BREAKING - reshuffle responses, models, and clients into the

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "straders"
-version = "2.1.4" 
+version = "2.1.5" 
 authors = [
 {name="C'tri", email ="[email protected]"},
 ]

requirements.txt

@@ -5,4 +5,4 @@ networkx
 psycopg2-binary
 setuptools
 wheel
-build
+build 

scripts/PRD-build.bat

@@ -0,0 +1,2 @@
+docker build  -f postgres.dockerfile -t spacetraders_db    .
+

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"

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

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,

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
 

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",

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,

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

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

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
 
 

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

straders_sdk/models/__init__.py

@@ -0,0 +1,3 @@
+from ..models_contracts import *
+from ..models_misc import *
+from ..models_ship import *

straders_sdk/contracts.py → 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
 

straders_sdk/ship.py → 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

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

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

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

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

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

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

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

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
 
 

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

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

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

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

straders_sdk/pg_pieces/upsert_survey.py

@@ -1,4 +1,4 @@
-from ..models import Survey
+from ..models_misc import Survey
 
 import logging
 import datetime

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
 

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
 
 

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."

straders_sdk/spacetraders_CH2.code-workspace

@@ -0,0 +1,11 @@
+{
+	"folders": [
+		{
+			"path": "../../spacetraders_CH2"
+		},
+		{
+			"path": ".."
+		}
+	],
+	"settings": {}
+}

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
     )

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,14 +39,15 @@ 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
 
 
 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