Merge origin/main into feat/openapi-app-build-loop

Author: GareArc

api/.env.example

@@ -733,14 +733,6 @@ AGENT_BACKEND_STREAM_MAX_RECONNECTS=3
 # Client deadline for converting a Binding file to a ToolFile through the Agent backend.
 AGENT_BACKEND_BINDING_FILE_DOWNLOAD_TIMEOUT_SECONDS=240
 
-# KnowledgeFS (Dataset 2.0)
-KNOWLEDGE_FS_ENABLED=false
-KNOWLEDGE_FS_BASE_URL=
-# Shared with KnowledgeFS; use at least 32 random characters.
-KNOWLEDGE_FS_JWT_SECRET=
-KNOWLEDGE_FS_SSE_READ_TIMEOUT_SECONDS=300
-KNOWLEDGE_FS_TIMEOUT_SECONDS=10
-
 # Marketplace configuration
 MARKETPLACE_ENABLED=true
 MARKETPLACE_API_URL=https://marketplace.dify.ai

api/.ruff.toml

@@ -59,7 +59,6 @@ select = [
 
 ignore = [
     "E402",    # module-import-not-at-top-of-file
-    "E712",    # true-false-comparison
     "F821",    # undefined-name
     "F841",    # unused-variable
     "UP007",   # non-pep604-annotation
@@ -71,8 +70,6 @@ ignore = [
     "N815",    # mixed-case-variable-in-class-scope
     "PT011",   # pytest-raises-too-broad
     "SIM102",  # collapsible-if
-    "SIM105",  # suppressible-exception
-    "SIM108",  # if-else-block-instead-of-if-exp
     "SIM117",  # multiple-with-statements
 ]
 

api/commands/vector.py

@@ -252,8 +252,8 @@ def migrate_knowledge_vector_database():
                     select(DatasetDocument).where(
                         DatasetDocument.dataset_id == dataset.id,
                         DatasetDocument.indexing_status == IndexingStatus.COMPLETED,
-                        DatasetDocument.enabled == True,
-                        DatasetDocument.archived == False,
+                        DatasetDocument.enabled.is_(True),
+                        DatasetDocument.archived.is_(False),
                     )
                 ).all()
 
@@ -264,7 +264,7 @@ def migrate_knowledge_vector_database():
                         select(DocumentSegment).where(
                             DocumentSegment.document_id == dataset_document.id,
                             DocumentSegment.status == SegmentStatus.COMPLETED,
-                            DocumentSegment.enabled == True,
+                            DocumentSegment.enabled.is_(True),
                         )
                     ).all()
 

api/configs/extra/__init__.py

@@ -1,6 +1,5 @@
 from configs.extra.agent_backend_config import AgentBackendConfig
 from configs.extra.archive_config import ArchiveStorageConfig
-from configs.extra.knowledge_fs_config import KnowledgeFSConfig
 from configs.extra.logstore_config import LogStoreConfig
 from configs.extra.notion_config import NotionConfig
 from configs.extra.sentry_config import SentryConfig
@@ -11,7 +10,6 @@ class ExtraServiceConfig(
     # place the configs in alphabet order
     AgentBackendConfig,
     ArchiveStorageConfig,
-    KnowledgeFSConfig,
     LogStoreConfig,
     NotionConfig,
     SentryConfig,

api/configs/extra/knowledge_fs_config.py

@@ -71,9 +71,6 @@ def resolve_agent_access_filter(
             if has_agent_list_permission(override.permission_keys)
         }
 
-    if whitelist_scope.unrestricted:
-        accessible_agent_ids = permission_agent_ids
-    else:
-        accessible_agent_ids = set(whitelist_scope.resource_ids)
+    accessible_agent_ids = permission_agent_ids if whitelist_scope.unrestricted else set(whitelist_scope.resource_ids)
 
     return AgentAccessFilter(accessible_agent_ids=accessible_agent_ids)

api/controllers/common/agent_access.py

@@ -3,10 +3,7 @@
 
 def decode_remote_url(url: str, query_string: bytes | str = b"") -> str:
     decoded_url = urllib.parse.unquote(url)
-    if isinstance(query_string, bytes):
-        raw_query = query_string.decode()
-    else:
-        raw_query = query_string
+    raw_query = query_string.decode() if isinstance(query_string, bytes) else query_string
     if not raw_query:
         return decoded_url
 

api/controllers/common/helpers.py

@@ -136,7 +136,6 @@ def _handle_workflow_run_archive_download_not_ready_error(
     feature,
     human_input_form,
     init_validate,
-    knowledge_fs_proxy,
     notification,
     onboarding,
     resource_access_token,
@@ -294,7 +293,6 @@ def _handle_workflow_run_archive_download_not_ready_error(
     "human_input_form",
     "init_validate",
     "installed_app",
-    "knowledge_fs_proxy",
     "load_balancing_config",
     "login",
     "mcp_server",

api/controllers/console/__init__.py

@@ -1,4 +1,3 @@
-from typing import Any
 from uuid import UUID
 
 from flask_restx import Resource
@@ -55,7 +54,7 @@ class TraceProviderQuery(BaseModel):
 
 class TraceConfigPayload(BaseModel):
     tracing_provider: str = Field(..., description="Tracing provider name")
-    tracing_config: dict[str, Any] = Field(
+    tracing_config: dict[str, str | None] = Field(
         ...,
         description="Tracing configuration data",
     )
@@ -68,7 +67,7 @@ class TraceAppConfigResponse(ResponseModel):
     id: str | None = None
     app_id: str | None = None
     tracing_provider: str | None = None
-    tracing_config: dict[str, Any] | None = Field(default=None)
+    tracing_config: dict[str, str | None] | None = Field(default=None)
     is_active: bool | None = None
     created_at: str | None = None
     updated_at: str | None = None

api/controllers/console/app/ops_trace.py

@@ -117,10 +117,7 @@ def decorated_view(*args: P.args, **kwargs: P.kwargs) -> R:
             app_mode = AppMode.value_of(app_model.mode)
 
             if mode is not None:
-                if isinstance(mode, list):
-                    modes = mode
-                else:
-                    modes = [mode]
+                modes = mode if isinstance(mode, list) else [mode]
 
                 if app_mode not in modes:
                     mode_values = {m.value for m in modes}