👷 fix case and PYTHONPATH env warning in Dockerfile

🧑‍💻 使用 Ruff 包办所有格式化和检查 (#663 )
⬆️ auto update by pre-commit hooks (#660 )
2026-05-14 04:48:39 +08:00 · 2024-12-17 16:29:10 +08:00 · 2024-12-17 10:52:21 +08:00 · 2024-12-05 18:28:38 +08:00 · 2024-12-05 08:09:09 +00:00 · 2024-12-05 16:08:42 +08:00
136 changed files with 1390 additions and 1144 deletions
@@ -80,7 +80,7 @@ jobs:
        run: poetry run pytest --cov-report xml --cov=./nonebot_bison -k 'not compare and not render' -n auto

      - name: Upload coverage report
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
        with:
          token: ${{ secrets.CODECOV_TOKEN }}
          flags: smoke-test
@@ -114,7 +114,7 @@ jobs:
        run: poetry run pytest --cov-report xml --cov=./nonebot_bison -k 'not compare' -n auto

      - name: Upload coverage report
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
        with:
          token: ${{ secrets.CODECOV_TOKEN }}
          flags: all-test
@@ -19,4 +19,9 @@ jobs:
      - uses: actions/checkout@v4

      - name: Run Ruff Lint
-        uses: chartboost/ruff-action@v1
+        uses: astral-sh/ruff-action@v2
+        with:
+          src: >-
+            nonebot_bison/
+            extra_plugins/
+            tests/
@@ -7,23 +7,13 @@ ci:
  autoupdate_commit_msg: ":arrow_up: auto update by pre-commit hooks"
 repos:
  - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.6.3
+    rev: v0.8.2
    hooks:
      - id: ruff
-        args: [--fix, --exit-non-zero-on-fix]
-        stages: [commit]
-
-  - repo: https://github.com/pycqa/isort
-    rev: 5.13.2
-    hooks:
-      - id: isort
-        stages: [commit]
-
-  - repo: https://github.com/psf/black
-    rev: 24.8.0
-    hooks:
-      - id: black
-        stages: [commit]
+        args: [--fix]
+        stages: [pre-commit]
+      - id: ruff-format
+        stages: [pre-commit]

  - repo: https://github.com/pre-commit/mirrors-prettier
    rev: v4.0.0-alpha.8
@@ -31,10 +21,10 @@ repos:
      - id: prettier
        types_or: [javascript, jsx, ts, tsx, markdown, yaml, json]
        exclude: "admin-frontend/"
-        stages: [commit]
+        stages: [pre-commit]

  - repo: https://github.com/pre-commit/mirrors-eslint
-    rev: v9.9.1
+    rev: v9.16.0
    hooks:
      - id: eslint
        additional_dependencies:
@@ -1,5 +1,18 @@
 # Change Log

+## 最近更新
+
+### 新功能
+
+- :sparkles: B站获取OPUS格式动态 [@AzideCupric](https://github.com/AzideCupric) ([#651](https://github.com/MountainDash/nonebot-bison/pull/651))
+- :sparkles: 添加 Cookie 组件 [@suyiiyii](https://github.com/suyiiyii) ([#633](https://github.com/MountainDash/nonebot-bison/pull/633))
+
+### Bug 修复
+
+- :bug: 修复 cookie 模块 type hint [@suyiiyii](https://github.com/suyiiyii) ([#658](https://github.com/MountainDash/nonebot-bison/pull/658))
+- :bug: B站转发动态补充 DeletedItem 类型解析 [@AzideCupric](https://github.com/AzideCupric) ([#659](https://github.com/MountainDash/nonebot-bison/pull/659))
+- :bug: 小刻食堂cdn使用https [@phidiaLam](https://github.com/phidiaLam) ([#650](https://github.com/MountainDash/nonebot-bison/pull/650))
+
 ## v0.9.5

 ### 新功能
@@ -17,9 +17,6 @@ _✨ 通用订阅推送插件 ✨_
    <img src="https://img.shields.io/pypi/v/nonebot-bison?logo=python&logoColor=edb641" alt="pypi">
 </a>
 <img src="https://img.shields.io/badge/python-3.10+-blue?logo=python&logoColor=edb641" alt="python">
-<a href="https://github.com/psf/black">
-    <img src="https://img.shields.io/badge/code%20style-black-000000.svg?logo=python&logoColor=edb641" alt="black">
-</a>
 <a href="https://github.com/astral-sh/ruff">
    <img src="https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/charliermarsh/ruff/main/assets/badge/v2.json" alt="ruff">
 </a>
@@ -14,7 +14,7 @@
    "@testing-library/react": "^16.0.1",
    "@testing-library/user-event": "^14.5.2",
    "@types/jest": "^29.5.13",
-    "@types/node": "^20.16.5",
+    "@types/node": "^22.9.0",
    "@types/react": "^18.3.7",
    "@types/react-dom": "^18.3.0",
    "react": "^18.3.1",
@@ -25,7 +25,7 @@
    "redux": "^5.0.1",
    "redux-persist": "^6.0.0",
    "typescript": "^5.6.2",
-    "web-vitals": "^3.5.2"
+    "web-vitals": "^4.2.4"
  },
  "scripts": {
    "start": "react-scripts start",
@@ -36,8 +36,8 @@ importers:
        specifier: ^29.5.13
        version: 29.5.13
      '@types/node':
-        specifier: ^20.16.5
-        version: 20.16.5
+        specifier: ^22.9.0
+        version: 22.9.0
      '@types/react':
        specifier: ^18.3.7
        version: 18.3.7
@@ -58,7 +58,7 @@ importers:
        version: 6.26.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
      react-scripts:
        specifier: 5.0.1
-        version: 5.0.1(@babel/plugin-syntax-flow@7.24.7(@babel/core@7.25.2))(@babel/plugin-transform-react-jsx@7.25.2(@babel/core@7.25.2))(@types/babel__core@7.1.20)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.6.0(eslint@8.57.1)(typescript@5.6.2))(eslint-plugin-import@2.30.0)(eslint@8.57.1))(eslint@8.57.1)(react@18.3.1)(type-fest@0.21.3)(typescript@5.6.2)
+        version: 5.0.1(@babel/plugin-syntax-flow@7.24.7(@babel/core@7.25.2))(@babel/plugin-transform-react-jsx@7.25.2(@babel/core@7.25.2))(@types/babel__core@7.1.20)(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1)(react@18.3.1)(type-fest@0.21.3)(typescript@5.6.2)
      redux:
        specifier: ^5.0.1
        version: 5.0.1
@@ -69,8 +69,8 @@ importers:
        specifier: ^5.6.2
        version: 5.6.2
      web-vitals:
-        specifier: ^3.5.2
-        version: 3.5.2
+        specifier: ^4.2.4
+        version: 4.2.4
    devDependencies:
      '@testing-library/jest-dom':
        specifier: ^6.5.0
@@ -86,10 +86,10 @@ importers:
        version: 8.57.1
      eslint-config-airbnb:
        specifier: ^19.0.4
-        version: 19.0.4(eslint-plugin-import@2.30.0(@typescript-eslint/parser@8.6.0(eslint@8.57.1)(typescript@5.6.2))(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1))(eslint-plugin-jsx-a11y@6.10.0(eslint@8.57.1))(eslint-plugin-react-hooks@4.6.2(eslint@8.57.1))(eslint-plugin-react@7.36.1(eslint@8.57.1))(eslint@8.57.1)
+        version: 19.0.4(eslint-plugin-import@2.30.0)(eslint-plugin-jsx-a11y@6.10.0(eslint@8.57.1))(eslint-plugin-react-hooks@4.6.2(eslint@8.57.1))(eslint-plugin-react@7.36.1(eslint@8.57.1))(eslint@8.57.1)
      eslint-config-airbnb-typescript:
        specifier: ^18.0.0
-        version: 18.0.0(@typescript-eslint/eslint-plugin@8.6.0(@typescript-eslint/parser@8.6.0(eslint@8.57.1)(typescript@5.6.2))(eslint@8.57.1)(typescript@5.6.2))(@typescript-eslint/parser@8.6.0(eslint@8.57.1)(typescript@5.6.2))(eslint-plugin-import@2.30.0(@typescript-eslint/parser@8.6.0(eslint@8.57.1)(typescript@5.6.2))(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1))(eslint@8.57.1)
+        version: 18.0.0(@typescript-eslint/eslint-plugin@8.6.0(@typescript-eslint/parser@8.6.0(eslint@8.57.1)(typescript@5.6.2))(eslint@8.57.1)(typescript@5.6.2))(@typescript-eslint/parser@8.6.0(eslint@8.57.1)(typescript@5.6.2))(eslint-plugin-import@2.30.0)(eslint@8.57.1)
      eslint-import-resolver-typescript:
        specifier: ^3.6.3
        version: 3.6.3(@typescript-eslint/parser@8.6.0(eslint@8.57.1)(typescript@5.6.2))(eslint-plugin-import@2.30.0)(eslint@8.57.1)
@@ -1362,8 +1362,8 @@ packages:
  '@types/mime@3.0.1':
    resolution: {integrity: sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA==}

-  '@types/node@20.16.5':
-    resolution: {integrity: sha512-VwYCweNo3ERajwy0IUlqqcyZ8/A7Zwa9ZP3MnENWcB11AejO+tLy3pu850goUW2FC/IJMdZUfKpX/yxL1gymCA==}
+  '@types/node@22.9.0':
+    resolution: {integrity: sha512-vuyHg81vvWA1Z1ELfvLko2c8f34gyA0zaic0+Rllc5lbCnbSyuvb2Oxpm6TAUAC/2xZN3QGqxBNggD1nNR2AfQ==}

  '@types/parse-json@4.0.0':
    resolution: {integrity: sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==}
@@ -2827,6 +2827,7 @@ packages:
  eslint@8.57.1:
    resolution: {integrity: sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==}
    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    deprecated: This version is no longer supported. Please see https://eslint.org/version-support for other options.
    hasBin: true

  espree@9.6.1:
@@ -3208,8 +3209,8 @@ packages:
    resolution: {integrity: sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==}
    engines: {node: '>= 6'}

-  http-proxy-middleware@2.0.6:
-    resolution: {integrity: sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==}
+  http-proxy-middleware@2.0.7:
+    resolution: {integrity: sha512-fgVY8AV7qU7z/MmXJ/rxwbrtQH4jBQ9m7kp3llF0liB7glmFeVZFBepQb32T3y8n8k2+AEYuMPCpinYW+/CuRA==}
    engines: {node: '>=12.0.0'}
    peerDependencies:
      '@types/express': ^4.17.13
@@ -5667,8 +5668,8 @@ packages:
  wbuf@1.7.3:
    resolution: {integrity: sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==}

-  web-vitals@3.5.2:
-    resolution: {integrity: sha512-c0rhqNcHXRkY/ogGDJQxZ9Im9D19hDihbzSQJrsioex+KnFgmMzBiy57Z1EjkhX/+OjyBpclDCzz2ITtjokFmg==}
+  web-vitals@4.2.4:
+    resolution: {integrity: sha512-r4DIlprAGwJ7YM11VZp4R884m0Vmgr6EAKe3P+kO0PPj3Unqyvv59rczf6UiGcb9Z8QxZVcqKNwv/g0WNdWwsw==}

  webidl-conversions@4.0.2:
    resolution: {integrity: sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==}
@@ -6979,7 +6980,7 @@ snapshots:
  '@jest/console@27.5.1':
    dependencies:
      '@jest/types': 27.5.1
-      '@types/node': 20.16.5
+      '@types/node': 22.9.0
      chalk: 4.1.2
      jest-message-util: 27.5.1
      jest-util: 27.5.1
@@ -6988,7 +6989,7 @@ snapshots:
  '@jest/console@28.1.3':
    dependencies:
      '@jest/types': 28.1.3
-      '@types/node': 20.16.5
+      '@types/node': 22.9.0
      chalk: 4.1.2
      jest-message-util: 28.1.3
      jest-util: 28.1.3
@@ -7001,7 +7002,7 @@ snapshots:
      '@jest/test-result': 27.5.1
      '@jest/transform': 27.5.1
      '@jest/types': 27.5.1
-      '@types/node': 20.16.5
+      '@types/node': 22.9.0
      ansi-escapes: 4.3.2
      chalk: 4.1.2
      emittery: 0.8.1
@@ -7035,7 +7036,7 @@ snapshots:
    dependencies:
      '@jest/fake-timers': 27.5.1
      '@jest/types': 27.5.1
-      '@types/node': 20.16.5
+      '@types/node': 22.9.0
      jest-mock: 27.5.1

  '@jest/expect-utils@29.7.0':
@@ -7046,7 +7047,7 @@ snapshots:
    dependencies:
      '@jest/types': 27.5.1
      '@sinonjs/fake-timers': 8.1.0
-      '@types/node': 20.16.5
+      '@types/node': 22.9.0
      jest-message-util: 27.5.1
      jest-mock: 27.5.1
      jest-util: 27.5.1
@@ -7064,7 +7065,7 @@ snapshots:
      '@jest/test-result': 27.5.1
      '@jest/transform': 27.5.1
      '@jest/types': 27.5.1
-      '@types/node': 20.16.5
+      '@types/node': 22.9.0
      chalk: 4.1.2
      collect-v8-coverage: 1.0.1
      exit: 0.1.2
@@ -7148,7 +7149,7 @@ snapshots:
    dependencies:
      '@types/istanbul-lib-coverage': 2.0.6
      '@types/istanbul-reports': 3.0.4
-      '@types/node': 20.16.5
+      '@types/node': 22.9.0
      '@types/yargs': 16.0.9
      chalk: 4.1.2

@@ -7157,7 +7158,7 @@ snapshots:
      '@jest/schemas': 28.1.3
      '@types/istanbul-lib-coverage': 2.0.6
      '@types/istanbul-reports': 3.0.4
-      '@types/node': 20.16.5
+      '@types/node': 22.9.0
      '@types/yargs': 17.0.32
      chalk: 4.1.2

@@ -7166,7 +7167,7 @@ snapshots:
      '@jest/schemas': 29.6.3
      '@types/istanbul-lib-coverage': 2.0.6
      '@types/istanbul-reports': 3.0.4
-      '@types/node': 20.16.5
+      '@types/node': 22.9.0
      '@types/yargs': 17.0.32
      chalk: 4.1.2

@@ -7435,20 +7436,20 @@ snapshots:
  '@types/body-parser@1.19.2':
    dependencies:
      '@types/connect': 3.4.35
-      '@types/node': 20.16.5
+      '@types/node': 22.9.0

  '@types/bonjour@3.5.10':
    dependencies:
-      '@types/node': 20.16.5
+      '@types/node': 22.9.0

  '@types/connect-history-api-fallback@1.3.5':
    dependencies:
      '@types/express-serve-static-core': 4.17.31
-      '@types/node': 20.16.5
+      '@types/node': 22.9.0

  '@types/connect@3.4.35':
    dependencies:
-      '@types/node': 20.16.5
+      '@types/node': 22.9.0

  '@types/eslint@8.4.10':
    dependencies:
@@ -7463,7 +7464,7 @@ snapshots:

  '@types/express-serve-static-core@4.17.31':
    dependencies:
-      '@types/node': 20.16.5
+      '@types/node': 22.9.0
      '@types/qs': 6.9.7
      '@types/range-parser': 1.2.4

@@ -7476,13 +7477,13 @@ snapshots:

  '@types/graceful-fs@4.1.5':
    dependencies:
-      '@types/node': 20.16.5
+      '@types/node': 22.9.0

  '@types/html-minifier-terser@6.1.0': {}

  '@types/http-proxy@1.17.9':
    dependencies:
-      '@types/node': 20.16.5
+      '@types/node': 22.9.0

  '@types/istanbul-lib-coverage@2.0.6': {}

@@ -7505,7 +7506,7 @@ snapshots:

  '@types/mime@3.0.1': {}

-  '@types/node@20.16.5':
+  '@types/node@22.9.0':
    dependencies:
      undici-types: 6.19.8

@@ -7532,7 +7533,7 @@ snapshots:

  '@types/resolve@1.17.1':
    dependencies:
-      '@types/node': 20.16.5
+      '@types/node': 22.9.0

  '@types/retry@0.12.0': {}

@@ -7545,11 +7546,11 @@ snapshots:
  '@types/serve-static@1.15.0':
    dependencies:
      '@types/mime': 3.0.1
-      '@types/node': 20.16.5
+      '@types/node': 22.9.0

  '@types/sockjs@0.3.33':
    dependencies:
-      '@types/node': 20.16.5
+      '@types/node': 22.9.0

  '@types/stack-utils@2.0.3': {}

@@ -7559,7 +7560,7 @@ snapshots:

  '@types/ws@8.5.3':
    dependencies:
-      '@types/node': 20.16.5
+      '@types/node': 22.9.0

  '@types/yargs-parser@21.0.3': {}

@@ -9097,7 +9098,7 @@ snapshots:
    optionalDependencies:
      source-map: 0.6.1

-  eslint-config-airbnb-base@15.0.0(eslint-plugin-import@2.30.0(@typescript-eslint/parser@8.6.0(eslint@8.57.1)(typescript@5.6.2))(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1))(eslint@8.57.1):
+  eslint-config-airbnb-base@15.0.0(eslint-plugin-import@2.30.0)(eslint@8.57.1):
    dependencies:
      confusing-browser-globals: 1.0.11
      eslint: 8.57.1
@@ -9106,19 +9107,19 @@ snapshots:
      object.entries: 1.1.7
      semver: 6.3.1

-  eslint-config-airbnb-typescript@18.0.0(@typescript-eslint/eslint-plugin@8.6.0(@typescript-eslint/parser@8.6.0(eslint@8.57.1)(typescript@5.6.2))(eslint@8.57.1)(typescript@5.6.2))(@typescript-eslint/parser@8.6.0(eslint@8.57.1)(typescript@5.6.2))(eslint-plugin-import@2.30.0(@typescript-eslint/parser@8.6.0(eslint@8.57.1)(typescript@5.6.2))(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1))(eslint@8.57.1):
+  eslint-config-airbnb-typescript@18.0.0(@typescript-eslint/eslint-plugin@8.6.0(@typescript-eslint/parser@8.6.0(eslint@8.57.1)(typescript@5.6.2))(eslint@8.57.1)(typescript@5.6.2))(@typescript-eslint/parser@8.6.0(eslint@8.57.1)(typescript@5.6.2))(eslint-plugin-import@2.30.0)(eslint@8.57.1):
    dependencies:
      '@typescript-eslint/eslint-plugin': 8.6.0(@typescript-eslint/parser@8.6.0(eslint@8.57.1)(typescript@5.6.2))(eslint@8.57.1)(typescript@5.6.2)
      '@typescript-eslint/parser': 8.6.0(eslint@8.57.1)(typescript@5.6.2)
      eslint: 8.57.1
-      eslint-config-airbnb-base: 15.0.0(eslint-plugin-import@2.30.0(@typescript-eslint/parser@8.6.0(eslint@8.57.1)(typescript@5.6.2))(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1))(eslint@8.57.1)
+      eslint-config-airbnb-base: 15.0.0(eslint-plugin-import@2.30.0)(eslint@8.57.1)
    transitivePeerDependencies:
      - eslint-plugin-import

-  eslint-config-airbnb@19.0.4(eslint-plugin-import@2.30.0(@typescript-eslint/parser@8.6.0(eslint@8.57.1)(typescript@5.6.2))(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1))(eslint-plugin-jsx-a11y@6.10.0(eslint@8.57.1))(eslint-plugin-react-hooks@4.6.2(eslint@8.57.1))(eslint-plugin-react@7.36.1(eslint@8.57.1))(eslint@8.57.1):
+  eslint-config-airbnb@19.0.4(eslint-plugin-import@2.30.0)(eslint-plugin-jsx-a11y@6.10.0(eslint@8.57.1))(eslint-plugin-react-hooks@4.6.2(eslint@8.57.1))(eslint-plugin-react@7.36.1(eslint@8.57.1))(eslint@8.57.1):
    dependencies:
      eslint: 8.57.1
-      eslint-config-airbnb-base: 15.0.0(eslint-plugin-import@2.30.0(@typescript-eslint/parser@8.6.0(eslint@8.57.1)(typescript@5.6.2))(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1))(eslint@8.57.1)
+      eslint-config-airbnb-base: 15.0.0(eslint-plugin-import@2.30.0)(eslint@8.57.1)
      eslint-plugin-import: 2.30.0(@typescript-eslint/parser@8.6.0(eslint@8.57.1)(typescript@5.6.2))(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1)
      eslint-plugin-jsx-a11y: 6.10.0(eslint@8.57.1)
      eslint-plugin-react: 7.36.1(eslint@8.57.1)
@@ -9126,7 +9127,7 @@ snapshots:
      object.assign: 4.1.4
      object.entries: 1.1.6

-  eslint-config-react-app@7.0.1(@babel/plugin-syntax-flow@7.24.7(@babel/core@7.25.2))(@babel/plugin-transform-react-jsx@7.25.2(@babel/core@7.25.2))(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.6.0(eslint@8.57.1)(typescript@5.6.2))(eslint-plugin-import@2.30.0)(eslint@8.57.1))(eslint@8.57.1)(jest@27.5.1)(typescript@5.6.2):
+  eslint-config-react-app@7.0.1(@babel/plugin-syntax-flow@7.24.7(@babel/core@7.25.2))(@babel/plugin-transform-react-jsx@7.25.2(@babel/core@7.25.2))(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1)(jest@27.5.1)(typescript@5.6.2):
    dependencies:
      '@babel/core': 7.25.2
      '@babel/eslint-parser': 7.19.1(@babel/core@7.25.2)(eslint@8.57.1)
@@ -9137,7 +9138,7 @@ snapshots:
      confusing-browser-globals: 1.0.11
      eslint: 8.57.1
      eslint-plugin-flowtype: 8.0.3(@babel/plugin-syntax-flow@7.24.7(@babel/core@7.25.2))(@babel/plugin-transform-react-jsx@7.25.2(@babel/core@7.25.2))(eslint@8.57.1)
-      eslint-plugin-import: 2.30.0(@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@5.6.2))(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.6.0(eslint@8.57.1)(typescript@5.6.2))(eslint-plugin-import@2.30.0)(eslint@8.57.1))(eslint@8.57.1)
+      eslint-plugin-import: 2.30.0(@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@5.6.2))(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1)
      eslint-plugin-jest: 25.7.0(@typescript-eslint/eslint-plugin@5.62.0(@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@5.6.2))(eslint@8.57.1)(typescript@5.6.2))(eslint@8.57.1)(jest@27.5.1)(typescript@5.6.2)
      eslint-plugin-jsx-a11y: 6.10.0(eslint@8.57.1)
      eslint-plugin-react: 7.36.1(eslint@8.57.1)
@@ -9167,7 +9168,7 @@ snapshots:
      debug: 4.3.5
      enhanced-resolve: 5.17.1
      eslint: 8.57.1
-      eslint-module-utils: 2.8.1(@typescript-eslint/parser@8.6.0(eslint@8.57.1)(typescript@5.6.2))(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.6.0(eslint@8.57.1)(typescript@5.6.2))(eslint-plugin-import@2.30.0)(eslint@8.57.1))(eslint@8.57.1)
+      eslint-module-utils: 2.8.1(@typescript-eslint/parser@8.6.0(eslint@8.57.1)(typescript@5.6.2))(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1)
      fast-glob: 3.3.2
      get-tsconfig: 4.8.0
      is-bun-module: 1.1.0
@@ -9180,7 +9181,7 @@ snapshots:
      - eslint-import-resolver-webpack
      - supports-color

-  eslint-module-utils@2.11.0(@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@5.6.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.6.0(eslint@8.57.1)(typescript@5.6.2))(eslint-plugin-import@2.30.0)(eslint@8.57.1))(eslint@8.57.1):
+  eslint-module-utils@2.11.0(@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@5.6.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1):
    dependencies:
      debug: 3.2.7
    optionalDependencies:
@@ -9191,7 +9192,7 @@ snapshots:
    transitivePeerDependencies:
      - supports-color

-  eslint-module-utils@2.11.0(@typescript-eslint/parser@8.6.0(eslint@8.57.1)(typescript@5.6.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.6.0(eslint@8.57.1)(typescript@5.6.2))(eslint-plugin-import@2.30.0)(eslint@8.57.1))(eslint@8.57.1):
+  eslint-module-utils@2.11.0(@typescript-eslint/parser@8.6.0(eslint@8.57.1)(typescript@5.6.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1):
    dependencies:
      debug: 3.2.7
    optionalDependencies:
@@ -9202,7 +9203,7 @@ snapshots:
    transitivePeerDependencies:
      - supports-color

-  eslint-module-utils@2.8.1(@typescript-eslint/parser@8.6.0(eslint@8.57.1)(typescript@5.6.2))(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.6.0(eslint@8.57.1)(typescript@5.6.2))(eslint-plugin-import@2.30.0)(eslint@8.57.1))(eslint@8.57.1):
+  eslint-module-utils@2.8.1(@typescript-eslint/parser@8.6.0(eslint@8.57.1)(typescript@5.6.2))(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1):
    dependencies:
      debug: 3.2.7
    optionalDependencies:
