flowcept 0.8.4__py3-none-any.whl → 0.8.5__py3-none-any.whl

flowcept/commons/flowcept_dataclasses/workflow_object.py

@@ -12,6 +12,7 @@ from flowcept.configs import (
     SYS_NAME,
     EXTRA_METADATA,
     ENVIRONMENT_ID,
+    SETTINGS_PATH,
 )
 
 
@@ -23,6 +24,7 @@ class WorkflowObject:
     workflow_id: AnyStr = None
     parent_workflow_id: AnyStr = None
     machine_info: Dict = None
+    conf: Dict = None
     flowcept_settings: Dict = None
     flowcept_version: AnyStr = None
     utc_timestamp: float = None
@@ -70,7 +72,7 @@ class WorkflowObject:
         """Enrich it."""
         self.utc_timestamp = get_utc_now()
         self.flowcept_settings = OmegaConf.to_container(settings) if isinstance(settings, DictConfig) else settings
-
+        self.conf = {"settings_path": SETTINGS_PATH}
         if adapter_key is not None:
             # TODO :base-interceptor-refactor: :code-reorg: :usability:
             # revisit all times we assume settings is not none

flowcept/flowcept_api/flowcept_controller.py

@@ -262,6 +262,7 @@ class Flowcept(object):
         if not MQDao.build().liveness_test():
             logger.error("MQ Not Ready!")
             return False
+
         if MONGO_ENABLED:
             from flowcept.commons.daos.docdb_dao.mongodb_dao import MongoDBDAO
 

flowcept/flowceptor/adapters/dask/dask_interceptor.py

@@ -80,6 +80,8 @@ class DaskWorkerInterceptor(BaseInterceptor):
         self._generated_workflow_id = True
         super().start(bundle_exec_id=self._worker.scheduler.address)
 
+        self._worker._interceptor = self
+
         instrumentation = INSTRUMENTATION.get("enabled", False)
         if instrumentation:
             InstrumentationInterceptor.get_instance().start(

flowcept/flowceptor/consumers/consumer_utils.py

@@ -45,13 +45,11 @@ def curate_task_msg(task_msg_dict: dict, convert_times=True):
         task_msg_dict["workflow_id"] = task_msg_dict["used"].pop("workflow_id")
 
     if convert_times:
-        has_time_fields = False
         for time_field in TaskObject.get_time_field_names():
             if time_field in task_msg_dict:
-                has_time_fields = True
                 task_msg_dict[time_field] = datetime.fromtimestamp(task_msg_dict[time_field], pytz.utc)
 
-        if not has_time_fields:
+        if "registered_at" not in task_msg_dict:
             task_msg_dict["registered_at"] = datetime.fromtimestamp(time(), pytz.utc)
 
 

flowcept/flowceptor/telemetry_capture.py

@@ -119,8 +119,8 @@ class GPUCapture:
         if "name" in gpu_conf:
             flowcept_gpu_info["name"] = nvmlDeviceGetName(device)
 
-        if "ix" in gpu_conf:
-            flowcept_gpu_info["gpu_ix"] = gpu_ix
+        if "id" in gpu_conf:
+            flowcept_gpu_info["id"] = nvmlDeviceGetUUID(device)
 
         return flowcept_gpu_info
 
@@ -160,7 +160,6 @@ class GPUCapture:
             }
         if "others" in gpu_conf:
             flowcept_gpu_info["others"] = {
-                "uuid": amdsmi_get_gpu_device_uuid(device),
                 "current_gfxclk": all_metrics["current_gfxclk"],
                 "current_socclk": all_metrics["current_socclk"],
                 "current_uclk": all_metrics["current_uclk"],
@@ -168,6 +167,9 @@ class GPUCapture:
                 "current_dclk0": all_metrics["current_dclk0"],
             }
 
+        if "id" in gpu_conf:
+            flowcept_gpu_info["id"] = (amdsmi_get_gpu_device_uuid(device),)
+
         return flowcept_gpu_info
 
 
@@ -193,6 +195,7 @@ elif GPUCapture.GPU_VENDOR == "nvidia":
         nvmlDeviceGetTemperature,
         nvmlDeviceGetPowerUsage,
         NVML_TEMPERATURE_GPU,
