refactor.

api/core/completion.py

@@ -16,6 +16,7 @@
 from core.model_providers.models.llm.base import BaseLLM
 from core.orchestrator_rule_parser import OrchestratorRuleParser
 from core.prompt.prompt_template import PromptTemplateParser
+from core.prompt.prompt_transform import PromptTransform
 from models.model import App, AppModelConfig, Account, Conversation, EndUser
 
 
@@ -156,24 +157,28 @@ def run_final_llm(cls, model_instance: BaseLLM, mode: str, app_model_config: App
                       conversation_message_task: ConversationMessageTask,
                       memory: Optional[ReadOnlyConversationTokenDBBufferSharedMemory],
                       fake_response: Optional[str]):
+        prompt_transform = PromptTransform()
+
         # get llm prompt
         if app_model_config.prompt_type == 'simple':
-            prompt_messages, stop_words = model_instance.get_prompt(
+            prompt_messages, stop_words = prompt_transform.get_prompt(
                 mode=mode,
                 pre_prompt=app_model_config.pre_prompt,
                 inputs=inputs,
                 query=query,
                 context=agent_execute_result.output if agent_execute_result else None,
-                memory=memory
+                memory=memory,
+                model_instance=model_instance
             )
         else:
-            prompt_messages = model_instance.get_advanced_prompt(
+            prompt_messages = prompt_transform.get_advanced_prompt(
                 app_mode=mode,
                 app_model_config=app_model_config,
                 inputs=inputs,
                 query=query,
                 context=agent_execute_result.output if agent_execute_result else None,
-                memory=memory
+                memory=memory,
+                model_instance=model_instance
             )
 
             model_config = app_model_config.model_dict
@@ -238,14 +243,17 @@ def get_validate_rest_tokens(cls, mode: str, model_instance: BaseLLM, app_model_
         if max_tokens is None:
             max_tokens = 0
 
+        prompt_transform = PromptTransform()
+
         # get prompt without memory and context
-        prompt_messages, _ = model_instance.get_prompt(
+        prompt_messages, _ = prompt_transform.get_prompt(
             mode=mode,
             pre_prompt=app_model_config.pre_prompt,
             inputs=inputs,
             query=query,
             context=None,
-            memory=None
+            memory=None,
+            model_instance=model_instance
         )
 
         prompt_tokens = model_instance.get_num_tokens(prompt_messages)

api/core/model_providers/models/entity/model_params.py

@@ -4,10 +4,6 @@
 from langchain.load.serializable import Serializable
 from pydantic import BaseModel
 
-class AppMode(enum.Enum):
-    COMPLETION = 'completion'
-    CHAT = 'chat'
-
 
 class ModelMode(enum.Enum):
     COMPLETION = 'completion'

api/core/model_providers/models/llm/baichuan_model.py

@@ -37,12 +37,6 @@ def _run(self, messages: List[PromptMessage],
         prompts = self._get_prompt_from_messages(messages)
         return self._client.generate([prompts], stop, callbacks)
 
-    def prompt_file_name(self, mode: str) -> str:
-        if mode == 'completion':
-            return 'baichuan_completion'
-        else:
-            return 'baichuan_chat'
-
     def get_num_tokens(self, messages: List[PromptMessage]) -> int:
         """
         get num tokens of prompt messages.