From d9a66ee7cb415efbab54651720f1fe94326c2b45 Mon Sep 17 00:00:00 2001 From: infinitycat Date: Wed, 30 Apr 2025 11:13:23 +0800 Subject: [PATCH 1/6] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9Elpmm=E7=9A=84Linu?= =?UTF-8?q?x=E5=BF=AB=E6=8D=B7=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/run_lpmm.sh | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 scripts/run_lpmm.sh diff --git a/scripts/run_lpmm.sh b/scripts/run_lpmm.sh new file mode 100644 index 000000000..05435365c --- /dev/null +++ b/scripts/run_lpmm.sh @@ -0,0 +1,43 @@ +#!/bin/sh + +# Step 1: 自动定位项目根目录(即 scripts 目录的上级目录) +SCRIPTS_DIR="scripts" +SCRIPT_DIR=$(cd "$(dirname "$0")" && pwd) +PROJECT_ROOT=$(cd "$SCRIPT_DIR/.." && pwd) + +# Step 2: 检查 scripts 目录是否存在 +if [ ! -d "$PROJECT_ROOT/$SCRIPTS_DIR" ]; then + echo "❌ 错误:项目根目录中找不到 scripts 目录" >&2 + echo "当前路径: $SCRIPT_DIR" >&2 + exit 1 +fi + +# Step 3: 切换到项目根目录 +cd "$PROJECT_ROOT" || { + echo "❌ 无法切换到项目根目录: $PROJECT_ROOT" >&2 + exit 1 +} + +# Step 4: 运行每个 Python 脚本并检查退出状态 +echo "🔄 正在运行 text_pre_process.py" +python3 scripts/text_pre_process.py +if [ $? -ne 0 ]; then + echo "❌ text_pre_process.py 执行失败" >&2 + exit 1 +fi + +echo "🔄 正在运行 info_extraction.py" +python3 scripts/info_extraction.py +if [ $? -ne 0 ]; then + echo "❌ info_extraction.py 执行失败" >&2 + exit 1 +fi + +echo "🔄 正在运行 import_openie.py" +python3 scripts/import_openie.py +if [ $? -ne 0 ]; then + echo "❌ import_openie.py 执行失败" >&2 + exit 1 +fi + +echo "✅ 所有脚本执行完成" \ No newline at end of file From 2dac54c30692ba5dd3c5f74863a3614112bf1264 Mon Sep 17 00:00:00 2001 From: infinitycat Date: Wed, 30 Apr 2025 15:09:34 +0800 Subject: [PATCH 2/6] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=84=9A=E6=9C=AC?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/run_lpmm.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/run_lpmm.sh b/scripts/run_lpmm.sh index 05435365c..15df0d7b3 100644 --- a/scripts/run_lpmm.sh +++ b/scripts/run_lpmm.sh @@ -19,10 +19,10 @@ cd "$PROJECT_ROOT" || { } # Step 4: 运行每个 Python 脚本并检查退出状态 -echo "🔄 正在运行 text_pre_process.py" -python3 scripts/text_pre_process.py +echo "🔄 正在运行 raw_data_preprocessor.py" +python3 scripts/raw_data_preprocessor.py if [ $? -ne 0 ]; then - echo "❌ text_pre_process.py 执行失败" >&2 + echo "❌ raw_data_preprocessor.py 执行失败" >&2 exit 1 fi From 6f41d39d7220a8152b0473abee3c06898e8686b2 Mon Sep 17 00:00:00 2001 From: infinitycat Date: Wed, 30 Apr 2025 16:09:00 +0800 Subject: [PATCH 3/6] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96lpmm=E8=84=9A?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/run_lpmm.sh | 51 ++++++++++++++++++++++++++------------------- 1 file changed, 30 insertions(+), 21 deletions(-) diff --git a/scripts/run_lpmm.sh b/scripts/run_lpmm.sh index 15df0d7b3..33eb72842 100644 --- a/scripts/run_lpmm.sh +++ b/scripts/run_lpmm.sh @@ -1,5 +1,9 @@ #!/bin/sh +# ============================================== +# 环境初始化:确保Python脚本在正确的目录下运行 +# ============================================== + # Step 1: 自动定位项目根目录(即 scripts 目录的上级目录) SCRIPTS_DIR="scripts" SCRIPT_DIR=$(cd "$(dirname "$0")" && pwd) @@ -8,36 +12,41 @@ PROJECT_ROOT=$(cd "$SCRIPT_DIR/.." && pwd) # Step 2: 检查 scripts 目录是否存在 if [ ! -d "$PROJECT_ROOT/$SCRIPTS_DIR" ]; then echo "❌ 错误:项目根目录中找不到 scripts 目录" >&2 - echo "当前路径: $SCRIPT_DIR" >&2 + echo "当前路径: $PROJECT_ROOT" >&2 exit 1 fi -# Step 3: 切换到项目根目录 +# Step 3: 设置Python运行环境 +export PYTHONPATH="$PROJECT_ROOT:$PYTHONPATH" # 将项目根目录加入Python路径 cd "$PROJECT_ROOT" || { echo "❌ 无法切换到项目根目录: $PROJECT_ROOT" >&2 exit 1 } -# Step 4: 运行每个 Python 脚本并检查退出状态 -echo "🔄 正在运行 raw_data_preprocessor.py" -python3 scripts/raw_data_preprocessor.py -if [ $? -ne 0 ]; then - echo "❌ raw_data_preprocessor.py 执行失败" >&2 - exit 1 -fi +# Step 4: 打印关键路径信息(调试用) +echo "============================" +echo "项目根目录: $PROJECT_ROOT" +echo "Python路径: $PYTHONPATH" +echo "当前工作目录: $(pwd)" +echo "============================" -echo "🔄 正在运行 info_extraction.py" -python3 scripts/info_extraction.py -if [ $? -ne 0 ]; then - echo "❌ info_extraction.py 执行失败" >&2 - exit 1 -fi +# ============================================== +# 执行Python脚本 +# ============================================== -echo "🔄 正在运行 import_openie.py" -python3 scripts/import_openie.py -if [ $? -ne 0 ]; then - echo "❌ import_openie.py 执行失败" >&2 - exit 1 -fi +run_python_script() { + local script_name=$1 + echo "🔄 正在运行 $script_name" + python3 "scripts/$script_name" + if [ $? -ne 0 ]; then + echo "❌ $script_name 执行失败" >&2 + exit 1 + fi +} + +# 按顺序运行脚本 +run_python_script "raw_data_preprocessor.py" +run_python_script "info_extraction.py" +run_python_script "import_openie.py" echo "✅ 所有脚本执行完成" \ No newline at end of file From 16f765d86b64934415d319c41c3751fa1a304efd Mon Sep 17 00:00:00 2001 From: infinitycat Date: Wed, 30 Apr 2025 16:10:16 +0800 Subject: [PATCH 4/6] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96lpmm=E8=84=9A?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/run_lpmm.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/run_lpmm.sh b/scripts/run_lpmm.sh index 33eb72842..1671f0112 100644 --- a/scripts/run_lpmm.sh +++ b/scripts/run_lpmm.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # ============================================== # 环境初始化:确保Python脚本在正确的目录下运行 From 850db4b3e76e01c11a07bc6165207736afd91717 Mon Sep 17 00:00:00 2001 From: infinitycat Date: Wed, 30 Apr 2025 16:12:27 +0800 Subject: [PATCH 5/6] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96lpmm=E8=84=9A?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/run_lpmm.sh | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/scripts/run_lpmm.sh b/scripts/run_lpmm.sh index 1671f0112..234363886 100644 --- a/scripts/run_lpmm.sh +++ b/scripts/run_lpmm.sh @@ -1,52 +1,51 @@ #!/bin/bash # ============================================== -# 环境初始化:确保Python脚本在正确的目录下运行 +# Environment Initialization # ============================================== -# Step 1: 自动定位项目根目录(即 scripts 目录的上级目录) +# Step 1: Locate project root directory SCRIPTS_DIR="scripts" SCRIPT_DIR=$(cd "$(dirname "$0")" && pwd) PROJECT_ROOT=$(cd "$SCRIPT_DIR/.." && pwd) -# Step 2: 检查 scripts 目录是否存在 +# Step 2: Verify scripts directory exists if [ ! -d "$PROJECT_ROOT/$SCRIPTS_DIR" ]; then - echo "❌ 错误:项目根目录中找不到 scripts 目录" >&2 - echo "当前路径: $PROJECT_ROOT" >&2 + echo "❌ Error: scripts directory not found in project root" >&2 + echo "Current path: $PROJECT_ROOT" >&2 exit 1 fi -# Step 3: 设置Python运行环境 -export PYTHONPATH="$PROJECT_ROOT:$PYTHONPATH" # 将项目根目录加入Python路径 +# Step 3: Set up Python environment +export PYTHONPATH="$PROJECT_ROOT:$PYTHONPATH" cd "$PROJECT_ROOT" || { - echo "❌ 无法切换到项目根目录: $PROJECT_ROOT" >&2 + echo "❌ Failed to cd to project root: $PROJECT_ROOT" >&2 exit 1 } -# Step 4: 打印关键路径信息(调试用) +# Debug info echo "============================" -echo "项目根目录: $PROJECT_ROOT" -echo "Python路径: $PYTHONPATH" -echo "当前工作目录: $(pwd)" +echo "Project Root: $PROJECT_ROOT" +echo "Python Path: $PYTHONPATH" +echo "Working Dir: $(pwd)" echo "============================" # ============================================== -# 执行Python脚本 +# Python Script Execution # ============================================== run_python_script() { local script_name=$1 - echo "🔄 正在运行 $script_name" - python3 "scripts/$script_name" - if [ $? -ne 0 ]; then - echo "❌ $script_name 执行失败" >&2 + echo "🔄 Running $script_name" + if ! python3 "scripts/$script_name"; then + echo "❌ $script_name failed" >&2 exit 1 fi } -# 按顺序运行脚本 +# Execute scripts in order run_python_script "raw_data_preprocessor.py" run_python_script "info_extraction.py" run_python_script "import_openie.py" -echo "✅ 所有脚本执行完成" \ No newline at end of file +echo "✅ All scripts completed successfully" \ No newline at end of file From 5141862cf326db44ff33a7699ca226c89b47303c Mon Sep 17 00:00:00 2001 From: infinitycat Date: Thu, 1 May 2025 01:18:00 +0800 Subject: [PATCH 6/6] =?UTF-8?q?fix:=20=E4=B8=80=E4=B8=AA=E5=B0=8F=E8=A1=A5?= =?UTF-8?q?=E4=B8=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/run_lpmm.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/run_lpmm.sh b/scripts/run_lpmm.sh index 234363886..f3f54610d 100644 --- a/scripts/run_lpmm.sh +++ b/scripts/run_lpmm.sh @@ -37,7 +37,7 @@ echo "============================" run_python_script() { local script_name=$1 echo "🔄 Running $script_name" - if ! python3 "scripts/$script_name"; then + if ! python3 "$SCRIPTS_DIR/$script_name"; then echo "❌ $script_name failed" >&2 exit 1 fi