PyPI - qontract-development-cli - Versions diffs - 0.16.0__tar.gz → 0.17.1__tar.gz - Mend

qontract-development-cli 0.16.0tar.gz → 0.17.1tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (28) hide show

{qontract_development_cli-0.16.0 → qontract_development_cli-0.17.1}/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-development-cli
-Version: 0.16.0
+Version: 0.17.1
 Summary: Helper tool for qontract-reconcile development
 Project-URL: homepage, http://github.com/chassing/qontract-development-cli
 Project-URL: repository, http://github.com/chassing/qontract-development-cli
@@ -14,8 +14,8 @@ Requires-Dist: jinja2~=3.1
 Requires-Dist: pydantic-settings~=2.6
 Requires-Dist: pydantic~=2.9
 Requires-Dist: pyyaml~=6.0.2
-Requires-Dist: rich~=14.0
-Requires-Dist: typer~=0.21.0
+Requires-Dist: rich~=15.0
+Requires-Dist: typer~=0.25.1
 Requires-Dist: watchfiles~=1.1.0
 Description-Content-Type: text/markdown
@@ -153,6 +153,7 @@ An environment specifies app-interface instance settings, e.g., **dev** vs. **pr
 | container_platform                 | Default Docker container platform for all images | linux/amd64                                    |
 | gitlab_pr_submitter_queue_url      | Gitlab pr submitter queue url                    |                                                |
 | run_qontract_api                   | Run qontract-api container                       | false                                          |
+| run_qontract_api_subscriber        | Run qontract-api-subscriber container            | false                                          |
 | run_qontract_api_worker            | Run qontract-api-worker container                | false                                          |
 | run_cache                          | Run cache (Redis) container                      | false                                          |
 | run_qontract_reconcile             | Run qontract-reconcile container                 | true                                           |
