Merge remote-tracking branch 'origin/develop' into zwb/file_preview

Author: Stockton11

LICENSE

@@ -1,20 +1,21 @@
-# Nexent Open Source License
-
-Nexent is licensed under the MIT License, with the following additional conditions:
-
-Nexent is permitted to be used commercially, including as a backend service for other applications or as an application development platform for enterprises. However, when the following conditions are met, you must contact the producer to obtain a commercial license:
-
-a. Multi-tenant SaaS service: Unless explicitly authorized by Nexent in writing, you may not use the Nexent source code to operate a multi-tenant SaaS service.
-b. LOGO and copyright information: In the process of using Nexent's frontend, you may not remove or modify the LOGO or copyright information in the Nexent console or applications. This restriction is inapplicable to uses of Nexent that do not involve its frontend.
-
-Please contact [email protected] by email to inquire about licensing matters.
-
-As a contributor, you should agree that:
-
-a. The producer can adjust the open-source agreement to be more strict or relaxed as deemed necessary.
-b. Your contributed code may be used for commercial purposes, such as Nexent's cloud business.
-
-Apart from the specific conditions mentioned above, all other rights and restrictions follow the MIT License.
-Detailed information about the MIT License can be found at: https://opensource.org/licenses/MIT
-
-Copyright © 2025 Huawei Technologies Co., Ltd.
+MIT License
+
+Copyright (c) 2025 Huawei Technologies Co., Ltd. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

backend/apps/vectordatabase_app.py

@@ -18,7 +18,7 @@
 from services.redis_service import get_redis_service
 from utils.auth_utils import get_current_user_id
 from utils.file_management_utils import get_all_files_status
-from database.knowledge_db import get_index_name_by_knowledge_name
+from database.knowledge_db import get_index_name_by_knowledge_name, get_knowledge_record
 
 router = APIRouter(prefix="/indices")
 service = ElasticSearchService()
@@ -54,7 +54,7 @@ def create_new_index(
         embedding_dim: Optional[int] = Query(
             None, description="Dimension of the embedding vectors"),
         request: Dict[str, Any] = Body(
-            None, description="Request body with optional fields (ingroup_permission, group_ids)"),
+            None, description="Request body with optional fields (ingroup_permission, group_ids, embedding_model_name)"),
         vdb_core: VectorDatabaseCore = Depends(get_vector_db_core),
         authorization: Optional[str] = Header(None)
 ):
