openhands-agent-server 1.62.0__tar.gz → 1.63.0__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 (122) hide show
  1. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/PKG-INFO +4 -4
  2. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/_secrets_exposure.py +19 -72
  3. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/acp_router.py +15 -12
  4. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/agent_profiles_router.py +135 -161
  5. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/api.py +154 -126
  6. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/auth_router.py +22 -9
  7. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/bash_router.py +7 -7
  8. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/bash_service.py +0 -18
  9. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/canvas_extensions/backend.py +27 -18
  10. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/canvas_extensions/bridge.py +58 -65
  11. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/canvas_extensions_bridge_router.py +30 -15
  12. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/canvas_extensions_router.py +46 -62
  13. openhands_agent_server-1.63.0/openhands/agent_server/catalog.py +12 -0
  14. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/config.py +3 -13
  15. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/conversation_lease.py +65 -10
  16. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/conversation_registry.py +9 -5
  17. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/conversation_router.py +306 -205
  18. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/conversation_service.py +225 -146
  19. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/credential_binding.py +29 -33
  20. openhands_agent_server-1.63.0/openhands/agent_server/dependencies.py +226 -0
  21. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/docker/Dockerfile +26 -1
  22. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/docker_runtime/hybrid.py +6 -1
  23. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/docker_runtime/provisioning.py +7 -18
  24. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/docker_runtime/proxy.py +10 -14
  25. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/docker_runtime/registry.py +24 -5
  26. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/docker_runtime/routers.py +185 -102
  27. openhands_agent_server-1.63.0/openhands/agent_server/errors.py +137 -0
  28. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/event_router.py +235 -32
  29. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/event_service.py +338 -207
  30. openhands_agent_server-1.63.0/openhands/agent_server/exceptions.py +64 -0
  31. openhands_agent_server-1.63.0/openhands/agent_server/experimental_features.py +166 -0
  32. openhands_agent_server-1.63.0/openhands/agent_server/experimental_features_router.py +72 -0
  33. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/file_router.py +105 -146
  34. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/git_provider_service.py +9 -9
  35. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/git_router.py +29 -38
  36. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/init_router.py +163 -128
  37. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/launch.py +29 -24
  38. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/llm_router.py +6 -17
  39. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/local_secret_resolver.py +11 -7
  40. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/mcp_oauth_store.py +19 -13
  41. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/mcp_router.py +262 -38
  42. openhands_agent_server-1.63.0/openhands/agent_server/message_sender.py +44 -0
  43. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/meta_profiles_router.py +28 -67
  44. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/models.py +58 -0
  45. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/openai/router.py +36 -35
  46. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/openai/service.py +187 -161
  47. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/persistence/__init__.py +5 -14
  48. openhands_agent_server-1.63.0/openhands/agent_server/persistence/async_store.py +36 -0
  49. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/persistence/models.py +27 -24
  50. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/persistence/store.py +157 -209
  51. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/plugins_router.py +55 -63
  52. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/plugins_service.py +4 -0
  53. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/profiles_router.py +89 -101
  54. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/provider_connections_router.py +66 -100
  55. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/pub_sub.py +16 -0
  56. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/runtime_router.py +27 -18
  57. openhands_agent_server-1.63.0/openhands/agent_server/server_context.py +92 -0
  58. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/server_details_router.py +12 -3
  59. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/session_socket.py +32 -7
  60. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/settings_router.py +137 -132
  61. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/skills_router.py +63 -58
  62. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/skills_service.py +13 -2
  63. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/sockets.py +36 -61
  64. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/sub_agents_router.py +3 -3
  65. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/telemetry/__init__.py +1 -1
  66. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/telemetry/service.py +18 -15
  67. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/tool_preload_service.py +28 -18
  68. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/tool_router.py +16 -3
  69. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/vscode_router.py +14 -13
  70. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/vscode_service.py +16 -28
  71. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/workspace_router.py +14 -29
  72. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/workspaces_router.py +40 -54
  73. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands_agent_server.egg-info/PKG-INFO +4 -4
  74. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands_agent_server.egg-info/SOURCES.txt +16 -0
  75. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands_agent_server.egg-info/requires.txt +3 -3
  76. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/pyproject.toml +5 -5
  77. openhands_agent_server-1.62.0/openhands/agent_server/dependencies.py +0 -134
  78. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/__init__.py +0 -0
  79. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/__main__.py +0 -0
  80. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/_secret_redaction.py +0 -0
  81. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/canvas_extensions/__init__.py +0 -0
  82. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/canvas_extensions/installed.py +0 -0
  83. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/canvas_extensions/manifest.py +0 -0
  84. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/code_server_proxy.cjs +0 -0
  85. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/docker/build.py +0 -0
  86. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/docker_runtime/__init__.py +0 -0
  87. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/docker_runtime/mediation.py +0 -0
  88. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/docker_runtime/storage.py +0 -0
  89. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/env_parser.py +0 -0
  90. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/hooks_router.py +0 -0
  91. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/hooks_service.py +0 -0
  92. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/local_storage.py +0 -0
  93. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/logging_config.py +0 -0
  94. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/managed_llm_key.py +0 -0
  95. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/middleware.py +0 -0
  96. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/openai/__init__.py +0 -0
  97. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/openai/models.py +0 -0
  98. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/openai/usage.py +0 -0
  99. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/openapi.py +0 -0
  100. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/py.typed +0 -0
  101. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/session_protocol.py +0 -0
  102. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/storage/__init__.py +0 -0
  103. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/storage/model.py +0 -0
  104. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/storage/reclaimer.py +0 -0
  105. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/storage/selectors.py +0 -0
  106. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/storage/trash.py +0 -0
  107. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/telemetry/factory.py +0 -0
  108. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/telemetry/http_exporter.py +0 -0
  109. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/telemetry/models.py +0 -0
  110. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/telemetry/policy.py +0 -0
  111. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/telemetry/posthog_exporter.py +0 -0
  112. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/telemetry/sanitizer.py +0 -0
  113. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/telemetry/sink.py +0 -0
  114. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/telemetry/subscriber.py +0 -0
  115. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/telemetry_types.py +0 -0
  116. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/utils.py +0 -0
  117. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/vscode_extensions/openhands-settings/extension.js +0 -0
  118. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands/agent_server/vscode_extensions/openhands-settings/package.json +0 -0
  119. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands_agent_server.egg-info/dependency_links.txt +0 -0
  120. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands_agent_server.egg-info/entry_points.txt +0 -0
  121. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/openhands_agent_server.egg-info/top_level.txt +0 -0
  122. {openhands_agent_server-1.62.0 → openhands_agent_server-1.63.0}/setup.cfg +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: openhands-agent-server
