Refactor OpenVikingMemorySystemClient to use OpenVikingCredential and update session handling; increase EverOS timeout to 180 seconds; enhance tests for credential handling and vector removal in search results.
This commit is contained in:
@ -27,16 +27,14 @@ class MemorySystemService:
|
||||
if not messages:
|
||||
raise ValueError("at least one message is required")
|
||||
|
||||
user_key = await self.openviking.ensure_user(request.user_id)
|
||||
await self.openviking.ensure_session(user_key, request.session_id)
|
||||
|
||||
print("user_key:", user_key) # Debugging line to check the user_key value
|
||||
credential = await self.openviking.ensure_user(request.user_id)
|
||||
await self.openviking.ensure_session(credential, request.session_id)
|
||||
|
||||
async def write_openviking() -> list[dict[str, Any]]:
|
||||
results = []
|
||||
for message in messages:
|
||||
results.append(
|
||||
await self.openviking.append_message(user_key, request.session_id, message["role"], message["content"])
|
||||
await self.openviking.append_message(credential, request.session_id, message["role"], message["content"])
|
||||
)
|
||||
return results
|
||||
|
||||
@ -97,6 +95,7 @@ class MemorySystemService:
|
||||
)
|
||||
|
||||
backends = await self._run_backends(openviking=search_openviking, everos=search_everos)
|
||||
backends = self._remove_vectors_from_backends(backends)
|
||||
items = self._merge_search_items(backends)
|
||||
return SearchResponse(status=self._aggregate_status(backends), items=items[: request.limit], backends=backends)
|
||||
|
||||
@ -126,7 +125,9 @@ class MemorySystemService:
|
||||
try:
|
||||
return BackendStatus(status="success", result=await call())
|
||||
except Exception as exc: # noqa: BLE001
|
||||
return BackendStatus(status="failed", error=str(exc))
|
||||
message = str(exc)
|
||||
error = f"{type(exc).__name__}: {message}" if message else type(exc).__name__
|
||||
return BackendStatus(status="failed", error=error)
|
||||
|
||||
def _aggregate_status(self, backends: dict[str, BackendStatus]) -> str:
|
||||
statuses = {backend.status for backend in backends.values()}
|
||||
@ -163,3 +164,16 @@ class MemorySystemService:
|
||||
if "source_backend" in item:
|
||||
return item
|
||||
return {"source_backend": backend_name, **item}
|
||||
|
||||
def _remove_vectors_from_backends(self, backends: dict[str, BackendStatus]) -> dict[str, BackendStatus]:
|
||||
return {
|
||||
name: backend.model_copy(update={"result": self._remove_vectors(backend.result)})
|
||||
for name, backend in backends.items()
|
||||
}
|
||||
|
||||
def _remove_vectors(self, value: Any) -> Any:
|
||||
if isinstance(value, dict):
|
||||
return {key: self._remove_vectors(item) for key, item in value.items() if key != "vector"}
|
||||
if isinstance(value, list):
|
||||
return [self._remove_vectors(item) for item in value]
|
||||
return value
|
||||
|
||||
Reference in New Issue
Block a user