apunkt/SurfSense
1
0
Fork 0
mirror of https://github.com/MODSetter/SurfSense.git synced 2026-06-06 20:15:17 +02:00
Code Issues Projects Releases Packages Wiki Activity

refactor(agents): move middleware package to app/agents/shared (slice 5c)

Browse source 
Relocate the entire new_chat/middleware/ package to the shared kernel as one
cohesive unit (it is live shared infrastructure: the multi-agent stack wraps
nearly every middleware via multi_agent_chat/middleware/main_agent/*, and
anonymous_agent consumes it too). Flip 69 live importers across both the
package-path and submodule-path forms.

Shims left for the frozen single-agent stack: a package __init__ re-export plus
submodule shims for permission, skills_backends, and scoped_model_fallback
(the three imported via submodule path by chat_deepagent/subagents).

Cycle break: importing shared.middleware previously reached back into
new_chat.tools at module load, which dragged in new_chat.__init__ ->
chat_deepagent -> the middleware shim -> half-initialized shared.middleware.
Made action_log's ToolDefinition import TYPE_CHECKING-only and
tool_call_repair's INVALID_TOOL_NAME import function-local. These tools-package
back-edges fully resolve in slice 6.

Asset note: skills_backends._default_builtin_root now walks to
app/agents/new_chat/skills/builtin (the skills/ tree migrates in slice 7).
This commit is contained in:
CREDO23 2026-06-04 13:00:41 +02:00
parent 6f488d9564
commit 227983a104
98 changed files with 1131 additions and 999 deletions
Download patch file Download diff file Expand all files Collapse all files

28
surfsense_backend/tests/unit/middleware/test_knowledge_search.py
View file

@ -6,7 +6,7 @@ import pytest
from langchain_core.messages import AIMessage, HumanMessage
from app.agents.shared.document_xml import build_document_xml as _build_document_xml
from app.agents.new_chat.middleware.knowledge_search import (
from app.agents.shared.middleware.knowledge_search import (
KBSearchPlan,
KnowledgeBaseSearchMiddleware,
_normalize_optional_date_range,
@ -258,7 +258,7 @@ class TestKnowledgeBaseSearchMiddlewarePlanner:
return []
monkeypatch.setattr(
"app.agents.new_chat.middleware.knowledge_search.search_knowledge_base",
"app.agents.shared.middleware.knowledge_search.search_knowledge_base",
fake_search_knowledge_base,
)
@ -301,7 +301,7 @@ class TestKnowledgeBaseSearchMiddlewarePlanner:
return []
monkeypatch.setattr(
"app.agents.new_chat.middleware.knowledge_search.search_knowledge_base",
"app.agents.shared.middleware.knowledge_search.search_knowledge_base",
fake_search_knowledge_base,
)
@ -330,7 +330,7 @@ class TestKnowledgeBaseSearchMiddlewarePlanner:
return []
monkeypatch.setattr(
"app.agents.new_chat.middleware.knowledge_search.search_knowledge_base",
"app.agents.shared.middleware.knowledge_search.search_knowledge_base",
fake_search_knowledge_base,
)
@ -375,11 +375,11 @@ class TestKnowledgeBaseSearchMiddlewarePlanner:
return []
monkeypatch.setattr(
"app.agents.new_chat.middleware.knowledge_search.browse_recent_documents",
"app.agents.shared.middleware.knowledge_search.browse_recent_documents",
fake_browse_recent_documents,
)
monkeypatch.setattr(
"app.agents.new_chat.middleware.knowledge_search.search_knowledge_base",
"app.agents.shared.middleware.knowledge_search.search_knowledge_base",
fake_search_knowledge_base,
)
@ -422,11 +422,11 @@ class TestKnowledgeBaseSearchMiddlewarePlanner:
return []
monkeypatch.setattr(
"app.agents.new_chat.middleware.knowledge_search.browse_recent_documents",
"app.agents.shared.middleware.knowledge_search.browse_recent_documents",
fake_browse_recent_documents,
)
monkeypatch.setattr(
"app.agents.new_chat.middleware.knowledge_search.search_knowledge_base",
"app.agents.shared.middleware.knowledge_search.search_knowledge_base",
fake_search_knowledge_base,
)
@ -549,11 +549,11 @@ class TestKnowledgePriorityMentionDrain:
return []
monkeypatch.setattr(
"app.agents.new_chat.middleware.knowledge_search.fetch_mentioned_documents",
"app.agents.shared.middleware.knowledge_search.fetch_mentioned_documents",
fake_fetch_mentioned_documents,
)
monkeypatch.setattr(
"app.agents.new_chat.middleware.knowledge_search.search_knowledge_base",
"app.agents.shared.middleware.knowledge_search.search_knowledge_base",
fake_search_knowledge_base,
)
@ -597,11 +597,11 @@ class TestKnowledgePriorityMentionDrain:
return []
monkeypatch.setattr(
"app.agents.new_chat.middleware.knowledge_search.fetch_mentioned_documents",
"app.agents.shared.middleware.knowledge_search.fetch_mentioned_documents",
fake_fetch_mentioned_documents,
)
monkeypatch.setattr(
"app.agents.new_chat.middleware.knowledge_search.search_knowledge_base",
"app.agents.shared.middleware.knowledge_search.search_knowledge_base",
fake_search_knowledge_base,
)
@ -642,11 +642,11 @@ class TestKnowledgePriorityMentionDrain:
return []
monkeypatch.setattr(
"app.agents.new_chat.middleware.knowledge_search.fetch_mentioned_documents",
"app.agents.shared.middleware.knowledge_search.fetch_mentioned_documents",
fake_fetch_mentioned_documents,
)
monkeypatch.setattr(
"app.agents.new_chat.middleware.knowledge_search.search_knowledge_base",
"app.agents.shared.middleware.knowledge_search.search_knowledge_base",
fake_search_knowledge_base,
)