wizata-dsapi 2.2.0.dev7__py3-none-any.whl → 2.2.0.dev9__py3-none-any.whl

wizata_dsapi/inventory.py

@@ -83,8 +83,9 @@ class InventoryBalance:
     DataPoint ``datapoint`` (a hardware id), true at ``timestamp`` (when it was
     counted, not when it was recorded: that is ``created_at``).
 
-    PostgreSQL ``"InventoryBalance"``, PK (``datapoint``, ``product``, ``timestamp``).
-    Writing the same key again replaces the quantity.
+    PostgreSQL ``"InventoryBalance"``, PK ``id`` (DEV-6085); (``datapoint``, ``product``,
+    ``timestamp``) is unique, and writing the same key again replaces the quantity.
+    ``count`` is the key shared by every balance written in one call (one count).
 
     On write only:
 
@@ -99,7 +100,9 @@ class InventoryBalance:
         return "planner/inventory/balances"
 
     def __init__(self, datapoint: str = None, product: str = None, timestamp=None,
-                 quantity: float = None, unit=None, twin: str = None):
+                 quantity: float = None, unit=None, twin: str = None, balance_id=None, count=None):
+        self.id: Optional[str] = _uuid_str(balance_id)
+        self.count: Optional[str] = _uuid_str(count)
         self.datapoint: Optional[str] = datapoint
         self.product: Optional[str] = product
         self.timestamp: Optional[datetime] = _ts_in(timestamp)
@@ -113,7 +116,8 @@ class InventoryBalance:
 
     def to_dict(self) -> dict:
         obj = {}
-        for name, value in (("datapoint", self.datapoint), ("product", self.product),
+        for name, value in (("id", self.id), ("count", self.count),
+                            ("datapoint", self.datapoint), ("product", self.product),
                             ("quantity", self.quantity), ("unit", self.unit),
                             ("twin", self.twin), ("createdBy", self.created_by),
                             ("updatedBy", self.updated_by)):
@@ -128,6 +132,8 @@ class InventoryBalance:
     @classmethod
     def from_dict(cls, data: dict) -> "InventoryBalance":
         obj = cls()
+        obj.id = _uuid_str(data.get("id"))
+        obj.count = _uuid_str(data.get("count"))
         obj.datapoint = data.get("datapoint")
         obj.product = data.get("product")
         obj.timestamp = _ts_in(data.get("timestamp"))
@@ -140,6 +146,9 @@ class InventoryBalance:
         obj.updated_by = data.get("updatedBy") or data.get("updated_by")
         return obj
 
+    def api_id(self) -> str:
+        return self.id
+
     def key(self) -> tuple:
         return self.datapoint, self.product, self.timestamp
 

wizata_dsapi/product.py

@@ -7,7 +7,9 @@ ProductKind — what role a product plays: raw material, container, finished pro
 
 Product — something the plant consumes or makes, identified by a Wizata key
   (e.g. ``can_33_coke``). ``category`` is a backend category id (Volume, Count, ...):
-  it says how a quantity of that product is expressed.
+  it says how a quantity of that product is expressed. ``unit`` (optional, DEV-6087) is
+  its default unit, a backend unit id of that category, used for stock totals across
+  storages; ``unit_symbol`` is filled on read only.
 
 ProductComponent — one line of a product's bill of materials: ``product`` is made of
   ``quantity`` ``unit`` of ``composed_of``. The unit is a backend unit id and must
@@ -120,12 +122,14 @@ class Product:
         return "planner/products"
 
     def __init__(self, key: str = None, name: str = None, category=None,
-                 kind: str = None, description: str = None):
+                 kind: str = None, description: str = None, unit=None):
         self.key: Optional[str] = key
         self.name: Optional[str] = name
         self.category: Optional[str] = _uuid_str(category)
         self.kind: Optional[str] = kind
         self.description: Optional[str] = description
+        self.unit: Optional[str] = _uuid_str(unit)
+        self.unit_symbol: Optional[str] = None
         self.created_at: Optional[datetime] = None
         self.updated_at: Optional[datetime] = None
 
@@ -141,6 +145,10 @@ class Product:
             obj["kind"] = self.kind
         if self.description is not None:
             obj["description"] = self.description
