by-framework 0.2.2.dev7__py3-none-any.whl → 0.2.2.dev9__py3-none-any.whl

by_framework/admin/cli.py

@@ -13,7 +13,8 @@ from rich.console import Console
 from rich.table import Table
 
 from by_framework.admin.worker_manager import WorkerManager
-from by_framework.common.redis_client import init_redis_from_url
+from by_framework.common.config import RedisConfig
+from by_framework.common.redis_client import init_redis, init_redis_from_url
 from by_framework.core.registry import WorkerRegistry
 from by_framework.metrics.snapshot import (
     build_observability_snapshot,
@@ -27,7 +28,13 @@ from by_framework.metrics.snapshot import (
 app = typer.Typer(
     name="by-admin",
     no_args_is_help=True,
-    help="by-framework cluster admin CLI",
+    help=(
+        "by-framework cluster admin CLI. For Redis Cluster, omit --redis-url "
+        "and set REDIS_CLUSTER_HOST (comma-separated host:port list; implies "
+        "both cluster mode and REDIS_KEY_SCHEMA_VERSION=v2 unless set "
+        "explicitly). REDIS_MODE=cluster + REDIS_CLUSTER_NODES + "
+        "REDIS_KEY_SCHEMA_VERSION=v2 also still works."
+    ),
 )
 worker_app = typer.Typer(no_args_is_help=True)
 type_app = typer.Typer(no_args_is_help=True)
@@ -43,7 +50,8 @@ app.add_typer(metrics_app, name="metrics", help="Metrics and observability")
 
 console = Console()
 err_console = Console(stderr=True)
-_redis_url = "redis://localhost:6379/0"
+_DEFAULT_REDIS_URL = "redis://localhost:6379/0"
+_redis_url: Optional[str] = None
 
 
 @app.callback()
@@ -52,13 +60,16 @@ def _global(
         None,
         "--redis-url",
         envvar=["BYAI_REDIS_URL", "REDIS_URL"],
-        help="Redis connection URL  [env: BYAI_REDIS_URL]",
+        help=(
+            "Standalone Redis connection URL [env: BYAI_REDIS_URL]. "
+            "For Redis Cluster, omit this and set REDIS_CLUSTER_HOST "
+            "(comma-separated host:port list)."
+        ),
     ),
 ):
     """by-framework cluster admin CLI."""
     global _redis_url
-    if redis_url:
-        _redis_url = redis_url
+    _redis_url = redis_url
 
 
 def _run(coro):  # type: ignore[no-untyped-def]
@@ -70,8 +81,14 @@ def _die(msg: str, code: int = 1) -> None:
     raise typer.Exit(code)
 
 
-def _get_redis():
-    return init_redis_from_url(_redis_url)
+def _get_redis(redis_url: Optional[str] = None):
+    configured_url = redis_url if redis_url is not None else _redis_url
+    if configured_url:
+        return init_redis_from_url(configured_url)
+    config = RedisConfig.from_env()
+    if config.mode == "cluster":
+        return init_redis(config=config)
+    return init_redis_from_url(_DEFAULT_REDIS_URL)
 
 
 # --------------------------------------------------------------------------- #

by_framework/common/config.py

@@ -9,6 +9,7 @@ from dataclasses import dataclass, field
 from typing import Literal, Optional
 
 from by_framework.common.constants import RedisKeys
+from by_framework.common.logger import logger
 
 
 @dataclass(frozen=True)
@@ -29,22 +30,40 @@ class RedisConfig:
 
     @classmethod
     def from_env(cls) -> "RedisConfig":
-        """Load Redis configuration from environment variables."""
+        """Load Redis configuration from environment variables.
+
+        REDIS_CLUSTER_HOST (comma-separated "host:port" list) is the
+        preferred way to configure Cluster mode: just setting it is enough
+        to switch to cluster mode, no separate REDIS_MODE=cluster needed.
+        An explicit REDIS_MODE still takes precedence when set, so existing
+        explicit REDIS_MODE=cluster + REDIS_CLUSTER_NODES setups keep working.
+
+        REDIS_DATABASE replaces REDIS_DB (which still works as a deprecated
+        fallback, logging a warning, during the transition period).
+        """
         password = os.environ.get("REDIS_PASSWORD", "")
         username = os.environ.get("REDIS_USERNAME") or None
         max_connections = os.environ.get("REDIS_MAX_CONNECTIONS")
-        mode = os.environ.get("REDIS_MODE", "standalone")
-        cluster_nodes_str = os.environ.get("REDIS_CLUSTER_NODES")
+        cluster_host_str = os.environ.get("REDIS_CLUSTER_HOST")
+        cluster_nodes_str = cluster_host_str or os.environ.get("REDIS_CLUSTER_NODES")
+        mode = os.environ.get("REDIS_MODE") or (
+            "cluster" if cluster_host_str else "standalone"
+        )
         cluster_nodes = None
         if cluster_nodes_str:
             cluster_nodes = []
             for node in cluster_nodes_str.split(","):
                 node_host, node_port = node.rsplit(":", 1)
                 cluster_nodes.append((node_host, int(node_port)))
+        db_str = os.environ.get("REDIS_DATABASE")
+        if db_str is None:
+            db_str = os.environ.get("REDIS_DB")
+            if db_str is not None:
+                logger.warning("REDIS_DB is deprecated, use REDIS_DATABASE instead")
         return cls(
             host=os.environ.get("REDIS_HOST", "localhost"),
             port=int(os.environ.get("REDIS_PORT", "6379")),
-            db=int(os.environ.get("REDIS_DB", "0")),
+            db=int(db_str) if db_str is not None else 0,
             password=password,
             username=username,
             max_connections=int(max_connections) if max_connections else None,

by_framework/common/constants.py

@@ -12,10 +12,20 @@ from typing import Optional
 def get_key_schema_version() -> str:
     """Return the configured Redis key schema version ("v1" or "v2").
 
-    Controlled by REDIS_KEY_SCHEMA_VERSION, defaulting to "v1" (the current
-    unprefixed key format). Cluster mode requires "v2" (see redis_client.init_redis).
+    Controlled by REDIS_KEY_SCHEMA_VERSION, which always wins when set
+    explicitly. When it isn't set, REDIS_CLUSTER_HOST being configured
+    implies "v2" (cluster mode requires v2 - v1 keys have no hash tags and
+    hit CROSSSLOT errors under Cluster; see redis_client.init_redis's
+    fail-fast check); otherwise it defaults to "v1" (the legacy unprefixed
+    key format). This mirrors RedisConfig.from_env()'s REDIS_MODE/
+    REDIS_CLUSTER_HOST precedence, but deliberately does NOT infer "v2"
+    from an explicit REDIS_MODE=cluster alone (without REDIS_CLUSTER_HOST)
+    - that legacy explicit-mode path still requires
+    REDIS_KEY_SCHEMA_VERSION=v2 to be set by hand.
     """
-    version = os.environ.get("REDIS_KEY_SCHEMA_VERSION", "v1")
+    version = os.environ.get("REDIS_KEY_SCHEMA_VERSION")
+    if version is None:
+        version = "v2" if os.environ.get("REDIS_CLUSTER_HOST") else "v1"
     if version not in ("v1", "v2"):
         raise ValueError(
             f"Invalid REDIS_KEY_SCHEMA_VERSION: {version!r} (must be 'v1' or 'v2')"

by_framework/common/redis_client.py

@@ -112,11 +112,11 @@ def init_redis_from_url(url: str) -> Redis:
 def get_redis() -> Redis:
     """Get the initialized global Redis client.
 
-    If not initialized, will automatically initialize with default config.
+    If not initialized, automatically initialize from environment config.
     """
     global _redis_client  # pylint: disable=global-variable-not-assigned
     if _redis_client is None:
-        return init_redis()
+        return init_redis(config=RedisConfig.from_env())
     return _redis_client
 
 

by_framework/worker/app.py

@@ -131,6 +131,17 @@ async def _run_worker_async(
     # parties can configure either mode purely programmatically or purely
     # via env vars, without the two modes behaving inconsistently.
     env_config = RedisConfig.from_env()
+    if redis_mode is not None:
+        effective_mode = redis_mode
+    elif redis_cluster_nodes:
+        # Mirrors REDIS_CLUSTER_HOST's env-var precedence: passing
+        # redis_cluster_nodes alone is enough to imply cluster mode, no
+        # separate redis_mode="cluster" required. Without this, passing
+        # redis_cluster_nodes alone would silently stay in standalone mode
+        # and the nodes list would be dropped on the floor.
+        effective_mode = "cluster"
+    else:
+        effective_mode = env_config.mode
     effective_config = replace(
         env_config,
         host=redis_host if redis_host is not None else env_config.host,
@@ -142,7 +153,7 @@ async def _run_worker_async(
         username=(
             redis_username if redis_username is not None else env_config.username
         ),
-        mode=redis_mode if redis_mode is not None else env_config.mode,
+        mode=effective_mode,
         cluster_nodes=(
             redis_cluster_nodes
             if redis_cluster_nodes is not None
@@ -276,13 +287,23 @@ def run_worker(
     Redis configuration: every redis_* argument defaults to None, meaning
     "not specified" - when not passed, the value is read from the
     corresponding REDIS_* environment variable (REDIS_HOST, REDIS_PORT,
-    REDIS_DB, REDIS_PASSWORD, REDIS_USERNAME, REDIS_MODE,
-    REDIS_CLUSTER_NODES), falling back to "localhost"/6379/standalone if
-    neither is set. An explicitly-passed argument always takes precedence
-    over its env var, for every field, in both standalone and cluster mode
-    - so either mode can be configured purely programmatically (e.g.
-    ``redis_mode="cluster", redis_cluster_nodes=[("h1", 6379)]``) or purely
-    via env vars, without the two modes behaving inconsistently.
+    REDIS_DATABASE, REDIS_PASSWORD, REDIS_USERNAME, REDIS_MODE,
+    REDIS_CLUSTER_HOST, REDIS_CLUSTER_NODES), falling back to
+    "localhost"/6379/standalone if none is set. REDIS_DATABASE replaces
+    REDIS_DB (still works as a deprecated fallback, logging a warning).
+    Setting REDIS_CLUSTER_HOST (comma-separated "host:port" list) alone is
+    enough to switch to cluster mode - no separate REDIS_MODE=cluster
+    required, though an explicit REDIS_MODE still wins if set; it also
+    implies REDIS_KEY_SCHEMA_VERSION=v2 unless that's set explicitly. An
+    explicitly-passed argument always takes precedence over its env var,
+    for every field, in both standalone and cluster mode. The same
+    single-argument convenience carries over to the programmatic path:
+    passing just ``redis_cluster_nodes=[("h1", 6379)]`` (no ``redis_mode``)
+    is enough to switch to cluster mode, mirroring REDIS_CLUSTER_HOST -
+    ``redis_mode`` only needs to be passed to explicitly force a mode
+    (e.g. pin a script to standalone regardless of REDIS_CLUSTER_HOST).
+    So either mode can be configured purely programmatically or purely via
+    env vars, without the two paths behaving inconsistently.
 
     Plugin support:
     - **Auto mode**: System automatically discovers and loads all subclasses

{by_framework-0.2.2.dev7.dist-info → by_framework-0.2.2.dev9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: by-framework
-Version: 0.2.2.dev7
+Version: 0.2.2.dev9
 Summary: 分布式 Agent 调度框架
 License-File: LICENSE
 Requires-Python: >=3.12

{by_framework-0.2.2.dev7.dist-info → by_framework-0.2.2.dev9.dist-info}/RECORD

@@ -1,18 +1,18 @@
 by_framework/__init__.py,sha256=5Ff4xfX-TNXcp4RMoBLQCWuehPMLpNRHwZrXofgFx5A,5300
 by_framework/__main__.py,sha256=_vIEieJzSHfZnPp-zna_hbVtWQUgE0I3mrWD41WzXiA,2561
 by_framework/admin/__init__.py,sha256=MKGQBtKk8YdnMrZ5gkzEemMl4iL8OfeFhEV6HdWR2XI,138
-by_framework/admin/cli.py,sha256=jsOYflCGKvSCNmZqA18fOR1mzsz_9XADl5BaEhdQVuM,10850
+by_framework/admin/cli.py,sha256=KBmTHONKdb6BeskW6d3DL6GRnL91xen0PJ80JB0h0lc,11710
 by_framework/admin/worker_manager.py,sha256=ihXRMlFJAR74T2JSh3xTNCDjzAElWd0-_yVDAZwSTJU,5924
 by_framework/client/__init__.py,sha256=kGP7uoXIlTJuiJ2Cgl1Q5wqYjnMA4SZqoa7Q7BhQ5JQ,272
 by_framework/client/byai_client.py,sha256=bB1NyKLvVW82bXefD_3zymqZ1vk2O925CIbxOho9Qww,2426
 by_framework/client/client.py,sha256=T_5ahX9enmsaXm-xBGvwpMx-yALzO7wOTgY-qAVj0Q4,40342
 by_framework/common/__init__.py,sha256=EkfIiVdmb8SCpi7OOUm6Hu84B7Wzekb-TG2hbvD_R1w,1685
-by_framework/common/config.py,sha256=KgUJ8s2BI3Rm3JIDa1Yd0i72LthQQua-n7h-Y69QzmU,4075
-by_framework/common/constants.py,sha256=qzWIZcaTg4bGf-dz7bb6xJzlfvGIuw-fXhnB4mmhddc,21481
+by_framework/common/config.py,sha256=RGe5Ce-uUgpZv1bgkdT4kCRcaIpaYhzskyvQy17Qn_o,5043
+by_framework/common/constants.py,sha256=xUp6Nvx31EH7EzkxDNBzXD0GIE9FpPnPmuVbL-BAAoI,22089
 by_framework/common/emitter.py,sha256=Mcp6vglFlS7_JVsLd_KVKvV49TKjoyoN4eCM_tm4I8s,11310
 by_framework/common/exceptions.py,sha256=NKQC7ueLZ4-gVTRz3SFRZNoPHsayu6jxi3-YlW0n_jg,962
 by_framework/common/logger.py,sha256=DX6S7U5CLcCQIUQ3IWqeeDnSC7QGuHKYaEhiKvKrBpk,5823
-by_framework/common/redis_client.py,sha256=DVMTGoj1RdsFXr9vdE92Y3ZMPdtVZfYQhXosyymbIcA,4640
+by_framework/common/redis_client.py,sha256=JfYE-QutI9G27dbehzvLw0LziTM1gHmG4tdVjxd0IoA,4668
 by_framework/core/__init__.py,sha256=bEaOfjGoCF0WacR_PoYSb5kUqJv-g59pngdnEE7fJzo,2070
 by_framework/core/availability.py,sha256=ZME5S002eNzNpzaW_QuWw8AmUN1JelUxwCt2U3PPAeQ,17624
 by_framework/core/delivery_gate.py,sha256=yijlCOw8zEou1HCyQzwRHDJZtLBsUnXtQ3x1FZsc4yU,2012
@@ -82,7 +82,7 @@ by_framework/worker/__init__.py,sha256=GBkUWYnHc2j3_Wx2AC2P49DzFl0CSrl0SKhdRP5CT
 by_framework/worker/_control_handling.py,sha256=0bL1Alx8_qaeXQV32Xv4ARSd9q77ySh9LMd7KtZZXu8,8111
 by_framework/worker/_execution_tracking.py,sha256=AWahfDKTXGrx_JWSCNisjGKkGAQruu9vSlXisof0BYQ,2493
 by_framework/worker/_message_processing.py,sha256=rgKzJTgPVDFp_HUfMcqJBwNdTCEfspuRAo5IM9VKsxs,2622
-by_framework/worker/app.py,sha256=7b3BkKewPjZb5HrzC2xftGTXP59YwMtMUPZsBqbbeUM,13195
+by_framework/worker/app.py,sha256=pf_q4F1ypf6u97HP4IpHVPVW5pssMg9_XXAwzv0wJfM,14387
 by_framework/worker/byai_context.py,sha256=DvKw-X8ePZr5c5osdapvzTvH4G23u0J80U-fgMLtge4,2388
 by_framework/worker/byai_worker.py,sha256=0NoRqzuTG_MPMxVbZ1ueeOrqI0H8-Adxh7dM3vckjJo,1757
 by_framework/worker/context.py,sha256=XTNeTAhXvzS2OMDRCDKVD0s3uQscE1rFo9eImUw773w,44747
@@ -92,8 +92,8 @@ by_framework/worker/runner.py,sha256=ZuuhzdXB4oIjSaNyJCjOIYhzvw6L5N7X6kPzvrbWET8
 by_framework/worker/worker.py,sha256=_RmNkvHEN5kDPlqbHtVQhkhgiKx37xjnCxNkf_tvASM,35441
 by_framework/worker/sandbox/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 by_framework/worker/sandbox/hook_sandbox.py,sha256=XXSdH5YGX814LvV03vkq-zn5DVIBPYYt2NhRv1lT1Bk,2329
-by_framework-0.2.2.dev7.dist-info/METADATA,sha256=eLdbc4la4ZUqdpLajSt3MQNsNHUV0g3vZABp3zPwYgI,26533
-by_framework-0.2.2.dev7.dist-info/WHEEL,sha256=mffPy8wBnZQn2VnJUU5jE99KsxaSfiyMHV9Yt0aLVxs,87
-by_framework-0.2.2.dev7.dist-info/entry_points.txt,sha256=5t6kgMjkR0UgJTpOsbuQDo0fOf7zeXjQW9DhkxfAGFc,56
-by_framework-0.2.2.dev7.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-by_framework-0.2.2.dev7.dist-info/RECORD,,
+by_framework-0.2.2.dev9.dist-info/METADATA,sha256=qmdF2bXuu0_IfQI5_QazjrVOxd8EjIHiqnm0PiIVZVo,26533
+by_framework-0.2.2.dev9.dist-info/WHEEL,sha256=lCkmxWfQsSc9CfIClYeavTdQeEX2toPqufh9gI35EQA,87
+by_framework-0.2.2.dev9.dist-info/entry_points.txt,sha256=5t6kgMjkR0UgJTpOsbuQDo0fOf7zeXjQW9DhkxfAGFc,56
+by_framework-0.2.2.dev9.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+by_framework-0.2.2.dev9.dist-info/RECORD,,

{by_framework-0.2.2.dev7.dist-info → by_framework-0.2.2.dev9.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.30.1
+Generator: hatchling 1.31.0
 Root-Is-Purelib: true
 Tag: py3-none-any