diff --git a/api/core/prompt/advanced_prompt_transform.py b/api/core/prompt/advanced_prompt_transform.py index 9ca3ef0375..397f708f1f 100644 --- a/api/core/prompt/advanced_prompt_transform.py +++ b/api/core/prompt/advanced_prompt_transform.py @@ -1,11 +1,20 @@ from typing import Optional -from core.entities.application_entities import PromptTemplateEntity, ModelConfigEntity, \ - AdvancedCompletionPromptTemplateEntity +from core.entities.application_entities import ( + AdvancedCompletionPromptTemplateEntity, + ModelConfigEntity, + PromptTemplateEntity, +) from core.file.file_obj import FileObj from core.memory.token_buffer_memory import TokenBufferMemory -from core.model_runtime.entities.message_entities import PromptMessage, PromptMessageRole, UserPromptMessage, \ - SystemPromptMessage, AssistantPromptMessage, TextPromptMessageContent +from core.model_runtime.entities.message_entities import ( + AssistantPromptMessage, + PromptMessage, + PromptMessageRole, + SystemPromptMessage, + TextPromptMessageContent, + UserPromptMessage, +) from core.prompt.prompt_template import PromptTemplateParser from core.prompt.prompt_transform import PromptTransform from core.prompt.simple_prompt_transform import ModelMode diff --git a/api/core/prompt/simple_prompt_transform.py b/api/core/prompt/simple_prompt_transform.py index a898c37c4a..6e158bef39 100644 --- a/api/core/prompt/simple_prompt_transform.py +++ b/api/core/prompt/simple_prompt_transform.py @@ -1,7 +1,7 @@ import enum import json import os -from typing import Optional, Tuple +from typing import Optional from core.entities.application_entities import ( ModelConfigEntity, @@ -85,7 +85,7 @@ class SimplePromptTransform(PromptTransform): query: Optional[str] = None, context: Optional[str] = None, histories: Optional[str] = None, - ) -> Tuple[str, dict]: + ) -> tuple[str, dict]: # get prompt template prompt_template_config = self.get_prompt_template( app_mode=app_mode, @@ -160,7 +160,7 @@ class SimplePromptTransform(PromptTransform): files: list[FileObj], memory: Optional[TokenBufferMemory], model_config: ModelConfigEntity) \ - -> Tuple[list[PromptMessage], Optional[list[str]]]: + -> tuple[list[PromptMessage], Optional[list[str]]]: prompt_messages = [] # get prompt @@ -193,7 +193,7 @@ class SimplePromptTransform(PromptTransform): files: list[FileObj], memory: Optional[TokenBufferMemory], model_config: ModelConfigEntity) \ - -> Tuple[list[PromptMessage], Optional[list[str]]]: + -> tuple[list[PromptMessage], Optional[list[str]]]: # get prompt prompt, prompt_rules = self.get_prompt_str_and_rules( app_mode=AppMode.CHAT, diff --git a/api/services/workflow/workflow_converter.py b/api/services/workflow/workflow_converter.py index 7d18f4f675..647713b404 100644 --- a/api/services/workflow/workflow_converter.py +++ b/api/services/workflow/workflow_converter.py @@ -4,11 +4,12 @@ from typing import Optional from core.application_manager import ApplicationManager from core.entities.application_entities import ( DatasetEntity, + DatasetRetrieveConfigEntity, ExternalDataVariableEntity, FileUploadEntity, ModelConfigEntity, PromptTemplateEntity, - VariableEntity, DatasetRetrieveConfigEntity, + VariableEntity, ) from core.model_runtime.entities.llm_entities import LLMMode from core.model_runtime.utils import helper