Self-evolving Context Database for AI Agents. Unify Agent Memory, Knowledge RAG and Skills.
Python agent-contextagent-memoryagent-pluginsagentic-ragcontext-databasedsh-pluginknowledge-basememorymemory-managementself-evolvingvector-database
fix(compile): forward saved args to runtime status and cancel (#5037)
Jiajie - He/him/hisda837188bf70
diff --git a/openviking/service/compile_service.py b/openviking/service/compile_service.pyindex 63eec42d9..08462b6b4 100644--- a/openviking/service/compile_service.py+++ b/openviking/service/compile_service.py@@ -62,7 +62,9 @@ class CompileRequest(BaseModel):self.from_ = sourcesself.to = self.to.strip().rstrip("/")self.skill = self.skill.strip().rstrip("/")- self.instruction = self.instruction.strip() if self.instruction and self.instruction.strip() else None+ self.instruction = (+ self.instruction.strip() if self.instruction and self.instruction.strip() else None+ )self.args = dict(self.args) if self.args else Noneif not self.to:raise ValueError("to must not be empty")@@ -147,11 +149,13 @@ class CompileAPIClient:session_id: str,*,connection: Mapping[str, Any],+ args: Mapping[str, Any] | None = None,) -> CompileSessionStatus:+ """Query a session with its original args; omit args for legacy tasks."""body = await self._request("POST","/runtime/v1/tasks/status",- json={"session_id": session_id},+ json={"session_id": session_id, **({"args": dict(args)} if args is not None else {})},headers=self._headers(connection),)return self._validate(CompileSessionStatus, body)@@ -161,11 +165,13 @@ class CompileAPIClient:session_id: str,*,connection: Mapping[str, Any],+ args: Mapping[str, Any] | None = None,) -> CompileSessionStatus:+ """Cancel a session with its original args; omit args for legacy tasks."""body = await self._request("POST","/runtime/v1/tasks/cancel",- json={"session_id": session_id},+ json={"session_id": session_id, **({"args": dict(args)} if args is not None else {})},headers=self._headers(connection),)return self._validate(CompileSessionStatus, body)@@ -315,13 +321,9 @@ class CompileService:connection: Mapping[str, Any],) -> str:request_payload = dict(payload)- public_args = request_payload.get("args")- private_args = private_payload.get("args")- if isinstance(public_args, dict) or isinstance(private_args, dict):- request_payload["args"] = {- **(public_args if isinstance(public_args, dict) else {}),- **(private_args if isinstance(private_args, dict) else {}),- }+ args = self._merge_args(payload, private_payload)+ if args is not None:+ request_payload["args"] = argsaccepted = await self._client().create({"task_type": self.task_type, "payload": request_payload},connection=connection,@@ -333,15 +335,54 @@ class CompileService:self,external_task_id: str,connection: Mapping[str, Any],+ *,+ payload: Mapping[str, Any] | None = None,+ private_payload: Mapping[str, Any] | None = None,) -> ExternalTaskSnapshot:- return self._snapshot(await self._client().get(external_task_id, connection=connection))+ """Query Runtime using args from the task's persisted public and private payloads."""+ return self._snapshot(+ await self._client().get(+ external_task_id,+ connection=connection,+ args=self._merge_args(payload, private_payload),+ )+ )async def cancel(self,external_task_id: str,connection: Mapping[str, Any],+ *,+ payload: Mapping[str, Any] | None = None,+ private_payload: Mapping[str, Any] | None = None,) -> ExternalTaskSnapshot:- return self._snapshot(await self._client().cancel(external_task_id, connection=connection))+ """Cancel Runtime work using the original task payloads, including restored secrets."""+ return self._snapshot(+ await self._client().cancel(+ external_task_id,+ connection=connection,+ args=self._merge_args(payload, private_payload),+ )+ )++ @staticmethod+ def _merge_args(+ payload: Mapping[str, Any] | None,+ private_payload: Mapping[str, Any] | None,+ ) -> dict[str, Any] | None:+ """Recombine saved args without mutation, or return None when absent.++ Private values take precedence. The result can contain credentials and+ is only for Runtime request bodies, never logs or public task metadata.+ """+ public_args = (payload or {}).get("args")+ private_args = (private_payload or {}).get("args")+ if not isinstance(public_args, dict) and not isinstance(private_args, dict):+ return None+ return {+ **(public_args if isinstance(public_args, dict) else {}),+ **(private_args if isinstance(private_args, dict) else {}),+ }async def _normalize_request(self,@@ -488,6 +529,7 @@ class CompileService:error_message=error_message,)+__all__ = ["CompileAPIClient","CompileRequest",diff --git a/openviking/service/external_task_service.py b/openviking/service/external_task_service.pyindex 009b6359d..f77a11f27 100644--- a/openviking/service/external_task_service.py+++ b/openviking/service/external_task_service.py@@ -65,12 +65,18 @@ class ExternalTaskProvider(Protocol):self,external_task_id: str,connection: Mapping[str, Any],+ *,+ payload: Mapping[str, Any] | None = None,+ private_payload: Mapping[str, Any] | None = None,) -> ExternalTaskSnapshot: ...async def cancel(self,external_task_id: str,connection: Mapping[str, Any],+ *,+ payload: Mapping[str, Any] | None = None,+ private_payload: Mapping[str, Any] | None = None,) -> ExternalTaskSnapshot: ...@@ -276,7 +282,12 @@ class ExternalTaskService:)while True:snapshot = await self._retry(- lambda: provider.get(external_task_id, connection),+ lambda: provider.get(+ external_task_id,+ connection,+ payload=payload,+ private_payload=private_payload,+ ),task_id=task_id,operation_name="poll",poll_interval=provider.poll_interval_seconds,@@ -359,7 +370,9 @@ class ExternalTaskService:meta = snapshot.meta or {}if task is not None and (task.stage != stage- or any(key not in task.meta or task.meta[key] != value for key, value in meta.items())+ or any(+ key not in task.meta or task.meta[key] != value for key, value in meta.items()+ )):await tracker.update_stage(task_id,@@ -441,7 +454,9 @@ class ExternalTaskService:user_id=user_id,)snapshot = await self._retry(- lambda task_id=external_task_id: provider.cancel(task_id, connection),+ lambda task_id=external_task_id: provider.cancel(+ task_id, connection, payload=payload, private_payload=private_payload+ ),task_id=ov_task_id,operation_name="cancel",poll_interval=provider.poll_interval_seconds,@@ -457,7 +472,9 @@ class ExternalTaskService:returnawait asyncio.sleep(provider.poll_interval_seconds)snapshot = await self._retry(- lambda task_id=external_task_id: provider.get(task_id, connection),+ lambda task_id=external_task_id: provider.get(+ task_id, connection, payload=payload, private_payload=private_payload+ ),task_id=ov_task_id,operation_name="poll cancellation",poll_interval=provider.poll_interval_seconds,diff --git a/tests/server/test_bot_proxy_auth.py b/tests/server/test_bot_proxy_auth.pyindex 0efc9067f..cde1fcdb8 100644--- a/tests/server/test_bot_proxy_auth.py+++ b/tests/server/test_bot_proxy_auth.py@@ -15,6 +15,7 @@ from fastapi import FastAPIimport openviking.server.routers.bot as bot_router_moduleimport openviking.server.routers.compile as compile_router_module+import openviking.server.routers.tasks as tasks_router_moduleimport openviking.service.compile_service as compile_service_moduleimport openviking.service.external_task_service as external_task_service_modulefrom openviking.server.auth.plugins import DevAuthPlugin, TrustedAuthPlugin@@ -296,10 +297,29 @@ async def test_compile_route_uses_ov_owned_task_and_rejects_legacy_routes(monkey@pytest.mark.asyncio[email protected]("finish", ["complete", "cancel", "poll_failure", "restart"])+ "finish", ["complete", "cancel", "poll_failure", "restart", "restart_cancel"]+)+ "args",+ [+ None,+ {},+ {"user_key": ""},+ {"user_key": "model-user-key"},+ {+ "model_name": "model-1",+ "user_key": "model-user-key",+ "api_key": "compile-api-key",+ "options": {"temperature": 0.2, "tags": ["wiki", "source"]},+ },+ ],+ ids=["no-args", "empty-args", "empty-key", "private-only", "full-args"],+)async def test_compile_api_client_session_protocol_retry_and_cancellation(- monkeypatch, tmp_path, finish+ monkeypatch, tmp_path, caplog, finish, args):+ """Runtime callbacks retain saved args through polling, cancellation, and queue recovery."""forwarded = []response_status = {"cancel": "cancelled",@@ -374,17 +394,14 @@ async def test_compile_api_client_session_protocol_retry_and_cancellation("to": "viking://resources/wiki","skill": "viking://agent/skills/wiki","instruction": "Keep supporting evidence.",- "args": {- "model_name": "model-1",- "user_key": "model-user-key",- "api_key": "compile-api-key",- },+ "args": args,})monkeypatch.setattr(service, "_normalize_request", AsyncMock(return_value=request))store = PersistentTaskStore(MockLocalAGFS(root_path=tmp_path))tracker = TaskTracker(store)monkeypatch.setattr(external_task_service_module, "get_task_tracker", lambda: tracker)+ monkeypatch.setattr(tasks_router_module, "get_task_tracker", lambda: tracker)monkeypatch.setattr(external_task_service_module,"get_queue_manager",@@ -392,23 +409,31 @@ async def test_compile_api_client_session_protocol_retry_and_cancellation()connection = {"api_key": "active-user-key"}owner = {"account_id": "acct", "user_id": "alice"}+ ctx = RequestContext(user=UserIdentifier("acct", "alice"), role=Role.USER)task = await service.create(request,connection=connection,- ctx=RequestContext(user=UserIdentifier("acct", "alice"), role=Role.USER),+ ctx=ctx,)- assert task.to_dict()["meta"]["request"]["args"] == {"model_name": "model-1"}+ public_args = {+ key: value for key, value in (args or {}).items() if key not in {"user_key", "api_key"}+ }+ private_args = {+ key: value for key, value in (args or {}).items() if key in {"user_key", "api_key"}+ }+ private_payload = {"args": private_args} if private_args else {}+ assert task.to_dict()["meta"]["request"].get("args", {}) == public_argsstored = await store.get(task.task_id, **owner)- assert stored["meta"]["request"]["args"] == {"model_name": "model-1"}+ assert stored is not None+ assert stored["meta"]["request"].get("args", {}) == public_argstracker = TaskTracker(store)restored = await tracker.get(task.task_id, **owner)+ assert restored is not Nonelisted = (await tracker.list_tasks(**owner))[0]assert restored.to_dict() == listed.to_dict() == task.to_dict()auth = await tracker.get_task_auth(task.task_id, **owner)- assert auth["external_request_private"] == {- "args": {"user_key": "model-user-key", "api_key": "compile-api-key"}- }+ assert auth["external_request_private"] == private_payloadexternal_task_id = await service.submit(task.task_id,restored.meta["request"],@@ -418,10 +443,14 @@ async def test_compile_api_client_session_protocol_retry_and_cancellation(status_snapshot = await service.get(external_task_id,{"api_key": "active-user-key"},+ payload=restored.meta["request"],+ private_payload=auth["external_request_private"],)cancel_snapshot = await service.cancel(external_task_id,{"api_key": "active-user-key"},+ payload=restored.meta["request"],+ private_payload=auth["external_request_private"],)assert external_task_id == "ma-session-1"@@ -441,16 +470,18 @@ async def test_compile_api_client_session_protocol_retry_and_cancellation("to": "viking://resources/wiki","skill": "viking://agent/skills/wiki","instruction": "Keep supporting evidence.",- "args": {- "model_name": "model-1",- "user_key": "model-user-key",- "api_key": "compile-api-key",- },+ **({"args": args} if args else {}),},}- assert forwarded[1]["body"] == {"session_id": "ma-session-1"}+ callback_body = {"session_id": "ma-session-1", **({"args": args} if args else {})}+ assert forwarded[1]["body"] == forwarded[2]["body"] == callback_body+ assert restored.meta["request"].get("args", {}) == public_argsassert status_snapshot.meta == {"token_usage": {"total_tokens": 12}}assert cancel_snapshot.status == "cancelled"+ if not args:+ await service.get(external_task_id, connection)+ await service.cancel(external_task_id, connection)+ assert forwarded[-1]["body"] == forwarded[-2]["body"] == callback_bodyawait tracker.complete(task.task_id, {"output": "wiki"}, **owner)assert await tracker.get_task_auth(task.task_id, **owner) == {}@@ -517,17 +548,21 @@ async def test_compile_api_client_session_protocol_retry_and_cancellation(async def runtime_request(_client, method, url, headers, json):nonlocal pollsif url.endswith("/runtime/v1/tasks"):+ assert json["payload"].get("args") == (args or None)task_id = headers["Idempotency-Key"]if task_id == rejected_id:return FakeResponse({"detail": "invalid request"}, status_code=422)submitted.append(task_id)return FakeResponse({"session_id": task_id})task_id = json["session_id"]+ assert json == {"session_id": task_id, **({"args": args} if args else {})}if task_id != first.task_id:return FakeResponse({"status": "completed", "stage": "done", "result": {"ok": True}})if url.endswith("/cancel"):cancel_entered.set()await release.wait()+ return FakeResponse({"status": "cancelling", "stage": "cancelling"})+ if cancel_entered.is_set():return FakeResponse({"status": "cancelled", "stage": "cancelled"})polls += 1if polls == 1:@@ -546,6 +581,7 @@ async def test_compile_api_client_session_protocol_retry_and_cancellation("compile",resource_id="viking://resources/source",payload={**restored.meta["request"], "to": target},+ private_payload=private_payload,connection={"api_key": "active-user-key"},ctx=RequestContext(user=UserIdentifier(account, user), role=Role.USER),)@@ -560,6 +596,13 @@ async def test_compile_api_client_session_protocol_retry_and_cancellation(other_account = await create(account="other-account")worker = asyncio.create_task(queue.dequeue())await asyncio.wait_for(entered.wait(), timeout=5)+ queried = await tasks_router_module.get_task(+ first.task_id,+ include_events=False,+ _ctx=ctx,+ )+ assert queried.result == (await state(first)).to_dict()+ assert queried.result["meta"]["request"].get("args", {}) == public_argsawait queue.dequeue() # Same target rotates, including across users.assert (await state(waiting)).status == TaskStatus.PENDING@@ -578,7 +621,7 @@ async def test_compile_api_client_session_protocol_retry_and_cancellation(await tracker.cancel(first.task_id, account_id="acct", user_id="alice")await asyncio.wait_for(cancel_entered.wait(), timeout=5)assert (await state(first)).status == TaskStatus.CANCELLING- elif finish == "restart":+ elif finish in {"restart", "restart_cancel"}:worker.cancel() # Process stops without requesting cancellation of the OV task.with pytest.raises(asyncio.CancelledError):await worker@@ -594,13 +637,16 @@ async def test_compile_api_client_session_protocol_retry_and_cancellation(await queue.dequeue()assert waiting.task_id not in submittedassert (await state(waiting)).status == TaskStatus.PENDING+ if finish == "restart_cancel":+ await tracker.cancel(first.task_id, account_id="acct", user_id="alice")release.set()- if finish == "restart":+ if finish in {"restart", "restart_cancel"}:await queue.dequeue()else:await asyncio.wait_for(worker, timeout=5)expected = {"cancel": TaskStatus.CANCELLED,+ "restart_cancel": TaskStatus.CANCELLED,"poll_failure": TaskStatus.FAILED,}.get(finish, TaskStatus.COMPLETED)assert (await state(first)).status == expected@@ -623,6 +669,9 @@ async def test_compile_api_client_session_protocol_retry_and_cancellation(after_rejection = await create()await queue.dequeue()assert (await state(after_rejection)).status == TaskStatus.COMPLETED+ for secret in private_args.values():+ if secret:+ assert secret not in caplog.text@pytest.mark.asyncio