diff --git a/agent/canvas.py b/agent/canvas.py
index aeb579443..2a428ffad 100644
--- a/agent/canvas.py
+++ b/agent/canvas.py
@@ -25,7 +25,6 @@ from typing import Any, Union, Tuple
 
 from agent.component import component_class
 from agent.component.base import ComponentBase
-from api.db.services.file_service import FileService
 from api.db.services.task_service import has_canceled
 from common.misc_utils import get_uuid, hash_str2int
 from common.exceptions import TaskCanceledException
@@ -545,6 +544,7 @@ class Canvas(Graph):
         return self.components[cpnnm]["obj"].get_input_elements()
 
     def get_files(self, files: Union[None, list[dict]]) -> list[str]:
+        from api.db.services.file_service import FileService
         if not files:
             return  []
         def image_to_base64(file):
diff --git a/rag/prompts/generator.py b/rag/prompts/generator.py
index b283b9cc6..3d8438f4a 100644
--- a/rag/prompts/generator.py
+++ b/rag/prompts/generator.py
@@ -52,7 +52,7 @@ def chunks_format(reference):
             "similarity": chunk.get("similarity"),
             "vector_similarity": chunk.get("vector_similarity"),
             "term_similarity": chunk.get("term_similarity"),
-            "doc_type": chunk.get("doc_type_kwd"),
+            "doc_type": get_value(chunk, "doc_type_kwd", "doc_type"),
         }
         for chunk in reference.get("chunks", [])
     ]