3
- Version: 1.62.0
3
+ Version: 1.63.0
4
4
  Summary: OpenHands Agent Server - REST/WebSocket interface for OpenHands AI Agent
5
5
  Project-URL: Source, https://github.com/OpenHands/software-agent-sdk
6
6
  Project-URL: Homepage, https://github.com/OpenHands/software-agent-sdk
@@ -15,10 +15,10 @@ Requires-Dist: fastapi>=0.104
15
15
  Requires-Dist: openhands-sdk
16
16
  Requires-Dist: openhands-tools
17
17
  Requires-Dist: openai<3,>=2.33.0
18
- Requires-Dist: pydantic>=2.13.5
19
- Requires-Dist: sqlalchemy>=2.1.6
18
+ Requires-Dist: pydantic>=2.14.3
19
+ Requires-Dist: sqlalchemy>=2.1.8
20
20
  Requires-Dist: uvicorn>=0.54.0
21
21
  Requires-Dist: websockets>=12
22
22
  Requires-Dist: wsproto>=1.3.2
23
23
  Provides-Extra: posthog
24
- Requires-Dist: posthog<8,>=7.82.2; extra == "posthog"
24
+ Requires-Dist: posthog<8,>=7.86.4; extra == "posthog"
@@ -2,20 +2,22 @@
2
2
 
3
3
  from collections.abc import Iterator
4
4
  from contextlib import contextmanager
5
- from typing import Any, Literal, cast
5
+ from typing import Literal, cast
6
6
 
7
- from fastapi import HTTPException, Request, status
7
+ from fastapi import Request
8
8
  from pydantic import SecretStr
9
9
  from pydantic_core import PydanticSerializationError
10
10
 
11
+ from openhands.sdk.errors import Conflict, Invalid, Unavailable
11
12
  from openhands.sdk.llm import LLM
12
13
  from openhands.sdk.llm.llm import LLM_SECRET_FIELDS
13
- from openhands.sdk.llm.provider_connection_store import ProviderConnectionNotFound
14
14
  from openhands.sdk.logger import get_logger
15
15
  from openhands.sdk.utils.cipher import FERNET_TOKEN_PREFIX, Cipher
16
16
  from openhands.sdk.utils.pydantic_secrets import (
17
17
  MissingCipherError,
18
+ SecretContext,
18
19
  SecretDecryptionError,
20
+ client_context,
19
21
  )
20
22
 
21
23
 
@@ -25,27 +27,11 @@ _logger = get_logger(__name__)
25
27
  ExposeSecretsMode = Literal["encrypted", "plaintext"]
26
28
 
27
29
 
