Merge remote-tracking branch 'origin/main' into feat/collaboration

2025-10-15 10:02:55 +08:00 · 2025-10-15 10:02:55 +08:00 · 0395d1f91f
parent 5f4c1e4057 f906e70f6b
commit 0395d1f91f
17 changed files with 85 additions and 41 deletions
--- a/api/core/tools/entities/tool_entities.py
+++ b/api/core/tools/entities/tool_entities.py
@ -189,6 +189,11 @@ class ToolInvokeMessage(BaseModel):
        data: Mapping[str, Any] = Field(..., description="Detailed log data")
        metadata: Mapping[str, Any] = Field(default_factory=dict, description="The metadata of the log")

+        @field_validator("metadata", mode="before")
+        @classmethod
+        def _normalize_metadata(cls, value: Mapping[str, Any] | None) -> Mapping[str, Any]:
+            return value or {}
+
    class RetrieverResourceMessage(BaseModel):
        retriever_resources: list[RetrievalSourceMetadata] = Field(..., description="retriever resources")
        context: str = Field(..., description="context")
@ -376,6 +381,11 @@ class ToolEntity(BaseModel):
    def set_parameters(cls, v, validation_info: ValidationInfo) -> list[ToolParameter]:
        return v or []

+    @field_validator("output_schema", mode="before")
+    @classmethod
+    def _normalize_output_schema(cls, value: Mapping[str, object] | None) -> Mapping[str, object]:
+        return value or {}
+

 class OAuthSchema(BaseModel):
    client_schema: list[ProviderConfig] = Field(
--- a/api/pyproject.toml
+++ b/api/pyproject.toml
@ -88,7 +88,6 @@ dependencies = [
    "sendgrid~=6.12.3",
    "flask-restx~=1.3.0",
    "packaging~=23.2",
-    "weaviate-client==4.17.0",
 ]
 # Before adding new dependency, consider place it in
 # alphabet order (a-z) and suitable group.
--- a/api/templates/without-brand/invite_member_mail_template_en-US.html
+++ b/api/templates/without-brand/invite_member_mail_template_en-US.html
@ -75,10 +75,7 @@
 </head>
 <body>
  <div class="container">
-    <div class="header">
-      <!-- Optional: Add a logo or a header image here -->
-      <img src="https://assets.dify.ai/images/logo.png" alt="Dify Logo">
-    </div>
+    <div class="header"></div>
    <div class="content">
      <p class="content1">Dear {{ to }},</p>
      <p class="content2">{{ inviter_name }} is pleased to invite you to join our workspace on {{application_title}}, a platform specifically designed for LLM application development. On {{application_title}}, you can explore, create, and collaborate to build and operate AI applications.</p>
--- a/api/tests/unit_tests/core/rag/datasource/vdb/alibabacloud_mysql/test_alibabacloud_mysql_vector.py
+++ b/api/tests/unit_tests/core/rag/datasource/vdb/alibabacloud_mysql/test_alibabacloud_mysql_vector.py
@ -110,19 +110,6 @@ class TestAlibabaCloudMySQLVector(unittest.TestCase):
        assert mock_cursor.execute.call_count >= 3  # CREATE TABLE + 2 indexes
        mock_redis.set.assert_called_once()

-    def test_config_validation(self):
-        """Test configuration validation."""
-        # Test missing required fields
-        with pytest.raises(ValueError):
-            AlibabaCloudMySQLVectorConfig(
-                host="",  # Empty host should raise error
-                port=3306,
-                user="test",
-                password="test",
-                database="test",
-                max_connection=5,
-            )
-
    @patch(
        "core.rag.datasource.vdb.alibabacloud_mysql.alibabacloud_mysql_vector.mysql.connector.pooling.MySQLConnectionPool"
    )
@ -718,5 +705,29 @@ class TestAlibabaCloudMySQLVector(unittest.TestCase):
        mock_cursor.fetchone.side_effect = [{"VERSION()": "8.0.36"}, {"vector_support": True}]


+@pytest.mark.parametrize(
+    "invalid_config_override",
+    [
+        {"host": ""},  # Test empty host
+        {"port": 0},  # Test invalid port
+        {"max_connection": 0},  # Test invalid max_connection
+    ],
+)
+def test_config_validation_parametrized(invalid_config_override):
+    """Test configuration validation for various invalid inputs using parametrize."""
+    config = {
+        "host": "localhost",
+        "port": 3306,
+        "user": "test",
+        "password": "test",
+        "database": "test",
+        "max_connection": 5,
+    }
+    config.update(invalid_config_override)
+
+    with pytest.raises(ValueError):
+        AlibabaCloudMySQLVectorConfig(**config)
+
+
 if __name__ == "__main__":
    unittest.main()
--- a/api/tests/unit_tests/core/tools/test_tool_entities.py
+++ b/api/tests/unit_tests/core/tools/test_tool_entities.py
@ -0,0 +1,29 @@
+from core.tools.entities.common_entities import I18nObject
+from core.tools.entities.tool_entities import ToolEntity, ToolIdentity, ToolInvokeMessage
+
+
+def _make_identity() -> ToolIdentity:
+    return ToolIdentity(
+        author="author",
+        name="tool",
+        label=I18nObject(en_US="Label"),
+        provider="builtin",
+    )
+
+
+def test_log_message_metadata_none_defaults_to_empty_dict():
+    log_message = ToolInvokeMessage.LogMessage(
+        id="log-1",
+        label="Log entry",
+        status=ToolInvokeMessage.LogMessage.LogStatus.START,
+        data={},
+        metadata=None,
+    )
+
+    assert log_message.metadata == {}
+
+
+def test_tool_entity_output_schema_none_defaults_to_empty_dict():
+    entity = ToolEntity(identity=_make_identity(), output_schema=None)
+
+    assert entity.output_schema == {}
--- a/api/uv.lock
+++ b/api/uv.lock
@ -1,5 +1,5 @@
 version = 1
-revision = 3
+revision = 2
 requires-python = ">=3.11, <3.13"
 resolution-markers = [
    "python_full_version >= '3.12.4' and platform_python_implementation != 'PyPy' and sys_platform == 'linux'",
@ -1383,7 +1383,6 @@ dependencies = [
    { name = "transformers" },
    { name = "unstructured", extra = ["docx", "epub", "md", "ppt", "pptx"] },
    { name = "weave" },
-    { name = "weaviate-client" },
    { name = "webvtt-py" },
    { name = "yarl" },
 ]
@ -1575,7 +1574,6 @@ requires-dist = [
    { name = "transformers", specifier = "~=4.56.1" },
    { name = "unstructured", extras = ["docx", "epub", "md", "ppt", "pptx"], specifier = "~=0.16.1" },
    { name = "weave", specifier = "~=0.51.0" },
-    { name = "weaviate-client", specifier = "==4.17.0" },
    { name = "webvtt-py", specifier = "~=0.5.1" },
    { name = "yarl", specifier = "~=1.18.3" },
 ]
--- a/web/app/components/develop/template/template.en.mdx
+++ b/web/app/components/develop/template/template.en.mdx
@ -767,8 +767,8 @@ The text generation application offers non-session support and is ideal for tran
  <Col>
    <CodeGroup
      title="Request"
-      tag="POST"
-      label="/meta"
+      tag="GET"
+      label="/site"
      targetCode={`curl -X GET '${props.appDetail.api_base_url}/site' \\
 -H 'Authorization: Bearer {api_key}'`}
    />
--- a/web/app/components/develop/template/template.ja.mdx
+++ b/web/app/components/develop/template/template.ja.mdx
@ -764,8 +764,8 @@ import { Row, Col, Properties, Property, Heading, SubProperty, Paragraph } from
  <Col>
    <CodeGroup
      title="Request"
-      tag="POST"
-      label="/meta"
+      tag="GET"
+      label="/site"
      targetCode={`curl -X GET '${props.appDetail.api_base_url}/site' \\
  -H 'Authorization: Bearer {api_key}'`}
    />
--- a/web/app/components/develop/template/template.zh.mdx
+++ b/web/app/components/develop/template/template.zh.mdx
@ -728,8 +728,8 @@ import { Row, Col, Properties, Property, Heading, SubProperty } from '../md.tsx'
  <Col>
    <CodeGroup
      title="Request"
-      tag="POST"
-      label="/meta"
+      tag="GET"
+      label="/site"
      targetCode={`curl -X GET '${props.appDetail.api_base_url}/site' \\
 -H 'Authorization: Bearer {api_key}'`}
    />
--- a/web/app/components/develop/template/template_chat.en.mdx
+++ b/web/app/components/develop/template/template_chat.en.mdx
@ -1599,8 +1599,8 @@ Chat applications support session persistence, allowing previous chat history to
  <Col>
    <CodeGroup
      title="Request"
-      tag="POST"
-      label="/meta"
+      tag="GET"
+      label="/site"
      targetCode={`curl -X GET '${props.appDetail.api_base_url}/site' \\
 -H 'Authorization: Bearer {api_key}'`}
    />
--- a/web/app/components/develop/template/template_chat.ja.mdx
+++ b/web/app/components/develop/template/template_chat.ja.mdx
@ -1586,8 +1586,8 @@ import { Row, Col, Properties, Property, Heading, SubProperty, Paragraph } from
  <Col>
    <CodeGroup
      title="リクエスト"
-      tag="POST"
-      label="/meta"
+      tag="GET"
+      label="/site"
      targetCode={`curl -X GET '${props.appDetail.api_base_url}/site' \\
 -H 'Authorization: Bearer {api_key}'`}
    />
--- a/web/app/components/develop/template/template_chat.zh.mdx
+++ b/web/app/components/develop/template/template_chat.zh.mdx
@ -1579,8 +1579,8 @@ import { Row, Col, Properties, Property, Heading, SubProperty } from '../md.tsx'
  <Col>
    <CodeGroup
      title="Request"
-      tag="POST"
-      label="/meta"
+      tag="GET"
+      label="/site"
      targetCode={`curl -X GET '${props.appDetail.api_base_url}/site' \\
 -H 'Authorization: Bearer {api_key}'`}
    />
--- a/web/app/components/develop/template/template_workflow.en.mdx
+++ b/web/app/components/develop/template/template_workflow.en.mdx
@ -1025,8 +1025,8 @@ Workflow applications offers non-session support and is ideal for translation, a
  <Col>
    <CodeGroup
      title="Request"
-      tag="POST"
-      label="/meta"
+      tag="GET"
+      label="/site"
      targetCode={`curl -X GET '${props.appDetail.api_base_url}/site' \\
 -H 'Authorization: Bearer {api_key}'`}
    />
--- a/web/app/components/develop/template/template_workflow.ja.mdx
+++ b/web/app/components/develop/template/template_workflow.ja.mdx
@ -1021,8 +1021,8 @@ import { Row, Col, Properties, Property, Heading, SubProperty, Paragraph } from
  <Col>
    <CodeGroup
      title="Request"
-      tag="POST"
-      label="/meta"
+      tag="GET"
+      label="/site"
      targetCode={`curl -X GET '${props.appDetail.api_base_url}/site' \\
  -H 'Authorization: Bearer {api_key}'`}
    />
--- a/web/app/components/develop/template/template_workflow.zh.mdx
+++ b/web/app/components/develop/template/template_workflow.zh.mdx
@ -1012,8 +1012,8 @@ Workflow 应用无会话支持，适合用于翻译/文章写作/总结 AI 等
  <Col>
    <CodeGroup
      title="Request"
-      tag="POST"
-      label="/meta"
+      tag="GET"
+      label="/site"
      targetCode={`curl -X GET '${props.appDetail.api_base_url}/site' \\
 -H 'Authorization: Bearer {api_key}'`}
    />
--- a/web/i18n/zh-Hans/common.ts
+++ b/web/i18n/zh-Hans/common.ts
@ -20,7 +20,7 @@ const translation = {
    save: '保存',
    yes: '是',
    no: '否',
-    deleteConfirmTitle: '删除?',
+    deleteConfirmTitle: '删除？',
    confirmAction: '请确认您的操作。',
    saveAndEnable: '保存并启用',
    edit: '编辑',
--- a/web/package.json
+++ b/web/package.json
@ -2,7 +2,7 @@
  "name": "dify-web",
  "version": "1.9.1",
  "private": true,
-  "packageManager": "pnpm@10.18.2",
+  "packageManager": "pnpm@10.18.3+sha512.bbd16e6d7286fd7e01f6b3c0b3c932cda2965c06a908328f74663f10a9aea51f1129eea615134bf992831b009eabe167ecb7008b597f40ff9bc75946aadfb08d",
  "engines": {
    "node": ">=v22.11.0"
  },