Refine connection strings (dotenv), Makefile targets

Author: Andrew Brookins

Makefile

@@ -14,6 +14,7 @@ help:
 	@echo "  format      reformat code"
 	@echo "  test        run all the tests"
 	@echo "  shell       open a Poetry shell"
+	@echo "  redis       start a Redis instance with Docker"
 	@echo ""
 	@echo "Check the Makefile to know exactly what each target is doing."
 
@@ -44,7 +45,7 @@ format: $(INSTALL_STAMP)
 .PHONY: test
 test: $(INSTALL_STAMP)
 	#$(POETRY) run pytest ./tests/ --cov-report term-missing --cov-fail-under 100 --cov $(NAME)
-	$(POETRY) run pytest ./tests/
+	$(POETRY) run pytest -s -vv ./tests/
 
 .PHONY: shell
 shell: $(INSTALL_STAMP)
@@ -53,3 +54,7 @@ shell: $(INSTALL_STAMP)
 .PHONY: redis
 redis:
 	docker-compose up -d
+
+
+.PHONY: all
+all: redis $(INSTALL_STAMP) lint test

docker-compose.yml

@@ -3,7 +3,7 @@ version: "3.8"
 services:
   redis:
     image: "redislabs/redismod:edge"
-    entrypoint: ["redis-server", "--appendonly", "yes", "--loadmodule", "/usr/lib/redis/modules/rejson.so"]
+    entrypoint: ["redis-server", "--appendonly", "yes", "--loadmodule", "/usr/lib/redis/modules/rejson.so", "--loadmodule", "/usr/lib/redis/modules/redisearch.so"]
     restart: always
     ports:
       - "6380:6379"

poetry.lock

@@ -16,6 +16,7 @@ pptree = "^3.1"
 types-redis = "^3.5.9"
 types-six = "^1.16.1"
 python-ulid = "^1.0.3"
+python-dotenv = "^0.19.1"
 
 [tool.poetry.dev-dependencies]
 mypy = "^0.910"

pyproject.toml

@@ -1,5 +1,26 @@
+import os
+
+import dotenv
 import redis
 
 
-def get_redis_connection() -> redis.Redis:
-    return redis.Redis(decode_responses=True)
+dotenv.load_dotenv()
+
+URL = os.environ.get("REDIS_OM_URL", None)
+
+
+def get_redis_connection(**kwargs) -> redis.Redis:
+    # If someone passed in a 'url' parameter, or specified a REDIS_OM_URL
+    # environment variable, we'll create the Redis client from the URL.
+    url = kwargs.pop("url", URL)
+    if not url:
+        import ipdb
+
+        ipdb.set_trace()
+    if url:
+        return redis.from_url(url, **kwargs)
+
+    # Decode from UTF-8 by default
+    if "decode_responses" not in kwargs:
+        kwargs["decode_responses"] = True
+    return redis.Redis(**kwargs)

redis_developer/connections.py

@@ -37,6 +37,7 @@
 from redis.client import Pipeline
 from ulid import ULID
 
+from ..connections import get_redis_connection
 from .encoders import jsonable_encoder
 from .render_tree import render_tree
 from .token_escaper import TokenEscaper
@@ -997,7 +998,7 @@ def __new__(cls, name, bases, attrs, **kwargs):  # noqa C901
             )
         if not getattr(new_class._meta, "database", None):
             new_class._meta.database = getattr(
-                base_meta, "database", redis.Redis(decode_responses=True)
+                base_meta, "database", get_redis_connection()
             )
         if not getattr(new_class._meta, "primary_key_creator_cls", None):
             new_class._meta.primary_key_creator_cls = getattr(

redis_developer/model/model.py

@@ -17,7 +17,6 @@ def redis():
 
 @pytest.fixture
 def key_prefix():
-    # TODO
     yield "redis-developer"