doover-cli 0.7.1__tar.gz → 0.7.2__tar.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 (101) hide show
  1. {doover_cli-0.7.1 → doover_cli-0.7.2}/.github/workflows/release.yml +1 -0
  2. {doover_cli-0.7.1 → doover_cli-0.7.2}/PKG-INFO +2 -2
  3. {doover_cli-0.7.1 → doover_cli-0.7.2}/pyproject.toml +1 -1
  4. {doover_cli-0.7.1 → doover_cli-0.7.2}/src/doover_cli/__init__.py +1 -1
  5. {doover_cli-0.7.1 → doover_cli-0.7.2}/src/doover_cli/api/session.py +92 -0
  6. {doover_cli-0.7.1 → doover_cli-0.7.2}/src/doover_cli/utils/api.py +19 -0
  7. {doover_cli-0.7.1 → doover_cli-0.7.2}/uv.lock +4 -4
  8. {doover_cli-0.7.1 → doover_cli-0.7.2}/.github/CONTRIBUTING.md +0 -0
  9. {doover_cli-0.7.1 → doover_cli-0.7.2}/.github/ISSUE_TEMPLATE/bug-report.yaml +0 -0
  10. {doover_cli-0.7.1 → doover_cli-0.7.2}/.github/ISSUE_TEMPLATE/config.yml +0 -0
  11. {doover_cli-0.7.1 → doover_cli-0.7.2}/.github/ISSUE_TEMPLATE/feature-request.yml +0 -0
  12. {doover_cli-0.7.1 → doover_cli-0.7.2}/.github/PULL_REQUEST_TEMPLATE.md +0 -0
  13. {doover_cli-0.7.1 → doover_cli-0.7.2}/.github/workflows/lint-test.yml +0 -0
  14. {doover_cli-0.7.1 → doover_cli-0.7.2}/.github/workflows/release-brew.yml +0 -0
  15. {doover_cli-0.7.1 → doover_cli-0.7.2}/.github/workflows/release-pypi.yml +0 -0
  16. {doover_cli-0.7.1 → doover_cli-0.7.2}/.gitignore +0 -0
  17. {doover_cli-0.7.1 → doover_cli-0.7.2}/.pre-commit-config.yaml +0 -0
  18. {doover_cli-0.7.1 → doover_cli-0.7.2}/AGENT.md +0 -0
  19. {doover_cli-0.7.1 → doover_cli-0.7.2}/LICENSE +0 -0
  20. {doover_cli-0.7.1 → doover_cli-0.7.2}/README.md +0 -0
  21. {doover_cli-0.7.1 → doover_cli-0.7.2}/debian/changelog +0 -0
  22. {doover_cli-0.7.1 → doover_cli-0.7.2}/debian/control +0 -0
  23. {doover_cli-0.7.1 → doover_cli-0.7.2}/debian/rules +0 -0
  24. {doover_cli-0.7.1 → doover_cli-0.7.2}/docs/user_stories.md +0 -0
  25. {doover_cli-0.7.1 → doover_cli-0.7.2}/src/doover_cli/agent.py +0 -0
  26. {doover_cli-0.7.1 → doover_cli-0.7.2}/src/doover_cli/api/__init__.py +0 -0
  27. {doover_cli-0.7.1 → doover_cli-0.7.2}/src/doover_cli/api/auth.py +0 -0
  28. {doover_cli-0.7.1 → doover_cli-0.7.2}/src/doover_cli/api/errors.py +0 -0
  29. {doover_cli-0.7.1 → doover_cli-0.7.2}/src/doover_cli/apps/app_install.py +0 -0
  30. {doover_cli-0.7.1 → doover_cli-0.7.2}/src/doover_cli/apps/apps.py +0 -0
  31. {doover_cli-0.7.1 → doover_cli-0.7.2}/src/doover_cli/apps/device.py +0 -0
  32. {doover_cli-0.7.1 → doover_cli-0.7.2}/src/doover_cli/apps/device_type.py +0 -0
  33. {doover_cli-0.7.1 → doover_cli-0.7.2}/src/doover_cli/apps/migrate.py +0 -0
  34. {doover_cli-0.7.1 → doover_cli-0.7.2}/src/doover_cli/apps/tunnel.py +0 -0
  35. {doover_cli-0.7.1 → doover_cli-0.7.2}/src/doover_cli/apps/widget_plugin.py +0 -0
  36. {doover_cli-0.7.1 → doover_cli-0.7.2}/src/doover_cli/channel.py +0 -0
  37. {doover_cli-0.7.1 → doover_cli-0.7.2}/src/doover_cli/cli.py +0 -0
  38. {doover_cli-0.7.1 → doover_cli-0.7.2}/src/doover_cli/colours.py +0 -0
  39. {doover_cli-0.7.1 → doover_cli-0.7.2}/src/doover_cli/config_schema.py +0 -0
  40. {doover_cli-0.7.1 → doover_cli-0.7.2}/src/doover_cli/dda_logs.py +0 -0
  41. {doover_cli-0.7.1 → doover_cli-0.7.2}/src/doover_cli/doover_config.py +0 -0
  42. {doover_cli-0.7.1 → doover_cli-0.7.2}/src/doover_cli/entry.py +0 -0
  43. {doover_cli-0.7.1 → doover_cli-0.7.2}/src/doover_cli/grpc.py +0 -0
  44. {doover_cli-0.7.1 → doover_cli-0.7.2}/src/doover_cli/login.py +0 -0
  45. {doover_cli-0.7.1 → doover_cli-0.7.2}/src/doover_cli/notification_schema.py +0 -0
  46. {doover_cli-0.7.1 → doover_cli-0.7.2}/src/doover_cli/registry.py +0 -0
  47. {doover_cli-0.7.1 → doover_cli-0.7.2}/src/doover_cli/renderer/__init__.py +0 -0
  48. {doover_cli-0.7.1 → doover_cli-0.7.2}/src/doover_cli/renderer/_base.py +0 -0
  49. {doover_cli-0.7.1 → doover_cli-0.7.2}/src/doover_cli/renderer/_basic.py +0 -0
  50. {doover_cli-0.7.1 → doover_cli-0.7.2}/src/doover_cli/renderer/_default.py +0 -0
  51. {doover_cli-0.7.1 → doover_cli-0.7.2}/src/doover_cli/renderer/_json.py +0 -0
  52. {doover_cli-0.7.1 → doover_cli-0.7.2}/src/doover_cli/report.py +0 -0
  53. {doover_cli-0.7.1 → doover_cli-0.7.2}/src/doover_cli/simulator.py +0 -0
  54. {doover_cli-0.7.1 → doover_cli-0.7.2}/src/doover_cli/tunnel_exec.py +0 -0
  55. {doover_cli-0.7.1 → doover_cli-0.7.2}/src/doover_cli/ui_schema.py +0 -0
  56. {doover_cli-0.7.1 → doover_cli-0.7.2}/src/doover_cli/user.py +0 -0
  57. {doover_cli-0.7.1 → doover_cli-0.7.2}/src/doover_cli/utils/__init__.py +0 -0
  58. {doover_cli-0.7.1 → doover_cli-0.7.2}/src/doover_cli/utils/apps.py +0 -0
  59. {doover_cli-0.7.1 → doover_cli-0.7.2}/src/doover_cli/utils/context.py +0 -0
  60. {doover_cli-0.7.1 → doover_cli-0.7.2}/src/doover_cli/utils/crud/__init__.py +0 -0
  61. {doover_cli-0.7.1 → doover_cli-0.7.2}/src/doover_cli/utils/crud/commands.py +0 -0
  62. {doover_cli-0.7.1 → doover_cli-0.7.2}/src/doover_cli/utils/crud/lookup.py +0 -0
  63. {doover_cli-0.7.1 → doover_cli-0.7.2}/src/doover_cli/utils/crud/prompting.py +0 -0
  64. {doover_cli-0.7.1 → doover_cli-0.7.2}/src/doover_cli/utils/crud/schema.py +0 -0
  65. {doover_cli-0.7.1 → doover_cli-0.7.2}/src/doover_cli/utils/crud/values.py +0 -0
  66. {doover_cli-0.7.1 → doover_cli-0.7.2}/src/doover_cli/utils/errors.py +0 -0
  67. {doover_cli-0.7.1 → doover_cli-0.7.2}/src/doover_cli/utils/formatters.py +0 -0
  68. {doover_cli-0.7.1 → doover_cli-0.7.2}/src/doover_cli/utils/misc.py +0 -0
  69. {doover_cli-0.7.1 → doover_cli-0.7.2}/src/doover_cli/utils/parsers.py +0 -0
  70. {doover_cli-0.7.1 → doover_cli-0.7.2}/src/doover_cli/utils/prompt.py +0 -0
  71. {doover_cli-0.7.1 → doover_cli-0.7.2}/src/doover_cli/utils/sentry.py +0 -0
  72. {doover_cli-0.7.1 → doover_cli-0.7.2}/src/doover_cli/utils/shell_commands.py +0 -0
  73. {doover_cli-0.7.1 → doover_cli-0.7.2}/src/doover_cli/utils/state.py +0 -0
  74. {doover_cli-0.7.1 → doover_cli-0.7.2}/tests/__init__.py +0 -0
  75. {doover_cli-0.7.1 → doover_cli-0.7.2}/tests/conftest.py +0 -0
  76. {doover_cli-0.7.1 → doover_cli-0.7.2}/tests/test_agent.py +0 -0
  77. {doover_cli-0.7.1 → doover_cli-0.7.2}/tests/test_app_install.py +0 -0
  78. {doover_cli-0.7.1 → doover_cli-0.7.2}/tests/test_apps.py +0 -0
  79. {doover_cli-0.7.1 → doover_cli-0.7.2}/tests/test_auth_integration.py +0 -0
  80. {doover_cli-0.7.1 → doover_cli-0.7.2}/tests/test_auth_unit.py +0 -0
  81. {doover_cli-0.7.1 → doover_cli-0.7.2}/tests/test_basic.py +0 -0
  82. {doover_cli-0.7.1 → doover_cli-0.7.2}/tests/test_crud_commands.py +0 -0
  83. {doover_cli-0.7.1 → doover_cli-0.7.2}/tests/test_crud_lookup.py +0 -0
  84. {doover_cli-0.7.1 → doover_cli-0.7.2}/tests/test_crud_prompting.py +0 -0
  85. {doover_cli-0.7.1 → doover_cli-0.7.2}/tests/test_crud_schema.py +0 -0
  86. {doover_cli-0.7.1 → doover_cli-0.7.2}/tests/test_crud_values.py +0 -0
  87. {doover_cli-0.7.1 → doover_cli-0.7.2}/tests/test_default_renderer.py +0 -0
  88. {doover_cli-0.7.1 → doover_cli-0.7.2}/tests/test_device.py +0 -0
  89. {doover_cli-0.7.1 → doover_cli-0.7.2}/tests/test_device_cli_integration.py +0 -0
  90. {doover_cli-0.7.1 → doover_cli-0.7.2}/tests/test_device_type.py +0 -0
  91. {doover_cli-0.7.1 → doover_cli-0.7.2}/tests/test_device_type_cli_integration.py +0 -0
  92. {doover_cli-0.7.1 → doover_cli-0.7.2}/tests/test_discover.py +0 -0
  93. {doover_cli-0.7.1 → doover_cli-0.7.2}/tests/test_migrate.py +0 -0
  94. {doover_cli-0.7.1 → doover_cli-0.7.2}/tests/test_prompt.py +0 -0
  95. {doover_cli-0.7.1 → doover_cli-0.7.2}/tests/test_registry.py +0 -0
  96. {doover_cli-0.7.1 → doover_cli-0.7.2}/tests/test_schema_export.py +0 -0
  97. {doover_cli-0.7.1 → doover_cli-0.7.2}/tests/test_sentry.py +0 -0
  98. {doover_cli-0.7.1 → doover_cli-0.7.2}/tests/test_tunnel_exec.py +0 -0
  99. {doover_cli-0.7.1 → doover_cli-0.7.2}/tests/test_user.py +0 -0
  100. {doover_cli-0.7.1 → doover_cli-0.7.2}/tests/test_utils_apps.py +0 -0
  101. {doover_cli-0.7.1 → doover_cli-0.7.2}/tests/test_widget_plugin.py +0 -0
