esd-services-api-client 2.6.3a155.dev9__tar.gz → 2.6.3a160.dev2__tar.gz

{esd_services_api_client-2.6.3a155.dev9 → esd_services_api_client-2.6.3a160.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: esd-services-api-client
-Version: 2.6.3a155.dev9
+Version: 2.6.3a160.dev2
 Summary: Python clients for ESD services
 License: Apache 2.0
 Author: ECCO Sneaks & Data

esd_services_api_client-2.6.3a160.dev2/esd_services_api_client/_version.py

@@ -0,0 +1 @@
+__version__ = 'v2.6.3a160.dev2'

{esd_services_api_client-2.6.3a155.dev9 → esd_services_api_client-2.6.3a160.dev2}/esd_services_api_client/nexus/abstractions/metrics_provider_factory.py

@@ -89,18 +89,15 @@ class MetricsProviderFactory:
         Creates a metrics provider enriched with additional tags for each metric emitted by this algorithm.
         In case of DatadogMetricsProvider, takes care of UDP/UDS specific initialization.
         """
-        self._metrics_settings.fixed_tags |= self._global_tags
+        init_args = self._metrics_settings.init_args | {
+            "fixed_tags": self._metrics_settings.fixed_tags | self._global_tags
+        }
 
         if self._metrics_class == DatadogMetricsProvider:
             if self._metrics_settings.protocol == "udp":
-                return self._metrics_class.udp(**self._metrics_settings.init_args)
+                return self._metrics_class.udp(**init_args)
 
             if self._metrics_settings.protocol == "uds":
-                return self._metrics_class.uds(**self._metrics_settings.init_args)
+                return self._metrics_class.uds(**init_args)
 
-        return self._metrics_class(
-            **(
-                self._metrics_settings.init_args
-                | {"fixed_tags": self._metrics_settings.fixed_tags}
-            )
-        )
+        return self._metrics_class(**init_args)

{esd_services_api_client-2.6.3a155.dev9 → esd_services_api_client-2.6.3a160.dev2}/esd_services_api_client/nexus/algorithms/_baseline_algorithm.py

@@ -74,7 +74,7 @@ class BaselineAlgorithm(NexusObject[TPayload, AlgorithmResult]):
         """
 
         @run_time_metrics_async(
-            metric_name="algorthm_run",
+            metric_name="algorithm_run",
             on_finish_message_template="Finished running {algorithm} in {elapsed:.2f}s seconds",
             template_args={
                 "algorithm": self.__class__.alias().upper(),

{esd_services_api_client-2.6.3a155.dev9 → esd_services_api_client-2.6.3a160.dev2}/esd_services_api_client/nexus/algorithms/_remote_algorithm.py

@@ -92,7 +92,7 @@ class RemoteAlgorithm(NexusObject[TPayload, AlgorithmResult]):
         """
 
         @run_time_metrics_async(
-            metric_name="algorthm_run",
+            metric_name="algorithm_run",
             on_finish_message_template="Launched a new remote {algorithm} in {elapsed:.2f}s seconds",
             template_args={
                 "algorithm": self.__class__.alias().upper(),

{esd_services_api_client-2.6.3a155.dev9 → esd_services_api_client-2.6.3a160.dev2}/esd_services_api_client/nexus/algorithms/forked_algorithm.py

@@ -131,7 +131,7 @@ class ForkedAlgorithm(NexusObject[TPayload, AlgorithmResult]):
         """
 
         @run_time_metrics_async(
-            metric_name="algorthm_run",
+            metric_name="algorithm_run",
             on_finish_message_template="Finished running algorithm {algorithm} in {elapsed:.2f}s seconds",
             template_args={
                 "algorithm": self.__class__.alias().upper(),

{esd_services_api_client-2.6.3a155.dev9 → esd_services_api_client-2.6.3a160.dev2}/esd_services_api_client/nexus/core/app_core.py

@@ -395,11 +395,6 @@ class Nexus:
                 scope=singleton,
             )
 
-            self._injector.binder.bind(
-                metrics_provider.__class__,
-                to=metrics_provider,
-                scope=singleton,
-            )
         except BaseException as ex:  # pylint: disable=broad-except
             bootstrap_logger.error("Error reading algorithm payload", ex)
 
@@ -420,7 +415,7 @@ class Nexus:
 
         root_logger.info(
             "Running algorithm {algorithm} on Nexus version {version}",
-            algorithm=algorithm.__class__.__name__,
+            algorithm=algorithm.__class__.alias().upper(),
             version=__version__,
         )
 
@@ -439,15 +434,20 @@ class Nexus:
                 root_logger.error(
                     "Algorithm {algorithm} run failed on Nexus version {version}",
                     ex,
-                    algorithm=algorithm.__class__.__name__,
+                    algorithm=algorithm.__class__.alias().upper(),
                     version=__version__,
                 )
+                metrics_provider.count("failed_runs", 1)
+                metrics_provider.count("successful_runs", 0)
 
             await self._submit_result(
                 self._algorithm_run_task.result() if not ex else None,
                 self._algorithm_run_task.exception(),
             )
 
+            metrics_provider.count("failed_runs", 0)
+            metrics_provider.count("successful_runs", 1)
+
             # record telemetry
             root_logger.info(
                 "Recording telemetry for the run {run_id}",
@@ -471,16 +471,23 @@ class Nexus:
                         on_complete_tasks, return_when=asyncio.FIRST_EXCEPTION
                     )
                     if len(pending) > 0:
+                        metrics_provider.count("telemetry_reports_incomplete", 1)
                         root_logger.warning(
                             "Some post-processing operations did not complete or failed. Please review application logs for more information"
                         )
+                    else:
+                        metrics_provider.count("telemetry_reports_incomplete", 0)
+
                     for done_on_complete_task in done:
                         on_complete_task_exc = done_on_complete_task.exception()
                         if on_complete_task_exc:
+                            metrics_provider.increment("telemetry_reports_failed")
                             root_logger.warning(
                                 "Post processing task failed",
                                 exception=on_complete_task_exc,
                             )
+                        else:
+                            metrics_provider.increment("telemetry_reports_succeeded")
                 else:
                     root_logger.info(
                         "No post processing tasks were defined for this run."

{esd_services_api_client-2.6.3a155.dev9 → esd_services_api_client-2.6.3a160.dev2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "esd-services-api-client"
-version = "v2.6.3a155.dev9"
+version = "v2.6.3a160.dev2"
 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.6.3a155.dev9/esd_services_api_client/_version.py

@@ -1 +0,0 @@
-__version__ = 'v2.6.3a155.dev9'