@@ -9220,7 +9221,7 @@ snapshots:
      lodash: 4.17.21
      string-natural-compare: 3.0.1

-  eslint-plugin-import@2.30.0(@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@5.6.2))(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.6.0(eslint@8.57.1)(typescript@5.6.2))(eslint-plugin-import@2.30.0)(eslint@8.57.1))(eslint@8.57.1):
+  eslint-plugin-import@2.30.0(@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@5.6.2))(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1):
    dependencies:
      '@rtsao/scc': 1.1.0
      array-includes: 3.1.8
@@ -9231,7 +9232,7 @@ snapshots:
      doctrine: 2.1.0
      eslint: 8.57.1
      eslint-import-resolver-node: 0.3.9
-      eslint-module-utils: 2.11.0(@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@5.6.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.6.0(eslint@8.57.1)(typescript@5.6.2))(eslint-plugin-import@2.30.0)(eslint@8.57.1))(eslint@8.57.1)
+      eslint-module-utils: 2.11.0(@typescript-eslint/parser@5.62.0(eslint@8.57.1)(typescript@5.6.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1)
      hasown: 2.0.2
      is-core-module: 2.15.1
      is-glob: 4.0.3
@@ -9259,7 +9260,7 @@ snapshots:
      doctrine: 2.1.0
      eslint: 8.57.1
      eslint-import-resolver-node: 0.3.9
-      eslint-module-utils: 2.11.0(@typescript-eslint/parser@8.6.0(eslint@8.57.1)(typescript@5.6.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.6.0(eslint@8.57.1)(typescript@5.6.2))(eslint-plugin-import@2.30.0)(eslint@8.57.1))(eslint@8.57.1)
+      eslint-module-utils: 2.11.0(@typescript-eslint/parser@8.6.0(eslint@8.57.1)(typescript@5.6.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1)
      hasown: 2.0.2
      is-core-module: 2.15.1
      is-glob: 4.0.3
@@ -9861,7 +9862,7 @@ snapshots:
    transitivePeerDependencies:
      - supports-color

-  http-proxy-middleware@2.0.6(@types/express@4.17.14):
+  http-proxy-middleware@2.0.7(@types/express@4.17.14):
    dependencies:
      '@types/http-proxy': 1.17.9
      http-proxy: 1.18.1
@@ -10145,7 +10146,7 @@ snapshots:
      '@jest/environment': 27.5.1
      '@jest/test-result': 27.5.1
      '@jest/types': 27.5.1
-      '@types/node': 20.16.5
+      '@types/node': 22.9.0
      chalk: 4.1.2
      co: 4.6.0
      dedent: 0.7.0
@@ -10248,7 +10249,7 @@ snapshots:
      '@jest/environment': 27.5.1
      '@jest/fake-timers': 27.5.1
      '@jest/types': 27.5.1
-      '@types/node': 20.16.5
+      '@types/node': 22.9.0
      jest-mock: 27.5.1
      jest-util: 27.5.1
      jsdom: 16.7.0
@@ -10263,7 +10264,7 @@ snapshots:
      '@jest/environment': 27.5.1
      '@jest/fake-timers': 27.5.1
      '@jest/types': 27.5.1
-      '@types/node': 20.16.5
+      '@types/node': 22.9.0
      jest-mock: 27.5.1
      jest-util: 27.5.1

@@ -10275,7 +10276,7 @@ snapshots:
    dependencies:
      '@jest/types': 27.5.1
      '@types/graceful-fs': 4.1.5
-      '@types/node': 20.16.5
+      '@types/node': 22.9.0
      anymatch: 3.1.2
      fb-watchman: 2.0.2
      graceful-fs: 4.2.11
@@ -10294,7 +10295,7 @@ snapshots:
      '@jest/source-map': 27.5.1
      '@jest/test-result': 27.5.1
      '@jest/types': 27.5.1
-      '@types/node': 20.16.5
+      '@types/node': 22.9.0
      chalk: 4.1.2
      co: 4.6.0
      expect: 27.5.1
@@ -10368,7 +10369,7 @@ snapshots:
  jest-mock@27.5.1:
    dependencies:
      '@jest/types': 27.5.1
-      '@types/node': 20.16.5
+      '@types/node': 22.9.0

  jest-pnp-resolver@1.2.2(jest-resolve@27.5.1):
    optionalDependencies:
@@ -10406,7 +10407,7 @@ snapshots:
      '@jest/test-result': 27.5.1
      '@jest/transform': 27.5.1
      '@jest/types': 27.5.1
-      '@types/node': 20.16.5
+      '@types/node': 22.9.0
      chalk: 4.1.2
      emittery: 0.8.1
      graceful-fs: 4.2.11
@@ -10457,7 +10458,7 @@ snapshots:

  jest-serializer@27.5.1:
    dependencies:
-      '@types/node': 20.16.5
+      '@types/node': 22.9.0
      graceful-fs: 4.2.11

  jest-snapshot@27.5.1:
@@ -10490,7 +10491,7 @@ snapshots:
  jest-util@27.5.1:
    dependencies:
      '@jest/types': 27.5.1
-      '@types/node': 20.16.5
+      '@types/node': 22.9.0
      chalk: 4.1.2
      ci-info: 3.9.0
      graceful-fs: 4.2.11
@@ -10499,7 +10500,7 @@ snapshots:
  jest-util@28.1.3:
    dependencies:
      '@jest/types': 28.1.3
-      '@types/node': 20.16.5
+      '@types/node': 22.9.0
      chalk: 4.1.2
      ci-info: 3.9.0
      graceful-fs: 4.2.11
@@ -10508,7 +10509,7 @@ snapshots:
  jest-util@29.7.0:
    dependencies:
      '@jest/types': 29.6.3
-      '@types/node': 20.16.5
+      '@types/node': 22.9.0
      chalk: 4.1.2
      ci-info: 3.9.0
      graceful-fs: 4.2.11
@@ -10538,7 +10539,7 @@ snapshots:
    dependencies:
      '@jest/test-result': 27.5.1
      '@jest/types': 27.5.1
-      '@types/node': 20.16.5
+      '@types/node': 22.9.0
      ansi-escapes: 4.3.2
      chalk: 4.1.2
      jest-util: 27.5.1
@@ -10548,7 +10549,7 @@ snapshots:
    dependencies:
      '@jest/test-result': 28.1.3
      '@jest/types': 28.1.3
-      '@types/node': 20.16.5
+      '@types/node': 22.9.0
      ansi-escapes: 4.3.2
      chalk: 4.1.2
      emittery: 0.10.2
@@ -10557,19 +10558,19 @@ snapshots:

  jest-worker@26.6.2:
    dependencies:
-      '@types/node': 20.16.5
+      '@types/node': 22.9.0
      merge-stream: 2.0.0
      supports-color: 7.2.0

  jest-worker@27.5.1:
    dependencies:
-      '@types/node': 20.16.5
+      '@types/node': 22.9.0
      merge-stream: 2.0.0
      supports-color: 8.1.1

  jest-worker@28.1.3:
    dependencies:
-      '@types/node': 20.16.5
+      '@types/node': 22.9.0
      merge-stream: 2.0.0
      supports-color: 8.1.1

@@ -11681,7 +11682,7 @@ snapshots:
      '@remix-run/router': 1.19.2
      react: 18.3.1

-  react-scripts@5.0.1(@babel/plugin-syntax-flow@7.24.7(@babel/core@7.25.2))(@babel/plugin-transform-react-jsx@7.25.2(@babel/core@7.25.2))(@types/babel__core@7.1.20)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.6.0(eslint@8.57.1)(typescript@5.6.2))(eslint-plugin-import@2.30.0)(eslint@8.57.1))(eslint@8.57.1)(react@18.3.1)(type-fest@0.21.3)(typescript@5.6.2):
+  react-scripts@5.0.1(@babel/plugin-syntax-flow@7.24.7(@babel/core@7.25.2))(@babel/plugin-transform-react-jsx@7.25.2(@babel/core@7.25.2))(@types/babel__core@7.1.20)(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1)(react@18.3.1)(type-fest@0.21.3)(typescript@5.6.2):
    dependencies:
      '@babel/core': 7.25.2
      '@pmmmwh/react-refresh-webpack-plugin': 0.5.9(react-refresh@0.11.0)(type-fest@0.21.3)(webpack-dev-server@4.11.1(webpack@5.94.0))(webpack@5.94.0)
@@ -11699,7 +11700,7 @@ snapshots:
      dotenv: 10.0.0
      dotenv-expand: 5.1.0
      eslint: 8.57.1
-      eslint-config-react-app: 7.0.1(@babel/plugin-syntax-flow@7.24.7(@babel/core@7.25.2))(@babel/plugin-transform-react-jsx@7.25.2(@babel/core@7.25.2))(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.6.0(eslint@8.57.1)(typescript@5.6.2))(eslint-plugin-import@2.30.0)(eslint@8.57.1))(eslint@8.57.1)(jest@27.5.1)(typescript@5.6.2)
+      eslint-config-react-app: 7.0.1(@babel/plugin-syntax-flow@7.24.7(@babel/core@7.25.2))(@babel/plugin-transform-react-jsx@7.25.2(@babel/core@7.25.2))(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1)(jest@27.5.1)(typescript@5.6.2)
      eslint-webpack-plugin: 3.2.0(eslint@8.57.1)(webpack@5.94.0)
      file-loader: 6.2.0(webpack@5.94.0)
      fs-extra: 10.1.0
@@ -12703,7 +12704,7 @@ snapshots:
    dependencies:
      minimalistic-assert: 1.0.1

-  web-vitals@3.5.2: {}
+  web-vitals@4.2.4: {}

  webidl-conversions@4.0.2: {}

@@ -12739,7 +12740,7 @@ snapshots:
      express: 4.19.2
      graceful-fs: 4.2.11
      html-entities: 2.3.3
-      http-proxy-middleware: 2.0.6(@types/express@4.17.14)
+      http-proxy-middleware: 2.0.7(@types/express@4.17.14)
      ipaddr.js: 2.0.1
      open: 8.4.0
      p-retry: 4.6.2
@@ -1,4 +1,4 @@
-FROM node:20.17.0 as frontend
+FROM node:22.11.0 AS frontend
 ADD . /app
 WORKDIR /app/admin-frontend
 RUN npm install -g pnpm
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1.10
-FROM python:3.11-slim-bullseye as base
+FROM python:3.11-slim-bullseye AS base

-FROM base as builder
+FROM base AS builder

 ENV PYTHONFAULTHANDLER=1 \
  PYTHONUNBUFFERED=1 \
@@ -12,7 +12,6 @@ ENV PYTHONFAULTHANDLER=1 \
  POETRY_NO_INTERACTION=1 \
  POETRY_VIRTUALENVS_CREATE=false \
  PATH="$PATH:/runtime/bin" \
-  PYTHONPATH="$PYTHONPATH:/runtime/lib/python3.10/site-packages" \
  # Versions:
  POETRY_VERSION=1.7.1
 RUN apt-get update && apt-get install -y build-essential unzip wget python-dev git
@@ -25,7 +24,7 @@ COPY README.md pyproject.toml poetry.lock /src/
 RUN poetry export --only=main,docker --without-hashes --no-interaction --no-ansi -f requirements.txt -o requirements.txt
 RUN pip install --prefix=/runtime --force-reinstall -r requirements.txt

-FROM base as runtime
+FROM base AS runtime

 WORKDIR /app
 RUN --mount=type=cache,target=/var/cache/apt \
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1.10
-FROM python:3.11-slim-bullseye as base
+FROM python:3.11-slim-bullseye AS base

-FROM base as builder
+FROM base AS builder

 ENV PYTHONFAULTHANDLER=1 \
  PYTHONUNBUFFERED=1 \
@@ -12,7 +12,6 @@ ENV PYTHONFAULTHANDLER=1 \
  POETRY_NO_INTERACTION=1 \
  POETRY_VIRTUALENVS_CREATE=false \
  PATH="$PATH:/runtime/bin" \
-  PYTHONPATH="$PYTHONPATH:/runtime/lib/python3.10/site-packages" \
  # Versions:
  POETRY_VERSION=1.7.1
 RUN apt-get update && apt-get install -y build-essential unzip wget python3-dev git
@@ -25,7 +24,7 @@ COPY pyproject.toml poetry.lock /src/
 RUN poetry export --only=main,docker --without-hashes --no-interaction --no-ansi -f requirements.txt -o requirements.txt
 RUN pip install --prefix=/runtime --force-reinstall -r requirements.txt

-FROM base as runtime
+FROM base AS runtime

 WORKDIR /app
 RUN --mount=type=cache,target=/var/cache/apt \
@@ -1,7 +1,7 @@
 from nonebot import on_request
-from nonebot.log import logger
 from nonebot.adapters.onebot.v11 import Bot
-from nonebot.adapters.onebot.v11.event import GroupRequestEvent, FriendRequestEvent
+from nonebot.adapters.onebot.v11.event import FriendRequestEvent, GroupRequestEvent
+from nonebot.log import logger

 friend_req = on_request(priority=5)

@@ -6,8 +6,8 @@ require("nonebot_plugin_saa")

 import nonebot_plugin_saa

+from . import admin_page, bootstrap, config, platform, post, scheduler, send, sub_manager, theme, types, utils
 from .plugin_config import PlugConfig, plugin_config
-from . import post, send, theme, types, utils, config, platform, bootstrap, scheduler, admin_page, sub_manager

 __help__version__ = "0.8.2"
 nonebot_plugin_saa.enable_auto_select_bot()
@@ -36,12 +36,12 @@ __all__ = [
    "admin_page",
    "bootstrap",
    "config",
-    "sub_manager",
+    "platform",
    "post",
    "scheduler",
    "send",
-    "platform",
+    "sub_manager",
+    "theme",
    "types",
    "utils",
-    "theme",
 ]
@@ -2,15 +2,16 @@ import os
 from pathlib import Path
 from typing import TYPE_CHECKING

-from nonebot.log import logger
-from nonebot.rule import to_me
-from nonebot.typing import T_State
 from nonebot import get_driver, on_command
 from nonebot.adapters.onebot.v11 import Bot
 from nonebot.adapters.onebot.v11.event import PrivateMessageEvent
+from nonebot.log import logger
+from nonebot.rule import to_me
+from nonebot.typing import T_State
+
+from nonebot_bison.plugin_config import plugin_config

 from .api import router as api_router
-from ..plugin_config import plugin_config
 from .token_manager import token_manager as tm

 if TYPE_CHECKING:
@@ -21,9 +22,9 @@ STATIC_PATH = (Path(__file__).parent / "dist").resolve()


 def init_fastapi(driver: "Driver"):
-    import socketio
    from fastapi.applications import FastAPI
    from fastapi.staticfiles import StaticFiles
+    import socketio

    sio = socketio.AsyncServer(async_mode="asgi", cors_allowed_origins="*")
    socket_app = socketio.ASGIApp(sio, socketio_path="socket")
@@ -1,37 +1,39 @@
 from typing import cast

-import nonebot
 from fastapi import status
-from fastapi.routing import APIRouter
-from fastapi.param_functions import Depends
 from fastapi.exceptions import HTTPException
+from fastapi.param_functions import Depends
+from fastapi.routing import APIRouter
+from fastapi.security.oauth2 import OAuth2PasswordBearer
+import nonebot
 from nonebot_plugin_saa import TargetQQGroup
 from nonebot_plugin_saa.auto_select_bot import get_bot
-from fastapi.security.oauth2 import OAuth2PasswordBearer

-from ..types import WeightConfig
-from ..apis import check_sub_target
+from nonebot_bison.apis import check_sub_target
+from nonebot_bison.config import NoSuchSubscribeException, NoSuchTargetException, NoSuchUserException, config
+from nonebot_bison.config.db_config import SubscribeDupException
+from nonebot_bison.platform import platform_manager
+from nonebot_bison.scheduler import scheduler_dict
+from nonebot_bison.types import Target as T_Target
+from nonebot_bison.types import WeightConfig
+from nonebot_bison.utils.get_bot import get_groups
+from nonebot_bison.utils.site import CookieClientManager, is_cookie_client_manager, site_manager
+
 from .jwt import load_jwt, pack_jwt
-from ..scheduler import scheduler_dict
-from ..types import Target as T_Target
-from ..utils.get_bot import get_groups
-from ..platform import platform_manager
 from .token_manager import token_manager
-from ..config.db_config import SubscribeDupException
-from ..utils.site import CookieClientManager, site_manager, is_cookie_client_manager
-from ..config import NoSuchUserException, NoSuchTargetException, NoSuchSubscribeException, config
 from .types import (
+    AddSubscribeReq,
    Cookie,
-    TokenResp,
+    CookieTarget,
    GlobalConf,
+    PlatformConfig,
    SiteConfig,
    StatusResp,
-    CookieTarget,
-    SubscribeResp,
-    PlatformConfig,
-    AddSubscribeReq,
    SubscribeConfig,
    SubscribeGroupDetail,
+    SubscribeResp,
+    Target,
+    TokenResp,
 )

 router = APIRouter(prefix="/api", tags=["api"])
@@ -211,7 +213,7 @@ async def update_weigth_config(platformName: str, target: str, weight_config: We


@router.get("/cookie", dependencies=[Depends(check_is_superuser)])
-async def get_cookie(site_name: str = None, target: str = None) -> list[Cookie]:
+async def get_cookie(site_name: str | None = None, target: str | None = None) -> list[Cookie]:
    cookies_in_db = await config.get_cookie(site_name, is_anonymous=False)
    return [
        Cookie(
@@ -250,7 +252,12 @@ async def get_cookie_target(
    cookie_targets = await config.get_cookie_target()
    # TODO: filter in SQL
    return [
-        x
+        CookieTarget(
+            target=Target(
+                platform_name=x.target.platform_name, target_name=x.target.target_name, target=x.target.target
+            ),
+            cookie_id=x.cookie.id,
+        )
        for x in cookie_targets
        if (site_name is None or x.cookie.site_name == site_name)
        and (target is None or x.target.target == target)
@@ -259,13 +266,13 @@ async def get_cookie_target(


@router.post("/cookie_target", dependencies=[Depends(check_is_superuser)])
-async def add_cookie_target(platform_name: str, target: str, cookie_id: int) -> StatusResp:
+async def add_cookie_target(platform_name: str, target: T_Target, cookie_id: int) -> StatusResp:
    await config.add_cookie_target(target, platform_name, cookie_id)
    return StatusResp(ok=True, msg="")


@router.delete("/cookie_target", dependencies=[Depends(check_is_superuser)])
-async def del_cookie_target(platform_name: str, target: str, cookie_id: int) -> StatusResp:
+async def del_cookie_target(platform_name: str, target: T_Target, cookie_id: int) -> StatusResp:
    await config.delete_cookie_target(target, platform_name, cookie_id)
    return StatusResp(ok=True, msg="")

@@ -1,6 +1,6 @@
+import datetime
 import random
 import string
-import datetime

 import jwt

@@ -1,6 +1,6 @@
+from datetime import timedelta
 import random
 import string
-from datetime import timedelta

 from expiringdictx import ExpiringDict

@@ -60,8 +60,8 @@ class StatusResp(BaseModel):
    msg: str


-from typing import Any
 from datetime import datetime
+from typing import Any

 from pydantic import BaseModel

@@ -1,6 +1,6 @@
-from .types import Target
-from .scheduler import scheduler_dict
 from .platform import platform_manager
+from .scheduler import scheduler_dict
+from .types import Target


 async def check_sub_target(platform_name: str, target: Target):
@@ -1,10 +1,10 @@
 from nonebot.log import logger
-from sqlalchemy import text, inspect
-from nonebot_plugin_datastore.db import get_engine, pre_db_init, post_db_init
+from nonebot_plugin_datastore.db import get_engine, post_db_init, pre_db_init
+from sqlalchemy import inspect, text

+from .config.config_legacy import start_up as legacy_db_startup
 from .config.db_migration import data_migrate
 from .scheduler.manager import init_scheduler
-from .config.config_legacy import start_up as legacy_db_startup


@pre_db_init
@@ -1,9 +1,9 @@
 from typing import Literal, overload

-from pydantic import BaseModel
 from nonebot.compat import PYDANTIC_V2
+from pydantic import BaseModel

-__all__ = ("model_validator", "model_rebuild")
+__all__ = ("model_rebuild", "model_validator")


 if PYDANTIC_V2:
@@ -1,4 +1,4 @@
 from .db_config import config as config
-from .utils import NoSuchUserException as NoSuchUserException
-from .utils import NoSuchTargetException as NoSuchTargetException
 from .utils import NoSuchSubscribeException as NoSuchSubscribeException
+from .utils import NoSuchTargetException as NoSuchTargetException
+from .utils import NoSuchUserException as NoSuchUserException
@@ -1,19 +1,20 @@
-import os
+from collections import defaultdict
+from datetime import datetime
 import json
+import os
 from os import path
 from pathlib import Path
-from datetime import datetime
-from collections import defaultdict
 from typing import Literal, TypedDict

 from nonebot.log import logger
 from tinydb import Query, TinyDB

-from ..utils import Singleton
-from ..types import User, Target
-from ..platform import platform_manager
-from ..plugin_config import plugin_config
-from .utils import NoSuchUserException, NoSuchSubscribeException
+from nonebot_bison.platform import platform_manager
+from nonebot_bison.plugin_config import plugin_config
+from nonebot_bison.types import Target, User
+from nonebot_bison.utils import Singleton
+
+from .utils import NoSuchSubscribeException, NoSuchUserException

 supported_target_type = platform_manager.keys()

@@ -1,20 +1,20 @@
 import asyncio
 from collections import defaultdict
-from datetime import time, datetime
-from collections.abc import Callable, Sequence, Awaitable
+from collections.abc import Awaitable, Callable, Sequence
+from datetime import datetime, time

 from nonebot.compat import model_dump
-from sqlalchemy.orm import selectinload
-from sqlalchemy.exc import IntegrityError
-from sqlalchemy import func, delete, select
-from nonebot_plugin_saa import PlatformTarget
 from nonebot_plugin_datastore import create_session
+from nonebot_plugin_saa import PlatformTarget
+from sqlalchemy import delete, func, select
+from sqlalchemy.exc import IntegrityError
+from sqlalchemy.orm import selectinload

-from ..types import Tag
-from ..types import Target as T_Target
-from .utils import NoSuchTargetException, DuplicateCookieTargetException
-from .db_model import User, Cookie, Target, Subscribe, CookieTarget, ScheduleTimeWeight
-from ..types import Category, UserSubInfo, WeightConfig, TimeWeightConfig, PlatformWeightConfigResp
+from nonebot_bison.types import Category, PlatformWeightConfigResp, Tag, TimeWeightConfig, UserSubInfo, WeightConfig
+from nonebot_bison.types import Target as T_Target
+
+from .db_model import Cookie, CookieTarget, ScheduleTimeWeight, Subscribe, Target, User
+from .utils import DuplicateCookieTargetException, NoSuchTargetException


 def _get_time():
@@ -288,6 +288,8 @@ class DBConfig:
    async def get_cookie_by_id(self, cookie_id: int) -> Cookie:
        async with create_session() as sess:
            cookie = await sess.scalar(select(Cookie).where(Cookie.id == cookie_id))
+            if not cookie:
+                raise NoSuchTargetException(f"cookie {cookie_id} not found")
            return cookie

    async def add_cookie(self, cookie: Cookie) -> int:
@@ -317,6 +319,8 @@ class DBConfig:
                .outerjoin(CookieTarget)
                .options(selectinload(Cookie.targets))
            )
+            if not cookie:
+                raise NoSuchTargetException(f"cookie {cookie_id} not found")
            if len(cookie.targets) > 0:
                raise Exception(f"cookie {cookie.id} in use")
            await sess.execute(delete(Cookie).where(Cookie.id == cookie_id))
@@ -1,11 +1,11 @@
-from nonebot.log import logger
 from nonebot.compat import model_dump
+from nonebot.log import logger
 from nonebot_plugin_datastore.db import get_engine
-from sqlalchemy.ext.asyncio.session import AsyncSession
 from nonebot_plugin_saa import TargetQQGroup, TargetQQPrivate
+from sqlalchemy.ext.asyncio.session import AsyncSession

-from .db_model import User, Target, Subscribe
 from .config_legacy import Config, ConfigContent, drop
+from .db_model import Subscribe, Target, User


 async def data_migrate():
@@ -1,15 +1,15 @@
 import datetime
-from typing import Any
 from pathlib import Path
+from typing import Any

-from nonebot_plugin_saa import PlatformTarget
-from sqlalchemy.dialects.postgresql import JSONB
 from nonebot.compat import PYDANTIC_V2, ConfigDict
 from nonebot_plugin_datastore import get_plugin_data
-from sqlalchemy.orm import Mapped, relationship, mapped_column
-from sqlalchemy import JSON, String, DateTime, ForeignKey, UniqueConstraint
+from nonebot_plugin_saa import PlatformTarget
+from sqlalchemy import JSON, DateTime, ForeignKey, String, UniqueConstraint
+from sqlalchemy.dialects.postgresql import JSONB
+from sqlalchemy.orm import Mapped, mapped_column, relationship

-from ..types import Tag, Category
+from nonebot_bison.types import Category, Tag

 Model = get_plugin_data().Model
 get_plugin_data().set_migration_dir(Path(__file__).parent / "migrations")
@@ -6,8 +6,8 @@ Create Date: 2022-03-21 19:18:13.762626

 """

-import sqlalchemy as sa
 from alembic import op
+import sqlalchemy as sa

 # revision identifiers, used by Alembic.
 revision = "0571870f5222"
@@ -6,8 +6,8 @@ Create Date: 2022-03-27 21:50:10.911649

 """

-import sqlalchemy as sa
 from alembic import op
+import sqlalchemy as sa

 # revision identifiers, used by Alembic.
 revision = "4a46ba54a3f3"
@@ -6,8 +6,8 @@ Create Date: 2022-05-31 22:05:13.235981

 """

-import sqlalchemy as sa
 from alembic import op
+import sqlalchemy as sa

 # revision identifiers, used by Alembic.
 revision = "5f3370328e44"
@@ -6,8 +6,8 @@ Create Date: 2023-03-20 00:39:30.199915

 """

-import sqlalchemy as sa
 from alembic import op
+import sqlalchemy as sa
 from sqlalchemy.dialects.postgresql import JSONB

 # revision identifiers, used by Alembic.
@@ -6,8 +6,8 @@ Create Date: 2023-03-20 11:08:42.883556

 """

-import sqlalchemy as sa
 from alembic import op
+import sqlalchemy as sa
 from sqlalchemy.dialects.postgresql import JSONB

 # revision identifiers, used by Alembic.
@@ -6,8 +6,8 @@ Create Date: 2023-03-20 15:38:20.220599

 """

-import sqlalchemy as sa
 from alembic import op
+import sqlalchemy as sa

 # revision identifiers, used by Alembic.
 revision = "8d3863e9d74b"
@@ -6,8 +6,8 @@ Create Date: 2022-03-29 21:01:38.213153

 """

-import sqlalchemy as sa
 from alembic import op
+import sqlalchemy as sa

 # revision identifiers, used by Alembic.
 revision = "a333d6224193"
@@ -6,10 +6,10 @@ Create Date: 2023-03-20 01:14:42.623789

 """

-import sqlalchemy as sa
 from alembic import op
-from sqlalchemy.orm import Session
+import sqlalchemy as sa
 from sqlalchemy.ext.automap import automap_base
+from sqlalchemy.orm import Session

 # revision identifiers, used by Alembic.
 revision = "a5466912fad0"
@@ -6,8 +6,8 @@ Create Date: 2023-03-09 19:10:42.168133

 """

-import sqlalchemy as sa
 from alembic import op
+import sqlalchemy as sa

 # revision identifiers, used by Alembic.
 revision = "aceef470d69c"
@@ -6,11 +6,11 @@ Create Date: 2023-03-02 14:04:16.492133

 """

-import sqlalchemy as sa
 from alembic import op
+import sqlalchemy as sa
 from sqlalchemy import select
-from sqlalchemy.orm import Session
 from sqlalchemy.ext.automap import automap_base
+from sqlalchemy.orm import Session

 # revision identifiers, used by Alembic.
 revision = "bd92923c218f"
@@ -6,8 +6,8 @@ Create Date: 2024-09-23 10:03:30.593263

 """

-import sqlalchemy as sa
 from alembic import op
+import sqlalchemy as sa
 from sqlalchemy import Text
 from sqlalchemy.dialects import postgresql

@@ -6,10 +6,10 @@ Create Date: 2023-08-25 00:20:51.511329

 """

-import sqlalchemy as sa
 from alembic import op
-from sqlalchemy.orm import Session
+import sqlalchemy as sa
 from sqlalchemy.ext.automap import automap_base
+from sqlalchemy.orm import Session

 # revision identifiers, used by Alembic.
 revision = "f9baef347cc8"
@@ -3,4 +3,4 @@
 from . import v1, v2, v3
 from .base import NBESFBase

-__all__ = ["v1", "v2", "v3", "NBESFBase"]
+__all__ = ["NBESFBase", "v1", "v2", "v3"]
@@ -1,10 +1,10 @@
 from abc import ABC

-from pydantic import BaseModel
 from nonebot.compat import PYDANTIC_V2, ConfigDict
 from nonebot_plugin_saa.registries import AllSupportedPlatformTarget as UserInfo
+from pydantic import BaseModel

-from ....types import Tag, Category
+from nonebot_bison.types import Category, Tag


 class NBESFBase(BaseModel, ABC):
@@ -1,17 +1,18 @@
 """nbesf is Nonebot Bison Enchangable Subscribes File! ver.1"""

-from typing import Any
 from functools import partial
+from typing import Any

-from nonebot.log import logger
-from pydantic import BaseModel
-from nonebot_plugin_saa import TargetQQGroup, TargetQQPrivate
 from nonebot.compat import PYDANTIC_V2, ConfigDict, model_dump, type_validate_json, type_validate_python
+from nonebot.log import logger
+from nonebot_plugin_saa import TargetQQGroup, TargetQQPrivate
+from pydantic import BaseModel, Field
+
+from nonebot_bison.config.db_config import SubscribeDupException, config
+from nonebot_bison.config.subs_io.utils import NBESFParseErr
+from nonebot_bison.types import Category, Tag

-from ..utils import NBESFParseErr
-from ....types import Tag, Category
 from .base import NBESFBase, SubReceipt
-from ...db_config import SubscribeDupException, config

 # ===== nbesf 定义格式 ====== #
 NBESF_VERSION = 1
@@ -79,7 +80,7 @@ class SubGroup(
    """

    version: int = NBESF_VERSION
-    groups: list[SubPack] = []
+    groups: list[SubPack] = Field(default_factory=list)


 # ======================= #
@@ -108,11 +109,11 @@ async def subs_receipt_gen(nbesf_data: SubGroup):
            try:
                await config.add_subscribe(receipt.user, **model_dump(receipt, exclude={"user"}))
            except SubscribeDupException:
-                logger.warning(f"！添加订阅条目 {repr(receipt)} 失败: 相同的订阅已存在")
+                logger.warning(f"！添加订阅条目 {receipt!r} 失败: 相同的订阅已存在")
            except Exception as e:
-                logger.error(f"！添加订阅条目 {repr(receipt)} 失败: {repr(e)}")
+                logger.error(f"！添加订阅条目 {receipt!r} 失败: {e!r}")
            else:
-                logger.success(f"添加订阅条目 {repr(receipt)} 成功！")
+                logger.success(f"添加订阅条目 {receipt!r} 成功！")


 def nbesf_parser(raw_data: Any) -> SubGroup:
@@ -1,17 +1,18 @@
 """nbesf is Nonebot Bison Enchangable Subscribes File! ver.2"""

-from typing import Any
 from functools import partial
+from typing import Any

-from nonebot.log import logger
-from pydantic import BaseModel
-from nonebot_plugin_saa.registries import AllSupportedPlatformTarget
 from nonebot.compat import PYDANTIC_V2, ConfigDict, model_dump, type_validate_json, type_validate_python
+from nonebot.log import logger
+from nonebot_plugin_saa.registries import AllSupportedPlatformTarget
+from pydantic import BaseModel, Field
+
+from nonebot_bison.config.db_config import SubscribeDupException, config
+from nonebot_bison.config.subs_io.utils import NBESFParseErr
+from nonebot_bison.types import Category, Tag

-from ..utils import NBESFParseErr
-from ....types import Tag, Category
 from .base import NBESFBase, SubReceipt
-from ...db_config import SubscribeDupException, config

 # ===== nbesf 定义格式 ====== #
 NBESF_VERSION = 2
@@ -64,7 +65,7 @@ class SubGroup(NBESFBase):
    """

    version: int = NBESF_VERSION
-    groups: list[SubPack] = []
+    groups: list[SubPack] = Field(default_factory=list)


 # ======================= #
@@ -85,11 +86,11 @@ async def subs_receipt_gen(nbesf_data: SubGroup):
            try:
                await config.add_subscribe(receipt.user, **model_dump(receipt, exclude={"user"}))
            except SubscribeDupException:
-                logger.warning(f"！添加订阅条目 {repr(receipt)} 失败: 相同的订阅已存在")
+                logger.warning(f"！添加订阅条目 {receipt!r} 失败: 相同的订阅已存在")
            except Exception as e:
-                logger.error(f"！添加订阅条目 {repr(receipt)} 失败: {repr(e)}")
+                logger.error(f"！添加订阅条目 {receipt!r} 失败: {e!r}")
            else:
-                logger.success(f"添加订阅条目 {repr(receipt)} 成功！")
+                logger.success(f"添加订阅条目 {receipt!r} 成功！")


 def nbesf_parser(raw_data: Any) -> SubGroup:
@@ -1,18 +1,20 @@
 """nbesf is Nonebot Bison Enchangable Subscribes File! ver.2"""

-from typing import Any
 from functools import partial
+from typing import Any

-from nonebot.log import logger
-from pydantic import BaseModel
-from nonebot_plugin_saa.registries import AllSupportedPlatformTarget
 from nonebot.compat import PYDANTIC_V2, ConfigDict, model_dump, type_validate_json, type_validate_python
+from nonebot.log import logger
+from nonebot_plugin_saa.registries import AllSupportedPlatformTarget
+from pydantic import BaseModel, Field
+
+from nonebot_bison.config.db_config import SubscribeDupException, config
+from nonebot_bison.config.db_model import Cookie as DBCookie
+from nonebot_bison.config.subs_io.utils import NBESFParseErr
+from nonebot_bison.types import Category, Tag
+from nonebot_bison.types import Target as T_Target

-from ..utils import NBESFParseErr
-from ....types import Tag, Category
 from .base import NBESFBase, SubReceipt
-from ...db_model import Cookie as DBCookie
-from ...db_config import SubscribeDupException, config

 # ===== nbesf 定义格式 ====== #
 NBESF_VERSION = 3
@@ -77,8 +79,8 @@ class SubGroup(NBESFBase):
    """

    version: int = NBESF_VERSION
-    groups: list[SubPack] = []
-    cookies: list[Cookie] = []
+    groups: list[SubPack] = Field(default_factory=list)
+    cookies: list[Cookie] = Field(default_factory=list)


 # ======================= #
@@ -100,11 +102,11 @@ async def subs_receipt_gen(nbesf_data: SubGroup):
            try:
                await config.add_subscribe(receipt.user, **model_dump(receipt, exclude={"user"}))
            except SubscribeDupException:
-                logger.warning(f"！添加订阅条目 {repr(receipt)} 失败: 相同的订阅已存在")
+                logger.warning(f"！添加订阅条目 {receipt!r} 失败: 相同的订阅已存在")
            except Exception as e:
-                logger.error(f"！添加订阅条目 {repr(receipt)} 失败: {repr(e)}")
+                logger.error(f"！添加订阅条目 {receipt!r} 失败: {e!r}")
            else:
-                logger.success(f"添加订阅条目 {repr(receipt)} 成功！")
+                logger.success(f"添加订阅条目 {receipt!r} 成功！")


 async def magic_cookie_gen(nbesf_data: SubGroup):
@@ -114,11 +116,11 @@ async def magic_cookie_gen(nbesf_data: SubGroup):
            new_cookie = DBCookie(**model_dump(cookie, exclude={"targets"}))
            cookie_id = await config.add_cookie(new_cookie)
            for target in cookie.targets:
-                await config.add_cookie_target(target.target, target.platform_name, cookie_id)
+                await config.add_cookie_target(T_Target(target.target), target.platform_name, cookie_id)
        except Exception as e:
-            logger.error(f"！添加 Cookie 条目 {repr(cookie)} 失败: {repr(e)}")
+            logger.error(f"！添加 Cookie 条目 {cookie!r} 失败: {e!r}")
        else:
-            logger.success(f"添加 Cookie 条目 {repr(cookie)} 成功！")
+            logger.success(f"添加 Cookie 条目 {cookie!r} 成功！")


 def nbesf_parser(raw_data: Any) -> SubGroup:
@@ -1,19 +1,20 @@
-from typing import cast
 from collections import defaultdict
 from collections.abc import Callable
+from typing import cast

-from sqlalchemy import select
-from nonebot.log import logger
-from sqlalchemy.sql.selectable import Select
-from nonebot_plugin_saa import PlatformTarget
 from nonebot.compat import type_validate_python
+from nonebot.log import logger
 from nonebot_plugin_datastore.db import create_session
+from nonebot_plugin_saa import PlatformTarget
+from sqlalchemy import select
 from sqlalchemy.orm.strategy_options import selectinload
+from sqlalchemy.sql.selectable import Select
+
+from nonebot_bison.config import config
+from nonebot_bison.config.db_model import Cookie, CookieTarget, Subscribe, Target, User

-from .. import config
-from .utils import NBESFVerMatchErr, row2dict
 from .nbesf_model import NBESFBase, v1, v2, v3
-from ..db_model import User, Cookie, Target, Subscribe, CookieTarget
+from .utils import NBESFVerMatchErr, row2dict


 async def subscribes_export(selector: Callable[[Select], Select]) -> v3.SubGroup:
@@ -65,7 +66,7 @@ async def subscribes_export(selector: Callable[[Select], Select]) -> v3.SubGroup
        target_payload = type_validate_python(v3.Target, cookie_target.target)
        cookie_target_dict[cookie_target.cookie].append(target_payload)

-    def cookie_transform(cookie: Cookie, targets: [Target]) -> v3.Cookie:
+    def cookie_transform(cookie: Cookie, targets: list[v3.Target]) -> v3.Cookie:
        cookie_dict = row2dict(cookie)
        cookie_dict["tags"] = cookie.tags
        cookie_dict["targets"] = targets
@@ -1,4 +1,6 @@
-from ..db_model import Model
+from typing import Any
+
+from sqlalchemy.orm import DeclarativeBase


 class NBESFVerMatchErr(Exception): ...
@@ -7,7 +9,7 @@ class NBESFVerMatchErr(Exception): ...
 class NBESFParseErr(Exception): ...


-def row2dict(row: Model) -> dict:
+def row2dict(row: DeclarativeBase) -> dict[str, Any]:
    d = {}
    for column in row.__table__.columns:
        d[column.name] = str(getattr(row, column.name))
@@ -1,9 +1,10 @@
-from pathlib import Path
-from pkgutil import iter_modules
 from collections import defaultdict
 from importlib import import_module
+from pathlib import Path
+from pkgutil import iter_modules
+
+from nonebot_bison.plugin_config import plugin_config

-from ..plugin_config import plugin_config
 from .platform import Platform, make_no_target_group

 _package_dir = str(Path(__file__).resolve().parent)
@@ -1,18 +1,19 @@
-import re
-import html
-from typing import Any
 from functools import partial
+import html
+import re
+from typing import Any, ClassVar

-from yarl import URL
-from httpx import AsyncClient
 from bs4 import BeautifulSoup as bs
-from pydantic import Field, BaseModel
+from httpx import AsyncClient
 from nonebot.compat import type_validate_python
+from pydantic import BaseModel, Field
+from yarl import URL
+
+from nonebot_bison.post import Post
+from nonebot_bison.post.protocol import HTMLContentSupport
+from nonebot_bison.types import Category, RawPost, Target
+from nonebot_bison.utils import Site

-from ..post import Post
-from ..utils import Site
-from ..types import Target, RawPost, Category
-from ..post.protocol import HTMLContentSupport
 from .platform import NewMessage, StatusChange


@@ -58,7 +59,7 @@ class ArkBulletinResponse(ArkResponseBase):
 class ArknightsSite(Site):
    name = "arknights"
    schedule_type = "interval"
-    schedule_setting = {"seconds": 30}
+    schedule_setting: ClassVar[dict] = {"seconds": 30}


 class ArknightsPost(Post, HTMLContentSupport):
@@ -95,7 +96,7 @@ class ArknightsPost(Post, HTMLContentSupport):


 class Arknights(NewMessage):
-    categories = {1: "游戏公告"}
+    categories: ClassVar[dict[Category, str]] = {1: "游戏公告"}
    platform_name = "arknights"
    name = "明日方舟游戏信息"
    enable_tag = False
@@ -157,7 +158,7 @@ class Arknights(NewMessage):


 class AkVersion(StatusChange):
-    categories = {2: "更新信息"}
+    categories: ClassVar[dict[Category, str]] = {2: "更新信息"}
    platform_name = "arknights"
    name = "明日方舟游戏信息"
    enable_tag = False
@@ -202,7 +203,7 @@ class AkVersion(StatusChange):


 class MonsterSiren(NewMessage):
-    categories = {3: "塞壬唱片新闻"}
+    categories: ClassVar[dict[Category, str]] = {3: "塞壬唱片新闻"}
    platform_name = "arknights"
    name = "明日方舟游戏信息"
    enable_tag = False
@@ -250,7 +251,7 @@ class MonsterSiren(NewMessage):


 class TerraHistoricusComic(NewMessage):
-    categories = {4: "泰拉记事社漫画"}
+    categories: ClassVar[dict[Category, str]] = {4: "泰拉记事社漫画"}
    platform_name = "arknights"
    name = "明日方舟游戏信息"
    enable_tag = False
@@ -1,7 +1,7 @@
 from .platforms import Bilibili as Bilibili
-from .platforms import Bilibililive as Bilibililive
-from .scheduler import BilibiliSite as BilibiliSite
-from .scheduler import BililiveSite as BililiveSite
 from .platforms import BilibiliBangumi as BilibiliBangumi
+from .platforms import Bilibililive as Bilibililive
 from .scheduler import BiliBangumiSite as BiliBangumiSite
 from .scheduler import BilibiliClientManager as BilibiliClientManager
+from .scheduler import BilibiliSite as BilibiliSite
+from .scheduler import BililiveSite as BililiveSite
@@ -1,22 +1,22 @@
-import sys
 import asyncio
-import inspect
+from collections.abc import AsyncGenerator, Awaitable, Callable, Sequence
+from collections.abc import Set as AbstractSet
+from dataclasses import dataclass
 from enum import Enum
 from functools import wraps
-from dataclasses import dataclass
-from collections.abc import Set as AbstractSet
-from collections.abc import Callable, Sequence, Awaitable, AsyncGenerator
+import inspect
+import sys
 from typing import (
    TYPE_CHECKING,
    Any,
+    Concatenate,
    Generic,
-    TypeVar,
-    Protocol,
+    NamedTuple,
    ParamSpec,
+    Protocol,
    TypeAlias,
    TypedDict,
-    NamedTuple,
-    Concatenate,
+    TypeVar,
    overload,
    runtime_checkable,
 )
@@ -1,7 +1,7 @@
-from typing import Any, Literal, TypeVar, TypeAlias
+from typing import Any, Literal, TypeAlias, TypeVar

-from pydantic import BaseModel
 from nonebot.compat import PYDANTIC_V2, ConfigDict
+from pydantic import BaseModel

 from nonebot_bison.compat import model_rebuild

@@ -13,7 +13,7 @@ TBaseModel = TypeVar("TBaseModel", bound=type[BaseModel])
 def model_rebuild_recurse(cls: TBaseModel) -> TBaseModel:
    """Recursively rebuild all BaseModel subclasses in the class."""
    if not PYDANTIC_V2:
-        from inspect import isclass, getmembers
+        from inspect import getmembers, isclass

        for _, sub_cls in getmembers(cls, lambda x: isclass(x) and issubclass(x, BaseModel)):
            model_rebuild_recurse(sub_cls)
@@ -131,7 +131,7 @@ class PostAPI(APIBase):
        basic: "PostAPI.Basic"
        id_str: str
        modules: "PostAPI.Modules"
-        orig: "PostAPI.Item | None" = None
+        orig: "PostAPI.Item | PostAPI.DeletedItem | None" = None
        topic: "PostAPI.Topic | None" = None
        type: DynamicType

@@ -141,6 +141,14 @@ class PostAPI(APIBase):
        modules: "PostAPI.Modules"
        type: Literal["DYNAMIC_TYPE_NONE"]

+        def to_item(self) -> "PostAPI.Item":
+            return PostAPI.Item(
+                basic=self.basic,
+                id_str="",
+                modules=self.modules,
+                type=self.type,
+            )
+
    class Data(Base):
        items: "list[PostAPI.Item | PostAPI.DeletedItem] | None" = None

@@ -1,40 +1,41 @@
-import re
-import json
 from copy import deepcopy
 from enum import Enum, unique
-from typing import NamedTuple
+import json
+import re
+from typing import ClassVar, NamedTuple
 from typing_extensions import Self

-from yarl import URL
-from nonebot import logger
 from httpx import AsyncClient
-from pydantic import Field, BaseModel, ValidationError
+from nonebot import logger
 from nonebot.compat import type_validate_json, type_validate_python
+from pydantic import BaseModel, Field, ValidationError
+from yarl import URL

-from nonebot_bison.post.post import Post
 from nonebot_bison.compat import model_rebuild
-from nonebot_bison.utils import text_similarity, decode_unicode_escapes
-from nonebot_bison.types import Tag, Target, RawPost, ApiError, Category
+from nonebot_bison.platform.platform import CategoryNotRecognize, CategoryNotSupport, NewMessage, StatusChange
+from nonebot_bison.post.post import Post
+from nonebot_bison.types import ApiError, Category, RawPost, Tag, Target
+from nonebot_bison.utils import decode_unicode_escapes, text_similarity

-from .retry import ApiCode352Error, retry_for_352
-from .scheduler import BilibiliSite, BililiveSite, BiliBangumiSite
-from ..platform import NewMessage, StatusChange, CategoryNotSupport, CategoryNotRecognize
 from .models import (
-    PostAPI,
-    UserAPI,
-    PGCMajor,
-    DrawMajor,
-    LiveMajor,
-    OPUSMajor,
-    DynRawPost,
-    VideoMajor,
-    CommonMajor,
-    DynamicType,
    ArticleMajor,
+    CommonMajor,
    CoursesMajor,
-    UnknownMajor,
+    DeletedMajor,
+    DrawMajor,
+    DynamicType,
+    DynRawPost,
+    LiveMajor,
    LiveRecommendMajor,
+    OPUSMajor,
+    PGCMajor,
+    PostAPI,
+    UnknownMajor,
+    UserAPI,
+    VideoMajor,
 )
+from .retry import ApiCode352Error, retry_for_352
+from .scheduler import BiliBangumiSite, BilibiliSite, BililiveSite


 class _ProcessedText(NamedTuple):
@@ -50,7 +51,7 @@ class _ParsedMojarPost(NamedTuple):


 class Bilibili(NewMessage):
-    categories = {
+    categories: ClassVar[dict[Category, str]] = {
        1: "一般动态",
        2: "专栏文章",
        3: "视频",
@@ -93,7 +94,7 @@ class Bilibili(NewMessage):
    @retry_for_352
    async def get_sub_list(self, target: Target) -> list[DynRawPost]:
        client = await self.ctx.get_client(target)
-        params = {"host_mid": target, "timezone_offset": -480, "offset": ""}
+        params = {"host_mid": target, "timezone_offset": -480, "offset": "", "features": "itemOpusStyle"}
        res = await client.get(
            "https://api.bilibili.com/x/polymer/web-dynamic/v1/feed/space",
            params=params,
@@ -161,7 +162,6 @@ class Bilibili(NewMessage):
        return tags

    def _text_process(self, dynamic: str, desc: str, title: str) -> _ProcessedText:
-
        # 计算视频标题和视频描述相似度
        title_similarity = 0.0 if len(title) == 0 or len(desc) == 0 else text_similarity(title, desc[: len(title)])
        if title_similarity > 0.9:
@@ -243,6 +243,13 @@ class Bilibili(NewMessage):
                    pics=[courses.cover],
                    url=URL(courses.jump_url).with_scheme("https").human_repr(),
                )
+            case DeletedMajor(none=none):
+                return _ParsedMojarPost(
+                    title="",
+                    content=none.tips,
+                    pics=[],
+                    url=None,
+                )
            case UnknownMajor(type=unknown_type):
                raise CategoryNotSupport(unknown_type)
            case None:  # 没有major的情况
@@ -259,10 +266,13 @@ class Bilibili(NewMessage):
        parsed_raw_post = self.pre_parse_by_mojar(raw_post)
        parsed_raw_repost = None
        if self._do_get_category(raw_post.type) == Category(5):
-            if raw_post.orig:
-                parsed_raw_repost = self.pre_parse_by_mojar(raw_post.orig)
-            else:
-                logger.warning(f"转发动态{raw_post.id_str}没有原动态")
+            match raw_post.orig:
+                case PostAPI.Item() as orig:
+                    parsed_raw_repost = self.pre_parse_by_mojar(orig)
+                case PostAPI.DeletedItem() as orig:
+                    parsed_raw_repost = self.pre_parse_by_mojar(orig.to_item())
+                case None:
+                    logger.warning(f"转发动态{raw_post.id_str}没有原动态")

        post = Post(
            self,
@@ -275,8 +285,14 @@ class Bilibili(NewMessage):
            nickname=raw_post.modules.module_author.name,
        )
        if parsed_raw_repost:
-            orig = raw_post.orig
-            assert orig
+            match raw_post.orig:
+                case PostAPI.Item() as orig:
+                    orig = orig
+                case PostAPI.DeletedItem() as orig:
+                    orig = orig.to_item()
+                case None:
+                    raise ValueError("转发动态没有原动态")
+
            post.repost = Post(
                self,
                content=decode_unicode_escapes(parsed_raw_repost.content),
@@ -291,7 +307,7 @@ class Bilibili(NewMessage):


 class Bilibililive(StatusChange):
-    categories = {1: "开播提醒", 2: "标题更新提醒", 3: "下播提醒"}
+    categories: ClassVar[dict[Category, str]] = {1: "开播提醒", 2: "标题更新提醒", 3: "下播提醒"}
    platform_name = "bilibili-live"
    enable_tag = False
    enabled = True
@@ -441,7 +457,7 @@ class Bilibililive(StatusChange):


 class BilibiliBangumi(StatusChange):
-    categories = {}
+    categories: ClassVar[dict[Category, str]] = {}
    platform_name = "bilibili-bangumi"
    enable_tag = False
    enabled = True
@@ -1,20 +1,20 @@
-import random
-from enum import Enum
-from functools import wraps
+from collections.abc import Awaitable, Callable
 from dataclasses import dataclass
 from datetime import datetime, timedelta
-from collections.abc import Callable, Awaitable
-from typing_extensions import override, assert_never
+from enum import Enum
+from functools import wraps
+import random
 from typing import TYPE_CHECKING, Generic, Literal, TypeVar
+from typing_extensions import assert_never, override

-from strenum import StrEnum
-from nonebot.log import logger
 from httpx import URL as HttpxURL
+from nonebot.log import logger
+from strenum import StrEnum

 from nonebot_bison.types import Target

+from .fsm import FSM, ActionReturn, Condition, StateGraph, Transition, reset_on_exception
 from .models import DynRawPost
-from .fsm import FSM, Condition, StateGraph, Transition, ActionReturn, reset_on_exception

 if TYPE_CHECKING:
    from .platforms import Bilibili
@@ -115,8 +115,7 @@ class RetryAddon(Generic[TBilibili]):

    def record_backoff_finish_time(self):
        self.backoff_finish_time = (
-            datetime.now()
-            + self.backoff_timedelta * self.backoff_count**2
+            datetime.now() + self.backoff_timedelta * self.backoff_count**2
            # + timedelta(seconds=random.randint(1, 60)) # jitter
        )
        logger.trace(f"set backoff finish time: {self.backoff_finish_time}")
@@ -1,17 +1,16 @@
+from datetime import datetime, timedelta
 import json
 import random
+from typing import TYPE_CHECKING, ClassVar, TypeVar
 from typing_extensions import override
-from datetime import datetime, timedelta
-from typing import TYPE_CHECKING, TypeVar

 from httpx import AsyncClient
 from nonebot import logger, require
 from playwright.async_api import Cookie

+from nonebot_bison.config.db_model import Cookie as CookieModel
 from nonebot_bison.utils import Site, http_client
-
-from ...utils.site import CookieClientManager
-from ...config.db_model import Cookie as CookieModel
+from nonebot_bison.utils.site import CookieClientManager

 if TYPE_CHECKING:
    from .platforms import Bilibili
@@ -23,7 +22,6 @@ B = TypeVar("B", bound="Bilibili")


 class BilibiliClientManager(CookieClientManager):
-
    _default_cookie_cd = timedelta(seconds=120)

    async def _get_cookies(self) -> list[Cookie]:
@@ -75,7 +73,7 @@ class BilibiliClientManager(CookieClientManager):

 class BilibiliSite(Site):
    name = "bilibili.com"
-    schedule_setting = {"seconds": 60}
+    schedule_setting: ClassVar[dict] = {"seconds": 60}
    schedule_type = "interval"
    client_mgr = BilibiliClientManager
    require_browser = True
@@ -83,11 +81,11 @@ class BilibiliSite(Site):

 class BililiveSite(Site):
    name = "live.bilibili.com"
-    schedule_setting = {"seconds": 5}
+    schedule_setting: ClassVar[dict] = {"seconds": 5}
    schedule_type = "interval"


 class BiliBangumiSite(Site):
    name = "bilibili.com/bangumi"
-    schedule_setting = {"seconds": 30}
+    schedule_setting: ClassVar[dict] = {"seconds": 30}
    schedule_type = "interval"
@@ -1,16 +1,16 @@
-from typing import TypeAlias
-from functools import partial
-from datetime import timedelta
-from types import MappingProxyType
 from collections.abc import Callable
+from datetime import timedelta
+from functools import partial
+from types import MappingProxyType
+from typing import TypeAlias

+from expiringdictx import ExpiringDict, SimpleCache
+from hishel import AsyncCacheTransport, AsyncInMemoryStorage, Controller
 from httpx import AsyncClient, AsyncHTTPTransport
-from expiringdictx import SimpleCache, ExpiringDict
-from hishel import Controller, AsyncCacheTransport, AsyncInMemoryStorage

 from .const import DATASOURCE_URL
-from .utils import process_response
 from .models import CeobeSource, CeobeTarget, DataSourceResponse
+from .utils import process_response

 cache_transport = AsyncCacheTransport(
    AsyncHTTPTransport(),
@@ -1,4 +1,4 @@
 DATASOURCE_URL = "https://server.ceobecanteen.top/api/v1/canteen/config/datasource/list"
 COMB_ID_URL = "https://server.ceobecanteen.top/api/v1/canteen/user/getDatasourceComb"
-COOKIE_ID_URL = "http://cdn.ceobecanteen.top/datasource-comb"
+COOKIE_ID_URL = "https://cdn.ceobecanteen.top/datasource-comb"
 COOKIES_URL = "https://server-cdn.ceobecanteen.top/api/v1/cdn/cookie/mainList/cookieList"
@@ -1,4 +1,4 @@
-from typing import Literal, TypeVar, NamedTuple
+from typing import Literal, NamedTuple, TypeVar

 from pydantic import BaseModel

@@ -1,23 +1,23 @@
-from typing import ParamSpec
-from functools import partial
-from datetime import timedelta
 from collections import defaultdict
+from datetime import timedelta
+from functools import partial
+from typing import ClassVar, ParamSpec

 from httpx import AsyncClient
 from nonebot import logger, require
 from rapidfuzz import fuzz, process

-from nonebot_bison.post import Post
+from nonebot_bison.platform.platform import NewMessage
 from nonebot_bison.plugin_config import plugin_config
-from nonebot_bison.types import Target, RawPost, Category
-from nonebot_bison.utils import Site, ClientManager, capture_html
+from nonebot_bison.post import Post
+from nonebot_bison.types import Category, RawPost, Target
+from nonebot_bison.utils import ClientManager, Site, capture_html

-from ..platform import NewMessage
-from .utils import process_response
-from .const import COMB_ID_URL, COOKIES_URL, COOKIE_ID_URL
-from .exception import CeobeSnapshotSkip, CeobeSnapshotFailed
 from .cache import CeobeCache, CeobeClient, CeobeDataSourceCache
-from .models import CeobeImage, CeobeCookie, CeobeTextPic, CombIdResponse, CookiesResponse, CookieIdResponse
+from .const import COMB_ID_URL, COOKIE_ID_URL, COOKIES_URL
+from .exception import CeobeSnapshotFailed, CeobeSnapshotSkip
+from .models import CeobeCookie, CeobeImage, CeobeTextPic, CombIdResponse, CookieIdResponse, CookiesResponse
+from .utils import process_response

 P = ParamSpec("P")

@@ -49,7 +49,7 @@ class CeobeCanteenSite(Site):
    name = "ceobe_canteen"
    schedule_type = "interval"
    # lwt の 推荐间隔
-    schedule_setting = {"seconds": 15}
+    schedule_setting: ClassVar[dict] = {"seconds": 15}
    client_mgr = CeobeCanteenClientManager


@@ -64,7 +64,7 @@ class CeobeCanteen(NewMessage):
    use_batch: bool = True
    default_theme: str = "ceobecanteen"

-    categories: dict[Category, str] = {1: "普通", 2: "转发"}
+    categories: ClassVar[dict[Category, str]] = {1: "普通", 2: "转发"}

    data_source_cache = CeobeDataSourceCache()

@@ -213,7 +213,9 @@ class CeobeCanteen(NewMessage):
        logger.debug(f"snapshot official website url: {url}")

        # /html/body/div[1]/div[1]/div/div[1]/div[1]/div
-        snapshot_selector = "html > body > div:nth-child(1) > div:nth-child(1) > div > div:nth-child(1) > div:nth-child(1) > div"  # noqa: E501
+        snapshot_selector = (
+            "html > body > div:nth-child(1) > div:nth-child(1) > div > div:nth-child(1) > div:nth-child(1) > div"
+        )
        # /html/body/div[1]/div[1]/div/div[1]/div[1]/div/div[4]/div/div/div
        calculate_selector = "html > body > div:nth-child(1) > div:nth-child(1) > div > div:nth-child(1) > div:nth-child(1) > div > div:nth-child(4) > div > div > div"  # noqa: E501
        viewport = {"width": 1024, "height": 19990}
@@ -3,7 +3,7 @@ from nonebot import logger
 from nonebot.compat import type_validate_python

 from .exception import CeobeResponseError
-from .models import ResponseModel, CookieIdResponse
+from .models import CookieIdResponse, ResponseModel


 def process_response(response: Response, parse_model: type[ResponseModel]) -> ResponseModel:
@@ -1,15 +1,16 @@
-from typing import Any
+from typing import Any, ClassVar

 from httpx import AsyncClient

-from ..post import Post
+from nonebot_bison.post import Post
+from nonebot_bison.types import RawPost, Target
+from nonebot_bison.utils import anonymous_site
+
 from .platform import NewMessage
-from ..utils import anonymous_site
-from ..types import Target, RawPost


 class FF14(NewMessage):
-    categories = {}
+    categories: ClassVar[dict] = {}
    platform_name = "ff14"
    name = "最终幻想XIV官方公告"
    enable_tag = False
@@ -1,22 +1,23 @@
 import re
-from typing import Any
+from typing import Any, ClassVar

 from httpx import AsyncClient

-from ..post import Post
-from ..utils import Site
+from nonebot_bison.post import Post
+from nonebot_bison.types import ApiError, Category, RawPost, Target
+from nonebot_bison.utils import Site
+
 from .platform import NewMessage
-from ..types import Target, RawPost, ApiError


 class NcmSite(Site):
    name = "music.163.com"
    schedule_type = "interval"
-    schedule_setting = {"minutes": 1}
+    schedule_setting: ClassVar[dict] = {"minutes": 1}


 class NcmArtist(NewMessage):
-    categories = {}
+    categories: ClassVar[dict[Category, str]] = {}
    platform_name = "ncm-artist"
    enable_tag = False
    enabled = True
@@ -73,7 +74,7 @@ class NcmArtist(NewMessage):


 class NcmRadio(NewMessage):
-    categories = {}
+    categories: ClassVar[dict[Category, str]] = {}
    platform_name = "ncm-radio"
    enable_tag = False
    enabled = True
@@ -1,22 +1,22 @@
-import ssl
-import json
-import time
-import typing
-from dataclasses import dataclass
 from abc import ABC, abstractmethod
 from collections import defaultdict
-from typing import Any, TypeVar, ParamSpec
-from collections.abc import Callable, Awaitable, Collection
+from collections.abc import Awaitable, Callable, Collection
+from dataclasses import dataclass
+import json
+import ssl
+import time
+import typing
+from typing import Any, ParamSpec, TypeVar

 import httpx
 from httpx import AsyncClient
 from nonebot.log import logger
 from nonebot_plugin_saa import PlatformTarget

-from ..post import Post
-from ..utils import Site, ProcessContext
-from ..plugin_config import plugin_config
-from ..types import Tag, Target, RawPost, SubUnit, Category
+from nonebot_bison.plugin_config import plugin_config
+from nonebot_bison.post import Post
+from nonebot_bison.types import Category, RawPost, SubUnit, Tag, Target
+from nonebot_bison.utils import ProcessContext, Site


 class CategoryNotSupport(Exception):
@@ -1,27 +1,27 @@
-import time
 import calendar
-from typing import Any
+import time
+from typing import Any, ClassVar

+from bs4 import BeautifulSoup as bs
 import feedparser
 from httpx import AsyncClient
-from bs4 import BeautifulSoup as bs

-from ..post import Post
+from nonebot_bison.post import Post
+from nonebot_bison.types import Category, RawPost, Target
+from nonebot_bison.utils import text_similarity
+from nonebot_bison.utils.site import CookieClientManager, Site
+
 from .platform import NewMessage
-from ..types import Target, RawPost
-from ..utils import text_similarity
-from ..utils.site import Site, CookieClientManager


 class RssSite(Site):
    name = "rss"
    schedule_type = "interval"
-    schedule_setting = {"seconds": 30}
+    schedule_setting: ClassVar[dict] = {"seconds": 30}
    client_mgr = CookieClientManager.from_name(name)


 class RssPost(Post):
-
    async def get_plain_content(self) -> str:
        soup = bs(self.content, "html.parser")

@@ -38,7 +38,7 @@ class RssPost(Post):


 class Rss(NewMessage):
-    categories = {}
+    categories: ClassVar[dict[Category, str]] = {}
    enable_tag = False
    platform_name = "rss"
    name = "Rss"
@@ -1,21 +1,22 @@
-import re
-import json
-from typing import Any
 from datetime import datetime
-from urllib.parse import unquote
+import json
+import re
+from typing import Any, ClassVar
 from typing_extensions import override
+from urllib.parse import unquote

-from yarl import URL
-from lxml.etree import HTML
-from httpx import AsyncClient
-from nonebot.log import logger
 from bs4 import BeautifulSoup as bs
+from httpx import AsyncClient
+from lxml.etree import HTML
+from nonebot.log import logger
+from yarl import URL
+
+from nonebot_bison.post import Post
+from nonebot_bison.types import ApiError, Category, RawPost, Tag, Target
+from nonebot_bison.utils import http_client, text_fletten
+from nonebot_bison.utils.site import CookieClientManager, Site

-from ..post import Post
 from .platform import NewMessage
-from ..utils import http_client, text_fletten
-from ..utils.site import Site, CookieClientManager
-from ..types import Tag, Target, RawPost, ApiError, Category

 _HEADER = {
    "accept": (
@@ -59,12 +60,12 @@ class WeiboClientManager(CookieClientManager):
 class WeiboSite(Site):
    name = "weibo.com"
    schedule_type = "interval"
-    schedule_setting = {"seconds": 3}
+    schedule_setting: ClassVar[dict] = {"seconds": 3}
    client_mgr = WeiboClientManager


 class Weibo(NewMessage):
-    categories = {
+    categories: ClassVar[dict[Category, str]] = {
        1: "转发",
        2: "视频",
        3: "图文",
@@ -1,8 +1,8 @@
 import nonebot
-from yarl import URL
 from nonebot import get_plugin_config
-from pydantic import Field, BaseModel
 from nonebot.compat import PYDANTIC_V2, ConfigDict
+from pydantic import BaseModel, Field
+from yarl import URL

 global_config = nonebot.get_driver().config
 PlatformName = str
@@ -1,10 +1,10 @@
-from dataclasses import dataclass
 from abc import ABC, abstractmethod
+from dataclasses import dataclass

-from nonebot_plugin_saa import Text, MessageFactory, MessageSegmentFactory
+from nonebot_plugin_saa import MessageFactory, MessageSegmentFactory, Text

-from ..utils import text_to_image
-from ..plugin_config import plugin_config
+from nonebot_bison.plugin_config import plugin_config
+from nonebot_bison.utils import text_to_image


@dataclass(kw_only=True)
@@ -1,20 +1,22 @@
-import reprlib
+from collections.abc import Sequence
+from dataclasses import dataclass, fields
 from io import BytesIO
 from pathlib import Path
+import reprlib
 from typing import TYPE_CHECKING
-from dataclasses import fields, dataclass

 from nonebot.log import logger
 from nonebot_plugin_saa import MessageSegmentFactory

-from ..theme import theme_manager
+from nonebot_bison.plugin_config import plugin_config
+from nonebot_bison.theme import theme_manager
+from nonebot_bison.theme.types import ThemeRenderError, ThemeRenderUnsupportError
+
 from .abstract_post import AbstractPost
-from ..plugin_config import plugin_config
 from .protocol import PlainContentSupport
-from ..theme.types import ThemeRenderError, ThemeRenderUnsupportError

 if TYPE_CHECKING:
-    from ..platform import Platform
+    from nonebot_bison.platform import Platform


@dataclass
@@ -30,7 +32,7 @@ class Post(AbstractPost, PlainContentSupport):
    """文本内容"""
    title: str | None = None
    """标题"""
-    images: list[str | bytes | Path | BytesIO] | None = None
+    images: Sequence[str | bytes | Path | BytesIO] | None = None
    """图片列表"""
    timestamp: float | None = None
    """发布/获取时间戳, 秒"""
@@ -1,3 +1,3 @@
-from .manager import init_scheduler, scheduler_dict, handle_delete_target, handle_insert_new_target
+from .manager import handle_delete_target, handle_insert_new_target, init_scheduler, scheduler_dict

-__all__ = ["init_scheduler", "handle_delete_target", "handle_insert_new_target", "scheduler_dict"]
+__all__ = ["handle_delete_target", "handle_insert_new_target", "init_scheduler", "scheduler_dict"]
@@ -2,14 +2,15 @@ from typing import cast

 from nonebot.log import logger

-from ..utils import Site
-from ..config import config
+from nonebot_bison.config import config
+from nonebot_bison.config.db_model import Target
+from nonebot_bison.platform import platform_manager
+from nonebot_bison.plugin_config import plugin_config
+from nonebot_bison.types import Target as T_Target
+from nonebot_bison.utils import Site
+from nonebot_bison.utils.site import CookieClientManager, is_cookie_client_manager
+
 from .scheduler import Scheduler
-from ..config.db_model import Target
-from ..types import Target as T_Target
-from ..platform import platform_manager
-from ..plugin_config import plugin_config
-from ..utils.site import CookieClientManager, is_cookie_client_manager

 scheduler_dict: dict[type[Site], Scheduler] = {}

@@ -1,18 +1,16 @@
-from dataclasses import dataclass
 from collections import defaultdict
+from dataclasses import dataclass

 from nonebot.log import logger
 from nonebot_plugin_apscheduler import scheduler
 from nonebot_plugin_saa.utils.exceptions import NoBotFound

-from nonebot_bison.utils import ClientManager
-
-from ..config import config
-from ..send import send_msgs
-from ..types import Target, SubUnit
-from ..platform import platform_manager
-from ..utils import Site, ProcessContext
-from ..utils.site import SkipRequestException
+from nonebot_bison.config import config
+from nonebot_bison.platform import platform_manager
+from nonebot_bison.send import send_msgs
+from nonebot_bison.types import SubUnit, Target
+from nonebot_bison.utils import ClientManager, ProcessContext, Site
+from nonebot_bison.utils.site import SkipRequestException


@dataclass
@@ -1,25 +1,26 @@
-import json
-import time
+from collections.abc import Callable, Coroutine
+from functools import partial, wraps
 import importlib
+import json
 from pathlib import Path
+import time
 from types import ModuleType
 from typing import Any, TypeVar
-from functools import wraps, partial
-from collections.abc import Callable, Coroutine

-from nonebot.log import logger
+from anyio import open_file
 from nonebot.compat import model_dump
+from nonebot.log import logger

-from ..scheduler.manager import init_scheduler
-from ..config.subs_io.nbesf_model import v1, v2, v3
-from ..config.subs_io import subscribes_export, subscribes_import
+from nonebot_bison.config.subs_io import subscribes_export, subscribes_import
+from nonebot_bison.config.subs_io.nbesf_model import v1, v2, v3
+from nonebot_bison.scheduler.manager import init_scheduler

 try:
    from typing_extensions import ParamSpec

    import anyio
+    from anyio import from_thread, to_thread
    import click
-    from anyio import to_thread, from_thread
 except ImportError as e:  # pragma: no cover
    raise ImportError("请使用 `pip install nonebot-bison[cli]` 安装所需依赖") from e

@@ -83,7 +84,7 @@ async def subs_export(path: Path, format: str):
    export_file = path / f"bison_subscribes_export_{int(time.time())}.{format}"

    logger.info("正在获取订阅信息...")
-    export_data: v2.SubGroup = await subscribes_export(lambda x: x)
+    export_data: v3.SubGroup = await subscribes_export(lambda x: x)

    with export_file.open("w", encoding="utf-8") as f:
        match format:
@@ -127,18 +128,18 @@ async def subs_import(path: str, format: str):
    import_file_path = Path(path)
    assert import_file_path.is_file(), "该路径不是文件！"

-    with import_file_path.open("r", encoding="utf-8") as f:
+    async with await open_file(import_file_path, "r", encoding="utf-8") as f:
        match format:
            case "yaml" | "yml":
                logger.info("正在从yaml导入...")

                pyyaml = import_yaml_module()
-                import_items = pyyaml.safe_load(f)
+                import_items = pyyaml.safe_load(await f.read())

            case "json":
                logger.info("正在从json导入...")

-                import_items = json.load(f)
+                import_items = json.loads(await f.read())

            case _:
                raise click.BadParameter(message=f"不支持的导入格式: {format}")
@@ -1,10 +1,10 @@
 import asyncio
 from collections import deque

-from nonebot.log import logger
-from nonebot_plugin_saa.auto_select_bot import refresh_bots
 from nonebot.adapters.onebot.v11.exception import ActionFailed
-from nonebot_plugin_saa import MessageFactory, PlatformTarget, AggregatedMessageFactory
+from nonebot.log import logger
+from nonebot_plugin_saa import AggregatedMessageFactory, MessageFactory, PlatformTarget
+from nonebot_plugin_saa.auto_select_bot import refresh_bots

 from .plugin_config import plugin_config

@@ -14,6 +14,8 @@ QUEUE: deque[tuple[PlatformTarget, Sendable, int]] = deque()

 MESSGE_SEND_INTERVAL = 1.5

+_MESSAGE_DISPATCH_TASKS: set[asyncio.Task] = set()
+

 async def _do_send(send_target: PlatformTarget, msg: Sendable):
    try:
@@ -59,7 +61,9 @@ async def _send_msgs_dispatch(send_target: PlatformTarget, msg: Sendable):
        QUEUE.append((send_target, msg, plugin_config.bison_resend_times))
        # len(QUEUE) before append was 0
        if len(QUEUE) == 1:
-            asyncio.create_task(do_send_msgs())
+            task = asyncio.create_task(do_send_msgs())
+            _MESSAGE_DISPATCH_TASKS.add(task)
+            task.add_done_callback(_MESSAGE_DISPATCH_TASKS.discard)
    else:
        await _do_send(send_target, msg)

@@ -2,23 +2,25 @@ import asyncio
 from datetime import datetime

 from nonebot import on_command
-from nonebot.typing import T_State
-from nonebot.matcher import Matcher
-from nonebot.rule import Rule, to_me
-from nonebot.permission import SUPERUSER
-from nonebot_plugin_saa import TargetQQGroup
-from nonebot.params import ArgStr, ArgPlainText
 from nonebot.adapters import Bot, MessageTemplate
 from nonebot.adapters.onebot.v11.event import PrivateMessageEvent
+from nonebot.matcher import Matcher
+from nonebot.params import ArgPlainText, ArgStr
+from nonebot.permission import SUPERUSER
+from nonebot.rule import Rule, to_me
+from nonebot.typing import T_State
+from nonebot_plugin_saa import TargetQQGroup

+from .add_cookie import do_add_cookie
+from .add_cookie_target import do_add_cookie_target
 from .add_sub import do_add_sub
+from .del_cookie import do_del_cookie
+from .del_cookie_target import do_del_cookie_target
 from .del_sub import do_del_sub
 from .query_sub import do_query_sub
-from .add_cookie import do_add_cookie
-from .del_cookie import do_del_cookie
-from .add_cookie_target import do_add_cookie_target
-from .del_cookie_target import do_del_cookie_target
-from .utils import common_platform, admin_permission, gen_handle_cancel, configurable_to_me, set_target_user_info
+from .utils import admin_permission, common_platform, configurable_to_me, gen_handle_cancel, set_target_user_info
+
+_COMMAND_DISPATCH_TASKS: set[asyncio.Task] = set()

 add_sub_matcher = on_command(
    "添加订阅",
@@ -149,7 +151,10 @@ async def do_dispatch_command(
    else:
        do_del_sub(new_matcher)
    new_matcher_ins = new_matcher()
-    asyncio.create_task(new_matcher_ins.run(bot, event, state))
+
+    task = asyncio.create_task(new_matcher_ins.run(bot, event, state))
+    _COMMAND_DISPATCH_TASKS.add(task)
+    task.add_done_callback(_COMMAND_DISPATCH_TASKS.discard)


 no_permission_matcher = on_command(
@@ -167,14 +172,14 @@ async def send_no_permission():


 __all__ = [
-    "common_platform",
+    "add_cookie_matcher",
+    "add_cookie_target_matcher",
    "add_sub_matcher",
-    "query_sub_matcher",
+    "common_platform",
+    "del_cookie_matcher",
+    "del_cookie_target_matcher",
    "del_sub_matcher",
    "group_manage_matcher",
    "no_permission_matcher",
-    "add_cookie_matcher",
-    "add_cookie_target_matcher",
-    "del_cookie_target_matcher",
-    "del_cookie_matcher",
+    "query_sub_matcher",
 ]
@@ -1,16 +1,17 @@
-from typing import cast
 from json import JSONDecodeError
+from typing import cast

+from nonebot.adapters import Message, MessageTemplate
+from nonebot.adapters.onebot.v11 import MessageEvent
 from nonebot.log import logger
-from nonebot.typing import T_State
 from nonebot.matcher import Matcher
 from nonebot.params import Arg, ArgPlainText
-from nonebot.adapters.onebot.v11 import MessageEvent
-from nonebot.adapters import Message, MessageTemplate
+from nonebot.typing import T_State
+
+from nonebot_bison.platform import platform_manager
+from nonebot_bison.scheduler import scheduler_dict
+from nonebot_bison.utils.site import CookieClientManager, is_cookie_client_manager

-from ..scheduler import scheduler_dict
-from ..platform import platform_manager
-from ..utils.site import CookieClientManager, is_cookie_client_manager
 from .utils import common_platform, gen_handle_cancel, only_allow_private


@@ -1,14 +1,15 @@
-from nonebot.typing import T_State
-from nonebot.matcher import Matcher
-from nonebot.params import ArgPlainText
-from nonebot_plugin_saa import MessageFactory
 from nonebot.adapters.onebot.v11 import MessageEvent
 from nonebot.internal.adapter import MessageTemplate
+from nonebot.matcher import Matcher
+from nonebot.params import ArgPlainText
+from nonebot.typing import T_State
+from nonebot_plugin_saa import MessageFactory

-from ..config import config
-from ..utils import parse_text
-from ..platform import platform_manager
-from .utils import gen_handle_cancel, only_allow_private, generate_sub_list_text
+from nonebot_bison.config import config
+from nonebot_bison.platform import platform_manager
+from nonebot_bison.utils import parse_text
+
+from .utils import gen_handle_cancel, generate_sub_list_text, only_allow_private


 def do_add_cookie_target(add_cookie_target_matcher: type[Matcher]):
@@ -26,15 +27,13 @@ def do_add_cookie_target(add_cookie_target_matcher: type[Matcher]):
    @add_cookie_target_matcher.got("target_idx", parameterless=[handle_cancel])
    async def got_target_idx(state: T_State, target_idx: str = ArgPlainText()):
        try:
-            target_idx = int(target_idx)
-            state["target"] = state["sub_table"][target_idx]
+            state["target"] = state["sub_table"][int(target_idx)]
            state["site"] = platform_manager[state["target"]["platform_name"]].site
        except Exception:
            await add_cookie_target_matcher.reject("序号错误")

    @add_cookie_target_matcher.handle()
    async def init_promote_cookie(state: T_State):
-
        # 获取 site 的所有用户 cookie，再排除掉已经关联的 cookie，剩下的就是可以关联的 cookie
        cookies = await config.get_cookie(site_name=state["site"].name, is_anonymous=False)
        associated_cookies = await config.get_cookie(
@@ -57,8 +56,7 @@ def do_add_cookie_target(add_cookie_target_matcher: type[Matcher]):
    @add_cookie_target_matcher.got("cookie_idx", MessageTemplate("{_prompt}"), [handle_cancel])
    async def got_cookie_idx(state: T_State, cookie_idx: str = ArgPlainText()):
        try:
-            cookie_idx = int(cookie_idx)
-            state["cookie"] = state["cookies"][cookie_idx - 1]
+            state["cookie"] = state["cookies"][int(cookie_idx) - 1]
        except Exception:
            await add_cookie_target_matcher.reject("序号错误")

@@ -1,17 +1,18 @@
 import contextlib

-from nonebot.typing import T_State
+from nonebot.adapters import Message, MessageTemplate
 from nonebot.matcher import Matcher
 from nonebot.params import Arg, ArgPlainText
-from nonebot.adapters import Message, MessageTemplate
-from nonebot_plugin_saa import Text, PlatformTarget, SupportedAdapters
+from nonebot.typing import T_State
+from nonebot_plugin_saa import PlatformTarget, SupportedAdapters, Text
+
+from nonebot_bison.apis import check_sub_target
+from nonebot_bison.config import config
+from nonebot_bison.config.db_config import SubscribeDupException
+from nonebot_bison.platform import Platform, platform_manager, unavailable_paltforms
+from nonebot_bison.types import Target

-from ..types import Target
-from ..config import config
-from ..apis import check_sub_target
-from ..config.db_config import SubscribeDupException
 from .utils import common_platform, ensure_user_info, gen_handle_cancel
-from ..platform import Platform, platform_manager, unavailable_paltforms


 def do_add_sub(add_sub: type[Matcher]):
@@ -1,11 +1,12 @@
-from nonebot.typing import T_State
+from nonebot.adapters.onebot.v11 import MessageEvent
 from nonebot.matcher import Matcher
 from nonebot.params import EventPlainText
+from nonebot.typing import T_State
 from nonebot_plugin_saa import MessageFactory
-from nonebot.adapters.onebot.v11 import MessageEvent

-from ..config import config
-from ..utils import parse_text
+from nonebot_bison.config import config
+from nonebot_bison.utils import parse_text
+
 from .utils import gen_handle_cancel, only_allow_private


@@ -1,11 +1,12 @@
-from nonebot.typing import T_State
+from nonebot.adapters.onebot.v11 import MessageEvent
 from nonebot.matcher import Matcher
 from nonebot.params import EventPlainText
+from nonebot.typing import T_State
 from nonebot_plugin_saa import MessageFactory
-from nonebot.adapters.onebot.v11 import MessageEvent

-from ..config import config
-from ..utils import parse_text
+from nonebot_bison.config import config
+from nonebot_bison.utils import parse_text
+
 from .utils import gen_handle_cancel, only_allow_private


@@ -1,12 +1,13 @@
-from nonebot.typing import T_State
 from nonebot.matcher import Matcher
 from nonebot.params import Arg, EventPlainText
+from nonebot.typing import T_State
 from nonebot_plugin_saa import MessageFactory, PlatformTarget

-from ..config import config
-from ..types import Category
-from ..utils import parse_text
-from ..platform import platform_manager
+from nonebot_bison.config import config
+from nonebot_bison.platform import platform_manager
+from nonebot_bison.types import Category
+from nonebot_bison.utils import parse_text
+
 from .utils import ensure_user_info, gen_handle_cancel


@@ -1,12 +1,13 @@
-from nonebot.params import Arg
 from nonebot.matcher import Matcher
+from nonebot.params import Arg
 from nonebot_plugin_saa import MessageFactory, PlatformTarget

-from ..config import config
-from ..types import Category
-from ..utils import parse_text
+from nonebot_bison.config import config
+from nonebot_bison.platform import platform_manager
+from nonebot_bison.types import Category
+from nonebot_bison.utils import parse_text
+
 from .utils import ensure_user_info
-from ..platform import platform_manager


 def do_query_sub(query_sub: type[Matcher]):
@@ -1,21 +1,22 @@
 import contextlib
-from typing import Annotated
 from itertools import groupby
 from operator import attrgetter
+from typing import Annotated

-from nonebot.rule import Rule
 from nonebot.adapters import Event
-from nonebot.typing import T_State
 from nonebot.matcher import Matcher
+from nonebot.params import Depends, EventPlainText, EventToMe
 from nonebot.permission import SUPERUSER
-from nonebot.params import Depends, EventToMe, EventPlainText
+from nonebot.rule import Rule
+from nonebot.typing import T_State
 from nonebot_plugin_saa import PlatformTarget, extract_target

-from ..config import config
-from ..types import Category
-from ..platform import platform_manager
-from ..plugin_config import plugin_config
-from ..utils.site import is_cookie_client_manager
+from nonebot_bison.config import config
+from nonebot_bison.platform import platform_manager
+from nonebot_bison.plugin_config import plugin_config
+from nonebot_bison.types import Category
+from nonebot_bison.types import Target as T_Target
+from nonebot_bison.utils.site import is_cookie_client_manager


 def _configurable_to_me(to_me: bool = EventToMe()):
@@ -88,7 +89,7 @@ async def generate_sub_list_text(
        sub_list = [
            sub
            for sub in sub_list
-            if is_cookie_client_manager(platform_manager.get(sub.target.platform_name).site.client_mgr)
+            if is_cookie_client_manager(platform_manager[sub.target.platform_name].site.client_mgr)
        ]
    if not sub_list:
        await matcher.finish("暂无已订阅账号\n请使用“添加订阅”命令添加订阅")
@@ -109,7 +110,7 @@ async def generate_sub_list_text(
                    res += " {}".format(", ".join(sub.tags)) + "\n"
            if is_show_cookie:
                target_cookies = await config.get_cookie(
-                    target=sub.target.target, site_name=platform.site.name, is_anonymous=False
+                    target=T_Target(sub.target.target), site_name=platform.site.name, is_anonymous=False
                )
                if target_cookies:
                    res += "  关联的 Cookie：\n"
@@ -126,6 +127,5 @@ async def only_allow_private(
    event: Event,
    matcher: type[Matcher],
 ):
-    # if not issubclass(PrivateMessageEvent, event.__class__):
-    if event.message_type != "private":
+    if not (hasattr(event, "message_type") and getattr(event, "message_type") == "private"):
        await matcher.finish("请在私聊中使用此命令")
@@ -1,10 +1,9 @@
+from importlib import import_module
 from pathlib import Path
 from pkgutil import iter_modules
-from importlib import import_module

-from .types import Theme
 from .registry import theme_manager
-from .types import ThemeRegistrationError
+from .types import Theme, ThemeRegistrationError
 from .types import ThemeRenderError as ThemeRenderError
 from .types import ThemeRenderUnsupportError as ThemeRenderUnsupportError

@@ -1,11 +1,14 @@
+from typing import ClassVar
+
 from nonebot import logger

-from ..plugin_config import plugin_config
+from nonebot_bison.plugin_config import plugin_config
+
 from .types import Theme, ThemeRegistrationError


 class ThemeManager:
-    __themes: dict[str, Theme] = {}
+    __themes: ClassVar[dict[str, Theme]] = {}

    def register(self, theme: Theme):
        logger.trace(f"Registering theme: {theme}")
@@ -1,13 +1,13 @@
+from dataclasses import dataclass
 from io import BytesIO
 from pathlib import Path
-from dataclasses import dataclass
 from typing import TYPE_CHECKING, Literal

-from nonebot_plugin_saa import Text, Image, MessageSegmentFactory
+from nonebot_plugin_saa import Image, MessageSegmentFactory, Text

-from nonebot_bison.utils import text_fletten
-from nonebot_bison.theme.utils import web_embed_image
 from nonebot_bison.theme import Theme, ThemeRenderError, ThemeRenderUnsupportError
+from nonebot_bison.theme.utils import web_embed_image
+from nonebot_bison.utils import text_fletten

 if TYPE_CHECKING:
    from nonebot_bison.platform.arknights import ArknightsPost
@@ -1,11 +1,12 @@
+from collections.abc import Sequence
 from io import BytesIO
 from pathlib import Path
 from typing import TYPE_CHECKING, Literal

-from nonebot_plugin_saa import Text, Image, MessageSegmentFactory
+from nonebot_plugin_saa import Image, MessageSegmentFactory, Text

 from nonebot_bison.theme import Theme
-from nonebot_bison.utils import pic_merge, is_pics_mergable
+from nonebot_bison.utils import is_pics_mergable, pic_merge

 if TYPE_CHECKING:
    from nonebot_bison.post import Post
@@ -50,7 +51,7 @@ class BasicTheme(Theme):
        client = await post.platform.ctx.get_client_for_static()
        msgs: list[MessageSegmentFactory] = [Text(text)]

-        pics_group: list[list[str | bytes | Path | BytesIO]] = []
+        pics_group: list[Sequence[str | bytes | Path | BytesIO]] = []
        if post.images:
            pics_group.append(post.images)
        if rp and rp.images:
@@ -1,9 +1,9 @@
 from typing import TYPE_CHECKING, Literal

-from nonebot_plugin_saa import Text, Image, MessageSegmentFactory
+from nonebot_plugin_saa import Image, MessageSegmentFactory, Text

-from nonebot_bison.utils import pic_merge, is_pics_mergable
 from nonebot_bison.theme import Theme, ThemeRenderUnsupportError
+from nonebot_bison.utils import is_pics_mergable, pic_merge

 if TYPE_CHECKING:
    from nonebot_bison.post import Post
@@ -1,19 +1,20 @@
+from collections.abc import Sequence
+from datetime import datetime
 from io import BytesIO
 from pathlib import Path
-from datetime import datetime
 from typing import TYPE_CHECKING, Literal

-import jinja2
-from yarl import URL
 from httpx import AsyncClient
-from pydantic import BaseModel
+import jinja2
+from nonebot_plugin_saa import Image, MessageSegmentFactory, Text
 from PIL import Image as PILImage
-from nonebot_plugin_saa import Text, Image, MessageSegmentFactory
+from pydantic import BaseModel
+from yarl import URL

 from nonebot_bison.compat import model_validator
-from nonebot_bison.utils import pic_merge, is_pics_mergable
-from nonebot_bison.theme.utils import convert_to_qr, web_embed_image
 from nonebot_bison.theme import Theme, ThemeRenderError, ThemeRenderUnsupportError
+from nonebot_bison.theme.utils import convert_to_qr, web_embed_image
+from nonebot_bison.utils import is_pics_mergable, pic_merge

 if TYPE_CHECKING:
    from nonebot_bison.post import Post
@@ -122,7 +123,7 @@ class CeobeCanteenTheme(Theme):

    @staticmethod
    async def merge_pics(
-        images: list[str | bytes | Path | BytesIO],
+        images: Sequence[str | bytes | Path | BytesIO],
        client: AsyncClient,
    ) -> list[str | bytes | Path | BytesIO]:
        if is_pics_mergable(images):
@@ -224,7 +225,7 @@ class CeobeCanteenTheme(Theme):
            text += f"详情: {post.url}"
        msgs.append(Text(text))

-        pics_group: list[list[str | bytes | Path | BytesIO]] = []
+        pics_group: list[Sequence[str | bytes | Path | BytesIO]] = []
        if post.images:
            pics_group.append(post.images)
        if post.repost and post.repost.images:
@@ -1,12 +1,13 @@
+from collections.abc import Sequence
 from io import BytesIO
 from pathlib import Path
 from typing import TYPE_CHECKING, Literal

-from nonebot_plugin_saa import Text, Image, MessageSegmentFactory
+from nonebot_plugin_saa import Image, MessageSegmentFactory, Text

-from nonebot_bison.theme import Theme, ThemeRenderError
 from nonebot_bison.post.protocol import HTMLContentSupport
-from nonebot_bison.utils import pic_merge, is_pics_mergable
+from nonebot_bison.theme import Theme, ThemeRenderError
+from nonebot_bison.utils import is_pics_mergable, pic_merge

 if TYPE_CHECKING:
    from nonebot_bison.post import Post
@@ -31,7 +32,6 @@ class Ht2iTheme(Theme):
            raise ThemeRenderError(f"渲染文本失败: {e}")

    async def render(self, post: "Post"):
-
        md_text = ""

        md_text += f"## {post.title}\n\n" if post.title else ""
@@ -50,9 +50,7 @@ class Ht2iTheme(Theme):
            else:
                rp_content = await rp.get_content()

-            md_text += (
-                ">  \n> " + rp_content if len(rp_content) < 500 else f"{rp_content[:500]}..." + "  \n"  # noqa: E501
-            )  # noqa: E501
+            md_text += ">  \n> " + rp_content if len(rp_content) < 500 else f"{rp_content[:500]}..." + "  \n"
        md_text += "\n\n"

        md_text += f"###### 来源: {post.platform.name} {post.nickname or ''}\n"
@@ -68,7 +66,7 @@ class Ht2iTheme(Theme):
        if urls:
            msgs.append(Text("\n".join(urls)))

-        pics_group: list[list[str | bytes | Path | BytesIO]] = []
+        pics_group: list[Sequence[str | bytes | Path | BytesIO]] = []
        if post.images:
            pics_group.append(post.images)
        if rp and rp.images:
@@ -1,14 +1,14 @@
-from typing import TYPE_CHECKING
 from abc import ABC, abstractmethod
+from typing import TYPE_CHECKING

 from nonebot import logger, require
-from pydantic import BaseModel, PrivateAttr
 from nonebot_plugin_saa import MessageSegmentFactory
+from pydantic import BaseModel, PrivateAttr

-from ..plugin_config import plugin_config
+from nonebot_bison.plugin_config import plugin_config

 if TYPE_CHECKING:
-    from ..post.abstract_post import AbstractPost
+    from nonebot_bison.post.abstract_post import AbstractPost


 class Theme(ABC, BaseModel):
@@ -1,10 +1,10 @@
+from base64 import b64encode
 from io import BytesIO
 from pathlib import Path
-from base64 import b64encode

 from qrcode import constants
-from qrcode.main import QRCode
 from qrcode.image.pil import PilImage
+from qrcode.main import QRCode


 def convert_to_qr(data: str, **kwarg) -> bytes:
@@ -1,10 +1,10 @@
-from datetime import time
 from dataclasses import dataclass
-from typing import Any, Literal, NewType, NamedTuple
+from datetime import time
+from typing import Any, Literal, NamedTuple, NewType

 from httpx import URL
-from pydantic import BaseModel
 from nonebot_plugin_saa import PlatformTarget as SendTarget
+from pydantic import BaseModel

 RawPost = Any
 Target = NewType("Target", str)
@@ -1,29 +1,31 @@
+import difflib
 import re
 import sys
-import difflib
+from typing import Any, ClassVar

-import nonebot
-from nonebot.plugin import require
 from bs4 import BeautifulSoup as bs
-from nonebot.log import logger, default_format
-from nonebot_plugin_saa import Text, Image, MessageSegmentFactory
+import nonebot
+from nonebot.log import default_format, logger
+from nonebot.plugin import require
+from nonebot_plugin_saa import Image, MessageSegmentFactory, Text

-from .site import Site as Site
-from ..plugin_config import plugin_config
-from .image import pic_merge as pic_merge
+from nonebot_bison.plugin_config import plugin_config
+
+from .context import ProcessContext as ProcessContext
 from .http import http_client as http_client
 from .image import capture_html as capture_html
-from .site import ClientManager as ClientManager
-from .image import text_to_image as text_to_image
-from .site import anonymous_site as anonymous_site
-from .context import ProcessContext as ProcessContext
 from .image import is_pics_mergable as is_pics_mergable
+from .image import pic_merge as pic_merge
 from .image import pic_url_to_image as pic_url_to_image
+from .image import text_to_image as text_to_image
+from .site import ClientManager as ClientManager
 from .site import DefaultClientManager as DefaultClientManager
+from .site import Site as Site
+from .site import anonymous_site as anonymous_site


 class Singleton(type):
-    _instances = {}
+    _instances: ClassVar[dict[Any, Any]] = {}

    def __call__(cls, *args, **kwargs):
        if cls not in cls._instances:
@@ -1,6 +1,6 @@
 from base64 import b64encode

-from httpx import Response, AsyncClient
+from httpx import AsyncClient, Response

 from nonebot_bison.types import Target

@@ -1,12 +1,12 @@
 """提供获取 Bot 的方法"""

-from typing import Any
 from collections import defaultdict
+from typing import Any

 import nonebot
 from nonebot.adapters import Bot
-from nonebot_plugin_saa import PlatformTarget
 from nonebot.adapters.onebot.v11 import Bot as Ob11Bot
+from nonebot_plugin_saa import PlatformTarget

 GROUP: dict[int, list[Bot]] = {}
 USER: dict[int, list[Bot]] = {}
@@ -1,6 +1,6 @@
 import httpx

-from ..plugin_config import plugin_config
+from nonebot_bison.plugin_config import plugin_config

 http_args = {
    "proxies": plugin_config.bison_proxy or None,
@@ -1,16 +1,17 @@
-from io import BytesIO
+from collections.abc import Sequence
 from functools import partial
+from io import BytesIO
 from typing import Literal, TypeGuard

-from yarl import URL
-from PIL import Image
 from httpx import AsyncClient
 from nonebot import logger, require
-from PIL.Image import Image as PILImage
-from nonebot_plugin_saa import Text as SaaText
 from nonebot_plugin_saa import Image as SaaImage
+from nonebot_plugin_saa import Text as SaaText
+from PIL import Image
+from PIL.Image import Image as PILImage
+from yarl import URL

-from ..plugin_config import plugin_config
+from nonebot_bison.plugin_config import plugin_config


 async def pic_url_to_image(data: str | bytes, http_client: AsyncClient) -> PILImage:
@@ -96,7 +97,7 @@ async def pic_merge(pics: list[str | bytes], http_client: AsyncClient) -> list[s
    return pics


-def is_pics_mergable(imgs: list) -> TypeGuard[list[str | bytes]]:
+def is_pics_mergable(imgs: Sequence) -> TypeGuard[list[str | bytes]]:
    if any(not isinstance(img, str | bytes) for img in imgs):
        return False

@@ -1,18 +1,19 @@
-import json
-from typing import Literal
-from json import JSONDecodeError
 from abc import ABC, abstractmethod
 from collections.abc import Callable
 from datetime import datetime, timedelta
+import json
+from json import JSONDecodeError
+from typing import Literal

 import httpx
 from httpx import AsyncClient
 from nonebot.log import logger

-from ..types import Target
-from ..config import config
+from nonebot_bison.config import config
+from nonebot_bison.config.db_model import Cookie
+from nonebot_bison.types import Target
+
 from .http import http_client
-from ..config.db_model import Cookie


 class ClientManager(ABC):
@@ -123,8 +124,8 @@ class CookieClientManager(ClientManager):
    async def _choose_cookie(self, target: Target | None) -> Cookie:
        """选择 cookie 的具体算法"""
        cookies = await config.get_cookie(self._site_name, target)
-        cookies = (cookie for cookie in cookies if cookie.last_usage + cookie.cd < datetime.now())
-        cookie = min(cookies, key=lambda x: x.last_usage)
+        avaliable_cookies = (cookie for cookie in cookies if cookie.last_usage + cookie.cd < datetime.now())
+        cookie = min(avaliable_cookies, key=lambda x: x.last_usage)
        return cookie

    async def get_client(self, target: Target | None) -> AsyncClient:
@@ -183,8 +184,8 @@ class SiteMeta(type):
            cls._key = kwargs.get("key")
        elif not kwargs.get("abstract"):
            # this is the subclass
-            if hasattr(cls, "name"):
-                site_manager[cls.name] = cls
+            if "name" in namespace:
+                site_manager[namespace["name"]] = cls
        super().__init__(name, bases, namespace, **kwargs)


@@ -1,4 +1,4 @@
-# This file is automatically @generated by Poetry 1.8.3 and should not be changed by hand.
+# This file is automatically @generated by Poetry 1.8.4 and should not be changed by hand.

 [[package]]
 name = "aiodns"
@@ -470,57 +470,6 @@ type = "legacy"
 url = "https://pypi.org/simple"
 reference = "offical-source"

-[[package]]
-name = "black"
-version = "24.8.0"
-description = "The uncompromising code formatter."
-optional = false
-python-versions = ">=3.8"
-files = [
-    {file = "black-24.8.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:09cdeb74d494ec023ded657f7092ba518e8cf78fa8386155e4a03fdcc44679e6"},
-    {file = "black-24.8.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:81c6742da39f33b08e791da38410f32e27d632260e599df7245cccee2064afeb"},
-    {file = "black-24.8.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:707a1ca89221bc8a1a64fb5e15ef39cd755633daa672a9db7498d1c19de66a42"},
-    {file = "black-24.8.0-cp310-cp310-win_amd64.whl", hash = "sha256:d6417535d99c37cee4091a2f24eb2b6d5ec42b144d50f1f2e436d9fe1916fe1a"},
-    {file = "black-24.8.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:fb6e2c0b86bbd43dee042e48059c9ad7830abd5c94b0bc518c0eeec57c3eddc1"},
-    {file = "black-24.8.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:837fd281f1908d0076844bc2b801ad2d369c78c45cf800cad7b61686051041af"},
-    {file = "black-24.8.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:62e8730977f0b77998029da7971fa896ceefa2c4c4933fcd593fa599ecbf97a4"},
-    {file = "black-24.8.0-cp311-cp311-win_amd64.whl", hash = "sha256:72901b4913cbac8972ad911dc4098d5753704d1f3c56e44ae8dce99eecb0e3af"},
-    {file = "black-24.8.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:7c046c1d1eeb7aea9335da62472481d3bbf3fd986e093cffd35f4385c94ae368"},
-    {file = "black-24.8.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:649f6d84ccbae73ab767e206772cc2d7a393a001070a4c814a546afd0d423aed"},
-    {file = "black-24.8.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:2b59b250fdba5f9a9cd9d0ece6e6d993d91ce877d121d161e4698af3eb9c1018"},
-    {file = "black-24.8.0-cp312-cp312-win_amd64.whl", hash = "sha256:6e55d30d44bed36593c3163b9bc63bf58b3b30e4611e4d88a0c3c239930ed5b2"},
-    {file = "black-24.8.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:505289f17ceda596658ae81b61ebbe2d9b25aa78067035184ed0a9d855d18afd"},
-    {file = "black-24.8.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:b19c9ad992c7883ad84c9b22aaa73562a16b819c1d8db7a1a1a49fb7ec13c7d2"},
-    {file = "black-24.8.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:1f13f7f386f86f8121d76599114bb8c17b69d962137fc70efe56137727c7047e"},
-    {file = "black-24.8.0-cp38-cp38-win_amd64.whl", hash = "sha256:f490dbd59680d809ca31efdae20e634f3fae27fba3ce0ba3208333b713bc3920"},
-    {file = "black-24.8.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:eab4dd44ce80dea27dc69db40dab62d4ca96112f87996bca68cd75639aeb2e4c"},
-    {file = "black-24.8.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:3c4285573d4897a7610054af5a890bde7c65cb466040c5f0c8b732812d7f0e5e"},
-    {file = "black-24.8.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:9e84e33b37be070ba135176c123ae52a51f82306def9f7d063ee302ecab2cf47"},
-    {file = "black-24.8.0-cp39-cp39-win_amd64.whl", hash = "sha256:73bbf84ed136e45d451a260c6b73ed674652f90a2b3211d6a35e78054563a9bb"},
-    {file = "black-24.8.0-py3-none-any.whl", hash = "sha256:972085c618ee94f402da1af548a4f218c754ea7e5dc70acb168bfaca4c2542ed"},
-    {file = "black-24.8.0.tar.gz", hash = "sha256:2500945420b6784c38b9ee885af039f5e7471ef284ab03fa35ecdde4688cd83f"},
-]
-
-[package.dependencies]
-click = ">=8.0.0"
-mypy-extensions = ">=0.4.3"
-packaging = ">=22.0"
-pathspec = ">=0.9.0"
-platformdirs = ">=2"
-tomli = {version = ">=1.1.0", markers = "python_version < \"3.11\""}
-typing-extensions = {version = ">=4.0.1", markers = "python_version < \"3.11\""}
-
-[package.extras]
-colorama = ["colorama (>=0.4.3)"]
-d = ["aiohttp (>=3.7.4)", "aiohttp (>=3.7.4,!=3.9.0)"]
-jupyter = ["ipython (>=7.8.0)", "tokenize-rt (>=3.2.0)"]
-uvloop = ["uvloop (>=0.15.2)"]
-
-[package.source]
-type = "legacy"
-url = "https://pypi.org/simple"
-reference = "offical-source"
-
 [[package]]
 name = "brotli"
 version = "1.1.0"
@@ -538,6 +487,10 @@ files = [
    {file = "Brotli-1.1.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:a37b8f0391212d29b3a91a799c8e4a2855e0576911cdfb2515487e30e322253d"},
    {file = "Brotli-1.1.0-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:e84799f09591700a4154154cab9787452925578841a94321d5ee8fb9a9a328f0"},
    {file = "Brotli-1.1.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:f66b5337fa213f1da0d9000bc8dc0cb5b896b726eefd9c6046f699b169c41b9e"},
+    {file = "Brotli-1.1.0-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:5dab0844f2cf82be357a0eb11a9087f70c5430b2c241493fc122bb6f2bb0917c"},
+    {file = "Brotli-1.1.0-cp310-cp310-musllinux_1_2_i686.whl", hash = "sha256:e4fe605b917c70283db7dfe5ada75e04561479075761a0b3866c081d035b01c1"},
+    {file = "Brotli-1.1.0-cp310-cp310-musllinux_1_2_ppc64le.whl", hash = "sha256:1e9a65b5736232e7a7f91ff3d02277f11d339bf34099a56cdab6a8b3410a02b2"},
+    {file = "Brotli-1.1.0-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:58d4b711689366d4a03ac7957ab8c28890415e267f9b6589969e74b6e42225ec"},
    {file = "Brotli-1.1.0-cp310-cp310-win32.whl", hash = "sha256:be36e3d172dc816333f33520154d708a2657ea63762ec16b62ece02ab5e4daf2"},
    {file = "Brotli-1.1.0-cp310-cp310-win_amd64.whl", hash = "sha256:0c6244521dda65ea562d5a69b9a26120769b7a9fb3db2fe9545935ed6735b128"},
    {file = "Brotli-1.1.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:a3daabb76a78f829cafc365531c972016e4aa8d5b4bf60660ad8ecee19df7ccc"},
@@ -550,8 +503,14 @@ files = [
    {file = "Brotli-1.1.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:19c116e796420b0cee3da1ccec3b764ed2952ccfcc298b55a10e5610ad7885f9"},
    {file = "Brotli-1.1.0-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:510b5b1bfbe20e1a7b3baf5fed9e9451873559a976c1a78eebaa3b86c57b4265"},
    {file = "Brotli-1.1.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:a1fd8a29719ccce974d523580987b7f8229aeace506952fa9ce1d53a033873c8"},
+    {file = "Brotli-1.1.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:c247dd99d39e0338a604f8c2b3bc7061d5c2e9e2ac7ba9cc1be5a69cb6cd832f"},
+    {file = "Brotli-1.1.0-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:1b2c248cd517c222d89e74669a4adfa5577e06ab68771a529060cf5a156e9757"},
+    {file = "Brotli-1.1.0-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:2a24c50840d89ded6c9a8fdc7b6ed3692ed4e86f1c4a4a938e1e92def92933e0"},
+    {file = "Brotli-1.1.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:f31859074d57b4639318523d6ffdca586ace54271a73ad23ad021acd807eb14b"},
    {file = "Brotli-1.1.0-cp311-cp311-win32.whl", hash = "sha256:39da8adedf6942d76dc3e46653e52df937a3c4d6d18fdc94a7c29d263b1f5b50"},
    {file = "Brotli-1.1.0-cp311-cp311-win_amd64.whl", hash = "sha256:aac0411d20e345dc0920bdec5548e438e999ff68d77564d5e9463a7ca9d3e7b1"},
+    {file = "Brotli-1.1.0-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:32d95b80260d79926f5fab3c41701dbb818fde1c9da590e77e571eefd14abe28"},
+    {file = "Brotli-1.1.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:b760c65308ff1e462f65d69c12e4ae085cff3b332d894637f6273a12a482d09f"},
    {file = "Brotli-1.1.0-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:316cc9b17edf613ac76b1f1f305d2a748f1b976b033b049a6ecdfd5612c70409"},
    {file = "Brotli-1.1.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:caf9ee9a5775f3111642d33b86237b05808dafcd6268faa492250e9b78046eb2"},
    {file = "Brotli-1.1.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:70051525001750221daa10907c77830bc889cb6d865cc0b813d9db7fefc21451"},
@@ -562,8 +521,24 @@ files = [
    {file = "Brotli-1.1.0-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:4093c631e96fdd49e0377a9c167bfd75b6d0bad2ace734c6eb20b348bc3ea180"},
    {file = "Brotli-1.1.0-cp312-cp312-musllinux_1_1_ppc64le.whl", hash = "sha256:7e4c4629ddad63006efa0ef968c8e4751c5868ff0b1c5c40f76524e894c50248"},
    {file = "Brotli-1.1.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:861bf317735688269936f755fa136a99d1ed526883859f86e41a5d43c61d8966"},
+    {file = "Brotli-1.1.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:87a3044c3a35055527ac75e419dfa9f4f3667a1e887ee80360589eb8c90aabb9"},
+    {file = "Brotli-1.1.0-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:c5529b34c1c9d937168297f2c1fde7ebe9ebdd5e121297ff9c043bdb2ae3d6fb"},
+    {file = "Brotli-1.1.0-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:ca63e1890ede90b2e4454f9a65135a4d387a4585ff8282bb72964fab893f2111"},
+    {file = "Brotli-1.1.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:e79e6520141d792237c70bcd7a3b122d00f2613769ae0cb61c52e89fd3443839"},
    {file = "Brotli-1.1.0-cp312-cp312-win32.whl", hash = "sha256:5f4d5ea15c9382135076d2fb28dde923352fe02951e66935a9efaac8f10e81b0"},
    {file = "Brotli-1.1.0-cp312-cp312-win_amd64.whl", hash = "sha256:906bc3a79de8c4ae5b86d3d75a8b77e44404b0f4261714306e3ad248d8ab0951"},
+    {file = "Brotli-1.1.0-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:8bf32b98b75c13ec7cf774164172683d6e7891088f6316e54425fde1efc276d5"},
+    {file = "Brotli-1.1.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:7bc37c4d6b87fb1017ea28c9508b36bbcb0c3d18b4260fcdf08b200c74a6aee8"},
+    {file = "Brotli-1.1.0-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3c0ef38c7a7014ffac184db9e04debe495d317cc9c6fb10071f7fefd93100a4f"},
+    {file = "Brotli-1.1.0-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:91d7cc2a76b5567591d12c01f019dd7afce6ba8cba6571187e21e2fc418ae648"},
+    {file = "Brotli-1.1.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a93dde851926f4f2678e704fadeb39e16c35d8baebd5252c9fd94ce8ce68c4a0"},
+    {file = "Brotli-1.1.0-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f0db75f47be8b8abc8d9e31bc7aad0547ca26f24a54e6fd10231d623f183d089"},
+    {file = "Brotli-1.1.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:6967ced6730aed543b8673008b5a391c3b1076d834ca438bbd70635c73775368"},
+    {file = "Brotli-1.1.0-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:7eedaa5d036d9336c95915035fb57422054014ebdeb6f3b42eac809928e40d0c"},
+    {file = "Brotli-1.1.0-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:d487f5432bf35b60ed625d7e1b448e2dc855422e87469e3f450aa5552b0eb284"},
+    {file = "Brotli-1.1.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:832436e59afb93e1836081a20f324cb185836c617659b07b129141a8426973c7"},
+    {file = "Brotli-1.1.0-cp313-cp313-win32.whl", hash = "sha256:43395e90523f9c23a3d5bdf004733246fba087f2948f87ab28015f12359ca6a0"},
+    {file = "Brotli-1.1.0-cp313-cp313-win_amd64.whl", hash = "sha256:9011560a466d2eb3f5a6e4929cf4a09be405c64154e12df0dd72713f6500e32b"},
    {file = "Brotli-1.1.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:a090ca607cbb6a34b0391776f0cb48062081f5f60ddcce5d11838e67a01928d1"},
    {file = "Brotli-1.1.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2de9d02f5bda03d27ede52e8cfe7b865b066fa49258cbab568720aa5be80a47d"},
    {file = "Brotli-1.1.0-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:2333e30a5e00fe0fe55903c8832e08ee9c3b1382aacf4db26664a16528d51b4b"},
@@ -573,6 +548,10 @@ files = [
    {file = "Brotli-1.1.0-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:fd5f17ff8f14003595ab414e45fce13d073e0762394f957182e69035c9f3d7c2"},
    {file = "Brotli-1.1.0-cp36-cp36m-musllinux_1_1_ppc64le.whl", hash = "sha256:069a121ac97412d1fe506da790b3e69f52254b9df4eb665cd42460c837193354"},
    {file = "Brotli-1.1.0-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:e93dfc1a1165e385cc8239fab7c036fb2cd8093728cbd85097b284d7b99249a2"},
+    {file = "Brotli-1.1.0-cp36-cp36m-musllinux_1_2_aarch64.whl", hash = "sha256:aea440a510e14e818e67bfc4027880e2fb500c2ccb20ab21c7a7c8b5b4703d75"},
+    {file = "Brotli-1.1.0-cp36-cp36m-musllinux_1_2_i686.whl", hash = "sha256:6974f52a02321b36847cd19d1b8e381bf39939c21efd6ee2fc13a28b0d99348c"},
+    {file = "Brotli-1.1.0-cp36-cp36m-musllinux_1_2_ppc64le.whl", hash = "sha256:a7e53012d2853a07a4a79c00643832161a910674a893d296c9f1259859a289d2"},
+    {file = "Brotli-1.1.0-cp36-cp36m-musllinux_1_2_x86_64.whl", hash = "sha256:d7702622a8b40c49bffb46e1e3ba2e81268d5c04a34f460978c6b5517a34dd52"},
    {file = "Brotli-1.1.0-cp36-cp36m-win32.whl", hash = "sha256:a599669fd7c47233438a56936988a2478685e74854088ef5293802123b5b2460"},
    {file = "Brotli-1.1.0-cp36-cp36m-win_amd64.whl", hash = "sha256:d143fd47fad1db3d7c27a1b1d66162e855b5d50a89666af46e1679c496e8e579"},
    {file = "Brotli-1.1.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:11d00ed0a83fa22d29bc6b64ef636c4552ebafcef57154b4ddd132f5638fbd1c"},
@@ -584,6 +563,10 @@ files = [
    {file = "Brotli-1.1.0-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:919e32f147ae93a09fe064d77d5ebf4e35502a8df75c29fb05788528e330fe74"},
    {file = "Brotli-1.1.0-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:23032ae55523cc7bccb4f6a0bf368cd25ad9bcdcc1990b64a647e7bbcce9cb5b"},
    {file = "Brotli-1.1.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:224e57f6eac61cc449f498cc5f0e1725ba2071a3d4f48d5d9dffba42db196438"},
+    {file = "Brotli-1.1.0-cp37-cp37m-musllinux_1_2_aarch64.whl", hash = "sha256:cb1dac1770878ade83f2ccdf7d25e494f05c9165f5246b46a621cc849341dc01"},
+    {file = "Brotli-1.1.0-cp37-cp37m-musllinux_1_2_i686.whl", hash = "sha256:3ee8a80d67a4334482d9712b8e83ca6b1d9bc7e351931252ebef5d8f7335a547"},
+    {file = "Brotli-1.1.0-cp37-cp37m-musllinux_1_2_ppc64le.whl", hash = "sha256:5e55da2c8724191e5b557f8e18943b1b4839b8efc3ef60d65985bcf6f587dd38"},
+    {file = "Brotli-1.1.0-cp37-cp37m-musllinux_1_2_x86_64.whl", hash = "sha256:d342778ef319e1026af243ed0a07c97acf3bad33b9f29e7ae6a1f68fd083e90c"},
    {file = "Brotli-1.1.0-cp37-cp37m-win32.whl", hash = "sha256:587ca6d3cef6e4e868102672d3bd9dc9698c309ba56d41c2b9c85bbb903cdb95"},
    {file = "Brotli-1.1.0-cp37-cp37m-win_amd64.whl", hash = "sha256:2954c1c23f81c2eaf0b0717d9380bd348578a94161a65b3a2afc62c86467dd68"},
    {file = "Brotli-1.1.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:efa8b278894b14d6da122a72fefcebc28445f2d3f880ac59d46c90f4c13be9a3"},
@@ -596,6 +579,10 @@ files = [
    {file = "Brotli-1.1.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:1ab4fbee0b2d9098c74f3057b2bc055a8bd92ccf02f65944a241b4349229185a"},
    {file = "Brotli-1.1.0-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:141bd4d93984070e097521ed07e2575b46f817d08f9fa42b16b9b5f27b5ac088"},
    {file = "Brotli-1.1.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:fce1473f3ccc4187f75b4690cfc922628aed4d3dd013d047f95a9b3919a86596"},
+    {file = "Brotli-1.1.0-cp38-cp38-musllinux_1_2_aarch64.whl", hash = "sha256:d2b35ca2c7f81d173d2fadc2f4f31e88cc5f7a39ae5b6db5513cf3383b0e0ec7"},
+    {file = "Brotli-1.1.0-cp38-cp38-musllinux_1_2_i686.whl", hash = "sha256:af6fa6817889314555aede9a919612b23739395ce767fe7fcbea9a80bf140fe5"},
+    {file = "Brotli-1.1.0-cp38-cp38-musllinux_1_2_ppc64le.whl", hash = "sha256:2feb1d960f760a575dbc5ab3b1c00504b24caaf6986e2dc2b01c09c87866a943"},
+    {file = "Brotli-1.1.0-cp38-cp38-musllinux_1_2_x86_64.whl", hash = "sha256:4410f84b33374409552ac9b6903507cdb31cd30d2501fc5ca13d18f73548444a"},
    {file = "Brotli-1.1.0-cp38-cp38-win32.whl", hash = "sha256:db85ecf4e609a48f4b29055f1e144231b90edc90af7481aa731ba2d059226b1b"},
    {file = "Brotli-1.1.0-cp38-cp38-win_amd64.whl", hash = "sha256:3d7954194c36e304e1523f55d7042c59dc53ec20dd4e9ea9d151f1b62b4415c0"},
    {file = "Brotli-1.1.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:5fb2ce4b8045c78ebbc7b8f3c15062e435d47e7393cc57c25115cfd49883747a"},
@@ -608,6 +595,10 @@ files = [
    {file = "Brotli-1.1.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:949f3b7c29912693cee0afcf09acd6ebc04c57af949d9bf77d6101ebb61e388c"},
    {file = "Brotli-1.1.0-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:89f4988c7203739d48c6f806f1e87a1d96e0806d44f0fba61dba81392c9e474d"},
    {file = "Brotli-1.1.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:de6551e370ef19f8de1807d0a9aa2cdfdce2e85ce88b122fe9f6b2b076837e59"},
+    {file = "Brotli-1.1.0-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:0737ddb3068957cf1b054899b0883830bb1fec522ec76b1098f9b6e0f02d9419"},
+    {file = "Brotli-1.1.0-cp39-cp39-musllinux_1_2_i686.whl", hash = "sha256:4f3607b129417e111e30637af1b56f24f7a49e64763253bbc275c75fa887d4b2"},
+    {file = "Brotli-1.1.0-cp39-cp39-musllinux_1_2_ppc64le.whl", hash = "sha256:6c6e0c425f22c1c719c42670d561ad682f7bfeeef918edea971a79ac5252437f"},
+    {file = "Brotli-1.1.0-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:494994f807ba0b92092a163a0a283961369a65f6cbe01e8891132b7a320e61eb"},
    {file = "Brotli-1.1.0-cp39-cp39-win32.whl", hash = "sha256:f0d8a7a6b5983c2496e364b969f0e526647a06b075d034f3297dc66f3b360c64"},
    {file = "Brotli-1.1.0-cp39-cp39-win_amd64.whl", hash = "sha256:cdad5b9014d83ca68c25d2e9444e28e967ef16e80f6b436918c700c117a85467"},
    {file = "Brotli-1.1.0.tar.gz", hash = "sha256:81de08ac11bcb85841e440c13611c00b67d3bf82698314928d0b676362546724"},
@@ -1822,25 +1813,6 @@ type = "legacy"
 url = "https://pypi.org/simple"
 reference = "offical-source"

-[[package]]
-name = "isort"
-version = "5.13.2"
-description = "A Python utility / library to sort Python imports."
-optional = false
-python-versions = ">=3.8.0"
-files = [
-    {file = "isort-5.13.2-py3-none-any.whl", hash = "sha256:8ca5e72a8d85860d5a3fa69b8745237f2939afe12dbf656afbcb47fe72d947a6"},
-    {file = "isort-5.13.2.tar.gz", hash = "sha256:48fdfcb9face5d58a4f6dde2e72a1fb8dcaf8ab26f95ab49fab84c2ddefb0109"},
-]
-
-[package.extras]
-colors = ["colorama (>=0.4.6)"]
-
-[package.source]
-type = "legacy"
-url = "https://pypi.org/simple"
-reference = "offical-source"
-
 [[package]]
 name = "jedi"
 version = "0.19.1"
@@ -2523,22 +2495,6 @@ type = "legacy"
 url = "https://pypi.org/simple"
 reference = "offical-source"

-[[package]]
-name = "mypy-extensions"
-version = "1.0.0"
-description = "Type system extensions for programs checked with the mypy type checker."
-optional = false
-python-versions = ">=3.5"
-files = [
-    {file = "mypy_extensions-1.0.0-py3-none-any.whl", hash = "sha256:4392f6c0eb8a5668a69e23d168ffa70f0be9ccfd32b5cc2d26a34ae5b844552d"},
-    {file = "mypy_extensions-1.0.0.tar.gz", hash = "sha256:75dbf8955dc00442a438fc4d0666508a9a97b6bd41aa2f0ffe9d2f2725af0782"},
-]
-
-[package.source]
-type = "legacy"
-url = "https://pypi.org/simple"
-reference = "offical-source"
-
 [[package]]
 name = "nb-cli"
 version = "1.4.2"
@@ -2928,22 +2884,6 @@ type = "legacy"
 url = "https://pypi.org/simple"
 reference = "offical-source"

-[[package]]
-name = "pathspec"
-version = "0.12.1"
-description = "Utility library for gitignore style pattern matching of file paths."
-optional = false
-python-versions = ">=3.8"
-files = [
-    {file = "pathspec-0.12.1-py3-none-any.whl", hash = "sha256:a0d503e138a4c123b27490a4f7beda6a01c6f288df0e4a8b79c7eb0dc7b4cc08"},
-    {file = "pathspec-0.12.1.tar.gz", hash = "sha256:a482d51503a1ab33b1c67a6c3813a26953dbdc71c31dacaef9a838c4e29f5712"},
-]
-
-[package.source]
-type = "legacy"
-url = "https://pypi.org/simple"
-reference = "offical-source"
-
 [[package]]
 name = "pexpect"
 version = "4.9.0"
@@ -2965,95 +2905,90 @@ reference = "offical-source"

 [[package]]
 name = "pillow"
-version = "10.4.0"
+version = "11.0.0"
 description = "Python Imaging Library (Fork)"
 optional = false
-python-versions = ">=3.8"
+python-versions = ">=3.9"
 files = [
-    {file = "pillow-10.4.0-cp310-cp310-macosx_10_10_x86_64.whl", hash = "sha256:4d9667937cfa347525b319ae34375c37b9ee6b525440f3ef48542fcf66f2731e"},
-    {file = "pillow-10.4.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:543f3dc61c18dafb755773efc89aae60d06b6596a63914107f75459cf984164d"},
-    {file = "pillow-10.4.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7928ecbf1ece13956b95d9cbcfc77137652b02763ba384d9ab508099a2eca856"},
-    {file = "pillow-10.4.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e4d49b85c4348ea0b31ea63bc75a9f3857869174e2bf17e7aba02945cd218e6f"},
-    {file = "pillow-10.4.0-cp310-cp310-manylinux_2_28_aarch64.whl", hash = "sha256:6c762a5b0997f5659a5ef2266abc1d8851ad7749ad9a6a5506eb23d314e4f46b"},
-    {file = "pillow-10.4.0-cp310-cp310-manylinux_2_28_x86_64.whl", hash = "sha256:a985e028fc183bf12a77a8bbf36318db4238a3ded7fa9df1b9a133f1cb79f8fc"},
-    {file = "pillow-10.4.0-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:812f7342b0eee081eaec84d91423d1b4650bb9828eb53d8511bcef8ce5aecf1e"},
-    {file = "pillow-10.4.0-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:ac1452d2fbe4978c2eec89fb5a23b8387aba707ac72810d9490118817d9c0b46"},
-    {file = "pillow-10.4.0-cp310-cp310-win32.whl", hash = "sha256:bcd5e41a859bf2e84fdc42f4edb7d9aba0a13d29a2abadccafad99de3feff984"},
-    {file = "pillow-10.4.0-cp310-cp310-win_amd64.whl", hash = "sha256:ecd85a8d3e79cd7158dec1c9e5808e821feea088e2f69a974db5edf84dc53141"},
-    {file = "pillow-10.4.0-cp310-cp310-win_arm64.whl", hash = "sha256:ff337c552345e95702c5fde3158acb0625111017d0e5f24bf3acdb9cc16b90d1"},
-    {file = "pillow-10.4.0-cp311-cp311-macosx_10_10_x86_64.whl", hash = "sha256:0a9ec697746f268507404647e531e92889890a087e03681a3606d9b920fbee3c"},
-    {file = "pillow-10.4.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:dfe91cb65544a1321e631e696759491ae04a2ea11d36715eca01ce07284738be"},
-    {file = "pillow-10.4.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5dc6761a6efc781e6a1544206f22c80c3af4c8cf461206d46a1e6006e4429ff3"},
-    {file = "pillow-10.4.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5e84b6cc6a4a3d76c153a6b19270b3526a5a8ed6b09501d3af891daa2a9de7d6"},
-    {file = "pillow-10.4.0-cp311-cp311-manylinux_2_28_aarch64.whl", hash = "sha256:bbc527b519bd3aa9d7f429d152fea69f9ad37c95f0b02aebddff592688998abe"},
-    {file = "pillow-10.4.0-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:76a911dfe51a36041f2e756b00f96ed84677cdeb75d25c767f296c1c1eda1319"},
-    {file = "pillow-10.4.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:59291fb29317122398786c2d44427bbd1a6d7ff54017075b22be9d21aa59bd8d"},
-    {file = "pillow-10.4.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:416d3a5d0e8cfe4f27f574362435bc9bae57f679a7158e0096ad2beb427b8696"},
-    {file = "pillow-10.4.0-cp311-cp311-win32.whl", hash = "sha256:7086cc1d5eebb91ad24ded9f58bec6c688e9f0ed7eb3dbbf1e4800280a896496"},
-    {file = "pillow-10.4.0-cp311-cp311-win_amd64.whl", hash = "sha256:cbed61494057c0f83b83eb3a310f0bf774b09513307c434d4366ed64f4128a91"},
-    {file = "pillow-10.4.0-cp311-cp311-win_arm64.whl", hash = "sha256:f5f0c3e969c8f12dd2bb7e0b15d5c468b51e5017e01e2e867335c81903046a22"},
-    {file = "pillow-10.4.0-cp312-cp312-macosx_10_10_x86_64.whl", hash = "sha256:673655af3eadf4df6b5457033f086e90299fdd7a47983a13827acf7459c15d94"},
-    {file = "pillow-10.4.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:866b6942a92f56300012f5fbac71f2d610312ee65e22f1aa2609e491284e5597"},
-    {file = "pillow-10.4.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:29dbdc4207642ea6aad70fbde1a9338753d33fb23ed6956e706936706f52dd80"},
-    {file = "pillow-10.4.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bf2342ac639c4cf38799a44950bbc2dfcb685f052b9e262f446482afaf4bffca"},
-    {file = "pillow-10.4.0-cp312-cp312-manylinux_2_28_aarch64.whl", hash = "sha256:f5b92f4d70791b4a67157321c4e8225d60b119c5cc9aee8ecf153aace4aad4ef"},
-    {file = "pillow-10.4.0-cp312-cp312-manylinux_2_28_x86_64.whl", hash = "sha256:86dcb5a1eb778d8b25659d5e4341269e8590ad6b4e8b44d9f4b07f8d136c414a"},
-    {file = "pillow-10.4.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:780c072c2e11c9b2c7ca37f9a2ee8ba66f44367ac3e5c7832afcfe5104fd6d1b"},
-    {file = "pillow-10.4.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:37fb69d905be665f68f28a8bba3c6d3223c8efe1edf14cc4cfa06c241f8c81d9"},
-    {file = "pillow-10.4.0-cp312-cp312-win32.whl", hash = "sha256:7dfecdbad5c301d7b5bde160150b4db4c659cee2b69589705b6f8a0c509d9f42"},
-    {file = "pillow-10.4.0-cp312-cp312-win_amd64.whl", hash = "sha256:1d846aea995ad352d4bdcc847535bd56e0fd88d36829d2c90be880ef1ee4668a"},
-    {file = "pillow-10.4.0-cp312-cp312-win_arm64.whl", hash = "sha256:e553cad5179a66ba15bb18b353a19020e73a7921296a7979c4a2b7f6a5cd57f9"},
-    {file = "pillow-10.4.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:8bc1a764ed8c957a2e9cacf97c8b2b053b70307cf2996aafd70e91a082e70df3"},
-    {file = "pillow-10.4.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:6209bb41dc692ddfee4942517c19ee81b86c864b626dbfca272ec0f7cff5d9fb"},
-    {file = "pillow-10.4.0-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bee197b30783295d2eb680b311af15a20a8b24024a19c3a26431ff83eb8d1f70"},
-    {file = "pillow-10.4.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1ef61f5dd14c300786318482456481463b9d6b91ebe5ef12f405afbba77ed0be"},
-    {file = "pillow-10.4.0-cp313-cp313-manylinux_2_28_aarch64.whl", hash = "sha256:297e388da6e248c98bc4a02e018966af0c5f92dfacf5a5ca22fa01cb3179bca0"},
-    {file = "pillow-10.4.0-cp313-cp313-manylinux_2_28_x86_64.whl", hash = "sha256:e4db64794ccdf6cb83a59d73405f63adbe2a1887012e308828596100a0b2f6cc"},
-    {file = "pillow-10.4.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:bd2880a07482090a3bcb01f4265f1936a903d70bc740bfcb1fd4e8a2ffe5cf5a"},
-    {file = "pillow-10.4.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:4b35b21b819ac1dbd1233317adeecd63495f6babf21b7b2512d244ff6c6ce309"},
-    {file = "pillow-10.4.0-cp313-cp313-win32.whl", hash = "sha256:551d3fd6e9dc15e4c1eb6fc4ba2b39c0c7933fa113b220057a34f4bb3268a060"},
-    {file = "pillow-10.4.0-cp313-cp313-win_amd64.whl", hash = "sha256:030abdbe43ee02e0de642aee345efa443740aa4d828bfe8e2eb11922ea6a21ea"},
-    {file = "pillow-10.4.0-cp313-cp313-win_arm64.whl", hash = "sha256:5b001114dd152cfd6b23befeb28d7aee43553e2402c9f159807bf55f33af8a8d"},
-    {file = "pillow-10.4.0-cp38-cp38-macosx_10_10_x86_64.whl", hash = "sha256:8d4d5063501b6dd4024b8ac2f04962d661222d120381272deea52e3fc52d3736"},
-    {file = "pillow-10.4.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:7c1ee6f42250df403c5f103cbd2768a28fe1a0ea1f0f03fe151c8741e1469c8b"},
-    {file = "pillow-10.4.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b15e02e9bb4c21e39876698abf233c8c579127986f8207200bc8a8f6bb27acf2"},
-    {file = "pillow-10.4.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7a8d4bade9952ea9a77d0c3e49cbd8b2890a399422258a77f357b9cc9be8d680"},
-    {file = "pillow-10.4.0-cp38-cp38-manylinux_2_28_aarch64.whl", hash = "sha256:43efea75eb06b95d1631cb784aa40156177bf9dd5b4b03ff38979e048258bc6b"},
-    {file = "pillow-10.4.0-cp38-cp38-manylinux_2_28_x86_64.whl", hash = "sha256:950be4d8ba92aca4b2bb0741285a46bfae3ca699ef913ec8416c1b78eadd64cd"},
-    {file = "pillow-10.4.0-cp38-cp38-musllinux_1_2_aarch64.whl", hash = "sha256:d7480af14364494365e89d6fddc510a13e5a2c3584cb19ef65415ca57252fb84"},
-    {file = "pillow-10.4.0-cp38-cp38-musllinux_1_2_x86_64.whl", hash = "sha256:73664fe514b34c8f02452ffb73b7a92c6774e39a647087f83d67f010eb9a0cf0"},
-    {file = "pillow-10.4.0-cp38-cp38-win32.whl", hash = "sha256:e88d5e6ad0d026fba7bdab8c3f225a69f063f116462c49892b0149e21b6c0a0e"},
-    {file = "pillow-10.4.0-cp38-cp38-win_amd64.whl", hash = "sha256:5161eef006d335e46895297f642341111945e2c1c899eb406882a6c61a4357ab"},
-    {file = "pillow-10.4.0-cp39-cp39-macosx_10_10_x86_64.whl", hash = "sha256:0ae24a547e8b711ccaaf99c9ae3cd975470e1a30caa80a6aaee9a2f19c05701d"},
-    {file = "pillow-10.4.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:298478fe4f77a4408895605f3482b6cc6222c018b2ce565c2b6b9c354ac3229b"},
-    {file = "pillow-10.4.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:134ace6dc392116566980ee7436477d844520a26a4b1bd4053f6f47d096997fd"},
-    {file = "pillow-10.4.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:930044bb7679ab003b14023138b50181899da3f25de50e9dbee23b61b4de2126"},
-    {file = "pillow-10.4.0-cp39-cp39-manylinux_2_28_aarch64.whl", hash = "sha256:c76e5786951e72ed3686e122d14c5d7012f16c8303a674d18cdcd6d89557fc5b"},
-    {file = "pillow-10.4.0-cp39-cp39-manylinux_2_28_x86_64.whl", hash = "sha256:b2724fdb354a868ddf9a880cb84d102da914e99119211ef7ecbdc613b8c96b3c"},
-    {file = "pillow-10.4.0-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:dbc6ae66518ab3c5847659e9988c3b60dc94ffb48ef9168656e0019a93dbf8a1"},
-    {file = "pillow-10.4.0-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:06b2f7898047ae93fad74467ec3d28fe84f7831370e3c258afa533f81ef7f3df"},
-    {file = "pillow-10.4.0-cp39-cp39-win32.whl", hash = "sha256:7970285ab628a3779aecc35823296a7869f889b8329c16ad5a71e4901a3dc4ef"},
-    {file = "pillow-10.4.0-cp39-cp39-win_amd64.whl", hash = "sha256:961a7293b2457b405967af9c77dcaa43cc1a8cd50d23c532e62d48ab6cdd56f5"},
-    {file = "pillow-10.4.0-cp39-cp39-win_arm64.whl", hash = "sha256:32cda9e3d601a52baccb2856b8ea1fc213c90b340c542dcef77140dfa3278a9e"},
-    {file = "pillow-10.4.0-pp310-pypy310_pp73-macosx_10_15_x86_64.whl", hash = "sha256:5b4815f2e65b30f5fbae9dfffa8636d992d49705723fe86a3661806e069352d4"},
-    {file = "pillow-10.4.0-pp310-pypy310_pp73-macosx_11_0_arm64.whl", hash = "sha256:8f0aef4ef59694b12cadee839e2ba6afeab89c0f39a3adc02ed51d109117b8da"},
-    {file = "pillow-10.4.0-pp310-pypy310_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9f4727572e2918acaa9077c919cbbeb73bd2b3ebcfe033b72f858fc9fbef0026"},
-    {file = "pillow-10.4.0-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ff25afb18123cea58a591ea0244b92eb1e61a1fd497bf6d6384f09bc3262ec3e"},
-    {file = "pillow-10.4.0-pp310-pypy310_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:dc3e2db6ba09ffd7d02ae9141cfa0ae23393ee7687248d46a7507b75d610f4f5"},
-    {file = "pillow-10.4.0-pp310-pypy310_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:02a2be69f9c9b8c1e97cf2713e789d4e398c751ecfd9967c18d0ce304efbf885"},
-    {file = "pillow-10.4.0-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:0755ffd4a0c6f267cccbae2e9903d95477ca2f77c4fcf3a3a09570001856c8a5"},
-    {file = "pillow-10.4.0-pp39-pypy39_pp73-macosx_10_15_x86_64.whl", hash = "sha256:a02364621fe369e06200d4a16558e056fe2805d3468350df3aef21e00d26214b"},
-    {file = "pillow-10.4.0-pp39-pypy39_pp73-macosx_11_0_arm64.whl", hash = "sha256:1b5dea9831a90e9d0721ec417a80d4cbd7022093ac38a568db2dd78363b00908"},
-    {file = "pillow-10.4.0-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9b885f89040bb8c4a1573566bbb2f44f5c505ef6e74cec7ab9068c900047f04b"},
-    {file = "pillow-10.4.0-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:87dd88ded2e6d74d31e1e0a99a726a6765cda32d00ba72dc37f0651f306daaa8"},
-    {file = "pillow-10.4.0-pp39-pypy39_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:2db98790afc70118bd0255c2eeb465e9767ecf1f3c25f9a1abb8ffc8cfd1fe0a"},
-    {file = "pillow-10.4.0-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:f7baece4ce06bade126fb84b8af1c33439a76d8a6fd818970215e0560ca28c27"},
-    {file = "pillow-10.4.0-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:cfdd747216947628af7b259d274771d84db2268ca062dd5faf373639d00113a3"},
-    {file = "pillow-10.4.0.tar.gz", hash = "sha256:166c1cd4d24309b30d61f79f4a9114b7b2313d7450912277855ff5dfd7cd4a06"},
+    {file = "pillow-11.0.0-cp310-cp310-macosx_10_10_x86_64.whl", hash = "sha256:6619654954dc4936fcff82db8eb6401d3159ec6be81e33c6000dfd76ae189947"},
+    {file = "pillow-11.0.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:b3c5ac4bed7519088103d9450a1107f76308ecf91d6dabc8a33a2fcfb18d0fba"},
+    {file = "pillow-11.0.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a65149d8ada1055029fcb665452b2814fe7d7082fcb0c5bed6db851cb69b2086"},
+    {file = "pillow-11.0.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:88a58d8ac0cc0e7f3a014509f0455248a76629ca9b604eca7dc5927cc593c5e9"},
+    {file = "pillow-11.0.0-cp310-cp310-manylinux_2_28_aarch64.whl", hash = "sha256:c26845094b1af3c91852745ae78e3ea47abf3dbcd1cf962f16b9a5fbe3ee8488"},
+    {file = "pillow-11.0.0-cp310-cp310-manylinux_2_28_x86_64.whl", hash = "sha256:1a61b54f87ab5786b8479f81c4b11f4d61702830354520837f8cc791ebba0f5f"},
+    {file = "pillow-11.0.0-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:674629ff60030d144b7bca2b8330225a9b11c482ed408813924619c6f302fdbb"},
+    {file = "pillow-11.0.0-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:598b4e238f13276e0008299bd2482003f48158e2b11826862b1eb2ad7c768b97"},
+    {file = "pillow-11.0.0-cp310-cp310-win32.whl", hash = "sha256:9a0f748eaa434a41fccf8e1ee7a3eed68af1b690e75328fd7a60af123c193b50"},
+    {file = "pillow-11.0.0-cp310-cp310-win_amd64.whl", hash = "sha256:a5629742881bcbc1f42e840af185fd4d83a5edeb96475a575f4da50d6ede337c"},
+    {file = "pillow-11.0.0-cp310-cp310-win_arm64.whl", hash = "sha256:ee217c198f2e41f184f3869f3e485557296d505b5195c513b2bfe0062dc537f1"},
+    {file = "pillow-11.0.0-cp311-cp311-macosx_10_10_x86_64.whl", hash = "sha256:1c1d72714f429a521d8d2d018badc42414c3077eb187a59579f28e4270b4b0fc"},
+    {file = "pillow-11.0.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:499c3a1b0d6fc8213519e193796eb1a86a1be4b1877d678b30f83fd979811d1a"},
+    {file = "pillow-11.0.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c8b2351c85d855293a299038e1f89db92a2f35e8d2f783489c6f0b2b5f3fe8a3"},
+    {file = "pillow-11.0.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6f4dba50cfa56f910241eb7f883c20f1e7b1d8f7d91c750cd0b318bad443f4d5"},
+    {file = "pillow-11.0.0-cp311-cp311-manylinux_2_28_aarch64.whl", hash = "sha256:5ddbfd761ee00c12ee1be86c9c0683ecf5bb14c9772ddbd782085779a63dd55b"},
+    {file = "pillow-11.0.0-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:45c566eb10b8967d71bf1ab8e4a525e5a93519e29ea071459ce517f6b903d7fa"},
+    {file = "pillow-11.0.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:b4fd7bd29610a83a8c9b564d457cf5bd92b4e11e79a4ee4716a63c959699b306"},
+    {file = "pillow-11.0.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:cb929ca942d0ec4fac404cbf520ee6cac37bf35be479b970c4ffadf2b6a1cad9"},
+    {file = "pillow-11.0.0-cp311-cp311-win32.whl", hash = "sha256:006bcdd307cc47ba43e924099a038cbf9591062e6c50e570819743f5607404f5"},
+    {file = "pillow-11.0.0-cp311-cp311-win_amd64.whl", hash = "sha256:52a2d8323a465f84faaba5236567d212c3668f2ab53e1c74c15583cf507a0291"},
+    {file = "pillow-11.0.0-cp311-cp311-win_arm64.whl", hash = "sha256:16095692a253047fe3ec028e951fa4221a1f3ed3d80c397e83541a3037ff67c9"},
+    {file = "pillow-11.0.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:d2c0a187a92a1cb5ef2c8ed5412dd8d4334272617f532d4ad4de31e0495bd923"},
+    {file = "pillow-11.0.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:084a07ef0821cfe4858fe86652fffac8e187b6ae677e9906e192aafcc1b69903"},
+    {file = "pillow-11.0.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8069c5179902dcdce0be9bfc8235347fdbac249d23bd90514b7a47a72d9fecf4"},
+    {file = "pillow-11.0.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f02541ef64077f22bf4924f225c0fd1248c168f86e4b7abdedd87d6ebaceab0f"},
+    {file = "pillow-11.0.0-cp312-cp312-manylinux_2_28_aarch64.whl", hash = "sha256:fcb4621042ac4b7865c179bb972ed0da0218a076dc1820ffc48b1d74c1e37fe9"},
+    {file = "pillow-11.0.0-cp312-cp312-manylinux_2_28_x86_64.whl", hash = "sha256:00177a63030d612148e659b55ba99527803288cea7c75fb05766ab7981a8c1b7"},
+    {file = "pillow-11.0.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:8853a3bf12afddfdf15f57c4b02d7ded92c7a75a5d7331d19f4f9572a89c17e6"},
+    {file = "pillow-11.0.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:3107c66e43bda25359d5ef446f59c497de2b5ed4c7fdba0894f8d6cf3822dafc"},
+    {file = "pillow-11.0.0-cp312-cp312-win32.whl", hash = "sha256:86510e3f5eca0ab87429dd77fafc04693195eec7fd6a137c389c3eeb4cfb77c6"},
+    {file = "pillow-11.0.0-cp312-cp312-win_amd64.whl", hash = "sha256:8ec4a89295cd6cd4d1058a5e6aec6bf51e0eaaf9714774e1bfac7cfc9051db47"},
+    {file = "pillow-11.0.0-cp312-cp312-win_arm64.whl", hash = "sha256:27a7860107500d813fcd203b4ea19b04babe79448268403172782754870dac25"},
+    {file = "pillow-11.0.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:bcd1fb5bb7b07f64c15618c89efcc2cfa3e95f0e3bcdbaf4642509de1942a699"},
+    {file = "pillow-11.0.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:0e038b0745997c7dcaae350d35859c9715c71e92ffb7e0f4a8e8a16732150f38"},
+    {file = "pillow-11.0.0-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0ae08bd8ffc41aebf578c2af2f9d8749d91f448b3bfd41d7d9ff573d74f2a6b2"},
+    {file = "pillow-11.0.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d69bfd8ec3219ae71bcde1f942b728903cad25fafe3100ba2258b973bd2bc1b2"},
+    {file = "pillow-11.0.0-cp313-cp313-manylinux_2_28_aarch64.whl", hash = "sha256:61b887f9ddba63ddf62fd02a3ba7add935d053b6dd7d58998c630e6dbade8527"},
+    {file = "pillow-11.0.0-cp313-cp313-manylinux_2_28_x86_64.whl", hash = "sha256:c6a660307ca9d4867caa8d9ca2c2658ab685de83792d1876274991adec7b93fa"},
+    {file = "pillow-11.0.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:73e3a0200cdda995c7e43dd47436c1548f87a30bb27fb871f352a22ab8dcf45f"},
+    {file = "pillow-11.0.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:fba162b8872d30fea8c52b258a542c5dfd7b235fb5cb352240c8d63b414013eb"},
+    {file = "pillow-11.0.0-cp313-cp313-win32.whl", hash = "sha256:f1b82c27e89fffc6da125d5eb0ca6e68017faf5efc078128cfaa42cf5cb38798"},
+    {file = "pillow-11.0.0-cp313-cp313-win_amd64.whl", hash = "sha256:8ba470552b48e5835f1d23ecb936bb7f71d206f9dfeee64245f30c3270b994de"},
+    {file = "pillow-11.0.0-cp313-cp313-win_arm64.whl", hash = "sha256:846e193e103b41e984ac921b335df59195356ce3f71dcfd155aa79c603873b84"},
+    {file = "pillow-11.0.0-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:4ad70c4214f67d7466bea6a08061eba35c01b1b89eaa098040a35272a8efb22b"},
+    {file = "pillow-11.0.0-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:6ec0d5af64f2e3d64a165f490d96368bb5dea8b8f9ad04487f9ab60dc4bb6003"},
+    {file = "pillow-11.0.0-cp313-cp313t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c809a70e43c7977c4a42aefd62f0131823ebf7dd73556fa5d5950f5b354087e2"},
+    {file = "pillow-11.0.0-cp313-cp313t-manylinux_2_28_x86_64.whl", hash = "sha256:4b60c9520f7207aaf2e1d94de026682fc227806c6e1f55bba7606d1c94dd623a"},
+    {file = "pillow-11.0.0-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:1e2688958a840c822279fda0086fec1fdab2f95bf2b717b66871c4ad9859d7e8"},
+    {file = "pillow-11.0.0-cp313-cp313t-win32.whl", hash = "sha256:607bbe123c74e272e381a8d1957083a9463401f7bd01287f50521ecb05a313f8"},
+    {file = "pillow-11.0.0-cp313-cp313t-win_amd64.whl", hash = "sha256:5c39ed17edea3bc69c743a8dd3e9853b7509625c2462532e62baa0732163a904"},
+    {file = "pillow-11.0.0-cp313-cp313t-win_arm64.whl", hash = "sha256:75acbbeb05b86bc53cbe7b7e6fe00fbcf82ad7c684b3ad82e3d711da9ba287d3"},
+    {file = "pillow-11.0.0-cp39-cp39-macosx_10_10_x86_64.whl", hash = "sha256:2e46773dc9f35a1dd28bd6981332fd7f27bec001a918a72a79b4133cf5291dba"},
+    {file = "pillow-11.0.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:2679d2258b7f1192b378e2893a8a0a0ca472234d4c2c0e6bdd3380e8dfa21b6a"},
+    {file = "pillow-11.0.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:eda2616eb2313cbb3eebbe51f19362eb434b18e3bb599466a1ffa76a033fb916"},
+    {file = "pillow-11.0.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:20ec184af98a121fb2da42642dea8a29ec80fc3efbaefb86d8fdd2606619045d"},
+    {file = "pillow-11.0.0-cp39-cp39-manylinux_2_28_aarch64.whl", hash = "sha256:8594f42df584e5b4bb9281799698403f7af489fba84c34d53d1c4bfb71b7c4e7"},
+    {file = "pillow-11.0.0-cp39-cp39-manylinux_2_28_x86_64.whl", hash = "sha256:c12b5ae868897c7338519c03049a806af85b9b8c237b7d675b8c5e089e4a618e"},
+    {file = "pillow-11.0.0-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:70fbbdacd1d271b77b7721fe3cdd2d537bbbd75d29e6300c672ec6bb38d9672f"},
+    {file = "pillow-11.0.0-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:5178952973e588b3f1360868847334e9e3bf49d19e169bbbdfaf8398002419ae"},
+    {file = "pillow-11.0.0-cp39-cp39-win32.whl", hash = "sha256:8c676b587da5673d3c75bd67dd2a8cdfeb282ca38a30f37950511766b26858c4"},
+    {file = "pillow-11.0.0-cp39-cp39-win_amd64.whl", hash = "sha256:94f3e1780abb45062287b4614a5bc0874519c86a777d4a7ad34978e86428b8dd"},
+    {file = "pillow-11.0.0-cp39-cp39-win_arm64.whl", hash = "sha256:290f2cc809f9da7d6d622550bbf4c1e57518212da51b6a30fe8e0a270a5b78bd"},
+    {file = "pillow-11.0.0-pp310-pypy310_pp73-macosx_10_15_x86_64.whl", hash = "sha256:1187739620f2b365de756ce086fdb3604573337cc28a0d3ac4a01ab6b2d2a6d2"},
+    {file = "pillow-11.0.0-pp310-pypy310_pp73-macosx_11_0_arm64.whl", hash = "sha256:fbbcb7b57dc9c794843e3d1258c0fbf0f48656d46ffe9e09b63bbd6e8cd5d0a2"},
+    {file = "pillow-11.0.0-pp310-pypy310_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5d203af30149ae339ad1b4f710d9844ed8796e97fda23ffbc4cc472968a47d0b"},
+    {file = "pillow-11.0.0-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:21a0d3b115009ebb8ac3d2ebec5c2982cc693da935f4ab7bb5c8ebe2f47d36f2"},
+    {file = "pillow-11.0.0-pp310-pypy310_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:73853108f56df97baf2bb8b522f3578221e56f646ba345a372c78326710d3830"},
+    {file = "pillow-11.0.0-pp310-pypy310_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:e58876c91f97b0952eb766123bfef372792ab3f4e3e1f1a2267834c2ab131734"},
+    {file = "pillow-11.0.0-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:224aaa38177597bb179f3ec87eeefcce8e4f85e608025e9cfac60de237ba6316"},
+    {file = "pillow-11.0.0-pp39-pypy39_pp73-macosx_11_0_arm64.whl", hash = "sha256:5bd2d3bdb846d757055910f0a59792d33b555800813c3b39ada1829c372ccb06"},
+    {file = "pillow-11.0.0-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:375b8dd15a1f5d2feafff536d47e22f69625c1aa92f12b339ec0b2ca40263273"},
+    {file = "pillow-11.0.0-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:daffdf51ee5db69a82dd127eabecce20729e21f7a3680cf7cbb23f0829189790"},
+    {file = "pillow-11.0.0-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:7326a1787e3c7b0429659e0a944725e1b03eeaa10edd945a86dead1913383944"},
+    {file = "pillow-11.0.0.tar.gz", hash = "sha256:72bacbaf24ac003fea9bff9837d1eedb6088758d41e100c1552930151f677739"},
 ]

 [package.extras]
-docs = ["furo", "olefile", "sphinx (>=7.3)", "sphinx-copybutton", "sphinx-inline-tabs", "sphinxext-opengraph"]
+docs = ["furo", "olefile", "sphinx (>=8.1)", "sphinx-copybutton", "sphinx-inline-tabs", "sphinxext-opengraph"]
 fpx = ["olefile"]
 mic = ["olefile"]
 tests = ["check-manifest", "coverage", "defusedxml", "markdown2", "olefile", "packaging", "pyroma", "pytest", "pytest-cov", "pytest-timeout"]
@@ -3665,17 +3600,17 @@ reference = "offical-source"

 [[package]]
 name = "pytest-cov"
-version = "5.0.0"
+version = "6.0.0"
 description = "Pytest plugin for measuring coverage."
 optional = false
-python-versions = ">=3.8"
+python-versions = ">=3.9"
 files = [
-    {file = "pytest-cov-5.0.0.tar.gz", hash = "sha256:5837b58e9f6ebd335b0f8060eecce69b662415b16dc503883a02f45dfeb14857"},
-    {file = "pytest_cov-5.0.0-py3-none-any.whl", hash = "sha256:4f0764a1219df53214206bf1feea4633c3b558a2925c8b59f144f682861ce652"},
+    {file = "pytest-cov-6.0.0.tar.gz", hash = "sha256:fde0b595ca248bb8e2d76f020b465f3b107c9632e6a1d1705f17834c89dcadc0"},
+    {file = "pytest_cov-6.0.0-py3-none-any.whl", hash = "sha256:eee6f1b9e61008bd34975a4d5bab25801eb31898b032dd55addc93e96fcaaa35"},
 ]

 [package.dependencies]
-coverage = {version = ">=5.2.1", extras = ["toml"]}
+coverage = {version = ">=7.5", extras = ["toml"]}
 pytest = ">=4.6"

 [package.extras]
@@ -4185,29 +4120,29 @@ reference = "offical-source"

 [[package]]
 name = "ruff"
-version = "0.6.5"
+version = "0.8.2"
 description = "An extremely fast Python linter and code formatter, written in Rust."
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "ruff-0.6.5-py3-none-linux_armv6l.whl", hash = "sha256:7e4e308f16e07c95fc7753fc1aaac690a323b2bb9f4ec5e844a97bb7fbebd748"},
-    {file = "ruff-0.6.5-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:932cd69eefe4daf8c7d92bd6689f7e8182571cb934ea720af218929da7bd7d69"},
-    {file = "ruff-0.6.5-py3-none-macosx_11_0_arm64.whl", hash = "sha256:3a8d42d11fff8d3143ff4da41742a98f8f233bf8890e9fe23077826818f8d680"},
-    {file = "ruff-0.6.5-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a50af6e828ee692fb10ff2dfe53f05caecf077f4210fae9677e06a808275754f"},
-    {file = "ruff-0.6.5-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:794ada3400a0d0b89e3015f1a7e01f4c97320ac665b7bc3ade24b50b54cb2972"},
-    {file = "ruff-0.6.5-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:381413ec47f71ce1d1c614f7779d88886f406f1fd53d289c77e4e533dc6ea200"},
-    {file = "ruff-0.6.5-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:52e75a82bbc9b42e63c08d22ad0ac525117e72aee9729a069d7c4f235fc4d276"},
-    {file = "ruff-0.6.5-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:09c72a833fd3551135ceddcba5ebdb68ff89225d30758027280968c9acdc7810"},
-    {file = "ruff-0.6.5-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:800c50371bdcb99b3c1551d5691e14d16d6f07063a518770254227f7f6e8c178"},
-    {file = "ruff-0.6.5-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8e25ddd9cd63ba1f3bd51c1f09903904a6adf8429df34f17d728a8fa11174253"},
-    {file = "ruff-0.6.5-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:7291e64d7129f24d1b0c947ec3ec4c0076e958d1475c61202497c6aced35dd19"},
-    {file = "ruff-0.6.5-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:9ad7dfbd138d09d9a7e6931e6a7e797651ce29becd688be8a0d4d5f8177b4b0c"},
-    {file = "ruff-0.6.5-py3-none-musllinux_1_2_i686.whl", hash = "sha256:005256d977021790cc52aa23d78f06bb5090dc0bfbd42de46d49c201533982ae"},
-    {file = "ruff-0.6.5-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:482c1e6bfeb615eafc5899127b805d28e387bd87db38b2c0c41d271f5e58d8cc"},
-    {file = "ruff-0.6.5-py3-none-win32.whl", hash = "sha256:cf4d3fa53644137f6a4a27a2b397381d16454a1566ae5335855c187fbf67e4f5"},
-    {file = "ruff-0.6.5-py3-none-win_amd64.whl", hash = "sha256:3e42a57b58e3612051a636bc1ac4e6b838679530235520e8f095f7c44f706ff9"},
-    {file = "ruff-0.6.5-py3-none-win_arm64.whl", hash = "sha256:51935067740773afdf97493ba9b8231279e9beef0f2a8079188c4776c25688e0"},
-    {file = "ruff-0.6.5.tar.gz", hash = "sha256:4d32d87fab433c0cf285c3683dd4dae63be05fd7a1d65b3f5bf7cdd05a6b96fb"},
+    {file = "ruff-0.8.2-py3-none-linux_armv6l.whl", hash = "sha256:c49ab4da37e7c457105aadfd2725e24305ff9bc908487a9bf8d548c6dad8bb3d"},
+    {file = "ruff-0.8.2-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:ec016beb69ac16be416c435828be702ee694c0d722505f9c1f35e1b9c0cc1bf5"},
+    {file = "ruff-0.8.2-py3-none-macosx_11_0_arm64.whl", hash = "sha256:f05cdf8d050b30e2ba55c9b09330b51f9f97d36d4673213679b965d25a785f3c"},
+    {file = "ruff-0.8.2-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:60f578c11feb1d3d257b2fb043ddb47501ab4816e7e221fbb0077f0d5d4e7b6f"},
+    {file = "ruff-0.8.2-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:cbd5cf9b0ae8f30eebc7b360171bd50f59ab29d39f06a670b3e4501a36ba5897"},
+    {file = "ruff-0.8.2-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b402ddee3d777683de60ff76da801fa7e5e8a71038f57ee53e903afbcefdaa58"},
+    {file = "ruff-0.8.2-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:705832cd7d85605cb7858d8a13d75993c8f3ef1397b0831289109e953d833d29"},
+    {file = "ruff-0.8.2-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:32096b41aaf7a5cc095fa45b4167b890e4c8d3fd217603f3634c92a541de7248"},
+    {file = "ruff-0.8.2-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:e769083da9439508833cfc7c23e351e1809e67f47c50248250ce1ac52c21fb93"},
+    {file = "ruff-0.8.2-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5fe716592ae8a376c2673fdfc1f5c0c193a6d0411f90a496863c99cd9e2ae25d"},
+    {file = "ruff-0.8.2-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:81c148825277e737493242b44c5388a300584d73d5774defa9245aaef55448b0"},
+    {file = "ruff-0.8.2-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:d261d7850c8367704874847d95febc698a950bf061c9475d4a8b7689adc4f7fa"},
+    {file = "ruff-0.8.2-py3-none-musllinux_1_2_i686.whl", hash = "sha256:1ca4e3a87496dc07d2427b7dd7ffa88a1e597c28dad65ae6433ecb9f2e4f022f"},
+    {file = "ruff-0.8.2-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:729850feed82ef2440aa27946ab39c18cb4a8889c1128a6d589ffa028ddcfc22"},
+    {file = "ruff-0.8.2-py3-none-win32.whl", hash = "sha256:ac42caaa0411d6a7d9594363294416e0e48fc1279e1b0e948391695db2b3d5b1"},
+    {file = "ruff-0.8.2-py3-none-win_amd64.whl", hash = "sha256:2aae99ec70abf43372612a838d97bfe77d45146254568d94926e8ed5bbb409ea"},
+    {file = "ruff-0.8.2-py3-none-win_arm64.whl", hash = "sha256:fb88e2a506b70cfbc2de6fae6681c4f944f7dd5f2fe87233a7233d888bad73e8"},
+    {file = "ruff-0.8.2.tar.gz", hash = "sha256:b84f4f414dda8ac7f75075c1fa0b905ac0ff25361f42e6d5da681a465e0f78e5"},
 ]

 [package.source]
@@ -5129,4 +5064,4 @@ yaml = []
 [metadata]
 lock-version = "2.0"
 python-versions = ">=3.10,<4.0.0"
-content-hash = "49633514954cd83e3973b4539baa86ca5518d8582bfdb08df85247e5dcabc70f"
+content-hash = "c66f1511368c8de33a7706df2a20ef24d4191769fa29bf69bd2d5985381218d4"
@@ -31,7 +31,7 @@ nonebot-plugin-htmlrender = ">=0.3.5"
 nonebot-plugin-datastore = ">=1.3.0,<2.0.0"
 nonebot-plugin-apscheduler = ">=0.5.0"
 nonebot-plugin-send-anything-anywhere = ">=0.7.1,<0.7.2"
-pillow = ">=10.4.0,<11.0"
+pillow = ">=11.0.0,<11.1"
 pyjwt = "^2.9.0"
 python-socketio = "^5.11.4"
 tinydb = "^4.8.0"
@@ -44,13 +44,11 @@ expiringdictx = "^1.1.0"
 rapidfuzz = "^3.9.7"

 [tool.poetry.group.dev.dependencies]
-black = ">=24.8.0,<25.0"
 ipdb = "^0.13.13"
-isort = "^5.13.2"
 nonemoji = "^0.1.4"
 nb-cli = "^1.4.2"
 pre-commit = "^4.0.1"
-ruff = "^0.6.5"
+ruff = "^0.8.2"

 [tool.poetry.group.test.dependencies]
 flaky = "^3.8.1"
@@ -58,7 +56,7 @@ nonebug = "^0.3.7"
 nonebug-saa = "^0.4.1"
 pytest = ">=8.3.3,<9.0.0"
 pytest-asyncio = ">=0.24.0,<0.24.1"
-pytest-cov = ">=5.0.0,<6"
+pytest-cov = ">=6.0.0,<7"
 pytest-mock = "^3.14.0"
 pytest-xdist = { extras = ["psutil"], version = "^3.6.1" }
 respx = ">=0.21.1,<0.22"
@@ -99,25 +97,44 @@ line-length = 120
 target-version = "py310"

 [tool.ruff.lint]
-select = ["E", "W", "F", "UP", "C", "T", "PYI", "PT", "Q"]
-ignore = ["E402", "C901", "PT023"]
+select = [
+  "F",     # Pyflakes
+  "W",     # pycodestyle warnings
+  "E",     # pycodestyle errors
+  "I",     # isort
+  "UP",    # pyupgrade
+  "ASYNC", # flake8-async
+  "C4",    # flake8-comprehensions
+  "T10",   # flake8-debugger
+  "T20",   # flake8-print
+  "PYI",   # flake8-pyi
+  "PT",    # flake8-pytest-style
+  "Q",     # flake8-quotes
+  "TID",   # flake8-tidy-imports
+  "RUF",   # Ruff-specific rules
+]
+ignore = [
+  "E402",   # module-import-not-at-top-of-file
+  "UP037",  # quoted-annotation
+  "RUF001", # ambiguous-unicode-character-string
+  "RUF002", # ambiguous-unicode-character-docstring
+  "RUF003", # ambiguous-unicode-character-comment
+]

-[tool.black]
-line-length = 120
-preview = true
-target-version = ["py310", "py311", "py312"]
-include = '\.pyi?$'
-extend-exclude = '''
-'''
+[tool.ruff.format]
+line-ending = "lf"

-[tool.isort]
-profile = "black"
-line_length = 120
-skip_gitignore = true
-length_sort = true
-force_sort_within_sections = true
-src_paths = ["nonebot_bison", "tests"]
-extra_standard_library = ["typing_extensions"]
+[tool.ruff.lint.isort]
+force-sort-within-sections = true
+known-first-party = ["nonebot_bison", "tests/*"]
+extra-standard-library = ["typing_extensions"]
+
+[tool.ruff.lint.flake8-pytest-style]
+fixture-parentheses = false
+mark-parentheses = false
+
+[tool.ruff.lint.pyupgrade]
+keep-runtime-typing = true

 [tool.nonebot]
 adapters = [
@@ -130,6 +147,7 @@ builtin_plugins = ["echo"]
 [tool.pyright]
 typeCheckingMode = "basic"
 reportShadowedImports = false
+disableBytesTypePromotions = true
 pythonVersion = "3.10"
 pythonPlatform = "All"
 executionEnvironments = [
@@ -1,7 +1,7 @@
 import typing

-import pytest
 from nonebug.app import App
+import pytest

 if typing.TYPE_CHECKING:
    import sys
@@ -1,16 +1,16 @@
-import pytest
 from nonebug.app import App
+import pytest


 async def test_add_subscribe(app: App, init_scheduler):
-    from nonebot_plugin_saa import TargetQQGroup
-    from sqlalchemy.sql.expression import select
    from nonebot_plugin_datastore.db import get_engine
+    from nonebot_plugin_saa import TargetQQGroup
    from sqlalchemy.ext.asyncio.session import AsyncSession
+    from sqlalchemy.sql.expression import select

    from nonebot_bison.config.db_config import config
+    from nonebot_bison.config.db_model import Subscribe, Target, User
    from nonebot_bison.types import Target as TTarget
-    from nonebot_bison.config.db_model import User, Target, Subscribe

    await config.add_subscribe(
        TargetQQGroup(group_id=123),
@@ -69,8 +69,8 @@ async def test_add_subscribe(app: App, init_scheduler):
 async def test_add_dup_sub(init_scheduler):
    from nonebot_plugin_saa import TargetQQGroup

-    from nonebot_bison.types import Target as TTarget
    from nonebot_bison.config.db_config import SubscribeDupException, config
+    from nonebot_bison.types import Target as TTarget

    await config.add_subscribe(
        TargetQQGroup(group_id=123),
@@ -93,15 +93,15 @@ async def test_add_dup_sub(init_scheduler):


 async def test_del_subsribe(init_scheduler):
-    from sqlalchemy.sql.functions import func
-    from nonebot_plugin_saa import TargetQQGroup
-    from sqlalchemy.sql.expression import select
    from nonebot_plugin_datastore.db import get_engine
+    from nonebot_plugin_saa import TargetQQGroup
    from sqlalchemy.ext.asyncio.session import AsyncSession
+    from sqlalchemy.sql.expression import select
+    from sqlalchemy.sql.functions import func

    from nonebot_bison.config.db_config import config
+    from nonebot_bison.config.db_model import Subscribe, Target
    from nonebot_bison.types import Target as TTarget
-    from nonebot_bison.config.db_model import Target, Subscribe

    await config.add_subscribe(
        TargetQQGroup(group_id=123),
@@ -1,9 +1,9 @@
+from datetime import datetime
 import json
 from typing import cast
-from datetime import datetime

-import pytest
 from nonebug import App
+import pytest


@pytest.mark.usefixtures("_patch_weibo_get_cookie_name")
@@ -11,9 +11,9 @@ async def test_cookie(app: App, init_scheduler):
    from nonebot_plugin_saa import TargetQQGroup

    from nonebot_bison.config.db_config import config
+    from nonebot_bison.config.utils import DuplicateCookieTargetException
    from nonebot_bison.scheduler import scheduler_dict
    from nonebot_bison.types import Target as T_Target
-    from nonebot_bison.config.utils import DuplicateCookieTargetException
    from nonebot_bison.utils.site import CookieClientManager, site_manager

    target = T_Target("weibo_id")
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
suyiiyii	5a7396bada	👷 fix case and PYTHONPATH env warning in Dockerfile test-build / Build Frontend (push) Has been cancelled Details test-build / Smoke-test Coverage (macos-latest, 3.10) (push) Has been cancelled Details test-build / Smoke-test Coverage (macos-latest, 3.11) (push) Has been cancelled Details test-build / Smoke-test Coverage (macos-latest, 3.12) (push) Has been cancelled Details test-build / Smoke-test Coverage (ubuntu-latest, 3.10) (push) Has been cancelled Details test-build / Smoke-test Coverage (ubuntu-latest, 3.11) (push) Has been cancelled Details test-build / Smoke-test Coverage (ubuntu-latest, 3.12) (push) Has been cancelled Details test-build / Smoke-test Coverage (windows-latest, 3.10) (push) Has been cancelled Details test-build / Smoke-test Coverage (windows-latest, 3.11) (push) Has been cancelled Details test-build / Smoke-test Coverage (windows-latest, 3.12) (push) Has been cancelled Details test-build / All-test Coverage (macos-latest, 3.10) (push) Has been cancelled Details test-build / All-test Coverage (macos-latest, 3.11) (push) Has been cancelled Details test-build / All-test Coverage (macos-latest, 3.12) (push) Has been cancelled Details test-build / All-test Coverage (ubuntu-latest, 3.10) (push) Has been cancelled Details test-build / All-test Coverage (ubuntu-latest, 3.11) (push) Has been cancelled Details test-build / All-test Coverage (ubuntu-latest, 3.12) (push) Has been cancelled Details test-build / All-test Coverage (windows-latest, 3.10) (push) Has been cancelled Details test-build / All-test Coverage (windows-latest, 3.11) (push) Has been cancelled Details test-build / All-test Coverage (windows-latest, 3.12) (push) Has been cancelled Details pydantic1-compat-test / pydantic1 test (ubuntu-latest, 3.11) (push) Has been cancelled Details Ruff Lint / Ruff Lint (push) Has been cancelled Details test-build / Docker main (push) Has been cancelled Details test-build / Docker main sentry (push) Has been cancelled Details	2024-12-17 16:29:10 +08:00
Azide	08ad5c288c	🧑‍💻 使用 Ruff 包办所有格式化和检查 (#663 )	2024-12-17 10:52:21 +08:00
pre-commit-ci[bot]	af1609730c	⬆️ auto update by pre-commit hooks (#660 ) test-build / Build Frontend (push) Has been cancelled Details test-build / Smoke-test Coverage (macos-latest, 3.10) (push) Has been cancelled Details test-build / Smoke-test Coverage (macos-latest, 3.11) (push) Has been cancelled Details test-build / Smoke-test Coverage (macos-latest, 3.12) (push) Has been cancelled Details test-build / Smoke-test Coverage (ubuntu-latest, 3.10) (push) Has been cancelled Details test-build / Smoke-test Coverage (ubuntu-latest, 3.11) (push) Has been cancelled Details test-build / Smoke-test Coverage (ubuntu-latest, 3.12) (push) Has been cancelled Details test-build / Smoke-test Coverage (windows-latest, 3.10) (push) Has been cancelled Details test-build / Smoke-test Coverage (windows-latest, 3.11) (push) Has been cancelled Details test-build / Smoke-test Coverage (windows-latest, 3.12) (push) Has been cancelled Details test-build / All-test Coverage (macos-latest, 3.10) (push) Has been cancelled Details test-build / All-test Coverage (macos-latest, 3.11) (push) Has been cancelled Details test-build / All-test Coverage (macos-latest, 3.12) (push) Has been cancelled Details test-build / All-test Coverage (ubuntu-latest, 3.10) (push) Has been cancelled Details test-build / All-test Coverage (ubuntu-latest, 3.11) (push) Has been cancelled Details test-build / All-test Coverage (ubuntu-latest, 3.12) (push) Has been cancelled Details test-build / All-test Coverage (windows-latest, 3.10) (push) Has been cancelled Details test-build / All-test Coverage (windows-latest, 3.11) (push) Has been cancelled Details test-build / All-test Coverage (windows-latest, 3.12) (push) Has been cancelled Details pydantic1-compat-test / pydantic1 test (ubuntu-latest, 3.11) (push) Has been cancelled Details Ruff Lint / Ruff Lint (push) Has been cancelled Details test-build / Docker main (push) Has been cancelled Details test-build / Docker main sentry (push) Has been cancelled Details Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>	2024-12-05 18:28:38 +08:00
github-actions[bot]	37958b0850	📝 Update changelog	2024-12-05 08:09:09 +00:00
suyiiyii	a48ea0e947	🐛 修复 cookie 模块 type hint (#658 )	2024-12-05 16:08:42 +08:00
github-actions[bot]	d4048716b2	📝 Update changelog	2024-12-04 12:09:30 +00:00
Azide	22bf05949d	🐛 B站转发动态补充 DeletedItem 类型解析 (#659 ) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>	2024-12-04 20:09:01 +08:00
renovate[bot]	630845fe0d	⬆️ Update codecov/codecov-action action to v5 (#653 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2024-11-20 11:38:47 +08:00
dependabot[bot]	d850632f88	⬆️ Bump http-proxy-middleware from 2.0.6 to 2.0.7 in /admin-frontend (#646 ) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-11-11 14:52:57 +08:00
renovate[bot]	3b2feb3ee0	⬆️ Update dependency pillow to v11 (#642 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2024-11-11 11:47:23 +08:00
renovate[bot]	347014f0fb	⬆️ Update dependency web-vitals to v4 (#598 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2024-11-11 11:47:01 +08:00
renovate[bot]	cfc1f38ecf	⬆️ Update dependency pytest-cov to v6 (#648 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2024-11-11 11:26:47 +08:00
renovate[bot]	23ab1b4323	⬆️ Update Node.js to v22 (#647 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2024-11-11 11:26:15 +08:00
pre-commit-ci[bot]	7e88602baa	⬆️ auto update by pre-commit hooks (#652 ) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>	2024-11-07 15:24:58 +08:00
github-actions[bot]	bb928ac4b8	📝 Update changelog	2024-11-06 08:49:27 +00:00
Azide	8ab60d65d0	✨ B站获取OPUS格式动态 (#651 )	2024-11-06 16:48:40 +08:00
洛梧藤	d10db08395	🐛 小刻食堂cdn使用https (#650 )	2024-11-06 16:47:55 +08:00
github-actions[bot]	5fe9712754	📝 Update changelog	2024-10-31 04:56:42 +00:00
suyiiyii	97a0f04808	✨ 添加 Cookie 组件 (#633 ) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>	2024-10-31 12:56:15 +08:00