49 Commits

Author SHA1 Message Date
Clivia
6483e64460 feat flask直接启动,解决部分机cpu占用过大问题 2024-03-08 21:34:03 +08:00
Clivia
07aa5ec83b feat simply flask run 2024-03-08 14:29:23 +08:00
Clivia
0f4ab22273 feat simply flask run 2024-03-08 14:28:37 +08:00
Clivia
ba4e89101f Update xyhelper-deploy.yml 2024-03-04 15:09:48 +08:00
Clivia
876417a9d1 Update ninja-image.yml 2024-03-04 15:09:29 +08:00
Yanyutin753
0564b10550 支持填错gpt-4-gizmo-XXX,回退成gpt-3.5-turbo 2024-03-04 14:53:01 +08:00
Clivia
148e96108c 优化部署说明 2024-03-04 09:40:57 +08:00
Clivia
afcca06c9d 修改部署说明 2024-03-03 23:45:50 +08:00
Clivia
f5b5592f66 修改部署说明 2024-02-27 22:54:38 +08:00
Clivia
81ff100e9c 优化部署说明 2024-02-27 22:46:17 +08:00
Clivia
256e6dbce6 fix gpts.json is not accessible 2024-02-27 17:28:04 +08:00
Clivia
7ce92ae642 优化请求 2024-02-26 21:52:23 +08:00
Clivia
d0cc050a51 优化部署说明 2024-02-26 15:36:22 +08:00
Clivia
05d5a1a13e 修改配置说明 2024-02-26 15:25:34 +08:00
Clivia
bd0e470427 适配GPTs 2024-02-26 14:42:54 +08:00
Clivia
3d3d939e3c 支持gpt-4-gizmo-XXX,动态配置GPTS 2024-02-26 14:13:27 +08:00
Yanyutin753
fa971cf108 支持动态适配gpts 2024-02-26 13:08:45 +08:00
Clivia
10ae0b415c 优化非流式回复空的问题 2024-02-22 00:04:26 +08:00
Clivia
b850592a57 修改部署说明 2024-02-21 18:51:12 +08:00
Clivia
719e6f83a9 Update start.sh 2024-02-21 18:50:15 +08:00
Clivia
c07d1f3268 更新 gpts.json 2024-02-20 10:00:02 +08:00
Clivia
33fb486c82 修改key_for_gpts_info 2024-02-20 01:18:14 +08:00
Clivia
6203fb3535 update KEY_FOR_GPTS_INFO 2024-02-20 01:05:35 +08:00
Clivia
b19586e24a 优化更新gpts的结构 2024-02-19 21:50:02 +08:00
Clivia
9f80493866 Update docker-compose.yml 2024-02-17 17:43:43 +08:00
Clivia
36eede643d Update docker-compose.yml 2024-02-17 17:42:46 +08:00
Clivia
6032546b5d Create ninja-image.yml 2024-02-17 17:41:44 +08:00
Clivia
7328dadefb Update xyhelper-deploy.yml 2024-02-17 17:41:09 +08:00
Clivia
b7e2af8afd Update and rename docker-deploy.yml to xyhelper-deploy.yml 2024-02-17 17:40:48 +08:00
Clivia
04c1599756 Update docker-deploy.yml 2024-02-17 17:38:22 +08:00
Clivia
06665924f6 更新自定义网址更新access_token失败 2024-02-17 02:07:11 +08:00
Clivia
6787069afb 修改部署说明 2024-02-13 18:05:32 +08:00
Clivia
abbdebc24e 修改部署说明 2024-02-11 23:41:50 +08:00
Clivia
e599e2a0cc 修改部署说明 2024-02-11 23:08:37 +08:00
Clivia
0c0dd0e8a7 新增部署说明 2024-02-11 21:32:03 +08:00
Clivia
5524ad2b11 更新部署配置 2024-02-11 21:26:55 +08:00
Clivia
ef27e47f91 项目将脱离ninja,需修改配置 2024-02-11 21:19:30 +08:00
Clivia
26539a0d79 项目将脱离ninja,需修改相应配置 2024-02-11 21:11:53 +08:00
Clivia
a3b5ae310c 修改部署说明 2024-02-11 20:57:09 +08:00
Clivia
c85a228fb9 增加xyhelper渠道 2024-02-11 20:55:23 +08:00
Clivia
4a7338637d 添加xyhelper渠道刷新refresh_token为access_token 2024-02-11 20:54:28 +08:00
Clivia
d02e2d0eb1 Update main.py 2024-02-11 20:52:57 +08:00
Clivia
ebd3c3974f 修改部署说明 2024-02-11 20:04:06 +08:00
Clivia
ab88debcf3 修改部署说明 2024-02-11 19:57:23 +08:00
Clivia
73b14891dd 适配xyhelper的免费接口 2024-02-11 19:56:26 +08:00
Clivia
1f50b3d3a9 修改xyhelper免费部署说明 2024-02-11 19:55:13 +08:00
Clivia
227781a12c 部署说明 2024-02-11 11:11:01 +08:00
Clivia
f06821d54f Update main.py 2024-02-09 15:48:28 +08:00
Clivia
3637133b2e 增加请求头 2024-02-09 15:42:55 +08:00
10 changed files with 157 additions and 80 deletions

