wizata-dsapi 2.1.0.dev8__tar.gz → 2.1.0.dev10__tar.gz

{wizata_dsapi-2.1.0.dev8 → wizata_dsapi-2.1.0.dev10}/PKG-INFO

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

{wizata_dsapi-2.1.0.dev8 → wizata_dsapi-2.1.0.dev10}/wizata_dsapi/context.py

@@ -68,6 +68,13 @@ class Context(ILogger):
         self.pipeline_id = pipeline_id
         self.execution_id = execution_id
         self.experiment_id = experiment_id
+        # Git ref the pipeline body was loaded at (DEV-5895): sha is the exact
+        # commit that ran (stamped on the ExecutionLog, DEV-5950), branch is the
+        # targeted branch when any. RAW-script resolution reads scripts/<name>.py
+        # from git at this sha so a branch run executes the branch's script
+        # version — not the Postgres "current" one. Left None off the git path.
+        self.branch = None
+        self.sha = None
         self.template = template
         self.registration = registration
         self.now = now

{wizata_dsapi-2.1.0.dev8 → wizata_dsapi-2.1.0.dev10}/wizata_dsapi/twin.py

@@ -14,6 +14,31 @@ def is_valid_hex_color(color):
         return True
 
 
+def parse_color(color):
+    """
+    Normalize a colour coming from a payload or a constructor (DEV-5970).
+
+    A BLANK value means "no colour", not an invalid one: the platform's own
+    .NET side stores `""` on twins it creates, and because this validation runs
+    on the READ path (`from_json`) a single such row used to raise and make
+    `GET /dsapi/twins/` fail for the WHOLE collection.
+
+    Anything else non-blank is still validated and still raises, because
+    `from_json` is also the write path (`POST` / `PUT /dsapi/twins/` validate
+    nowhere else) — a colour typed as `red` must remain a 400.
+
+    :param color: raw colour value or None.
+    :return: the colour string, or None when absent/blank.
+    """
+    if color is None:
+        return None
+    color = str(color)
+    if color.strip() == '':
+        return None
+    is_valid_hex_color(color)
+    return color
+
+
 class TwinType(ApiDto):
     """
     twin type
@@ -41,9 +66,7 @@ class TwinType(ApiDto):
             self.twin_type_id = twin_type_id
         self.name = name
         self.icon = icon
-        self.color = color
-        if color is not None:
-            is_valid_hex_color(color)
+        self.color = parse_color(color)
         self.description = description
         self.createdById = None
         self.createdDate = None
@@ -62,8 +85,7 @@ class TwinType(ApiDto):
         if "name" in obj.keys() and obj["name"] is not None:
             self.name = obj["name"]
         if "color" in obj.keys() and obj["color"] is not None:
-            is_valid_hex_color(str(obj["color"]))
-            self.color = str(obj["color"])
+            self.color = parse_color(obj["color"])
         if "icon" in obj.keys() and obj["icon"] is not None:
             self.icon = str(obj["icon"])
         if "description" in obj.keys() and obj["description"] is not None:
@@ -185,9 +207,7 @@ class Twin(ApiDto):
         self.longitude = longitude
         self.latitude_id = latitude_id
         self.longitude_id = longitude_id
-        if color is not None:
-            is_valid_hex_color(color)
-        self.color = color
+        self.color = parse_color(color)
         self.icon = icon
         self.extra_properties = extra_properties
         self.is_asset = is_asset
@@ -229,8 +249,7 @@ class Twin(ApiDto):
         if "longitudeSensorId" in obj.keys() and obj["longitudeSensorId"] is not None:
             self.longitude_id = uuid.UUID(obj["longitudeSensorId"])
         if "color" in obj.keys() and obj["color"] is not None:
-            is_valid_hex_color(str(obj["color"]))
-            self.color = str(obj["color"])
+            self.color = parse_color(obj["color"])
         if "icon" in obj.keys() and obj["icon"] is not None:
             self.icon = str(obj["icon"])
         if "description" in obj.keys() and obj["description"] is not None:

wizata_dsapi-2.1.0.dev10/wizata_dsapi/version.py

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

{wizata_dsapi-2.1.0.dev8 → wizata_dsapi-2.1.0.dev10}/wizata_dsapi.egg-info/PKG-INFO

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

wizata_dsapi-2.1.0.dev8/wizata_dsapi/version.py

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