@@ -64,6 +64,7 @@ jobs:
64
64
  deb-s3 upload \
65
65
  debian/build/*.deb \
66
66
  --lock \
67
+ --preserve-versions \
67
68
  --bucket "apt.u.doover.com" \
68
69
  --s3-region "${AWS_DEFAULT_REGION}" \
69
70
  --sign "${REPO_SIGNING_KEY_ID}" \
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.5
2
2
  Name: doover-cli
3
- Version: 0.7.1
3
+ Version: 0.7.2
4
4
  Summary: CLI for Doover
5
5
  License-File: LICENSE
6
6
  Requires-Python: >=3.11
@@ -11,7 +11,7 @@ Requires-Dist: doover-tunnel<0.2,>=0.1.2
11
11
  Requires-Dist: jsf>=0.11.2
12
12
  Requires-Dist: paramiko>=3.5.1
13
13
  Requires-Dist: prompt-toolkit>=3.0.52
14
- Requires-Dist: pydoover>=1.17.1
14
+ Requires-Dist: pydoover>=1.18.5
15
15
  Requires-Dist: pytz>=2025.2
16
16
  Requires-Dist: questionary>=1.10.0
17
17
  Requires-Dist: requests>=2.32.3
@@ -10,7 +10,7 @@ dependencies = [
10
10
  "docker>=7.1.0",
11
11
  "jsf>=0.11.2",
12
12
  "paramiko>=3.5.1",
13
- "pydoover>=1.17.1",
13
+ "pydoover>=1.18.5",
14
14
  "doover-tunnel>=0.1.2,<0.2",
15
15
  "pytz>=2025.2",
16
16
  "questionary>=1.10.0",
@@ -5,7 +5,7 @@ and `doover tunnel` to the doover-tunnel binary before `cli` (typer, pydoover,
5
5
  docker, ...) loads. `app` and `main` are still reachable here, lazily.
6
6
  """
7
7
 
8
- __version__ = "0.7.1"
8
+ __version__ = "0.7.2"
9
9
 
10
10
 
11
11
  def __getattr__(name: str):
@@ -3,6 +3,8 @@ import os
3
3
  import typer
4
4
 
5
5
  from pydoover.api import DataClient, ControlClient
6
+ from pydoover.api.auth._base import SyncAuthBase
7
+ from pydoover.models.data.exceptions import TokenRefreshError
6
8
  from pydoover.api.auth import ConfigManager
7
9
 
8
10
  from .auth import DooverCLIAuthClient
@@ -72,6 +74,65 @@ class DooverCLISession:
72
74
  auth = TrustedPublisherAuthClient(**kwargs)
73
75
  return cls(config_manager=None, profile_name=None, auth=auth)
74
76
 
77
+ @classmethod
78
+ def from_service_account(
79
+ cls,
80
+ service_account_id: str,
81
+ *,
82
+ audience: str | None = None,
83
+ data_base_url: str | None = None,
84
+ control_base_url: str | None = None,
85
+ timeout: float = 60.0,
86
+ ) -> "DooverCLISession":
87
+ """Build a session acting as a service account that trusts this CI job:
88
+ the job's OIDC token (GitHub Actions, with id-token permission) is
89
+ exchanged on doover-data for the account's token. No stored secret."""
90
+ from pydoover.api.auth import ServiceAccountAuthClient
91
+
92
+ kwargs = dict(timeout=timeout)
93
+ if audience:
94
+ kwargs["audience"] = audience
95
+ if data_base_url:
96
+ kwargs["data_base_url"] = data_base_url
97
+ if control_base_url:
98
+ kwargs["control_base_url"] = control_base_url
99
+ auth = ServiceAccountAuthClient(service_account_id, **kwargs)
100
+ return cls(config_manager=None, profile_name=None, auth=auth)
101
+
102
+ @classmethod
103
+ def from_github_actions(
104
+ cls,
105
+ *,
106
+ audience: str | None = None,
107
+ data_base_url: str | None = None,
108
+ control_base_url: str | None = None,
109
+ timeout: float = 60.0,
110
+ ) -> "DooverCLISession":
111
+ """Inside GitHub Actions with no account named: the service account
112
+ that trusts this job if data finds one, else trusted publishing."""
113
+ from pydoover.api.auth import (
114
+ ServiceAccountAuthClient,
115
+ TrustedPublisherAuthClient,
116
+ )
117
+
118
+ account = dict(timeout=timeout)
119
+ if data_base_url:
120
+ account["data_base_url"] = data_base_url
121
+ if control_base_url:
122
+ account["control_base_url"] = control_base_url
123
+ publisher = dict(
124
+ provider="GH", control_base_url=control_base_url, timeout=timeout
125
+ )
126
+ if audience:
127
+ account["audience"] = audience
128
+ publisher["audience"] = audience
129
+ auth = _ServiceAccountOrPublisher(
130
+ ServiceAccountAuthClient(**account),
131
+ TrustedPublisherAuthClient(**publisher),
132
+ timeout=timeout,
133
+ )
134
+ return cls(config_manager=None, profile_name=None, auth=auth)
135
+
75
136
  @classmethod
76
137
  def from_env(cls, *, timeout: float = 60.0) -> "DooverCLISession":
77
138
  token = os.environ.get("DOOVER_API_TOKEN")
@@ -125,3 +186,34 @@ class DooverCLISession:
125
186
  return None
126
187
  raise NotImplementedError()
127
188
  # self.get_control_client().agents
189
+
190
+
191
+ class _ServiceAccountOrPublisher(SyncAuthBase):
192
+ """The service account that trusts this CI job, found by data; if none
193
+ does (data answers 401), trusted publishing, for the rest of the run."""
194
+
195
+ def __init__(self, account, publisher, *, timeout: float):
196
+ super().__init__(token=None, timeout=timeout)
197
+ self._account = account
198
+ self._publisher = publisher
199
+ self._use_publisher = False
200
+ self.control_base_url = getattr(account, "control_base_url", None) or getattr(
201
+ publisher, "control_base_url", None
202
+ )
203
+
204
+ def refresh_access_token(self) -> None:
205
+ if not self._use_publisher:
206
+ try:
207
+ self._account.refresh_access_token()
208
+ self._set_access_token(
209
+ self._account.token, token_expires=self._account.token_expires
210
+ )
211
+ return
212
+ except TokenRefreshError as e:
213
+ if " 401 " not in f" {e} ":
214
+ raise
215
+ self._use_publisher = True
216
+ self._publisher.refresh_access_token()
217
+ self._set_access_token(
218
+ self._publisher.token, token_expires=self._publisher.token_expires
219
+ )
@@ -31,7 +31,26 @@ def setup_session(
31
31
  if os.environ.get("DOOVER_API_TOKEN"):
32
32
  return DooverCLISession.from_env()
33
33
 
34
+ # A service account trusting this CI job: preferred over the older
35
+ # trusted-publisher flow when named.
36
+ service_account = os.environ.get("DOOVER_SERVICE_ACCOUNT")
37
+ if service_account:
38
+ return DooverCLISession.from_service_account(
39
+ service_account,
40
+ audience=os.environ.get("DOOVER_OIDC_AUDIENCE"),
41
+ data_base_url=os.environ.get("DOOVER_DATA_API_BASE_URL"),
42
+ control_base_url=os.environ.get("DOOVER_CONTROL_API_BASE_URL"),
43
+ )
44
+
34
45
  provider = _trusted_publisher_provider()
46
+ if provider == "GH" and not os.environ.get("DOOVER_TRUSTED_PUBLISHER"):
47
+ # No account named: data finds the one trusting this job, else
48
+ # trusted publishing.
49
+ return DooverCLISession.from_github_actions(
50
+ audience=os.environ.get("DOOVER_OIDC_AUDIENCE"),
51
+ data_base_url=os.environ.get("DOOVER_DATA_API_BASE_URL"),
52
+ control_base_url=os.environ.get("DOOVER_CONTROL_API_BASE_URL"),
53
+ )
35
54
  if provider:
36
55
  return DooverCLISession.from_trusted_publisher(
37
56
  provider=provider,
@@ -593,7 +593,7 @@ requires-dist = [
593
593
  { name = "jsf", specifier = ">=0.11.2" },
594
594
  { name = "paramiko", specifier = ">=3.5.1" },
595
595
  { name = "prompt-toolkit", specifier = ">=3.0.52" },
596
- { name = "pydoover", specifier = ">=1.17.1" },
596
+ { name = "pydoover", specifier = ">=1.18.5" },
597
597
  { name = "pytz", specifier = ">=2025.2" },
598
598
  { name = "questionary", specifier = ">=1.10.0" },
599
599
  { name = "requests", specifier = ">=2.32.3" },
@@ -1350,15 +1350,15 @@ wheels = [
1350
1350
 
1351
1351
  [[package]]
1352
1352
  name = "pydoover"
1353
- version = "1.17.1"
1353
+ version = "1.18.5"
1354
1354
  source = { registry = "https://pypi.org/simple" }
1355
1355
  dependencies = [
1356
1356
  { name = "aiohttp" },
1357
1357
  { name = "httpx" },
1358
1358
  ]
1359
- sdist = { url = "https://files.pythonhosted.org/packages/d9/99/56164d2368604d81dedde8f969f777f2cfa75b6325cd7235c4a64413714d/pydoover-1.17.1.tar.gz", hash = "sha256:11ae6055a5af53aeb137c5a14fe38942596f7549cd9bdf20db571433f135503d", size = 608525, upload-time = "2026-09-09T03:17:32.98Z" }
1359
+ sdist = { url = "https://files.pythonhosted.org/packages/9a/74/32e2894219e068f25ba78dbb07b2878f9fd54e2651f960940b100e87bfa7/pydoover-1.18.5.tar.gz", hash = "sha256:7c7c175b7f9db64394d22f4c5e8d495b727c1a5a9fb9c22c3d2f5919bea4e2a5", size = 643017, upload-time = "2026-11-10T04:57:38.181Z" }
1360
1360
  wheels = [
1361
- { url = "https://files.pythonhosted.org/packages/2b/8f/f17d1242881565ed5d93604dab48977891421f3d1a1fe189f6150af31ae8/pydoover-1.17.1-py3-none-any.whl", hash = "sha256:dc9e6a67007d161193372d884b691809c7c835409f8c50d6dacbec5dee0ce27a", size = 329229, upload-time = "2026-09-09T03:17:31.696Z" },
1361
+ { url = "https://files.pythonhosted.org/packages/fb/29/36b7ba1948beb1df64d365eed242ca489c99aba50e8cf8d78651c9326582/pydoover-1.18.5-py3-none-any.whl", hash = "sha256:2d4dc0589e54ed2e536c11550ca236d962f0efc0c254b993e0f8e03a909af2d1", size = 344389, upload-time = "2026-11-10T04:57:36.547Z" },
1362
1362
  ]
1363
1363
 
1364
1364
  [[package]]
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes