From 2ae8ba56c41adde9b5104a74bbc6c358b23ec99b Mon Sep 17 00:00:00 2001 From: Pliosauroidea Date: Wed, 12 Mar 2025 12:47:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- run.bat | 18 +-- run_memory_vis.bat | 56 ++++---- script/run_maimai.bat | 12 +- script/run_thingking.bat | 10 +- script/run_windows.bat | 134 +++++++++--------- ...的配置文件版本太老就点我.bat | 90 ++++++------ 麦麦开始学习.bat | 90 ++++++------ 7 files changed, 205 insertions(+), 205 deletions(-) diff --git a/run.bat b/run.bat index 23c520e9..91904bc3 100644 --- a/run.bat +++ b/run.bat @@ -1,10 +1,10 @@ -@ECHO OFF -chcp 65001 -if not exist "venv" ( - python -m venv venv - call venv\Scripts\activate.bat - pip install -i https://mirrors.aliyun.com/pypi/simple --upgrade -r requirements.txt - ) else ( - call venv\Scripts\activate.bat -) +@ECHO OFF +chcp 65001 +if not exist "venv" ( + python -m venv venv + call venv\Scripts\activate.bat + pip install -i https://mirrors.aliyun.com/pypi/simple --upgrade -r requirements.txt + ) else ( + call venv\Scripts\activate.bat +) python run.py \ No newline at end of file diff --git a/run_memory_vis.bat b/run_memory_vis.bat index 1b2b34a1..b1feb0cb 100644 --- a/run_memory_vis.bat +++ b/run_memory_vis.bat @@ -1,29 +1,29 @@ -@echo on -chcp 65001 > nul -set /p CONDA_ENV="请输入要激活的 conda 环境名称: " -call conda activate %CONDA_ENV% -if errorlevel 1 ( - echo 激活 conda 环境失败 - pause - exit /b 1 -) -echo Conda 环境 "%CONDA_ENV%" 激活成功 - -set /p OPTION="请选择运行选项 (1: 运行全部绘制, 2: 运行简单绘制): " -if "%OPTION%"=="1" ( - python src/plugins/memory_system/memory_manual_build.py -) else if "%OPTION%"=="2" ( - python src/plugins/memory_system/draw_memory.py -) else ( - echo 无效的选项 - pause - exit /b 1 -) - -if errorlevel 1 ( - echo 命令执行失败，错误代码 %errorlevel% - pause - exit /b 1 -) -echo 脚本成功完成 +@echo on +chcp 65001 > nul +set /p CONDA_ENV="请输入要激活的 conda 环境名称: " +call conda activate %CONDA_ENV% +if errorlevel 1 ( + echo 激活 conda 环境失败 + pause + exit /b 1 +) +echo Conda 环境 "%CONDA_ENV%" 激活成功 + +set /p OPTION="请选择运行选项 (1: 运行全部绘制, 2: 运行简单绘制): " +if "%OPTION%"=="1" ( + python src/plugins/memory_system/memory_manual_build.py +) else if "%OPTION%"=="2" ( + python src/plugins/memory_system/draw_memory.py +) else ( + echo 无效的选项 + pause + exit /b 1 +) + +if errorlevel 1 ( + echo 命令执行失败，错误代码 %errorlevel% + pause + exit /b 1 +) +echo 脚本成功完成 pause \ No newline at end of file diff --git a/script/run_maimai.bat b/script/run_maimai.bat index addcc052..3a099fd7 100644 --- a/script/run_maimai.bat +++ b/script/run_maimai.bat @@ -1,7 +1,7 @@ -chcp 65001 -call conda activate maimbot -cd . - -REM 执行nb run命令 -nb run +chcp 65001 +call conda activate maimbot +cd . + +REM 执行nb run命令 +nb run pause \ No newline at end of file diff --git a/script/run_thingking.bat b/script/run_thingking.bat index c2a3e650..a134da6f 100644 --- a/script/run_thingking.bat +++ b/script/run_thingking.bat @@ -1,5 +1,5 @@ -call conda activate niuniu -cd src\gui -start /b python reasoning_gui.py -exit - +call conda activate niuniu +cd src\gui +start /b python reasoning_gui.py +exit + diff --git a/script/run_windows.bat b/script/run_windows.bat index a07f513f..bea397dd 100644 --- a/script/run_windows.bat +++ b/script/run_windows.bat @@ -1,68 +1,68 @@ -@echo off -setlocal enabledelayedexpansion -chcp 65001 - -REM 修正路径获取逻辑 -cd /d "%~dp0" || ( - echo 错误：切换目录失败 - exit /b 1 -) - -if not exist "venv\" ( - echo 正在初始化虚拟环境... - - where python >nul 2>&1 - if %errorlevel% neq 0 ( - echo 未找到Python解释器 - exit /b 1 - ) - - for /f "tokens=2" %%a in ('python --version 2^>^&1') do set version=%%a - for /f "tokens=1,2 delims=." %%b in ("!version!") do ( - set major=%%b - set minor=%%c - ) - - if !major! lss 3 ( - echo 需要Python大于等于3.0，当前版本 !version! - exit /b 1 - ) - - if !major! equ 3 if !minor! lss 9 ( - echo 需要Python大于等于3.9，当前版本 !version! - exit /b 1 - ) - - echo 正在安装virtualenv... - python -m pip install virtualenv || ( - echo virtualenv安装失败 - exit /b 1 - ) - - echo 正在创建虚拟环境... - python -m virtualenv venv || ( - echo 虚拟环境创建失败 - exit /b 1 - ) - - call venv\Scripts\activate.bat - -) else ( - call venv\Scripts\activate.bat -) - -echo 正在更新依赖... -pip install -r requirements.txt - -echo 当前代理设置： -echo HTTP_PROXY=%HTTP_PROXY% -echo HTTPS_PROXY=%HTTPS_PROXY% - -set HTTP_PROXY= -set HTTPS_PROXY= -echo 代理已取消。 - -set no_proxy=0.0.0.0/32 - -call nb run +@echo off +setlocal enabledelayedexpansion +chcp 65001 + +REM 修正路径获取逻辑 +cd /d "%~dp0" || ( + echo 错误：切换目录失败 + exit /b 1 +) + +if not exist "venv\" ( + echo 正在初始化虚拟环境... + + where python >nul 2>&1 + if %errorlevel% neq 0 ( + echo 未找到Python解释器 + exit /b 1 + ) + + for /f "tokens=2" %%a in ('python --version 2^>^&1') do set version=%%a + for /f "tokens=1,2 delims=." %%b in ("!version!") do ( + set major=%%b + set minor=%%c + ) + + if !major! lss 3 ( + echo 需要Python大于等于3.0，当前版本 !version! + exit /b 1 + ) + + if !major! equ 3 if !minor! lss 9 ( + echo 需要Python大于等于3.9，当前版本 !version! + exit /b 1 + ) + + echo 正在安装virtualenv... + python -m pip install virtualenv || ( + echo virtualenv安装失败 + exit /b 1 + ) + + echo 正在创建虚拟环境... + python -m virtualenv venv || ( + echo 虚拟环境创建失败 + exit /b 1 + ) + + call venv\Scripts\activate.bat + +) else ( + call venv\Scripts\activate.bat +) + +echo 正在更新依赖... +pip install -r requirements.txt + +echo 当前代理设置： +echo HTTP_PROXY=%HTTP_PROXY% +echo HTTPS_PROXY=%HTTPS_PROXY% + +set HTTP_PROXY= +set HTTPS_PROXY= +echo 代理已取消。 + +set no_proxy=0.0.0.0/32 + +call nb run pause \ No newline at end of file diff --git a/如果你的配置文件版本太老就点我.bat b/如果你的配置文件版本太老就点我.bat index f33d96ec..fec1f4cd 100644 --- a/如果你的配置文件版本太老就点我.bat +++ b/如果你的配置文件版本太老就点我.bat @@ -1,45 +1,45 @@ -@echo off -setlocal enabledelayedexpansion -chcp 65001 -cd /d %~dp0 - -echo ===================================== -echo 选择Python环境: -echo 1 - venv (推荐) -echo 2 - conda -echo ===================================== -choice /c 12 /n /m "输入数字(1或2): " - -if errorlevel 2 ( - echo ===================================== - set "CONDA_ENV=" - set /p CONDA_ENV="请输入要激活的 conda 环境名称: " - - :: 检查输入是否为空 - if "!CONDA_ENV!"=="" ( - echo 错误：环境名称不能为空 - pause - exit /b 1 - ) - - call conda activate !CONDA_ENV! - if errorlevel 1 ( - echo 激活 conda 环境失败 - pause - exit /b 1 - ) - - echo Conda 环境 "!CONDA_ENV!" 激活成功 - python config/auto_update.py -) else ( - if exist "venv\Scripts\python.exe" ( - venv\Scripts\python config/auto_update.py - ) else ( - echo ===================================== - echo 错误: venv环境不存在，请先创建虚拟环境 - pause - exit /b 1 - ) -) -endlocal -pause +@echo off +setlocal enabledelayedexpansion +chcp 65001 +cd /d %~dp0 + +echo ===================================== +echo 选择Python环境: +echo 1 - venv (推荐) +echo 2 - conda +echo ===================================== +choice /c 12 /n /m "输入数字(1或2): " + +if errorlevel 2 ( + echo ===================================== + set "CONDA_ENV=" + set /p CONDA_ENV="请输入要激活的 conda 环境名称: " + + :: 检查输入是否为空 + if "!CONDA_ENV!"=="" ( + echo 错误：环境名称不能为空 + pause + exit /b 1 + ) + + call conda activate !CONDA_ENV! + if errorlevel 1 ( + echo 激活 conda 环境失败 + pause + exit /b 1 + ) + + echo Conda 环境 "!CONDA_ENV!" 激活成功 + python config/auto_update.py +) else ( + if exist "venv\Scripts\python.exe" ( + venv\Scripts\python config/auto_update.py + ) else ( + echo ===================================== + echo 错误: venv环境不存在，请先创建虚拟环境 + pause + exit /b 1 + ) +) +endlocal +pause diff --git a/麦麦开始学习.bat b/麦麦开始学习.bat index dfdf3ccc..f7391150 100644 --- a/麦麦开始学习.bat +++ b/麦麦开始学习.bat @@ -1,45 +1,45 @@ -@echo off -setlocal enabledelayedexpansion -chcp 65001 -cd /d %~dp0 - -echo ===================================== -echo 选择Python环境: -echo 1 - venv (推荐) -echo 2 - conda -echo ===================================== -choice /c 12 /n /m "输入数字(1或2): " - -if errorlevel 2 ( - echo ===================================== - set "CONDA_ENV=" - set /p CONDA_ENV="请输入要激活的 conda 环境名称: " - - :: 检查输入是否为空 - if "!CONDA_ENV!"=="" ( - echo 错误：环境名称不能为空 - pause - exit /b 1 - ) - - call conda activate !CONDA_ENV! - if errorlevel 1 ( - echo 激活 conda 环境失败 - pause - exit /b 1 - ) - - echo Conda 环境 "!CONDA_ENV!" 激活成功 - python src/plugins/zhishi/knowledge_library.py -) else ( - if exist "venv\Scripts\python.exe" ( - venv\Scripts\python src/plugins/zhishi/knowledge_library.py - ) else ( - echo ===================================== - echo 错误: venv环境不存在，请先创建虚拟环境 - pause - exit /b 1 - ) -) -endlocal -pause +@echo off +setlocal enabledelayedexpansion +chcp 65001 +cd /d %~dp0 + +echo ===================================== +echo 选择Python环境: +echo 1 - venv (推荐) +echo 2 - conda +echo ===================================== +choice /c 12 /n /m "输入数字(1或2): " + +if errorlevel 2 ( + echo ===================================== + set "CONDA_ENV=" + set /p CONDA_ENV="请输入要激活的 conda 环境名称: " + + :: 检查输入是否为空 + if "!CONDA_ENV!"=="" ( + echo 错误：环境名称不能为空 + pause + exit /b 1 + ) + + call conda activate !CONDA_ENV! + if errorlevel 1 ( + echo 激活 conda 环境失败 + pause + exit /b 1 + ) + + echo Conda 环境 "!CONDA_ENV!" 激活成功 + python src/plugins/zhishi/knowledge_library.py +) else ( + if exist "venv\Scripts\python.exe" ( + venv\Scripts\python src/plugins/zhishi/knowledge_library.py + ) else ( + echo ===================================== + echo 错误: venv环境不存在，请先创建虚拟环境 + pause + exit /b 1 + ) +) +endlocal +pause