wizata-dsapi 2.1.0.dev19__tar.gz → 2.1.0.dev20__tar.gz

{wizata_dsapi-2.1.0.dev19 → wizata_dsapi-2.1.0.dev20}/PKG-INFO

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

wizata_dsapi-2.1.0.dev20/wizata_dsapi/version.py

@@ -0,0 +1 @@
+__version__ = "2.1.0.dev20"

{wizata_dsapi-2.1.0.dev19 → wizata_dsapi-2.1.0.dev20}/wizata_dsapi/wizata_dsapi_client.py

@@ -1209,6 +1209,38 @@ class WizataDSAPIClient(ApiInterface, ApiDtoInterface):
             raise ValueError("a pipeline key, UUID or Pipeline is required")
         return urllib.parse.quote(str(reference), safe="")
 
+    def _pipeline_uuid(self, pipeline) -> str:
+        """
+        Path segment for a route that addresses a pipeline by UUID only.
+
+        Distinct from :meth:`_pipeline_ref`, and the difference is not cosmetic: the
+        live-plot route resolves a key OR a UUID (DEV-6027), while the branch, deploy
+        and preview routes parse the segment with ``uuid.UUID(id)`` and answer
+        ``400 badly formed hexadecimal UUID string`` for a key.
+
+        Callers hold keys — that is what a pipeline is called everywhere a person
+        reads one — so the key is resolved here rather than refused.
+
+        :param pipeline: pipeline key, UUID or Pipeline.
+        :return: the pipeline's UUID as a path segment.
+        """
+        if isinstance(pipeline, Pipeline):
+            if pipeline.pipeline_id is not None:
+                return str(pipeline.pipeline_id)
+            pipeline = pipeline.key
+        if pipeline is None:
+            raise ValueError("a pipeline key, UUID or Pipeline is required")
+        if isinstance(pipeline, uuid.UUID):
+            return str(pipeline)
+        try:
+            return str(uuid.UUID(str(pipeline)))
+        except (ValueError, AttributeError, TypeError):
+            pass
+        resolved = self.get(pipeline_key=str(pipeline))
+        if resolved is None or resolved.pipeline_id is None:
+            raise ValueError(f"pipeline {pipeline!r} could not be resolved to an id")
+        return str(resolved.pipeline_id)
+
     def deployed_plots(self, pipeline, twin: str = None) -> list:
         """
         list a deployed pipeline's LIVE plots - what its deployments are currently
@@ -2088,7 +2120,7 @@ class WizataDSAPIClient(ApiInterface, ApiDtoInterface):
         """
         response = self._process_request(
             method="GET",
-            route=f"{Pipeline.route()}/{self._pipeline_ref(pipeline)}/branches/"
+            route=f"{Pipeline.route()}/{self._pipeline_uuid(pipeline)}/branches/"
         )
         return response.json()
 
@@ -2109,7 +2141,7 @@ class WizataDSAPIClient(ApiInterface, ApiDtoInterface):
             payload["source"] = source
         response = self._process_request(
             method="POST",
-            route=f"{Pipeline.route()}/{self._pipeline_ref(pipeline)}/branches/",
+            route=f"{Pipeline.route()}/{self._pipeline_uuid(pipeline)}/branches/",
             data=json.dumps(payload)
         )
         return Pipeline.from_dict(response.json())
@@ -2127,7 +2159,7 @@ class WizataDSAPIClient(ApiInterface, ApiDtoInterface):
         """
         self._process_request(
             method="DELETE",
-            route=f"{Pipeline.route()}/{self._pipeline_ref(pipeline)}/branches/{branch}/"
+            route=f"{Pipeline.route()}/{self._pipeline_uuid(pipeline)}/branches/{branch}/"
         )
 
     def merge_branch(self, pipeline, branch: str) -> dict:
@@ -2140,7 +2172,7 @@ class WizataDSAPIClient(ApiInterface, ApiDtoInterface):
         """
         response = self._process_request(
             method="POST",
-            route=f"{Pipeline.route()}/{self._pipeline_ref(pipeline)}/branches/{branch}/merge"
+            route=f"{Pipeline.route()}/{self._pipeline_uuid(pipeline)}/branches/{branch}/merge"
         )
         return response.json()
 
@@ -2154,7 +2186,7 @@ class WizataDSAPIClient(ApiInterface, ApiDtoInterface):
         """
         response = self._process_request(
             method="GET",
-            route=f"{Pipeline.route()}/{self._pipeline_ref(pipeline)}/branches/{branch}/"
+            route=f"{Pipeline.route()}/{self._pipeline_uuid(pipeline)}/branches/{branch}/"
         )
         return Pipeline.from_dict(response.json())
 
@@ -2239,7 +2271,7 @@ class WizataDSAPIClient(ApiInterface, ApiDtoInterface):
                 payload[name] = value
         response = self._process_request(
             method="POST",
-            route=f"{Pipeline.route()}/{self._pipeline_ref(pipeline)}/deploy/",
+            route=f"{Pipeline.route()}/{self._pipeline_uuid(pipeline)}/deploy/",
             data=json.dumps(payload)
         )
         return Deployment.from_dict(response.json())
@@ -2258,7 +2290,7 @@ class WizataDSAPIClient(ApiInterface, ApiDtoInterface):
         payload = {k: v for k, v in kwargs.items() if v is not None}
         response = self._process_request(
             method="POST",
-            route=f"{Pipeline.route()}/{self._pipeline_ref(pipeline)}/deploy/preview/",
+            route=f"{Pipeline.route()}/{self._pipeline_uuid(pipeline)}/deploy/preview/",
             data=json.dumps(payload)
         )
         return response.json()

{wizata_dsapi-2.1.0.dev19 → wizata_dsapi-2.1.0.dev20}/wizata_dsapi.egg-info/PKG-INFO

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

wizata_dsapi-2.1.0.dev19/wizata_dsapi/version.py

@@ -1 +0,0 @@
-__version__ = "2.1.0.dev19"