esd-services-api-client 2.5.7__tar.gz → 2.5.9__tar.gz

{esd_services_api_client-2.5.7 → esd_services_api_client-2.5.9}/PKG-INFO

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

{esd_services_api_client-2.5.7 → esd_services_api_client-2.5.9}/esd_services_api_client/__init__.py

@@ -17,4 +17,4 @@
  Root index.
 """
 
-__version__ = "2.5.7"
+__version__ = "2.5.9"

{esd_services_api_client-2.5.7 → esd_services_api_client-2.5.9}/esd_services_api_client/nexus/algorithms/forked_algorithm.py

@@ -153,14 +153,6 @@ class ForkedAlgorithm(NexusObject[TPayload, AlgorithmResult]):
             self._get_forks, **self._inputs, **kwargs
         )()
 
-        if len(forks) > 0:
-            self._logger.info(
-                "Forking node with: {forks}, after the node run",
-                forks=",".join([fork.alias() for fork in forks]),
-            )
-        else:
-            self._logger.info("Leaf algorithm node: proceeding with this node run only")
-
         run_result = await partial(
             _measured_run,
             **kwargs,
@@ -170,7 +162,15 @@ class ForkedAlgorithm(NexusObject[TPayload, AlgorithmResult]):
             logger=self._logger,
         )()
 
-        # now await callback scheduling
-        await asyncio.wait([asyncio.create_task(fork.run(**kwargs)) for fork in forks])
+        if len(forks) > 0:
+            self._logger.info(
+                "Forking node with: {forks}, after the node run",
+                forks=",".join([fork.alias() for fork in forks]),
+            )
+            await asyncio.wait(
+                [asyncio.create_task(fork.run(**kwargs)) for fork in forks]
+            )
+        else:
+            self._logger.info("Leaf algorithm node: proceeding with this node run only")
 
         return run_result

{esd_services_api_client-2.5.7 → esd_services_api_client-2.5.9}/esd_services_api_client/nexus/core/app_core.py

@@ -32,7 +32,7 @@ from adapta.logs import LoggerInterface
 from adapta.process_communication import DataSocket
 from adapta.storage.blob.base import StorageClient
 from adapta.storage.query_enabled_store import QueryEnabledStore
-from injector import Injector
+from injector import Injector, Module
 
 import esd_services_api_client.nexus.exceptions
 from esd_services_api_client.crystal import (
@@ -188,6 +188,13 @@ class Nexus:
 
         return self
 
+    def with_module(self, module: Type[Module]) -> "Nexus":
+        """
+        Adds a (custom) DI module into the DI container.
+        """
+        self._configurator = self._configurator.with_module(module)
+        return self
+
     async def _submit_result(
         self,
         result: Optional[AlgorithmResult] = None,

{esd_services_api_client-2.5.7 → esd_services_api_client-2.5.9}/esd_services_api_client/nexus/core/app_dependencies.py

@@ -255,6 +255,13 @@ class ServiceConfigurator:
         """
         return self._injection_binds
 
+    def with_module(self, module: Type[Module]) -> "ServiceConfigurator":
+        """
+        Adds a (custom) module into the DI container.
+        """
+        self._injection_binds.append(module())
+        return self
+
     def with_input_reader(self, reader: Type[InputReader]) -> "ServiceConfigurator":
         """
         Adds the input reader implementation to the DI.

esd_services_api_client-2.5.9/esd_services_api_client/nexus/modules/__init__.py

@@ -0,0 +1,20 @@
+#  Copyright (c) 2023-2024. ECCO Sneaks & Data
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+#
+
+"""
+ Import index.
+"""
+
+from esd_services_api_client.nexus.modules.mlflow_module import MlflowModule

esd_services_api_client-2.5.9/esd_services_api_client/nexus/modules/mlflow_module.py

@@ -0,0 +1,43 @@
+#  Copyright (c) 2023-2024. ECCO Sneaks & Data
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+#
+
+"""
+MLFlow module that provides the MLFlow client to the Nexus framework.
+"""
+
+import os
+from typing import final
+from injector import Module, singleton, provider
+from adapta.ml.mlflow import MlflowBasicClient
+from esd_services_api_client.nexus.exceptions.startup_error import (
+    FatalStartupConfigurationError,
+)
+
+
+@final
+class MlflowModule(Module):
+    """
+    MLFlow module.
+    """
+
+    @singleton
+    @provider
+    def provide(self) -> MlflowBasicClient:
+        """
+        DI factory method.
+        """
+        if "NEXUS__MLFLOW_TRACKING_URI" not in os.environ:
+            raise FatalStartupConfigurationError("NEXUS__MLFLOW_TRACKING_URI")
+        return MlflowBasicClient(os.environ["NEXUS__MLFLOW_TRACKING_URI"])

{esd_services_api_client-2.5.7 → esd_services_api_client-2.5.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "esd-services-api-client"
-version = "2.5.7"
+version = "2.5.9"
 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>']