fix multiple retrieval in knowledge node (langgenius#8942)

hwzhuhao · Sep 30, 2024 · 625e4c4 · 625e4c4
1 parent 7850a28
commit 625e4c4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/api/core/workflow/nodes/knowledge_retrieval/knowledge_retrieval_node.py b/api/core/workflow/nodes/knowledge_retrieval/knowledge_retrieval_node.py
@@ -229,7 +229,9 @@ def _fetch_dataset_retriever(self, node_data: KnowledgeRetrievalNodeData, query:
                             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

diff --git a/api/services/website_service.py b/api/services/website_service.py
@@ -166,15 +166,15 @@ def get_crawl_status(cls, job_id: str, provider: str) -> dict:
     @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):
                 data = storage.load_once(file_key)
                 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":