47
.github/workflows/xyhelper-deploy.yml vendored Normal file
View File

@@ -0,0 +1,47 @@
name: xyhelper Build and Push Docker Image
on:
release:
types: [created]
workflow_dispatch:
inputs:
tag:
description: 'Tag Name'
required: true
jobs:
build-and-push:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
- name: Login to Docker Hub
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_PASSWORD }}
- name: Set tag name
id: tag_name
run: |
if [ "${{ github.event_name }}" = "release" ]; then
echo "::set-output name=tag::${GITHUB_REF#refs/tags/}"
elif [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
echo "::set-output name=tag::${{ github.event.inputs.tag }}"
fi
- name: Build and push Docker image with Release tag
uses: docker/build-push-action@v2
with:
context: .
file: ./Dockerfile
push: true
tags: |
yangclivia/pandora-to-api:${{ steps.tag_name.outputs.tag }}
yangclivia/pandora-to-api:0.7.8
platforms: linux/amd64,linux/arm64
build-args: TARGETPLATFORM=${{ matrix.platform }}

5
.gitignore vendored Normal file
View File

@@ -0,0 +1,5 @@
*.json
*.log
*.json
*.log

6
.idea/encodings.xml generated Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding">
<file url="file://$PROJECT_DIR$/log/access.log" charset="GBK" />
</component>
</project>

View File

@@ -1,20 +1,28 @@
## 0.7.7 ninja版本项目简介
![Docker Image Size (tag)](https://img.shields.io/docker/image-size/yangclivia/pandora-to-api/0.7.7)![Docker Pulls](https://img.shields.io/docker/pulls/yangclivia/pandora-to-api)[![GitHub Repo stars](https://img.shields.io/github/stars/Yanyutin753/RefreshToV1Api?style=social)](https://github.com/Yanyutin753/refresh-gpt-chat/stargazers)
## 0.7.8 xyhelper项目简介
![Docker Image Size (tag)](https://img.shields.io/docker/image-size/yangclivia/pandora-to-api/0.7.8)![Docker Pulls](https://img.shields.io/docker/pulls/yangclivia/pandora-to-api)[![GitHub Repo stars](https://img.shields.io/github/stars/Yanyutin753/RefreshToV1Api?style=social)](https://github.com/Yanyutin753/refresh-gpt-chat/stargazers)
> [!IMPORTANT]
>
> Respect Zhile大佬 , Respect Wizerd
> Respect `xyhelper` ,Respect `ninja` , Respect `Wizerd`
感谢pandoraNext和Wizerd的付出敬礼
感谢xyhelper、ninja和Wizerd大佬们的付出,敬礼!!!
本项目支持:
1.ninja `proxy` 模式下的 `backend-api` 转为 `/v1/chat/completions` 接口,支持流式和非流式响应。
1.xyhelper `proxy` 模式下的 `backend-api免费接口` 转为 `/v1/chat/completions` 接口,支持流式和非流式响应。
2.ninja `proxy` 模式下的 `backend-api` 转为 `/v1/images/generations` 接口
2.xyhelper `proxy` 模式下的 `backend-api免费接口` 转为 `/v1/images/generations` 接口
3. 支持直接把refresh_token作为请求key方便接入one_api
4. 支持 gpt-4-mobile 、gpt-4-s 、基本所有的GPTS
4. 支持 gpt-4-mobile 、gpt-4-s 、动态支持所有的gpt-4-gizmo-XXX模型
* **xyhelper 的 免费 backend-api 接口,无需打码**
* **xyhelper接口每分钟最多请求30次介意请绕行**
* 我是开发者,我想自行修改功能->前往源码库 https://github.com/xyhelper/chatgpt-mirror-server
* 我没服务器,也没有官网账号,只想使用->前往官网购买我们运营的会员服务 https://www.xyhelper.com.cn
* 我想做商业用途,我想自己运营->老板里面请 https://www.xyhelper.com.cn/access
* 我有服务器,我想自己部署->请继续阅读本文档(有条件的话给个star吧)
如果本项目对你有帮助的话,请点个小星星吧~
@@ -34,7 +42,7 @@
- [x] 支持 gpt-3.5-turbo
- [x] 支持 动态gpts
- [x] 支持 gpts
- [x] 支持 流式输出
@@ -59,13 +67,13 @@
## 注意
> [!CAUTION]
> 1. 本项目的运行需要 ninja
> 1. 本项目的运行需要 xyhelper 的免费接口
>
> 2. 本项目实际为将来自 `/v1/chat/completions` 的请求转发到ninja的 `/backend-api/conversation` 接口,因此本项目并不支持高并发操作,请不要接入如 `沉浸式翻译` 等高并发项目。
> 2. 本项目实际为将来自 `/v1/chat/completions` 的请求转发到xyhelper免费接口的 `/backend-api/conversation` 接口,因此本项目并不支持高并发操作,请不要接入如 `沉浸式翻译` 等高并发项目。
>
> 3. 本项目支持使用apple平台的refresh_token作为请求key.
>
> 4. 本项目并不能绕过 OpenAI 和 ninja 官方的限制,只提供便利,不提供绕过。
> 4. 本项目并不能绕过 OpenAI 和 xyhelper 官方的限制,只提供便利,不提供绕过。
>
> 5. 提问的艺术:当出现项目不能正常运行时,请携带 `DEBUG` 级别的日志在 `Issue` 或者社区群内提问,否则将开启算命模式~
@@ -91,13 +99,13 @@
- `need_log_to_file`: 用于设置是否需要将日志输出到文件,可选值为:`true``false`,默认为 `true`,日志文件路径为:`./log/access.log`,默认每天会自动分割日志文件。
- `process_workers`: 用于设置进程数,如果不需要设置,可以保持不变,如果需要设置,可以设置为需要设置的值,如果设置`1`,则会强制设置为单进程模式
- `process_workers`: 用于设置进程数,如果不需要设置,可以保持不变,如果需要设置,可以设置为需要设置的值,默认`2`
- `process_threads`: 用于设置线程数,如果不需要设置,可以保持不变,如果需要设置,可以设置为需要设置的值,如果设置`1`,则会强制设置为单线程模式
- `process_threads`: 用于设置线程数,如果不需要设置,可以保持不变,如果需要设置,可以设置为需要设置的值,默认`2`
- `upstream_base_url`: ninja 的部署地址,如:`https://pandoranext.com`,注意:不要以 `/` 结尾。可以填写为本项目可以访问到的 PandoraNext 的内网地址。
- `upstream_base_url`: xyhelper 的免费接口地址,如:`https://demo.xyhelper.cn`,注意:不要以 `/` 结尾。
- `upstream_api_prefix`: PandoraNext Proxy 模式下的 API 前缀
- `upstream_api_prefix`: 默认为""
- `backend_container_url`: 用于dalle模型生成图片的时候展示所用需要设置为使用如 [ChatGPT-Next-Web](https://github.com/ChatGPTNextWebTeam/ChatGPT-Next-Web) 的用户可以访问到的本项目地址,如:`http://1.2.3.4:50011`,同原环境变量中的 `UPLOAD_BASE_URL`
@@ -143,7 +151,8 @@ PS. 注意arkose_urls中的地址需要支持PandoraNext的Arkose Token获取
- `enableOai`:用于设置是否使用官网通过refresh_token刷新access_token仅在 `enableOai``true` 时生效。
- `ninja_refreshToAccess_Url`:用于设置使用ninja来进行使用refresh_token刷新access_token,enableOai为false的时候必填
- `xyhelper_refreshToAccess_Url`:用于设置使用xyhelper来进行使用refresh_token刷新access_token,enableOai为false的时候必填
- 默认为"https://demo.xyhelper.cn/applelogin"
- `redis`
@@ -176,7 +185,7 @@ PS. 注意arkose_urls中的地址需要支持PandoraNext的Arkose Token获取
}
```
2. 直接请求的时候加上相应的gpt-4-gizmo-XXXXXX等同于上面的id的值
2. 直接请求的时候加上相应的gpt-4-gizmo-XXX
```json
{
"stream":true,
@@ -193,7 +202,7 @@ PS. 注意arkose_urls中的地址需要支持PandoraNext的Arkose Token获取
请求方式:`POST`
请求头:正常携带 `Authorization``Content-Type` 即可,`Authorization` 的值为 `Bearer <ninja 的 fk>``Content-Type` 的值为 `application/json`
请求头:正常携带 `Authorization``Content-Type` 即可,`Authorization` 的值为 `Bearer <refresh_token>``Content-Type` 的值为 `application/json`
请求体格式示例:
@@ -394,4 +403,4 @@ services:
## Star History
[![Star History Chart](https://api.star-history.com/svg?repos=Yanyutin753/ninjaToV1Api_refresh&type=Date)](https://star-history.com/#Yanyutin753/ninjaToV1Api_refresh&Date)
[![Star History Chart](https://api.star-history.com/svg?repos=Yanyutin753/xyhelperV1Api_refresh&type=Date)](https://star-history.com/#Yanyutin753/xyhelperV1Api_refresh&Date)

View File

@@ -4,7 +4,7 @@
"process_workers": 2,
"process_threads": 2,
"proxy": "",
"upstream_base_url": "",
"upstream_base_url": "https://demo.xyhelper.cn",
"upstream_api_prefix": "",
"backend_container_url": "",
"backend_container_api_prefix": "",
@@ -26,8 +26,8 @@
},
"refresh_ToAccess": {
"stream_sleep_time": 0,
"enableOai":"true",
"ninja_refreshToAccess_Url": ""
"enableOai":"false",
"xyhelper_refreshToAccess_Url": "https://demo.xyhelper.cn/applelogin"
},
"redis": {
"host": "redis",

View File

@@ -1,5 +1 @@
{
"gpt-4-classic": {
"id":"g-YyyyMT9XH-chatgpt-classic"
}
}
{}

View File

@@ -2,7 +2,7 @@ version: '3'
services:
backend-to-api:
image: yangclivia/pandora-to-api:0.7.7
image: yangclivia/pandora-to-api:0.7.8
restart: always
ports:
- "50011:33333"

0
log/access.log Normal file
View File

115
main.py
View File

@@ -62,10 +62,10 @@ BOT_MODE_ENABLED_CODE_BLOCK_OUTPUT = BOT_MODE.get('enabled_plugin_output', 'fals
BOT_MODE_ENABLED_PLAIN_IMAGE_URL_OUTPUT = BOT_MODE.get('enabled_plain_image_url_output', 'false').lower() == 'true'
# ninjaToV1Api_refresh
# xyhelperToV1Api_refresh
REFRESH_TOACCESS = CONFIG.get('refresh_ToAccess', {})
REFRESH_TOACCESS_ENABLEOAI = REFRESH_TOACCESS.get('enableOai', 'true').lower() == 'true'
REFRESH_TOACCESS_NINJA_REFRESHTOACCESS_URL = REFRESH_TOACCESS.get('ninja_refreshToAccess_Url', '')
REFRESH_TOACCESS_XYHELPER_REFRESHTOACCESS_URL = REFRESH_TOACCESS.get('xyhelper_refreshToAccess_Url', '')
STEAM_SLEEP_TIME = REFRESH_TOACCESS.get('steam_sleep_time', 0)
NEED_DELETE_CONVERSATION_AFTER_RESPONSE = CONFIG.get('need_delete_conversation_after_response',
@@ -198,12 +198,15 @@ def oaiGetAccessToken(refresh_token):
return None
# ninja获得access_token
def ninjaGetAccessToken(getAccessTokenUrl, refresh_token):
# xyhelper获得access_token
def xyhelperGetAccessToken(getAccessTokenUrl, refresh_token):
try:
logger.info("将通过这个网址请求access_token" + getAccessTokenUrl)
headers = {"Authorization": "Bearer " + refresh_token}
response = requests.post(getAccessTokenUrl, headers=headers)
data = {
'refresh_token': refresh_token,
}
response = requests.post(getAccessTokenUrl, data=data)
if not response.ok:
logger.error("Request 失败: " + response.text.strip())
return None
@@ -227,7 +230,7 @@ def updateGptsKey():
if REFRESH_TOACCESS_ENABLEOAI:
access_token = oaiGetAccessToken(KEY_FOR_GPTS_INFO)
else:
access_token = ninjaGetAccessToken(REFRESH_TOACCESS_NINJA_REFRESHTOACCESS_URL, KEY_FOR_GPTS_INFO)
access_token = xyhelperGetAccessToken(REFRESH_TOACCESS_XYHELPER_REFRESHTOACCESS_URL, KEY_FOR_GPTS_INFO)
if access_token.startswith("eyJhb"):
KEY_FOR_GPTS_INFO_ACCESS_TOKEN = access_token
logging.info("KEY_FOR_GPTS_INFO_ACCESS_TOKEN被更新:" + KEY_FOR_GPTS_INFO_ACCESS_TOKEN)
@@ -252,7 +255,7 @@ def fetch_gizmo_info(base_url, proxy_api_prefix, model_id):
# 将配置添加到全局列表
def add_config_to_global_list(base_url, proxy_api_prefix, gpts_data):
global gpts_configurations
updateGptsKey()
updateGptsKey() # cSpell:ignore Gpts
# print(f"gpts_data: {gpts_data}")
for model_name, model_info in gpts_data.items():
# print(f"model_name: {model_name}")
@@ -268,12 +271,11 @@ def add_config_to_global_list(base_url, proxy_api_prefix, gpts_data):
else:
logger.info(f"Fetching gpts info for {model_name}, {model_id}")
gizmo_info = fetch_gizmo_info(base_url, proxy_api_prefix, model_id)
# 如果成功获取到数据,则将其存入 Redis
if gizmo_info:
redis_client.set(model_id, str(gizmo_info))
logger.info(f"Cached gizmo info for {model_name}, {model_id}")
# 检查模型名称是否已经在列表中
if gizmo_info and not any(d['name'] == model_name for d in gpts_configurations):
gpts_configurations.append({
@@ -285,7 +287,6 @@ def add_config_to_global_list(base_url, proxy_api_prefix, gpts_data):
logger.info(f"Model already exists in the list, skipping...")
def generate_gpts_payload(model, messages):
model_config = find_model_config(model)
if model_config:
@@ -321,9 +322,11 @@ scheduler.start()
# PANDORA_UPLOAD_URL = 'files.pandoranext.com'
VERSION = '0.7.7.3'
VERSION = '0.7.8.3'
# VERSION = 'test'
UPDATE_INFO = 'flask直接启动解决部分机cpu占用过大问题'
# UPDATE_INFO = '【仅供临时测试使用】 '
# 解析响应中的信息
@@ -402,7 +405,7 @@ with app.app_context():
logger.info(f"REFRESH_TOACCESS_ENABLEOAI: {REFRESH_TOACCESS_ENABLEOAI}")
if not REFRESH_TOACCESS_ENABLEOAI:
logger.info(f"REFRESH_TOACCESS_NINJA_REFRESHTOACCESS_URL: {REFRESH_TOACCESS_NINJA_REFRESHTOACCESS_URL}")
logger.info(f"REFRESH_TOACCESS_XYHELPER_REFRESHTOACCESS_URL: {REFRESH_TOACCESS_XYHELPER_REFRESHTOACCESS_URL}")
if BOT_MODE_ENABLED:
logger.info(f"enabled_markdown_image_output: {BOT_MODE_ENABLED_MARKDOWN_IMAGE_OUTPUT}")
@@ -410,10 +413,10 @@ with app.app_context():
logger.info(f"enabled_bing_reference_output: {BOT_MODE_ENABLED_BING_REFERENCE_OUTPUT}")
logger.info(f"enabled_plugin_output: {BOT_MODE_ENABLED_CODE_BLOCK_OUTPUT}")
# ninjaToV1Api_refresh
# xyhelperToV1Api_refresh
logger.info(f"REFRESH_TOACCESS_ENABLEOAI: {REFRESH_TOACCESS_ENABLEOAI}")
logger.info(f"REFRESH_TOACCESS_NINJA_REFRESHTOACCESS_URL: {REFRESH_TOACCESS_NINJA_REFRESHTOACCESS_URL}")
logger.info(f"REFRESH_TOACCESS_XYHELPER_REFRESHTOACCESS_URL: {REFRESH_TOACCESS_XYHELPER_REFRESHTOACCESS_URL}")
logger.info(f"STEAM_SLEEP_TIME: {STEAM_SLEEP_TIME}")
if not BASE_URL:
@@ -867,8 +870,8 @@ def send_text_prompt_and_get_response(messages, api_key, stream, model):
ori_model_name = model_config.get('ori_name', model)
logger.info(f"原模型名: {ori_model_name}")
else:
logger.info(f"请求模型名: {model}")
ori_model_name = model
logger.info(f"请求模型名: {model}")
if ori_model_name == 'gpt-4-s':
payload = {
# 构建 payload
@@ -965,7 +968,8 @@ def send_text_prompt_and_get_response(messages, api_key, stream, model):
"force_paragen": False,
"force_rate_limit": False
}
logger.debug('KEY_FOR_GPTS_INFO is not accessible')
logger.debug('KEY_FOR_GPTS_INFO Or Request Model is not accessible')
else:
payload = generate_gpts_payload(model, formatted_messages)
if not payload:
@@ -1141,7 +1145,7 @@ def replace_sandbox(text, conversation_id, message_id, api_key):
sandbox_path = match.group(1)
download_url = get_download_url(conversation_id, message_id, sandbox_path)
if download_url == None:
return "\n```\nError: 沙箱文件下载失败,这可能是因为您启用了隐私模式\n```"
return "\n```\nError: 沙箱文件下载失败,这可能是因为您的帐号启用了隐私模式\n```"
file_name = extract_filename(download_url)
timestamped_file_name = timestamp_filename(file_name)
if USE_OAIUSERCONTENT_URL == False:
@@ -2298,6 +2302,8 @@ def chat_completions():
accessible_model_list = get_accessible_model_list()
if model not in accessible_model_list and not 'gpt-4-gizmo-' in model:
return jsonify({"error": "model is not accessible"}), 401
elif 'gpt-4-gizmo-' in model and not KEY_FOR_GPTS_INFO:
return jsonify({"error": "key_for_gpts_info is not accessible"}), 400
stream = data.get('stream', False)
@@ -2314,7 +2320,7 @@ def chat_completions():
if REFRESH_TOACCESS_ENABLEOAI:
api_key = oaiGetAccessToken(api_key)
else:
api_key = ninjaGetAccessToken(REFRESH_TOACCESS_NINJA_REFRESHTOACCESS_URL, api_key)
api_key = xyhelperGetAccessToken(REFRESH_TOACCESS_XYHELPER_REFRESHTOACCESS_URL, api_key)
if not api_key.startswith("eyJhb"):
return jsonify({"error": "refresh_token is wrong or refresh_token url is wrong!"}), 401
add_to_dict(refresh_token, api_key)
@@ -2416,32 +2422,36 @@ def chat_completions():
ori_model_name = model_config.get('ori_name', model)
input_tokens = count_total_input_words(messages, ori_model_name)
comp_tokens = count_tokens(all_new_text, ori_model_name)
response_json = {
"id": generate_unique_id("chatcmpl"),
"object": "chat.completion",
"created": int(time.time()), # 使用当前时间戳
"model": model, # 使用请求中指定的模型
"choices": [
{
"index": 0,
"message": {
"role": "assistant",
"content": all_new_text # 使用累积的文本
},
"finish_reason": "stop"
}
],
"usage": {
# 这里的 token 计数需要根据实际情况计算
"prompt_tokens": input_tokens,
"completion_tokens": comp_tokens,
"total_tokens": input_tokens + comp_tokens
},
"system_fingerprint": None
}
# 返回 JSON 响应
return jsonify(response_json)
if input_tokens >= 100 and comp_tokens <= 0:
# 返回错误消息和状态码429
error_response = {"error": "空回复"}
return jsonify(error_response), 429
else:
response_json = {
"id": generate_unique_id("chatcmpl"),
"object": "chat.completion",
"created": int(time.time()), # 使用当前时间戳
"model": model, # 使用请求中指定的模型
"choices": [
{
"index": 0,
"message": {
"role": "assistant",
"content": all_new_text # 使用累积的文本
},
"finish_reason": "stop"
}
],
"usage": {
# 这里的 token 计数需要根据实际情况计算
"prompt_tokens": input_tokens,
"completion_tokens": comp_tokens,
"total_tokens": input_tokens + comp_tokens
},
"system_fingerprint": None
}
# 返回 JSON 响应
return jsonify(response_json)
else:
return Response(generate(), mimetype='text/event-stream')
@@ -2456,6 +2466,8 @@ def images_generations():
accessible_model_list = get_accessible_model_list()
if model not in accessible_model_list and not 'gpt-4-gizmo-' in model:
return jsonify({"error": "model is not accessible"}), 401
elif 'gpt-4-gizmo-' in model and not KEY_FOR_GPTS_INFO:
return jsonify({"error": "key_for_gpts_info is not accessible"}), 400
prompt = data.get('prompt', '')
@@ -2479,7 +2491,7 @@ def images_generations():
refresh_token = api_key
api_key = oaiGetAccessToken(api_key)
else:
api_key = ninjaGetAccessToken(REFRESH_TOACCESS_NINJA_REFRESHTOACCESS_URL, api_key)
api_key = xyhelperGetAccessToken(REFRESH_TOACCESS_XYHELPER_REFRESHTOACCESS_URL, api_key)
if not api_key.startswith("eyJhb"):
return jsonify({"error": "refresh_token is wrong or refresh_token url is wrong!"}), 401
add_to_dict(refresh_token, api_key)
@@ -2659,7 +2671,7 @@ def updateRefresh_dict():
if REFRESH_TOACCESS_ENABLEOAI:
access_token = oaiGetAccessToken(key)
else:
access_token = ninjaGetAccessToken(REFRESH_TOACCESS_NINJA_REFRESHTOACCESS_URL, key)
access_token = xyhelperGetAccessToken(REFRESH_TOACCESS_XYHELPER_REFRESHTOACCESS_URL, key)
if not access_token.startswith("eyJhb"):
logger.debug("refresh_token is wrong or refresh_token url is wrong!")
error_num += 1
@@ -2667,17 +2679,18 @@ def updateRefresh_dict():
success_num += 1
logging.info("更新成功: " + str(success_num) + ", 失败: " + str(error_num))
logger.info(f"==========================================")
logging.info("开始更新KEY_FOR_GPTS_INFO_ACCESS_TOKEN和GPTS配置信息......")
logging.info("开始更新KEY_FOR_GPTS_INFO_ACCESS_TOKEN和GPTS配置信息.......")
# 加载配置并添加到全局列表
gpts_data = load_gpts_config("./data/gpts.json")
add_config_to_global_list(BASE_URL, PROXY_API_PREFIX, gpts_data)
accessible_model_list = get_accessible_model_list()
logger.info(f"当前可用 GPTS 列表: {accessible_model_list}")
# 检查列表中是否有重复的模型名称
if len(accessible_model_list) != len(set(accessible_model_list)):
raise Exception("检测到重复的模型名称,请检查环境变量或配置文件")
raise Exception("检测到重复的模型名称,请检查环境变量或配置文件......")
logging.info("更新KEY_FOR_GPTS_INFO_ACCESS_TOKEN和GPTS配置信息成功......")
logger.info(f"当前可用 GPTS 列表: {accessible_model_list}")
logger.info(f"==========================================")

View File

@@ -11,7 +11,7 @@ if [ -z "$PROCESS_WORKERS" ]; then
export PROCESS_WORKERS
if [ -z "$PROCESS_WORKERS" ]; then
PROCESS_WORKERS=1
PROCESS_WORKERS=2
fi
fi
@@ -32,3 +32,4 @@ echo "PROCESS_THREADS: ${PROCESS_THREADS}"
# 启动 Gunicorn 并使用 tee 命令同时输出日志到文件和控制台
exec gunicorn -w ${PROCESS_WORKERS} --threads ${PROCESS_THREADS} --bind 0.0.0.0:33333 main:app --access-logfile - --error-logfile - --timeout 60