Merge pull request #6 from andersinno/redis-conn-by-url

redis: URL support for connection parameters

Author: suutari-ai

src/passari_workflow/db/connection.py

@@ -1,13 +1,15 @@
+import os
+
 from passari_workflow.db import DBSession
 
 from sqlalchemy import create_engine
 
-from urllib.parse import quote_plus
+from urllib.parse import quote
 
 from passari_workflow.config import CONFIG
 
 
-def get_connection_uri():
+def get_connection_uri(*, default="error"):
     """
     Get the connection URI used to connect to the database
     """
@@ -21,12 +23,15 @@ def get_connection_uri():
     if url and not name:
         return url
     elif not url and not name:
+        url = os.getenv("PASSARI_WORKFLOW_DB_URL", os.getenv("DATABASE_URL"))
+        if url or (default != "error"):
+            return url or default
         raise EnvironmentError("Either 'url' or 'name' is required for db")
     elif url and name:
         raise EnvironmentError("The db 'url' and 'name' are exclusive")
 
     if user and host and port:
-        return f"postgresql://{user}:{quote_plus(password)}@{host}:{port}/{name}"
+        return f"postgresql://{user}:{quote(password)}@{host}:{port}/{name}"
     elif user or host or port or password:
         raise EnvironmentError(
             "If 'host' is given in PostgreSQL config,"

src/passari_workflow/redis/connection.py

@@ -1,19 +1,36 @@
+import os
+from urllib.parse import quote
+
 from passari_workflow.config import CONFIG
 
 from redis import Redis
 
 
-def get_redis_connection(db=0):
+def get_redis_connection():
     """
     Get Redis connection used for the workflow, distributed locks and other
     miscellaneous tasks
     """
-    password = CONFIG["redis"].get("password", None)
-    redis = Redis(
-        host=CONFIG["redis"]["host"],
-        port=CONFIG["redis"]["port"],
-        db=db,
-        password=password if password else None
-    )
-
-    return redis
+    redis_url = get_redis_url()
+    return Redis.from_url(redis_url)
+
+
+def get_redis_url():
+    redis_config = CONFIG.get("redis", {})
+    url = redis_config.get("url")
+    host = redis_config.get("host")
+    port = redis_config.get("port")
+    db = redis_config.get("db") or 0
+    password = redis_config.get("password") or None
+
+    if not url and not host:  # Get URL from environment
+        return os.getenv(
+            "PASSARI_WORKFLOW_REDIS_URL",
+            os.getenv("REDIS_URL", "redis://localhost/0"),
+        )
+    elif url and (host or port or db or password):
+        raise EnvironmentError("The 'url' config for Redis is exclusive")
+
+    password_part = f":{quote(password)}@" if password else ""
+    port_part = f":{port}" if port else ""
+    return f"redis://{password_part}{host}{port_part}/{db}"