wizata-dsapi 1.2.20__tar.gz → 1.2.22__tar.gz

{wizata_dsapi-1.2.20 → wizata_dsapi-1.2.22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wizata_dsapi
-Version: 1.2.20
+Version: 1.2.22
 Summary: Wizata Data Science Toolkit
 Author: Wizata S.A.
 Author-email: info@wizata.com

{wizata_dsapi-1.2.20 → wizata_dsapi-1.2.22}/wizata_dsapi/datapoint.py

@@ -91,12 +91,24 @@ class Unit(ApiDto):
 
     def __init__(self,
                  unit_id: uuid.UUID = None,
-                 short_name: str = None):
+                 symbol: str = None,
+                 short_name: str = None,
+                 full_name: str = None,
+                 category_id: uuid.UUID = None,
+                 is_canonical: bool = False,
+                 from_canonical: str = None,
+                 to_canonical: str = None):
         if unit_id is None:
             self.unit_id = uuid.uuid4()
         else:
             self.unit_id = unit_id
+        self.symbol = symbol
         self.short_name = short_name
+        self.full_name = full_name
+        self.category_id = category_id
+        self.is_canonical = is_canonical
+        self.from_canonical = from_canonical
+        self.to_canonical = to_canonical
 
     def api_id(self) -> str:
         return str(self.unit_id).upper()
@@ -112,16 +124,38 @@ class Unit(ApiDto):
         """
         if "id" in obj.keys():
             self.unit_id = uuid.UUID(obj["id"])
-
-        if "shortName" in obj.keys():
+        if "symbol" in obj.keys():
+            self.symbol = obj["symbol"]
+        if "shortName" in obj.keys() and obj["shortName"] is not None:
             self.short_name = obj["shortName"]
+        if "fullName" in obj.keys() and obj["fullName"] is not None:
+            self.full_name = obj["fullName"]
+        if "isCanonical" in obj.keys() and obj["isCanonical"] is not None:
+            self.is_canonical = obj["isCanonical"]
+        if "categoryId" in obj.keys() and obj["categoryId"] is not None:
+            self.category_id = uuid.UUID(obj["categoryId"])
+        if "fromCanonical" in obj.keys() and obj["fromCanonical"] is not None:
+            self.from_canonical = obj["fromCanonical"]
+        if "toCanonical" in obj.keys() and obj["toCanonical"] is not None:
+            self.to_canonical = obj["toCanonical"]
 
     def to_json(self, target: str = None):
         obj = {
-            "id": str(self.unit_id)
+            "id": str(self.unit_id),
+            "isCanonical": self.is_canonical
         }
+        if self.symbol is not None and self.symbol != '':
+            obj["symbol"] = self.symbol
         if self.short_name is not None and self.short_name != '':
             obj["shortName"] = self.short_name
+        if self.short_name is not None and self.short_name != '':
+            obj["fullName"] = self.short_name
+        if self.category_id is not None:
+            obj["categoryId"] = str(self.category_id)
+        if self.from_canonical is not None and self.from_canonical != '':
+            obj["fromCanonical"] = self.from_canonical
+        if self.to_canonical is not None and self.to_canonical != '':
+            obj["toCanonical"] = self.to_canonical
         return obj
 
 

{wizata_dsapi-1.2.20 → wizata_dsapi-1.2.22}/wizata_dsapi/template.py

@@ -36,7 +36,8 @@ class TemplateProperty(ApiDto):
                  description: str = None,
                  p_type: VarType = None,
                  required: bool = True,
-                 template_id: uuid.UUID = None):
+                 template_id: uuid.UUID = None,
+                 unit_id: uuid.UUID = None):
         if template_property_id is None:
             self.template_property_id = uuid.uuid4()
         else:
@@ -46,6 +47,7 @@ class TemplateProperty(ApiDto):
         self.name = name
         self.p_type = p_type
         self.required = required
+        self.unit_id = unit_id
         self.createdById = None
         self.createdDate = None
         self.updatedById = None
@@ -82,6 +84,8 @@ class TemplateProperty(ApiDto):
             self.updatedById = obj["updatedById"]
         if "updatedDate" in obj.keys() and obj["updatedDate"] is not None:
             self.updatedDate = obj["updatedDate"]
+        if "unitId" in obj.keys() and obj["unitId"] is not None:
+            self.unit_id = uuid.UUID(obj["unitId"])
 
     def to_json(self, target: str = None):
         obj = {
@@ -99,6 +103,8 @@ class TemplateProperty(ApiDto):
             obj["required"] = self.required
         if self.template_id is not None:
             obj["templateId"] = str(self.template_id)
+        if self.unit_id is not None:
+            obj["unitId"] = str(self.unit_id)
         if self.createdById is not None:
             obj["createdById"] = str(self.createdById)
         if self.createdDate is not None:

wizata_dsapi-1.2.22/wizata_dsapi/version.py

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

{wizata_dsapi-1.2.20 → wizata_dsapi-1.2.22}/wizata_dsapi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wizata-dsapi
-Version: 1.2.20
+Version: 1.2.22
 Summary: Wizata Data Science Toolkit
 Author: Wizata S.A.
 Author-email: info@wizata.com

wizata_dsapi-1.2.20/wizata_dsapi/version.py

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