wizata-dsapi 1.4.0.dev5__py3-none-any.whl → 1.4.0.dev8__py3-none-any.whl

wizata_dsapi/execution_log.py

@@ -5,6 +5,7 @@ from .twin import Twin
 from .template import Template
 from .twinregistration import TwinRegistration
 from .execution import ExecutionStatus
+from typing import Optional, Union
 import uuid
 import sys
 import json
@@ -49,7 +50,7 @@ class ExecutionLog(Dto):
             properties = json.loads(properties)
 
         return cls(
-            execution_id=uuid.UUID(data["id"]) if "id" in data else None,
+            execution_id=uuid.UUID(data["id"]) if "id" in data and not isinstance(data["id"], int) else None,
             experiment=data.get("experiment"),
             pipeline=data.get("pipeline") if "pipeline" in data else uuid.UUID(data.get("pipelineId")) if "pipelineId" in data else None,
             template=data.get("template") if "template" in data else uuid.UUID(data.get("templateId")) if "templateId" in data else None,
@@ -68,11 +69,11 @@ class ExecutionLog(Dto):
 
     def __init__(self,
                  execution_id: uuid.UUID = None,
-                 experiment: str|uuid.UUID|Experiment = None,
-                 pipeline: str|uuid.UUID|Pipeline = None,
-                 twin: str|uuid.UUID|Twin = None,
-                 template: str|uuid.UUID|Template = None,
-                 registration: uuid.UUID|TwinRegistration = None,
+                 experiment: Optional[Union[str, uuid.UUID, Experiment]] = None,
+                 pipeline: Optional[Union[str, uuid.UUID, Pipeline]] = None,
+                 twin: Optional[Union[str, uuid.UUID, Twin]] = None,
+                 template: Optional[Union[str, uuid.UUID, Template]] = None,
+                 registration: Optional[Union[str, uuid.UUID, TwinRegistration]] = None,
                  edge_device_id: str = None,
                  status: ExecutionStatus = None,
                  pipeline_image_id: str = None,
@@ -148,7 +149,7 @@ class ExecutionLog(Dto):
         return self._experiment_id
 
     @experiment.setter
-    def experiment(self, value: str | uuid.UUID | Experiment | None):
+    def experiment(self, value: Optional[Union[str, uuid.UUID, Experiment , None]]):
         """
         set experiment - accept key/uuid or a Experiment
         """
@@ -201,7 +202,7 @@ class ExecutionLog(Dto):
         return self._pipeline_id
 
     @pipeline.setter
-    def pipeline(self, value: str | uuid.UUID | Pipeline | None):
+    def pipeline(self, value: Optional[Union[str, uuid.UUID, Pipeline , None]]):
         """
         set pipeline - accept key/uuid or a Pipeline
         """
@@ -254,7 +255,7 @@ class ExecutionLog(Dto):
         return self._twin_id
 
     @twin.setter
-    def twin(self, value: str | uuid.UUID | Twin | None):
+    def twin(self, value: Optional[Union[str, uuid.UUID, Twin , None]]):
         """
         set twin - accept key/uuid or a Twin
         """
@@ -307,7 +308,7 @@ class ExecutionLog(Dto):
         return self._template_id
 
     @template.setter
-    def template(self, value: str | uuid.UUID | Template | None):
+    def template(self, value: Optional[Union[str, uuid.UUID, Template , None]]):
         """
         set template - accept key/uuid or a Template
         """
@@ -358,7 +359,7 @@ class ExecutionLog(Dto):
         return self._registration_id
 
     @registration.setter
-    def registration(self, value: uuid.UUID | TwinRegistration | None):
+    def registration(self, value: Optional[Union[str, uuid.UUID, TwinRegistration , None]]):
         """
         set template - accept uuid or a TwinRegistration
         """

wizata_dsapi/version.py

@@ -1 +1 @@
-__version__ = "1.4.0.dev5"
+__version__ = "1.4.0.dev8"

wizata_dsapi/wizata_dsapi_client.py

@@ -31,6 +31,7 @@ from .mlmodel import ModelInfo, ModelList, ModelFile
 from .experiment import Experiment
 from .script import Script
 from .execution import Execution, ExecutionStatus
+from .execution_log import ExecutionLog
 from .dsapi_json_encoder import DSAPIEncoder
 from .group_system import GroupSystem
 from .ds_dataframe import DSDataFrame
@@ -843,7 +844,7 @@ class WizataDSAPIClient(ApiInterface, ApiDtoInterface):
                   twin=None,
                   mode: str = 'experiment',
                   version: str = None,
-                  ) -> Execution:
+                  ) -> ExecutionLog:
         """
         internal function - deprecated - please use experiment() or test_run() instead.
         """