+        nvmlDeviceGetUUID,
     )
 
     FlowceptLogger().debug("Imported Nvidia modules!")

flowcept/instrumentation/flowcept_loop.py

@@ -156,13 +156,13 @@ class FlowceptLoop:
             "used": {"i": self._next_counter, self._item_name: self._current_item},
             "parent_task_id": self._parent_task_id,
         }
-        tel = FlowceptLoop._interceptor.telemetry_capture.capture()
-        if tel:
-            iteration_task["telemetry_at_start"] = tel.to_dict()
         return iteration_task
 
-    def _end_iteration_task(self, iteration_task):
-        iteration_task["status"] = Status.FINISHED.value
+    def _end_iteration_task(self, _):
+        self._last_iteration_task["status"] = Status.FINISHED.value
+        tel = FlowceptLoop._interceptor.telemetry_capture.capture()
+        if tel:
+            self._last_iteration_task["telemetry_at_end"] = tel.to_dict()
         FlowceptLoop._interceptor.intercept(self._last_iteration_task)
 
     def _do_nothing_in_end_iter(self, *args, **kwargs):

flowcept/version.py

@@ -4,4 +4,4 @@
 # The expected format is: <Major>.<Minor>.<Patch>
 # This file is supposed to be automatically modified by the CI Bot.
 # See .github/workflows/version_bumper.py
-__version__ = "0.8.4"
+__version__ = "0.8.5"

