fred-oss 0.13.0__tar.gz → 0.15.0__tar.gz

{fred_oss-0.13.0/src/main/fred_oss.egg-info → fred_oss-0.15.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fred-oss
-Version: 0.13.0
+Version: 0.15.0
 Summary: FREDOSS
 Home-page: https://fred.fahera.mx
 Author: Fahera Research, Education, and Development
@@ -11,6 +11,8 @@ License-File: NOTICE.txt
 Requires-Dist: fire==0.7.1
 Requires-Dist: psutil==7.0.0
 Requires-Dist: redis==6.4.0
+Requires-Dist: fastapi==0.116.2
+Requires-Dist: uvicorn[standard]==0.35.0
 Dynamic: author
 Dynamic: author-email
 Dynamic: description

{fred_oss-0.13.0 → fred_oss-0.15.0}/requirements.txt

@@ -2,6 +2,8 @@
 fire==0.7.1
 # Minimal requirements
 psutil==7.0.0
-# Fred Workers Infra
+# Fred Worker/Runner Infra
 redis==6.4.0
+fastapi==0.116.2
+uvicorn[standard]==0.35.0
 # Databricks Runtime: 16.4 LTS (Python 3.12.3)

{fred_oss-0.13.0 → fred_oss-0.15.0}/src/main/fred/cli/main.py

@@ -18,6 +18,11 @@ class CLIExtensionGroups:
     def runpod(self):
         from fred.integrations.runpod.cli_ext import RunPodExt
         return RunPodExt()
+    
+    @property
+    def runner_server(self):
+        from fred.worker.runner.rest.cli_ext import RunnerServerExt
+        return RunnerServerExt()
 
 
 class CLI(AbstractCLI, CLIExtensionGroups):

fred_oss-0.15.0/src/main/fred/dao/__init__.py

@@ -0,0 +1,11 @@
+from fred.maturity import Maturity, MaturityLevel
+
+
+module_maturity = Maturity(
+    level=MaturityLevel.ALPHA,
+    reference=__name__,
+    message=(
+        "Fred-DAO implementation is in early development "
+        "and therefore currently with incomplete and unstable features."
+    )
+)

fred_oss-0.15.0/src/main/fred/dao/service/_redis.py

@@ -0,0 +1,25 @@
+from redis import Redis, ConnectionPool
+
+from fred.dao.service.utils import get_redis_configs_from_payload
+from fred.dao.service.interface import ServiceConnectionPoolInterface, ServiceInterface
+
+
+class RedisConnectionPool(ServiceConnectionPoolInterface[ConnectionPool]):
+
+    @classmethod
+    def _create_pool(cls, **kwargs) -> ConnectionPool:
+        configs = get_redis_configs_from_payload(payload=kwargs, keep=False)
+        return ConnectionPool(**configs)
+
+
+class RedisService(ServiceInterface[Redis]):
+    instance: Redis
+
+    @classmethod
+    def _create_instance(cls, **kwargs) -> Redis:
+        return Redis(connection_pool=RedisConnectionPool.get_or_create_pool(**kwargs))
+
+    @classmethod
+    def auto(cls, **kwargs) -> "RedisService":
+        cls.instance = Redis(connection_pool=RedisConnectionPool.get_or_create_pool(**kwargs))
+        return cls(**kwargs)

fred_oss-0.15.0/src/main/fred/dao/service/catalog.py

@@ -0,0 +1,22 @@
+import enum
+from functools import lru_cache
+
+from fred.dao.service.interface import ServiceInterface
+from fred.dao.service._redis import RedisService
+
+
+class ServiceCatalog(enum.Enum):
+    REDIS = RedisService
+
+    @classmethod
+    def from_classname(cls, classname: str) -> "ServiceCatalog":
+        for item in cls:
+            if item.value.__name__ == classname:
+                return item
+        raise ValueError(f"No service found for classname: {classname}")
+
+    def service_cls(self) -> type[ServiceInterface]:
+        return self.value
+
+    def auto(self, **kwargs) -> ServiceInterface:
+        return self.value.auto(**kwargs)

fred_oss-0.15.0/src/main/fred/dao/service/interface.py

@@ -0,0 +1,54 @@
+import uuid
+import json
+from functools import lru_cache
+from typing import Generic, TypeVar
+
+T = TypeVar("T")
+
+
+class ServiceConnectionPoolInterface(Generic[T]):
+    pool_registry: dict[str, T] = {}
+
+    @classmethod
+    def get_pool_id(cls, **kwargs) -> str:
+        return str(uuid.uuid5(uuid.NAMESPACE_OID, json.dumps(kwargs, sort_keys=True)))
+
+    @classmethod
+    def _create_pool(cls, **kwargs) -> T:
+        raise NotImplementedError("This method should be implemented by subclasses.")
+
+    @classmethod
+    @lru_cache
+    def get_or_create_pool(cls, **kwargs) -> T:
+        pool_id = cls.get_pool_id(**kwargs)
+        pool = cls.pool_registry.get(pool_id)
+        if not pool:
+            pool = cls.pool_registry[pool_id] = cls._create_pool(**kwargs)
+        return pool
+
+
+class ServiceInterface(Generic[T]):
+    instance: T
+
+    def __init__(self, **kwargs):
+        self.config = kwargs
+
+    @classmethod
+    def _create_instance(cls, **kwargs) -> T:
+        raise NotImplementedError("This method should be implemented by subclasses.")
+    
+    @classmethod
+    def auto(cls, **kwargs) -> "ServiceInterface":
+        raise NotImplementedError("This method should be implemented by subclasses.")
+
+    @property
+    def client(self) -> T:  
+        if not getattr(self, "instance", None):
+            self.instance = self._create_instance(**getattr(self, "config", {}))
+        return self.instance
+    
+    def close(self):
+        # Close the instance if it has a close method.
+        # This method can be overridden by subclasses if needed.
+        if self.instance and hasattr(self.instance, "close") and callable(self.instance.close):
+            self.instance.close()

fred_oss-0.15.0/src/main/fred/dao/service/utils.py

@@ -0,0 +1,37 @@
+from fred.settings import get_environ_variable
+
+
+def get_redis_configs_from_payload(
+        payload: dict,
+        keep: bool = False,
+    ) -> dict:
+    """Extract Redis configuration from the given payload dictionary.
+    This function looks for common Redis configuration keys in the payload
+    dictionary. If a key is not found, it falls back to environment variables.
+    Args:
+        payload (dict): The dictionary from which to extract Redis configuration.
+        keep (bool): If True, the original keys are retained in the payload. If False, they are removed.
+    Returns:
+        dict: A dictionary containing Redis configuration parameters.
+    """
+    host = port = password = db = None
+    for host_key in ["host", "redis_host"]:
+        if (host := payload.get(host_key) if keep else payload.pop(host_key, None)):
+            break
+    for port_key in ["port", "redis_port"]:
+        if (port := payload.get(port_key) if keep else payload.pop(port_key, None)):
+            break
+    for password_key in ["password", "redis_password"]:
+        if (password := payload.get(password_key) if keep else payload.pop(password_key, None)):
+            break
+    for db_key in ["db", "redis_db"]:
+        if (db := payload.get(db_key) if keep else payload.pop(db_key, None)):
+            break
+    return {
+        "host": host or get_environ_variable(name="REDIS_HOST", default="localhost"),
+        "port": int(port or get_environ_variable(name="REDIS_PORT", default=6379)),
+        "password": password or get_environ_variable(name="REDIS_PASSWORD", default=None),
+        "db": int(db or get_environ_variable(name="REDIS_DB", default=0)),
+        "decode_responses": True,
+        **(payload.get("redis_configs", {}) if keep else payload.pop("redis_configs", {})),
+    }

fred_oss-0.15.0/src/main/fred/version

@@ -0,0 +1 @@
+0.15.0

fred_oss-0.15.0/src/main/fred/worker/runner/rest/cli_ext.py

@@ -0,0 +1,32 @@
+from typing import Optional
+
+from fred.cli.interface import IntegrationExtCLI
+from fred.settings import logger_manager
+
+
+logger = logger_manager.get_logger(name=__name__)
+
+
+class RunnerServerExt(IntegrationExtCLI):
+
+    def start(
+            self,
+            include_routers: Optional[list[str]] = None,
+            exclude_routers: Optional[list[str]] = None,
+            fast_api_configs: Optional[dict] = None,
+            server_configs: Optional[dict] = None,
+        ):
+        from fred.worker.runner.rest.server import RunnerServer
+
+        include_routers = include_routers or []
+        exclude_routers = exclude_routers or []
+        fast_api_configs = fast_api_configs or {}
+        server_configs = server_configs or {}
+
+        logger.info("Starting REST server...")
+        server = RunnerServer.auto(
+            include_routers=include_routers,
+            exclude_routers=exclude_routers,
+            **fast_api_configs,
+        )
+        server.start(**server_configs)

fred_oss-0.15.0/src/main/fred/worker/runner/rest/routers/_runner.py

@@ -0,0 +1,40 @@
+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.",
+        )
+
+    def handler_exists(self, classname: str, classpath: str) -> dict:
+        from fred.worker.runner.handler import RunnerHandler
+        from fred.worker.interface import HandlerInterface
+
+        result_payload = {
+            "handler_classname": classname,
+            "handler_classpath": classpath,
+            "exists": False,
+            "is_runner_handler": False,
+            "metadata": {}
+        }
+
+        try:
+            handler = HandlerInterface.find_handler(
+                import_pattern=classpath,
+                handler_classname=classname,
+            )
+            result_payload["is_runner_handler"] = isinstance(handler, RunnerHandler)
+            result_payload["exists"] = True
+            return result_payload
+        except Exception as e:
+            result_payload["metadata"]["error"] = str(e)
+            return result_payload

