chore: marking attributes as optional (#6)

examples/fix_labour.py

@@ -20,8 +20,8 @@ async def main():
     client = Client(os.environ["API_USER"], os.environ["API_TOKEN"])
     player = await client.player()
 
-    manager = player.storehouse.inventory.managers.get(Item.Labour)
-    flow = player.storehouse.total_flow.get(Item.Labour)
+    manager = player.storehouse.data.inventory.managers.get(Item.Labour)
+    flow = player.storehouse.data.total_flow.get(Item.Labour)
 
     consumed = flow.consumption - flow.production
 
@@ -39,7 +39,7 @@ async def main():
     print(f"Adjusting labour purchase amount to {math.ceil(consumed)}")
     manager.buy_volume = math.ceil(consumed)
 
-    result = await player.storehouse.set_manager(Item.Labour, manager)
+    result = await player.storehouse.data.set_manager(Item.Labour, manager)
     if result:
         print("Labour purchase amount adjusted successfully")
     else:

pymerc/api/models/businesses.py

@@ -18,7 +18,7 @@ class Business(BaseModel):
     id: int
     name: str
     owner_id: int
-    transport_ids: list[int]
+    transport_ids: Optional[list[int]] = None
 
 
 class BusinessAccount(BaseModel):

pymerc/api/models/common.py

@@ -689,17 +689,18 @@ def selling(self) -> bool:
 class InventoryFlow(BaseModel):
     """Represents an inventory flow."""
 
-    consumption: Optional[float] = None
-    expiration: Optional[float] = None
+    consumption: Optional[float] = 0.0
+    expiration: Optional[float] = 0.0
     export: Optional[int] = None
     imported: Optional[int] = Field(None, alias="import")
-    production: Optional[float] = None
-    production_cost: Optional[float] = None
+    production: Optional[float] = 0.0
+    production_cost: Optional[float] = 0.0
     purchase: Optional[int] = None
-    purchase_cost: Optional[float] = None
+    purchase_cost: Optional[float] = 0.0
     resident: Optional[float] = None
     sale: Optional[int] = None
-    sale_value: Optional[float] = None
+    sale_value: Optional[float] = 0.0
+    shortfall: Optional[float] = 0.0
 
 
 class DeliveryCost(BaseModel):

pymerc/api/models/player.py

@@ -10,7 +10,7 @@
 class Player(BaseModel):
     username: str
     household: Household
-    discord_id: str
+    discord_id: Optional[str] = None
     settings: Settings
     active: bool
 
@@ -24,7 +24,7 @@ class Household(BaseModel):
     account_id: str
     business_ids: list[str]
     prestige: float
-    prestige_impacts: list[PrestigeImpact]
+    prestige_impacts: Optional[list[PrestigeImpact]] = None
     workers: list[Worker]
     operations: list[str]
     caps: dict[str, int]
@@ -46,7 +46,7 @@ class Worker(BaseModel):
 class Sustenance(BaseModel):
     reference: str
     inventory: common.Inventory
-    provider_id: str
+    provider_id: Optional[str] = None
 
 
 class Settings(BaseModel):

pymerc/api/models/transports.py

@@ -24,7 +24,7 @@ class Transport(BaseModel):
     inventory: common.Inventory
     cargo: TransportCargo = None
     previous_operations: Optional[common.Operation] = None
-    provider_id: int
+    provider_id: Optional[int] = None
     producer: Optional[common.Producer] = None
     route: Optional[TransportRoute] = None
     journey: TransportJourney
@@ -34,7 +34,7 @@ class TransportCargo(BaseModel):
     """Represents the cargo of a transport."""
 
     reference: str
-    inventory: common.Inventory
+    inventory: Optional[common.Inventory] = None
 
 
 class TransportJourney(BaseModel):

pymerc/game/player.py

@@ -2,7 +2,7 @@
 
 from typing import TYPE_CHECKING
 
-from pymerc.api.models import common
+from pymerc.api.models import common, businesses
 from pymerc.api.models.player import Household, Sustenance
 from pymerc.api.models.player import Player as PlayerModel
 from pymerc.game.building import BuildingsList
@@ -18,7 +18,7 @@ class Player:
     """A higher level representation of a player in the game."""
 
     buildings: BuildingsList
-    business: common.Business
+    business: businesses.Business
     data: PlayerModel
     exports: ExportsSummed
     imports: ImportsSummed
@@ -41,8 +41,9 @@ async def load(self):
             self.buildings.append(await self._client.building(id))
 
         self.transports = []
-        for id in self.business.transport_ids:
-            self.transports.append(await self._client.transport(id))
+        if self.business.transport_ids:
+            for id in self.business.transport_ids:
+                self.transports.append(await self._client.transport(id))
 
         for transport in self.transports:
             for item, exp in transport.exports.items():