Skip to content

Self-evolving Context Database for AI Agents. Unify Agent Memory, Knowledge RAG and Skills.

fix(session): allow explicit role_id passthrough (#1643)

Qin Haojie5a8ed95a5502
diff --git a/openviking/server/routers/sessions.py b/openviking/server/routers/sessions.py
index 20bba03ec..f2544092b 100644
--- a/openviking/server/routers/sessions.py
+++ b/openviking/server/routers/sessions.py
@@ -3,7 +3,6 @@
"""Sessions endpoints for OpenViking HTTP Server."""
import logging
-import re
from typing import Any, Dict, List, Literal, Optional
from fastapi import APIRouter, Depends, Path, Query, Request
@@ -12,13 +11,11 @@ from pydantic import BaseModel, model_validator
from openviking.message.part import TextPart, part_from_dict
from openviking.server.auth import get_request_context
from openviking.server.dependencies import get_service
-from openviking.server.identity import AuthMode, RequestContext, Role
+from openviking.server.identity import AuthMode, RequestContext
from openviking.server.models import ErrorInfo, Response
-from openviking_cli.exceptions import InvalidArgumentError
router = APIRouter(prefix="/api/v1/sessions", tags=["sessions"])
logger = logging.getLogger(__name__)
-_ROLE_ID_PATTERN = re.compile(r"^[a-zA-Z0-9_-]+$")
class TextPartRequest(BaseModel):
@@ -116,23 +113,10 @@ def _resolve_message_role_id(
if request.role not in {"user", "assistant"}:
return request.role_id
- role_id_provided = "role_id" in request.model_fields_set
- allow_explicit_role_id = _request_auth_mode(http_request) == AuthMode.TRUSTED or ctx.role in {
- Role.ROOT,
- Role.ADMIN,
- }
- if not allow_explicit_role_id and role_id_provided:
- raise InvalidArgumentError(
- "USER requests cannot explicitly set role_id; it is derived from the request context."
- )
-
- role_id = request.role_id if allow_explicit_role_id else None
+ role_id = request.role_id
if not role_id:
role_id = ctx.user.user_id if request.role == "user" else ctx.user.agent_id
- if not _ROLE_ID_PATTERN.match(role_id):
- raise InvalidArgumentError("role_id must be alpha-numeric string.")
-
return role_id
diff --git a/tests/server/test_api_sessions.py b/tests/server/test_api_sessions.py
index 949f1c347..198af690f 100644
--- a/tests/server/test_api_sessions.py
+++ b/tests/server/test_api_sessions.py
@@ -17,7 +17,6 @@ from openviking.server.api_keys import APIKeyManager
from openviking.server.config import ServerConfig
from openviking.server.identity import RequestContext, Role
from openviking.server.routers import sessions as sessions_router
-from openviking_cli.exceptions import InvalidArgumentError
from openviking_cli.session.user_id import UserIdentifier
from openviking_cli.utils.config import OPENVIKING_CONFIG_ENV
from openviking_cli.utils.config.open_viking_config import OpenVikingConfigSingleton
@@ -308,20 +307,25 @@ async def test_add_message_admin_request_allows_registered_user_role_id(service,
assert session.messages[-1].role_id == "alice"
-async def test_add_message_user_request_rejects_explicit_role_id(service, monkeypatch):
+async def test_add_message_user_request_allows_explicit_role_id(service, monkeypatch):
+ session_id = "user-explicit-role-id"
ctx = RequestContext(
user=UserIdentifier("acct_session_user", "alice", "assistant-user"),
role=Role.USER,
)
- with pytest.raises(InvalidArgumentError, match="cannot explicitly set role_id"):
- await _call_add_message_route(
- service,
- monkeypatch,
- ctx=ctx,
- payload=_message_request("user", content="hello user", role_id="alice"),
- session_id="user-explicit-role-id",
- )
+ response = await _call_add_message_route(
+ service,
+ monkeypatch,
+ ctx=ctx,
+ payload=_message_request("user", content="hello user", role_id="wx/user-01@abc"),
+ session_id=session_id,
+ )
+
+ assert response.result["message_count"] == 1
+ session = await service.sessions.get(session_id, ctx, auto_create=False)
+ await session.load()
+ assert session.messages[-1].role_id == "wx/user-01@abc"
async def test_add_message_user_request_autofills_role_id(service, monkeypatch):