esd-services-api-client 2.6.3a155.dev7__tar.gz → 2.6.3a155.dev19__tar.gz

{esd_services_api_client-2.6.3a155.dev7 → esd_services_api_client-2.6.3a155.dev19}/PKG-INFO

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

esd_services_api_client-2.6.3a155.dev19/esd_services_api_client/_version.py

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

{esd_services_api_client-2.6.3a155.dev7 → esd_services_api_client-2.6.3a155.dev19}/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.dev7 → esd_services_api_client-2.6.3a155.dev19}/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.dev7 → esd_services_api_client-2.6.3a155.dev19}/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.dev7 → esd_services_api_client-2.6.3a155.dev19}/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.dev7 → esd_services_api_client-2.6.3a155.dev19}/esd_services_api_client/nexus/core/app_core.py

@@ -28,6 +28,7 @@ from typing import final, Type, Optional, Callable
 import backoff
 import urllib3.exceptions
 from adapta.logs import LoggerInterface
+from adapta.metrics import MetricsProvider
 from adapta.process_communication import DataSocket
 from adapta.storage.blob.base import StorageClient
 from adapta.storage.query_enabled_store import QueryEnabledStore
@@ -387,11 +388,13 @@ class Nexus:
             metrics_provider = MetricsProviderFactory(
                 global_tags=metric_tags,
             ).create_provider()
+
             self._injector.binder.bind(
-                metrics_provider.__class__,
+                MetricsProvider,
                 to=metrics_provider,
                 scope=singleton,
             )
+
         except BaseException as ex:  # pylint: disable=broad-except
             bootstrap_logger.error("Error reading algorithm payload", ex)
 
@@ -412,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__,
         )
 
@@ -431,7 +434,7 @@ 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__,
                 )
 

{esd_services_api_client-2.6.3a155.dev7 → esd_services_api_client-2.6.3a155.dev19}/pyproject.toml

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

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