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

{fred_oss-0.11.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.11.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.11.0 → fred_oss-0.12.0}/src/main/fred/worker/runner/client.py

@@ -9,6 +9,7 @@ from fred.settings import (
 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
@@ -24,14 +25,7 @@ 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 = get_request_queue_name_from_payload(payload=kwargs, keep=False) 
         res_queue = get_response_queue_name_from_payload(payload=kwargs, keep=False) or (

{fred_oss-0.11.0 → fred_oss-0.12.0}/src/main/fred/worker/runner/utils.py

@@ -47,3 +47,28 @@ def get_response_queue_name_from_payload(
         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.11.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.11.0
+Version: 0.12.0
 Summary: FREDOSS
 Home-page: https://fred.fahera.mx
 Author: Fahera Research, Education, and Development

fred_oss-0.11.0/src/main/fred/version

@@ -1 +0,0 @@
-0.11.0