mirror of
https://github.com/langbot-app/LangBot.git
synced 2025-11-25 11:29:39 +08:00
perf(modelmgr.py): 类名称强调其为一个请求对象
This commit is contained in:
@@ -5,7 +5,7 @@ import openai
|
|||||||
import pkg.openai.keymgr
|
import pkg.openai.keymgr
|
||||||
import pkg.utils.context
|
import pkg.utils.context
|
||||||
import pkg.audit.gatherer
|
import pkg.audit.gatherer
|
||||||
from pkg.openai.modelmgr import Model, ChatCompletionModel, OpenaiModel
|
from pkg.openai.modelmgr import ModelRequest, create_openai_model_request
|
||||||
|
|
||||||
# 为其他模块提供与OpenAI交互的接口
|
# 为其他模块提供与OpenAI交互的接口
|
||||||
class OpenAIInteract:
|
class OpenAIInteract:
|
||||||
@@ -35,7 +35,7 @@ class OpenAIInteract:
|
|||||||
def request_completion(self, messages):
|
def request_completion(self, messages):
|
||||||
config = pkg.utils.context.get_config()
|
config = pkg.utils.context.get_config()
|
||||||
|
|
||||||
ai:Model = OpenaiModel(config.completion_api_params['model'], 'user')
|
ai:ModelRequest = create_openai_model_request(config.completion_api_params['model'], 'user')
|
||||||
ai.request(
|
ai.request(
|
||||||
messages,
|
messages,
|
||||||
**config.completion_api_params
|
**config.completion_api_params
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ IMAGE_MODELS = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
class Model():
|
class ModelRequest():
|
||||||
|
|
||||||
can_chat = False
|
can_chat = False
|
||||||
|
|
||||||
@@ -62,7 +62,7 @@ class Model():
|
|||||||
return self.ret
|
return self.ret
|
||||||
|
|
||||||
|
|
||||||
class ChatCompletionModel(Model):
|
class ChatCompletionModel(ModelRequest):
|
||||||
"""ChatCompletion接口实现"""
|
"""ChatCompletion接口实现"""
|
||||||
Chat_role = ['system', 'user', 'assistant']
|
Chat_role = ['system', 'user', 'assistant']
|
||||||
def __init__(self, model_name, user_name):
|
def __init__(self, model_name, user_name):
|
||||||
@@ -87,7 +87,7 @@ class ChatCompletionModel(Model):
|
|||||||
return self.message
|
return self.message
|
||||||
|
|
||||||
|
|
||||||
class CompletionModel(Model):
|
class CompletionModel(ModelRequest):
|
||||||
"""Completion接口实现"""
|
"""Completion接口实现"""
|
||||||
def __init__(self, model_name, user_name):
|
def __init__(self, model_name, user_name):
|
||||||
request_fun = openai.Completion.create
|
request_fun = openai.Completion.create
|
||||||
@@ -111,7 +111,8 @@ class CompletionModel(Model):
|
|||||||
return self.message
|
return self.message
|
||||||
|
|
||||||
|
|
||||||
def OpenaiModel(model_name:str, user_name='user'):
|
def create_openai_model_request(model_name: str, user_name: str = 'user') -> ModelRequest:
|
||||||
|
"""使用给定的模型名称创建模型请求对象"""
|
||||||
if model_name in CHAT_COMPLETION_MODELS:
|
if model_name in CHAT_COMPLETION_MODELS:
|
||||||
model = ChatCompletionModel(model_name, user_name)
|
model = ChatCompletionModel(model_name, user_name)
|
||||||
elif model_name in COMPLETION_MODELS:
|
elif model_name in COMPLETION_MODELS:
|
||||||
|
|||||||
@@ -94,8 +94,6 @@ class Session:
|
|||||||
|
|
||||||
prompt = {}
|
prompt = {}
|
||||||
|
|
||||||
import config
|
|
||||||
|
|
||||||
create_timestamp = 0
|
create_timestamp = 0
|
||||||
|
|
||||||
last_interact_timestamp = 0
|
last_interact_timestamp = 0
|
||||||
|
|||||||
Reference in New Issue
Block a user