{flowcept-0.8.4.dist-info → flowcept-0.8.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flowcept
-Version: 0.8.4
+Version: 0.8.5
 Summary: Capture and query workflow provenance data using data observability
 Project-URL: GitHub, https://github.com/ORNL/flowcept
 Author: Oak Ridge National Laboratory

{flowcept-0.8.4.dist-info → flowcept-0.8.5.dist-info}/RECORD

@@ -1,6 +1,6 @@
 flowcept/__init__.py,sha256=CukmdzTUvm6Y_plTKPq4kKn7w9LdR36j7V_C_UQyjhU,2011
 flowcept/configs.py,sha256=_-jhoI_HGKjzymjYTlDuysbM38Gr2aunc0Q-Stlmcwk,7511
-flowcept/version.py,sha256=sgsQa7sBlHkp-P60Bs4HRcOzfCc2iDmfQsjJbMii7Xg,306
+flowcept/version.py,sha256=RW_aTLB2vWTDjrpIPcWytUXxQhZLynom14B2UHfVVcU,306
 flowcept/analytics/__init__.py,sha256=46q-7vsHq_ddPNrzNnDgEOiRgvlx-5Ggu2ocyROMV0w,641
 flowcept/analytics/analytics_utils.py,sha256=FRJdBtQa7Hrk2oR_FFhmhmMf3X6YyZ4nbH5RIYh7KL4,8753
 flowcept/analytics/data_augmentation.py,sha256=Dyr5x316Zf-k1e8rVoQMCpFOrklYVHjfejRPrtoycmc,1641
@@ -27,10 +27,10 @@ flowcept/commons/flowcept_dataclasses/__init__.py,sha256=8KkiJh0WSRAB50waVluxCSI
 flowcept/commons/flowcept_dataclasses/base_settings_dataclasses.py,sha256=Cjw2PGYtZDfnwecz6G3S42Ncmxj7AIZVEBx05bsxRUo,399
 flowcept/commons/flowcept_dataclasses/task_object.py,sha256=3DD5ZNMz7EVILS9PRkQ3khboav7lIKoUC5W6sKMFauQ,4694
 flowcept/commons/flowcept_dataclasses/telemetry.py,sha256=9_5ONCo-06r5nKHXmi5HfIhiZSuPgmTECiq_u9MlxXM,2822
-flowcept/commons/flowcept_dataclasses/workflow_object.py,sha256=t9M0eVdcq3NLZgT4fwXrR3x2oOgjtE5Jo5_MAi4-0YM,4283
+flowcept/commons/flowcept_dataclasses/workflow_object.py,sha256=FBpel5PulrN3mCCk3hrQhoYiFqd-4aNV4tT03bCV3DE,4376
 flowcept/flowcept_api/__init__.py,sha256=T1ty86YlocQ5Z18l5fUqHj_CC6Unq_iBv0lFyiI7Ao8,22
 flowcept/flowcept_api/db_api.py,sha256=hKXep-n50rp9cAzV0ljk2QVEF8O64yxi3ujXv5_Ibac,9723
-flowcept/flowcept_api/flowcept_controller.py,sha256=zq4cRM14xoeRA6HPL6JwLwDLpsVra5ej1EAPmiVKUIs,11932
+flowcept/flowcept_api/flowcept_controller.py,sha256=lkHR7O0zAAfbGtVa4o9tjZMdZquYN7vdnymRKzc4B8s,11933
 flowcept/flowcept_api/task_query_api.py,sha256=SrwB0OCVtbpvCPECkE2ySM10G_g8Wlk5PJ8h-0xEaNc,23821
 flowcept/flowcept_webserver/__init__.py,sha256=8411GIXGddKTKoHUvbo_Rq6svosNG7tG8VzvUEBd7WI,28
 flowcept/flowcept_webserver/app.py,sha256=VUV8_JZbIbx9u_1O7m7XtRdhZb_7uifUa-iNlPhmZws,658
@@ -38,14 +38,14 @@ flowcept/flowcept_webserver/resources/__init__.py,sha256=XOk5yhLeLU6JmVXxbl3TY2z
 flowcept/flowcept_webserver/resources/query_rsrc.py,sha256=Mk1XDC_wVYkMk0eaazqWWrTC07gQU9U0toKfip0ihZE,1353
 flowcept/flowcept_webserver/resources/task_messages_rsrc.py,sha256=0u68it2W-9NzUUx5fWOZCqvRKe5EsLI8oyvto9634Ng,666
 flowcept/flowceptor/__init__.py,sha256=wVxRXUv07iNx6SMRRma2vqhR_GIcRl0re_WCYG65PUs,29
-flowcept/flowceptor/telemetry_capture.py,sha256=8LK4o3OaZD8B6KTpgpvD9D834dFpAJpX-NN2bc91jZU,13658
+flowcept/flowceptor/telemetry_capture.py,sha256=FlWGLpzb6pBJOKVi349kyZKzAHeTsL86BCQd4Wtxpig,13746
 flowcept/flowceptor/adapters/__init__.py,sha256=SuZbSZVVQeBJ9zXW-M9jF09dw3XIjre3lSGrUO1Y8Po,27
 flowcept/flowceptor/adapters/base_interceptor.py,sha256=99a_Ipnj6g8qZMHWLBEYJh0Cox033ADxOKPFrivr9gw,6056
 flowcept/flowceptor/adapters/instrumentation_interceptor.py,sha256=DhK2bBnpghqPSeA62BUqRg6pl8zxuYrP33dK4x6PhRE,733
 flowcept/flowceptor/adapters/interceptor_state_manager.py,sha256=xRzmi5YFKBEqNtX8F5s6XlMTRe27ml4BmQtBO4WtG2c,919
 flowcept/flowceptor/adapters/dask/__init__.py,sha256=GKreb5L_nliD2BEckyB943zOQ-b6Gn1fLDj81FqSK2Y,23
 flowcept/flowceptor/adapters/dask/dask_dataclasses.py,sha256=6LTG-kdcc6AUuVINvkqB5QHw6pchg1aMqj0sdWt2Ef8,580
-flowcept/flowceptor/adapters/dask/dask_interceptor.py,sha256=Dzrwu9Y9A6k2Qq8tZKXx3zmi-CpmtFrJehUTfNjZxDM,5827
+flowcept/flowceptor/adapters/dask/dask_interceptor.py,sha256=uBQpLluYXzlT1gBDfTe4_WueC_fWBEs5Xr8ntpOmljE,5869
 flowcept/flowceptor/adapters/dask/dask_plugins.py,sha256=s1ENAi9N61PC_6RiFvOYhJsgWzSm_lFWm3w87V-R1YY,2473
 flowcept/flowceptor/adapters/mlflow/__init__.py,sha256=3mzHrvh1XQOy68qx1A3so9Nq27tIb0i2mSXfv3F6gZg,25
 flowcept/flowceptor/adapters/mlflow/interception_event_handler.py,sha256=-SsIRdOcZjQUTzWgsZ41ouqpla4Qd32jIWXIAGU1pPw,494
@@ -59,15 +59,15 @@ flowcept/flowceptor/adapters/zambeze/__init__.py,sha256=1e9_hK2cUKDXhQ0kBRftwcJj
 flowcept/flowceptor/adapters/zambeze/zambeze_dataclasses.py,sha256=nn9MxvcdzgmOa8n5Jwdl7UzlSzxEu9bA-Ls6cHyb91c,849
 flowcept/flowceptor/adapters/zambeze/zambeze_interceptor.py,sha256=Bjyi48JW0DXJLJuvwPxaD8zxxsSoEFgSoXl8YcbwFWk,3782
 flowcept/flowceptor/consumers/__init__.py,sha256=foxtVEb2ZEe9g1slfYIKM4tIFv-He1l7XS--SYs7nlQ,28
-flowcept/flowceptor/consumers/consumer_utils.py,sha256=JmyjQeZPqMj_yqFlxxw9k2_JZvZkAmX7kySV__YvEVc,5719
+flowcept/flowceptor/consumers/consumer_utils.py,sha256=7bvFJWusJkfA4j0gwZLDIIsIOyfk9wRq6s5liS3JAV0,5665
 flowcept/flowceptor/consumers/document_inserter.py,sha256=rAK3rs3VNW5a6koesE05scQ1mR_4BhuxLurP10ipURs,9339
 flowcept/instrumentation/__init__.py,sha256=M5bTmg80E4QyN91gUX3qfw_nbtJSXwGWcKxdZP3vJz0,34
-flowcept/instrumentation/flowcept_loop.py,sha256=9Ap7-PfpNdwS7DaRDaB-R9G3X_G3RZvGVkNVUZAix5A,12164
+flowcept/instrumentation/flowcept_loop.py,sha256=RvETm3Pn37dIw_a1RXigyh2U7MCBHqi46dPmbrz3RMQ,12171
 flowcept/instrumentation/flowcept_task.py,sha256=l_BAYEUZ_SeBt8QJN_E9D9QcZVYRnW9qO_XRnqvmePE,5993
 flowcept/instrumentation/flowcept_torch.py,sha256=KXA1HBwz8l5Qp7PkZ7nsbYlM8IcwWD_u04NxaAcZPzM,23395
 flowcept/instrumentation/task_capture.py,sha256=u82r_SgzoVKyb6_SWtfB-meBUZgjrXvF5dxkH9vnMDs,4776
-resources/sample_settings.yaml,sha256=eYMO3rlS4m1sjkgoKuRIYaTuZldiu50bN-E3Bu3on_I,3424
-flowcept-0.8.4.dist-info/METADATA,sha256=aOyqBxuMdXSO5h4n9vAqLQDY7U3ZRRzJoHKTrgHYfoE,17543
-flowcept-0.8.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-flowcept-0.8.4.dist-info/licenses/LICENSE,sha256=r5-2P6tFTuRGWT5TiX32s1y0tnp4cIqBEC1QjTaXe2k,1086
-flowcept-0.8.4.dist-info/RECORD,,
+resources/sample_settings.yaml,sha256=aZRAZRkgCe52i-8czQvZsEIAz8dGau-OF2YClUF3QGs,3427
+flowcept-0.8.5.dist-info/METADATA,sha256=uZzz3Hz-Pee3zpeyNYLk5K-JbS_miCTMXIXlqtMBXX0,17543
+flowcept-0.8.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+flowcept-0.8.5.dist-info/licenses/LICENSE,sha256=r5-2P6tFTuRGWT5TiX32s1y0tnp4cIqBEC1QjTaXe2k,1086
+flowcept-0.8.5.dist-info/RECORD,,

resources/sample_settings.yaml

@@ -13,7 +13,7 @@ log:
   log_stream_level: error
 
 telemetry_capture:
-  gpu: ~ # ~ means None. This is a list with GPU metrics. AMD=[activity,used,power,temperature,others]; NVIDIA=[used,temperature,power,name,ix]
+  gpu: ~ # ~ means None. This is a list with GPU metrics. AMD=[activity,used,power,temperature,others,id]; NVIDIA=[used,temperature,power,name,id]
   cpu: true
   per_cpu: true
   process_info: true