cyclo-manager 0.1.0.dev2__tar.gz → 0.1.0.dev3__tar.gz

{cyclo_manager-0.1.0.dev2 → cyclo_manager-0.1.0.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cyclo-manager
-Version: 0.1.0.dev2
+Version: 0.1.0.dev3
 Summary: cyclo_manager CLI: pip-installable launcher for cyclo_manager server and UI containers. Run 'cyclo_manager up' to start Docker stack.
 License-Expression: Apache-2.0
 Requires-Python: >=3.10
@@ -49,12 +49,10 @@ cyclo_manager up
 
 | Command | What it does |
 |--------|----------------|
-| `cyclo_manager up` | `docker compose up -d` for **`cyclo_manager`** and **`ui`**; then `docker compose create --no-recreate` for **`rmw_zenoh`** and **`novnc-server`** so those containers exist but stay **stopped** |
-| `cyclo_manager up -c /path/to/config.yml` | Same as `up`, but mounts this file into the API container as config. If the path does not exist, the CLI **copies** the bundled default config there first |
-| `cyclo_manager up -r 35` | Sets **`ROS_DOMAIN_ID`** for the stack (default: **30**) |
+| `cyclo_manager up` | `docker compose up -d` for **`cyclo_manager`** and **`ui`**; then `docker compose create --no-recreate` for **`rmw_zenoh`** and **`novnc-server`** so those containers exist but stay **stopped**. Always mounts the **bundled** [`config/config.yml`](config/config.yml) (no custom `-c` path). |
 | `cyclo_manager up --pull` | Runs `docker compose pull` before up/create |
 | `cyclo_manager down` | `docker compose down` for the **packaged** compose file (stops/removes containers for that project) |
-| `cyclo_manager update` | Runs `cyclo_manager down`, then `pip install -U cyclo-manager`, then `cyclo_manager up` again (optional `-c`, `-r`, `--pull` are forwarded to `up`) |
+| `cyclo_manager update` | Runs `cyclo_manager down`, then `pip install -U cyclo-manager`, then `cyclo_manager up` again (optional `--pull` is forwarded to `up`) |
 | `cyclo_manager --help` | Top-level help |
 
 Implementation reference: [`cyclo_manager_cli/cli.py`](cyclo_manager_cli/cli.py).
@@ -70,10 +68,9 @@ Implementation reference: [`cyclo_manager_cli/cli.py`](cyclo_manager_cli/cli.py)
 
 ### Environment passed into Compose
 
-- **`CYCLO_MANAGER_CONFIG_FILE`**: absolute path to the YAML config used on the host (default: bundled [`config/config.yml`](cyclo_manager_cli/config/config.yml))
-- **`ROS_DOMAIN_ID`**: from `-r` / `--ros-domain-id` (default **30**)
+- **`CYCLO_MANAGER_CONFIG_FILE`**: absolute path to the **bundled** YAML on the host ([`config/config.yml`](config/config.yml)). `up` and `down` both set this when invoking Compose.
 
-`cyclo_manager down` always sets `CYCLO_MANAGER_CONFIG_FILE` to the **bundled** config path when invoking Compose (see `cmd_down` in `cli.py`).
+**`ROS_DOMAIN_ID`** is **not** set by the CLI. Use each container’s **`~/.bashrc`** (or image defaults) and restart containers so DDS matches your robots. For a custom config mount or host dev workflow, use the repository **`docker-compose.dev.yml`** instead of the pip CLI.
 
 ## Bundled config
 

{cyclo_manager-0.1.0.dev2 → cyclo_manager-0.1.0.dev3}/README.md

@@ -38,12 +38,10 @@ cyclo_manager up
 
 | Command | What it does |
 |--------|----------------|
-| `cyclo_manager up` | `docker compose up -d` for **`cyclo_manager`** and **`ui`**; then `docker compose create --no-recreate` for **`rmw_zenoh`** and **`novnc-server`** so those containers exist but stay **stopped** |
-| `cyclo_manager up -c /path/to/config.yml` | Same as `up`, but mounts this file into the API container as config. If the path does not exist, the CLI **copies** the bundled default config there first |
-| `cyclo_manager up -r 35` | Sets **`ROS_DOMAIN_ID`** for the stack (default: **30**) |
+| `cyclo_manager up` | `docker compose up -d` for **`cyclo_manager`** and **`ui`**; then `docker compose create --no-recreate` for **`rmw_zenoh`** and **`novnc-server`** so those containers exist but stay **stopped**. Always mounts the **bundled** [`config/config.yml`](config/config.yml) (no custom `-c` path). |
 | `cyclo_manager up --pull` | Runs `docker compose pull` before up/create |
 | `cyclo_manager down` | `docker compose down` for the **packaged** compose file (stops/removes containers for that project) |
-| `cyclo_manager update` | Runs `cyclo_manager down`, then `pip install -U cyclo-manager`, then `cyclo_manager up` again (optional `-c`, `-r`, `--pull` are forwarded to `up`) |
+| `cyclo_manager update` | Runs `cyclo_manager down`, then `pip install -U cyclo-manager`, then `cyclo_manager up` again (optional `--pull` is forwarded to `up`) |
 | `cyclo_manager --help` | Top-level help |
 
 Implementation reference: [`cyclo_manager_cli/cli.py`](cyclo_manager_cli/cli.py).
@@ -59,10 +57,9 @@ Implementation reference: [`cyclo_manager_cli/cli.py`](cyclo_manager_cli/cli.py)
 
 ### Environment passed into Compose
 
-- **`CYCLO_MANAGER_CONFIG_FILE`**: absolute path to the YAML config used on the host (default: bundled [`config/config.yml`](cyclo_manager_cli/config/config.yml))
-- **`ROS_DOMAIN_ID`**: from `-r` / `--ros-domain-id` (default **30**)
+- **`CYCLO_MANAGER_CONFIG_FILE`**: absolute path to the **bundled** YAML on the host ([`config/config.yml`](config/config.yml)). `up` and `down` both set this when invoking Compose.
 
-`cyclo_manager down` always sets `CYCLO_MANAGER_CONFIG_FILE` to the **bundled** config path when invoking Compose (see `cmd_down` in `cli.py`).
+**`ROS_DOMAIN_ID`** is **not** set by the CLI. Use each container’s **`~/.bashrc`** (or image defaults) and restart containers so DDS matches your robots. For a custom config mount or host dev workflow, use the repository **`docker-compose.dev.yml`** instead of the pip CLI.
 
 ## Bundled config
 

{cyclo_manager-0.1.0.dev2 → cyclo_manager-0.1.0.dev3}/cyclo_manager.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cyclo-manager
-Version: 0.1.0.dev2
+Version: 0.1.0.dev3
 Summary: cyclo_manager CLI: pip-installable launcher for cyclo_manager server and UI containers. Run 'cyclo_manager up' to start Docker stack.
 License-Expression: Apache-2.0
 Requires-Python: >=3.10
@@ -49,12 +49,10 @@ cyclo_manager up
 
 | Command | What it does |
 |--------|----------------|
-| `cyclo_manager up` | `docker compose up -d` for **`cyclo_manager`** and **`ui`**; then `docker compose create --no-recreate` for **`rmw_zenoh`** and **`novnc-server`** so those containers exist but stay **stopped** |
-| `cyclo_manager up -c /path/to/config.yml` | Same as `up`, but mounts this file into the API container as config. If the path does not exist, the CLI **copies** the bundled default config there first |
-| `cyclo_manager up -r 35` | Sets **`ROS_DOMAIN_ID`** for the stack (default: **30**) |
+| `cyclo_manager up` | `docker compose up -d` for **`cyclo_manager`** and **`ui`**; then `docker compose create --no-recreate` for **`rmw_zenoh`** and **`novnc-server`** so those containers exist but stay **stopped**. Always mounts the **bundled** [`config/config.yml`](config/config.yml) (no custom `-c` path). |
 | `cyclo_manager up --pull` | Runs `docker compose pull` before up/create |
 | `cyclo_manager down` | `docker compose down` for the **packaged** compose file (stops/removes containers for that project) |
-| `cyclo_manager update` | Runs `cyclo_manager down`, then `pip install -U cyclo-manager`, then `cyclo_manager up` again (optional `-c`, `-r`, `--pull` are forwarded to `up`) |
+| `cyclo_manager update` | Runs `cyclo_manager down`, then `pip install -U cyclo-manager`, then `cyclo_manager up` again (optional `--pull` is forwarded to `up`) |
 | `cyclo_manager --help` | Top-level help |
 
 Implementation reference: [`cyclo_manager_cli/cli.py`](cyclo_manager_cli/cli.py).
@@ -70,10 +68,9 @@ Implementation reference: [`cyclo_manager_cli/cli.py`](cyclo_manager_cli/cli.py)
 
 ### Environment passed into Compose
 
-- **`CYCLO_MANAGER_CONFIG_FILE`**: absolute path to the YAML config used on the host (default: bundled [`config/config.yml`](cyclo_manager_cli/config/config.yml))
-- **`ROS_DOMAIN_ID`**: from `-r` / `--ros-domain-id` (default **30**)
+- **`CYCLO_MANAGER_CONFIG_FILE`**: absolute path to the **bundled** YAML on the host ([`config/config.yml`](config/config.yml)). `up` and `down` both set this when invoking Compose.
 
-`cyclo_manager down` always sets `CYCLO_MANAGER_CONFIG_FILE` to the **bundled** config path when invoking Compose (see `cmd_down` in `cli.py`).
+**`ROS_DOMAIN_ID`** is **not** set by the CLI. Use each container’s **`~/.bashrc`** (or image defaults) and restart containers so DDS matches your robots. For a custom config mount or host dev workflow, use the repository **`docker-compose.dev.yml`** instead of the pip CLI.
 
 ## Bundled config
 

{cyclo_manager-0.1.0.dev2 → cyclo_manager-0.1.0.dev3}/cyclo_manager_cli/__init__.py

@@ -1,3 +1,3 @@
 """cyclo_manager CLI - pip-installable launcher for cyclo_manager server and UI containers."""
 
-__version__ = "0.1.0.dev2"
+__version__ = "0.1.0.dev3"

{cyclo_manager-0.1.0.dev2 → cyclo_manager-0.1.0.dev3}/cyclo_manager_cli/cli.py

@@ -24,30 +24,22 @@ def _config_dir() -> Path:
 
 
 def _packaged_config_path() -> Path:
-    """Path to the bundled config (config/config.yml). Used by default for cyclo_manager up."""
+    """Path to the bundled config (config/config.yml). Used for cyclo_manager up/down."""
     return _config_dir() / "config.yml"
 
 
 def cmd_up(args: argparse.Namespace) -> int:
     """Run docker compose: start API + UI; create zenoh + noVNC containers without starting them."""
-    if args.config is None:
-        config_path = _packaged_config_path()
-    else:
-        config_path = Path(args.config).expanduser().resolve()
-        if not config_path.exists():
-            config_path.parent.mkdir(parents=True, exist_ok=True)
-            shutil.copy2(_packaged_config_path(), config_path)
-            print(f"Created default config at {config_path}", file=sys.stderr)
-        if not config_path.is_file():
-            print(f"Config file not found: {config_path}", file=sys.stderr)
-            return 1
+    config_path = _packaged_config_path()
+    if not config_path.is_file():
+        print(f"Bundled config not found: {config_path}", file=sys.stderr)
+        return 1
     compose_path = _docker_dir() / "docker-compose.yml"
     if not compose_path.is_file():
         print(f"Compose file not found: {compose_path}", file=sys.stderr)
         return 1
     env = os.environ.copy()
     env["CYCLO_MANAGER_CONFIG_FILE"] = str(config_path)
-    env["ROS_DOMAIN_ID"] = str(args.ros_domain_id)
     base = ["docker", "compose", "-f", str(compose_path)]
     try:
         if args.pull:
@@ -132,12 +124,8 @@ def cmd_update(args: argparse.Namespace) -> int:
 
     print("Starting containers (cyclo_manager up)...")
     up_args = [cyclo_manager_exe, "up"]
-    if getattr(args, "config", None) is not None:
-        up_args.extend(["-c", str(args.config)])
     if getattr(args, "pull", False):
         up_args.append("--pull")
-    if getattr(args, "ros_domain_id", None) is not None:
-        up_args.extend(["-r", str(args.ros_domain_id)])
     try:
         subprocess.run(up_args, check=True)
     except subprocess.CalledProcessError as e:
@@ -155,20 +143,6 @@ def main() -> int:
     sub = parser.add_subparsers(dest="command", help="Commands")
 
     up_parser = sub.add_parser("up", help="Start cyclo_manager stack (docker compose)")
-    up_parser.add_argument(
-        "-c",
-        "--config",
-        metavar="PATH",
-        help="Config file path (default: use bundled config from package)",
-    )
-    up_parser.add_argument(
-        "-r",
-        "--ros-domain-id",
-        type=int,
-        default=30,
-        metavar="ID",
-        help="ROS2 domain ID for cyclo_manager server (default: 30)",
-    )
     up_parser.add_argument(
         "--pull",
         action="store_true",
@@ -183,20 +157,6 @@ def main() -> int:
         "update",
         help="Down containers, pip install -U cyclo-manager, then up again",
     )
-    update_parser.add_argument(
-        "-c",
-        "--config",
-        metavar="PATH",
-        help="Config file path for cyclo_manager up (default: use bundled config)",
-    )
-    update_parser.add_argument(
-        "-r",
-        "--ros-domain-id",
-        type=int,
-        default=30,
-        metavar="ID",
-        help="ROS2 domain ID for cyclo_manager up (default: 30)",
-    )
     update_parser.add_argument(
         "--pull",
         action="store_true",

{cyclo_manager-0.1.0.dev2 → cyclo_manager-0.1.0.dev3}/cyclo_manager_cli/docker/docker-compose.yml

@@ -22,7 +22,6 @@ services:
       - /var/run/docker.sock:/var/run/docker.sock # For Docker API access
     environment:
       - CONFIG_FILE=/app/config.yml
-      - ROS_DOMAIN_ID=${ROS_DOMAIN_ID:-30}
 
   ui:
     container_name: cyclo_manager_ui
@@ -45,7 +44,6 @@ services:
       memlock: 8428281856
     network_mode: host
     environment:
-      - ROS_DOMAIN_ID=${ROS_DOMAIN_ID:-30}
       - DISPLAY=:99
       - DISPLAY_WIDTH=1920
       - DISPLAY_HEIGHT=1080

{cyclo_manager-0.1.0.dev2 → cyclo_manager-0.1.0.dev3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "cyclo-manager"
-version = "0.1.0.dev2"
+version = "0.1.0.dev3"
 description = "cyclo_manager CLI: pip-installable launcher for cyclo_manager server and UI containers. Run 'cyclo_manager up' to start Docker stack."
 readme = "README.md"
 license = "Apache-2.0"

{cyclo_manager-0.1.0.dev2 → cyclo_manager-0.1.0.dev3}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = cyclo-manager
-version = 0.1.0.dev2
+version = 0.1.0.dev3
 
 [egg_info]
 egg_base = .