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

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

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

fred_oss-0.34.0/src/main/fred/version

@@ -0,0 +1 @@
+0.34.0

fred_oss-0.34.0/src/main/fred/worker/runner/rest/auth.py

@@ -0,0 +1,22 @@
+from fastapi import Security, HTTPException, status
+from fastapi.security import APIKeyHeader
+
+from fred.worker.runner.rest.settings import FRD_RESTAPI_TOKEN
+
+async def verify_key(
+        api_key_header: str = Security(
+            APIKeyHeader(
+                name="X-API-Key",
+                auto_error=False
+            )
+        ),
+):
+    """
+    Verify the provided API key against the expected token.
+    Raises an HTTPException if the key is invalid or missing.
+    """
+    if api_key_header != FRD_RESTAPI_TOKEN:
+        raise HTTPException(
+            status_code=status.HTTP_401_UNAUTHORIZED,
+            detail="Invalid or missing API Key",
+        )

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

@@ -1,7 +1,11 @@
 from dataclasses import dataclass
 
+from fred.settings import logger_manager
+from fred.utils.dateops import datetime_utcnow
 from fred.worker.runner.rest.routers.interface import RouterInterface
 
+logger = logger_manager.get_logger(name=__name__)
+
 
 class RunnerRouterMethods:
 
@@ -28,7 +32,20 @@ class RunnerRouterMethods:
         except Exception as e:
             result_payload["metadata"]["error"] = str(e)
             return result_payload
-        
+
+    def qlen(self, queue_slug: str) -> dict:
+
+        snapshot_at = datetime_utcnow().isoformat()
+        req_queue = self.runner_backend.queue(f"req:{queue_slug}")
+        res_queue = self.runner_backend.queue(f"res:{queue_slug}")
+
+        return {
+            "snapshot_at": snapshot_at,
+            "queue_slug": queue_slug,
+            "req": req_queue.size(),
+            "res": res_queue.size(),
+        }
+
     def runner_start(self, payload: dict) -> dict:
         from fred.worker.runner.model.catalog import RunnerModelCatalog
         from fred.worker.runner.plugins.catalog import PluginCatalog
@@ -44,10 +61,31 @@ class RunnerRouterMethods:
             "runner_id": plugin.execute(runner_spec, wait_for_exec=wait_for_exec).runner_id,
             "queue_slug": runner_spec.queue_slug,
         }
+    
+    def runner_execute(self, payload: dict) -> dict:
+        from fred.worker.runner.model.catalog import RunnerModelCatalog
+
+        request_id = payload.pop("request_id", None)
+        queue_slug = payload.pop("queue_slug", None) or (
+            logger.error("No 'queue_slug' value provided; defaulting to 'demo'.")
+            or "demo"
+        )
+
+        item = RunnerModelCatalog.ITEM.value.uuid(payload=payload, uuid_hash=False)
+        request = item.as_request(use_hash=False, request_id=request_id)
+        request.dispatch(
+            request_queue=self.runner_backend.queue(f"req:{queue_slug}")
+        )
+        return {
+            "item_id": item.item_id,
+            "request_id": request.request_id,
+            "queue_slug": queue_slug,
+            "dispatched_at": datetime_utcnow().isoformat(),
+        }
 
 
 @dataclass(frozen=True, slots=False)
-class RunnerRouter(RouterInterface, RunnerRouterMethods):
+class RunnerRouter(RouterInterface.with_backend(), RunnerRouterMethods):
 
     def __post_init__(self):
         self.router.add_api_route(
@@ -58,6 +96,14 @@ class RunnerRouter(RouterInterface, RunnerRouterMethods):
             summary="Check if a handler class exists and is a RunnerHandler.",
             response_description="Details about the handler class.",
         )
+        self.router.add_api_route(
+            "/qlen/{queue_slug}",
+            self.qlen,
+            methods=["GET"],
+            tags=["Runner"],
+            summary="Get the length of the request and response queues for a given queue slug.",
+            response_description="The lengths of the request and response queues.",
+        )
         self.router.add_api_route(
             "/start",
             self.runner_start,
@@ -66,3 +112,11 @@ class RunnerRouter(RouterInterface, RunnerRouterMethods):
             summary="Start a runner using the specified plugin.",
             response_description="The ID of the started runner.",
         )
