Skip to content

Commit 3a1728c

Browse files
committed
feat: OpenAI图片模型
1 parent ddad340 commit 3a1728c

File tree

4 files changed

+134
-1
lines changed

4 files changed

+134
-1
lines changed
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
# coding=utf-8
2+
from typing import Dict
3+
4+
from common import forms
5+
from common.exception.app_exception import AppApiException
6+
from common.forms import BaseForm
7+
from setting.models_provider.base_model_provider import BaseModelCredential, ValidCode
8+
9+
10+
class OpenAIImageModelCredential(BaseForm, BaseModelCredential):
11+
api_base = forms.TextInputField('API 域名', required=True)
12+
api_key = forms.PasswordInputField('API Key', required=True)
13+
14+
def is_valid(self, model_type: str, model_name, model_credential: Dict[str, object], provider,
15+
raise_exception=False):
16+
model_type_list = provider.get_model_type_list()
17+
if not any(list(filter(lambda mt: mt.get('value') == model_type, model_type_list))):
18+
raise AppApiException(ValidCode.valid_error.value, f'{model_type} 模型类型不支持')
19+
20+
for key in ['api_base', 'api_key']:
21+
if key not in model_credential:
22+
if raise_exception:
23+
raise AppApiException(ValidCode.valid_error.value, f'{key} 字段为必填字段')
24+
else:
25+
return False
26+
try:
27+
model = provider.get_model(model_type, model_name, model_credential)
28+
model.check_auth()
29+
except Exception as e:
30+
if isinstance(e, AppApiException):
31+
raise e
32+
if raise_exception:
33+
raise AppApiException(ValidCode.valid_error.value, f'校验失败,请检查参数是否正确: {str(e)}')
34+
else:
35+
return False
36+
return True
37+
38+
def encryption_dict(self, model: Dict[str, object]):
39+
return {**model, 'api_key': super().encryption(model.get('api_key', ''))}
40+
41+
def get_model_params_setting_form(self, model_name):
42+
pass
Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
import base64
2+
import os
3+
from typing import Dict
4+
5+
from openai import OpenAI
6+
7+
from common.config.tokenizer_manage_config import TokenizerManage
8+
from setting.models_provider.base_model_provider import MaxKBBaseModel
9+
from setting.models_provider.impl.base_image import BaseImage
10+
11+
12+
def custom_get_token_ids(text: str):
13+
tokenizer = TokenizerManage.get_tokenizer()
14+
return tokenizer.encode(text)
15+
16+
17+
class OpenAIImage(MaxKBBaseModel, BaseImage):
18+
api_base: str
19+
api_key: str
20+
model: str
21+
22+
def __init__(self, **kwargs):
23+
super().__init__(**kwargs)
24+
self.api_key = kwargs.get('api_key')
25+
self.api_base = kwargs.get('api_base')
26+
27+
@staticmethod
28+
def new_instance(model_type, model_name, model_credential: Dict[str, object], **model_kwargs):
29+
optional_params = {}
30+
if 'max_tokens' in model_kwargs and model_kwargs['max_tokens'] is not None:
31+
optional_params['max_tokens'] = model_kwargs['max_tokens']
32+
if 'temperature' in model_kwargs and model_kwargs['temperature'] is not None:
33+
optional_params['temperature'] = model_kwargs['temperature']
34+
return OpenAIImage(
35+
model=model_name,
36+
api_base=model_credential.get('api_base'),
37+
api_key=model_credential.get('api_key'),
38+
**optional_params,
39+
)
40+
41+
def check_auth(self):
42+
client = OpenAI(
43+
base_url=self.api_base,
44+
api_key=self.api_key
45+
)
46+
response_list = client.models.with_raw_response.list()
47+
# print(response_list)
48+
# cwd = os.path.dirname(os.path.abspath(__file__))
49+
# with open(f'{cwd}/img_1.png', 'rb') as f:
50+
# self.image_understand(f, "一句话概述这个图片")
51+
52+
def image_understand(self, image_file, text):
53+
client = OpenAI(
54+
base_url=self.api_base,
55+
api_key=self.api_key
56+
)
57+
base64_image = base64.b64encode(image_file.read()).decode('utf-8')
58+
59+
response = client.chat.completions.create(
60+
model=self.model,
61+
messages=[
62+
{
63+
"role": "user",
64+
"content": [
65+
{
66+
"type": "text",
67+
"text": text,
68+
},
69+
{
70+
"type": "image_url",
71+
"image_url": {
72+
"url": f"data:image/jpeg;base64,{base64_image}"
73+
},
74+
},
75+
],
76+
}
77+
],
78+
)
79+
return response.choices[0].message.content
Loading

