mirror of
https://github.com/langbot-app/LangBot.git
synced 2026-06-11 08:16:03 +00:00
feat: 删除oss相关代码
This commit is contained in:
@@ -26,18 +26,9 @@ class OpenAIChatCompletions(api.LLMAPIRequester):
|
||||
|
||||
requester_cfg: dict
|
||||
|
||||
cached_image_oss_url: dict[str, str] = {}
|
||||
"""缓存的OSS服务的图片URL
|
||||
|
||||
key: 前文message中的原图片URL(QQ图片)
|
||||
value: OSS服务的图片URL
|
||||
"""
|
||||
|
||||
def __init__(self, ap: app.Application):
|
||||
self.ap = ap
|
||||
|
||||
self.cached_image_oss_url = {}
|
||||
|
||||
self.requester_cfg = self.ap.provider_cfg.data['requester']['openai-chat-completions']
|
||||
|
||||
async def initialize(self):
|
||||
@@ -89,13 +80,11 @@ class OpenAIChatCompletions(api.LLMAPIRequester):
|
||||
messages = req_messages.copy()
|
||||
|
||||
# 检查vision
|
||||
if self.ap.oss_mgr.available():
|
||||
for msg in messages:
|
||||
if 'content' in msg and isinstance(msg["content"], list):
|
||||
for me in msg["content"]:
|
||||
if me["type"] == "image_url":
|
||||
# me["image_url"]['url'] = await self.get_oss_url(me["image_url"]['url'])
|
||||
me["image_url"]['url'] = await self.get_base64_str(me["image_url"]['url'])
|
||||
for msg in messages:
|
||||
if 'content' in msg and isinstance(msg["content"], list):
|
||||
for me in msg["content"]:
|
||||
if me["type"] == "image_url":
|
||||
me["image_url"]['url'] = await self.get_base64_str(me["image_url"]['url'])
|
||||
|
||||
args["messages"] = messages
|
||||
|
||||
@@ -135,20 +124,6 @@ class OpenAIChatCompletions(api.LLMAPIRequester):
|
||||
except openai.APIError as e:
|
||||
raise errors.RequesterError(f'请求错误: {e.message}')
|
||||
|
||||
async def get_oss_url(
|
||||
self,
|
||||
original_url: str,
|
||||
) -> str:
|
||||
|
||||
if original_url in self.cached_image_oss_url:
|
||||
return self.cached_image_oss_url[original_url]
|
||||
|
||||
oss_url = await self.ap.oss_mgr.upload_url_image(original_url)
|
||||
|
||||
self.cached_image_oss_url[original_url] = oss_url
|
||||
|
||||
return oss_url
|
||||
|
||||
async def get_base64_str(
|
||||
self,
|
||||
original_url: str,
|
||||
|
||||
@@ -38,10 +38,6 @@ class ModelManager:
|
||||
|
||||
async def initialize(self):
|
||||
|
||||
# 检查是否启用了vision但是没有配置oss
|
||||
if self.ap.provider_cfg.data['enable-vision'] and not self.ap.oss_mgr.available():
|
||||
self.ap.logger.warn("启用了视觉但是没有配置可用的oss服务,基于 URL 传递图片的视觉 API 将无法正常使用")
|
||||
|
||||
# 初始化token_mgr, requester
|
||||
for k, v in self.ap.provider_cfg.data['keys'].items():
|
||||
self.token_mgrs[k] = token.TokenManager(k, v)
|
||||
|
||||
Reference in New Issue
Block a user