Merge pull request #26 from iidamie/dev

fix: Dev to Main

Author: iidamie

.dockerignore

@@ -4,3 +4,6 @@ docker-compose.yml
 README.MD
 .github
 vercel.json
+.releaserc.json
+CHANGELOG.md
+version.txt

.github/workflows/docker-image-dev.yml

@@ -16,41 +16,38 @@ jobs:
   semantic-release:
     runs-on: ubuntu-latest
     outputs:
-      new_version: ${{ steps.semantic.outputs.new_release_version }}
       new_release_published: ${{ steps.semantic.outputs.new_release_published }}
     steps:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0
           token: ${{ secrets.GH_TOKEN }}
 
-      - name: Setup Node.js for semantic-release
-        uses: actions/setup-node@v2
-        with:
-          node-version: '18'
-
       - name: Git Configuration
         run: |
           git config --global user.name "iidamie"
           git config --global user.email "iidamie@users.noreply.github.com"
 
-      - name: Install semantic-release
-        run: |
-          npm install -g \
-            semantic-release \
-            @semantic-release/git \
-            @semantic-release/changelog \
-            @semantic-release/exec
-
       - name: Semantic Release
         id: semantic
+        uses: cycjimmy/semantic-release-action@v4
+        with:
+          extra_plugins: |
+            @semantic-release/exec
+            @semantic-release/git
+            @semantic-release/changelog
         env:
           GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
-        run: semantic-release
+
+      - name: Debug Semantic Release Outputs
+        run: |
+          echo "New Version: ${{ steps.semantic.outputs.new_release_version }}"
+          echo "Release Published: ${{ steps.semantic.outputs.new_release_published }}"
 
   build-and-push:
     needs: semantic-release
     runs-on: ubuntu-latest
+    if: ${{ needs.semantic-release.outputs.new_release_published == 'true' }}  
     steps:
       - uses: actions/checkout@v2
 

.github/workflows/docker-image.yml

@@ -44,6 +44,11 @@ jobs:
           echo "New Version: ${{ steps.semantic.outputs.new_release_version }}"
           echo "Release Published: ${{ steps.semantic.outputs.new_release_published }}"
 
+      - name: Debug Semantic Release Outputs
+        run: |
+          echo "New Version: ${{ steps.semantic.outputs.new_release_version }}"
+          echo "Release Published: ${{ steps.semantic.outputs.new_release_published }}"
+
   build-and-push:
     needs: semantic-release
     runs-on: ubuntu-latest

CHANGELOG.md

@@ -1,3 +1,31 @@
+## [1.2.6-beta.4](https://github.com/iidamie/deepseek2api/compare/v1.2.6-beta.3...v1.2.6-beta.4) (2025-02-17)
+
+
+### Bug Fixes
+
+* 更新 .dockerignore ([b8faf0a](https://github.com/iidamie/deepseek2api/commit/b8faf0ae11c6d315c6f1e0ad4b21e6a0e63d0528))
+
+## [1.2.6-beta.3](https://github.com/iidamie/deepseek2api/compare/v1.2.6-beta.2...v1.2.6-beta.3) (2025-02-17)
+
+
+### Bug Fixes
+
+* 更新 app.py ([b2f181e](https://github.com/iidamie/deepseek2api/commit/b2f181ec02623c50c2bc3eb58c8bec072ab29f18))
+
+## [1.2.6-beta.2](https://github.com/iidamie/deepseek2api/compare/v1.2.6-beta.1...v1.2.6-beta.2) (2025-02-17)
+
+
+### Bug Fixes
+
+* 更新 app.py ([3bdd442](https://github.com/iidamie/deepseek2api/commit/3bdd442957486298c9bf4950e4d9b519b248a469))
+
+## [1.2.6-beta.1](https://github.com/iidamie/deepseek2api/compare/v1.2.5...v1.2.6-beta.1) (2025-02-17)
+
+
+### Bug Fixes
+
+* 更新 app.py ([faa167f](https://github.com/iidamie/deepseek2api/commit/faa167f29879a2561284c61f0e7e3a5aec3798a8))
+
 ## [1.2.5](https://github.com/iidamie/deepseek2api/compare/v1.2.4...v1.2.5) (2025-02-17)
 
 

app.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 import json
 import base64
 import time
@@ -70,7 +69,7 @@ def save_config(cfg):
 CONFIG = load_config()
 
 # -------------------------- 全局账号队列 --------------------------
-account_queue = []  # 维护所有可用账号（不在队列中的即为正在使用）
+account_queue = []  # 维护所有可用账号
 
 def init_account_queue():
     """初始化时从配置加载账号"""
@@ -462,7 +461,7 @@ def get_pow_response(request: Request, max_attempts=3):
     return None
 
 # ----------------------------------------------------------------------
-# (8) 路由：/v1/models（模拟 OpenAI 模型列表）
+# (8) 路由：/v1/models
 # ----------------------------------------------------------------------
 @app.get("/v1/models")
 def list_models():
@@ -500,7 +499,7 @@ def list_models():
     return JSONResponse(content=data, status_code=200)
 
 # ----------------------------------------------------------------------
-# (新增) 消息预处理函数，将多轮对话合并成最终 prompt
+# 消息预处理函数，将多轮对话合并成最终 prompt
 # ----------------------------------------------------------------------
 def messages_prepare(messages: list) -> str:
     """处理消息列表，合并连续相同角色的消息，并添加角色标签：
@@ -842,7 +841,7 @@ def index(request: Request):
     return templates.TemplateResponse("welcome.html", {"request": request})
 
 # ----------------------------------------------------------------------
-# 启动 FastAPI 应用（可用 uvicorn 启动）
+# 启动 FastAPI 应用
 # ----------------------------------------------------------------------
 if __name__ == '__main__':
     import uvicorn

version.txt

@@ -1 +1 @@
-1.2.5
+1.2.6-beta.4