kaiyuan/chatgpt-on-wechat
1
0
Fork 0
mirror of https://github.com/zhayujie/chatgpt-on-wechat.git synced 2026-07-21 06:07:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(openai): drop SDK dependency and switch to native HTTP client

Browse Source
This commit is contained in:
zhayujie
2026-04-27 20:21:54 +08:00
parent 5c65196e44
commit 8752f0cc60
8 changed files with 920 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
models/openai/open_ai_image.py
View File

@@ -1,17 +1,25 @@
import time
import openai
from models.openai.openai_compat import RateLimitError
from common.log import logger
from common.token_bucket import TokenBucket
from config import conf
from models.openai.openai_compat import RateLimitError, wrap_http_error
from models.openai.openai_http_client import OpenAIHTTPClient, OpenAIHTTPError
# OPENAI提供的画图接口
# OpenAI image generation API wrapper
class OpenAIImage(object):
def __init__(self):
openai.api_key = conf().get("open_ai_api_key")
# Lazy default client; subclasses (ChatGPTBot/OpenAIBot) typically
# construct their own _http_client and override _get_image_client().
self._image_api_key = conf().get("open_ai_api_key")
self._image_api_base = conf().get("open_ai_api_base") or None
self._image_proxy = conf().get("proxy") or None
self._image_client = OpenAIHTTPClient(
api_key=self._image_api_key,
api_base=self._image_api_base,
proxy=self._image_proxy,
)
if conf().get("rate_limit_dalle"):
self.tb4dalle = TokenBucket(conf().get("rate_limit_dalle", 50))
@@ -20,24 +28,35 @@ class OpenAIImage(object):
if conf().get("rate_limit_dalle") and not self.tb4dalle.get_token():
return False, "请求太快了，请休息一下再问我吧"
logger.info("[OPEN_AI] image_query={}".format(query))
response = openai.Image.create(
api_key=api_key,
prompt=query, # 图片描述
n=1, # 每次生成图片的数量
response = self._image_client.images_generate(
api_key=api_key or None,
api_base=api_base or None,
prompt=query, # image description
n=1,
model=conf().get("text_to_image") or "dall-e-2",
# size=conf().get("image_create_size", "256x256"), # 图片大小,可选有 256x256, 512x512, 1024x1024
# size=conf().get("image_create_size", "256x256"),
)
image_url = response["data"][0]["url"]
logger.info("[OPEN_AI] image_url={}".format(image_url))
return True, image_url
except OpenAIHTTPError as http_err:
mapped = wrap_http_error(http_err)
if isinstance(mapped, RateLimitError):
logger.warn(mapped)
if retry_count < 1:
time.sleep(5)
logger.warn("[OPEN_AI] ImgCreate RateLimit exceed, 第{}次重试".format(retry_count + 1))
return self.create_img(query, retry_count + 1)
return False, "画图出现问题，请休息一下再问我吧"
logger.exception(mapped)
return False, "画图出现问题，请休息一下再问我吧"
except RateLimitError as e:
logger.warn(e)
if retry_count < 1:
time.sleep(5)
logger.warn("[OPEN_AI] ImgCreate RateLimit exceed, 第{}次重试".format(retry_count + 1))
return self.create_img(query, retry_count + 1)
else:
return False, "画图出现问题，请休息一下再问我吧"
return False, "画图出现问题，请休息一下再问我吧"
except Exception as e:
logger.exception(e)
return False, "画图出现问题，请休息一下再问我吧"