esd-services-api-client 2.0.5__tar.gz → 2.0.6__tar.gz

{esd_services_api_client-2.0.5 → esd_services_api_client-2.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: esd-services-api-client
-Version: 2.0.5
+Version: 2.0.6
 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.0.6/esd_services_api_client/_version.py

@@ -0,0 +1 @@
+__version__ = '2.0.6'

{esd_services_api_client-2.0.5 → esd_services_api_client-2.0.6}/esd_services_api_client/nexus/README.md

@@ -239,17 +239,10 @@ class MyAlgorithm(MinimalisticAlgorithm):
         pass
 
     @inject
-    def __init__(
-        self,
-        input_processor: MyInputProcessor,
-        metrics_provider: MetricsProvider,
-        logger_factory: LoggerFactory,
-    ):
-        super().__init__(input_processor, metrics_provider, logger_factory)
+    def __init__(self, metrics_provider: MetricsProvider, logger_factory: LoggerFactory, input_processor: MyInputProcessor):
+        super().__init__(metrics_provider, logger_factory, input_processor)
 
-    async def _run(
-        self, x_ready: PandasDataFrame, y_ready: PandasDataFrame, **kwargs
-    ) -> PandasDataFrame:
+    async def _run(self, x_ready: PandasDataFrame, y_ready: PandasDataFrame, **kwargs) -> PandasDataFrame:
         return pandas.concat([x_ready, y_ready])
 
 

{esd_services_api_client-2.0.5 → esd_services_api_client-2.0.6}/esd_services_api_client/nexus/algorithms/_baseline_algorithm.py

@@ -1,6 +1,7 @@
 """
  Base algorithm
 """
+import asyncio
 
 #  Copyright (c) 2023. ECCO Sneaks & Data
 #
@@ -19,6 +20,7 @@
 
 
 from abc import abstractmethod
+from functools import reduce
 
 from adapta.metrics import MetricsProvider
 from pandas import DataFrame as PandasDataFrame
@@ -35,12 +37,12 @@ class BaselineAlgorithm(NexusObject):
 
     def __init__(
         self,
-        input_processor: InputProcessor,
         metrics_provider: MetricsProvider,
         logger_factory: LoggerFactory,
+        *input_processors: InputProcessor,
     ):
         super().__init__(metrics_provider, logger_factory)
-        self._input_processor = input_processor
+        self._input_processors = input_processors
 
     @abstractmethod
     async def _run(self, **kwargs) -> PandasDataFrame:
@@ -52,5 +54,18 @@ class BaselineAlgorithm(NexusObject):
         """
         Coroutine that executes the algorithm logic.
         """
-        async with self._input_processor as input_processor:
-            return await self._run(**(await input_processor.process_input(**kwargs)))
+
+        async def _process(processor: InputProcessor) -> dict[str, PandasDataFrame]:
+            async with processor as instance:
+                return await instance.process_input(**kwargs)
+
+        process_tasks: dict[str, asyncio.Task] = {
+            input_processor.__class__.__name__.lower(): asyncio.create_task(
+                _process(input_processor)
+            )
+            for input_processor in self._input_processors
+        }
+        await asyncio.wait(fs=process_tasks.values())
+        results = [task.result() for task in process_tasks.values()]
+
+        return await self._run(**reduce(lambda a, b: a | b, results))

{esd_services_api_client-2.0.5 → esd_services_api_client-2.0.6}/esd_services_api_client/nexus/algorithms/minimalistic.py

@@ -37,8 +37,8 @@ class MinimalisticAlgorithm(BaselineAlgorithm, ABC):
     @inject
     def __init__(
         self,
-        input_processor: InputProcessor,
         metrics_provider: MetricsProvider,
         logger_factory: LoggerFactory,
+        *input_processors: InputProcessor,
     ):
-        super().__init__(input_processor, metrics_provider, logger_factory)
+        super().__init__(metrics_provider, logger_factory, *input_processors)

{esd_services_api_client-2.0.5 → esd_services_api_client-2.0.6}/esd_services_api_client/nexus/algorithms/recursive.py

@@ -39,20 +39,18 @@ class RecursiveAlgorithm(BaselineAlgorithm):
     @inject
     def __init__(
         self,
-        input_processor: InputProcessor,
         metrics_provider: MetricsProvider,
         logger_factory: LoggerFactory,
+        *input_processors: InputProcessor,
     ):
-        super().__init__(input_processor, metrics_provider, logger_factory)
+        super().__init__(metrics_provider, logger_factory, *input_processors)
 
     @abstractmethod
     async def _is_finished(self, **kwargs) -> bool:
         """ """
 
     async def run(self, **kwargs) -> PandasDataFrame:
-        result = await self._run(
-            **(await self._input_processor.process_input(**kwargs))
-        )
+        result = await self._run(**kwargs)
         if self._is_finished(**result):
             return result
         return await self.run(**result)

{esd_services_api_client-2.0.5 → esd_services_api_client-2.0.6}/esd_services_api_client/nexus/input/_functions.py

@@ -62,7 +62,7 @@ async def resolve_readers(*readers: InputReader) -> Dict[str, PandasDataFrame]:
             return await instance.read()
 
     read_tasks: dict[str, asyncio.Task] = {
-        reader.socket.alias: asyncio.create_task(_read(reader)) for reader in readers
+        reader.alias: asyncio.create_task(_read(reader)) for reader in readers
     }
     await asyncio.wait(fs=read_tasks.values())
 

{esd_services_api_client-2.0.5 → esd_services_api_client-2.0.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "esd-services-api-client"
-version = "2.0.5"
+version = "2.0.6"
 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.0.5/esd_services_api_client/_version.py

@@ -1 +0,0 @@
-__version__ = '2.0.5'