+        if self.unit is not None:
+            obj["unit"] = self.unit
+        if self.unit_symbol is not None:
+            obj["unitSymbol"] = self.unit_symbol
         if self.created_at is not None:
             obj["createdAt"] = _ts_out(self.created_at)
         if self.updated_at is not None:
@@ -155,6 +163,8 @@ class Product:
         obj.category = _uuid_str(data.get("category"))
         obj.kind = data.get("kind")
         obj.description = data.get("description")
+        obj.unit = _uuid_str(data.get("unit"))
+        obj.unit_symbol = data.get("unitSymbol") or data.get("unit_symbol")
         obj.created_at = _ts_in(data.get("createdAt") or data.get("created_at"))
         obj.updated_at = _ts_in(data.get("updatedAt") or data.get("updated_at"))
         return obj

wizata_dsapi/version.py

@@ -1 +1 @@
-__version__ = "2.2.0.dev7"
+__version__ = "2.2.0.dev9"

wizata_dsapi/wizata_dsapi_client.py

@@ -2886,7 +2886,8 @@ class WizataDSAPIClient(ApiInterface, ApiDtoInterface):
             inventoryMovement DataPoint by ``datapoint``, or by ``twin`` (the DataPoint
             of the product's category on that Twin). ``unit`` converts the quantity to
             the DataPoint's unit.
-        :return: the stored balances, quantities in the DataPoint's unit.
+        :return: the stored balances, quantities in the DataPoint's unit, each with its
+            ``id`` and the ``count`` key the call created.
         """
         body = [b.to_dict() if isinstance(b, InventoryBalance) else b for b in balances]
         response = self._planner_request("POST", "planner/inventory/balances/", body=body)
@@ -2896,8 +2897,8 @@ class WizataDSAPIClient(ApiInterface, ApiDtoInterface):
         """
         List recorded balances, newest first by default.
 
-        :param search_query: SearchQuery or dict; filters on ``datapoint`` and
-            ``product`` (eq / in) and ``timestamp`` (gte / gt / lt / lte).
+        :param search_query: SearchQuery or dict; filters on ``datapoint``, ``product``,
+            ``twin``, ``count``, ``id`` (eq / in) and ``timestamp`` (eq / gte / gt / lt / lte).
         :return: PagedQueryResult with InventoryBalance results.
         """
         if search_query is None:
@@ -2908,19 +2909,40 @@ class WizataDSAPIClient(ApiInterface, ApiDtoInterface):
                                          body=search_query.to_dict())
         return PagedQueryResult.from_dict(response.json(), dto_class=InventoryBalance)
 
-    def delete_inventory_balance(self, datapoint: str, product: str, timestamp):
+    @staticmethod
+    def _balance_id(value) -> str:
+        balance_id = value.id if isinstance(value, InventoryBalance) else value
+        if not balance_id:
+            raise ValueError("please provide a balance or its id")
+        return urllib.parse.quote(str(balance_id), safe="")
+
+    def get_inventory_balance(self, balance_id):
+        """
+        :param balance_id: the balance's id.
+        :return: InventoryBalance, or None when it does not exist.
+        """
+        response = self._planner_request("GET", f"planner/inventory/balances/{self._balance_id(balance_id)}/",
+                                         expected=(200, 404))
+        return InventoryBalance.from_dict(response.json()) if response.status_code == 200 else None
+
+    def update_inventory_balance(self, balance: InventoryBalance) -> InventoryBalance:
+        """
+        Change one balance's quantity and/or time (its datapoint and product never change).
+        ``unit`` converts the quantity to the datapoint's unit. 409 when another balance
+        already holds the new time.
+        """
+        body = {k: v for k, v in balance.to_dict().items() if k in ("quantity", "timestamp", "unit")}
+        response = self._planner_request("PUT", f"planner/inventory/balances/{self._balance_id(balance)}/",
+                                         body=body)
+        return InventoryBalance.from_dict(response.json())
+
+    def delete_inventory_balance(self, balance):
         """
         Delete one recorded balance (a count entered by mistake).
 
-        :param timestamp: datetime or ISO string, exactly as stored.
+        :param balance: InventoryBalance or its id.
         """
-        if isinstance(timestamp, datetime.datetime):
-            if timestamp.tzinfo is None:
-                timestamp = timestamp.replace(tzinfo=datetime.timezone.utc)
-            timestamp = timestamp.isoformat()
-        self._planner_request("DELETE", "planner/inventory/balances/",
-                              params={"datapoint": datapoint, "product": product,
-                                      "timestamp": timestamp},
+        self._planner_request("DELETE", f"planner/inventory/balances/{self._balance_id(balance)}/",
                               expected=(204,))
 
 

{wizata_dsapi-2.2.0.dev7.dist-info → wizata_dsapi-2.2.0.dev9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wizata_dsapi
-Version: 2.2.0.dev7
+Version: 2.2.0.dev9
 Summary: Wizata Data Science Toolkit
 Author: Wizata S.A.
 Author-email: info@wizata.com

{wizata_dsapi-2.2.0.dev7.dist-info → wizata_dsapi-2.2.0.dev9.dist-info}/RECORD

@@ -25,7 +25,7 @@ wizata_dsapi/graylog_log.py,sha256=KaHzv9HSqzmg8Cjr1vrsqeggd3tvrDkSN1TXaxCwsPs,4
 wizata_dsapi/group_system.py,sha256=6rUKe0_J3YWACysyBlzuw_TEpKNXgLOMxhpWsNxOzwY,1708
 wizata_dsapi/ilogger.py,sha256=YKBTRp7pHYtBlnzroGRPT91_bMVJT93Pft3fUGcFSIM,488
 wizata_dsapi/insight.py,sha256=ABFZ04DqYxxzqAEfU1tzlTZqqrigM-zN-8Lbetko3g0,6468
-wizata_dsapi/inventory.py,sha256=F20bwqL5mltd1_RC-PH9I7QwWxPE4l2yl64uoO_G7GU,6060
+wizata_dsapi/inventory.py,sha256=JN_aPJbR5_hf4Xjh8UsZWIqxG72GGCzaoAYIqwA_TN4,6525
 wizata_dsapi/mlmodel.py,sha256=ezgln6vyNGqEw7mD4P2YQZxHm5rXGqM9YW40eS09A8Q,26595
 wizata_dsapi/mobile_asset.py,sha256=FBEvrOaXkT8YaLv1coemqNFJaoY-NVUcgNKPFgUzfP4,7631
 wizata_dsapi/model_toolkit.py,sha256=UNyw5CFSgZeXydQFsiDIRTjoMeqIsdyIIuiwumLW5bA,1574
@@ -34,7 +34,7 @@ wizata_dsapi/paged_query_result.py,sha256=QOpJMAS6rxJfiz3a5oSfc0gOvwQeZTEhOtBoSs
 wizata_dsapi/pipeline.py,sha256=mMkNzFQsC9s1ZuC0HrfLG1BsZCnYYlrrhPlo6Out1Zs,40872
 wizata_dsapi/pipeline_image.py,sha256=WtMY0_ncba9WzZ96KQINiYshJegQdArzhspKTGWBgVA,7758
 wizata_dsapi/plot.py,sha256=KLeYj6xpG_XFSDuR4A8Iqp2fmAVLeDsHaUOVT2sRUYM,4033
-wizata_dsapi/product.py,sha256=DEuqi-1KDih3fyLEmVlsKao57tCpPJQ2sTwhEqe-r0A,7577
+wizata_dsapi/product.py,sha256=EiiT9icS2xr8aN3STre4X7CsaJ33tt7jmOnQPD9pA6U,8139
 wizata_dsapi/request.py,sha256=sjYNjxI6m88hdPIPOkRfwoFLNaV7cupjnLIktalapNI,29298
 wizata_dsapi/script.py,sha256=1Mjw3BNxN_R5dx0f55T0WuebqqRr_69rsK5yuQZOjmQ,19467
 wizata_dsapi/search.py,sha256=pHX-xGIB0E6gJkTxXmLjFe_b8-0gei7hfkW0JnxzCl0,4691
@@ -46,10 +46,10 @@ wizata_dsapi/trigger.py,sha256=waOX2AhrLvFzNFRQ535j6iemgg_QJP2QsWGL2ipljFg,8848
 wizata_dsapi/twin.py,sha256=8AnrxSaL7dMrILXJ3-GGmmUz078j3qqwzDTe6i86xqA,12672
 wizata_dsapi/twinregistration.py,sha256=iXt55AVGAQNl0jmxa3ZVynPqlSsIunFf4sLfp-MWTw0,13244
 wizata_dsapi/user.py,sha256=-hchKAMZULu9P00RUHDqu_5AT4NI5BYOJd8XCBrt3eQ,1950
-wizata_dsapi/version.py,sha256=yfwCYQz4p6IHiajShzB17V1HzG-JxgGk1JgH0R0YvRU,27
+wizata_dsapi/version.py,sha256=-k1RPdCS3o4yj0_fbjRN7hn5K2x676nDCXQeGBqBB5Y,27
 wizata_dsapi/wizard_function.py,sha256=RbM7W7Gf-6Rhp_1dU9DBYkHaciknGAGvuAndhAS_vyo,942
 wizata_dsapi/wizard_request.py,sha256=v6BaqKLKvTWmUSo0_gda9FabAQz5x_-GOH1Av50GzFo,3762
-wizata_dsapi/wizata_dsapi_client.py,sha256=O6Q-cFg0MYaLQqMR8VEMweTZ8fxDh5uuUJM5kavoeuw,121630
+wizata_dsapi/wizata_dsapi_client.py,sha256=uDbrcr57ZdyVYdwmAovYxIFMt42p7WtjUF_0ogoF4lw,122750
 wizata_dsapi/words.py,sha256=tV8CqzCqODZCV7PgBxBF5exBxeF_ya9t5DiUy-cg6Sg,1535
 wizata_dsapi/models/__init__.py,sha256=O3Tusyhl8hFb-5QaEBY7DJISRB8Gf_Xbxxr-aFDR1_U,380
 wizata_dsapi/models/common.py,sha256=5BC3Dc6kMvqPGxHgoCuGVOynu_F1MWh7EJSzXIICSSg,27196
@@ -58,8 +58,8 @@ wizata_dsapi/plots/common.py,sha256=7F4WMBaddubnCpdSafgaI9U9Sz0Sngg0VREP_vnIMno,
 wizata_dsapi/plots/theme.py,sha256=D4sSgEwabXVxF3z1GV8DivXJbbY61KgxXAWfjUbNDAc,3594
 wizata_dsapi/scripts/__init__.py,sha256=9fRdTMuuXcqMkIsUPf5dwFsTWwBzKteQdAMVkyy2acQ,212
 wizata_dsapi/scripts/common.py,sha256=T2cP8aGPg8OgIvBWuQBNonVtph_dHlNFubByuYrLb0o,15675
-wizata_dsapi-2.2.0.dev7.dist-info/licenses/LICENSE.txt,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
-wizata_dsapi-2.2.0.dev7.dist-info/METADATA,sha256=uk069VouGwpiD3c4aQktZwzcILevlxIiFb3WElWMEGg,14037
-wizata_dsapi-2.2.0.dev7.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-wizata_dsapi-2.2.0.dev7.dist-info/top_level.txt,sha256=-OeTJbEnh5DuWyTOHtvw0Dw3LRg3G27TNS6W4ZtfwPs,13
-wizata_dsapi-2.2.0.dev7.dist-info/RECORD,,
+wizata_dsapi-2.2.0.dev9.dist-info/licenses/LICENSE.txt,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
+wizata_dsapi-2.2.0.dev9.dist-info/METADATA,sha256=7gc7U8W1SyZscjCiOaTwmNwAnoos-HiwvtF21PjbaVc,14037
+wizata_dsapi-2.2.0.dev9.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+wizata_dsapi-2.2.0.dev9.dist-info/top_level.txt,sha256=-OeTJbEnh5DuWyTOHtvw0Dw3LRg3G27TNS6W4ZtfwPs,13
+wizata_dsapi-2.2.0.dev9.dist-info/RECORD,,