fred_oss-0.15.0/src/main/fred/worker/runner/rest/routers/catalog.py

@@ -0,0 +1,18 @@
+import enum
+
+from fred.worker.runner.rest.routers.interface import RouterInterface
+from fred.worker.runner.rest.routers._runner import RunnerRouter
+
+
+class RouterCatalog(enum.Enum):
+    EXAMPLE = RouterInterface.auto()  # Default example router directly from the base interface
+    RUNNER = RunnerRouter.auto(
+        prefix="/runner",
+        tags=["Runner"],
+    )
+
+    def get_router_instance(self) -> RouterInterface:
+        return self.value.router
+
+    def get_router_configs(self) -> dict:
+        return self.value.router_configs

fred_oss-0.15.0/src/main/fred/worker/runner/rest/routers/interface.py

@@ -0,0 +1,39 @@
+from dataclasses import dataclass
+from typing import Optional
+
+from fastapi import APIRouter
+
+
+@dataclass(frozen=True, slots=False)
+class RouterInterface:
+    router: APIRouter
+    router_configs: dict
+
+    @classmethod
+    def auto(
+        cls,
+        router: Optional[APIRouter] = None,
+        **kwargs,
+    ) -> "RouterInterface":
+        return cls(
+            router=router or APIRouter(),
+            router_configs=kwargs,
+        )
+
+    def __post_init__(self):
+        self.router.add_api_route(
+            "/ping",
+            self.ping,
+            methods=["GET"],
+            tags=["Health"],
+            summary="Ping the server to check if it's alive.",
+            response_description="A simple pong response.",
+        )
+
+    def ping(self, pong: Optional[str] = None) -> dict:
+        from fred.utils.dateops import datetime_utcnow
+
+        return {
+            "ping_time": datetime_utcnow().isoformat(),
+            "ping_response": pong or "pong",
+        }

