Merge branch 'main' into aio_beta

Author: shinonomeow

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -6,8 +6,8 @@ body:
   - type: markdown
     attributes:
       value: |
-        描述问题前，请先更新到最新版本。2.5 之前的版本升级请参考 [升级指南](https://www.autobangumi.org/changelog/2.6.html#如何从老版本更新的注意事项)
-        请确认以下信息，如果你的问题可以直接在文档中找到，那么你的 issue 将会被直接关闭。
+        描述问题前，请先更新到最新版本。
+        请确认以下信息，如果你没有完成以下检查，那么你的 issue 将会被直接关闭。
         解析器问题请转到[专用模板](https://github.com/EstrellaXD/Auto_Bangumi/issues/new?assignees=&labels=bug&template=parser_bug.yml&title=%5B解析器错误%5D)，
         重命名问题请到[专用模板](https://github.com/EstrellaXD/Auto_Bangumi/issues/new?assignees=&labels=bug&template=rename_bug.yml&title=%5B重命名错误%5D)
   - type: checkboxes
@@ -18,13 +18,11 @@ body:
       options:
         - label: 我的版本是最新版本，我的版本号与 [version](https://github.com/EstrellaXD/Auto_Bangumi/releases/latest) 相同。
           required: true
-        - label: 我已经查阅了[排错流程](https://autobangumi.org/faq/排错流程.html)，确保提出的问题不在其中。
-          required: true
-        - label: 我已经查阅了[已知问题](https://autobangumi.org/faq/常见问题.html)，并确认我的问题不在其中。
+        - label: 我已经查阅了[已知问题](https://autobangumi.org/faq/)，并确认我的问题不在其中。
           required: true
         - label: 我已经 [issue](https://github.com/EstrellaXD/Auto_Bangumi/issues) 中搜索过，确认我的问题没有被提出过。
           required: true
-        - label: 我已经修改标题，将标题中的 描述 替换为我遇到的问题。
+        - label: 我已经修改标题，将标题中的 **描述** 替换为我遇到的问题。
           required: true
   - type: input
     id: version

.github/workflows/build.yml

@@ -12,7 +12,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python 3.11
         uses: actions/setup-python@v3
         with:
@@ -28,11 +28,48 @@ jobs:
           mkdir -p config
           pytest
 
+  webui-test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Install Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+
+      - uses: pnpm/action-setup@v4
+        name: Install pnpm
+        with:
+          version: 9
+          run_install: false
+
+      - name: Get pnpm store directory
+        shell: bash
+        run: |
+          echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
+
+      - uses: actions/cache@v4
+        name: Setup pnpm cache
+        with:
+          path: ${{ env.STORE_PATH }}
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-store-
+
+      - name: Install dependencies
+        run: cd webui && pnpm install
+
+      - name: build test
+        run: |
+          cd webui && pnpm test:build
+
   version-info:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: If release
         id: release
         run: |
@@ -79,25 +116,35 @@ jobs:
 
   build-webui:
     runs-on: ubuntu-latest
-    needs: [ test, version-info ]
+    needs: [test, webui-test, version-info]
     if: ${{ needs.version-info.outputs.release == 1 || needs.version-info.outputs.dev == 1 }}
-    strategy:
-      matrix:
-        node-version: [ 18 ]
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+
+      - name: Install Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
 
-      - uses: pnpm/action-setup@v2
+      - uses: pnpm/action-setup@v4
+        name: Install pnpm
         with:
-          version: 8
+          version: 9
+          run_install: false
+
+      - name: Get pnpm store directory
+        shell: bash
+        run: |
+          echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
 
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+      - uses: actions/cache@v4
+        name: Setup pnpm cache
         with:
-          node-version: ${{ matrix.node-version }}
-          cache: 'pnpm'
-          cache-dependency-path: webui/pnpm-lock.yaml
+          path: ${{ env.STORE_PATH }}
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-store-
 
       - name: Install dependencies
         run: cd webui && pnpm install
@@ -114,10 +161,10 @@ jobs:
 
   build-docker:
     runs-on: ubuntu-latest
-    needs: [ build-webui, version-info ]
+    needs: [build-webui, version-info]
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Create Version info via tag
         working-directory: ./backend/src
@@ -217,14 +264,14 @@ jobs:
 
   release:
     runs-on: ubuntu-latest
-    needs: [ build-docker, version-info ]
+    needs: [build-docker, version-info]
     if: ${{ needs.version-info.outputs.release == 1 }}
     outputs:
       url: ${{ steps.release.outputs.url }}
       version: ${{ needs.version-info.outputs.version }}
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Download artifact webui
         uses: actions/download-artifact@v3
@@ -247,11 +294,10 @@ jobs:
         run: |
           echo ${{ needs.version-info.outputs.version }}
           echo "VERSION='${{ needs.version-info.outputs.version }}'" >> module/__version__.py
-          
+
       - name: Copy requirements.txt
         working-directory: ./backend
-        run:
-          cp requirements.txt src/requirements.txt
+        run: cp requirements.txt src/requirements.txt
 
       - name: Zip app
         run: |
@@ -267,7 +313,7 @@ jobs:
             echo "version=🌟${{ needs.version-info.outputs.version }}" >> $GITHUB_OUTPUT
             echo "pre_release=false" >> $GITHUB_OUTPUT
           fi
-          
+
       - name: Release
         id: release
         uses: softprops/action-gh-release@v1
@@ -283,10 +329,9 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }}
 
-
   telegram:
     runs-on: ubuntu-latest
-    needs: [ release ]
+    needs: [release]
     steps:
       - name: send telegram message on push
         uses: appleboy/telegram-action@master

.gitignore

@@ -216,4 +216,3 @@ dev-dist
 
 # test file
 test.*
-test_*

README.md

@@ -10,7 +10,7 @@
 </p>
 
 <p align="center">
-  <a href="https://www.autobangumi.org">官方网站</a> | <a href="https://www.autobangumi.org/deploy/quick-start.html">快速开始</a> | <a href="https://www.autobangumi.org/changelog/3.0.html">更新日志</a> | <a href="https://t.me/autobangumi">TG 群组</a>
+  <a href="https://www.autobangumi.org">官方网站</a> | <a href="https://www.autobangumi.org/deploy/quick-start.html">快速开始</a> | <a href="https://www.autobangumi.org/changelog/3.0.html">更新日志</a> | <a href="https://t.me/autobangumi_update">更新推送</a> | <a href="https://t.me/autobangumi">TG 群组</a>
 </p>
 
 # 项目说明
@@ -60,11 +60,6 @@
 - 无需维护完全无感使用
 - 内置 TDMB 解析器，可以直接生成完整的 TMDB 格式的文件以及番剧信息。
 
-## 相关群组
-
-- 更新推送：[Telegram Channel](https://t.me/autobangumi_update)
-- Bug 反馈群：[Telegram](https://t.me/+yNisOnDGaX5jMTM9)
-
 ## [Roadmap](https://github.com/users/EstrellaXD/projects/2)
 
 

backend/src/module/api/rss.py

@@ -258,6 +258,7 @@ async def download_collection(data: Bangumi):
     dependencies=[Depends(get_current_user)],
 )
 async def subscribe(data: Bangumi, rss: RSSItem):
+
     resp = await collector.subscribe_season(data, parser=rss.parser)
 
     if resp:
@@ -276,3 +277,4 @@ async def subscribe(data: Bangumi, rss: RSSItem):
             msg_zh=f"[Engine] 下载 {data.official_title} 失败。",
         )
     return u_response(resp)
+

backend/src/module/database/user.py

@@ -24,6 +24,10 @@ def get_user(self, username):
     def auth_user(self, user: User):
         statement = select(User).where(User.username == user.username)
         result = self.session.exec(statement).first()
+        if not user.password:
+            return ResponseModel(
+                status_code=401, status=False, msg_en="Incorrect password format", msg_zh="密码格式不正确"
+            )
         if not result:
             return ResponseModel(
                 status_code=401, status=False, msg_en="User not found", msg_zh="用户不存在"

backend/src/module/manager/collector.py

@@ -41,6 +41,7 @@ async def collect_season(self, bangumi: Bangumi, link: str = None):
                 return False
 
     @staticmethod
+
     async def subscribe_season(data: Bangumi,parser:str = "mikan"):
         data.added = True
         data.eps_collect = True

backend/src/module/models/config.py

@@ -1,7 +1,7 @@
 from os.path import expandvars
 from typing import Literal
 
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, Field, validator
 
 
 class Program(BaseModel):
@@ -122,6 +122,12 @@ class ExperimentalOpenAI(BaseModel):
         "", description="Azure OpenAI deployment id, ignored when api type is openai"
     )
 
+    @validator("api_base")
+    def validate_api_base(cls, value: str):
+        if value == "https://api.openai.com/":
+            return "https://api.openai.com/v1"
+        return value
+
 
 class Config(BaseModel):
     program: Program = Program()

backend/src/module/parser/analyser/mikan_parser.py

@@ -87,3 +87,4 @@ async def poster_parser(self):
     parser = MikanParser(url)
 
     print(asyncio.run(parser.poster_parser()))
+

backend/src/module/parser/analyser/raw_parser.py

@@ -147,6 +147,7 @@
     "V": 5,
 }
 
+
 UNUSEFUL_RE = re.compile(
     r"""
     # 匹配无用的片段