Merge branch 'new-model-abstract' of https://github.com/LINSTCL/QChatGPT into new-model-abstract

This commit is contained in:
Rock Chin
2023-03-03 00:11:06 +08:00
+4 -4
View File
@@ -43,8 +43,8 @@ class ModelRequest():
"""将prompt dict转换成接口需要的格式""" """将prompt dict转换成接口需要的格式"""
return msg return msg
def ret_handle(self, ret): def ret_handle(self):
return ret return
def get_total_tokens(self): def get_total_tokens(self):
return self.ret['usage']['total_tokens'] return self.ret['usage']['total_tokens']
@@ -66,7 +66,7 @@ class ChatCompletionModel(ModelRequest):
def request(self, prompts, **kwargs): def request(self, prompts, **kwargs):
ret = self.request_fun(messages = self.__msg_handle__(prompts), **kwargs, user=self.user_name) ret = self.request_fun(messages = self.__msg_handle__(prompts), **kwargs, user=self.user_name)
self.ret = self.ret_handle(ret) self.ret_handle()
self.message = self.ret["choices"][0]["message"]['content'] self.message = self.ret["choices"][0]["message"]['content']
def __msg_handle__(self, msgs): def __msg_handle__(self, msgs):
@@ -88,7 +88,7 @@ class CompletionModel(ModelRequest):
def request(self, prompts, **kwargs): def request(self, prompts, **kwargs):
ret = self.request_fun(prompt = self.__msg_handle__(prompts), **kwargs) ret = self.request_fun(prompt = self.__msg_handle__(prompts), **kwargs)
self.ret = self.ret_handle(ret) self.ret_handle()
self.message = self.ret["choices"][0]["text"] self.message = self.ret["choices"][0]["text"]
def __msg_handle__(self, msgs): def __msg_handle__(self, msgs):