fred_oss-0.15.0/src/main/fred/worker/runner/rest/server.py

@@ -0,0 +1,77 @@
+from dataclasses import dataclass
+
+from fastapi import FastAPI
+
+from fred.settings import logger_manager, get_environ_variable
+from fred.worker.runner.rest.routers.catalog import RouterCatalog
+
+logger = logger_manager.get_logger(name=__name__)
+
+
+@dataclass(frozen=True, slots=True)
+class RunnerServer:
+    app: FastAPI
+    include_routers: list[str]
+    exclude_routers: list[str]
+
+    @classmethod
+    def auto(cls, **kwargs) -> "RunnerServer":
+        # Include routers by checking on keyword argument or environment variable
+        include_routers = kwargs.pop("include_routers", None) or get_environ_variable(
+            "FRD_RUNNER_API_INCLUDE_ROUTERS",
+            default=""
+        )
+        if isinstance(include_routers, str):
+            include_routers = [
+                name.upper()
+                for router in include_routers.split(";")
+                if (name := router.strip())
+            ]
+        # Exclude routers by checking on keyword argument or environment variable
+        exclude_routers = kwargs.pop("exclude_routers", None) or get_environ_variable(
+            "FRD_RUNNER_API_EXCLUDE_ROUTERS",
+            default=""
+        )
+        if isinstance(exclude_routers, str):
+            exclude_routers = [
+                name.upper()
+                for router in exclude_routers.split(";")
+                if (name := router.strip())
+            ]
+        # Create FastAPI instance
+        app_instance = FastAPI(**kwargs)
+        return cls(
+            app=app_instance,
+            include_routers=include_routers,
+            exclude_routers=exclude_routers,
+        )
+
+    def __post_init__(self):
+        logger.info("Attempting to register routers...")
+        logger.info("Included routers candidates: %s", self.include_routers or "ALL")
+        logger.info("Excluded routers candidates: %s", self.exclude_routers or "NONE")
+        for router in RouterCatalog:
+            name = router.name.upper()
+            if self.include_routers and name not in self.include_routers:
+                logger.info(f"Skipping router '{name}' as it's not in the include list.")
+                continue
+            if self.exclude_routers and name in self.exclude_routers:
+                logger.info(f"Skipping router '{name}' as it's in the exclude list.")
+                continue
+            logger.info(f"Registering router '{name}'.")
+            self.app.include_router(
+                router.get_router_instance(),
+                **router.get_router_configs(),
+            ) 
+
+    def start(self, **kwargs):
+        import uvicorn
+
+        server_kwargs = {
+            "host": "localhost",
+            "port": 8000,
+            "log_level": "info",
+            **kwargs,
+        }
+
+        uvicorn.run(self.app, **server_kwargs)

