wizata-dsapi 2.0.1__tar.gz → 2.1.0.dev2__tar.gz

{wizata_dsapi-2.0.1/wizata_dsapi.egg-info → wizata_dsapi-2.1.0.dev2}/PKG-INFO

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

{wizata_dsapi-2.0.1 → wizata_dsapi-2.1.0.dev2}/wizata_dsapi/pipeline.py

@@ -588,6 +588,10 @@ class Pipeline(ApiDto):
         self.createdDate = None
         self.updatedById = None
         self.updatedDate = None
+        # Transient: which branch/ref this DTO was read from. The server
+        # sets it in responses so the FE knows where edits will land; clients
+        # are free to omit it on writes (the URL path carries the branch).
+        self.branch = None
         self.plots = plots
         if plots is None:
             self.plots = []
@@ -956,12 +960,20 @@ class Pipeline(ApiDto):
             self.updatedById = obj["updatedById"]
         if "updatedDate" in obj.keys() and obj["updatedDate"] is not None:
             self.updatedDate = obj["updatedDate"]
+        # Transient: only relevant on reads. Ignored if absent.
+        if "branch" in obj.keys() and obj["branch"] is not None:
+            self.branch = str(obj["branch"])
 
     def to_json(self, target: str = None):
         """
         Convert to a json version of Execution definition.
-        By default, use DS API format.
+        By default, use DS API format (steps/plots/variables are stringified
+        JSON, matching the C# backend SQL column shape).
+        target="git" emits steps/plots/variables as nested JSON instead, so
+        git-stored pipeline files have human-readable diffs and merge cleanly.
+        from_json() accepts both forms transparently.
         """
+        as_git = target == "git"
         obj = {
             "id": str(self.pipeline_id)
         }
@@ -972,12 +984,12 @@ class Pipeline(ApiDto):
             step: PipelineStep
             for step in self.steps:
                 obj_steps.append(step.to_json())
-            obj["steps"] = json.dumps(obj_steps)
+            obj["steps"] = obj_steps if as_git else json.dumps(obj_steps)
         if self.plots is not None:
-            obj["plots"] = json.dumps(self.plots)
+            obj["plots"] = list(self.plots) if as_git else json.dumps(self.plots)
         if self.variables is not None:
             self.check_variables()
-            obj["variables"] = json.dumps(self.variables)
+            obj["variables"] = dict(self.variables) if as_git else json.dumps(self.variables)
         if self.template_id is not None:
             obj["templateId"] = str(self.template_id)
         if self.experiment_id is not None:
@@ -990,6 +1002,10 @@ class Pipeline(ApiDto):
             obj["updatedById"] = str(self.updatedById)
         if self.updatedDate is not None:
             obj["updatedDate"] = str(self.updatedDate)
+        # Server-set transient — only useful on responses. Omitted from the
+        # git-store payload so we don't add noise into committed JSON.
+        if not as_git and self.branch is not None:
+            obj["branch"] = self.branch
         return obj
 
     def _save_related_entities(self, obj: dict) -> dict:

{wizata_dsapi-2.0.1 → wizata_dsapi-2.1.0.dev2}/wizata_dsapi/pipeline_image.py

@@ -68,16 +68,28 @@ class PipelineImage(ApiDto):
         if self.pipeline_image_id is None:
             raise ValueError(f'pipeline_image_id cannot be None')
 
+        # Old format: {datetime}.v{ver}.{key}
+        # New format: {datetime}.v{ver}.{key}.{git_sha_short}
+        # Pipeline keys are constrained to [A-Za-z0-9_-]{1,32} (no dots), so a
+        # third dot unambiguously separates the key from the optional SHA.
         first_dot = self.pipeline_image_id.index('.')
         second_dot = self.pipeline_image_id.index('.', first_dot + 1)
+        third_dot = self.pipeline_image_id.find('.', second_dot + 1)
 
         datetime_part = self.pipeline_image_id[:first_dot]
         version_part = self.pipeline_image_id[first_dot + 1:second_dot].replace('_', '.')[1:]
-        key_part = self.pipeline_image_id[second_dot + 1:]
+        if third_dot == -1:
+            key_part = self.pipeline_image_id[second_dot + 1:]
+            git_sha = None
+        else:
+            key_part = self.pipeline_image_id[second_dot + 1:third_dot]
+            git_sha = self.pipeline_image_id[third_dot + 1:] or None
+
         return {
             'datetime': int(datetime.strptime(datetime_part, '%Y%m%d%H%M%S').replace(tzinfo=pytz.UTC).timestamp() * 1000),
             'version': version_part,
-            'key': key_part
+            'key': key_part,
+            'git_sha': git_sha,
         }
 
     def to_json(self, target: str = None):
@@ -146,12 +158,17 @@ class PipelineImage(ApiDto):
                 base_name = json_file[:-5]
                 pkl_file = base_name + '.pkl'
 
+                script = Script.from_dict(json.loads(g_files[json_file]))
                 if pkl_file in script_files:
-                    script = Script.from_dict(json.loads(g_files[json_file]))
+                    # API scripts: pkl carries the dill-serialised callable.
                     script.function = Script.load_function_from_dill(g_files[pkl_file])
-                    image.scripts.append(script)
+                elif script.script_type == wizata_dsapi.ScriptType.RAW:
+                    # RAW scripts: the python source rides in the JSON; no pkl
+                    # is expected. Runtime path compiles script.source on use.
+                    pass
                 else:
                     raise KeyError(f"missing pkl for script json {json_file}")
+                image.scripts.append(script)
 
             for pkl_file in pkl_files:
                 base_name = pkl_file[:-4]

wizata_dsapi-2.1.0.dev2/wizata_dsapi/version.py

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

{wizata_dsapi-2.0.1 → wizata_dsapi-2.1.0.dev2/wizata_dsapi.egg-info}/PKG-INFO

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

wizata_dsapi-2.0.1/wizata_dsapi/version.py

@@ -1 +0,0 @@
-__version__ = "2.0.1"