esd-services-api-client 2.5.1a122.dev7__tar.gz → 2.5.1a123.dev3__tar.gz

{esd_services_api_client-2.5.1a122.dev7 → esd_services_api_client-2.5.1a123.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: esd-services-api-client
-Version: 2.5.1a122.dev7
+Version: 2.5.1a123.dev3
 Summary: Python clients for ESD services
 Home-page: https://github.com/SneaksAndData/esd-services-api-client
 License: Apache 2.0

esd_services_api_client-2.5.1a123.dev3/esd_services_api_client/_version.py

@@ -0,0 +1 @@
+__version__ = 'v2.5.1a123.dev3'

{esd_services_api_client-2.5.1a122.dev7 → esd_services_api_client-2.5.1a123.dev3}/esd_services_api_client/nexus/core/app_core.py

@@ -293,7 +293,7 @@ class Nexus:
                 )
                 on_complete_tasks = [
                     recorder.record_user_telemetry(
-                        user_recorder_type=on_complete_task_class,
+                        user_recorder=self._injector.get(on_complete_task_class),
                         run_id=self._run_args.request_id,
                         result=self._algorithm_run_task.result(),
                         **algorithm.inputs,

{esd_services_api_client-2.5.1a122.dev7 → esd_services_api_client-2.5.1a123.dev3}/esd_services_api_client/nexus/telemetry/recorder.py

@@ -122,7 +122,7 @@ class TelemetryRecorder(NexusCoreObject):
 
     def record_user_telemetry(
         self,
-        user_recorder_type: type[UserTelemetryRecorder],
+        user_recorder: UserTelemetryRecorder,
         run_id: str,
         result: AlgorithmResult,
         **inputs: DataFrame,
@@ -130,17 +130,16 @@ class TelemetryRecorder(NexusCoreObject):
         """
         Creates an awaitable task that records user telemetry using provided recorder type.
 
-        :param user_recorder_type: Recorder type to record user telemetry.
+        :param user_recorder: Recorder type to record user telemetry.
         :param run_id: The request_id to record user telemetry for.
         :param result: Result of the algorithm.
         :param inputs: Algorithm input data.
         """
         return asyncio.create_task(
-            user_recorder_type(
-                metrics_provider=self._metrics_provider,
-                logger=self._logger,
-                storage_client=self._storage_client,
-                serializer=self._serializer,
+            user_recorder.record(
+                run_id=run_id,
                 telemetry_base_path=self._telemetry_base_path,
-            ).record(run_id=run_id, algorithm_result=result, **inputs)
+                algorithm_result=result,
+                **inputs,
+            )
         )

{esd_services_api_client-2.5.1a122.dev7 → esd_services_api_client-2.5.1a123.dev3}/esd_services_api_client/nexus/telemetry/user_telemetry_recorder.py

@@ -6,7 +6,7 @@ import re
 from abc import ABC, abstractmethod
 from dataclasses import dataclass
 from functools import partial
-from typing import final
+from typing import final, Generic
 
 from pandas import DataFrame
 
@@ -18,9 +18,8 @@ from adapta.utils.decorators import run_time_metrics_async
 from dataclasses_json.stringcase import snakecase
 from injector import inject
 
-from esd_services_api_client.nexus.abstractions.nexus_object import AlgorithmResult
+from esd_services_api_client.nexus.abstractions.nexus_object import TPayload, TResult
 from esd_services_api_client.nexus.core.serializers import TelemetrySerializer
-from esd_services_api_client.nexus.input.payload_reader import AlgorithmPayload
 
 
 @final
@@ -66,7 +65,7 @@ class UserTelemetry:
         return "/".join([str(t_path) for t_path in self._telemetry_path_segments])
 
 
-class UserTelemetryRecorder(ABC):
+class UserTelemetryRecorder(Generic[TPayload, TResult], ABC):
     """
     Base class for user-defined telemetry recorders.
     """
@@ -74,19 +73,17 @@ class UserTelemetryRecorder(ABC):
     @inject
     def __init__(
         self,
-        algorithm_payload: AlgorithmPayload,
+        algorithm_payload: TPayload,
         metrics_provider: MetricsProvider,
         logger: LoggerInterface,
         storage_client: StorageClient,
         serializer: TelemetrySerializer,
-        telemetry_base_path: str,
     ):
         self._metrics_provider = metrics_provider
         self._logger = logger
         self._payload = algorithm_payload
         self._storage_client = storage_client
         self._serializer = serializer
-        self._telemetry_base_path = telemetry_base_path
 
     @property
     def _metric_tags(self) -> dict[str, str]:
@@ -95,8 +92,8 @@ class UserTelemetryRecorder(ABC):
     @abstractmethod
     async def _compute(
         self,
-        algorithm_payload: AlgorithmPayload,
-        algorithm_result: AlgorithmResult,
+        algorithm_payload: TPayload,
+        algorithm_result: TResult,
         run_id: str,
         **inputs: DataFrame,
     ) -> UserTelemetry:
@@ -105,7 +102,11 @@ class UserTelemetryRecorder(ABC):
         """
 
     async def record(
-        self, algorithm_result: AlgorithmResult, run_id: str, **inputs: DataFrame
+        self,
+        algorithm_result: TResult,
+        telemetry_base_path: str,
+        run_id: str,
+        **inputs: DataFrame,
     ):
         """
         Record user-defined telemetry data.
@@ -141,7 +142,7 @@ class UserTelemetryRecorder(ABC):
             blob_path=DataSocket(
                 alias="user_telemetry",
                 data_path=os.path.join(
-                    self._telemetry_base_path,
+                    telemetry_base_path,
                     "telemetry_group=user",
                     f"recorder_class={self.__class__.alias()}",
                     telemetry.telemetry_path,  # path join eliminates empty segments

{esd_services_api_client-2.5.1a122.dev7 → esd_services_api_client-2.5.1a123.dev3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "esd-services-api-client"
-version = "v2.5.1a122.dev7"
+version = "v2.5.1a123.dev3"
 description = "Python clients for ESD services"
 authors = ["ECCO Sneaks & Data <esdsupport@ecco.com>"]
 maintainers = ['GZU <gzu@ecco.com>', 'JRB <ext-jrb@ecco.com>', 'VISA <visa@ecco.com>']

esd_services_api_client-2.5.1a122.dev7/esd_services_api_client/_version.py

@@ -1 +0,0 @@
-__version__ = 'v2.5.1a122.dev7'