python-rundeck 1.0.1__tar.gz → 1.1.0__tar.gz

{python_rundeck-1.0.1 → python_rundeck-1.1.0}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: python-rundeck
-Version: 1.0.1
-Summary: Python client for the Rundeck API (v14-v56).
+Version: 1.1.0
+Summary: Python client for the Rundeck API (v14-v58).
 License-Expression: MIT
 License-File: LICENSE
 Keywords: rundeck,api,client
@@ -43,7 +43,7 @@ python-rundeck
 ![License](https://img.shields.io/pypi/l/python-rundeck)
 ![Downloads](https://static.pepy.tech/badge/python-rundeck)
 
-Python client for the Rundeck API (v14-v56), inspired by the python-gitlab architecture. Provides typed managers for key resources (projects, jobs, executions, tokens, users, system, configuration) and SCM (import/export).
+Python client for the Rundeck API (v14-v58), inspired by the python-gitlab architecture. The default API version is v58; current Rundeck servers require v17 or later and versions below v34 are deprecated. Provides typed managers for Community resources (projects, jobs, executions, tokens, users, system) and SCM (import/export).
 
 Contents
 --------
@@ -69,9 +69,9 @@ Quick start
 ```python
 from rundeck.client import Rundeck
 
-rd = Rundeck(url="https://rundeck.example.com", token="MY_TOKEN", api_version=56)
+rd = Rundeck(url="https://rundeck.example.com", token="MY_TOKEN", api_version=58)
 # Password auth (session cookie) if no token
-rd = Rundeck(url="https://rundeck.example.com", username="admin", password="admin", api_version=56)
+rd = Rundeck(url="https://rundeck.example.com", username="admin", password="admin", api_version=58)
 
 # List projects
 projects = rd.projects.list()
@@ -94,20 +94,24 @@ Main parameters:
 - `url`: Rundeck URL (e.g. `https://rundeck.example.com`)
 - `token`: API token (header `X-Rundeck-Auth-Token`)
 - `username` / `password`: Session authentication (j_security_check) if no token is provided.
-- `api_version`: API version (e.g. `56`)
+- `api_version`: API version (default: `58`)
 - `timeout`: Request timeout (float, seconds)
 - `ssl_verify`: TLS verification (bool or CA path)
+- `user_agent`: Custom HTTP User-Agent (string)
+- `config_section`: Section name in config files (default: `rundeck`)
 
 Config files: if needed, pass `config_files` or `Rundeck.from_config(config_section=...)`.
 Useful env vars (client config):
 - `RUNDECK_URL`: Base URL
 - `RUNDECK_TOKEN`: API token (header `X-Rundeck-Auth-Token`)
 - `RUNDECK_USERNAME` / `RUNDECK_PASSWORD`: Session auth (if no token)
-- `RUNDECK_API_VERSION`: API version (e.g. 56)
+- `RUNDECK_API_VERSION`: API version (e.g. 58)
 - `RUNDECK_TIMEOUT`: Request timeout (seconds)
 - `RUNDECK_SSL_VERIFY`: TLS verification (bool or CA path)
 - `RUNDECK_USER_AGENT`: HTTP User-Agent
 
+Rundeck 6.0+ accepts JSON for REST requests and responses. XML/YAML remain supported only as job, archive, and resource document formats.
+
 Available resources
 -------------------
 - `projects` (`ProjectManager`): CRUD projects, job export/import, project config, archive (export/import).
@@ -115,13 +119,15 @@ Available resources
 - `executions` (`ExecutionManager`): list/filter, running, get/delete, advanced query.
 - `tokens` (`TokenManager`): list, get, create, delete.
 - `users` (`UserManager`): user operations (per current implementation).
-- `metrics` (`MetricsManager`): `/metrics` endpoints (list/data/healthcheck/ping).
+- `metrics` (`MetricsManager`): legacy `/api/V/metrics` endpoints (list/data/healthcheck/ping/threads).
+- `monitoring` (`MonitoringManager`): modern non-versioned `/monitoring/*` endpoints (Prometheus, metrics, health, info, thread dump).
 - `plugins` (`PluginManager`): list installed plugins (`/plugin/list`).
 - `webhooks` (`WebhookEventManager` + `ProjectWebhookManager`): project webhook management and sending via token.
 - `key_storage` (`StorageKeyManager`): key storage management `/storage/keys`.
 - `adhoc` (`AdhocManager`, via `project.adhoc`): run AdHoc commands/scripts.
 - `system` (`SystemManager`): system info, executions enable/disable, logstorage, ACL.
-- `config_management` (`ConfigManagementManager`): global configuration `/config`.
+- `config_management` (`ConfigManagementManager`): global configuration `/config` (commercial, deprecated and scheduled for removal in 2.0).
+- `scheduler` (`SchedulerManager`): cluster scheduler takeover (commercial, deprecated and scheduled for removal in 2.0).
 - `scm` (via `project.scm` and `job.scm`): import/export plugins, setup, enable/disable, status, actions (commit/import/export...).
 
 Return types policy
@@ -130,7 +136,7 @@ Return types policy
 - Factory managers return the created resource object for actions that create it
   (e.g., `project.adhoc` returns `Execution`).
 - Utility managers return raw API responses (dict/str/bytes).
-- `delete(...)` returns `None`.
+- CRUD `delete(...)` returns `None`; action endpoints returning a result body return that raw result.
 - Object methods return raw API responses and update the object in place when needed.
 - Explicit flags are used when an object return is requested (e.g., `as_execution=True`).
 
@@ -257,9 +263,11 @@ job.enable_schedule()
 job.disable_schedule()
 info = job.info()
 meta = job.meta(meta="name,description")
-tags = job.tags()
+meta = job.meta(meta="*", meta_exclude="stats")  # API v58+
 workflow = job.workflow()
-forecast = job.forecast(time="2024-05-01T10:00:00Z", max=5)
+forecast = job.forecast(time="2024-05-01T10:00:00Z", max=5, past=False)
+executions = job.executions(include_job_ref=True)
+deleted = job.delete_executions()
 
 # Export/import jobs via manager (project parameter or parent)
 rd.jobs.export(project="demo", format="xml", idlist="id1,id2", groupPath="group")
@@ -462,6 +470,7 @@ if features:
 
 Global configuration `/config`
 ```python
+# Commercial compatibility surface; deprecated and removed in 2.0.
 cfg = rd.config_management
 all_configs = cfg.list()
 cfg.save([{"key": "ui.banner", "value": "Hello"}])
@@ -470,6 +479,19 @@ cfg.refresh()
 cfg.restart()
 ```
 
+Monitoring
+----------
+```python
+# Rundeck 6.0+ modern endpoints, outside /api/V.
+health = rd.monitoring.health()
+prometheus_text = rd.monitoring.prometheus()
+metric = rd.monitoring.metric("jvm.memory.used", tags=["area:heap"])
+thread_dump = rd.monitoring.thread_dump()
+
+# Legacy metrics require rundeck.metrics.legacy.enabled=true on Rundeck 6.0.
+legacy_threads = rd.metrics.threads()
+```
+
 Pagination
 ----------
 Managers inherit `RundeckObjectManager.iter(...)` (offset/max). Example:
@@ -488,7 +510,8 @@ Development and testing
 - Formatting/Lint: `black src/rundeck tests/`, `ruff check src/rundeck tests/`
 - Typing: `mypy src/rundeck/`
 - Tests: `pytest`
-- Local integration tests: `scripts/run-integration.sh` (starts docker compose at repo root, exports by default `RUNDECK_URL=http://localhost:4440`, `RUNDECK_TOKEN=adminToken`, `RUNDECK_API_VERSION=56`, waits for the healthcheck, runs `poetry run pytest -m integration`). You can override env vars before running. Add `KEEP_STACK=1` to keep the instance running after tests. Dedicated teardown script: `scripts/stop-integration.sh`.
+- Local integration tests: `scripts/run-integration.sh` starts Rundeck Community 6.0.1 by default with API v58. Use `RUNDECK_IMAGE=rundeck/rundeck:5.18.0 RUNDECK_API_VERSION=56 scripts/run-integration.sh` for the v56 compatibility run. Add `KEEP_STACK=1` to keep the instance running after tests. Dedicated teardown script: `scripts/stop-integration.sh`.
+- The docker compose stack mounts `tokens.properties` at the repo root to seed a local admin token for integration tests. This file is only intended for local testing.
 
 Code structure
 --------------

{python_rundeck-1.0.1 → python_rundeck-1.1.0}/README.md

@@ -5,7 +5,7 @@ python-rundeck
 ![License](https://img.shields.io/pypi/l/python-rundeck)
 ![Downloads](https://static.pepy.tech/badge/python-rundeck)
 
-Python client for the Rundeck API (v14-v56), inspired by the python-gitlab architecture. Provides typed managers for key resources (projects, jobs, executions, tokens, users, system, configuration) and SCM (import/export).
+Python client for the Rundeck API (v14-v58), inspired by the python-gitlab architecture. The default API version is v58; current Rundeck servers require v17 or later and versions below v34 are deprecated. Provides typed managers for Community resources (projects, jobs, executions, tokens, users, system) and SCM (import/export).
 
 Contents
 --------
@@ -31,9 +31,9 @@ Quick start
 ```python
 from rundeck.client import Rundeck
 
-rd = Rundeck(url="https://rundeck.example.com", token="MY_TOKEN", api_version=56)
+rd = Rundeck(url="https://rundeck.example.com", token="MY_TOKEN", api_version=58)
 # Password auth (session cookie) if no token
-rd = Rundeck(url="https://rundeck.example.com", username="admin", password="admin", api_version=56)
+rd = Rundeck(url="https://rundeck.example.com", username="admin", password="admin", api_version=58)
 
 # List projects
 projects = rd.projects.list()
@@ -56,20 +56,24 @@ Main parameters:
 - `url`: Rundeck URL (e.g. `https://rundeck.example.com`)
 - `token`: API token (header `X-Rundeck-Auth-Token`)
 - `username` / `password`: Session authentication (j_security_check) if no token is provided.
-- `api_version`: API version (e.g. `56`)
+- `api_version`: API version (default: `58`)
 - `timeout`: Request timeout (float, seconds)
 - `ssl_verify`: TLS verification (bool or CA path)
+- `user_agent`: Custom HTTP User-Agent (string)
+- `config_section`: Section name in config files (default: `rundeck`)
 
 Config files: if needed, pass `config_files` or `Rundeck.from_config(config_section=...)`.
 Useful env vars (client config):
 - `RUNDECK_URL`: Base URL
 - `RUNDECK_TOKEN`: API token (header `X-Rundeck-Auth-Token`)
 - `RUNDECK_USERNAME` / `RUNDECK_PASSWORD`: Session auth (if no token)
-- `RUNDECK_API_VERSION`: API version (e.g. 56)
+- `RUNDECK_API_VERSION`: API version (e.g. 58)
 - `RUNDECK_TIMEOUT`: Request timeout (seconds)
 - `RUNDECK_SSL_VERIFY`: TLS verification (bool or CA path)
 - `RUNDECK_USER_AGENT`: HTTP User-Agent
 
+Rundeck 6.0+ accepts JSON for REST requests and responses. XML/YAML remain supported only as job, archive, and resource document formats.
+
 Available resources
 -------------------
 - `projects` (`ProjectManager`): CRUD projects, job export/import, project config, archive (export/import).
@@ -77,13 +81,15 @@ Available resources
 - `executions` (`ExecutionManager`): list/filter, running, get/delete, advanced query.
 - `tokens` (`TokenManager`): list, get, create, delete.
 - `users` (`UserManager`): user operations (per current implementation).
-- `metrics` (`MetricsManager`): `/metrics` endpoints (list/data/healthcheck/ping).
+- `metrics` (`MetricsManager`): legacy `/api/V/metrics` endpoints (list/data/healthcheck/ping/threads).
+- `monitoring` (`MonitoringManager`): modern non-versioned `/monitoring/*` endpoints (Prometheus, metrics, health, info, thread dump).
 - `plugins` (`PluginManager`): list installed plugins (`/plugin/list`).
 - `webhooks` (`WebhookEventManager` + `ProjectWebhookManager`): project webhook management and sending via token.
 - `key_storage` (`StorageKeyManager`): key storage management `/storage/keys`.
 - `adhoc` (`AdhocManager`, via `project.adhoc`): run AdHoc commands/scripts.
 - `system` (`SystemManager`): system info, executions enable/disable, logstorage, ACL.
-- `config_management` (`ConfigManagementManager`): global configuration `/config`.
+- `config_management` (`ConfigManagementManager`): global configuration `/config` (commercial, deprecated and scheduled for removal in 2.0).
+- `scheduler` (`SchedulerManager`): cluster scheduler takeover (commercial, deprecated and scheduled for removal in 2.0).
 - `scm` (via `project.scm` and `job.scm`): import/export plugins, setup, enable/disable, status, actions (commit/import/export...).
 
 Return types policy
@@ -92,7 +98,7 @@ Return types policy
 - Factory managers return the created resource object for actions that create it
   (e.g., `project.adhoc` returns `Execution`).
 - Utility managers return raw API responses (dict/str/bytes).
-- `delete(...)` returns `None`.
+- CRUD `delete(...)` returns `None`; action endpoints returning a result body return that raw result.
 - Object methods return raw API responses and update the object in place when needed.
 - Explicit flags are used when an object return is requested (e.g., `as_execution=True`).
 
@@ -219,9 +225,11 @@ job.enable_schedule()
 job.disable_schedule()
 info = job.info()
 meta = job.meta(meta="name,description")
-tags = job.tags()
+meta = job.meta(meta="*", meta_exclude="stats")  # API v58+
 workflow = job.workflow()
-forecast = job.forecast(time="2024-05-01T10:00:00Z", max=5)
+forecast = job.forecast(time="2024-05-01T10:00:00Z", max=5, past=False)
+executions = job.executions(include_job_ref=True)
+deleted = job.delete_executions()
 
 # Export/import jobs via manager (project parameter or parent)
 rd.jobs.export(project="demo", format="xml", idlist="id1,id2", groupPath="group")
@@ -424,6 +432,7 @@ if features:
 
 Global configuration `/config`
 ```python
+# Commercial compatibility surface; deprecated and removed in 2.0.
 cfg = rd.config_management
 all_configs = cfg.list()
 cfg.save([{"key": "ui.banner", "value": "Hello"}])
@@ -432,6 +441,19 @@ cfg.refresh()
 cfg.restart()
 ```
 
+Monitoring
+----------
+```python
+# Rundeck 6.0+ modern endpoints, outside /api/V.
+health = rd.monitoring.health()
+prometheus_text = rd.monitoring.prometheus()
+metric = rd.monitoring.metric("jvm.memory.used", tags=["area:heap"])
+thread_dump = rd.monitoring.thread_dump()
+
+# Legacy metrics require rundeck.metrics.legacy.enabled=true on Rundeck 6.0.
+legacy_threads = rd.metrics.threads()
+```
+
 Pagination
 ----------
 Managers inherit `RundeckObjectManager.iter(...)` (offset/max). Example:
@@ -450,7 +472,8 @@ Development and testing
 - Formatting/Lint: `black src/rundeck tests/`, `ruff check src/rundeck tests/`
 - Typing: `mypy src/rundeck/`
 - Tests: `pytest`
-- Local integration tests: `scripts/run-integration.sh` (starts docker compose at repo root, exports by default `RUNDECK_URL=http://localhost:4440`, `RUNDECK_TOKEN=adminToken`, `RUNDECK_API_VERSION=56`, waits for the healthcheck, runs `poetry run pytest -m integration`). You can override env vars before running. Add `KEEP_STACK=1` to keep the instance running after tests. Dedicated teardown script: `scripts/stop-integration.sh`.
+- Local integration tests: `scripts/run-integration.sh` starts Rundeck Community 6.0.1 by default with API v58. Use `RUNDECK_IMAGE=rundeck/rundeck:5.18.0 RUNDECK_API_VERSION=56 scripts/run-integration.sh` for the v56 compatibility run. Add `KEEP_STACK=1` to keep the instance running after tests. Dedicated teardown script: `scripts/stop-integration.sh`.
+- The docker compose stack mounts `tokens.properties` at the repo root to seed a local admin token for integration tests. This file is only intended for local testing.
 
 Code structure
 --------------

{python_rundeck-1.0.1 → python_rundeck-1.1.0}/pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "python-rundeck"
-version = "1.0.1"
-description = "Python client for the Rundeck API (v14-v56)."
+version = "1.1.0"
+description = "Python client for the Rundeck API (v14-v58)."
 authors = [
     {name = "Pascal Seckinger",email = "pascal.seckinger@protonmail.com"}
 ]

{python_rundeck-1.0.1 → python_rundeck-1.1.0}/src/rundeck/client.py

@@ -1,8 +1,6 @@
-from __future__ import annotations
+"""Client principal pour l'API Rundeck."""
 
-"""
-Client principal pour l'API Rundeck
-"""
+from __future__ import annotations
 
 from typing import Any
 from urllib.parse import urljoin
@@ -37,8 +35,10 @@ class Rundeck:
         api_version: int | None = None,
         timeout: float | None = None,
         ssl_verify: bool | None = None,
+        user_agent: str | None = None,
         session: requests.Session | None = None,
         config_files: list[str] | None = None,
+        config_section: str | None = None,
     ) -> None:
         self.config = RundeckConfig(
             url=url,
@@ -48,7 +48,9 @@ class Rundeck:
             api_version=api_version,
             timeout=timeout,
             ssl_verify=ssl_verify,
+            user_agent=user_agent,
             config_files=config_files,
+            config_section=config_section or "rundeck",
         )
 
         if not self.config.url:
@@ -84,7 +86,7 @@ class Rundeck:
         from rundeck.v1.objects.features import FeatureManager
         from rundeck.v1.objects.jobs import JobManager
         from rundeck.v1.objects.key_storage import StorageKeyManager
-        from rundeck.v1.objects.metrics import MetricsManager
+        from rundeck.v1.objects.metrics import MetricsManager, MonitoringManager
         from rundeck.v1.objects.plugins import PluginManager
         from rundeck.v1.objects.projects import ProjectManager
         from rundeck.v1.objects.scheduler import SchedulerManager
@@ -98,6 +100,7 @@ class Rundeck:
         self.executions = ExecutionManager(self)
         self.config_management = ConfigManagementManager(self)
         self.metrics = MetricsManager(self)
+        self.monitoring = MonitoringManager(self)
         self.plugins = PluginManager(self)
         self.webhooks = WebhookEventManager(self)
         self.key_storage = StorageKeyManager(self)
@@ -127,6 +130,7 @@ class Rundeck:
         cls,
         config_section: str | None = None,
         config_files: list[str] | None = None,
+        user_agent: str | None = None,
         **kwargs: Any,
     ) -> "Rundeck":
         """
@@ -144,8 +148,10 @@ class Rundeck:
             api_version=conf.api_version,
             timeout=conf.timeout,
             ssl_verify=conf.ssl_verify,
+            user_agent=user_agent,
             session=kwargs.get("session"),
             config_files=config_files,
+            config_section=config_section,
         )
 
     def _authenticate_with_password(self) -> None:
@@ -265,14 +271,12 @@ class Rundeck:
         if raw:
             return response
 
-        if method == HTTP_DELETE:
-            return None
         if response.text:
             try:
                 return response.json()
             except ValueError:
                 return response.text
-        return {}
+        return None if method == HTTP_DELETE else {}
 
     def http_get(
         self,
@@ -331,8 +335,8 @@ class Rundeck:
         url: str,
         raw: bool = False,
         **kwargs: Any,
-    ) -> None:
-        self._request(HTTP_DELETE, url, raw=raw, **kwargs)
+    ) -> Any:
+        return self._request(HTTP_DELETE, url, raw=raw, **kwargs)
 
     def __enter__(self) -> "Rundeck":
         return self

{python_rundeck-1.0.1 → python_rundeck-1.1.0}/src/rundeck/config.py

@@ -63,6 +63,7 @@ class RundeckConfig:
         api_version: int | str | None = None,
         timeout: float | None = None,
         ssl_verify: bool | str | None = None,
+        user_agent: str | None = None,
         config_files: list[str] | None = None,
         config_section: str = "rundeck",
     ) -> None:
@@ -103,7 +104,7 @@ class RundeckConfig:
             else _coerce_ssl_verify(env_ssl_verify or file_conf.get("ssl_verify"))
         )
         self.user_agent: str = (
-            env_user_agent or file_conf.get("user_agent") or USER_AGENT
+            user_agent or env_user_agent or file_conf.get("user_agent") or USER_AGENT
         )
         self.config_files = files
 

python_rundeck-1.1.0/src/rundeck/const.py

@@ -0,0 +1,69 @@
+"""
+Constantes partagées pour le client Rundeck.
+"""
+
+from importlib.metadata import PackageNotFoundError, version
+from pathlib import Path
+import tomllib
+
+
+# Package metadata
+def _read_pyproject_version() -> str | None:
+    try:
+        root = Path(__file__).resolve().parents[2]
+        pyproject = root / "pyproject.toml"
+        if not pyproject.is_file():
+            return None
+        with pyproject.open("rb") as handle:
+            data = tomllib.load(handle)
+        return data.get("project", {}).get("version")
+    except Exception:
+        return None
+
+
+try:
+    __version__ = version("python-rundeck")
+except PackageNotFoundError:  # pragma: no cover - fallback for local dev
+    __version__ = _read_pyproject_version() or "0.0.0"
+
+# Auth
+RUNDECK_AUTH_HEADER = "X-Rundeck-Auth-Token"
+
+# HTTP methods
+HTTP_GET = "GET"
+HTTP_POST = "POST"
+HTTP_PUT = "PUT"
+HTTP_DELETE = "DELETE"
+
+# Content / formats
+FORMAT_JSON = "json"
+
+# API versions. The library remains compatible with legacy Rundeck servers
+# using v14, while current Rundeck servers require at least v17.
+API_VERSION_CURRENT = "58"
+API_VERSION_MIN = "14"
+API_VERSION_SERVER_MIN = "17"
+API_VERSION_DEPRECATION = "34"
+
+# Defaults
+DEFAULT_API_VERSION = API_VERSION_CURRENT
+DEFAULT_TIMEOUT = 30
+USER_AGENT = "python-rundeck"
+
+
+__all__ = [
+    "__version__",
+    "API_VERSION_CURRENT",
+    "API_VERSION_DEPRECATION",
+    "API_VERSION_MIN",
+    "API_VERSION_SERVER_MIN",
+    "DEFAULT_API_VERSION",
+    "DEFAULT_TIMEOUT",
+    "FORMAT_JSON",
+    "HTTP_DELETE",
+    "HTTP_GET",
+    "HTTP_POST",
+    "HTTP_PUT",
+    "RUNDECK_AUTH_HEADER",
+    "USER_AGENT",
+]

python_rundeck-1.1.0/src/rundeck/utils.py

@@ -0,0 +1,35 @@
+from __future__ import annotations
+
+from typing import Any, Mapping
+
+
+def compact(*dicts: Mapping[str, Any], **kwargs: Any) -> dict[str, Any]:
+    """
+    Supprime les entrées dont la valeur est None.
+    """
+    result: dict[str, Any] = {}
+    for mapping in dicts:
+        if not mapping:
+            continue
+        for key, value in mapping.items():
+            if value is not None:
+                result[key] = value
+    for key, value in kwargs.items():
+        if value is not None:
+            result[key] = value
+    return result
+
+
+def build_headers(
+    accept: str | None = None,
+    content_type: str | None = None,
+) -> dict[str, str] | None:
+    """
+    Construit les en-têtes standards (Accept/Content-Type).
+    """
+    headers: dict[str, str] = {}
+    if accept is not None:
+        headers["Accept"] = accept
+    if content_type is not None:
+        headers["Content-Type"] = content_type
+    return headers or None

python_rundeck-1.1.0/src/rundeck/v1/objects/acl.py

@@ -0,0 +1,19 @@
+from __future__ import annotations
+
+from typing import Any
+
+from rundeck.utils import build_headers
+
+
+class YamlPolicyMixin:
+    _yaml_content_type = "application/yaml"
+
+    def _yaml_headers(self) -> dict[str, str]:
+        headers = build_headers(content_type=self._yaml_content_type)
+        return headers or {"Content-Type": self._yaml_content_type}
+
+    def _post_yaml(self, path: str, content: Any) -> Any:
+        return self.rd.http_post(path, data=content, headers=self._yaml_headers())
+
+    def _put_yaml(self, path: str, content: Any) -> Any:
+        return self.rd.http_put(path, data=content, headers=self._yaml_headers())

{python_rundeck-1.0.1 → python_rundeck-1.1.0}/src/rundeck/v1/objects/adhoc.py

@@ -19,23 +19,6 @@ class AdhocManager(RundeckObjectManager[Execution]):
             raise ValueError("Le nom du projet est requis pour les commandes AdHoc")
         return project_name
 
-    def _wrap_execution(self, result: Any, refresh: bool = True) -> Execution:
-        data = (
-            result.get("execution")
-            if isinstance(result, dict) and "execution" in result
-            else result
-        )
-        if isinstance(data, dict):
-            exec_id = data.get("id")
-            # Les réponses AdHoc ne sont pas complètes,
-            # Le rafraîchissement permet d'obtenir toutes les données
-            if refresh and exec_id:
-                try:
-                    return self.rd.executions.get(exec_id)
-                except Exception:
-                    return Execution(self.rd.executions, data)
-        return Execution(self.rd.executions, data)
-
     def run_command(
         self,
         exec: str,
@@ -49,7 +32,7 @@ class AdhocManager(RundeckObjectManager[Execution]):
         payload.update(options)
         path = f"/project/{project_name}/run/command"
         result = self.rd.http_post(path, json=payload)
-        return self._wrap_execution(result, refresh=refresh)
+        return self.rd.executions.wrap_execution(result, refresh=refresh)
 
     def run_script(
         self,
@@ -72,7 +55,7 @@ class AdhocManager(RundeckObjectManager[Execution]):
             payload: dict[str, Any] = {"script": script or "", "project": project_name}
             payload.update(options)
             result = self.rd.http_post(path, json=payload)
-        return self._wrap_execution(result, refresh=refresh)
+        return self.rd.executions.wrap_execution(result, refresh=refresh)
 
     def run_url(
         self,
@@ -87,7 +70,7 @@ class AdhocManager(RundeckObjectManager[Execution]):
         payload.update(options)
         path = f"/project/{project_name}/run/url"
         result = self.rd.http_post(path, json=payload)
-        return self._wrap_execution(result, refresh=refresh)
+        return self.rd.executions.wrap_execution(result, refresh=refresh)
 
 
 __all__ = ["AdhocManager"]

{python_rundeck-1.0.1 → python_rundeck-1.1.0}/src/rundeck/v1/objects/config_management.py

@@ -1,8 +1,8 @@
+"""Gestion de la configuration Rundeck (instance globale)."""
+
 from __future__ import annotations
 
-"""
-Gestion de la configuration Rundeck (instance globale).
-"""
+import warnings
 
 from rundeck.base import RundeckObjectManager
 
@@ -14,8 +14,17 @@ class ConfigManagementManager(RundeckObjectManager):
 
     _path = "/config"
 
+    @staticmethod
+    def _warn_commercial() -> None:
+        warnings.warn(
+            "Config Management est une surface commerciale et sera retirée en 2.0.",
+            DeprecationWarning,
+            stacklevel=3,
+        )
+
     def list(self) -> list[dict[str, str]]:
         """Liste toutes les configs et propriétés."""
+        self._warn_commercial()
         path = self._build_path("list")
         return self.rd.http_get(path)
 
@@ -23,6 +32,7 @@ class ConfigManagementManager(RundeckObjectManager):
         """
         Crée ou met à jour des configs (payload: liste de dicts {key, value, strata?}).
         """
+        self._warn_commercial()
         path = self._build_path("save")
         return self.rd.http_post(path, json=entries)
 
@@ -30,6 +40,7 @@ class ConfigManagementManager(RundeckObjectManager):
         """
         Supprime une config via /config/delete avec payload JSON.
         """
+        self._warn_commercial()
         payload: dict[str, str] = {"key": key}
         if strata:
             payload["strata"] = strata
@@ -40,6 +51,7 @@ class ConfigManagementManager(RundeckObjectManager):
         """
         Recharge les configurations depuis les fichiers de propriétés.
         """
+        self._warn_commercial()
         path = self._build_path("refresh")
         return self.rd.http_post(path)
 
@@ -47,5 +59,6 @@ class ConfigManagementManager(RundeckObjectManager):
         """
         Redémarre le serveur Rundeck.
         """
+        self._warn_commercial()
         path = self._build_path("restart")
         return self.rd.http_post(path)