wizata-dsapi 1.2.19__py3-none-any.whl → 1.2.21__py3-none-any.whl

wizata_dsapi/datapoint.py

@@ -91,12 +91,22 @@ class Unit(ApiDto):
 
     def __init__(self,
                  unit_id: uuid.UUID = None,
-                 short_name: 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.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()
@@ -113,15 +123,34 @@ class Unit(ApiDto):
         if "id" in obj.keys():
             self.unit_id = uuid.UUID(obj["id"])
 
-        if "shortName" in obj.keys():
+        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.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/request.py

@@ -1,8 +1,5 @@
 import uuid
 from datetime import datetime, timedelta, timezone
-
-from reactivex.operators import group_by
-
 from .dataframe_toolkit import generate_epoch
 from .api_dto import ApiDto
 from .datapoint import BusinessType

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/version.py

@@ -1 +1 @@
-__version__ = "1.2.19"
+__version__ = "1.2.21"

{wizata_dsapi-1.2.19.dist-info → wizata_dsapi-1.2.21.dist-info}/METADATA

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

{wizata_dsapi-1.2.19.dist-info → wizata_dsapi-1.2.21.dist-info}/RECORD

@@ -6,7 +6,7 @@ wizata_dsapi/bucket.py,sha256=Zz9olv-pymikAutGitSuGWrAPiawOTW86JDDHG4ugTc,1150
 wizata_dsapi/business_label.py,sha256=u0TVfUNfoR9qSv8lzpf6rNjlg3G9xTiz6itefcKfeak,4151
 wizata_dsapi/context.py,sha256=M7hsvXoU0Bn_5ONDB-5VvjriMpno6bAgh0RrJ9Y-h7U,11600
 wizata_dsapi/dataframe_toolkit.py,sha256=22H4SizmhTQ1DNIzd6tg0izgncRDcrdkfGdBO6Vbi5g,9039
-wizata_dsapi/datapoint.py,sha256=jH8yLqr78XO7pSr1a4P8kmtFvpY0_0c16xyRi9OgZAQ,12677
+wizata_dsapi/datapoint.py,sha256=x900Aedrh92NUF03vXzh7rH7Pj1l10vXCSKXDwSNdiU,14268
 wizata_dsapi/datastore.py,sha256=BSHZmCSJ679boBA1eCkaWGJCy1CUeipKKGt2jDHzdVo,2663
 wizata_dsapi/ds_dataframe.py,sha256=Sk2JRUuTRJzko3HosJnbK34STpgSJUlqxLq8w_E5VM4,2089
 wizata_dsapi/dsapi_json_encoder.py,sha256=EhY1NA3-UQJ3HFYYbe7bvXb8NuhOvHVMJvXyGvX_T3k,2772
@@ -23,15 +23,15 @@ wizata_dsapi/pipeline.py,sha256=WDJeOxPZJiYW1qwTNZUm3jom2epIxqrSoiUwcrTF9EE,3130
 wizata_dsapi/pipeline_deployment.py,sha256=grekBaxUK0EhL9w7lDB8vNuW_wzLnHVm9Mq8Lkbkguk,1722
 wizata_dsapi/pipeline_image.py,sha256=M3FOr45dJIAEvsmXPpMD8JZ09k5-YpW9PRYEWJqptcI,5272
 wizata_dsapi/plot.py,sha256=SPGKFWWYNcRvHcqvvnPIIIBKsd5UwhdsxLW7b2dG2rs,2360
-wizata_dsapi/request.py,sha256=g6iAjASGW1e-oM7rLbkMwBFoMNLWe5A4S3zM6xLwoCU,26558
+wizata_dsapi/request.py,sha256=qHh1-DQri2Vh17069fHmLlrF5vjNTvA4jmD6mYjg2w8,26515
 wizata_dsapi/script.py,sha256=DeEciwVpuCYZetgJCoivw_bYe8ma52WuTaTQ_VkLEcg,12930
 wizata_dsapi/solution_component.py,sha256=8gbZWx2h_xUqI_pAXa3goqAnR5Y-GDMii8MeGlaK1IE,9531
 wizata_dsapi/streamlit_utils.py,sha256=sXBdygktbixV828Zg01Nl27_a4F8zGFc4RY0C8g-1bc,1942
-wizata_dsapi/template.py,sha256=h2f3dLduJ4WhreVxJXuFIB3pinnI3c39WxBms0bCgos,13007
+wizata_dsapi/template.py,sha256=kjfzOgS_ngUMjmptsdmo9xFQp5chEjEuz1xGXW_5FUI,13282
 wizata_dsapi/trigger.py,sha256=w3BZYP-L3SUwvaT0oCTanh_Ewn57peZvlt7vxzHv9J8,5129
 wizata_dsapi/twin.py,sha256=S0DUzQf1smZXZTdXpXZPtkZYCfKIhw53EecCnsl9i4Q,11017
 wizata_dsapi/twinregistration.py,sha256=Mi6-YuwroiEXc0c1hgrOaphh4hNVoHupxOnXedVtJtE,13377
-wizata_dsapi/version.py,sha256=vBqPpUxy9sFZkDmAAvQCrIqAA_ye7foz7jV5SkuJi0I,23
+wizata_dsapi/version.py,sha256=3uF8dV6igE_qWszFViblw_rtJOgCwoi-rVuWcQrSR0A,23
 wizata_dsapi/wizard_function.py,sha256=RbM7W7Gf-6Rhp_1dU9DBYkHaciknGAGvuAndhAS_vyo,942
 wizata_dsapi/wizard_request.py,sha256=v6BaqKLKvTWmUSo0_gda9FabAQz5x_-GOH1Av50GzFo,3762
 wizata_dsapi/wizata_dsapi_client.py,sha256=6URQeMA5A9eXxC2cs8TUbKolmOo-Kj6kII9NmRRITPQ,78702
@@ -42,8 +42,8 @@ wizata_dsapi/plots/__init__.py,sha256=qgnSFqrjOPur-807M8uh5awIfjM1ZHXUXcAqHc-r2l
 wizata_dsapi/plots/common.py,sha256=jdPsJqLHBwSKc6dX83BSGPqSRxzIVNHSYO5yI_8sjGk,6568
 wizata_dsapi/scripts/__init__.py,sha256=hAxiETSQf0qOHde1si1tEAJU48seqEgHrchCzS2-LvQ,80
 wizata_dsapi/scripts/common.py,sha256=efwq-Rd0lvYljIs3gSFz9izogBD7asOU2cTK-IvHTkM,4244
-wizata_dsapi-1.2.19.dist-info/LICENSE.txt,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
-wizata_dsapi-1.2.19.dist-info/METADATA,sha256=7sKZQuOlsAtq5lgTpnOnu-HN32AGIjUo4azxIny89eM,2188
-wizata_dsapi-1.2.19.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-wizata_dsapi-1.2.19.dist-info/top_level.txt,sha256=-OeTJbEnh5DuWyTOHtvw0Dw3LRg3G27TNS6W4ZtfwPs,13
-wizata_dsapi-1.2.19.dist-info/RECORD,,
+wizata_dsapi-1.2.21.dist-info/LICENSE.txt,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
+wizata_dsapi-1.2.21.dist-info/METADATA,sha256=lt1a6UtgxNFgZocKKPrVih7wiCXlj1YJTwUp6N074nk,2188
+wizata_dsapi-1.2.21.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+wizata_dsapi-1.2.21.dist-info/top_level.txt,sha256=-OeTJbEnh5DuWyTOHtvw0Dw3LRg3G27TNS6W4ZtfwPs,13
+wizata_dsapi-1.2.21.dist-info/RECORD,,