Add configurable agent_id support and update integration options
- Introduced configurable OpenClaw `agent_id` for manual setup and service overrides. - Enhanced API client to support routing messages to specific agents. - Updated integration options to reload automatically upon saving changes. - Added service descriptions and translations for the new `agent_id` field. - Updated version to 0.1.58 in manifest.
This commit is contained in:
@@ -51,6 +51,7 @@ class OpenClawApiClient:
|
||||
use_ssl: bool = False,
|
||||
verify_ssl: bool = True,
|
||||
session: aiohttp.ClientSession | None = None,
|
||||
agent_id: str = "main",
|
||||
) -> None:
|
||||
"""Initialize the API client.
|
||||
|
||||
@@ -61,6 +62,7 @@ class OpenClawApiClient:
|
||||
use_ssl: Use HTTPS instead of HTTP.
|
||||
verify_ssl: Verify SSL certificates (set False for self-signed certs).
|
||||
session: Optional aiohttp session (reused from HA).
|
||||
agent_id: Target OpenClaw agent ID (default: "main").
|
||||
"""
|
||||
self._host = host
|
||||
self._port = port
|
||||
@@ -68,6 +70,7 @@ class OpenClawApiClient:
|
||||
self._use_ssl = use_ssl
|
||||
self._verify_ssl = verify_ssl
|
||||
self._session = session
|
||||
self._agent_id = agent_id
|
||||
self._base_url = f"{'https' if use_ssl else 'http'}://{host}:{port}"
|
||||
# ssl=False disables cert verification for self-signed certs;
|
||||
# ssl=None uses default verification.
|
||||
@@ -82,11 +85,13 @@ class OpenClawApiClient:
|
||||
"""Update the authentication token (e.g., after addon restart)."""
|
||||
self._token = token
|
||||
|
||||
def _headers(self) -> dict[str, str]:
|
||||
"""Build request headers with auth token."""
|
||||
def _headers(self, agent_id: str | None = None) -> dict[str, str]:
|
||||
"""Build request headers with auth token and agent ID."""
|
||||
effective_agent = agent_id or self._agent_id or "main"
|
||||
return {
|
||||
"Authorization": f"Bearer {self._token}",
|
||||
"Content-Type": "application/json",
|
||||
"x-openclaw-agent-id": effective_agent,
|
||||
}
|
||||
|
||||
async def _get_session(self) -> aiohttp.ClientSession:
|
||||
@@ -182,6 +187,7 @@ class OpenClawApiClient:
|
||||
model: str | None = None,
|
||||
system_prompt: str | None = None,
|
||||
stream: bool = False,
|
||||
agent_id: str | None = None,
|
||||
) -> dict[str, Any]:
|
||||
"""Send a chat message (non-streaming).
|
||||
|
||||
@@ -190,6 +196,7 @@ class OpenClawApiClient:
|
||||
session_id: Optional session/conversation ID.
|
||||
model: Optional model override.
|
||||
stream: If True, raises ValueError (use async_stream_message).
|
||||
agent_id: Optional per-call agent ID override.
|
||||
|
||||
Returns:
|
||||
Complete chat completion response.
|
||||
@@ -213,7 +220,7 @@ class OpenClawApiClient:
|
||||
payload["model"] = model
|
||||
|
||||
# Pass session_id as a custom header or param if supported by gateway
|
||||
headers = self._headers()
|
||||
headers = self._headers(agent_id=agent_id)
|
||||
if session_id:
|
||||
headers["X-Session-Id"] = session_id
|
||||
headers["x-openclaw-session-key"] = session_id
|
||||
@@ -247,6 +254,7 @@ class OpenClawApiClient:
|
||||
session_id: str | None = None,
|
||||
model: str | None = None,
|
||||
system_prompt: str | None = None,
|
||||
agent_id: str | None = None,
|
||||
) -> AsyncIterator[str]:
|
||||
"""Send a chat message and stream the response via SSE.
|
||||
|
||||
@@ -256,6 +264,7 @@ class OpenClawApiClient:
|
||||
message: The user message text.
|
||||
session_id: Optional session/conversation ID.
|
||||
model: Optional model override.
|
||||
agent_id: Optional per-call agent ID override.
|
||||
|
||||
Yields:
|
||||
Content delta strings from the streaming response.
|
||||
@@ -275,7 +284,7 @@ class OpenClawApiClient:
|
||||
if model:
|
||||
payload["model"] = model
|
||||
|
||||
headers = self._headers()
|
||||
headers = self._headers(agent_id=agent_id)
|
||||
if session_id:
|
||||
headers["X-Session-Id"] = session_id
|
||||
headers["x-openclaw-session-key"] = session_id
|
||||
|
||||
Reference in New Issue
Block a user