rrq 0.3.5__py3-none-any.whl → 0.3.6__py3-none-any.whl

rrq/cli.py

@@ -18,6 +18,14 @@ from .settings import RRQSettings
 from .store import JobStore
 from .worker import RRQWorker
 
+# Attempt to import dotenv components for .env file loading
+try:
+    from dotenv import find_dotenv, load_dotenv
+
+    DOTENV_AVAILABLE = True
+except ImportError:
+    DOTENV_AVAILABLE = False
+
 logger = logging.getLogger(__name__)
 
 
@@ -28,12 +36,21 @@ def _load_app_settings(settings_object_path: str | None = None) -> RRQSettings:
     If the environment variable is not set, will create a default settings object.
     RRQ Setting objects, automatically pick up ENVIRONMENT variables starting with RRQ_.
 
+    This function will also attempt to load a .env file if python-dotenv is installed
+    and a .env file is found. System environment variables take precedence over .env variables.
+
     Args:
         settings_object_path: A string representing the path to the settings object. (e.g. "myapp.worker_config.rrq_settings").
 
     Returns:
         The RRQSettings object.
     """
+    if DOTENV_AVAILABLE:
+        dotenv_path = find_dotenv(usecwd=True)
+        if dotenv_path:
+            logger.debug(f"Loading .env file at: {dotenv_path}...")
+            load_dotenv(dotenv_path=dotenv_path, override=False)
+
     try:
         if settings_object_path is None:
             settings_object_path = os.getenv("RRQ_SETTINGS")
@@ -153,12 +170,10 @@ def start_rrq_worker_subprocess(
 ) -> subprocess.Popen | None:
     """Start an RRQ worker process, optionally for specific queues."""
     command = ["rrq", "worker", "run"]
+
     if settings_object_path:
         command.extend(["--settings", settings_object_path])
-    else:
-        raise ValueError(
-            "start_rrq_worker_subprocess called without settings_object_path!"
-        )
+
     # Add queue filters if specified
     if queues:
         for q in queues:
@@ -220,16 +235,6 @@ async def watch_rrq_worker_impl(
     settings_object_path: str | None = None,
     queues: list[str] | None = None,
 ) -> None:
-    if not settings_object_path:
-        click.echo(
-            click.style(
-                "ERROR: 'rrq worker watch' requires --settings to be specified.",
-                fg="red",
-            ),
-            err=True,
-        )
-        sys.exit(1)
-
     abs_watch_path = os.path.abspath(watch_path)
     click.echo(
         f"Watching for file changes in {abs_watch_path} to restart RRQ worker (app settings: {settings_object_path})..."
@@ -295,7 +300,7 @@ def rrq():
     """RRQ: Reliable Redis Queue Command Line Interface.
 
     Provides tools for running RRQ workers, checking system health,
-    and managing jobs. Requires an application-specific --settings module
+    and managing jobs. Requires an application-specific settings object
     for most operations.
     """
     pass
@@ -329,6 +334,7 @@ def worker_cli():
     help=(
         "Python settings path for application worker settings "
         "(e.g., myapp.worker_config.rrq_settings). "
+        "Alternatively, this can be specified as RRQ_SETTINGS env variable. "
         "The specified settings object must include a `job_registry: JobRegistry`."
     ),
 )
@@ -337,7 +343,9 @@ def worker_run_command(
     queues: tuple[str, ...],
     settings_object_path: str,
 ):
-    """Run an RRQ worker process. Requires --settings."""
+    """Run an RRQ worker process.
+    Requires an application-specific settings object.
+    """
     rrq_settings = _load_app_settings(settings_object_path)
 
     # Determine queues to poll
@@ -418,7 +426,9 @@ def worker_watch_command(
     settings_object_path: str,
     queues: tuple[str, ...],
 ):
-    """Run the RRQ worker with auto-restart on file changes in PATH. Requires --settings."""
+    """Run the RRQ worker with auto-restart on file changes in PATH.
+    Requires an application-specific settings object.
+    """
     # Run watch with optional queue filters
     asyncio.run(
         watch_rrq_worker_impl(
@@ -446,7 +456,9 @@ def worker_watch_command(
     ),
 )
 def check_command(settings_object_path: str):
-    """Perform a health check on active RRQ worker(s). Requires --settings."""
+    """Perform a health check on active RRQ worker(s).
+    Requires an application-specific settings object.
+    """
     click.echo("Performing RRQ health check...")
     healthy = asyncio.run(
         check_health_async_impl(settings_object_path=settings_object_path)

{rrq-0.3.5.dist-info → rrq-0.3.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rrq
-Version: 0.3.5
+Version: 0.3.6
 Summary: RRQ is a Python library for creating reliable job queues using Redis and asyncio
 Project-URL: Homepage, https://github.com/getresq/rrq
 Project-URL: Bug Tracker, https://github.com/getresq/rrq/issues

{rrq-0.3.5.dist-info → rrq-0.3.6.dist-info}/RECORD

@@ -1,5 +1,5 @@
 rrq/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rrq/cli.py,sha256=B9ra9ipZGRto423uG1vGEP-_jLshfl2XrCTNqixBMiQ,16562
+rrq/cli.py,sha256=_LbaAH_w2a0VNRR0EctuE4afl-wccvMY2w2VbehFDEQ,16980
 rrq/client.py,sha256=5_bmZ05LKIfY9WFSKU-nYawEupsnrnHT2HewXfC2Ahg,7831
 rrq/constants.py,sha256=F_uZgBI3h00MctnEjBjiCGMrg5jUaz5Bz9I1vkyqNrs,1654
 rrq/exc.py,sha256=NJq3C7pUfcd47AB8kghIN8vdY0l90UrsHQEg4McBHP8,1281
@@ -8,8 +8,8 @@ rrq/registry.py,sha256=E9W_zx3QiKTBwMOGearaNpDKBDB87JIn0RlMQ3sAcP0,2925
 rrq/settings.py,sha256=BPKP4XjG7z475gqRgHZt4-IvvOs8uZefq4fPfD2Bepk,4350
 rrq/store.py,sha256=teO0Af8hzBiu7-dFn6_2lz5X90LAZXmtg0VDZuQoAwk,24972
 rrq/worker.py,sha256=y0UTziZVh4QbOPv24b8cqbm_xDBM0HtJLwPNYsJPWnE,40706
-rrq-0.3.5.dist-info/METADATA,sha256=0sqVBY1QbqT2GJshYbz_nkKPYfStjZVKE3ICDvv7jdU,9224
-rrq-0.3.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-rrq-0.3.5.dist-info/entry_points.txt,sha256=f8eFjk2ygDSyu9USwXGj5IM8xeyQqZgDa1rSrCj4Mis,36
-rrq-0.3.5.dist-info/licenses/LICENSE,sha256=XDvu5hKdS2-_ByiSj3tiu_3zSsrXXoJsgbILGoMpKCw,554
-rrq-0.3.5.dist-info/RECORD,,
+rrq-0.3.6.dist-info/METADATA,sha256=MKJ-uoveQQVVI4p_RhRA1Kk-KN9_J348gGYY572HUY0,9224
+rrq-0.3.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+rrq-0.3.6.dist-info/entry_points.txt,sha256=f8eFjk2ygDSyu9USwXGj5IM8xeyQqZgDa1rSrCj4Mis,36
+rrq-0.3.6.dist-info/licenses/LICENSE,sha256=XDvu5hKdS2-_ByiSj3tiu_3zSsrXXoJsgbILGoMpKCw,554
+rrq-0.3.6.dist-info/RECORD,,