deriva-ml 1.14.30__py3-none-any.whl → 1.14.32__py3-none-any.whl

deriva_ml/execution/workflow.py

@@ -7,6 +7,7 @@ from pathlib import Path
 from typing import Any
 
 import requests
+from pydantic import BaseModel, PrivateAttr, model_validator
 from requests import RequestException
 
 from deriva_ml.core.definitions import RID
@@ -48,7 +49,7 @@ except ImportError:
         return get_connection_file()
 
 
-class Workflow:
+class Workflow(BaseModel):
     """Represents a computational workflow in DerivaML.
 
     A workflow defines a computational process or analysis pipeline. Each workflow has
@@ -75,17 +76,19 @@ class Workflow:
         ... )
     """
 
-    def __init__(
-        self,
-        name: str,
-        workflow_type: str,
-        description: str | None = None,
-        url: str | None = None,
-        version: str | None = None,
-        rid: RID | None = None,
-        checksum: str | None = None,
-        is_notebook: bool = False,
-    ):
+    name: str
+    workflow_type: str
+    description: str | None = None
+    url: str | None = None
+    version: str | None = None
+    rid: RID | None = None
+    checksum: str | None = None
+    is_notebook: bool = False
+
+    _logger: logging.Logger = PrivateAttr(default=10)
+
+    @model_validator(mode="after")
+    def setup_url_checksum(self) -> "Workflow":
         """Creates a workflow from the current execution context.
 
         Identifies the currently executing program (script or notebook) and creates
@@ -114,14 +117,6 @@ class Workflow:
             ...     description="Process sample data"
             ... )
         """
-        self.name = name
-        self.url = url
-        self.workflow_type = workflow_type
-        self.version = version
-        self.description = description
-        self.rid = rid
-        self.checksum = checksum
-        self.is_notebook = is_notebook
         """Initializes logging for the workflow."""
 
         # Check to see if execution file info is being passed in by calling program.
@@ -135,6 +130,7 @@ class Workflow:
             self.url, self.checksum = Workflow.get_url_and_checksum(path)
 
         self._logger = logging.getLogger("deriva_ml")
+        return self
 
     @staticmethod
     def get_url_and_checksum(executable_path: Path) -> tuple[str, str]:

{deriva_ml-1.14.30.dist-info → deriva_ml-1.14.32.dist-info}/METADATA

@@ -1,11 +1,12 @@
 Metadata-Version: 2.4
 Name: deriva-ml
-Version: 1.14.30
+Version: 1.14.32
 Summary: Utilities to simplify use of Dervia and Pandas to create reproducable ML pipelines
 Author-email: ISRD <isrd-dev@isi.edu>
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: bump-my-version
 Requires-Dist: deriva~=1.7.10
 Requires-Dist: deepdiff
 Requires-Dist: pandas

{deriva_ml-1.14.30.dist-info → deriva_ml-1.14.32.dist-info}/RECORD

@@ -20,7 +20,7 @@ deriva_ml/execution/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 deriva_ml/execution/environment.py,sha256=B7nywqxFTRUWgyu8n7rFoKcVC9on422kjeFG2FPQfvg,9302
 deriva_ml/execution/execution.py,sha256=tXWkFLDoSre836x6MMkcmhtmr3zP5_VoSioQ72-XmvE,44298
 deriva_ml/execution/execution_configuration.py,sha256=Rw4VWkBCZN9yatvSKdTqEWTfu470lpcVKfHFR0uN0jI,6248
-deriva_ml/execution/workflow.py,sha256=65z9p0u4EKduLykn-noWRgf14B1lRPeYJr_0SbqYlA4,13681
+deriva_ml/execution/workflow.py,sha256=Q5AvWOZLmveIobVKqTNo30HqpnLQ9Q9oy8klZBDKd3Q,13577
 deriva_ml/model/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 deriva_ml/model/catalog.py,sha256=dzTBcRlqgEVkPY32AUax_iu75RgFiT4Pu5au7rmrv8k,14068
 deriva_ml/model/database.py,sha256=MlXQQFgFmGxZbRx-unRFoRttXwpJspV4v2AIgppttCU,14805
@@ -32,9 +32,9 @@ deriva_ml/schema/create_schema.py,sha256=0ydJSZEg3C3-m8hWPN6k2MoUvm-RWxAlKFzVChx
 deriva_ml/schema/deriva-ml-reference.json,sha256=AEOMIgwKO3dNMMWHb0lxaXyamvfAEbUPh8qw0aAtsUQ,242460
 deriva_ml/schema/policy.json,sha256=5ykB8nnZFl-oCHzlAwppCFKJHWJFIkYognUMVEanfY8,1826
 deriva_ml/schema/table_comments_utils.py,sha256=4flCqnZAaqg_uSZ9I18pNUWAZoLfmMCXbmI5uERY5vM,2007
-deriva_ml-1.14.30.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-deriva_ml-1.14.30.dist-info/METADATA,sha256=c3IN9kLi-Es1kMa6LAxJ-hgr6BqFnOPfw7gd6o_xvpM,1034
-deriva_ml-1.14.30.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-deriva_ml-1.14.30.dist-info/entry_points.txt,sha256=dkf_z7E4V6_3_5Xjsm0hcixNg6ASHDw6NfYQuBvF1Wc,363
-deriva_ml-1.14.30.dist-info/top_level.txt,sha256=I1Q1dkH96cRghdsFRVqwpa2M7IqJpR2QPUNNc5-Bnpw,10
-deriva_ml-1.14.30.dist-info/RECORD,,
+deriva_ml-1.14.32.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+deriva_ml-1.14.32.dist-info/METADATA,sha256=_asZgskBD4cnJX51XQZCe97TSTNswWzAREQSyCA1uLs,1065
+deriva_ml-1.14.32.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+deriva_ml-1.14.32.dist-info/entry_points.txt,sha256=dkf_z7E4V6_3_5Xjsm0hcixNg6ASHDw6NfYQuBvF1Wc,363
+deriva_ml-1.14.32.dist-info/top_level.txt,sha256=I1Q1dkH96cRghdsFRVqwpa2M7IqJpR2QPUNNc5-Bnpw,10
+deriva_ml-1.14.32.dist-info/RECORD,,