wizata-dsapi 2.2.0.dev25__tar.gz → 2.2.0.dev27__tar.gz

{wizata_dsapi-2.2.0.dev25 → wizata_dsapi-2.2.0.dev27}/PKG-INFO

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

{wizata_dsapi-2.2.0.dev25 → wizata_dsapi-2.2.0.dev27}/wizata_dsapi/python_package.py

@@ -6,13 +6,13 @@ importable where a pipeline runs (runners, pipeline images, edges) under its ori
 dotted name, so models pickled against it load unchanged.
 
 PythonPackage — one package, named as pip names it: the name is normalised the pip way
-  (``XpertRef_Tools`` is ``xpertref-tools``). ``source`` says where its code comes from:
+  (``Plant_Models`` is ``plant-models``). ``source`` says where its code comes from:
 
   - ``upload``: pure-Python wheels uploaded one version at a time (option A);
   - ``git``: the ``packages/<name>/`` folder of the attached repository (option B), whose
     version is the commit a pipeline is read at.
 
-  ``import_names`` are the top-level modules it provides (``xpertref``). ``versions`` is
+  ``import_names`` are the top-level modules it provides (``plant_models``). ``versions`` is
   filled on read only.
 
 PythonPackageVersion — one uploaded wheel of an ``upload`` package. Immutable: a version is
@@ -30,7 +30,7 @@ from typing import List, Optional
 
 def normalize_python_package_name(name: str) -> str:
     """
-    A package name as pip compares it (PEP 503): ``XpertRef_Tools.v2`` -> ``xpertref-tools-v2``.
+    A package name as pip compares it (PEP 503): ``Plant_Models.v2`` -> ``plant-models-v2``.
     Validating it is the package client's job.
     """
     return re.sub(r"[-_.]+", "-", name).lower()
@@ -77,6 +77,8 @@ class PythonPackageVersion:
     :ivar str requires_python: the wheel's ``Requires-Python``.
     :ivar str uploaded_by: the user who uploaded it.
     :ivar datetime uploaded_at: when it was uploaded.
+    :ivar list used_by: keys of the stored pipelines that pin this version (filled on a
+        package read that asks for it; None when not read or not known).
     """
 
     def __init__(self, name: str = None, version: str = None, filename: str = None,
@@ -91,6 +93,7 @@ class PythonPackageVersion:
         self.requires_python: Optional[str] = requires_python
         self.uploaded_by: Optional[str] = None
         self.uploaded_at: Optional[datetime] = None
+        self.used_by: Optional[List[str]] = None
 
     def api_id(self) -> str:
         return f"{self.name}=={self.version}"
@@ -102,7 +105,7 @@ class PythonPackageVersion:
                            ("size", self.size), ("requiresDist", self.requires_dist),
                            ("requiresPython", self.requires_python),
                            ("uploadedBy", self.uploaded_by),
-                           ("uploadedAt", _ts_out(self.uploaded_at))):
+                           ("uploadedAt", _ts_out(self.uploaded_at)), ("usedBy", self.used_by)):
             if value is not None:
                 obj[key] = value
         return obj
@@ -116,6 +119,7 @@ class PythonPackageVersion:
                   requires_python=_first(data, "requiresPython", "requires_python"))
         obj.uploaded_by = _first(data, "uploadedBy", "uploaded_by")
         obj.uploaded_at = _ts_in(_first(data, "uploadedAt", "uploaded_at"))
+        obj.used_by = _first(data, "usedBy", "used_by")
         return obj
 
     def __repr__(self) -> str:
@@ -136,6 +140,10 @@ class PythonPackage:
     :ivar str problem: why it cannot be used, when it cannot (a git folder that does not
         compile, a name clash with the repository); set by the platform.
     :ivar list versions: its uploaded versions, newest first (filled on read only).
+    :ivar list used_by: keys of the stored pipelines that import it (filled on a package read
+        that asks for it; None when not read or not known).
+    :ivar str latest_version: its highest version (filled on search rows).
+    :ivar int version_count: how many versions it has (filled on search rows; 0 for a git one).
     """
 
     @classmethod
@@ -153,6 +161,9 @@ class PythonPackage:
         self.updated_at: Optional[datetime] = None
         self.problem: Optional[str] = None
         self.versions: Optional[List[PythonPackageVersion]] = None
+        self.used_by: Optional[List[str]] = None
+        self.latest_version: Optional[str] = None
+        self.version_count: Optional[int] = None
 
     def api_id(self) -> str:
         return self.name
@@ -167,7 +178,9 @@ class PythonPackage:
             else self.import_names
         for key, value in (("description", self.description), ("createdBy", self.created_by),
                            ("createdAt", _ts_out(self.created_at)),
-                           ("updatedAt", _ts_out(self.updated_at)), ("problem", self.problem)):
+                           ("updatedAt", _ts_out(self.updated_at)), ("problem", self.problem),
+                           ("usedBy", self.used_by), ("latestVersion", self.latest_version),
+                           ("versionCount", self.version_count)):
             if value is not None:
                 obj[key] = value
         if self.versions is not None:
@@ -185,6 +198,9 @@ class PythonPackage:
         obj.created_at = _ts_in(_first(data, "createdAt", "created_at"))
         obj.updated_at = _ts_in(_first(data, "updatedAt", "updated_at"))
         obj.problem = data.get("problem")
+        obj.used_by = _first(data, "usedBy", "used_by")
+        obj.latest_version = _first(data, "latestVersion", "latest_version")
+        obj.version_count = _first(data, "versionCount", "version_count")
         if data.get("versions") is not None:
             obj.versions = [PythonPackageVersion.from_dict(v) for v in data["versions"]]
         return obj

wizata_dsapi-2.2.0.dev27/wizata_dsapi/version.py

@@ -0,0 +1 @@
+__version__ = "2.2.0.dev27"

{wizata_dsapi-2.2.0.dev25 → wizata_dsapi-2.2.0.dev27}/wizata_dsapi/wizata_dsapi_client.py

@@ -1454,7 +1454,7 @@ class WizataDSAPIClient(ApiInterface, ApiDtoInterface):
                               description: str = None) -> PythonPackageVersion:
         """
         Upload a version of a Python package your pipelines import: the pure-Python wheel
-        ``python -m build --wheel`` makes (e.g. ``dist/xpertref-1.4.0-py3-none-any.whl``).
+        ``python -m build --wheel`` makes (e.g. ``dist/plant_models-1.4.0-py3-none-any.whl``).
         Its name, version and requirements come from the wheel; the package is created by
         its first upload. A version is immutable: a fix is a new version.
 
@@ -1466,7 +1466,7 @@ class WizataDSAPIClient(ApiInterface, ApiDtoInterface):
         if isinstance(wheel, (bytes, bytearray)):
             if not filename:
                 raise ValueError("give the wheel's file name with its bytes "
-                                 "(e.g. xpertref-1.4.0-py3-none-any.whl)")
+                                 "(e.g. plant_models-1.4.0-py3-none-any.whl)")
             data = bytes(wheel)
         else:
             path = str(wheel)

{wizata_dsapi-2.2.0.dev25 → wizata_dsapi-2.2.0.dev27}/wizata_dsapi.egg-info/PKG-INFO

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

wizata_dsapi-2.2.0.dev25/wizata_dsapi/version.py

@@ -1 +0,0 @@
-__version__ = "2.2.0.dev25"