fred-oss 0.45.0__tar.gz → 0.47.0__tar.gz

{fred_oss-0.45.0/src/main/fred_oss.egg-info → fred_oss-0.47.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fred-oss
-Version: 0.45.0
+Version: 0.47.0
 Summary: FREDOSS
 Home-page: https://fred.fahera.mx
 Author: Fahera Research, Education, and Development

fred_oss-0.47.0/src/main/fred/version

@@ -0,0 +1 @@
+0.47.0

{fred_oss-0.45.0 → fred_oss-0.47.0}/src/main/fred/worker/interface.py

@@ -2,6 +2,7 @@ import time
 from typing import overload, Callable, Optional
 from dataclasses import dataclass, field
 
+from fred.worker.settings import FRD_WORKER_DEFAULT_BROADCAST
 from fred.future.impl import Future  # Should we make this import lazy?
 from fred.utils.dateops import datetime_utcnow
 from fred.settings import (
@@ -139,14 +140,14 @@ class HandlerInterface:
         return json.loads(metadata_serialized)
 
     @overload
-    def run(self, event: dict, as_future: bool = True, future_id: Optional[str] = None) -> Future[dict]:
+    def run(self, event: dict, as_future: bool = True, broadcast: Optional[bool] = None, future_id: Optional[str] = None) -> Future[dict]:
         ...
 
     @overload
-    def run(self, event: dict, as_future: bool = False, future_id: Optional[str] = None) -> dict:
+    def run(self, event: dict, as_future: bool = False, broadcast: Optional[bool] = None, future_id: Optional[str] = None) -> dict:
         ...
 
-    def run(self, event: dict, as_future: bool = False, future_id: Optional[str] = None) -> dict | Future[dict]:
+    def run(self, event: dict, as_future: bool = False, broadcast: Optional[bool] = None, future_id: Optional[str] = None) -> dict | Future[dict]:
         """Process an incoming event and return a structured response.
         The event is expected to be a dictionary with at least an 'id' and 'input' keys.
         The 'input' key should contain the payload to be processed.
@@ -158,7 +159,11 @@ class HandlerInterface:
                 If requested as a Future, returns a Future that will resolve to the response dictionary.
         """
         if as_future:
-            return Future(function=lambda: self.run(event=event, as_future=False), future_id=future_id)
+            return Future(
+                future_id=future_id,
+                function=lambda: self.run(event=event, as_future=False),
+                broadcast=FRD_WORKER_DEFAULT_BROADCAST if broadcast is None else broadcast,
+            )
         # Extract payload and event ID
         payload = event.get("input", {})
         job_event_identifier = event.get("id")

{fred_oss-0.45.0 → fred_oss-0.47.0}/src/main/fred/worker/runner/client.py

@@ -124,6 +124,10 @@ class RunnerClient:
             retry_backoff_rate: float = 0.1,
             **kwargs,
     ) -> Future:
+        logger.warning(
+            "Using 'pullsync' is to be deprecated soon; use the 'Future.subscribe' "
+            "method instead (by default this is used on fetch_result with 'use_pullsync=False')."
+        )
         return Future(
             function=self._pullsync,
             request_id=request_id,
@@ -160,8 +164,16 @@ class RunnerClient:
                 return False
         return True
 
-    def fetch_result(self, request_id: str, now: bool = False, timeout: Optional[float] = None, **kwargs) -> Optional[dict]:
-        future = self.pullsync(request_id=request_id, **kwargs)
+    def fetch_result(
+            self,
+            request_id: str,
+            now: bool = False,
+            timeout: Optional[float] = None,
+            use_pullsync: bool = False,
+            **kwargs,
+    ) -> Optional[dict]:
+        future = self.pullsync(request_id=request_id, **kwargs) \
+            if use_pullsync else Future.subscribe(future_id=request_id, **kwargs)
         if now:
             return future.getwhatevernow()
         return future.wait_and_resolve(timeout=timeout)

{fred_oss-0.45.0 → fred_oss-0.47.0}/src/main/fred/worker/runner/rest/routers/_runner.py

@@ -1,5 +1,7 @@
 from dataclasses import dataclass
+from typing import Optional
 
+from fred.future import Future
 from fred.settings import logger_manager
 from fred.utils.dateops import datetime_utcnow
 from fred.worker.runner.rest.routers.interface import RouterInterface
@@ -86,6 +88,21 @@ class RunnerRouterMethods:
             "dispatched_at": datetime_utcnow().isoformat(),
         }
 
+    def runner_output(self, request_id: str, nonblocking: bool = False, timeout: Optional[float] = None) -> dict:
+
+        output_requested_at = datetime_utcnow().isoformat()
+        # Subscribe to the future result using the request_id
+        future = Future.subscribe(future_id=request_id)
+        if nonblocking:
+            # TODO: Implement non-blocking fetch logic... let's ensure it's worth the effort.
+            raise NotImplementedError("Non-blocking fetch not implemented yet...")
+        return {
+            "request_id": request_id,
+            "output_requested_at": output_requested_at,
+            "output_delivered_at": datetime_utcnow().isoformat(),
+            "output": future.wait_and_resolve(timeout=timeout),
+        }
+
 
 @dataclass(frozen=True, slots=False)
 class RunnerRouter(RouterInterface.with_backend(), RunnerRouterMethods):
@@ -123,3 +140,11 @@ class RunnerRouter(RouterInterface.with_backend(), RunnerRouterMethods):
             summary="Execute a task by dispatching a request to the specified queue.",
             response_description="Details about the dispatched request.",
         )
+        self.router.add_api_route(
+            "/output/{request_id}",
+            self.runner_output,
+            methods=["GET"],
+            tags=["Runner"],
+            summary="Fetch the output of a previously dispatched request.",
+            response_description="The output of the request.",
+        )

fred_oss-0.47.0/src/main/fred/worker/settings.py

@@ -0,0 +1,7 @@
+from fred.settings import get_environ_variable
+
+
+FRD_WORKER_DEFAULT_BROADCAST = bool(int(get_environ_variable(
+    name="FRD_WORKER_BROADCAST_DEFAULT",
+    default="0",
+)) or 0)

{fred_oss-0.45.0 → fred_oss-0.47.0/src/main/fred_oss.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fred-oss
-Version: 0.45.0
+Version: 0.47.0
 Summary: FREDOSS
 Home-page: https://fred.fahera.mx
 Author: Fahera Research, Education, and Development

{fred_oss-0.45.0 → fred_oss-0.47.0}/src/main/fred_oss.egg-info/SOURCES.txt

@@ -53,6 +53,7 @@ src/main/fred/utils/dateops.py
 src/main/fred/utils/runtime.py
 src/main/fred/worker/__init__.py
 src/main/fred/worker/interface.py
+src/main/fred/worker/settings.py
 src/main/fred/worker/runner/__init__.py
 src/main/fred/worker/runner/backend.py
 src/main/fred/worker/runner/client.py

fred_oss-0.45.0/src/main/fred/version

@@ -1 +0,0 @@
-0.45.0