28
- def get_config(request: Request):
29
- """Get config from app state, raising 503 if uninitialized."""
30
- config = getattr(request.app.state, "config", None)
31
- if config is None:
32
- raise HTTPException(
33
- status_code=status.HTTP_503_SERVICE_UNAVAILABLE,
34
- detail="Server not fully initialized",
35
- )
36
- return config
37
-
38
-
39
- def get_cipher(request: Request) -> Cipher | None:
40
- """Get the configured cipher (``None`` when ``OH_SECRET_KEY`` is unset)."""
41
- return get_config(request).cipher
42
-
43
-
44
30
  def parse_expose_secrets_header(request: Request) -> ExposeSecretsMode | None:
45
31
  """Parse the ``X-Expose-Secrets`` header.
46
32
 
47
33
  Returns ``"encrypted"``, ``"plaintext"``, or ``None`` (header absent).
48
- Raises ``HTTPException(400)`` for any other value.
34
+ Raises ``Invalid`` (400) for any other value.
49
35
  """
50
36
  header_value = request.headers.get("X-Expose-Secrets", "").lower().strip()
51
37
 
@@ -60,22 +46,17 @@ def parse_expose_secrets_header(request: Request) -> ExposeSecretsMode | None:
60
46
  if header_value in ("encrypted", "plaintext"):
61
47
  return cast(ExposeSecretsMode, header_value)
62
48
 
63
- raise HTTPException(
64
- status_code=status.HTTP_400_BAD_REQUEST,
65
- detail=(
66
- f"Invalid X-Expose-Secrets header value: '{header_value}'. "
67
- "Valid values are: 'encrypted', 'plaintext'."
68
- ),
49
+ raise Invalid(
50
+ f"Invalid X-Expose-Secrets header value: '{header_value}'. "
51
+ "Valid values are: 'encrypted', 'plaintext'."
69
52
  )
70
53
 
71
54
 
72
55
  def build_expose_context(
73
56
  expose_mode: ExposeSecretsMode | None, cipher: Cipher | None
74
- ) -> dict[str, Any]:
57
+ ) -> SecretContext:
75
58
  """Build the pydantic serialization context for the given expose mode."""
76
- if expose_mode is None:
77
- return {}
78
- return {"expose_secrets": expose_mode, "cipher": cipher}
59
+ return client_context(expose_mode or "redact", cipher)
79
60
 
80
61
 
81
62
  def _has_missing_cipher_cause(exc: BaseException) -> bool:
@@ -115,56 +96,22 @@ def decrypt_incoming_llm_secrets(llm: LLM, cipher: Cipher) -> LLM:
115
96
 
116
97
  @contextmanager
117
98
  def translate_missing_cipher() -> Iterator[None]:
118
- """Translate a missing-cipher serializer error into HTTP 503."""
99
+ """Translate a missing-cipher serializer error into ``Unavailable`` (503)."""
119
100
  try:
120
101
  yield
121
102
  except (PydanticSerializationError, MissingCipherError) as e:
122
103
  if _has_missing_cipher_cause(e):
