fred-oss 0.10.0__tar.gz → 0.12.0__tar.gz

{fred_oss-0.10.0/src/main/fred_oss.egg-info → fred_oss-0.12.0}/PKG-INFO

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

fred_oss-0.12.0/src/main/fred/version

@@ -0,0 +1 @@
+0.12.0

{fred_oss-0.10.0 → fred_oss-0.12.0}/src/main/fred/worker/runner/client.py

@@ -6,6 +6,11 @@ from fred.settings import (
     get_environ_variable,
     logger_manager,
 )
+from fred.worker.runner.utils import (
+    get_request_queue_name_from_payload,
+    get_response_queue_name_from_payload,
+    get_redis_configs_from_payload,
+)
 
 from redis import Redis
 
@@ -20,20 +25,12 @@ class RunnerClient:
 
     @classmethod
     def auto(cls, **kwargs) -> "RunnerClient":
-        redis_configs = {
-            "host": kwargs.get("host") or get_environ_variable(name="REDIS_HOST", default="localhost"),
-            "port": int(kwargs.get("port") or get_environ_variable(name="REDIS_PORT", default=6379)),
-            "password": get_environ_variable(name="REDIS_PASSWORD", default=None),
-            "db": int(kwargs.get("db") or get_environ_variable(name="REDIS_DB", default=0)),
-            "decode_responses": True,
-            **kwargs.pop("redis_configs", {}),
-        }
+        redis_configs = get_redis_configs_from_payload(payload=kwargs, keep=False)
         redis_instance = Redis(**redis_configs)
-        req_queue = kwargs.get("request_queue") or get_environ_variable(name="FRD_RUNNER_REQUEST_QUEUE", default=None) or (
-            logger.warning("Redis request queue not specified; defaulting to 'req:demo'.") or "req:demo"
-        )
-        res_queue = kwargs.get("response_queue") or get_environ_variable(name="FRD_RUNNER_RESPONSE_QUEUE", default=None) or (
-            logger.warning("Redis response queue not specified; defaulting to inferring pattern.") or f"res:{req_queue.split(':')[-1]}"
+        req_queue = get_request_queue_name_from_payload(payload=kwargs, keep=False) 
+        res_queue = get_response_queue_name_from_payload(payload=kwargs, keep=False) or (
+            logger.warning("Redis response queue not specified; defaulting to inferring pattern.")
+            or f"res:{req_queue.split(':')[-1]}"
         )
         logger.info(f"Connecting to Redis, using request queue '{req_queue}' and response queue '{res_queue}'.")
         return cls(

{fred_oss-0.10.0 → fred_oss-0.12.0}/src/main/fred/worker/runner/handler.py

@@ -8,6 +8,10 @@ from fred.settings import (
     get_environ_variable,
     logger_manager,
 )
+from fred.worker.runner.utils import (
+    get_request_queue_name_from_payload,
+    get_response_queue_name_from_payload,
+)
 
 from redis import Redis
 
@@ -37,12 +41,8 @@ class RunnerHandler(HandlerInterface):
         }
         # Connect to Redis
         redis = Redis(**redis_configs)
-        req_queue = payload.pop("redis_request_queue", None) or get_environ_variable(name="FRD_RUNNER_REQUEST_QUEUE", default=None) or (
-            logger.warning("Redis request queue not specified; defaulting to: 'req:demo'") or "req:demo"
-        )
-        res_queue = payload.pop("redis_response_queue", None) or get_environ_variable(name="FRD_RUNNER_RESPONSE_QUEUE", default=None) or (
-            logger.warning("Redis response queue not specified; defaulting to: None (not using response queue)") or None
-        )
+        req_queue = get_request_queue_name_from_payload(payload=payload, keep=False) 
+        res_queue = get_response_queue_name_from_payload(payload=payload, keep=False)
         # Handoff to target handler (i.e., runner)
         runner_configs = payload.pop("runner_configs")
         runner_id = runner_configs.pop("id", str(uuid.uuid4()))

fred_oss-0.12.0/src/main/fred/worker/runner/utils.py

@@ -0,0 +1,74 @@
+from typing import Optional
+
+from fred.settings import get_environ_variable, logger_manager
+
+logger = logger_manager.get_logger(name=__name__)
+
+
+def get_queue_name_from_payload(
+        payload: dict,
+        search_keys: list[str],
+        env_fallback: str,
+        default: Optional[str] = None,
+        keep: bool = False,
+    ) -> str:
+    for key in search_keys:
+        if (queue_name := payload.get(key) if keep else payload.pop(key, None)):
+            return queue_name
+    return (
+        queue_name
+        or get_environ_variable(name=env_fallback, default=None)
+        or (
+            logger.warning(f"Redis queue not specified; defaulting to: '{default}'")
+            or default
+        )
+    )
+
+def get_request_queue_name_from_payload(
+        payload: dict,
+        keep: bool = False,
+) -> Optional[str]:
+    return get_queue_name_from_payload(
+        payload=payload,
+        search_keys=["redis_request_queue", "request_queue", "req_queue"],
+        env_fallback="FRD_RUNNER_REQUEST_QUEUE",
+        default="req:demo",
+        keep=keep,
+    )
+
+def get_response_queue_name_from_payload(
+        payload: dict,
+        keep: bool = False,
+) -> Optional[str]:
+    return get_queue_name_from_payload(
+        payload=payload,
+        search_keys=["redis_response_queue", "response_queue", "res_queue"],
+        env_fallback="FRD_RUNNER_RESPONSE_QUEUE",
+        default=None,
+        keep=keep,
+    )
+
+def get_redis_configs_from_payload(
+        payload: dict,
+        keep: bool = False,
+    ) -> dict:
+    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.10.0 → fred_oss-0.12.0/src/main/fred_oss.egg-info}/PKG-INFO

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

{fred_oss-0.10.0 → fred_oss-0.12.0}/src/main/fred_oss.egg-info/SOURCES.txt

@@ -30,6 +30,7 @@ src/main/fred/worker/interface.py
 src/main/fred/worker/runner/__init__.py
 src/main/fred/worker/runner/client.py
 src/main/fred/worker/runner/handler.py
+src/main/fred/worker/runner/utils.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.10.0/src/main/fred/version

@@ -1 +0,0 @@
-0.10.0