wizata-dsapi 1.2.25__py3-none-any.whl → 1.2.27__py3-none-any.whl

wizata_dsapi/dataframe_toolkit.py

@@ -148,7 +148,7 @@ def df_from_dict(df_dict: dict) -> pandas.DataFrame:
                     raise ValueError('if using a multi-line dataframe please provide a Timestamp column')
 
     if "Timestamp" not in df_dict:
-        df_dict["Timestamp"] = [datetime.utcnow()]
+        df_dict["Timestamp"] = [datetime.now(timezone.utc)]
     else:
         timestamp_col = []
         for timestamp_ms in df_dict["Timestamp"]:
@@ -208,7 +208,7 @@ def verify_relative_datetime(formatted_string: str) -> bool:
 def generate_epoch(formatted_string: str, now=None):
     """
     generate an epoch based on a formatted string (e.g. now+6h) - see documentation.
-    * now = datetime.utcnow() can be override
+    * now = datetime.now(timezone.utc) can be override
     * units = 'y' = 365d, 'M'=30d , 'w'=7d , 'd'=24h , 'h'=60m, 'm'=60s , 's'=1000'ms'
     * operators = '+' or '-'
     :param formatted_string: formatted epoch representation using relative time.
@@ -216,7 +216,7 @@ def generate_epoch(formatted_string: str, now=None):
     :return: epoch in ms.
     """
     if now is None:
-        now = datetime.utcnow()
+        now = datetime.now(timezone.utc)
 
     pattern = r'^now([+-]\d+([yMwdHhms]{1,2}))?$'
     match = re.match(pattern, formatted_string)
@@ -274,5 +274,5 @@ def generate_unique_key() -> str:
         - 11 char for 'animal_'
         - 3 car for number XXX
     """
-    return f"{datetime.now().strftime('%y%m%d')}_{random.choice(colors).lower()}_" \
+    return f"{datetime.now(timezone.utc).strftime('%y%m%d')}_{random.choice(colors).lower()}_" \
            f"{random.choice(animals).lower()}_{random.randint(1, 999)}"

wizata_dsapi/request.py

@@ -355,6 +355,36 @@ class Request(ApiDto):
         else:
             return
 
+    def set_twin(self, twin):
+        """
+        set a twin properly (str hardware Id or uuid.UUID)
+        :param twin:
+        :return:
+        """
+        if self.template is None:
+            self.template = {}
+        if isinstance(twin, uuid.UUID):
+            self.template['twin_id'] = twin
+        elif isinstance(twin, str):
+            self.template['twin_hardware_id'] = twin
+        else:
+            raise TypeError('twin must be str or uuid on request')
+
+    def set_template(self, template):
+        """
+        set a template properly (str key or uuid.UUID)
+        :param template:
+        :return:
+        """
+        if self.template is None:
+            self.template = {}
+        if isinstance(template, uuid.UUID):
+            self.template['template_id'] = template
+        elif isinstance(template, str):
+            self.template['template_key'] = template
+        else:
+            raise TypeError('template must be str or uuid on request')
+
     def __format_date(self, dt_to_format):
         if isinstance(dt_to_format, datetime):
             millisec = dt_to_format.timestamp() * 1000
@@ -468,22 +498,27 @@ class Request(ApiDto):
         else:
             self.template = {}
 
-            if template_id is not None:
+            template = None
+            if template_key is not None:
+                template = template_key
+            elif template_id is not None:
                 if isinstance(template_id, uuid.UUID):
-                    self.template['template_id'] = template_id
+                    template = template_id
                 else:
-                    self.template['template_id'] = uuid.UUID(template_id)
-            elif template_key is not None:
-                self.template['template_key'] = str(template_key)
-
-            if twin_id is not None:
+                    template = uuid.UUID(template_id)
+            if template is not None:
+                self.set_template(template=template)
+
+            twin = None
+            if twin_hardware_id is not None:
+                twin = twin_hardware_id
+            elif twin_id is not None:
                 if isinstance(twin_id, uuid.UUID):
-                    self.template['twin_id'] = twin_id
+                    twin = twin_id
                 else:
-                    self.template['twin_id'] = uuid.UUID(twin_id)
-
-            elif twin_hardware_id is not None:
-                self.template['twin_hardware_id'] = str(twin_hardware_id)
+                    twin = uuid.UUID(twin_id)
+            if twin is not None:
+                self.set_twin(twin=twin)
 
     def get_params(self):
         """

