From ab82aa75752e712a1ab305991153e03e8ba99da2 Mon Sep 17 00:00:00 2001
From: superobk <superobk@hotmail.com>
Date: Fri, 24 May 2024 16:16:43 +0800
Subject: [PATCH] refactor: chat processing

---
 src/blackbox/chat.py | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/blackbox/chat.py b/src/blackbox/chat.py
index 0ba8c68..369c228 100644
--- a/src/blackbox/chat.py
+++ b/src/blackbox/chat.py
@@ -1,4 +1,3 @@
-import logging
 from typing import Any, Coroutine
 
 from fastapi import Request, Response, status
@@ -14,8 +13,6 @@ import re
 
 from injector import singleton
 
-logger = logging.getLogger
-
 @singleton
 class Chat(Blackbox):
     
@@ -27,15 +24,14 @@ class Chat(Blackbox):
         return isinstance(data, list)
 
     # model_name有 Qwen1.5-14B-Chat , internlm2-chat-20b
-    @logging_time(logger=logger)
-    def processing(self, *args, **kwargs)  -> str:
+    @logging_time()
+    def processing(self, prompt: str, context: list, settings: dict)  -> str:
 
-        settings: dict = args[0]
         if settings is None:
             settings = {}
         user_model_name = settings.get("model_name")
-        user_context = settings.get("context")
-        user_question = settings.get("question")
+        user_context = context
+        user_question = prompt
         user_template = settings.get("template")
         user_temperature = settings.get("temperature")
         user_top_p = settings.get("top_p")
@@ -44,7 +40,6 @@ class Chat(Blackbox):
         user_stop = settings.get("stop")
         user_frequency_penalty = settings.get("frequency_penalty")
         user_presence_penalty = settings.get("presence_penalty")
-
         if user_context == None:
             user_context = []
 
@@ -124,5 +119,7 @@ class Chat(Blackbox):
             return JSONResponse(content={"error": "json parse error"}, status_code=status.HTTP_400_BAD_REQUEST)
 
         setting: dict = data.get("settings")
-        
-        return JSONResponse(content={"response": self.processing(setting)}, status_code=status.HTTP_200_OK)
\ No newline at end of file
+        context = data.get("context")
+        prompt = data.get("prompt")
+
+        return JSONResponse(content={"response": self.processing(prompt, context, setting)}, status_code=status.HTTP_200_OK)
\ No newline at end of file