Merge remote-tracking branch 'origin/master' into ji
# Conflicts: # .gitignore # frontend-web/src/components/workspace/artifacts/context.tsx # frontend-web/src/components/workspace/messages/message-group.tsx # offline-backend-20260512/backend/CLAUDE.md # offline-backend-20260512/backend/README.md # offline-backend-20260512/backend/app/gateway/app.py # offline-backend-20260512/backend/app/gateway/deps.py # offline-backend-20260512/backend/app/gateway/routers/llmwiki.py
This commit is contained in:
commit
e818c24769
262 files changed
+29527
-5236
No files matched your search
@@ -17,8 +17,8 @@ from typing import TYPE_CHECKING, TypeVar, cast
|
||||
from fastapi import FastAPI, HTTPException, Request
|
||||
from langgraph.types import Checkpointer
|
||||
|
||||
from deerflow.config.app_config import AppConfig
|
||||
from deerflow.persistence.feedback import FeedbackRepository
|
||||
from deerflow.config.app_config import AppConfig
|
||||
from deerflow.persistence.feedback import FeedbackRepository
|
||||
from deerflow.runtime import RunContext, RunManager, StreamBridge
|
||||
from deerflow.runtime.events.store.base import RunEventStore
|
||||
from deerflow.runtime.runs.store.base import RunStore
|
||||
@@ -285,15 +285,15 @@ async def langgraph_runtime(app: FastAPI) -> AsyncGenerator[None, None]:
|
||||
|
||||
app.state.light_app_store = make_light_app_store(sf)
|
||||
|
||||
from deerflow.persistence.menu_overrides import make_menu_override_store
|
||||
|
||||
app.state.menu_override_store = make_menu_override_store(sf)
|
||||
|
||||
from deerflow.persistence.compact_menu_overrides import make_compact_menu_override_store
|
||||
|
||||
app.state.compact_menu_override_store = make_compact_menu_override_store(sf)
|
||||
|
||||
from deerflow.persistence.sensitive_words import make_sensitive_word_store
|
||||
from deerflow.persistence.menu_overrides import make_menu_override_store
|
||||
|
||||
app.state.menu_override_store = make_menu_override_store(sf)
|
||||
|
||||
from deerflow.persistence.compact_menu_overrides import make_compact_menu_override_store
|
||||
|
||||
app.state.compact_menu_override_store = make_compact_menu_override_store(sf)
|
||||
|
||||
from deerflow.persistence.sensitive_words import make_sensitive_word_store
|
||||
|
||||
app.state.sensitive_word_store = make_sensitive_word_store(sf)
|
||||
|
||||
@@ -305,6 +305,10 @@ async def langgraph_runtime(app: FastAPI) -> AsyncGenerator[None, None]:
|
||||
|
||||
app.state.task_button_store = make_task_button_store(sf)
|
||||
|
||||
from deerflow.persistence.report_structures import make_report_structure_store
|
||||
|
||||
app.state.report_structure_store = make_report_structure_store(sf)
|
||||
|
||||
from deerflow.integrations.weknora.runtime import register_llmwiki_store
|
||||
from deerflow.persistence.llmwiki import make_llmwiki_store
|
||||
|
||||
@@ -340,7 +344,11 @@ async def langgraph_runtime(app: FastAPI) -> AsyncGenerator[None, None]:
|
||||
max_knowledge_bases=local_index_config.cache_max_knowledge_bases,
|
||||
revision_check_seconds=local_index_config.cache_revision_check_seconds,
|
||||
)
|
||||
app.state.llmwiki_vector_search = WikiVectorSearchService(local_index_config, app.state.llmwiki_embedding, app.state.llmwiki_vector_cache)
|
||||
app.state.llmwiki_vector_search = WikiVectorSearchService(
|
||||
local_index_config,
|
||||
app.state.llmwiki_embedding,
|
||||
app.state.llmwiki_vector_cache,
|
||||
)
|
||||
if weknora_client is not None:
|
||||
app.state.llmwiki_sync_service = WikiSyncService(
|
||||
local_index_config,
|
||||
@@ -354,7 +362,11 @@ async def langgraph_runtime(app: FastAPI) -> AsyncGenerator[None, None]:
|
||||
|
||||
app.state.llmwiki_retrieval_service = WikiRetrievalService(
|
||||
app.state.llmwiki_index_store,
|
||||
vector_search=(app.state.llmwiki_vector_search if local_index_config.internal_search_enabled else None),
|
||||
vector_search=(
|
||||
app.state.llmwiki_vector_search
|
||||
if local_index_config.internal_search_enabled
|
||||
else None
|
||||
),
|
||||
client=weknora_client,
|
||||
)
|
||||
register_local_wiki_index_runtime(
|
||||
@@ -492,21 +504,21 @@ async def langgraph_runtime(app: FastAPI) -> AsyncGenerator[None, None]:
|
||||
from deerflow.persistence.deep_research_sessions import (
|
||||
make_deep_research_session_store,
|
||||
)
|
||||
from deerflow.persistence.deep_research_sources import (
|
||||
make_deep_research_source_store,
|
||||
)
|
||||
from deerflow.persistence.document_rewrite_versions import (
|
||||
make_document_rewrite_version_store,
|
||||
)
|
||||
from deerflow.persistence.deep_research_sources import (
|
||||
make_deep_research_source_store,
|
||||
)
|
||||
from deerflow.persistence.document_rewrite_versions import (
|
||||
make_document_rewrite_version_store,
|
||||
)
|
||||
|
||||
app.state.deep_research_session_store = make_deep_research_session_store(sf)
|
||||
app.state.deep_research_job_store = make_deep_research_job_store(sf)
|
||||
app.state.deep_research_event_store = make_deep_research_event_store(sf)
|
||||
app.state.deep_research_source_store = make_deep_research_source_store(sf)
|
||||
app.state.deep_research_message_store = make_deep_research_message_store(sf)
|
||||
# Whole-document AI rewrites retain a durable original snapshot so a
|
||||
# completed replacement can be safely undone after a refresh.
|
||||
app.state.document_rewrite_version_store = make_document_rewrite_version_store(sf)
|
||||
app.state.deep_research_message_store = make_deep_research_message_store(sf)
|
||||
# Whole-document AI rewrites retain a durable original snapshot so a
|
||||
# completed replacement can be safely undone after a refresh.
|
||||
app.state.document_rewrite_version_store = make_document_rewrite_version_store(sf)
|
||||
# Low-latency in-process SSE fan-out. The database event log remains
|
||||
# authoritative for reconnect replay and cross-worker recovery.
|
||||
from app.gateway.deep_research_live_hub import DeepResearchLiveHub
|
||||
@@ -521,16 +533,16 @@ async def langgraph_runtime(app: FastAPI) -> AsyncGenerator[None, None]:
|
||||
DeepResearchJobExecutor,
|
||||
)
|
||||
|
||||
app.state.deep_research_executor = DeepResearchJobExecutor(
|
||||
app.state.deep_research_job_store,
|
||||
app.state.deep_research_session_store,
|
||||
app.state.deep_research_event_store,
|
||||
app.state.deep_research_source_store,
|
||||
live_publisher=app.state.deep_research_live_hub.publish,
|
||||
checkpointer=app.state.checkpointer,
|
||||
document_rewrite_version_store=app.state.document_rewrite_version_store,
|
||||
app_config=config,
|
||||
)
|
||||
app.state.deep_research_executor = DeepResearchJobExecutor(
|
||||
app.state.deep_research_job_store,
|
||||
app.state.deep_research_session_store,
|
||||
app.state.deep_research_event_store,
|
||||
app.state.deep_research_source_store,
|
||||
live_publisher=app.state.deep_research_live_hub.publish,
|
||||
checkpointer=app.state.checkpointer,
|
||||
document_rewrite_version_store=app.state.document_rewrite_version_store,
|
||||
app_config=config,
|
||||
)
|
||||
app.state.deep_research_dispatcher = DeepResearchJobDispatcher(
|
||||
app.state.deep_research_job_store,
|
||||
app.state.deep_research_executor,
|
||||
@@ -550,8 +562,8 @@ async def langgraph_runtime(app: FastAPI) -> AsyncGenerator[None, None]:
|
||||
|
||||
app.state.concurrency_gate = make_redis_concurrency_gate(config)
|
||||
|
||||
try:
|
||||
yield
|
||||
try:
|
||||
yield
|
||||
finally:
|
||||
from deerflow.integrations.weknora.local_index.runtime import register_local_wiki_index_runtime
|
||||
|
||||
@@ -781,16 +793,10 @@ _cached_repo: SQLiteUserRepository | None = None
|
||||
|
||||
|
||||
def get_request_access_token(request: Request) -> str | None:
|
||||
"""Extract access token from Authorization header or session cookie.
|
||||
"""Extract the caller identity, preferring the explicit Bearer header.
|
||||
|
||||
Priority:
|
||||
1. ``Authorization: Bearer <token>`` header (the caller/tab's explicit identity)
|
||||
2. ``access_token`` cookie (browser session fallback)
|
||||
3. ``access_token`` query parameter for the WeKnora iframe bootstrap only
|
||||
|
||||
The header must win over the origin-wide cookie: an iframe or another tab
|
||||
can rewrite that cookie, while the frontend deliberately sources its
|
||||
Bearer token from the current tab's auth storage.
|
||||
An iframe or another tab can rewrite the origin-wide cookie, while the
|
||||
frontend deliberately sources its Bearer token from this tab's auth store.
|
||||
"""
|
||||
from app.gateway.auth.token_source import get_explicit_or_session_token
|
||||
|
||||
@@ -805,7 +811,7 @@ def get_request_access_token(request: Request) -> str | None:
|
||||
query_token = (request.query_params.get("access_token") or "").strip()
|
||||
if query_token:
|
||||
return query_token
|
||||
return None
|
||||
return None
|
||||
|
||||
|
||||
def get_local_provider() -> LocalAuthProvider:
|
||||
|
||||
Reference in new issue
Block a user