Merge pull request #338 from dmgav/redis-addr-sec

Modify Redis address validation code to allow passing security credentials with the address

Author: dmgav

.github/workflows/black.yml

@@ -15,7 +15,7 @@ jobs:
           # installation problems if out of date.
           python -m pip install --upgrade pip setuptools numpy
 
-          pip install black
+          pip install black!=25.11.0
       - name: Run black
         run: |
           black . --check

bluesky_queueserver/manager/config.py

@@ -361,8 +361,6 @@ def __init__(self, *, parser, args):
             value_config=self._get_value_from_config("redis_addr"),
             value_cli=self._args_existing("redis_addr"),
         )
-        if redis_addr.count(":") > 1:
-            raise ConfigError(f"Redis address is incorrectly formatted: {redis_addr}")
         self._settings["redis_addr"] = redis_addr
 
         redis_name_prefix = self._get_param(

bluesky_queueserver/manager/plan_queue_ops.py

@@ -257,7 +257,9 @@ async def start(self):
             self._lock = asyncio.Lock()
             async with self._lock:
                 try:
-                    host = f"redis://{self._redis_host}"
+                    if "://" not in self._redis_host:
+                        host = f"redis://{self._redis_host}"
+                    logger.debug("Connecting to Redis host at'%s'", host)
                     self._r_pool = redis.asyncio.from_url(host, encoding="utf-8", decode_responses=True)
                     await self._r_pool.ping()
                 except Exception as ex:

requirements-dev.txt

@@ -1,6 +1,6 @@
 # These are required for developing the package (running the tests, building
 # the documentation) but not necessarily required for _using_ it.
-black
+black!=25.11.0
 coverage
 flake8
 isort