@@ -905,8 +906,7 @@ class WizataDSAPIClient(ApiInterface, ApiDtoInterface):
             # Parse
             if response.status_code == 200:
                 obj = response.json()
-                result_execution = Execution()
-                result_execution.from_json(obj)
+                result_execution = ExecutionLog.from_dict(obj)
                 if "plots" in obj.keys():
                     for plot in obj["plots"]:
                         result_execution.plots.append(self.get(Plot(plot_id=plot["id"])))
@@ -928,7 +928,7 @@ class WizataDSAPIClient(ApiInterface, ApiDtoInterface):
                    train: bool = True,
                    plot: bool = True,
                    write: bool = False,
-                   version: str = None) -> Execution:
+                   version: str = None) -> ExecutionLog:
         """
         experiment and train models with a pipeline.
 
@@ -974,7 +974,7 @@ class WizataDSAPIClient(ApiInterface, ApiDtoInterface):
             train: bool = False,
             plot: bool = False,
             write: bool = True,
-            version: str = None) -> Execution:
+            version: str = None) -> ExecutionLog:
         """
         run a pipeline.
 

{wizata_dsapi-1.4.0.dev5.dist-info → wizata_dsapi-1.4.0.dev8.dist-info}/METADATA

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

{wizata_dsapi-1.4.0.dev5.dist-info → wizata_dsapi-1.4.0.dev8.dist-info}/RECORD

@@ -12,7 +12,7 @@ wizata_dsapi/ds_dataframe.py,sha256=Sk2JRUuTRJzko3HosJnbK34STpgSJUlqxLq8w_E5VM4,
 wizata_dsapi/dsapi_json_encoder.py,sha256=_NJE2IncJCS-juOxV_IQWHq8WpaanKe2aWpGNZNUzyk,2062
 wizata_dsapi/evaluation.py,sha256=kB61SD66uRBBbKqiES7XZERn77bwhacbyufneSD4s8c,2222
 wizata_dsapi/execution.py,sha256=JuU8qZDcUZxtCvQwwvM_luwHi18GQ2jbBSxAjc2cSlM,14148
-wizata_dsapi/execution_log.py,sha256=GDWUkAppb1ZzzWnvdIjtQJlZ_bWuZfVho_D4_KWn99w,14183
+wizata_dsapi/execution_log.py,sha256=f6tBrdoD_USznaVd4FlzvcZ311QnbUVoaObRW3lJ4NA,14434
 wizata_dsapi/experiment.py,sha256=QYQ1CJ-MTWsXq08xYbm5sAp95dRxbPOmGDgaAOoBMDQ,4631
 wizata_dsapi/group_system.py,sha256=6rUKe0_J3YWACysyBlzuw_TEpKNXgLOMxhpWsNxOzwY,1708
 wizata_dsapi/ilogger.py,sha256=iYnID-Z-qrYhie26C43404aIuU4_tHSKXbDeQIdo82Q,807
@@ -32,10 +32,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=zmMLpLdS2_yHw_KWOOB_Lme8oLIH0jQRoSHNuqYKVGI,27
+wizata_dsapi/version.py,sha256=PRRDTaVar8lbgR02pJHefl2c_-V50kpHHvEj_l_aWJQ,27
 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=VbbtctPUx2vxXtXCcWARjrTqH1hCK24YCFhse9wPlgg,85040
+wizata_dsapi/wizata_dsapi_client.py,sha256=o-YMZzEXTglrU3dPR0FDQ3CZeiKVruVfzMM4vIFPxJk,85057
 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
@@ -43,8 +43,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.4.0.dev5.dist-info/licenses/LICENSE.txt,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
-wizata_dsapi-1.4.0.dev5.dist-info/METADATA,sha256=O7pNEfq54NM069DWUhIllllpBo578b5PiG1a9anmsMs,4959
-wizata_dsapi-1.4.0.dev5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-wizata_dsapi-1.4.0.dev5.dist-info/top_level.txt,sha256=-OeTJbEnh5DuWyTOHtvw0Dw3LRg3G27TNS6W4ZtfwPs,13
-wizata_dsapi-1.4.0.dev5.dist-info/RECORD,,
+wizata_dsapi-1.4.0.dev8.dist-info/licenses/LICENSE.txt,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
+wizata_dsapi-1.4.0.dev8.dist-info/METADATA,sha256=I38eqia7S97qkUrNDhdlOcAC075LnvebFAtJd4JZXJs,4959
+wizata_dsapi-1.4.0.dev8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+wizata_dsapi-1.4.0.dev8.dist-info/top_level.txt,sha256=-OeTJbEnh5DuWyTOHtvw0Dw3LRg3G27TNS6W4ZtfwPs,13
+wizata_dsapi-1.4.0.dev8.dist-info/RECORD,,