From 6ae72a4b03bf5a99eb4c757c1e7ed9baed26bfa7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Ke=C3=9Fler?= Date: Tue, 4 Jul 2023 18:53:18 +0200 Subject: [PATCH] Adapt imports to new package structure --- hanabi/__init__.py | 4 ++++ hanabi/constants.py | 4 ++-- hanabi/database/database.py | 2 +- hanabi/database/init_database.py | 2 +- hanabi/hanabi_cli.py | 4 ++-- hanabi/live/check_game.py | 8 ++++---- hanabi/live/compress.py | 8 ++------ hanabi/live/download_data.py | 2 +- hanabi/live/instance_finder.py | 12 ++++++------ hanabi/live/site_api.py | 3 +-- hanabi/live/variants.py | 2 +- hanabi/solvers/deck_analyzer.py | 4 ++-- hanabi/solvers/greedy_solver.py | 4 ++-- hanabi/solvers/sat.py | 4 ++-- 14 files changed, 31 insertions(+), 32 deletions(-) mode change 100755 => 100644 hanabi/live/compress.py diff --git a/hanabi/__init__.py b/hanabi/__init__.py index e69de29..34da869 100644 --- a/hanabi/__init__.py +++ b/hanabi/__init__.py @@ -0,0 +1,4 @@ +from .logger_setup import LoggerManager + +logger_manager = LoggerManager() +logger = logger_manager.get_logger() diff --git a/hanabi/constants.py b/hanabi/constants.py index 7136bcf..34a5139 100644 --- a/hanabi/constants.py +++ b/hanabi/constants.py @@ -8,9 +8,9 @@ COLOR_INITIALS = 'rygbpt' PLAYER_NAMES = ["Alice", "Bob", "Cathy", "Donald", "Emily", "Frank"] -#### hanab.live stuff +# hanab.live stuff -# Id of no variant +# id of no variant NO_VARIANT_ID = 0 # a map (num_suits, num_dark_suits) -> variant id of a variant on hanab.live fitting that distribution diff --git a/hanabi/database/database.py b/hanabi/database/database.py index 1fc2371..1edbdcb 100644 --- a/hanabi/database/database.py +++ b/hanabi/database/database.py @@ -1,5 +1,5 @@ +from typing import Optional import psycopg2 -from typing import Optional, Dict # global connection conn = psycopg2.connect("dbname=hanab-live-2 user=postgres") diff --git a/hanabi/database/init_database.py b/hanabi/database/init_database.py index 6b4695e..846c5ad 100644 --- a/hanabi/database/init_database.py +++ b/hanabi/database/init_database.py @@ -1,7 +1,7 @@ import json import requests from pathlib import Path -from log_setup import logger +from hanabi import logger from .database import cur, conn diff --git a/hanabi/hanabi_cli.py b/hanabi/hanabi_cli.py index 201da14..d9d4dc1 100755 --- a/hanabi/hanabi_cli.py +++ b/hanabi/hanabi_cli.py @@ -4,10 +4,10 @@ import argparse import verboselogs -from check_game import check_game +from hanabi import logger +from hanabi.live.check_game import check_game from hanabi.live.download_data import detailed_export_game from hanabi.live.compress import link -from hanabi.log_setup import logger, logger_manager """ init db + populate tables diff --git a/hanabi/live/check_game.py b/hanabi/live/check_game.py index 2235eee..37749cd 100644 --- a/hanabi/live/check_game.py +++ b/hanabi/live/check_game.py @@ -1,12 +1,12 @@ import copy from typing import Tuple -from database import conn +from hanabi.database import conn from hanabi.live.compress import decompress_deck, decompress_actions, link -from hanabi import GameState +from hanabi.game import GameState from hanabi.live.hanab_live import HanabLiveInstance, HanabLiveGameState -from sat import solve_sat -from hanabi.log_setup import logger +from hanabi.solvers.sat import solve_sat +from hanabi import logger # returns minimal number T of turns (from game) after which instance was infeasible diff --git a/hanabi/live/compress.py b/hanabi/live/compress.py old mode 100755 new mode 100644 index 87b5cf8..2618f87 --- a/hanabi/live/compress.py +++ b/hanabi/live/compress.py @@ -1,14 +1,10 @@ #! /bin/python3 -import json import sys import more_itertools -from enum import Enum -from termcolor import colored -from typing import List, Optional, Union +from typing import List, Union -from variants import variant_id, variant_name -from hanabi import DeckCard, ActionType, Action, GameState, HanabiInstance +from hanabi.game import DeckCard, ActionType, Action, GameState, HanabiInstance from hanab_live import HanabLiveGameState, HanabLiveInstance diff --git a/hanabi/live/download_data.py b/hanabi/live/download_data.py index 9b9a91d..4f366c4 100644 --- a/hanabi/live/download_data.py +++ b/hanabi/live/download_data.py @@ -9,7 +9,7 @@ from hanabi.live.compress import compress_deck, compress_actions, DeckCard, Acti from hanabi.live.variants import variant_id, variant_name from hanab_live import HanabLiveInstance, HanabLiveGameState -from hanabi.log_setup import logger +from hanabi import logger # diff --git a/hanabi/live/instance_finder.py b/hanabi/live/instance_finder.py index 7624999..f413f48 100644 --- a/hanabi/live/instance_finder.py +++ b/hanabi/live/instance_finder.py @@ -4,17 +4,17 @@ import concurrent.futures import traceback -from sat import solve_sat +from hanabi.solvers.sat import solve_sat from hanabi.database.database import conn, cur from hanabi.live.download_data import detailed_export_game from alive_progress import alive_bar from hanabi.live.compress import decompress_deck, link -from hanabi import HanabiInstance +from hanabi.game import HanabiInstance from threading import Lock from time import perf_counter -from greedy_solver import GameState, GreedyStrategy -from hanabi.log_setup import logger -from deck_analyzer import analyze, InfeasibilityReason +from hanabi.solvers.greedy_solver import GameState, GreedyStrategy +from hanabi import logger +from hanabi.solvers.deck_analyzer import analyze, InfeasibilityReason from hanabi.live.variants import Variant MAX_PROCESSES = 6 @@ -98,7 +98,7 @@ def get_decks_for_all_seeds(): res = cur.fetchall() with alive_bar(len(res), title="Exporting decks") as bar: for (game_id,) in res: - export_game(game_id) + detailed_export_game(game_id) bar() diff --git a/hanabi/live/site_api.py b/hanabi/live/site_api.py index c4c745f..93b6d80 100644 --- a/hanabi/live/site_api.py +++ b/hanabi/live/site_api.py @@ -1,7 +1,6 @@ import json -import requests import requests_cache -from log_setup import logger +from hanabi import logger # Cache all requests to site to reduce traffic and latency diff --git a/hanabi/live/variants.py b/hanabi/live/variants.py index b89a352..644ffd0 100644 --- a/hanabi/live/variants.py +++ b/hanabi/live/variants.py @@ -1,6 +1,6 @@ import enum from typing import List, Optional -from hanabi import DeckCard, ActionType +from hanabi.game import DeckCard, ActionType from hanabi.database.database import cur diff --git a/hanabi/solvers/deck_analyzer.py b/hanabi/solvers/deck_analyzer.py index 2adbc03..6361d91 100644 --- a/hanabi/solvers/deck_analyzer.py +++ b/hanabi/solvers/deck_analyzer.py @@ -1,8 +1,8 @@ from hanabi.live.compress import DeckCard from enum import Enum -from database import conn -from hanabi import HanabiInstance, pp_deck +from hanabi.database import conn +from hanabi.game import HanabiInstance, pp_deck from hanabi.live.compress import decompress_deck diff --git a/hanabi/solvers/greedy_solver.py b/hanabi/solvers/greedy_solver.py index d352e5d..3c1a2e7 100755 --- a/hanabi/solvers/greedy_solver.py +++ b/hanabi/solvers/greedy_solver.py @@ -2,10 +2,10 @@ import collections import sys from enum import Enum -from hanabi.log_setup import logger +from hanabi import logger from typing import Optional -from hanabi import DeckCard, GameState, HanabiInstance +from hanabi.game import DeckCard, GameState, HanabiInstance from hanabi.live.compress import link, decompress_deck from hanabi.database.database import conn diff --git a/hanabi/solvers/sat.py b/hanabi/solvers/sat.py index 6f0438a..9f2d997 100644 --- a/hanabi/solvers/sat.py +++ b/hanabi/solvers/sat.py @@ -3,11 +3,11 @@ from pysmt.shortcuts import Symbol, Bool, Not, Implies, Iff, And, Or, AtMostOne, from pysmt.typing import INT from typing import Optional, Tuple -from hanabi import DeckCard, GameState, HanabiInstance +from hanabi.game import DeckCard, GameState, HanabiInstance from hanabi.live.compress import link, decompress_deck from greedy_solver import GreedyStrategy from hanabi.constants import COLOR_INITIALS -from hanabi.log_setup import logger +from hanabi import logger # literals to model game as sat instance to check for feasibility