diff --git a/pyproject.toml b/pyproject.toml index de56431..87874f0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "straders" -version = "2.1.4" +version = "2.1.5" authors = [ {name="C'tri", email ="pythonpackages@ctri.co.uk"}, ] diff --git a/requirements.txt b/requirements.txt index dcd8214..6320e2d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,4 +5,4 @@ networkx psycopg2-binary setuptools wheel -build \ No newline at end of file +build \ No newline at end of file diff --git a/scripts/PRD-build.bat b/scripts/PRD-build.bat new file mode 100644 index 0000000..f243ac2 --- /dev/null +++ b/scripts/PRD-build.bat @@ -0,0 +1,2 @@ +docker build -f postgres.dockerfile -t spacetraders_db . + diff --git a/setup.bat b/setup.bat index c8875fe..91e58bb 100644 --- a/setup.bat +++ b/setup.bat @@ -1,4 +1,4 @@ py -m build py -m pip uninstall straders -y -py -m pip install dist/straders-2.1.4-py3-none-any.whl --force-reinstall +py -m pip install dist/straders-2.1.5-py3-none-any.whl --force-reinstall explorer "C:\Users\C_tri\AppData\Local\Programs\Python\Python310\Lib\site-packages" \ No newline at end of file diff --git a/setup.sh b/setup.sh index e690b3d..7d04bde 100755 --- a/setup.sh +++ b/setup.sh @@ -2,4 +2,4 @@ python3 -m build python3 -m pip uninstall straders -y -python3 -m pip install dist/straders-2.1.4-py3-none-any.whl --force-reinstall +python3 -m pip install dist/straders-2.1.5-py3-none-any.whl --force-reinstall diff --git a/straders_sdk/client_api.py b/straders_sdk/client_api.py index fd8b710..cd864bd 100644 --- a/straders_sdk/client_api.py +++ b/straders_sdk/client_api.py @@ -1,4 +1,4 @@ -from .models import Waypoint +from .models_misc import Waypoint from .responses import SpaceTradersResponse from .client_interface import SpaceTradersClient from .responses import SpaceTradersResponse @@ -13,7 +13,7 @@ waypoint_slicer, ) from .local_response import LocalSpaceTradersRespose # -from .models import ( +from .models_misc import ( Waypoint, Survey, Market, @@ -26,8 +26,8 @@ Agent, Faction, ) -from .contracts import Contract -from .ship import Ship +from .models_contracts import Contract +from .models_ship import Ship import logging from requests_ratelimiter import LimiterSession from datetime import datetime @@ -492,7 +492,7 @@ def ship_install_mount(self, ship: Ship, mount_symbol: str) -> SpaceTradersRespo data = {"symbol": mount_symbol} resp = post_and_validate( url, - data, + json=data, headers=self._headers(), session=self.session, priority=self.priority, diff --git a/straders_sdk/client_interface.py b/straders_sdk/client_interface.py index 9dfd08b..b256ede 100644 --- a/straders_sdk/client_interface.py +++ b/straders_sdk/client_interface.py @@ -1,5 +1,5 @@ from typing import Protocol, runtime_checkable -from .models import Waypoint, Survey, Market, Shipyard, JumpGate, ConstructionSite +from .models_misc import Waypoint, Survey, Market, Shipyard, JumpGate, ConstructionSite from .responses import SpaceTradersResponse from abc import abstractmethod diff --git a/straders_sdk/client_json_cache.py b/straders_sdk/client_json_cache.py index 76e770e..e2ec2d4 100644 --- a/straders_sdk/client_json_cache.py +++ b/straders_sdk/client_json_cache.py @@ -1,5 +1,5 @@ from typing import Protocol -from .models import Waypoint, Survey, Market, System +from .models_misc import Waypoint, Survey, Market, System from .responses import SpaceTradersResponse from .local_response import LocalSpaceTradersRespose from .client_interface import SpaceTradersClient @@ -8,7 +8,7 @@ import logging -class SpaceTradersCacheClient(SpaceTradersClient): +class SpaceTradersJSONClient(SpaceTradersClient): def __init__( self, resources_folder_path="resources", diff --git a/straders_sdk/client_mediator.py b/straders_sdk/client_mediator.py index c25dd6e..4900d17 100644 --- a/straders_sdk/client_mediator.py +++ b/straders_sdk/client_mediator.py @@ -4,8 +4,8 @@ import time from .responses import SpaceTradersResponse from .local_response import LocalSpaceTradersRespose -from .contracts import Contract -from .models import ( +from .models_contracts import Contract +from .models_misc import ( Waypoint, ShipyardShip, GameStatus, @@ -16,13 +16,13 @@ JumpGate, ) import psycopg2 -from .models import Shipyard, System -from .ship import Ship +from .models_misc import Shipyard, System +from .models_ship import Ship from .client_api import SpaceTradersApiClient from .client_stub import SpaceTradersStubClient from .client_postgres import SpaceTradersPostgresClient from .client_pg_logger import SpaceTradersPostgresLoggerClient -from .client_json_cache import SpaceTradersCacheClient +from .client_json_cache import SpaceTradersJSONClient from straders_sdk.pg_connection_pool import PGConnectionPool from threading import Lock import logging @@ -93,7 +93,7 @@ def __init__( db_pass, ) self._connection = None - self.json_cache_client = SpaceTradersCacheClient() + self.json_cache_client = SpaceTradersJSONClient() self.api_client = SpaceTradersApiClient( token=token, base_url=base_url, diff --git a/straders_sdk/client_pg_logger.py b/straders_sdk/client_pg_logger.py index 30701af..4b6b4df 100644 --- a/straders_sdk/client_pg_logger.py +++ b/straders_sdk/client_pg_logger.py @@ -1,6 +1,6 @@ from typing import Protocol, runtime_checkable -from .models import Waypoint, Survey, Market, Shipyard, Agent, ConstructionSite -from .ship import Ship +from .models_misc import Waypoint, Survey, Market, Shipyard, Agent, ConstructionSite +from .models_ship import Ship from .client_interface import SpaceTradersClient import straders_sdk.utils as utils from .responses import SpaceTradersResponse diff --git a/straders_sdk/client_postgres.py b/straders_sdk/client_postgres.py index 76fd925..8eae2a1 100644 --- a/straders_sdk/client_postgres.py +++ b/straders_sdk/client_postgres.py @@ -1,6 +1,6 @@ from .pg_connection_pool import PGConnectionPool from typing import Protocol -from .models import ( +from .models_misc import ( Waypoint, WaypointTrait, Market, @@ -15,7 +15,7 @@ JumpGate, ) import logging -from .contracts import Contract, ContractDeliverGood +from .models_contracts import Contract, ContractDeliverGood from datetime import datetime from .responses import SpaceTradersResponse from .client_interface import SpaceTradersClient @@ -34,8 +34,8 @@ select_construction_site_one, ) from .local_response import LocalSpaceTradersRespose -from .models import RouteNode, ConstructionSite -from .ship import Ship, ShipInventory, ShipNav, ShipModule, ShipMount +from .models_misc import RouteNode, ConstructionSite +from .models_ship import Ship, ShipInventory, ShipNav, ShipModule, ShipMount from .utils import try_execute_select, try_execute_upsert import psycopg2 from .constants import ORBITAL_TYPES, PARENT_TYPES diff --git a/straders_sdk/client_stub.py b/straders_sdk/client_stub.py index 574d72c..059abe1 100644 --- a/straders_sdk/client_stub.py +++ b/straders_sdk/client_stub.py @@ -1,5 +1,5 @@ from typing import Protocol -from .models import Waypoint, Survey, Market +from .models_misc import Waypoint, Survey, Market from .responses import SpaceTradersResponse diff --git a/straders_sdk/clients/__init__.py b/straders_sdk/clients/__init__.py new file mode 100644 index 0000000..96f7395 --- /dev/null +++ b/straders_sdk/clients/__init__.py @@ -0,0 +1,5 @@ +from ..client_api import SpaceTradersApiClient +from ..client_mediator import SpaceTradersMediatorClient +from ..client_json_cache import SpaceTradersJSONClient +from ..client_pg_logger import SpaceTradersPostgresLoggerClient +from ..client_postgres import SpaceTradersPostgresClient diff --git a/straders_sdk/models/__init__.py b/straders_sdk/models/__init__.py new file mode 100644 index 0000000..47bead7 --- /dev/null +++ b/straders_sdk/models/__init__.py @@ -0,0 +1,3 @@ +from ..models_contracts import * +from ..models_misc import * +from ..models_ship import * diff --git a/straders_sdk/contracts.py b/straders_sdk/models_contracts.py similarity index 98% rename from straders_sdk/contracts.py rename to straders_sdk/models_contracts.py index e34bc4f..5cf9ee5 100644 --- a/straders_sdk/contracts.py +++ b/straders_sdk/models_contracts.py @@ -2,7 +2,7 @@ from .client_interface import SpaceTradersClient from .utils import DATE_FORMAT, _url, post_and_validate -from .models import SymbolClass +from .models_misc import SymbolClass from dataclasses import dataclass import logging diff --git a/straders_sdk/models.py b/straders_sdk/models_misc.py similarity index 100% rename from straders_sdk/models.py rename to straders_sdk/models_misc.py diff --git a/straders_sdk/ship.py b/straders_sdk/models_ship.py similarity index 98% rename from straders_sdk/ship.py rename to straders_sdk/models_ship.py index 1df7621..262e36d 100644 --- a/straders_sdk/ship.py +++ b/straders_sdk/models_ship.py @@ -1,8 +1,8 @@ from datetime import datetime, timedelta from dataclasses import dataclass -from .models import ShipFrame, ShipModule, ShipMount -from .models import ShipReactor, ShipEngine -from .models import ShipRequirements, ShipNav +from .models_misc import ShipFrame, ShipModule, ShipMount +from .models_misc import ShipReactor, ShipEngine +from .models_misc import ShipRequirements, ShipNav from .client_interface import SpaceTradersInteractive import logging from .utils import parse_timestamp diff --git a/straders_sdk/pathfinder/pathfinder.py b/straders_sdk/pathfinder/pathfinder.py index 1fe5b96..2092c53 100644 --- a/straders_sdk/pathfinder/pathfinder.py +++ b/straders_sdk/pathfinder/pathfinder.py @@ -5,7 +5,7 @@ import os from datetime import timedelta, datetime from networkx import Graph -from straders_sdk.models import System, Waypoint, WaypointTrait +from straders_sdk.models_misc import System, Waypoint, WaypointTrait from networkx import Graph from straders_sdk.utils import try_execute_select from straders_sdk.pathfinder.route import JumpGateRoute, JumpGateSystem diff --git a/straders_sdk/pathfinder/route.py b/straders_sdk/pathfinder/route.py index 3549778..a605cc1 100644 --- a/straders_sdk/pathfinder/route.py +++ b/straders_sdk/pathfinder/route.py @@ -1,4 +1,4 @@ -from straders_sdk.models import System, Waypoint +from straders_sdk.models_misc import System, Waypoint import json import logging from datetime import datetime diff --git a/straders_sdk/pg_pieces/agents.py b/straders_sdk/pg_pieces/agents.py index e044141..1a385b0 100644 --- a/straders_sdk/pg_pieces/agents.py +++ b/straders_sdk/pg_pieces/agents.py @@ -1,4 +1,4 @@ -from ..models import Agent +from ..models_misc import Agent from ..local_response import LocalSpaceTradersRespose import logging import datetime diff --git a/straders_sdk/pg_pieces/construction_sites.py b/straders_sdk/pg_pieces/construction_sites.py index 99d0855..f45e2f4 100644 --- a/straders_sdk/pg_pieces/construction_sites.py +++ b/straders_sdk/pg_pieces/construction_sites.py @@ -1,4 +1,4 @@ -from ..models import ConstructionSite, ConstructionSiteMaterial +from ..models_misc import ConstructionSite, ConstructionSiteMaterial from ..local_response import LocalSpaceTradersRespose import logging import datetime diff --git a/straders_sdk/pg_pieces/contracts.py b/straders_sdk/pg_pieces/contracts.py index 2e76718..1128867 100644 --- a/straders_sdk/pg_pieces/contracts.py +++ b/straders_sdk/pg_pieces/contracts.py @@ -1,5 +1,5 @@ -from ..models import Waypoint -from ..contracts import Contract, ContractDeliverGood +from ..models_misc import Waypoint +from ..models_contracts import Contract, ContractDeliverGood import logging from datetime import datetime from ..local_response import LocalSpaceTradersRespose diff --git a/straders_sdk/pg_pieces/extractions.py b/straders_sdk/pg_pieces/extractions.py index 56bd012..14f0218 100644 --- a/straders_sdk/pg_pieces/extractions.py +++ b/straders_sdk/pg_pieces/extractions.py @@ -1,4 +1,4 @@ -from ..models import Agent +from ..models_misc import Agent from ..local_response import LocalSpaceTradersRespose import logging import datetime diff --git a/straders_sdk/pg_pieces/jump_gates.py b/straders_sdk/pg_pieces/jump_gates.py index a7feab3..6bc4557 100644 --- a/straders_sdk/pg_pieces/jump_gates.py +++ b/straders_sdk/pg_pieces/jump_gates.py @@ -1,4 +1,4 @@ -from ..models import Waypoint, JumpGate, JumpGateConnection +from ..models_misc import Waypoint, JumpGate, JumpGateConnection import logging from datetime import datetime from ..local_response import LocalSpaceTradersRespose diff --git a/straders_sdk/pg_pieces/select_ship.py b/straders_sdk/pg_pieces/select_ship.py index ed57b7c..dda19f8 100644 --- a/straders_sdk/pg_pieces/select_ship.py +++ b/straders_sdk/pg_pieces/select_ship.py @@ -1,8 +1,8 @@ from ..local_response import LocalSpaceTradersRespose -from ..ship import Ship, ShipFrame, ShipNav, ShipInventory -from ..models import RouteNode +from ..models_ship import Ship, ShipFrame, ShipNav, ShipInventory +from ..models_misc import RouteNode from ..client_interface import SpaceTradersClient -from ..models import ShipRequirements +from ..models_misc import ShipRequirements from ..utils import try_execute_select, try_execute_upsert diff --git a/straders_sdk/pg_pieces/transactions.py b/straders_sdk/pg_pieces/transactions.py index 65852f0..a588b14 100644 --- a/straders_sdk/pg_pieces/transactions.py +++ b/straders_sdk/pg_pieces/transactions.py @@ -1,4 +1,4 @@ -from ..models import Agent +from ..models_misc import Agent from ..local_response import LocalSpaceTradersRespose import logging import datetime diff --git a/straders_sdk/pg_pieces/upsert_market.py b/straders_sdk/pg_pieces/upsert_market.py index 93eb314..c03c2a9 100644 --- a/straders_sdk/pg_pieces/upsert_market.py +++ b/straders_sdk/pg_pieces/upsert_market.py @@ -1,4 +1,4 @@ -from ..models import Market, MarketTradeGoodListing, Waypoint +from ..models_misc import Market, MarketTradeGoodListing, Waypoint import psycopg2 import logging from datetime import datetime diff --git a/straders_sdk/pg_pieces/upsert_ship.py b/straders_sdk/pg_pieces/upsert_ship.py index 518f132..9cd467a 100644 --- a/straders_sdk/pg_pieces/upsert_ship.py +++ b/straders_sdk/pg_pieces/upsert_ship.py @@ -1,5 +1,5 @@ -from ..ship import Ship -from ..models import Agent +from ..models_ship import Ship +from ..models_misc import Agent import psycopg2 import logging import re diff --git a/straders_sdk/pg_pieces/upsert_shipyard.py b/straders_sdk/pg_pieces/upsert_shipyard.py index 57227bd..e6052ec 100644 --- a/straders_sdk/pg_pieces/upsert_shipyard.py +++ b/straders_sdk/pg_pieces/upsert_shipyard.py @@ -1,4 +1,4 @@ -from ..models import Shipyard, ShipyardShip +from ..models_misc import Shipyard, ShipyardShip import psycopg2 import logging from ..utils import try_execute_upsert diff --git a/straders_sdk/pg_pieces/upsert_survey.py b/straders_sdk/pg_pieces/upsert_survey.py index 1b1115d..99d1871 100644 --- a/straders_sdk/pg_pieces/upsert_survey.py +++ b/straders_sdk/pg_pieces/upsert_survey.py @@ -1,4 +1,4 @@ -from ..models import Survey +from ..models_misc import Survey import logging import datetime diff --git a/straders_sdk/pg_pieces/upsert_system.py b/straders_sdk/pg_pieces/upsert_system.py index e38a074..efdc1cd 100644 --- a/straders_sdk/pg_pieces/upsert_system.py +++ b/straders_sdk/pg_pieces/upsert_system.py @@ -1,7 +1,7 @@ import psycopg2 -from ..models import System +from ..models_misc import System from ..pg_pieces.upsert_waypoint import _upsert_waypoint from ..utils import try_execute_upsert diff --git a/straders_sdk/pg_pieces/upsert_waypoint.py b/straders_sdk/pg_pieces/upsert_waypoint.py index a54432e..f496927 100644 --- a/straders_sdk/pg_pieces/upsert_waypoint.py +++ b/straders_sdk/pg_pieces/upsert_waypoint.py @@ -1,7 +1,7 @@ import psycopg2 -from ..models import Waypoint, WaypointTrait +from ..models_misc import Waypoint, WaypointTrait from ..utils import try_execute_upsert diff --git a/straders_sdk/responses.py b/straders_sdk/responses.py index 5eb348c..19f5ed1 100644 --- a/straders_sdk/responses.py +++ b/straders_sdk/responses.py @@ -38,7 +38,7 @@ def __init__(self, response: requests.Response, priority: int = None): self.error_code = None self.request_priority = None - if not response: + if response is None: self.status_code = 0 self.error_code = 0 self.error = "Timed out waiting for request to be sent." diff --git a/straders_sdk/spacetraders_CH2.code-workspace b/straders_sdk/spacetraders_CH2.code-workspace new file mode 100644 index 0000000..ce651e6 --- /dev/null +++ b/straders_sdk/spacetraders_CH2.code-workspace @@ -0,0 +1,11 @@ +{ + "folders": [ + { + "path": "../../spacetraders_CH2" + }, + { + "path": ".." + } + ], + "settings": {} +} \ No newline at end of file diff --git a/straders_sdk/utils.py b/straders_sdk/utils.py index 1e1d110..82dfa0a 100644 --- a/straders_sdk/utils.py +++ b/straders_sdk/utils.py @@ -150,7 +150,7 @@ def post_and_validate( url, data=None, json=None, headers=None, priority=5, session: Session = None ) -> SpaceTradersResponse: "wraps the requests.post function to make it easier to use" - + headers["Content-Type"] = "application/json" return request_and_validate( "POST", url, data=data, json=json, headers=headers, priority=priority ) diff --git a/tests/test_api.py b/tests/test_api.py index 0589106..8f1301b 100644 --- a/tests/test_api.py +++ b/tests/test_api.py @@ -1,6 +1,6 @@ from straders_sdk.client_api import SpaceTradersApiClient -from straders_sdk.ship import Ship -from straders_sdk.models import ShipMount +from straders_sdk.models import Ship +from straders_sdk.models_misc import ShipMount from straders_sdk.utils import ApiConfig BASE_URL = "https://stoplight.io" @@ -11,6 +11,7 @@ def test_ship_survey(): client = SpaceTradersApiClient("token", BASE_URL, VERSION) ship = Ship() + ship.name = "test_ship" ship.nav.status = "IN_ORBIT" ship.mounts.append( ShipMount( @@ -38,7 +39,7 @@ def test_ship_scan(): def test_ship_mount(): client = SpaceTradersApiClient("token", BASE_URL, VERSION) ship = Ship() - + ship.name = "test" resp = client.ship_install_mount(ship, "MINING_LASER_I") assert resp @@ -46,6 +47,7 @@ def test_ship_mount(): def test_ship_unmount(): client = SpaceTradersApiClient("token", BASE_URL, VERSION) ship = Ship() + ship.name = "test" resp = client.ship_remove_mount(ship, "MINING_LASER_I") assert resp diff --git a/tests/test_cache.py b/tests/test_cache.py index 8dce5af..51e2ebf 100644 --- a/tests/test_cache.py +++ b/tests/test_cache.py @@ -1,5 +1,5 @@ -from straders_sdk.client_json_cache import SpaceTradersCacheClient -from straders_sdk.models import Waypoint, System +from straders_sdk.client_json_cache import SpaceTradersJSONClient +from straders_sdk.models_misc import Waypoint, System import os import pytest @@ -7,7 +7,7 @@ def test_init(): - client = SpaceTradersCacheClient(FOLDER) + client = SpaceTradersJSONClient(FOLDER) assert client # check the resources folder exists @@ -17,13 +17,13 @@ def test_init(): def test_save_waypoint(waypoint_response_data): - client = SpaceTradersCacheClient(FOLDER) + client = SpaceTradersJSONClient(FOLDER) wp = Waypoint.from_json(waypoint_response_data) client.update(wp) def test_waypoints_view_one(waypoint_response_data): - client = SpaceTradersCacheClient(FOLDER) + client = SpaceTradersJSONClient(FOLDER) check_wp = Waypoint.from_json(waypoint_response_data) wp = client.waypoints_view_one("DOESNOTEXIST") assert not wp @@ -33,13 +33,13 @@ def test_waypoints_view_one(waypoint_response_data): def test_save_system(system_response_data): - client = SpaceTradersCacheClient(FOLDER) + client = SpaceTradersJSONClient(FOLDER) sys = System.from_json(system_response_data) client.update(sys) def test_systems_view_one(system_response_data): - client = SpaceTradersCacheClient(FOLDER) + client = SpaceTradersJSONClient(FOLDER) check_sys = System.from_json(system_response_data) sys = client.systems_view_one(check_sys.symbol) assert sys.symbol == check_sys.symbol @@ -49,7 +49,7 @@ def test_systems_view_one(system_response_data): def test_waypoints_view(system_response_data): - client = SpaceTradersCacheClient(FOLDER) + client = SpaceTradersJSONClient(FOLDER) check_sys = System.from_json(system_response_data) wps = client.waypoints_view(check_sys.symbol) assert wps @@ -57,7 +57,7 @@ def test_waypoints_view(system_response_data): def test_find_waypoints_by_coords(waypoint_response_data): - client = SpaceTradersCacheClient(FOLDER) + client = SpaceTradersJSONClient(FOLDER) check_wp = Waypoint.from_json(waypoint_response_data) wps = client.find_waypoints_by_coords( check_wp.system_symbol, check_wp.x, check_wp.y diff --git a/tests/test_db.py b/tests/test_db.py index 264a944..a3f48f0 100644 --- a/tests/test_db.py +++ b/tests/test_db.py @@ -1,10 +1,11 @@ import os from straders_sdk.client_postgres import SpaceTradersPostgresClient from straders_sdk.utils import try_execute_select -from straders_sdk.models import Waypoint, Market, System -from straders_sdk.models import JumpGate, JumpGateConnection -from straders_sdk.models import ConstructionSite, ConstructionSiteMaterial +from straders_sdk.models_misc import Waypoint, Market, System +from straders_sdk.models_misc import JumpGate, JumpGateConnection +from straders_sdk.models_misc import ConstructionSite, ConstructionSiteMaterial import pytest +import psycopg2 ST_HOST = os.getenv("ST_TEST_DB_HOST", "localhost") ST_NAME = os.getenv("ST_DB_NAME") @@ -22,10 +23,19 @@ def test_environment_variables(): assert ST_PORT +def test_connection(): + conn = psycopg2.connect( + dbname=ST_NAME, user=ST_USER, password=ST_PASS, host=ST_HOST, port=ST_PORT + ) + assert conn + conn.close() + + def test_contracts(): client = SpaceTradersPostgresClient( ST_HOST, ST_NAME, ST_USER, ST_PASS, TEST_AGENT_NAME, db_port=ST_PORT ) + resp = client.view_my_contracts() assert isinstance(resp, list) @@ -38,8 +48,13 @@ def test_find_waypoints_by_type(): # get a starting system, check it for asteroid fields sql = "select distinct system_symbol from agents a join waypoints w on a.headquarters = w.waypoint_symbol limit 1" - system = try_execute_select(sql)[0][0] + results = try_execute_select(sql) + if len(results) == 0: + pytest.skip("No ASTEROID waypoints found in system") + system = results[0][0] resp = client.find_waypoints_by_type(system, "ASTEROID") + assert isinstance(resp, list) + assert resp for wayp in resp: assert wayp.type == "ASTEROID" diff --git a/tests/test_mediator.py b/tests/test_mediator.py index b113f07..20a9404 100644 --- a/tests/test_mediator.py +++ b/tests/test_mediator.py @@ -1,9 +1,9 @@ import os from straders_sdk import SpaceTraders from straders_sdk.utils import try_execute_select -from straders_sdk.models import Waypoint, Market -from straders_sdk.models import JumpGate, JumpGateConnection -from straders_sdk.models import ConstructionSite, ConstructionSiteMaterial +from straders_sdk.models_misc import Waypoint, Market +from straders_sdk.models_misc import JumpGate, JumpGateConnection +from straders_sdk.models_misc import ConstructionSite, ConstructionSiteMaterial import pytest ST_HOST = os.getenv("ST_DB_HOST") diff --git a/tests/test_models.py b/tests/test_models.py index 54b1096..edc892d 100644 --- a/tests/test_models.py +++ b/tests/test_models.py @@ -5,7 +5,7 @@ import pytest from datetime import datetime, timedelta from straders_sdk.utils import DATE_FORMAT -from straders_sdk.models import ( +from straders_sdk.models_misc import ( Announement, CrewInfo, FuelInfo, @@ -21,7 +21,7 @@ Waypoint, ) -from straders_sdk.ship import Ship +from straders_sdk.models_ship import Ship # Test cases for Announement class @@ -253,9 +253,9 @@ def market_response_data(): def test_market(market_response_data): - import straders_sdk.models as models + import straders_sdk.models_misc as models_misc - market = models.Market.from_json(market_response_data) + market = models_misc.Market.from_json(market_response_data) assert market is not None diff --git a/tests/test_pathfinder.py b/tests/test_pathfinder.py index 1f0afad..c04a8d2 100644 --- a/tests/test_pathfinder.py +++ b/tests/test_pathfinder.py @@ -1,6 +1,6 @@ from straders_sdk.pathfinder import PathFinder -from straders_sdk.models import System, Waypoint, WaypointTrait -from straders_sdk.ship import Ship +from straders_sdk.models_misc import System, Waypoint, WaypointTrait +from straders_sdk.models_ship import Ship import os import psycopg2