@@ -65,9 +65,11 @@ def create_new_index(
         # Extract optional fields from request body
         ingroup_permission = None
         group_ids = None
+        embedding_model_name = None
         if request:
             ingroup_permission = request.get("ingroup_permission")
             group_ids = request.get("group_ids")
+            embedding_model_name = request.get("embedding_model_name")
 
         # Treat path parameter as user-facing knowledge base name for new creations
         return ElasticSearchService.create_knowledge_base(
@@ -78,6 +80,7 @@ def create_new_index(
             tenant_id=tenant_id,
             ingroup_permission=ingroup_permission,
             group_ids=group_ids,
+            embedding_model_name=embedding_model_name,
         )
     except Exception as e:
         raise HTTPException(
@@ -195,7 +198,16 @@ def create_index_documents(
     """
     try:
         user_id, tenant_id = get_current_user_id(authorization)
-        embedding_model = get_embedding_model(tenant_id)
+        
+        # Get the knowledge base record to retrieve the saved embedding model
+        knowledge_record = get_knowledge_record({'index_name': index_name})
+        saved_embedding_model_name = None
+        if knowledge_record:
+            saved_embedding_model_name = knowledge_record.get('embedding_model_name')
+        
+        # Use the saved model from knowledge base, fallback to tenant default if not set
+        embedding_model = get_embedding_model(tenant_id, saved_embedding_model_name)
+        
         return ElasticSearchService.index_documents(
             embedding_model=embedding_model,
             index_name=index_name,

backend/services/model_management_service.py

@@ -199,7 +199,11 @@ async def list_provider_models_for_tenant(tenant_id: str, provider: str, model_t
         model_list = get_models_by_tenant_factory_type(
             tenant_id, provider, model_type)
         for model in model_list:
-            model["id"] = model["model_repo"] + "/" + model["model_name"]
+            # Use add_repo_to_name for consistent format with /model/list API
+            model["id"] = add_repo_to_name(
+                model_repo=model["model_repo"],
+                model_name=model["model_name"],
+            )
 
         logging.debug(f"Provider model {provider} created successfully")
         return model_list

backend/services/vectordatabase_service.py

@@ -395,6 +395,7 @@ def create_knowledge_base(
             tenant_id: Optional[str],
             ingroup_permission: Optional[str] = None,
             group_ids: Optional[List[int]] = None,
+            embedding_model_name: Optional[str] = None,
     ):
         """
         Create a new knowledge base with a user-facing name and an internal Elasticsearch index name.
@@ -404,19 +405,37 @@ def create_knowledge_base(
         - Generate index_name as ``knowledge_id + '-' + uuid`` (digits and lowercase letters only).
         - Use generated index_name as the Elasticsearch index name.
 
+        Args:
+            knowledge_name: User-facing knowledge base name
+            embedding_dim: Dimension of the embedding vectors (optional)
+            vdb_core: VectorDatabaseCore instance
+            user_id: User ID who creates the knowledge base
+            tenant_id: Tenant ID
+            ingroup_permission: Permission level (optional)
+            group_ids: List of group IDs (optional)
+            embedding_model_name: Specific embedding model name to use (optional).
+                                   If provided, will use this model instead of tenant default.
+
         For backward compatibility, legacy callers can still use create_index() directly
         with an explicit index_name.
         """
         try:
-            embedding_model = get_embedding_model(tenant_id)
+            # Get embedding model - use user-selected model if provided, otherwise use tenant default
+            embedding_model = get_embedding_model(tenant_id, embedding_model_name)
+
+            # Determine the embedding model name to save: use user-provided name if available,
+            # otherwise use the model's display name
+            saved_embedding_model_name = embedding_model_name
+            if not saved_embedding_model_name and embedding_model:
+                saved_embedding_model_name = embedding_model.model
 
             # Create knowledge record first to obtain knowledge_id and generated index_name
             knowledge_data = {
                 "knowledge_name": knowledge_name,
                 "knowledge_describe": "",
                 "user_id": user_id,
                 "tenant_id": tenant_id,
-                "embedding_model_name": embedding_model.model if embedding_model else None,
+                "embedding_model_name": saved_embedding_model_name,
             }
 
             # Add group permission and group IDs if provided

doc/docs/.vitepress/config.mts

@@ -1,15 +1,25 @@
-// https://vitepress.dev/reference/site-config
+// https://vitepress.dev/reference/site-config
 import { defineConfig } from "vitepress";
 
 export default defineConfig({
   // Set base path for GitHub Pages deployment
-  base: (globalThis as any).process?.env?.GITHUB_PAGES ? '/nexent/' : '/',
+  base: (globalThis as any).process?.env?.GITHUB_PAGES ? "/nexent/" : "/",
   title: "Nexent Doc",
   description:
     "A zero-code platform for auto-generating agents  no orchestration, no complex drag-and-drop required.",
 
   // Add favicon to head
-  head: [["link", { rel: "icon", href: (globalThis as any).process?.env?.GITHUB_PAGES ? "/nexent/favicon.ico" : "/doc/favicon.ico" }]],
+  head: [
+    [
+      "link",
+      {
+        rel: "icon",
+        href: (globalThis as any).process?.env?.GITHUB_PAGES
+          ? "/nexent/favicon.ico"
+          : "/doc/favicon.ico",
+      },
+    ],
+  ],
 
   // Ignore localhost links as they are meant for local deployment access
   ignoreDeadLinks: [
@@ -99,16 +109,40 @@ export default defineConfig({
                 text: "Memory Management",
                 link: "/en/user-guide/memory-management",
               },
-              { text: "User Management", link: "/en/user-guide/user-management" },
+              {
+                text: "User Management",
+                link: "/en/user-guide/user-management",
+              },
+              {
+                text: "Third-party Platform Integrations",
+                items: [
+                  { text: "ModelEngine", link: "/en/user-guide/modelengine" },
+                ],
+              },
               {
                 text: "Local Tools",
                 items: [
                   { text: "Overview", link: "/en/user-guide/local-tools/" },
-                  { text: "File Tools", link: "/en/user-guide/local-tools/file-tools" },
-                  { text: "Email Tools", link: "/en/user-guide/local-tools/email-tools" },
-                  { text: "Search Tools", link: "/en/user-guide/local-tools/search-tools" },
-                  { text: "Multimodal Tools", link: "/en/user-guide/local-tools/multimodal-tools" },
-                  { text: "Terminal Tool", link: "/en/user-guide/local-tools/terminal-tool" },
+                  {
+                    text: "File Tools",
+                    link: "/en/user-guide/local-tools/file-tools",
+                  },
+                  {
+                    text: "Email Tools",
+                    link: "/en/user-guide/local-tools/email-tools",
+                  },
+                  {
+                    text: "Search Tools",
+                    link: "/en/user-guide/local-tools/search-tools",
+                  },
+                  {
+                    text: "Multimodal Tools",
+                    link: "/en/user-guide/local-tools/multimodal-tools",
+                  },
+                  {
+                    text: "Terminal Tool",
+                    link: "/en/user-guide/local-tools/terminal-tool",
+                  },
                 ],
               },
             ],
@@ -134,9 +168,7 @@ export default defineConfig({
           },
           {
             text: "Frontend Development",
-            items: [
-              { text: "Overview", link: "/en/frontend/overview" },
-            ],
+            items: [{ text: "Overview", link: "/en/frontend/overview" }],
           },
           {
             text: "Backend Development",
@@ -184,7 +216,10 @@ export default defineConfig({
             text: "MCP Ecosystem",
             items: [
               { text: "Overview", link: "/en/mcp-ecosystem/overview" },
-              { text: "MCP Recommendations", link: "/en/mcp-ecosystem/mcp-recommendations" },
+              {
+                text: "MCP Recommendations",
+                link: "/en/mcp-ecosystem/mcp-recommendations",
+              },
               { text: "Use Cases", link: "/en/mcp-ecosystem/use-cases" },
             ],
           },
@@ -289,11 +324,32 @@ export default defineConfig({
                 text: "本地工具",
                 items: [
                   { text: "概览", link: "/zh/user-guide/local-tools/" },
-                  { text: "文件工具", link: "/zh/user-guide/local-tools/file-tools" },
-                  { text: "邮件工具", link: "/zh/user-guide/local-tools/email-tools" },
-                  { text: "搜索工具", link: "/zh/user-guide/local-tools/search-tools" },
-                  { text: "多模态工具", link: "/zh/user-guide/local-tools/multimodal-tools" },
-                  { text: "终端工具", link: "/zh/user-guide/local-tools/terminal-tool" },
+                  {
+                    text: "文件工具",
+                    link: "/zh/user-guide/local-tools/file-tools",
+                  },
+                  {
+                    text: "邮件工具",
+                    link: "/zh/user-guide/local-tools/email-tools",
+                  },
+                  {
+                    text: "搜索工具",
+                    link: "/zh/user-guide/local-tools/search-tools",
+                  },
+                  {
+                    text: "多模态工具",
+                    link: "/zh/user-guide/local-tools/multimodal-tools",
+                  },
+                  {
+                    text: "终端工具",
+                    link: "/zh/user-guide/local-tools/terminal-tool",
+                  },
+                ],
+              },
+              {
+                text: "对接第三方平台",
+                items: [
+                  { text: "ModelEngine", link: "/zh/user-guide/modelengine" },
                 ],
               },
             ],
@@ -359,7 +415,10 @@ export default defineConfig({
             text: "MCP 生态系统",
             items: [
               { text: "概览", link: "/zh/mcp-ecosystem/overview" },
-              { text: "MCP 推荐", link: "/zh/mcp-ecosystem/mcp-recommendations" },
+              {
+                text: "MCP 推荐",
+                link: "/zh/mcp-ecosystem/mcp-recommendations",
+              },
               { text: "用例场景", link: "/zh/mcp-ecosystem/use-cases" },
             ],
           },