chore(version): bump to 0.9.1 (#8945)

api/configs/packaging/__init__.py

@@ -9,7 +9,7 @@ class PackagingInfo(BaseSettings):
 
     CURRENT_VERSION: str = Field(
         description="Dify version",
-        default="0.9.0",
+        default="0.9.1",
     )
 
     COMMIT_SHA: str = Field(

api/core/workflow/nodes/knowledge_retrieval/knowledge_retrieval_node.py

@@ -229,7 +229,9 @@ class KnowledgeRetrievalNode(BaseNode):
                             source["content"] = segment.get_sign_content()
                         retrieval_resource_list.append(source)
         if retrieval_resource_list:
-            retrieval_resource_list = sorted(retrieval_resource_list, key=lambda x: x.get("score"), reverse=True)
+            retrieval_resource_list = sorted(
+                retrieval_resource_list, key=lambda x: x.get("metadata").get("score"), reverse=True
+            )
             position = 1
             for item in retrieval_resource_list:
                 item["metadata"]["position"] = position

api/services/dataset_service.py

@@ -250,6 +250,9 @@ class DatasetService:
             db.session.commit()
         else:
             data.pop("partial_member_list", None)
+            data.pop("external_knowledge_api_id", None)
+            data.pop("external_knowledge_id", None)
+            data.pop("external_retrieval_model", None)
             filtered_data = {k: v for k, v in data.items() if v is not None or k == "description"}
             action = None
             if dataset.indexing_technique != data["indexing_technique"]:

api/services/website_service.py

@@ -166,6 +166,8 @@ class WebsiteService:
     @classmethod
     def get_crawl_url_data(cls, job_id: str, provider: str, url: str, tenant_id: str) -> dict | None:
         credentials = ApiKeyAuthService.get_auth_credentials(tenant_id, "website", provider)
+        # decrypt api_key
+        api_key = encrypter.decrypt_token(tenant_id=tenant_id, token=credentials.get("config").get("api_key"))
         if provider == "firecrawl":
             file_key = "website_files/" + job_id + ".txt"
             if storage.exists(file_key):
@@ -173,8 +175,6 @@ class WebsiteService:
                 if data:
                     data = json.loads(data.decode("utf-8"))
             else:
-                # decrypt api_key
-                api_key = encrypter.decrypt_token(tenant_id=tenant_id, token=credentials.get("config").get("api_key"))
                 firecrawl_app = FirecrawlApp(api_key=api_key, base_url=credentials.get("config").get("base_url", None))
                 result = firecrawl_app.check_crawl_status(job_id)
                 if result.get("status") != "completed":

docker-legacy/docker-compose.yaml

@@ -2,7 +2,7 @@ version: '3'
 services:
   # API service
   api:
-    image: langgenius/dify-api:0.9.0
+    image: langgenius/dify-api:0.9.1
     restart: always
     environment:
       # Startup mode, 'api' starts the API server.
@@ -227,7 +227,7 @@ services:
   # worker service
   # The Celery worker for processing the queue.
   worker:
-    image: langgenius/dify-api:0.9.0
+    image: langgenius/dify-api:0.9.1
     restart: always
     environment:
       CONSOLE_WEB_URL: ''
@@ -396,7 +396,7 @@ services:
 
   # Frontend web application.
   web:
-    image: langgenius/dify-web:0.9.0
+    image: langgenius/dify-web:0.9.1
     restart: always
     environment:
       # The base URL of console application api server, refers to the Console base URL of WEB service if console domain is

docker/docker-compose.yaml

@@ -213,7 +213,7 @@ x-shared-env: &shared-api-worker-env
 services:
   # API service
   api:
-    image: langgenius/dify-api:0.9.0
+    image: langgenius/dify-api:0.9.1
     restart: always
     environment:
       # Use the shared environment variables.
@@ -233,7 +233,7 @@ services:
   # worker service
   # The Celery worker for processing the queue.
   worker:
-    image: langgenius/dify-api:0.9.0
+    image: langgenius/dify-api:0.9.1
     restart: always
     environment:
       # Use the shared environment variables.
@@ -252,7 +252,7 @@ services:
 
   # Frontend web application.
   web:
-    image: langgenius/dify-web:0.9.0
+    image: langgenius/dify-web:0.9.1
     restart: always
     environment:
       CONSOLE_API_URL: ${CONSOLE_API_URL:-}

web/app/components/app/configuration/dataset-config/settings-modal/index.tsx

@@ -59,10 +59,10 @@ const SettingsModal: FC<SettingsModalProps> = ({
   const { t } = useTranslation()
   const { notify } = useToastContext()
   const ref = useRef(null)
+  const isExternal = currentDataset.provider === 'external'
   const [topK, setTopK] = useState(currentDataset?.external_retrieval_model.top_k ?? 2)
   const [scoreThreshold, setScoreThreshold] = useState(currentDataset?.external_retrieval_model.score_threshold ?? 0.5)
   const [scoreThresholdEnabled, setScoreThresholdEnabled] = useState(currentDataset?.external_retrieval_model.score_threshold_enabled ?? false)
-
   const { setShowAccountSettingModal } = useModalContext()
   const [loading, setLoading] = useState(false)
   const { isCurrentWorkspaceDatasetOperator } = useAppContext()
@@ -122,19 +122,21 @@ const SettingsModal: FC<SettingsModalProps> = ({
           description,
           permission,
           indexing_technique: indexMethod,
-          external_retrieval_model: {
-            top_k: topK,
-            score_threshold: scoreThreshold,
-            score_threshold_enabled: scoreThresholdEnabled,
-          },
           retrieval_model: {
             ...postRetrievalConfig,
             score_threshold: postRetrievalConfig.score_threshold_enabled ? postRetrievalConfig.score_threshold : 0,
           },
-          external_knowledge_id: currentDataset!.external_knowledge_info.external_knowledge_id,
-          external_knowledge_api_id: currentDataset!.external_knowledge_info.external_knowledge_api_id,
           embedding_model: localeCurrentDataset.embedding_model,
           embedding_model_provider: localeCurrentDataset.embedding_model_provider,
+          ...(isExternal && {
+            external_knowledge_id: currentDataset!.external_knowledge_info.external_knowledge_id,
+            external_knowledge_api_id: currentDataset!.external_knowledge_info.external_knowledge_api_id,
+            external_retrieval_model: {
+              top_k: topK,
+              score_threshold: scoreThreshold,
+              score_threshold_enabled: scoreThresholdEnabled,
+            },
+          }),
         },
       } as any
       if (permission === 'partial_members') {

web/app/components/datasets/settings/form/index.tsx

@@ -141,19 +141,21 @@ const Form = () => {
           description,
           permission,
           indexing_technique: indexMethod,
-          external_retrieval_model: {
-            top_k: topK,
-            score_threshold: scoreThreshold,
-            score_threshold_enabled: scoreThresholdEnabled,
-          },
           retrieval_model: {
             ...postRetrievalConfig,
             score_threshold: postRetrievalConfig.score_threshold_enabled ? postRetrievalConfig.score_threshold : 0,
           },
-          external_knowledge_id: currentDataset!.external_knowledge_info.external_knowledge_id,
-          external_knowledge_api_id: currentDataset!.external_knowledge_info.external_knowledge_api_id,
           embedding_model: embeddingModel.model,
           embedding_model_provider: embeddingModel.provider,
+          ...(currentDataset!.provider === 'external' && {
+            external_knowledge_id: currentDataset!.external_knowledge_info.external_knowledge_id,
+            external_knowledge_api_id: currentDataset!.external_knowledge_info.external_knowledge_api_id,
+            external_retrieval_model: {
+              top_k: topK,
+              score_threshold: scoreThreshold,
+              score_threshold_enabled: scoreThresholdEnabled,
+            },
+          }),
         },
       } as any
       if (permission === 'partial_members') {

web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dify-web",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "private": true,
   "engines": {
     "node": ">=18.17.0"

web/service/datasets.ts

@@ -30,8 +30,9 @@ import type {
   createDocumentResponse,
 } from '@/models/datasets'
 import type { CreateKnowledgeBaseReq } from '@/app/components/datasets/external-knowledge-base/create/declarations'
-import type { CreateExternalAPIReq } from '@/app/components/datasets/external-api/declarations.ts'
+import type { CreateExternalAPIReq } from '@/app/components/datasets/external-api/declarations'
 import type { CommonResponse, DataSourceNotionWorkspace } from '@/models/common'
+import { DataSourceProvider } from '@/models/common'
 import type {
   ApiKeysListResponse,
   CreateApiKeyResponse,