apps/setting/models_provider/impl/openai_model_provider/openai_model_provider.py

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,12 @@
1212
from setting.models_provider.base_model_provider import IModelProvider, ModelProvideInfo, ModelInfo, \
1313
ModelTypeConst, ModelInfoManage
1414
from setting.models_provider.impl.openai_model_provider.credential.embedding import OpenAIEmbeddingCredential
15+
from setting.models_provider.impl.openai_model_provider.credential.image import OpenAIImageModelCredential
1516
from setting.models_provider.impl.openai_model_provider.credential.llm import OpenAILLMModelCredential
1617
from setting.models_provider.impl.openai_model_provider.credential.stt import OpenAISTTModelCredential
1718
from setting.models_provider.impl.openai_model_provider.credential.tts import OpenAITTSModelCredential
1819
from setting.models_provider.impl.openai_model_provider.model.embedding import OpenAIEmbeddingModel
20+
from setting.models_provider.impl.openai_model_provider.model.image import OpenAIImage
1921
from setting.models_provider.impl.openai_model_provider.model.llm import OpenAIChatModel
2022
from setting.models_provider.impl.openai_model_provider.model.stt import OpenAISpeechToText
2123
from setting.models_provider.impl.openai_model_provider.model.tts import OpenAITextToSpeech
@@ -24,6 +26,7 @@
2426
openai_llm_model_credential = OpenAILLMModelCredential()
2527
openai_stt_model_credential = OpenAISTTModelCredential()
2628
openai_tts_model_credential = OpenAITTSModelCredential()
29+
openai_image_model_credential = OpenAIImageModelCredential()
2730
model_info_list = [
2831
ModelInfo('gpt-3.5-turbo', '最新的gpt-3.5-turbo,随OpenAI调整而更新', ModelTypeConst.LLM,
2932
openai_llm_model_credential, OpenAIChatModel
@@ -88,11 +91,20 @@
8891
OpenAIEmbeddingModel)
8992
]
9093

94+
model_info_image_list = [
95+
ModelInfo('gpt-4o', '最新的GPT-4o,比gpt-4-turbo更便宜、更快,随OpenAI调整而更新',
96+
ModelTypeConst.IMAGE, openai_image_model_credential,
97+
OpenAIImage),
98+
ModelInfo('gpt-4o-mini', '最新的gpt-4o-mini,比gpt-4o更便宜、更快,随OpenAI调整而更新',
99+
ModelTypeConst.IMAGE, openai_image_model_credential,
100+
OpenAIImage),
101+
]
102+
91103
model_info_manage = ModelInfoManage.builder().append_model_info_list(model_info_list).append_default_model_info(
92104
ModelInfo('gpt-3.5-turbo', '最新的gpt-3.5-turbo,随OpenAI调整而更新', ModelTypeConst.LLM,
93105
openai_llm_model_credential, OpenAIChatModel
94106
)).append_model_info_list(model_info_embedding_list).append_default_model_info(
95-
model_info_embedding_list[0]).build()
107+
model_info_embedding_list[0]).append_model_info_list(model_info_image_list).build()
96108

97109

98110
class OpenAIModelProvider(IModelProvider):

0 commit comments

Comments
 (0)