@@ -216,6 +217,11 @@ The command line flag takes precedence over any configuration you might have in
 | qontract_api_container_platform        | Qontract-api container platform                                                                                                                                              | Default from [environment](#environment-settings)                    |
 | qontract_api_compose_file              | Qontract-api docker-compose file template                                                                                                                                    | `api.yml.j2`                                                         |
 | qontract_api_debugger_port             | Debugger port for qontract-api                                                                                                                                               | `5679`                                                               |
+| qontract_api_subscriber_build_image    | Build qontract-api-subscriber image                                                                                                                                          | `true`                                                               |
+| qontract_api_subscriber_image          | Qontract-api-subscriber image                                                                                                                                                | `quay.io/redhat-services-prod/.../qontract-api-master:latest`        |
+| qontract_api_subscriber_container_platform | Qontract-api-subscriber container platform                                                                                                                               | Default from [environment](#environment-settings)                    |
+| qontract_api_subscriber_compose_file   | Qontract-api-subscriber docker-compose file template                                                                                                                         | `subscriber.yml.j2`                                                  |
+| qontract_api_subscriber_debugger_port  | Debugger port for qontract-api-subscriber                                                                                                                                    | `5681`                                                               |
 | qontract_api_worker_build_image        | Build qontract-api-worker image                                                                                                                                              | `true`                                                               |
 | qontract_api_worker_image              | Qontract-api-worker image                                                                                                                                                    | `quay.io/redhat-services-prod/.../qontract-api-worker-master:latest` |
 | qontract_api_worker_container_platform | Qontract-api-worker container platform                                                                                                                                       | Default from [environment](#environment-settings)                    |
@@ -283,6 +289,19 @@ Note that the Qontract Reconcile container will not start running until it is co
         "enable": true
       }
     },
+    {
+      "name": "Python Debugger: Subscriber",
+      "type": "debugpy",
+      "request": "attach",
+      "connect": { "host": "localhost", "port": 5681 },
+      "pathMappings": [
+        { "localRoot": "${workspaceFolder}", "remoteRoot": "/opt/app-root/src" }
+      ],
+      "justMyCode": true,
+      "autoReload": {
+        "enable": true
+      }
+    },
     {
       "name": "Python Debugger: Worker",
       "type": "debugpy",
@@ -303,6 +322,7 @@ Note that the Qontract Reconcile container will not start running until it is co
       "configurations": [
         "Python Debugger: Reconcile",
         "Python Debugger: Api",
+        "Python Debugger: Subscriber",
         "Python Debugger: Worker"
       ],
       "stopAll": true,

{qontract_development_cli-0.16.0 → qontract_development_cli-0.17.1}/README.md RENAMED Viewed

@@ -132,6 +132,7 @@ An environment specifies app-interface instance settings, e.g., **dev** vs. **pr
 | container_platform                 | Default Docker container platform for all images | linux/amd64                                    |
 | gitlab_pr_submitter_queue_url      | Gitlab pr submitter queue url                    |                                                |
 | run_qontract_api                   | Run qontract-api container                       | false                                          |
+| run_qontract_api_subscriber        | Run qontract-api-subscriber container            | false                                          |
 | run_qontract_api_worker            | Run qontract-api-worker container                | false                                          |
 | run_cache                          | Run cache (Redis) container                      | false                                          |
 | run_qontract_reconcile             | Run qontract-reconcile container                 | true                                           |
@@ -195,6 +196,11 @@ The command line flag takes precedence over any configuration you might have in
 | qontract_api_container_platform        | Qontract-api container platform                                                                                                                                              | Default from [environment](#environment-settings)                    |
 | qontract_api_compose_file              | Qontract-api docker-compose file template                                                                                                                                    | `api.yml.j2`                                                         |
 | qontract_api_debugger_port             | Debugger port for qontract-api                                                                                                                                               | `5679`                                                               |
+| qontract_api_subscriber_build_image    | Build qontract-api-subscriber image                                                                                                                                          | `true`                                                               |
+| qontract_api_subscriber_image          | Qontract-api-subscriber image                                                                                                                                                | `quay.io/redhat-services-prod/.../qontract-api-master:latest`        |
+| qontract_api_subscriber_container_platform | Qontract-api-subscriber container platform                                                                                                                               | Default from [environment](#environment-settings)                    |
+| qontract_api_subscriber_compose_file   | Qontract-api-subscriber docker-compose file template                                                                                                                         | `subscriber.yml.j2`                                                  |
+| qontract_api_subscriber_debugger_port  | Debugger port for qontract-api-subscriber                                                                                                                                    | `5681`                                                               |
 | qontract_api_worker_build_image        | Build qontract-api-worker image                                                                                                                                              | `true`                                                               |
 | qontract_api_worker_image              | Qontract-api-worker image                                                                                                                                                    | `quay.io/redhat-services-prod/.../qontract-api-worker-master:latest` |
 | qontract_api_worker_container_platform | Qontract-api-worker container platform                                                                                                                                       | Default from [environment](#environment-settings)                    |
@@ -262,6 +268,19 @@ Note that the Qontract Reconcile container will not start running until it is co
         "enable": true
       }
     },
+    {
+      "name": "Python Debugger: Subscriber",
+      "type": "debugpy",
+      "request": "attach",
+      "connect": { "host": "localhost", "port": 5681 },
+      "pathMappings": [
+        { "localRoot": "${workspaceFolder}", "remoteRoot": "/opt/app-root/src" }
+      ],
+      "justMyCode": true,
+      "autoReload": {
+        "enable": true
+      }
+    },
     {
       "name": "Python Debugger: Worker",
       "type": "debugpy",
@@ -282,6 +301,7 @@ Note that the Qontract Reconcile container will not start running until it is co
       "configurations": [
         "Python Debugger: Reconcile",
         "Python Debugger: Api",
+        "Python Debugger: Subscriber",
         "Python Debugger: Worker"
       ],
       "stopAll": true,

{qontract_development_cli-0.16.0 → qontract_development_cli-0.17.1}/pyproject.toml RENAMED Viewed

@@ -1,6 +1,6 @@
 [project]
 name = "qontract-development-cli"
-version = "0.16.0"
+version = "0.17.1"
 description = "Helper tool for qontract-reconcile development"
 authors = [{ name = "Christian Assing", email = "cassing@redhat.com" }]
 license = { text = "MIT" }
@@ -13,15 +13,15 @@ dependencies = [
     "pydantic ~=2.9",
     "pydantic-settings ~=2.6",
     "pyyaml ~=6.0.2",
-    "rich ~=14.0",
-    "typer ~=0.21.0",
+    "rich ~=15.0",
+    "typer ~=0.25.1",
     "watchfiles ~=1.1.0",
 ]
 [dependency-groups]
 dev = [
     # dev dependencies
-    "mypy ~=1.13",
+    "mypy ~=2.0",
     "ruff ~=0.7",
     "types-pyyaml ~=6.0",
 ]

{qontract_development_cli-0.16.0 → qontract_development_cli-0.17.1}/qontract_development_cli/commands/profile.py RENAMED Viewed

@@ -269,6 +269,7 @@ def run(  # noqa: C901, PLR0912, PLR0913, PLR0915
         cache=env.settings.run_cache,
         reconcile=env.settings.run_qontract_reconcile,
         server=env.settings.run_qontract_server,
+        subscriber=env.settings.run_qontract_api_subscriber,
         vault=env.settings.run_vault,
         worker=env.settings.run_qontract_api_worker,
     )

{qontract_development_cli-0.16.0 → qontract_development_cli-0.17.1}/qontract_development_cli/models.py RENAMED Viewed

@@ -18,6 +18,7 @@ class EnvSettings(BaseModel):
     container_platform: str = "linux/amd64"
     gitlab_pr_submitter_queue_url: str = ""
     run_qontract_api: bool = False
+    run_qontract_api_subscriber: bool = False
     run_qontract_api_worker: bool = False
     run_cache: bool = False
     run_qontract_reconcile: bool = True
@@ -50,9 +51,16 @@ class ProfileSettings(BaseModel):
     qontract_api_compose_file: str = "api.yml.j2"
     qontract_api_debugger_port: int = 5679
+    # api-subscriber
+    qontract_api_subscriber_build_image: bool = True
+    qontract_api_subscriber_image: str = "quay.io/redhat-services-prod/app-sre-tenant/qontract-reconcile-master/qontract-api-master:latest"
+    qontract_api_subscriber_container_platform: str | None = None
+    qontract_api_subscriber_compose_file: str = "subscriber.yml.j2"
+    qontract_api_subscriber_debugger_port: int = 5681
     # api-worker
     qontract_api_worker_build_image: bool = True
-    qontract_api_worker_image: str = "quay.io/redhat-services-prod/app-sre-tenant/qontract-reconcile-master/qontract-api-worker-master:latest"
+    qontract_api_worker_image: str = "quay.io/redhat-services-prod/app-sre-tenant/qontract-reconcile-master/qontract-api-master:latest"
     qontract_api_worker_container_platform: str | None = None
     qontract_api_worker_compose_file: str = "worker.yml.j2"
     qontract_api_worker_debugger_port: int = 5680
@@ -119,10 +127,12 @@ class ProfileSettings(BaseModel):
         cache: bool,
         reconcile: bool,
         server: bool,
+        subscriber: bool,
         vault: bool,
         worker: bool,
     ) -> list[str]:
         files = [self.qontract_api_compose_file] if api else []
+        files += [self.qontract_api_subscriber_compose_file] if subscriber else []
         files += [self.qontract_api_worker_compose_file] if worker else []
         files += [self.cache_compose_file] if cache else []
         files += [self.qontract_reconcile_compose_file] if reconcile else []

{qontract_development_cli-0.16.0 → qontract_development_cli-0.17.1}/qontract_development_cli/shell.py RENAMED Viewed

@@ -21,6 +21,15 @@ _docker_compose_bin = (
 )
+def _compose_base_cmd(compose_file: Path) -> list[str]:
+    """Build the base docker compose command with main and override files."""
+    cmd = [*_docker_compose_bin, "-f", str(compose_file)]
+    override = compose_file.parent / "compose.override.yml"
+    if override.exists():
+        cmd.extend(["-f", str(override)])
+    return cmd
 def compose_up(
     compose_file: Path,
     *,
@@ -29,7 +38,7 @@ def compose_up(
     build: bool = False,
 ) -> None:
     log.info("Starting all containers")
-    compose_cmd = [*_docker_compose_bin, "-f", str(compose_file), "up", "-d"]
+    compose_cmd = [*_compose_base_cmd(compose_file), "up", "-d"]
     if force_recreate:
         compose_cmd.append("--force-recreate")
     if remove_orphan:
@@ -41,7 +50,7 @@ def compose_up(
 def compose_restart(compose_file: Path, container: str) -> None:
     log.info(f"Restarting {container} container")
-    compose_cmd = [*_docker_compose_bin, "-f", str(compose_file), "restart", container]
+    compose_cmd = [*_compose_base_cmd(compose_file), "restart", container]
     subprocess.run(compose_cmd, check=True)
@@ -53,12 +62,12 @@ def container_restart(container: str) -> None:
 def compose_down(compose_file: Path) -> None:
     log.info("Stopping all containers")
-    compose_cmd = [*_docker_compose_bin, "-f", str(compose_file), "down"]
+    compose_cmd = [*_compose_base_cmd(compose_file), "down"]
     subprocess.run(compose_cmd, check=True)
 def compose_log_tail(compose_file: Path) -> Process:
-    compose_cmd = [*_docker_compose_bin, "-f", str(compose_file), "logs", "--follow"]
+    compose_cmd = [*_compose_base_cmd(compose_file), "logs", "--follow"]
     p = EndlessProcess(target=subprocess.run, args=(compose_cmd,))
     p.start()
     return p
@@ -71,7 +80,7 @@ def kill_log_tail(p: Process, compose_file: Path) -> None:
             "pkill",
             "-9",
             "-f",
-            " ".join([*_docker_compose_bin, "-f", str(compose_file), "logs"]),
+            " ".join([*_compose_base_cmd(compose_file), "logs"]),
         ],
         check=False,
     )

{qontract_development_cli-0.16.0 → qontract_development_cli-0.17.1}/qontract_development_cli/templates/api.yml.j2 RENAMED Viewed

@@ -26,7 +26,6 @@ services:
     volumes:
     - {{ profile.settings.qontract_api_path.expanduser().absolute() }}/app.sh:/opt/app-root/src/app.sh:z
-    - {{ profile.settings.qontract_api_path.expanduser().absolute() }}/.env.yaml:/opt/app-root/src/.env.yaml:z
     - {{ profile.settings.qontract_api_path.expanduser().absolute() }}/.env:/opt/app-root/src/.env:z
     - {{ profile.settings.qontract_api_path.expanduser().absolute() }}/qontract_api:/opt/app-root/src/qontract_api/qontract_api:z
     - {{ profile.settings.qontract_reconcile_path.expanduser().absolute() }}/qontract_utils/qontract_utils:/opt/app-root/src/qontract_utils/qontract_utils:z

qontract_development_cli-0.17.1/qontract_development_cli/templates/subscriber.yml.j2 ADDED Viewed

@@ -0,0 +1,31 @@
+services:
+  # qontract-api (Event Subscriber)
+  qontract-api-subscriber:
+    container_name: qontract-api-subscriber
+    platform: {{ profile.settings.qontract_api_subscriber_container_platform or env.settings.container_platform }}
+    {% if profile.settings.qontract_api_subscriber_build_image %}
+    build:
+      context: {{ profile.settings.qontract_reconcile_path.expanduser().absolute() }}
+      dockerfile: {{ profile.settings.qontract_api_path.expanduser().absolute() }}/Dockerfile
+      target: debug
+    {% else %}
+    image: {{ profile.settings.qontract_api_subscriber_image }}
+    {% endif %}
+    ports:
+    - 8081:8080
+    - {{ profile.settings.qontract_api_subscriber_debugger_port }}:5678  # debugpy port
+    environment:
+    - QAPI_START_MODE=subscriber
+    - QAPI_CACHE_BROKER_URL=redis://cache:6379/0
+    # Enable debugpy
+    - DEBUGGER_ENABLED={% if profile.settings.debugger %}true{% else %}false{% endif %}
+    # Hot reload for development
+    - AUTO_RELOAD=1
+    volumes:
+    - {{ profile.settings.qontract_api_path.expanduser().absolute() }}/app.sh:/opt/app-root/src/app.sh:z
+    - {{ profile.settings.qontract_api_path.expanduser().absolute() }}/.env:/opt/app-root/src/.env:z
+    - {{ profile.settings.qontract_api_path.expanduser().absolute() }}/qontract_api:/opt/app-root/src/qontract_api/qontract_api:z
+    - {{ profile.settings.qontract_reconcile_path.expanduser().absolute() }}/qontract_utils/qontract_utils:/opt/app-root/src/qontract_utils/qontract_utils:z

{qontract_development_cli-0.16.0 → qontract_development_cli-0.17.1}/qontract_development_cli/templates/worker.yml.j2 RENAMED Viewed

@@ -7,13 +7,13 @@ services:
     build:
       context: {{ profile.settings.qontract_reconcile_path.expanduser().absolute() }}
       dockerfile: {{ profile.settings.qontract_api_path.expanduser().absolute() }}/Dockerfile
       target: debug
     {% else %}
     image: {{ profile.settings.qontract_api_workerimage }}
     {% endif %}
     ports:
+    - 8000:8000
     - {{ profile.settings.qontract_api_worker_debugger_port }}:5678  # debugpy port
     environment:
@@ -26,7 +26,6 @@ services:
     volumes:
     - {{ profile.settings.qontract_api_path.expanduser().absolute() }}/app.sh:/opt/app-root/src/app.sh
-    - {{ profile.settings.qontract_api_path.expanduser().absolute() }}/.env.yaml:/opt/app-root/src/.env.yaml
     - {{ profile.settings.qontract_api_path.expanduser().absolute() }}/.env:/opt/app-root/src/.env
     - {{ profile.settings.qontract_api_path.expanduser().absolute() }}/qontract_api:/opt/app-root/src/qontract_api/qontract_api
     - {{ profile.settings.qontract_reconcile_path.expanduser().absolute() }}/qontract_utils/qontract_utils:/opt/app-root/src/qontract_utils/qontract_utils