Merge pull request #412 from LlmKira/dev

[BUG] Solved the problem of global credentials overwriting personal credentials

Author: sudoskys

app/middleware/llm_task.py

@@ -226,7 +226,10 @@ async def request_openai(
         # TODO:实现消息时序切片
         # 日志
         logger.info(
-            f"[x] Openai request" f"\n--message {len(messages)} " f"\n--tools {tools}"
+            f"Request Details:"
+            f"\n--message {len(messages)} "
+            f"\n--tools {tools} "
+            f"\n--model {credential.api_model}"
         )
         for msg in messages:
             if isinstance(msg, UserMessage):

app/receiver/function.py

@@ -260,7 +260,7 @@ async def run_pending_task(task: TaskHeader, pending_task: ToolCall):
         if len(task.task_sign.tool_calls_pending) == 0:
             if not has_been_called_recently(userid=task.receiver.uid, n_seconds=3):
                 credentials = await read_user_credential(user_id=task.receiver.uid)
-                if global_credential:
+                if global_credential and not credentials:
                     credentials = global_credential
                 logic = LLMLogic(
                     api_key=credentials.api_key,

app/receiver/receiver_client.py

@@ -246,7 +246,7 @@ async def _flash(
         try:
             try:
                 credentials = await read_user_credential(user_id=task.receiver.uid)
-                if global_credential:
+                if global_credential and not credentials:
                     credentials = global_credential
                 assert credentials, "You need to /login first"
                 llm_result = await llm.request_openai(

llmkira/kv_manager/instruction.py

@@ -4,10 +4,9 @@
 from llmkira.kv_manager._base import KvManager
 
 DEFAULT_INSTRUCTION = (
-    "[ASSISTANT RULE]"
+    "instruction: "
     "SPEAK IN MORE CUTE STYLE, No duplication answer, CALL USER MASTER, REPLY IN USER "
     "LANGUAGE, ACT STEP BY STEP"
-    "[RULE END]"
 )
 
 

llmkira/openai/request.py

@@ -168,7 +168,7 @@ def make_url(base_url: str):
     def check_vision(self):
         if not self.model.startswith(VISION):
             logger.info(
-                "Try to remove the image content part from the messages, because the model is not supported."
+                f"Try to remove the image content part from the messages, because the model is not supported {self.model}"
             )
             for message in self.messages:
                 if isinstance(message, UserMessage) and isinstance(