fred-oss 0.30.0__tar.gz → 0.32.0__tar.gz

{fred_oss-0.30.0/src/main/fred_oss.egg-info → fred_oss-0.32.0}/PKG-INFO

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

{fred_oss-0.30.0 → fred_oss-0.32.0}/src/main/fred/future/impl.py

@@ -239,9 +239,9 @@ class Future(MonadInterface[A]):
     def pullsync(
             cls,
             future_id: str,
-            delay: float = 0.001,
-            delay_incr: float = 0.001,
-            delay_max: float = 30,
+            retry_delay: float = 0.2,
+            retry_backoff_rate: float = 0.1,
+            retry_delay_max: float = 15,
             timeout: float = FRD_FUTURE_DEFAULT_EXPIRATION,
             on_complete: Optional[CallbackInterface] = None,
             **kwargs
@@ -252,9 +252,9 @@ class Future(MonadInterface[A]):
 
         Args:
             future_id (str): The unique identifier of the future to be pulled.
-            delay (float): Initial delay between checks for the future's completion.
-            delay_incr (float): Incremental increase in delay after each check.
-            delay_max (float): Maximum delay between checks.
+            retry_delay (float): Initial delay between checks for the future's completion.
+            retry_backoff_rate (float): Incremental increase in delay after each check.
+            retry_delay_max (float): Maximum delay between checks.
             timeout (float): Maximum time to wait for the future to complete.
             on_complete (Optional[CallbackInterface]): An optional callback to be executed
                                                       when the future completes.
@@ -267,9 +267,9 @@ class Future(MonadInterface[A]):
         return cls(
             function=lambda: pull_future_result(
                 future_id=future_id,
-                delay=delay,
-                delay_incr=delay_incr,
-                delay_max=delay_max,
+                retry_delay=retry_delay,
+                retry_backoff_rate=retry_backoff_rate,
+                retry_delay_max=retry_delay_max,
                 timeout=timeout,
             ),
             on_complete=on_complete,

{fred_oss-0.30.0 → fred_oss-0.32.0}/src/main/fred/future/utils.py

@@ -8,9 +8,9 @@ A = TypeVar("A")
 
 def pull_future_result(
         future_id: str,
-        delay: float = 0.001,
-        delay_incr: float = 0.001,
-        delay_max: float = 30,
+        retry_delay: float = 0.2,
+        retry_backoff_rate: float = 0.1,
+        retry_delay_max: float = 15,
         timeout: float = FRD_FUTURE_DEFAULT_EXPIRATION,
     ) -> A:
     from fred.future.impl import FutureResult, FutureUndefinedInProgress, FutureUndefinedPending
@@ -25,15 +25,15 @@ def pull_future_result(
             return value.resolve()
         case FutureUndefinedPending() | FutureUndefinedInProgress():
             # If the future is not yet defined, wait for it to complete
-            time.sleep(delay)
+            time.sleep(retry_delay)
             # Increase the delay for the next check to avoid busy waiting (exponential backoff) capped at delay_max
             return pull_future_result(
                 future_id=future_id,
-                delay=(delay + delay_incr) if delay < delay_max else delay_max,
-                delay_incr=delay,
-                delay_max=delay_max,
+                retry_delay=min(retry_delay * (1 + retry_backoff_rate), retry_delay_max),
+                retry_backoff_rate=retry_backoff_rate,
+                retry_delay_max=retry_delay_max,
                 # TODO: Consider using a more precise timeout mechanism based on elapsed time
-                timeout=timeout - delay,
+                timeout=timeout - retry_delay,
             )
         case _:
             raise ValueError(f"Unknown future state for ID '{future_id}'")

fred_oss-0.32.0/src/main/fred/version

@@ -0,0 +1 @@
+0.32.0

{fred_oss-0.30.0 → fred_oss-0.32.0}/src/main/fred/worker/runner/client.py

@@ -92,7 +92,8 @@ class RunnerClient:
             self,
             request_id: str,
             retry_sync: int = 10,
-            retry_delay: float = 0.5,
+            retry_delay: float = 0.2,
+            retry_backoff_rate: float = 0.1,
             **kwargs,
     ) -> Future:
         # TODO: Once the broadcast method is implemented, we can add a warning notice regarding
@@ -102,6 +103,7 @@ class RunnerClient:
             request_id=request_id,
             retry_sync=retry_sync,
             retry_delay=retry_delay,
+            retry_backoff_rate=retry_backoff_rate,
             fail=True,  # Always fail inside the future to propagate the exception
         )
         return future.flat_map(
@@ -112,7 +114,8 @@ class RunnerClient:
             self,
             request_id: str,
             retry_sync: int = 10,
-            retry_delay: float = 0.5,
+            retry_delay: float = 0.2,
+            retry_backoff_rate: float = 0.1,
             fail: bool = False,
     ) -> bool:
         if not self.fetch_status(request_id=request_id):
@@ -120,7 +123,8 @@ class RunnerClient:
             retry_kwargs = {
                 "request_id": request_id,
                 "retry_sync": retry_sync - 1,
-                "retry_delay": retry_delay,
+                "retry_delay": retry_delay * (1 + retry_backoff_rate),  # Exponential backoff
+                "retry_backoff_rate": retry_backoff_rate,
                 "fail": fail,
             }
             if retry_sync:

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

@@ -1,19 +1,9 @@
 from dataclasses import dataclass
+
 from fred.worker.runner.rest.routers.interface import RouterInterface
 
 
-@dataclass(frozen=True, slots=False)
-class RunnerRouter(RouterInterface):
-
-    def __post_init__(self):
-        self.router.add_api_route(
-            "/handler_exists",
-            self.handler_exists,
-            methods=["GET"],
-            tags=["Runner"],
-            summary="Check if a handler class exists and is a RunnerHandler.",
-            response_description="Details about the handler class.",
-        )
+class RunnerRouterMethods:
 
     def handler_exists(self, classname: str, classpath: str) -> dict:
         from fred.worker.runner.handler import RunnerHandler
@@ -38,3 +28,41 @@ class RunnerRouter(RouterInterface):
         except Exception as e:
             result_payload["metadata"]["error"] = str(e)
             return result_payload
+        
+    def runner_start(self, payload: dict) -> dict:
+        from fred.worker.runner.model.catalog import RunnerModelCatalog
+        from fred.worker.runner.plugins.catalog import PluginCatalog
+        # Determine which plugin to use; default to LOCAL if not specified
+        plugin_name: str = payload.pop("plugin", "LOCAL")
+        wait_for_exec: bool = payload.pop("wait_for_exec", False)
+        # Create the RunnerSpec from the provided payload
+        # TODO: Instead on depending on parsing a dict... Can we implement a base-model to facilitate fast-api validation?
+        runner_spec = RunnerModelCatalog.RUNNER_SPEC.value.from_payload(payload=payload)
+        # Instantiate the plugin and execute the runner
+        plugin = PluginCatalog[plugin_name.upper()]()
+        return {
+            "runner_id": plugin.execute(runner_spec, wait_for_exec=wait_for_exec).runner_id,
+            "queue_slug": runner_spec.queue_slug,
+        }
+
+
+@dataclass(frozen=True, slots=False)
+class RunnerRouter(RouterInterface, RunnerRouterMethods):
+
+    def __post_init__(self):
+        self.router.add_api_route(
+            "/handler_exists",
+            self.handler_exists,
+            methods=["GET"],
+            tags=["Runner"],
+            summary="Check if a handler class exists and is a RunnerHandler.",
+            response_description="Details about the handler class.",
+        )
+        self.router.add_api_route(
+            "/start",
+            self.runner_start,
+            methods=["POST"],
+            tags=["Runner"],
+            summary="Start a runner using the specified plugin.",
+            response_description="The ID of the started runner.",
+        )

{fred_oss-0.30.0 → fred_oss-0.32.0/src/main/fred_oss.egg-info}/PKG-INFO

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

fred_oss-0.30.0/src/main/fred/version

@@ -1 +0,0 @@
-0.30.0