{fred_oss-0.13.0 → fred_oss-0.15.0/src/main/fred_oss.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fred-oss
-Version: 0.13.0
+Version: 0.15.0
 Summary: FREDOSS
 Home-page: https://fred.fahera.mx
 Author: Fahera Research, Education, and Development
@@ -11,6 +11,8 @@ License-File: NOTICE.txt
 Requires-Dist: fire==0.7.1
 Requires-Dist: psutil==7.0.0
 Requires-Dist: redis==6.4.0
+Requires-Dist: fastapi==0.116.2
+Requires-Dist: uvicorn[standard]==0.35.0
 Dynamic: author
 Dynamic: author-email
 Dynamic: description

{fred_oss-0.13.0 → fred_oss-0.15.0}/src/main/fred_oss.egg-info/SOURCES.txt

@@ -11,6 +11,12 @@ src/main/fred/cli/__init__.py
 src/main/fred/cli/__main__.py
 src/main/fred/cli/interface.py
 src/main/fred/cli/main.py
+src/main/fred/dao/__init__.py
+src/main/fred/dao/service/__init__.py
+src/main/fred/dao/service/_redis.py
+src/main/fred/dao/service/catalog.py
+src/main/fred/dao/service/interface.py
+src/main/fred/dao/service/utils.py
 src/main/fred/integrations/databricks/__init__.py
 src/main/fred/integrations/databricks/cli_ext.py
 src/main/fred/integrations/databricks/runtime.py
@@ -36,6 +42,13 @@ src/main/fred/worker/runner/plugins/__init__.py
 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/cli_ext.py
+src/main/fred/worker/runner/rest/server.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
+src/main/fred/worker/runner/rest/routers/interface.py
 src/main/fred_oss.egg-info/PKG-INFO
 src/main/fred_oss.egg-info/SOURCES.txt
 src/main/fred_oss.egg-info/dependency_links.txt

fred_oss-0.15.0/src/main/fred_oss.egg-info/requires.txt

@@ -0,0 +1,5 @@
+fire==0.7.1
+psutil==7.0.0
+redis==6.4.0
+fastapi==0.116.2
+uvicorn[standard]==0.35.0

fred_oss-0.13.0/src/main/fred/version

@@ -1 +0,0 @@
-0.13.0

fred_oss-0.13.0/src/main/fred_oss.egg-info/requires.txt

@@ -1,3 +0,0 @@
-fire==0.7.1
-psutil==7.0.0
-redis==6.4.0