wizata-dsapi 1.3.7__tar.gz → 1.3.9__tar.gz

{wizata_dsapi-1.3.7 → wizata_dsapi-1.3.9}/PKG-INFO

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

{wizata_dsapi-1.3.7 → wizata_dsapi-1.3.9}/setup.py

@@ -7,7 +7,8 @@ with open(ver_path) as ver_file:
     exec(ver_file.read(), main_ns)
 
 core_dependencies = [
-    'pandas==1.5.3; python_version<"3.12"',
+    'pandas==1.5.3; python_version<"3.11"',
+    'pandas==2.2.3; python_version>="3.11" and python_version<"3.12"',
     'pandas>=2.3.3; python_version>="3.12"',
     'numpy==1.26.4; python_version<"3.12"',
     'numpy>=2.3.3; python_version>="3.12"',
@@ -18,17 +19,17 @@ core_dependencies = [
     'msal>=1.34.0; python_version>="3.12"',
     'joblib==1.5.2; python_version<"3.12"',
     'joblib>=1.2.0; python_version>="3.12"',
-    'requests==2.28.2; python_version<"3.12"',
-    'requests>=2.32.5; python_version>="3.12"',
-    'setuptools==67.6.0; python_version<"3.12"',
-    'setuptools>=80.9.0; python_version>="3.12"',
+    'requests==2.28.2; python_version<"3.11"',
+    'requests>=2.32.5; python_version>="3.11"',
+    'setuptools==67.6.0; python_version<"3.11"',
+    'setuptools>=80.9.0; python_version>="3.11"',
     'plotly==5.13.1; python_version<"3.12"',
     'plotly>=6.3.1; python_version>="3.12"'
 ]
 
 ml_dependencies = [
-    'matplotlib==3.7.1; python_version<"3.12"',
-    'matplotlib>=3.10.6; python_version>="3.12"',
+    'matplotlib==3.7.1; python_version<"3.11"',
+    'matplotlib>=3.10.6; python_version>="3.11"',
     'tensorflow>=2.15.0; (sys_platform != "darwin" or platform_machine != "arm64") and python_version<"3.12"',
     'tensorflow-macos>=2.15.0; sys_platform == "darwin" and platform_machine == "arm64" and python_version<"3.12"',
     'tensorflow>=2.20.0; python_version>="3.12"',

{wizata_dsapi-1.3.7 → wizata_dsapi-1.3.9}/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-1.3.7 → wizata_dsapi-1.3.9}/wizata_dsapi/execution.py

@@ -1,5 +1,6 @@
 import json
 import uuid
+import sys
 from enum import Enum
 
 from .api_dto import ApiDto
@@ -147,6 +148,7 @@ class Execution(ApiDto):
     :ivar uuid.UUID twin_id: twin id registered on the template to run pipeline on.
     :ivar int waiting_time: duration of the waiting time in the queue.
     :ivar list warnings: list of error and/or warning messages.
+    :ivar version str: python version (major.minor) to use as target on runners, by default use current auto-detected version.
     """
 
     @classmethod
@@ -169,7 +171,8 @@ class Execution(ApiDto):
                  experiment_id: uuid.UUID = None,
                  twin_id: uuid.UUID = None,
                  template_id: uuid.UUID = None,
-                 trigger_id: uuid.UUID = None):
+                 trigger_id: uuid.UUID = None,
+                 version: str = None):
 
         self.execution_id = execution_id
 
@@ -199,6 +202,9 @@ class Execution(ApiDto):
         self.waiting_time = None
         self.warnings = None
         self.edge_device_id = None
+        self.version = version
+        if version is None:
+            self.version = f'{sys.version_info.major}.{sys.version_info.minor}'
 
         # Only accessible between Front-End and DS API (not backend)
         if properties is None:
@@ -265,6 +271,8 @@ class Execution(ApiDto):
             obj["warnings"] = self.warnings
         if self.status is not None and isinstance(self.status, ExecutionStatus):
             obj["status"] = self.status.value
+        if self.version is not None:
+            obj["version"] = self.version
         if self.edge_device_id is not None:
             obj["edgeDeviceId"] = self.edge_device_id
 
@@ -319,6 +327,8 @@ class Execution(ApiDto):
             self.warnings = obj["warnings"]
         if "status" in obj.keys():
             self.status = ExecutionStatus(str(obj["status"]))
+        if "version" in obj.keys() and obj["version"] is not None:
+            self.version = obj["version"]
         if "edgeDeviceId" in obj.keys() and obj["edgeDeviceId"] is not None:
             self.edge_device_id = obj["edgeDeviceId"]
 

wizata_dsapi-1.3.9/wizata_dsapi/version.py

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

{wizata_dsapi-1.3.7 → wizata_dsapi-1.3.9}/wizata_dsapi.egg-info/PKG-INFO

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

{wizata_dsapi-1.3.7 → wizata_dsapi-1.3.9}/wizata_dsapi.egg-info/requires.txt

@@ -1,23 +1,30 @@
 protobuf>=3.20.3
 
-[:python_version < "3.12"]
+[:python_version < "3.11"]
 pandas==1.5.3
+requests==2.28.2
+setuptools==67.6.0
+
+[:python_version < "3.12"]
 numpy==1.26.4
 dill==0.3.6
 msal==1.24.0
 joblib==1.5.2
-requests==2.28.2
-setuptools==67.6.0
 plotly==5.13.1
 
+[:python_version >= "3.11"]
+requests>=2.32.5
+setuptools>=80.9.0
+
+[:python_version >= "3.11" and python_version < "3.12"]
+pandas==2.2.3
+
 [:python_version >= "3.12"]
 pandas>=2.3.3
 numpy>=2.3.3
 dill==0.4.0
 msal>=1.34.0
 joblib>=1.2.0
-requests>=2.32.5
-setuptools>=80.9.0
 plotly>=6.3.1
 
 [all]
@@ -27,16 +34,18 @@ adtk==0.6.2
 [all:(sys_platform != "darwin" or platform_machine != "arm64") and python_version < "3.12"]
 tensorflow>=2.15.0
 
-[all:python_version < "3.12"]
+[all:python_version < "3.11"]
 pandas==1.5.3
+requests==2.28.2
+setuptools==67.6.0
+matplotlib==3.7.1
+
+[all:python_version < "3.12"]
 numpy==1.26.4
 dill==0.3.6
 msal==1.24.0
 joblib==1.5.2
-requests==2.28.2
-setuptools==67.6.0
 plotly==5.13.1
-matplotlib==3.7.1
 keras==2.15.0
 tensorflow_probability==0.15.0
 scikit-learn==1.2.2
@@ -52,16 +61,21 @@ pytest-cov==4.0.0
 shapely==2.0.1
 pyodbc==4.0.35
 
+[all:python_version >= "3.11"]
+requests>=2.32.5
+setuptools>=80.9.0
+matplotlib>=3.10.6
+
+[all:python_version >= "3.11" and python_version < "3.12"]
+pandas==2.2.3
+
 [all:python_version >= "3.12"]
 pandas>=2.3.3
 numpy>=2.3.3
 dill==0.4.0
 msal>=1.34.0
 joblib>=1.2.0
-requests>=2.32.5
-setuptools>=80.9.0
 plotly>=6.3.1
-matplotlib>=3.10.6
 tensorflow>=2.20.0
 keras>=3.11.3
 tensorflow_probability>=0.25.0

wizata_dsapi-1.3.7/wizata_dsapi/version.py

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