wizata_dsapi/version.py

@@ -1 +1 @@
-__version__ = "1.2.25"
+__version__ = "1.2.27"

wizata_dsapi/wizata_dsapi_client.py

@@ -662,11 +662,11 @@ class WizataDSAPIClient(ApiInterface):
 
         request.set_aggregation(agg_method, interval)
 
-        if template is not None or twin is not None:
-            request.select_template(
-                template_key=template,
-                twin_hardware_id=twin
-            )
+        if twin is not None:
+            request.set_twin(twin)
+
+        if template is not None:
+            request.set_template(template)
 
         if filters is not None:
             request.filters = filters

{wizata_dsapi-1.2.25.dist-info → wizata_dsapi-1.2.27.dist-info}/METADATA

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

{wizata_dsapi-1.2.25.dist-info → wizata_dsapi-1.2.27.dist-info}/RECORD

@@ -5,7 +5,7 @@ wizata_dsapi/api_interface.py,sha256=DURk-0ey16T8sV5e2Y2G_YybPEusJvZuY0oD5L7AnXo
 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/dataframe_toolkit.py,sha256=7D8JrhsFSGXeO3mRAd2e2cLmdjbXRjk04IuaMG8F974,9078
 wizata_dsapi/datapoint.py,sha256=UUatqzWMwC4ucM6HdeQDWtLS4fGqEsDABCNVmxoP5Hg,14635
 wizata_dsapi/datastore.py,sha256=BSHZmCSJ679boBA1eCkaWGJCy1CUeipKKGt2jDHzdVo,2663
 wizata_dsapi/ds_dataframe.py,sha256=Sk2JRUuTRJzko3HosJnbK34STpgSJUlqxLq8w_E5VM4,2089
@@ -23,7 +23,7 @@ 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=qHh1-DQri2Vh17069fHmLlrF5vjNTvA4jmD6mYjg2w8,26515
+wizata_dsapi/request.py,sha256=W4E1BHacQdJiBLPI96yVeHz41rbfFuGrbuw1U60L_DM,27560
 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
@@ -31,10 +31,10 @@ wizata_dsapi/template.py,sha256=wtCRKKk3PchH4RrNgNYlEF_9C6bzZwKIeLyEvgv6Fdo,1370
 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=9j001fhDZzLSWs6YCbGQFuK5ERX5EUWz3RKLN8l5JS8,23
+wizata_dsapi/version.py,sha256=JKArgvnX6ljUI_WxYnXTejXGdjsA4KJ3Cy2xBcK4vh4,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
+wizata_dsapi/wizata_dsapi_client.py,sha256=kos_8j47CBXiy6y6b_H2yDUe3aWh76diEmWjCisYKkY,78662
 wizata_dsapi/words.py,sha256=tV8CqzCqODZCV7PgBxBF5exBxeF_ya9t5DiUy-cg6Sg,1535
 wizata_dsapi/models/__init__.py,sha256=O5PHqw8lKILw4apO-MfDxPz73wK0vADD9y3xjuzX7Tw,104
 wizata_dsapi/models/common.py,sha256=1dTqE80-mFJnUwEdNlJdhJzfZ2N5Kp8Nb3LQ8uwPtLc,3808
@@ -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.25.dist-info/LICENSE.txt,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
-wizata_dsapi-1.2.25.dist-info/METADATA,sha256=hWT2ESQIOnGzoOoXklVARi5LoeEYuL0Sf0IKCU60_YM,2188
-wizata_dsapi-1.2.25.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-wizata_dsapi-1.2.25.dist-info/top_level.txt,sha256=-OeTJbEnh5DuWyTOHtvw0Dw3LRg3G27TNS6W4ZtfwPs,13
-wizata_dsapi-1.2.25.dist-info/RECORD,,
+wizata_dsapi-1.2.27.dist-info/LICENSE.txt,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
+wizata_dsapi-1.2.27.dist-info/METADATA,sha256=idjFas_BsW1WjABbd60xyTwUAh0JWIkhvafZWvg6PS8,2188
+wizata_dsapi-1.2.27.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+wizata_dsapi-1.2.27.dist-info/top_level.txt,sha256=-OeTJbEnh5DuWyTOHtvw0Dw3LRg3G27TNS6W4ZtfwPs,13
+wizata_dsapi-1.2.27.dist-info/RECORD,,