+        self.router.add_api_route(
+            "/execute",
+            self.runner_execute,
+            methods=["POST"],
+            tags=["Runner"],
+            summary="Execute a task by dispatching a request to the specified queue.",
+            response_description="Details about the dispatched request.",
+        )

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

@@ -1,11 +1,31 @@
 from dataclasses import dataclass
 from typing import Optional
 
+from fred.worker.runner.backend import RunnerBackend
+from fred.worker.runner.settings import FRD_RUNNER_BACKEND
+
 from fastapi import APIRouter
 
 
+class RouterInterfaceBackendMixin:
+    """Base class for router interfaces that require a backend service."""
+    runner_backend: RunnerBackend
+
+    @classmethod
+    def with_backend(cls, service_name: Optional[str] = None, **kwargs) -> type["RouterInterfaceBackendMixin"]:
+        # Avoid re-initializing if already set
+        if getattr(cls, "runner_backend", None):
+            return cls
+        # Initialize the backend once and assign to the class attribute
+        cls.runner_backend = RunnerBackend.auto(
+            service_name=service_name or FRD_RUNNER_BACKEND,
+            **kwargs,
+        )
+        return cls
+
+
 @dataclass(frozen=True, slots=False)
-class RouterInterface:
+class RouterInterface(RouterInterfaceBackendMixin):
     router: APIRouter
     router_configs: dict
 

{fred_oss-0.32.0 → fred_oss-0.34.0}/src/main/fred/worker/runner/rest/server.py

@@ -1,9 +1,11 @@
 from dataclasses import dataclass
 
-from fastapi import FastAPI
+from fastapi import FastAPI, Depends
 
 from fred.settings import logger_manager, get_environ_variable
+from fred.worker.runner.rest.settings import FRD_RESTAPI_TOKEN
 from fred.worker.runner.rest.routers.catalog import RouterCatalog
+from fred.worker.runner.rest.auth import verify_key
 
 logger = logger_manager.get_logger(name=__name__)
 
@@ -39,6 +41,9 @@ class RunnerServer:
                 if (name := router.strip())
             ]
         # Create FastAPI instance
+        kwargs["dependencies"] = kwargs.get("dependencies", []) + [
+            Depends(verify_key),
+        ]
         app_instance = FastAPI(**kwargs)
         return cls(
             app=app_instance,

fred_oss-0.34.0/src/main/fred/worker/runner/rest/settings.py

@@ -0,0 +1,12 @@
+from fred.settings import get_environ_variable, logger_manager
+
+logger = logger_manager.get_logger(name=__name__)
+
+
+FRD_RESTAPI_TOKEN = get_environ_variable(
+    "FRD_RESTAPI_TOKEN",
+    default=None
+)
+if not FRD_RESTAPI_TOKEN:
+    logger.warning("FRD_RESTAPI_TOKEN not found in environment; using default token 'changeme'.")
+    FRD_RESTAPI_TOKEN = "changeme"

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

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

{fred_oss-0.32.0 → fred_oss-0.34.0}/src/main/fred_oss.egg-info/SOURCES.txt

@@ -73,8 +73,10 @@ src/main/fred/worker/runner/plugins/_local.py
 src/main/fred/worker/runner/plugins/catalog.py
 src/main/fred/worker/runner/plugins/interface.py
 src/main/fred/worker/runner/rest/__init__.py
+src/main/fred/worker/runner/rest/auth.py
 src/main/fred/worker/runner/rest/cli_ext.py
 src/main/fred/worker/runner/rest/server.py
+src/main/fred/worker/runner/rest/settings.py
 src/main/fred/worker/runner/rest/routers/__init__.py
 src/main/fred/worker/runner/rest/routers/_runner.py
 src/main/fred/worker/runner/rest/routers/catalog.py

fred_oss-0.32.0/src/main/fred/version

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