From 21b6184d7158abe29c8609294f22ec543d4a672c Mon Sep 17 00:00:00 2001 From: lss233 Date: Sun, 9 Feb 2025 23:43:25 +0800 Subject: [PATCH 1/5] ci(docker): update docker entry name --- .github/workflows/docker-dev.yml | 37 ----------------------------- .github/workflows/docker-latest.yml | 4 ++-- .github/workflows/docker-tag.yml | 2 +- 3 files changed, 3 insertions(+), 40 deletions(-) delete mode 100644 .github/workflows/docker-dev.yml diff --git a/.github/workflows/docker-dev.yml b/.github/workflows/docker-dev.yml deleted file mode 100644 index 2e510f65..00000000 --- a/.github/workflows/docker-dev.yml +++ /dev/null @@ -1,37 +0,0 @@ -name: Docker build dev - -on: - workflow_dispatch: - push: - branches: - - 'browser-version-dev' - -jobs: - docker: - runs-on: ubuntu-latest - steps: - - - name: Checkout - uses: actions/checkout@v3 - - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - - name: Login to Docker Hub - uses: docker/login-action@v2 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Build and push - uses: docker/build-push-action@v4 - with: - context: . - push: true - platforms: 'linux/amd64,linux/arm64' - tags: lss233/chatgpt-mirai-qq-bot:browser-version-dev - cache-from: type=gha - cache-to: type=gha,mode=max diff --git a/.github/workflows/docker-latest.yml b/.github/workflows/docker-latest.yml index 9f5dbb19..5c39f19a 100644 --- a/.github/workflows/docker-latest.yml +++ b/.github/workflows/docker-latest.yml @@ -4,7 +4,7 @@ on: workflow_dispatch: push: branches: - - 'browser-version' + - 'master' jobs: docker: @@ -32,6 +32,6 @@ jobs: context: . push: true platforms: 'linux/amd64,linux/arm64' - tags: lss233/chatgpt-mirai-qq-bot:browser-version + tags: lss233/kirara-agent-framework:latest cache-from: type=gha cache-to: type=gha,mode=max \ No newline at end of file diff --git a/.github/workflows/docker-tag.yml b/.github/workflows/docker-tag.yml index 58b60081..518729f2 100644 --- a/.github/workflows/docker-tag.yml +++ b/.github/workflows/docker-tag.yml @@ -41,6 +41,6 @@ jobs: context: . push: true platforms: 'linux/amd64,linux/arm64' - tags: lss233/chatgpt-mirai-qq-bot:${{ steps.vars.outputs.tag }} + tags: lss233/kirara-agent-framework:${{ steps.vars.outputs.tag }} cache-from: type=gha cache-to: type=gha,mode=max From 9d09d45b15e218c8f7835fda5a347ac6d331c060 Mon Sep 17 00:00:00 2001 From: lss233 Date: Sun, 9 Feb 2025 23:43:41 +0800 Subject: [PATCH 2/5] refactor(quickstart): update Windows quickstart scripts --- .../windows/config.example.go-cqhttp.cfg | 14 --- .../quickstarts/windows/go-cqhttp/config.yml | 107 ------------------ .../quickstarts/windows/go-cqhttp/device.json | 1 - .../\345\210\235\345\247\213\345\214\226.cmd" | 68 ----------- .../\345\220\257\345\212\250ChatGPT.cmd" | 10 -- .../\345\220\257\345\212\250go-cqhttp.cmd" | 12 -- .../windows/mirai-http-api-settings.yml | 20 ---- .../\345\210\235\345\247\213\345\214\226.cmd" | 70 ------------ .../\345\220\257\345\212\250ChatGPT.cmd" | 11 -- .../\345\220\257\345\212\250Mirai.cmd" | 12 -- .../\345\210\235\345\247\213\345\214\226.bat" | 44 +++++++ .../scripts/\345\220\257\345\212\250.cmd" | 11 ++ .../quickstart-windows-dev-mirai.yaml | 97 ---------------- .../workflows/quickstart-windows-gocqhttp.yml | 79 ------------- .../workflows/quickstart-windows-mirai.yml | 98 ---------------- ...ev-gocqhttp.yml => quickstart-windows.yml} | 35 +++--- 16 files changed, 73 insertions(+), 616 deletions(-) delete mode 100644 .github/quickstarts/windows/config.example.go-cqhttp.cfg delete mode 100644 .github/quickstarts/windows/go-cqhttp/config.yml delete mode 100644 .github/quickstarts/windows/go-cqhttp/device.json delete mode 100644 ".github/quickstarts/windows/go-cqhttp/scripts/\345\210\235\345\247\213\345\214\226.cmd" delete mode 100644 ".github/quickstarts/windows/go-cqhttp/scripts/\345\220\257\345\212\250ChatGPT.cmd" delete mode 100644 ".github/quickstarts/windows/go-cqhttp/scripts/\345\220\257\345\212\250go-cqhttp.cmd" delete mode 100644 .github/quickstarts/windows/mirai-http-api-settings.yml delete mode 100644 ".github/quickstarts/windows/mirai/scripts/\345\210\235\345\247\213\345\214\226.cmd" delete mode 100644 ".github/quickstarts/windows/mirai/scripts/\345\220\257\345\212\250ChatGPT.cmd" delete mode 100644 ".github/quickstarts/windows/mirai/scripts/\345\220\257\345\212\250Mirai.cmd" create mode 100644 ".github/quickstarts/windows/scripts/\345\210\235\345\247\213\345\214\226.bat" create mode 100644 ".github/quickstarts/windows/scripts/\345\220\257\345\212\250.cmd" delete mode 100644 .github/workflows/quickstart-windows-dev-mirai.yaml delete mode 100644 .github/workflows/quickstart-windows-gocqhttp.yml delete mode 100644 .github/workflows/quickstart-windows-mirai.yml rename .github/workflows/{quickstart-windows-dev-gocqhttp.yml => quickstart-windows.yml} (70%) diff --git a/.github/quickstarts/windows/config.example.go-cqhttp.cfg b/.github/quickstarts/windows/config.example.go-cqhttp.cfg deleted file mode 100644 index 8a9308d4..00000000 --- a/.github/quickstarts/windows/config.example.go-cqhttp.cfg +++ /dev/null @@ -1,14 +0,0 @@ - -######################## -# 配置文件编写教程： -# https://chatgpt-qq.lss233.com/ -# 你也可以使用 WebUI 来修改配置 -######################## -[presets] -# 切换预设的命令： 加载预设 猫娘 -command = "加载预设 (\\w+)" - -[presets.keywords] -# 预设关键词 <-> 实际文件 -"聊天" = "presets/issue402.txt" -"猫娘" = "presets/catgirl.txt" diff --git a/.github/quickstarts/windows/go-cqhttp/config.yml b/.github/quickstarts/windows/go-cqhttp/config.yml deleted file mode 100644 index 26da0b8f..00000000 --- a/.github/quickstarts/windows/go-cqhttp/config.yml +++ /dev/null @@ -1,107 +0,0 @@ -# go-cqhttp 默认配置文件 - -account: # 账号相关 - uin: YOUR_BOT_QQ_HERE # QQ账号 - password: '' # 密码为空时使用扫码登录 - encrypt: false # 是否开启密码加密 - status: 0 # 在线状态 请参考 https://docs.go-cqhttp.org/guide/config.html#在线状态 - relogin: # 重连设置 - delay: 3 # 首次重连延迟, 单位秒 - interval: 3 # 重连间隔 - max-times: 0 # 最大重连次数, 0为无限制 - - # 是否使用服务器下发的新地址进行重连 - # 注意, 此设置可能导致在海外服务器上连接情况更差 - use-sso-address: true - # 是否允许发送临时会话消息 - allow-temp-session: false - -heartbeat: - # 心跳频率, 单位秒 - # -1 为关闭心跳 - interval: 5 - -message: - # 上报数据类型 - # 可选: string,array - post-format: string - # 是否忽略无效的CQ码, 如果为假将原样发送 - ignore-invalid-cqcode: true - # 是否强制分片发送消息 - # 分片发送将会带来更快的速度 - # 但是兼容性会有些问题 - force-fragment: false - # 是否将url分片发送 - fix-url: false - # 下载图片等请求网络代理 - proxy-rewrite: '' - # 是否上报自身消息 - report-self-message: false - # 移除服务端的Reply附带的At - remove-reply-at: false - # 为Reply附加更多信息 - extra-reply-data: false - # 跳过 Mime 扫描, 忽略错误数据 - skip-mime-scan: false - -output: - # 日志等级 trace,debug,info,warn,error - log-level: warn - # 日志时效 单位天. 超过这个时间之前的日志将会被自动删除. 设置为 0 表示永久保留. - log-aging: 15 - # 是否在每次启动时强制创建全新的文件储存日志. 为 false 的情况下将会在上次启动时创建的日志文件续写 - log-force-new: true - # 是否启用日志颜色 - log-colorful: true - # 是否启用 DEBUG - debug: false # 开启调试模式 - -# 默认中间件锚点 -default-middlewares: &default - # 访问密钥, 强烈推荐在公网的服务器设置 - access-token: '' - # 事件过滤器文件目录 - filter: '' - # API限速设置 - # 该设置为全局生效 - # 原 cqhttp 虽然启用了 rate_limit 后缀, 但是基本没插件适配 - # 目前该限速设置为令牌桶算法, 请参考: - # https://baike.baidu.com/item/%E4%BB%A4%E7%89%8C%E6%A1%B6%E7%AE%97%E6%B3%95/6597000?fr=aladdin - rate-limit: - enabled: false # 是否启用限速 - frequency: 1 # 令牌回复频率, 单位秒 - bucket: 1 # 令牌桶大小 - -database: # 数据库相关设置 - leveldb: - # 是否启用内置leveldb数据库 - # 启用将会增加10-20MB的内存占用和一定的磁盘空间 - # 关闭将无法使用 撤回 回复 get_msg 等上下文相关功能 - enable: true - sqlite3: - # 是否启用内置sqlite3数据库 - # 启用将会增加一定的内存占用和一定的磁盘空间 - # 关闭将无法使用 撤回 回复 get_msg 等上下文相关功能 - enable: false - cachettl: 3600000000000 # 1h - -# 连接服务列表 -servers: - # 添加方式，同一连接方式可添加多个，具体配置说明请查看文档 - #- http: # http 通信 - #- ws: # 正向 Websocket - #- ws-reverse: # 反向 Websocket - #- pprof: #性能分析服务器 - # 反向WS设置 - - ws-reverse: - # 反向WS Universal 地址 - # 注意 设置了此项地址后下面两项将会被忽略 - universal: ws://127.0.0.1:8566/ws - # 反向WS API 地址 - api: ws://your_websocket_api.server - # 反向WS Event 地址 - event: ws://your_websocket_event.server - # 重连间隔 单位毫秒 - reconnect-interval: 3000 - middlewares: - <<: *default # 引用默认中间件 diff --git a/.github/quickstarts/windows/go-cqhttp/device.json b/.github/quickstarts/windows/go-cqhttp/device.json deleted file mode 100644 index 2c765537..00000000 --- a/.github/quickstarts/windows/go-cqhttp/device.json +++ /dev/null @@ -1 +0,0 @@ -{"display":"MIRAI.328126.001","product":"mirai","device":"mirai","board":"mirai","model":"mirai","finger_print":"mamoe/mirai/mirai:10/MIRAI.200122.001/9131310:user/release-keys","boot_id":"779066ef-140d-cf58-4b54-415b6db79071","proc_version":"Linux version 3.0.31-NAKD7gEP (android-build@xxx.xxx.xxx.xxx.com)","protocol":2,"imei":"427816956058829","brand":"mamoe","bootloader":"unknown","base_band":"","version":{"incremental":"5891938","release":"10","codename":"REL","sdk":29},"sim_info":"T-Mobile","os_type":"android","mac_address":"00:50:56:C0:00:08","ip_address":[10,0,1,3],"wifi_bssid":"00:50:56:C0:00:08","wifi_ssid":"\u003cunknown ssid\u003e","imsi_md5":"cc73b4a6b592dcebb09db63419673a69","android_id":"1e52fc9af1b185eb","apn":"wifi","vendor_name":"MIUI","vendor_os_name":"mirai"} \ No newline at end of file diff --git "a/.github/quickstarts/windows/go-cqhttp/scripts/\345\210\235\345\247\213\345\214\226.cmd" "b/.github/quickstarts/windows/go-cqhttp/scripts/\345\210\235\345\247\213\345\214\226.cmd" deleted file mode 100644 index 16adb8f8..00000000 --- "a/.github/quickstarts/windows/go-cqhttp/scripts/\345\210\235\345\247\213\345\214\226.cmd" +++ /dev/null @@ -1,68 +0,0 @@ -@ECHO OFF -@CHCP 65001 -SET BASE_DIR=%cd% - -ECHO !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -ECHO !! -ECHO !! 如果您是新手，没有特殊需求。一路回车即可安装 !!!! -ECHO !! 如果您在执行的过程出现错误，可以重新启动此脚本 !!!! -ECHO !! 如果您遇到问题，可以提交 issue，或者在交流群询问 !!!! -ECHO !! -ECHO !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -ECHO 当前的安装路径为 %BASE_DIR% -ECHO 提示：请注意安装路径中不要有空格，否则可能会导致安装失败 -ECHO 提示：安装前先解压程序，不要在压缩包中直接运行 -pause - -cd "%BASE_DIR%\go-cqhttp" - -cd "%BASE_DIR%" -ECHO 复制 配置信息... -set /p "bot_qq=请输入机器人QQ号：" -copy "%BASE_DIR%\files\go-cqhttp\config.yml" "%BASE_DIR%\go-cqhttp\" -copy "%BASE_DIR%\files\go-cqhttp\device.json" "%BASE_DIR%\go-cqhttp\" -setlocal enabledelayedexpansion -set "file=%BASE_DIR%\go-cqhttp\config.yml" -set "search=YOUR_BOT_QQ_HERE" -set "replace=!bot_qq!" -if exist "%file%" ( - for /f "usebackq delims=" %%a in ("%file%") do ( - set "line=%%a" - set "line=!line:%search%=%replace%!" - echo(!line! - ) -) > "%file%.new" -move /y "%file%.new" "%file%" > nul -ECHO go-cqhttp 初始化完毕。 -cd "%BASE_DIR%\chatgpt" - -ECHO 接下来开始初始化 ChatGPT -ECHO 初始化 pip... -set PYTHON_EXECUTABLE="%BASE_DIR%\python3.11\python.exe" -cd "%BASE_DIR%\python3.11" -@REM %PYTHON_EXECUTABLE% get-pip.py - -ECHO 安装依赖... -cd "%BASE_DIR%\chatgpt" - -REM 如果下载的依赖不是最新版 -REM 请修改 https://mirrors.aliyun.com/pypi/simple/ 为 https://pypi.org/simple/ -REM 然后重新执行 - -%PYTHON_EXECUTABLE% -m pip install -i https://mirrors.aliyun.com/pypi/simple/ --extra-index-url https://pypi.org/simple/ -r requirements.txt - -ECHO 接下来将会打开 config.cfg，请修改里面的信息。 - -cd "%BASE_DIR%\chatgpt" -COPY %BASE_DIR%\files\config.example.go-cqhttp.cfg config.cfg -notepad config.cfg -cd "%BASE_DIR%" - -cls - -COPY "%BASE_DIR%\files\go-cqhttp\scripts\启动ChatGPT.cmd" . -COPY "%BASE_DIR%\files\go-cqhttp\scripts\启动go-cqhttp.cmd" . -ECHO "接下来请先执行 【启动ChatGPT.cmd】，启动程序。" -ECHO "然后执行 【启动go-cqhttp.cmd】 并登录机器人 QQ，然后就可以开始使用了！" - -pause diff --git "a/.github/quickstarts/windows/go-cqhttp/scripts/\345\220\257\345\212\250ChatGPT.cmd" "b/.github/quickstarts/windows/go-cqhttp/scripts/\345\220\257\345\212\250ChatGPT.cmd" deleted file mode 100644 index 82396b39..00000000 --- "a/.github/quickstarts/windows/go-cqhttp/scripts/\345\220\257\345\212\250ChatGPT.cmd" +++ /dev/null @@ -1,10 +0,0 @@ -@ECHO OFF -@CHCP 65001 - -SET PATH="%cd%\ffmpeg\bin;%PATH%" - -TITLE [ChatGPT for QQ] ChatGPT 端正在运行... -cd chatgpt && ..\python3.11\python.exe bot.py -TITLE [ChatGPT for QQ] ChatGPT 端已停止运行 -ECHO 程序已停止运行。 -PAUSE \ No newline at end of file diff --git "a/.github/quickstarts/windows/go-cqhttp/scripts/\345\220\257\345\212\250go-cqhttp.cmd" "b/.github/quickstarts/windows/go-cqhttp/scripts/\345\220\257\345\212\250go-cqhttp.cmd" deleted file mode 100644 index 0b552350..00000000 --- "a/.github/quickstarts/windows/go-cqhttp/scripts/\345\220\257\345\212\250go-cqhttp.cmd" +++ /dev/null @@ -1,12 +0,0 @@ -@ECHO OFF -@CHCP 65001 - -TITLE [ChatGPT for QQ] go-cqhttp 端正在运行... - -SET PATH="%cd%\ffmpeg\bin;%PATH%" - -cd go-cqhttp && go-cqhttp -faststart -TITLE [ChatGPT for QQ] go-cqhttp 端已停止运行 - -echo 程序已停止运行 -PAUSE \ No newline at end of file diff --git a/.github/quickstarts/windows/mirai-http-api-settings.yml b/.github/quickstarts/windows/mirai-http-api-settings.yml deleted file mode 100644 index 0e0bcf8c..00000000 --- a/.github/quickstarts/windows/mirai-http-api-settings.yml +++ /dev/null @@ -1,20 +0,0 @@ -adapters: - - reverse-ws - -enableVerify: true -verifyKey: 1234567890 - -debug: false - -singleMode: false - -cacheSize: 4096 - -adapterSettings: - reverse-ws: - ## 远端 websocket server 地址配置 - destinations: - - host: localhost - port: 8554 - path: / - protocol: ws \ No newline at end of file diff --git "a/.github/quickstarts/windows/mirai/scripts/\345\210\235\345\247\213\345\214\226.cmd" "b/.github/quickstarts/windows/mirai/scripts/\345\210\235\345\247\213\345\214\226.cmd" deleted file mode 100644 index c44a0547..00000000 --- "a/.github/quickstarts/windows/mirai/scripts/\345\210\235\345\247\213\345\214\226.cmd" +++ /dev/null @@ -1,70 +0,0 @@ -@ECHO OFF -@CHCP 65001 -SET BASE_DIR=%cd% - -ECHO 正在初始化 Mirai... -ECHO !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -ECHO !! -ECHO !! 如果您是新手，没有特殊需求。一路回车即可安装 !!!! -ECHO !! 如果您在执行的过程出现错误，可以重新启动此脚本 !!!! -ECHO !! 如果您遇到问题，可以提交 issue，或者在交流群询问 !!!! -ECHO !! -ECHO !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -ECHO 当前的安装路径为 %BASE_DIR% -ECHO 提示：请注意安装路径中不要有空格，否则可能会导致安装失败 -ECHO 提示：安装前先解压程序，不要在压缩包中直接运行 -pause - -cd "%BASE_DIR%\mirai" -@REM mcl-installer.exe - -@REM ECHO 安装 mirai-api-http 插件... -@REM ECHO 插件介绍：https://github.com/project-mirai/mirai-api-http -@REM cmd /c mcl.cmd --update-package net.mamoe:mirai-api-http --channel stable-v2 --type plugin -@REM -@REM ECHO 安装 mirai-device-generator 插件... -@REM ECHO 插件介绍：https://github.com/cssxsh/mirai-device-generator -@REM cmd /c mcl.cmd --update-package xyz.cssxsh.mirai:mirai-device-generator --channel stable --type plugin -@REM -@REM ECHO 安装 fix-protocol-version 插件... -@REM ECHO 插件介绍：https://github.com/cssxsh/fix-protocol-version -@REM cmd /c mcl.cmd --update-package xyz.cssxsh.mirai:fix-protocol-version --channel stable --type plugin - -cd "%BASE_DIR%" -ECHO 复制 mirai-http-api 配置信息... -mkdir "%BASE_DIR%\mirai\config\net.mamoe.mirai-api-http" -copy "%BASE_DIR%\files\mirai-http-api-settings.yml" "%BASE_DIR%\mirai\config\net.mamoe.mirai-api-http\setting.yml" - -ECHO Mirai 初始化完毕。 -cd "%BASE_DIR%\chatgpt" - -ECHO 接下来开始初始化 ChatGPT -ECHO 初始化 pip... -set PYTHON_EXECUTABLE="%BASE_DIR%\python3.11\python.exe" -cd "%BASE_DIR%\python3.11" -@REM %PYTHON_EXECUTABLE% get-pip.py - -ECHO 安装依赖... -cd "%BASE_DIR%\chatgpt" - -REM 如果下载的依赖不是最新版 -REM 请修改 https://mirrors.aliyun.com/pypi/simple/ 为 https://pypi.org/simple/ -REM 然后重新执行 - -%PYTHON_EXECUTABLE% -m pip install -i https://mirrors.aliyun.com/pypi/simple/ --extra-index-url https://pypi.org/simple/ -r requirements.txt - -ECHO 接下来将会打开 config.cfg，请修改里面的信息。 - -cd "%BASE_DIR%\chatgpt" -COPY config.example.cfg config.cfg -notepad config.cfg -cd "%BASE_DIR%" - -cls - -COPY "%BASE_DIR%\files\mirai\scripts\启动ChatGPT.cmd" . -COPY "%BASE_DIR%\files\mirai\scripts\启动Mirai.cmd" . -ECHO "接下来请先执行 【启动ChatGPT.cmd】，启动程序。" -ECHO "然后执行 【启动Mirai.cmd】 并登录机器人 QQ，然后就可以开始使用了！" - -pause diff --git "a/.github/quickstarts/windows/mirai/scripts/\345\220\257\345\212\250ChatGPT.cmd" "b/.github/quickstarts/windows/mirai/scripts/\345\220\257\345\212\250ChatGPT.cmd" deleted file mode 100644 index 4878dfa0..00000000 --- "a/.github/quickstarts/windows/mirai/scripts/\345\220\257\345\212\250ChatGPT.cmd" +++ /dev/null @@ -1,11 +0,0 @@ -@ECHO OFF -@CHCP 65001 - -TITLE [ChatGPT for QQ] ChatGPT 端正在运行... - -SET PATH="%cd%\ffmpeg\bin;%PATH%" - -cd chatgpt && ..\python3.11\python.exe bot.py -TITLE [ChatGPT for QQ] ChatGPT 端已停止运行 -ECHO 程序已停止运行。 -PAUSE \ No newline at end of file diff --git "a/.github/quickstarts/windows/mirai/scripts/\345\220\257\345\212\250Mirai.cmd" "b/.github/quickstarts/windows/mirai/scripts/\345\220\257\345\212\250Mirai.cmd" deleted file mode 100644 index 1c12d4ba..00000000 --- "a/.github/quickstarts/windows/mirai/scripts/\345\220\257\345\212\250Mirai.cmd" +++ /dev/null @@ -1,12 +0,0 @@ -@ECHO OFF -@CHCP 65001 - -TITLE [ChatGPT for QQ] Mirai 端正在运行... - -SET PATH="%cd%\ffmpeg\bin;%PATH%" - -cd mirai && mcl -TITLE [ChatGPT for QQ] Mirai 端已停止运行 - -echo 程序已停止运行 -PAUSE \ No newline at end of file diff --git "a/.github/quickstarts/windows/scripts/\345\210\235\345\247\213\345\214\226.bat" "b/.github/quickstarts/windows/scripts/\345\210\235\345\247\213\345\214\226.bat" new file mode 100644 index 00000000..ef10db50 --- /dev/null +++ "b/.github/quickstarts/windows/scripts/\345\210\235\345\247\213\345\214\226.bat" @@ -0,0 +1,44 @@ +@ECHO OFF +@CHCP 65001 +SET BASE_DIR=%cd% + +ECHO 正在初始化 Mirai... +ECHO !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +ECHO !! +ECHO !! 如果您是新手，没有特殊需求。一路回车即可安装 !!!! +ECHO !! 如果您在执行的过程出现错误，可以重新启动此脚本 !!!! +ECHO !! 如果您遇到问题，可以提交 issue，或者在交流群询问 !!!! +ECHO !! +ECHO !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +ECHO 当前的安装路径为 %BASE_DIR% +ECHO 提示：请注意安装路径中不要有空格，否则可能会导致安装失败 +ECHO 提示：安装前先解压程序，不要在压缩包中直接运行 +pause + +cd "%BASE_DIR%" +ECHO Mirai 初始化完毕。 +cd "%BASE_DIR%\kirara-ai" + +ECHO 接下来开始初始化 +ECHO 初始化 pip... +set PYTHON_EXECUTABLE="%BASE_DIR%\python3.11\python.exe" +cd "%BASE_DIR%\python3.11" +@REM %PYTHON_EXECUTABLE% get-pip.py + +ECHO 安装依赖... +cd "%BASE_DIR%\kirara-ai" + +REM 如果下载的依赖不是最新版 +REM 请修改 https://mirrors.aliyun.com/pypi/simple/ 为 https://pypi.org/simple/ +REM 然后重新执行 + +%PYTHON_EXECUTABLE% -m pip install -i https://mirrors.aliyun.com/pypi/simple/ --extra-index-url https://pypi.org/simple/ -r requirements.txt + +cd "%BASE_DIR%" + +cls + +COPY "%BASE_DIR%\files\scripts\启动.cmd" . +ECHO "接下来请先执行 【启动.cmd】，启动程序。" + +pause diff --git "a/.github/quickstarts/windows/scripts/\345\220\257\345\212\250.cmd" "b/.github/quickstarts/windows/scripts/\345\220\257\345\212\250.cmd" new file mode 100644 index 00000000..8e7b4ab6 --- /dev/null +++ "b/.github/quickstarts/windows/scripts/\345\220\257\345\212\250.cmd" @@ -0,0 +1,11 @@ +@ECHO OFF +@CHCP 65001 + +TITLE [Kirara AI] AI 系统正在运行... + +SET PATH="%cd%\ffmpeg\bin;%PATH%" + +cd kirara-ai && ..\python3.11\python.exe main.py +TITLE [Kirara AI] AI 系统已停止运行 +ECHO 程序已停止运行。 +PAUSE \ No newline at end of file diff --git a/.github/workflows/quickstart-windows-dev-mirai.yaml b/.github/workflows/quickstart-windows-dev-mirai.yaml deleted file mode 100644 index 2331b4e1..00000000 --- a/.github/workflows/quickstart-windows-dev-mirai.yaml +++ /dev/null @@ -1,97 +0,0 @@ -name: Windows Quickstart Dev (Mirai) - -on: - workflow_dispatch: - push: - branches: - - 'browser-version-dev' - -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true - -jobs: - build: - name: Windows Quickstart Dev (Mirai) - runs-on: Windows-latest - - steps: - - name: Checkout - uses: actions/checkout@v3 - - name: Generate files - run: | - mkdir C:/generated_files - mkdir C:/tmp_files - echo "Creating folders..." - cd C:/generated_files - mkdir mirai - mkdir chatgpt - mkdir ffmpeg - mkdir mirai/plugins - echo "Downloading JRE..." - Invoke-WebRequest -URI https://download.bell-sw.com/java/17.0.6+10/bellsoft-jre17.0.6+10-windows-amd64.zip -OutFile C:/tmp_files/jre.zip - 7z x C:/tmp_files/jre.zip -r -oC:/generated_files/mirai/jre/ - - echo "Downloading mcl..." - Invoke-WebRequest -URI https://github.com/iTXTech/mirai-console-loader/releases/download/v2.1.2/mcl-2.1.2.zip -OutFile C:/tmp_files/mcl.zip - 7z x C:/tmp_files/mcl.zip -r -oC:/generated_files/mirai/ - cd C:/generated_files/mirai/ - $search = [Regex]::Escape('set JAVA_BINARY=java') - $replace = 'set JAVA_BINARY=jre\jre-17.0.6\bin\java.exe' - - (Get-Content -Path 'C:/generated_files/mirai/mcl.cmd' -Raw) -replace $search, $replace | Set-Content -Path 'C:/generated_files/mirai/mcl.cmd' - - Invoke-WebRequest -URI https://github.com/cssxsh/fix-protocol-version/releases/download/v1.5.0/fix-protocol-version-1.5.0.mirai2.jar -OutFile C:/generated_files/mirai/plugins/fix-protocol-version-1.5.0.mirai2.jar - - ./mcl.cmd --update-package net.mamoe:mirai-api-http --channel stable-v2 --type plugin - ./mcl.cmd --update-package xyz.cssxsh.mirai:mirai-device-generator --channel stable --type plugin - ./mcl.cmd --update-package xyz.cssxsh.mirai:fix-protocol-version --channel stable --type plugin - ./mcl.cmd --dry-run - - cp -r D:\a\chatgpt-mirai-qq-bot\chatgpt-mirai-qq-bot\* C:\generated_files\chatgpt\ - - echo "Downloading ffmpeg ..." - Invoke-WebRequest https://www.gyan.dev/ffmpeg/builds/packages/ffmpeg-6.0-full_build.7z -OutFile C:/tmp_files/ffmpeg.7z - 7z x C:/tmp_files/ffmpeg.zip -r -oC:/generated_files/ffmpeg - - echo "Downloading Python3.11 ..." - Invoke-WebRequest https://www.python.org/ftp/python/3.11.2/python-3.11.2-embed-amd64.zip -OutFile C:/tmp_files/python.zip - 7z x C:/tmp_files/python.zip -r -oC:/generated_files/python3.11 - - echo "Downloading get-pip.py ..." - Invoke-WebRequest -URI https://bootstrap.pypa.io/get-pip.py -OutFile C:/generated_files/python3.11/get-pip.py - echo "import site" >> C:/generated_files/python3.11/python311._pth - - echo "Moving files..." - mv D:\a\chatgpt-mirai-qq-bot\chatgpt-mirai-qq-bot\.github\quickstarts\windows\ C:/generated_files/files/ - - echo "Replacing..." - cp C:/generated_files/files/mirai/scripts/初始化.cmd C:/generated_files/ - - Invoke-WebRequest -URI https://github.com/lss233/awesome-chatgpt-qq-presets/archive/refs/heads/master.zip -OutFile C:/tmp_files/presets.zip - 7z x C:/tmp_files/presets.zip -oC:/tmp_files/ - Copy-Item C:\tmp_files\awesome-chatgpt-qq-presets-master\* -Destination C:\generated_files\chatgpt\presets\ -Recurse - - Invoke-WebRequest -URI https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox-0.12.6-1.mxe-cross-win64.7z -O C:/tmp_files/wkhtmltox.7z - - echo "Downloading vc_redist.exe..." - Invoke-WebRequest -URI https://aka.ms/vs/17/release/vc_redist.x64.exe -O "C:\generated_files\【语音功能依赖】vc_redist.x64.exe" - - echo "Setting up wkhtmltox" - 7z x C:/tmp_files/wkhtmltox.7z -oC:/tmp_files/ - cp C:/tmp_files/wkhtmltox/bin/wkhtmltoimage.exe C:\generated_files\chatgpt\ - - echo "Downloading packages..." - cd C:/generated_files/chatgpt - ..\python3.11\python.exe C:/generated_files/python3.11/get-pip.py - ..\python3.11\python.exe -m pip install -r requirements.txt - ..\python3.11\python.exe -c exec("""from pycloudflared import try_cloudflare \ntry: try_cloudflare(-1)\nexcept:... """) - echo "Packing..." - cd C:/generated_files - 7z a quickstart-windows-mirai-amd64.zip C:\generated_files\* - - name: Archive production artifacts - uses: actions/upload-artifact@v3 - with: - name: quickstart-windows-mirai-amd64.zip - path: | - C:\generated_files\quickstart-windows-mirai-amd64.zip diff --git a/.github/workflows/quickstart-windows-gocqhttp.yml b/.github/workflows/quickstart-windows-gocqhttp.yml deleted file mode 100644 index f0ec2331..00000000 --- a/.github/workflows/quickstart-windows-gocqhttp.yml +++ /dev/null @@ -1,79 +0,0 @@ -name: Windows Quickstart (go-cqhttp) - -on: - workflow_dispatch: - push: - tags: - - '**' - -jobs: - build: - name: Quickstart (GO-CQHTTP) - runs-on: Windows-latest - - steps: - - name: Checkout - uses: actions/checkout@v3 - - name: Generate files - run: | - mkdir C:/generated_files - mkdir C:/tmp_files - echo "Creating folders..." - cd C:/generated_files - echo "Downloading go-cqhttp..." - mkdir go-cqhttp - mkdir chatgpt - mkdir ffmpeg - Invoke-WebRequest -URI https://github.com/Mrs4s/go-cqhttp/releases/download/v1.1.0/go-cqhttp_windows_amd64.exe -OutFile C:/generated_files/go-cqhttp/go-cqhttp.exe - - cp -r D:\a\chatgpt-mirai-qq-bot\chatgpt-mirai-qq-bot\* C:\generated_files\chatgpt\ - - echo "Downloading ffmpeg ..." - Invoke-WebRequest https://www.gyan.dev/ffmpeg/builds/packages/ffmpeg-6.0-full_build.7z -OutFile C:/tmp_files/ffmpeg.7z - 7z x C:/tmp_files/ffmpeg.zip -r -oC:/generated_files/ffmpeg - - echo "Downloading Python3.11 ..." - Invoke-WebRequest https://www.python.org/ftp/python/3.11.2/python-3.11.2-embed-amd64.zip -OutFile C:/tmp_files/python.zip - 7z x C:/tmp_files/python.zip -r -oC:/generated_files/python3.11 - - echo "Downloading get-pip.py ..." - Invoke-WebRequest -URI https://bootstrap.pypa.io/get-pip.py -OutFile C:/generated_files/python3.11/get-pip.py - echo "import site" >> C:/generated_files/python3.11/python311._pth - - echo "Moving files..." - mv D:\a\chatgpt-mirai-qq-bot\chatgpt-mirai-qq-bot\.github\quickstarts\windows\ C:/generated_files/files/ - - echo "Replacing..." - cp C:/generated_files/files/go-cqhttp/scripts/初始化.cmd C:/generated_files/ - - Invoke-WebRequest -URI https://github.com/lss233/awesome-chatgpt-qq-presets/archive/refs/heads/master.zip -OutFile C:/tmp_files/presets.zip - 7z x C:/tmp_files/presets.zip -oC:/tmp_files/ - Copy-Item C:\tmp_files\awesome-chatgpt-qq-presets-master\* -Destination C:\generated_files\chatgpt\presets\ -Recurse - - Invoke-WebRequest -URI https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox-0.12.6-1.mxe-cross-win64.7z -O C:/tmp_files/wkhtmltox.7z - - echo "Downloading vc_redist.exe..." - Invoke-WebRequest -URI https://aka.ms/vs/17/release/vc_redist.x64.exe -O "C:\generated_files\【语音功能依赖】vc_redist.x64.exe" - - echo "Setting up wkhtmltox" - 7z x C:/tmp_files/wkhtmltox.7z -oC:/tmp_files/ - cp C:/tmp_files/wkhtmltox/bin/wkhtmltoimage.exe C:\generated_files\chatgpt\ - - echo "Downloading packages..." - cd C:/generated_files/chatgpt - ..\python3.11\python.exe C:/generated_files/python3.11/get-pip.py - ..\python3.11\python.exe -m pip install -r requirements.txt - ..\python3.11\python.exe -c exec("""from pycloudflared import try_cloudflare \ntry: try_cloudflare(-1)\nexcept:... """) - - echo "Packing..." - cd C:/generated_files - 7z a quickstart-windows-go-cqhttp-amd64.zip C:\generated_files\* - - name: Upload compressed files to release - uses: svenstaro/upload-release-action@v2 - with: - repo_token: ${{ secrets.GITHUB_TOKEN }} - file: C:\generated_files\quickstart-windows-go-cqhttp-amd64.zip - asset_name: Windows-quickstart-go-cqhttp-${{ github.ref }}.zip - tag: ${{ github.ref }} - overwrite: false - body: "quickstart-windows-amd64.zip is to quickstart go-cqhttp for Windows x64 user" diff --git a/.github/workflows/quickstart-windows-mirai.yml b/.github/workflows/quickstart-windows-mirai.yml deleted file mode 100644 index 44f4da36..00000000 --- a/.github/workflows/quickstart-windows-mirai.yml +++ /dev/null @@ -1,98 +0,0 @@ -name: Windows Quickstart (Mirai) - -on: - workflow_dispatch: - push: - tags: - - '**' - -jobs: - build: - name: Quickstart - runs-on: Windows-latest - - steps: - - name: Checkout - uses: actions/checkout@v3 - - name: Generate files - run: | - mkdir C:/generated_files - mkdir C:/tmp_files - echo "Creating folders..." - cd C:/generated_files - mkdir mirai - mkdir chatgpt - mkdir ffmpeg - mkdir mirai/plugins - echo "Downloading JRE..." - Invoke-WebRequest -URI https://download.bell-sw.com/java/17.0.6+10/bellsoft-jre17.0.6+10-windows-amd64.zip -OutFile C:/tmp_files/jre.zip - 7z x C:/tmp_files/jre.zip -r -oC:/generated_files/mirai/jre/ - - echo "Downloading mcl..." - Invoke-WebRequest -URI https://github.com/iTXTech/mirai-console-loader/releases/download/v2.1.2/mcl-2.1.2.zip -OutFile C:/tmp_files/mcl.zip - 7z x C:/tmp_files/mcl.zip -r -oC:/generated_files/mirai/ - cd C:/generated_files/mirai/ - $search = [Regex]::Escape('set JAVA_BINARY=java') - $replace = 'set JAVA_BINARY=jre\jre-17.0.6\bin\java.exe' - - (Get-Content -Path 'C:/generated_files/mirai/mcl.cmd' -Raw) -replace $search, $replace | Set-Content -Path 'C:/generated_files/mirai/mcl.cmd' - - Invoke-WebRequest -URI https://github.com/cssxsh/fix-protocol-version/releases/download/v1.5.0/fix-protocol-version-1.5.0.mirai2.jar -OutFile C:/generated_files/mirai/plugins/fix-protocol-version-1.5.0.mirai2.jar - - ./mcl.cmd --update-package net.mamoe:mirai-api-http --channel stable-v2 --type plugin - ./mcl.cmd --update-package xyz.cssxsh.mirai:mirai-device-generator --channel stable --type plugin - ./mcl.cmd --update-package xyz.cssxsh.mirai:fix-protocol-version --channel stable --type plugin - ./mcl.cmd --dry-run - - cp -r D:\a\chatgpt-mirai-qq-bot\chatgpt-mirai-qq-bot\* C:\generated_files\chatgpt\ - - echo "Downloading ffmpeg ..." - Invoke-WebRequest https://www.gyan.dev/ffmpeg/builds/packages/ffmpeg-6.0-full_build.7z -OutFile C:/tmp_files/ffmpeg.7z - 7z x C:/tmp_files/ffmpeg.zip -r -oC:/generated_files/ffmpeg - - echo "Downloading Python3.11 ..." - Invoke-WebRequest https://www.python.org/ftp/python/3.11.2/python-3.11.2-embed-amd64.zip -OutFile C:/tmp_files/python.zip - 7z x C:/tmp_files/python.zip -r -oC:/generated_files/python3.11 - - echo "Downloading get-pip.py ..." - Invoke-WebRequest -URI https://bootstrap.pypa.io/get-pip.py -OutFile C:/generated_files/python3.11/get-pip.py - echo "import site" >> C:/generated_files/python3.11/python311._pth - - echo "Moving files..." - mv D:\a\chatgpt-mirai-qq-bot\chatgpt-mirai-qq-bot\.github\quickstarts\windows\ C:/generated_files/files/ - - echo "Replacing..." - cp C:/generated_files/files/mirai/scripts/初始化.cmd C:/generated_files/ - - Invoke-WebRequest -URI https://github.com/lss233/awesome-chatgpt-qq-presets/archive/refs/heads/master.zip -OutFile C:/tmp_files/presets.zip - 7z x C:/tmp_files/presets.zip -oC:/tmp_files/ - Copy-Item C:\tmp_files\awesome-chatgpt-qq-presets-master\* -Destination C:\generated_files\chatgpt\presets\ -Recurse - - Invoke-WebRequest -URI https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox-0.12.6-1.mxe-cross-win64.7z -O C:/tmp_files/wkhtmltox.7z - - echo "Setting up wkhtmltox" - 7z x C:/tmp_files/wkhtmltox.7z -oC:/tmp_files/ - cp C:/tmp_files/wkhtmltox/bin/wkhtmltoimage.exe C:\generated_files\chatgpt\ - - echo "Downloading vc_redist.exe..." - Invoke-WebRequest -URI https://aka.ms/vs/17/release/vc_redist.x64.exe -O "C:\generated_files\【语音功能依赖】vc_redist.x64.exe" - - echo "Downloading packages..." - cd C:/generated_files/chatgpt - ..\python3.11\python.exe C:/generated_files/python3.11/get-pip.py - ..\python3.11\python.exe -m pip install -r requirements.txt - ..\python3.11\python.exe -c exec("""from pycloudflared import try_cloudflare \ntry: try_cloudflare(-1)\nexcept:... """) - - echo "Packing..." - cd C:/generated_files - 7z a quickstart-windows-mirai-amd64.zip C:\generated_files\* - - name: Upload compressed files to release - uses: svenstaro/upload-release-action@v2 - with: - repo_token: ${{ secrets.GITHUB_TOKEN }} - file: C:\generated_files\quickstart-windows-mirai-amd64.zip - asset_name: Windows-quickstart-mirai-${{ github.ref }}.zip - tag: ${{ github.ref }} - overwrite: false - body: "quickstart-windows-amd64.zip 是为 Windows x64 用户准备的快速启动包" - diff --git a/.github/workflows/quickstart-windows-dev-gocqhttp.yml b/.github/workflows/quickstart-windows.yml similarity index 70% rename from .github/workflows/quickstart-windows-dev-gocqhttp.yml rename to .github/workflows/quickstart-windows.yml index 860b88a1..ba1238d4 100644 --- a/.github/workflows/quickstart-windows-dev-gocqhttp.yml +++ b/.github/workflows/quickstart-windows.yml @@ -1,10 +1,18 @@ -name: Windows Quickstart Dev (go-cqhttp) +name: Windows Quickstart on: workflow_dispatch: push: branches: - 'browser-version-dev' + - 'master' + - 'dev' + - 'refactoring-v3-mvp' + pull_request: + branches: + - 'master' + - 'dev' + - 'refactoring-v3-mvp' concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -12,7 +20,7 @@ concurrency: jobs: build: - name: Windows Quickstart Dev (go-cqhttp) + name: Windows Quickstart runs-on: Windows-latest steps: @@ -24,13 +32,10 @@ jobs: mkdir C:/tmp_files echo "Creating folders..." cd C:/generated_files - echo "Downloading go-cqhttp..." - mkdir go-cqhttp - mkdir chatgpt + mkdir kirara_ai mkdir ffmpeg - Invoke-WebRequest -URI https://github.com/Mrs4s/go-cqhttp/releases/download/v1.1.0/go-cqhttp_windows_amd64.exe -OutFile C:/generated_files/go-cqhttp/go-cqhttp.exe - cp -r D:\a\chatgpt-mirai-qq-bot\chatgpt-mirai-qq-bot\* C:\generated_files\chatgpt\ + cp -r D:\a\chatgpt-mirai-qq-bot\chatgpt-mirai-qq-bot\* C:\generated_files\kirara_ai\ echo "Downloading ffmpeg ..." Invoke-WebRequest https://www.gyan.dev/ffmpeg/builds/packages/ffmpeg-6.0-full_build.7z -OutFile C:/tmp_files/ffmpeg.7z @@ -48,11 +53,7 @@ jobs: mv D:\a\chatgpt-mirai-qq-bot\chatgpt-mirai-qq-bot\.github\quickstarts\windows\ C:/generated_files/files/ echo "Replacing..." - cp C:/generated_files/files/go-cqhttp/scripts/初始化.cmd C:/generated_files/ - - Invoke-WebRequest -URI https://github.com/lss233/awesome-chatgpt-qq-presets/archive/refs/heads/master.zip -OutFile C:/tmp_files/presets.zip - 7z x C:/tmp_files/presets.zip -oC:/tmp_files/ - Copy-Item C:\tmp_files\awesome-chatgpt-qq-presets-master\* -Destination C:\generated_files\chatgpt\presets\ -Recurse + cp C:/generated_files/files/scripts/初始化.cmd C:/generated_files/ Invoke-WebRequest -URI https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox-0.12.6-1.mxe-cross-win64.7z -O C:/tmp_files/wkhtmltox.7z @@ -61,20 +62,20 @@ jobs: echo "Setting up wkhtmltox" 7z x C:/tmp_files/wkhtmltox.7z -oC:/tmp_files/ - cp C:/tmp_files/wkhtmltox/bin/wkhtmltoimage.exe C:\generated_files\chatgpt\ + cp C:/tmp_files/wkhtmltox/bin/wkhtmltoimage.exe C:\generated_files\kirara_ai\ echo "Downloading packages..." - cd C:/generated_files/chatgpt + cd C:/generated_files/kirara_ai ..\python3.11\python.exe C:/generated_files/python3.11/get-pip.py ..\python3.11\python.exe -m pip install -r requirements.txt ..\python3.11\python.exe -c exec("""from pycloudflared import try_cloudflare \ntry: try_cloudflare(-1)\nexcept:... """) echo "Packing..." cd C:/generated_files - 7z a quickstart-windows-go-cqhttp-amd64.zip C:\generated_files\* + 7z a quickstart-windows-kirara-ai-amd64.zip C:\generated_files\* - name: Archive production artifacts uses: actions/upload-artifact@v3 with: - name: quickstart-windows-go-cqhttp-amd64.zip + name: quickstart-windows-kirara-ai-amd64.zip path: | - C:\generated_files\quickstart-windows-go-cqhttp-amd64.zip + C:\generated_files\quickstart-windows-kirara-ai-amd64.zip From 8497d5d1a3339e427e0424f7cd896a97a54ae1d2 Mon Sep 17 00:00:00 2001 From: lss233 Date: Sun, 9 Feb 2025 23:45:56 +0800 Subject: [PATCH 3/5] fix(ci): use v4 checkout --- .github/workflows/docker-latest.yml | 2 +- .github/workflows/docker-tag.yml | 2 +- .github/workflows/quickstart-windows.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker-latest.yml b/.github/workflows/docker-latest.yml index 5c39f19a..1f8481ed 100644 --- a/.github/workflows/docker-latest.yml +++ b/.github/workflows/docker-latest.yml @@ -12,7 +12,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up QEMU uses: docker/setup-qemu-action@v2 diff --git a/.github/workflows/docker-tag.yml b/.github/workflows/docker-tag.yml index 518729f2..a38f18ea 100644 --- a/.github/workflows/docker-tag.yml +++ b/.github/workflows/docker-tag.yml @@ -21,7 +21,7 @@ jobs: echo ${{ steps.vars.outputs.tag }} - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up QEMU uses: docker/setup-qemu-action@v2 diff --git a/.github/workflows/quickstart-windows.yml b/.github/workflows/quickstart-windows.yml index ba1238d4..1c5b45e6 100644 --- a/.github/workflows/quickstart-windows.yml +++ b/.github/workflows/quickstart-windows.yml @@ -25,7 +25,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Generate files run: | mkdir C:/generated_files @@ -74,7 +74,7 @@ jobs: cd C:/generated_files 7z a quickstart-windows-kirara-ai-amd64.zip C:\generated_files\* - name: Archive production artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: quickstart-windows-kirara-ai-amd64.zip path: | From 18a01cc521a828e8668ad9d1719ed3da01275c89 Mon Sep 17 00:00:00 2001 From: lss233 Date: Sun, 9 Feb 2025 23:50:16 +0800 Subject: [PATCH 4/5] chore(ci): update ffmpeg download to version 7.0.2 --- .github/workflows/quickstart-windows.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/quickstart-windows.yml b/.github/workflows/quickstart-windows.yml index 1c5b45e6..84816499 100644 --- a/.github/workflows/quickstart-windows.yml +++ b/.github/workflows/quickstart-windows.yml @@ -38,7 +38,9 @@ jobs: cp -r D:\a\chatgpt-mirai-qq-bot\chatgpt-mirai-qq-bot\* C:\generated_files\kirara_ai\ echo "Downloading ffmpeg ..." - Invoke-WebRequest https://www.gyan.dev/ffmpeg/builds/packages/ffmpeg-6.0-full_build.7z -OutFile C:/tmp_files/ffmpeg.7z + Invoke-WebRequest https://www.gyan.dev/ffmpeg/builds/packages/ffmpeg-7.0.2-essentials_build.7z -OutFile C:/tmp_files/ffmpeg.7z + echo "Appreciate the contribution of gyan.dev" + 7z x C:/tmp_files/ffmpeg.zip -r -oC:/generated_files/ffmpeg echo "Downloading Python3.11 ..." From 572a6421d6934d2ab7a29096a93ca352e1356ef4 Mon Sep 17 00:00:00 2001 From: lss233 Date: Sun, 9 Feb 2025 23:53:55 +0800 Subject: [PATCH 5/5] fix(ci): windows script --- .../\345\210\235\345\247\213\345\214\226.cmd" | 37 ++++++++++++++++--- .../scripts/\345\220\257\345\212\250.cmd" | 10 ++++- .github/workflows/quickstart-windows.yml | 35 ++++++++++++------ main.py | 4 ++ 4 files changed, 66 insertions(+), 20 deletions(-) rename ".github/quickstarts/windows/scripts/\345\210\235\345\247\213\345\214\226.bat" => ".github/quickstarts/windows/scripts/\345\210\235\345\247\213\345\214\226.cmd" (80%) diff --git "a/.github/quickstarts/windows/scripts/\345\210\235\345\247\213\345\214\226.bat" "b/.github/quickstarts/windows/scripts/\345\210\235\345\247\213\345\214\226.cmd" similarity index 80% rename from ".github/quickstarts/windows/scripts/\345\210\235\345\247\213\345\214\226.bat" rename to ".github/quickstarts/windows/scripts/\345\210\235\345\247\213\345\214\226.cmd" index ef10db50..29e9b1bc 100644 --- "a/.github/quickstarts/windows/scripts/\345\210\235\345\247\213\345\214\226.bat" +++ "b/.github/quickstarts/windows/scripts/\345\210\235\345\247\213\345\214\226.cmd" @@ -1,35 +1,55 @@ +@REM ... + @ECHO OFF + @CHCP 65001 + SET BASE_DIR=%cd% -ECHO 正在初始化 Mirai... ECHO !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + ECHO !! + ECHO !! 如果您是新手，没有特殊需求。一路回车即可安装 !!!! + ECHO !! 如果您在执行的过程出现错误，可以重新启动此脚本 !!!! + ECHO !! 如果您遇到问题，可以提交 issue，或者在交流群询问 !!!! + ECHO !! + ECHO !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + ECHO 当前的安装路径为 %BASE_DIR% + ECHO 提示：请注意安装路径中不要有空格，否则可能会导致安装失败 + ECHO 提示：安装前先解压程序，不要在压缩包中直接运行 + +ECHO 提示：现在请按【回车键】继续操作 + pause -cd "%BASE_DIR%" -ECHO Mirai 初始化完毕。 -cd "%BASE_DIR%\kirara-ai" +cd "%BASE_DIR%\kirara_ai" ECHO 接下来开始初始化 + ECHO 初始化 pip... + set PYTHON_EXECUTABLE="%BASE_DIR%\python3.11\python.exe" + cd "%BASE_DIR%\python3.11" + @REM %PYTHON_EXECUTABLE% get-pip.py ECHO 安装依赖... -cd "%BASE_DIR%\kirara-ai" + +cd "%BASE_DIR%\kirara_ai" REM 如果下载的依赖不是最新版 + REM 请修改 https://mirrors.aliyun.com/pypi/simple/ 为 https://pypi.org/simple/ + REM 然后重新执行 %PYTHON_EXECUTABLE% -m pip install -i https://mirrors.aliyun.com/pypi/simple/ --extra-index-url https://pypi.org/simple/ -r requirements.txt @@ -39,6 +59,11 @@ cd "%BASE_DIR%" cls COPY "%BASE_DIR%\files\scripts\启动.cmd" . -ECHO "接下来请先执行 【启动.cmd】，启动程序。" + +ECHO 安装完毕。 + +ECHO 接下来请执行 启动.cmd 启动程序。 + +ECHO 如果需要重新安装，请重新运行此脚本，但愿不用。 pause diff --git "a/.github/quickstarts/windows/scripts/\345\220\257\345\212\250.cmd" "b/.github/quickstarts/windows/scripts/\345\220\257\345\212\250.cmd" index 8e7b4ab6..3e8ab1a1 100644 --- "a/.github/quickstarts/windows/scripts/\345\220\257\345\212\250.cmd" +++ "b/.github/quickstarts/windows/scripts/\345\220\257\345\212\250.cmd" @@ -1,11 +1,17 @@ +@REM ... + @ECHO OFF + @CHCP 65001 TITLE [Kirara AI] AI 系统正在运行... -SET PATH="%cd%\ffmpeg\bin;%PATH%" +SET PATH=%cd%\python3.11;%cd%\ffmpeg\bin;%PATH% + +cd kirara_ai && python main.py -cd kirara-ai && ..\python3.11\python.exe main.py TITLE [Kirara AI] AI 系统已停止运行 + ECHO 程序已停止运行。 + PAUSE \ No newline at end of file diff --git a/.github/workflows/quickstart-windows.yml b/.github/workflows/quickstart-windows.yml index 84816499..33097d2a 100644 --- a/.github/workflows/quickstart-windows.yml +++ b/.github/workflows/quickstart-windows.yml @@ -40,8 +40,8 @@ jobs: echo "Downloading ffmpeg ..." Invoke-WebRequest https://www.gyan.dev/ffmpeg/builds/packages/ffmpeg-7.0.2-essentials_build.7z -OutFile C:/tmp_files/ffmpeg.7z echo "Appreciate the contribution of gyan.dev" - - 7z x C:/tmp_files/ffmpeg.zip -r -oC:/generated_files/ffmpeg + + 7z x C:/tmp_files/ffmpeg.7z -r -oC:/generated_files/ffmpeg echo "Downloading Python3.11 ..." Invoke-WebRequest https://www.python.org/ftp/python/3.11.2/python-3.11.2-embed-amd64.zip -OutFile C:/tmp_files/python.zip @@ -55,16 +55,12 @@ jobs: mv D:\a\chatgpt-mirai-qq-bot\chatgpt-mirai-qq-bot\.github\quickstarts\windows\ C:/generated_files/files/ echo "Replacing..." + dir C:/generated_files/files/scripts/ + cp C:/generated_files/files/scripts/初始化.cmd C:/generated_files/ - Invoke-WebRequest -URI https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox-0.12.6-1.mxe-cross-win64.7z -O C:/tmp_files/wkhtmltox.7z - echo "Downloading vc_redist.exe..." - Invoke-WebRequest -URI https://aka.ms/vs/17/release/vc_redist.x64.exe -O "C:\generated_files\【语音功能依赖】vc_redist.x64.exe" - - echo "Setting up wkhtmltox" - 7z x C:/tmp_files/wkhtmltox.7z -oC:/tmp_files/ - cp C:/tmp_files/wkhtmltox/bin/wkhtmltoimage.exe C:\generated_files\kirara_ai\ + Invoke-WebRequest -URI https://aka.ms/vs/17/release/vc_redist.x64.exe -OutFile "C:\generated_files\【语音功能依赖】vc_redist.x64.exe" echo "Downloading packages..." cd C:/generated_files/kirara_ai @@ -74,10 +70,25 @@ jobs: echo "Packing..." cd C:/generated_files - 7z a quickstart-windows-kirara-ai-amd64.zip C:\generated_files\* - name: Archive production artifacts uses: actions/upload-artifact@v4 with: - name: quickstart-windows-kirara-ai-amd64.zip + name: quickstart-windows-kirara-ai-amd64 path: | - C:\generated_files\quickstart-windows-kirara-ai-amd64.zip + C:\generated_files\ + - name: Create Release Archive + if: startsWith(github.ref, 'refs/tags/') + shell: pwsh + run: | + Write-Host "Creating archive for release..." + Compress-Archive -Path C:\generated_files\* -DestinationPath C:\generated_files\quickstart-windows-kirara-ai-amd64.zip + - name: Upload compressed files to release + if: startsWith(github.ref, 'refs/tags/') + uses: svenstaro/upload-release-action@v2 + with: + repo_token: ${{ secrets.GITHUB_TOKEN }} + file: C:\generated_files\quickstart-windows-kirara-ai-amd64.zip + asset_name: Windows-quickstart-kirara-ai-${{ github.ref_name }}.zip + tag: ${{ github.ref_name }} + overwrite: false + body: "quickstart-windows-kirara-ai-amd64.zip 是为 Windows x64 用户准备的快速启动包" diff --git a/main.py b/main.py index a6b44d5f..4fc5e802 100644 --- a/main.py +++ b/main.py @@ -1,3 +1,7 @@ +# For embedded python +import sys +sys.path.insert(0, '.') + import asyncio import os import signal