flowmesh-cli-stack 0.1.2__tar.gz → 0.1.3__tar.gz

{flowmesh_cli_stack-0.1.2/src/flowmesh_cli_stack.egg-info → flowmesh_cli_stack-0.1.3}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: flowmesh-cli-stack
-Version: 0.1.2
+Version: 0.1.3
 Summary: FlowMesh CLI stack commands
 License-Expression: Apache-2.0
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: flowmesh-cli==0.1.2
-Requires-Dist: flowmesh-sdk-stack==0.1.2
+Requires-Dist: flowmesh-cli==0.1.3
+Requires-Dist: flowmesh-sdk-stack==0.1.3
 Requires-Dist: docker>=7.1.0
 Requires-Dist: packaging>=24
 Requires-Dist: pyyaml>=6.0.2

{flowmesh_cli_stack-0.1.2 → flowmesh_cli_stack-0.1.3}/pyproject.toml

@@ -4,15 +4,15 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "flowmesh-cli-stack"
-version = "0.1.2"
+version = "0.1.3"
 description = "FlowMesh CLI stack commands"
 readme = "README.md"
 requires-python = ">=3.12"
 license = "Apache-2.0"
 license-files = ["LICENSE"]
 dependencies = [
-    "flowmesh-cli==0.1.2",
-    "flowmesh-sdk-stack==0.1.2",
+    "flowmesh-cli==0.1.3",
+    "flowmesh-sdk-stack==0.1.3",
     "docker>=7.1.0",
     "packaging>=24",
     "pyyaml>=6.0.2",

{flowmesh_cli_stack-0.1.2 → flowmesh_cli_stack-0.1.3}/src/flowmesh_cli_stack/assets/.env.example

@@ -117,9 +117,11 @@ TASK_MERGE_MAX_BATCH_SIZE=4
 ENABLE_CONTEXT_REUSE=true
 WORKER_CACHE_TTL_SEC=3600
 ENABLE_STAGE_WEIGHT_STICKINESS=false
+TASK_NO_WORKER_GRACE_SEC=60
 ENABLE_WORKER_WATCHDOG=true
 WORKER_DEATH_CHECK_INTERVAL=30
 WORKER_DEATH_GRACE_SEC=60
+WORKER_REHYDRATION_GRACE_SEC=120
 
 # ==== Server Heartbeat ====
 SERVER_HEARTBEAT_INTERVAL=30

{flowmesh_cli_stack-0.1.2 → flowmesh_cli_stack-0.1.3}/src/flowmesh_cli_stack/env_schema.py

@@ -388,6 +388,12 @@ STACK_ENV_SCHEMA = EnvSchema(
                     "false",
                     var_type=EnvVarType.BOOL,
                 ),
+                EnvVar(
+                    "TASK_NO_WORKER_GRACE_SEC",
+                    "60",
+                    var_type=EnvVarType.INT,
+                    min_value=0,
+                ),
                 EnvVar("ENABLE_WORKER_WATCHDOG", "true", var_type=EnvVarType.BOOL),
                 EnvVar(
                     "WORKER_DEATH_CHECK_INTERVAL",
@@ -401,6 +407,12 @@ STACK_ENV_SCHEMA = EnvSchema(
                     var_type=EnvVarType.INT,
                     min_value=0,
                 ),
+                EnvVar(
+                    "WORKER_REHYDRATION_GRACE_SEC",
+                    "120",
+                    var_type=EnvVarType.INT,
+                    min_value=0,
+                ),
             ],
         ),
         EnvSection(

{flowmesh_cli_stack-0.1.2 → flowmesh_cli_stack-0.1.3}/src/flowmesh_cli_stack/stack.py

@@ -531,33 +531,87 @@ def down(
     logging.success("FlowMesh stack stopped.")
 
 
+STACK_SERVICES = ("server", "redis_control", "redis_telemetry")
+"""Compose services that can be restarted individually."""
+
+WORKER_MANAGING_SERVICES = ("server",)
+"""Services whose restart tears down the supervisor; drain workers first."""
+
+
 @app.command()
 def restart(
+    services: list[str] | None = typer.Argument(
+        None,
+        help=(
+            "Restart only these compose services in place (any of: "
+            f"{', '.join(STACK_SERVICES)}), leaving the rest of the stack "
+            "running. Omit to restart the whole stack."
+        ),
+    ),
     env_file: Path = typer.Option(
         DEFAULT_ENV_FILE, "--env-file", help="Env file for compose"
     ),
     image_tag: str | None = typer.Option(
         None, "--image-tag", help="Override FLOWMESH_VERSION"
     ),
+    pull: bool = typer.Option(
+        True, "--pull/--no-pull", help="Pull the target image before recreating."
+    ),
 ) -> None:
-    """Drain workers and restart the stack."""
-    logging.info("Draining workers...")
-    _drain_workers(env_file)
-    _compose(
-        ["down"],
-        env_file=env_file,
-        env=image_env_overrides(image_tag),
-        profile="root",
-    )
+    """Drain workers and restart the stack, or recreate specific services in place.
+
+    With one or more SERVICE arguments the stack is left running and only those services
+    are recreated; when any of them manages workers (the server / supervisor) its
+    workers are drained first so their in-flight tasks requeue onto other nodes.
+    """
+    if not services:
+        logging.info("Draining workers...")
+        _drain_workers(env_file)
+        _compose(
+            ["down"],
+            env_file=env_file,
+            env=image_env_overrides(image_tag),
+            profile="root",
+        )
+        profile = "root" if _node_role(env_file) == NodeRole.ROOT else None
+        _compose(
+            ["up", "-d", "--wait"],
+            env_file=env_file,
+            env=image_env_overrides(image_tag),
+            to_deploy=True,
+            profile=profile,
+        )
+        logging.success("FlowMesh stack is up.")
+        return
+
+    requested = list(dict.fromkeys(services))
+    unknown = [svc for svc in requested if svc not in STACK_SERVICES]
+    if unknown:
+        logging.error(
+            f"Unknown service(s): {', '.join(unknown)}. "
+            f"Known services: {', '.join(STACK_SERVICES)}."
+        )
+        raise typer.Exit(code=1)
+
+    if any(svc in WORKER_MANAGING_SERVICES for svc in requested):
+        logging.info("Draining workers...")
+        _drain_workers(env_file)
+
     profile = "root" if _node_role(env_file) == NodeRole.ROOT else None
+    up_args = ["up", "-d", "--no-deps", "--force-recreate", "--wait"]
+    if pull:
+        up_args += ["--pull", "always"]
+    up_args += requested
+    joined = ", ".join(requested)
+    logging.info(f"Recreating service(s): {joined}...")
     _compose(
-        ["up", "-d", "--wait"],
+        up_args,
         env_file=env_file,
         env=image_env_overrides(image_tag),
         to_deploy=True,
         profile=profile,
     )
-    logging.success("FlowMesh stack is up.")
+    logging.success(f"Service(s) restarted: {joined}.")
 
 
 @app.command()

{flowmesh_cli_stack-0.1.2 → flowmesh_cli_stack-0.1.3}/src/flowmesh_cli_stack/worker.py

@@ -18,7 +18,13 @@ from flowmesh_stack.workers import (
     select_worker_images,
 )
 
-from .utils import DEFAULT_ENV_FILE, STACK_PATH_KEYS, stack_node_client
+from .utils import (
+    DEFAULT_ENV_FILE,
+    STACK_PATH_KEYS,
+    STACK_SLUG_ENV,
+    stack_node_client,
+    stack_resource_env_overrides,
+)
 
 app = get_typer(help="Create and manage workers on the local node.")
 
@@ -74,6 +80,15 @@ def worker_up(
             "Repeat --config-raw to provide multiple configs."
         ),
     ),
+    name_template: str | None = typer.Option(
+        None,
+        "--name-template",
+        help=(
+            "Worker name template for cpu/gpu presets. Placeholders: "
+            "{slug}, {kind}, {idx}, {gpu}. "
+            "Default: '{slug}_worker_{kind}_{idx|gpu}'."
+        ),
+    ),
     env_file: Path = typer.Option(
         DEFAULT_ENV_FILE, "--env-file", help="Env file to load defaults"
     ),
@@ -84,6 +99,11 @@ def worker_up(
 ) -> None:
     """Create and start one or more workers from presets or a custom config file."""
     client = stack_node_client(env_file, base_url, token or None)
+    try:
+        slug = stack_resource_env_overrides(os.environ)[STACK_SLUG_ENV]
+    except ValueError as exc:
+        logging.error(str(exc))
+        raise typer.Exit(code=1)
     logging.info("Creating workers...")
     try:
         created = create_workers(
@@ -93,6 +113,8 @@ def worker_up(
             targets=targets,
             config_paths=config,
             config_raw=config_raw,
+            name_template=name_template,
+            slug=slug,
         )
     except FlowMeshError as exc:
         logging.error(str(exc))

{flowmesh_cli_stack-0.1.2 → flowmesh_cli_stack-0.1.3/src/flowmesh_cli_stack.egg-info}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: flowmesh-cli-stack
-Version: 0.1.2
+Version: 0.1.3
 Summary: FlowMesh CLI stack commands
 License-Expression: Apache-2.0
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: flowmesh-cli==0.1.2
-Requires-Dist: flowmesh-sdk-stack==0.1.2
+Requires-Dist: flowmesh-cli==0.1.3
+Requires-Dist: flowmesh-sdk-stack==0.1.3
 Requires-Dist: docker>=7.1.0
 Requires-Dist: packaging>=24
 Requires-Dist: pyyaml>=6.0.2

flowmesh_cli_stack-0.1.3/src/flowmesh_cli_stack.egg-info/requires.txt

@@ -0,0 +1,5 @@
+flowmesh-cli==0.1.3
+flowmesh-sdk-stack==0.1.3
+docker>=7.1.0
+packaging>=24
+pyyaml>=6.0.2

flowmesh_cli_stack-0.1.2/src/flowmesh_cli_stack.egg-info/requires.txt

@@ -1,5 +0,0 @@
-flowmesh-cli==0.1.2
-flowmesh-sdk-stack==0.1.2
-docker>=7.1.0
-packaging>=24
-pyyaml>=6.0.2