123
- raise HTTPException(
124
- status_code=status.HTTP_503_SERVICE_UNAVAILABLE,
125
- detail=(
126
- "Encryption not available: OH_SECRET_KEY is not configured. "
127
- "Cannot return encrypted secrets."
128
- ),
104
+ raise Unavailable(
105
+ "Encryption not available: OH_SECRET_KEY is not configured. "
106
+ "Cannot return encrypted secrets."
129
107
  )
130
108
  raise
131
109
 
132
110
 
133
- def profile_key_mismatch(name: str, error: SecretDecryptionError) -> HTTPException:
111
+ def profile_key_mismatch(name: str, error: SecretDecryptionError) -> Conflict:
134
112
  """409 for a profile whose stored key the current cipher cannot decrypt."""
135
113
  _logger.error(f"Refusing to use profile '{name}': {error}")
136
- return HTTPException(
137
- status_code=status.HTTP_409_CONFLICT,
138
- detail=(
139
- f"Profile '{name}' is encrypted with a different key: restore that "
140
- "key as OH_SECRET_KEY or add it to OH_PREVIOUS_SECRET_KEYS"
141
- ),
114
+ return Conflict(
115
+ f"Profile '{name}' is encrypted with a different key: restore that "
116
+ "key as OH_SECRET_KEY or add it to OH_PREVIOUS_SECRET_KEYS"
142
117
  )
143
-
144
-
145
- @contextmanager
146
- def store_errors() -> Iterator[None]:
147
- """Map profile-store errors (``LLMProfileStore``/``AgentProfileStore``) to
148
- HTTP responses. Shared by the settings, profiles, and agent-profiles
149
- routers."""
150
- try:
151
- yield
152
- except TimeoutError:
153
- raise HTTPException(
154
- status_code=status.HTTP_503_SERVICE_UNAVAILABLE,
155
- detail="Profile store is busy. Please retry.",
156
- )
157
- except ProviderConnectionNotFound as e:
158
- # Subclass of ValueError, so it must be handled before the generic
159
- # ValueError arm below. A dangling provider reference is a resolvable
160
- # config problem (recreate the connection or edit the profile), hence
161
- # 422 rather than a generic 400.
162
- raise HTTPException(
163
- status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
164
- detail=str(e),
165
- )
166
- except ValueError as e:
167
- raise HTTPException(
168
- status_code=status.HTTP_400_BAD_REQUEST,
169
- detail=str(e),
170
- )
@@ -9,17 +9,18 @@ import time
9
9
  from collections.abc import Awaitable, Callable, Mapping
10
10
  from dataclasses import dataclass, field
11
11
 
12
- from fastapi import APIRouter, HTTPException, Request, status
12
+ from fastapi import APIRouter, Depends, Request
13
13
  from pydantic import BaseModel, Field
14
14
 
15
- from openhands.agent_server._secrets_exposure import get_config
16
15
  from openhands.agent_server.config import Config
17
16
  from openhands.agent_server.credential_binding import LocalVersionedCredentialBinding
18
- from openhands.agent_server.persistence import get_secrets_store
17
+ from openhands.agent_server.dependencies import get_config, get_secrets_store
18
+ from openhands.agent_server.persistence import FileSecretsStore
19
19
  from openhands.sdk.agent.acp_file_credentials import CODEX_AUTH_SECRET_NAME
20
20
  from openhands.sdk.agent.acp_model_discovery import discover_acp_models
21
21
  from openhands.sdk.agent.acp_models import ACPModelDiscovery
22
22
  from openhands.sdk.credential import VersionedCredentialBinding
23
+ from openhands.sdk.errors import NotSupported, Unprocessable
23
24
  from openhands.sdk.logger import get_logger
24
25
  from openhands.sdk.secret import SecretSource
25
26
  from openhands.sdk.settings.model import ACPAgentSettings
@@ -130,11 +131,10 @@ def _cache_key(
130
131
 
131
132
 
132
133
  def _codex_bindings(
133
- settings: ACPAgentSettings, config: Config, secrets: dict[str, str]
134
+ settings: ACPAgentSettings, store: FileSecretsStore, secrets: dict[str, str]
134
135
  ) -> dict[str, VersionedCredentialBinding]:
135
136
  if settings.acp_server != "codex":
136
137
  return {}
137
- store = get_secrets_store(config)
138
138
  if store.get_secret(CODEX_AUTH_SECRET_NAME) is None:
139
139
  return {}
140
140
  # A stored ChatGPT login refreshes through the store, as in a conversation.
@@ -148,7 +148,10 @@ def _codex_bindings(
148
148
 
149
149
  @acp_router.post("/models", response_model=ACPModelDiscovery)
150
150
  async def discover_models(
151
- body: ACPModelDiscoveryRequest, request: Request
151
+ body: ACPModelDiscoveryRequest,
152
+ request: Request,
153
+ config: Config = Depends(get_config),
154
+ secrets_store: FileSecretsStore = Depends(get_secrets_store),
152
155
  ) -> ACPModelDiscovery:
153
156
  """Start the ACP server in a throwaway session and report its models.
154
157
 
@@ -156,20 +159,20 @@ async def discover_models(
156
159
  given credentials; a launch or authentication failure comes back in
157
160
  ``error`` rather than as an HTTP error.
158
161
  """
159
- config: Config = get_config(request)
160
162
  if config.conversation_runtime == "docker":
161
- raise HTTPException(
162
- status.HTTP_501_NOT_IMPLEMENTED,
163
- "ACP model discovery runs only where conversations run in-process",
163
+ raise NotSupported(
164
+ "ACP model discovery runs only where conversations run in-process"
164
165
  )
165
166
  settings = body.agent_settings
166
167
  try:
167
168
  command = settings.resolve_acp_command()
168
169
  except ValueError as exc:
169
- raise HTTPException(status.HTTP_422_UNPROCESSABLE_ENTITY, str(exc)) from exc
170
+ raise Unprocessable(str(exc)) from exc
170
171
 
171
172
  secrets = await asyncio.to_thread(_resolve_secrets, body.secrets)
172
- bindings = await asyncio.to_thread(_codex_bindings, settings, config, secrets)
173
+ bindings = await asyncio.to_thread(
174
+ _codex_bindings, settings, secrets_store, secrets
175
+ )
173
176
  key = _cache_key(settings, command, secrets)
174
177
 
175
178
  async def run() -> ACPModelDiscovery: