Skip to content

Commit

Permalink
Merge pull request #275 from AmiyaBot/V6-dev
Browse files Browse the repository at this point in the history
V6 dev
  • Loading branch information
vivien8261 authored Jul 1, 2024
2 parents 9faa174 + e89c04c commit c17d7e1
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 30 deletions.
2 changes: 1 addition & 1 deletion .github/publish.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v6.4.7
v6.4.8
27 changes: 0 additions & 27 deletions .github/workflows/package.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,30 +35,3 @@ jobs:
run: |
venv\Scripts\Activate.ps1
venv\Scripts\python run_build.py --type package --upload
publish-linux-package:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3

- name: Set up Python 3.8
uses: actions/setup-python@v4
with:
python-version: 3.8.x

- name: Install dependencies
run: |
python -m pip install --upgrade pip
python -m venv venv
venv/bin/python -m pip install --upgrade pip wheel setuptools
venv/bin/python -m pip install -r requirements.txt
venv/bin/python -m pip install cos-python-sdk-v5
venv/bin/python -m pip install pyinstaller
- name: Build and publish package
env:
SECRETID: ${{ secrets.SECRETID }}
SECRETKEY: ${{ secrets.SECRETKEY }}
run: |
source venv/bin/activate
venv/bin/python run_build.py --type package --upload
2 changes: 1 addition & 1 deletion pluginsDev
Submodule pluginsDev updated 64 files
+0 −0 bak/chatBot/README.md
+0 −0 bak/chatBot/README_USE.md
+0 −0 bak/chatBot/__init__.py
+0 −0 bak/chatBot/config_default.yaml
+0 −0 bak/chatBot/config_schema.json
+ bak/chatBot/logo.png
+3 −3 bak/chatBot/main.py
+0 −0 bak/chatBot/prompt/chat.txt
+0 −0 bak/chatBot/template/Amiya.txt
+3 −1 src/admin/main.py
+179 −73 src/ai/blm/README.md
+0 −0 src/ai/blm/__init__.py
+11 −0 src/ai/blm/config_templates/global_config_default.json
+48 −15 src/ai/blm/config_templates/global_config_schema.json
+ src/ai/blm/images/chino_logo_comment.png
+ src/ai/blm/logo.png
+1 −1 src/ai/blm/main.py
+0 −0 src/ai/blm/src/__init__.py
+0 −0 src/ai/blm/src/chat_gpt/__init__.py
+224 −30 src/ai/blm/src/chat_gpt/chat_gpt_adapter.py
+0 −0 src/ai/blm/src/common/__init__.py
+62 −32 src/ai/blm/src/common/blm_plugin_instance.py
+27 −25 src/ai/blm/src/common/blm_types.py
+0 −0 src/ai/blm/src/common/database.py
+0 −0 src/ai/blm/src/common/extract_json.py
+0 −0 src/ai/blm/src/ernie/__init__.py
+40 −18 src/ai/blm/src/ernie/ernie_adapter.py
+241 −0 src/ai/blm/src/ernie/qianfan_adapter.py
+0 −0 src/ai/blm/src/functions/__init__.py
+2 −4 src/ai/blm/src/functions/core.py
+6 −2 src/arknights/calculator/jade.py
+2 −2 src/arknights/calculator/main.py
+1 −0 src/arknights/enemy/config_default.yaml
+13 −0 src/arknights/enemy/config_schema.json
+15 −8 src/arknights/enemy/main.py
+9 −3 src/arknights/gacha/main.py
+4 −1 src/arknights/intellect/main.py
+1 −0 src/arknights/material/config_default.yaml
+13 −0 src/arknights/material/config_schema.json
+13 −5 src/arknights/material/main.py
+2 −1 src/arknights/operatorArchives/README_USE-public.md
+1 −1 src/arknights/operatorArchives/config_default.yaml
+6 −6 src/arknights/operatorArchives/config_schema.json
+9 −5 src/arknights/operatorArchives/main.py
+14 −17 src/arknights/operatorArchives/operatorCore.py
+7 −1 src/arknights/stage/main.py
+1 −0 src/func/template.md
+1 −1 src/game/guess/config_default.yaml
+14 −2 src/game/guess/config_schema.json
+12 −3 src/game/guess/guessStart.py
+14 −6 src/game/guess/main.py
+5 −1 src/game/wordle2/gameStart.py
+3 −1 src/game/wordle2/main.py
+7 −4 src/replace/main.py
+1 −1 src/skland/README_TOKEN.md
+42 −34 src/skland/gacha.py
+24 −17 src/skland/main.py
+41 −41 src/skland/template/gacha.css
+236 −236 src/skland/template/gacha.html
+1 −2 src/talking/main.py
+5 −2 src/user/main.py
+5 −2 src/user/mainBot.py
+5 −3 src/weibo/helper.py
+7 −4 src/weibo/main.py
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
amiyabot==1.9.5
amiyabot==1.9.8
attrdict~=2.0.1
baidu-aip
dhash~=1.3
Expand Down

0 comments on commit c17d7e1

Please sign in to comment.