diff --git a/.github/workflows/sep-tests.yml b/.github/workflows/sep-tests.yml index 76a5e8eb23..cc05ca92e6 100644 --- a/.github/workflows/sep-tests.yml +++ b/.github/workflows/sep-tests.yml @@ -135,7 +135,9 @@ jobs: trap 'rm -f "$changed_files"' EXIT git diff --name-only ${{ github.event.pull_request.base.sha }}...${{ github.event.pull_request.head.sha }} \ | while read -r file; do - [[ -f "$file" ]] && printf '%s\0' "$file" + if [[ -f "$file" ]]; then + printf '%s\0' "$file" + fi done > "$changed_files" echo "Changed files to run lefthook on:" if [[ -s "$changed_files" ]]; then @@ -1120,4 +1122,4 @@ jobs: fi if [[ -n ${PORT_RESERVATION:-} ]]; then rm -f "${PORT_RESERVATION}" - fi \ No newline at end of file + fi diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index a42c094804..14e7ac4e15 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -100,7 +100,9 @@ jobs: trap 'rm -f "$changed_files"' EXIT git diff --name-only ${{ github.event.pull_request.base.sha }}...${{ github.event.pull_request.head.sha }} \ | while read -r file; do - [[ -f "$file" ]] && printf '%s\0' "$file" + if [[ -f "$file" ]]; then + printf '%s\0' "$file" + fi done > "$changed_files" echo "Changed files to run lefthook on:" if [[ -s "$changed_files" ]]; then diff --git a/build.sh b/build.sh index 22ed55771f..ccb297e9dc 100755 --- a/build.sh +++ b/build.sh @@ -159,7 +159,7 @@ check_office_oxide_deps() { echo -e "${RED}Error: office_oxide native library not found${NC}" echo " Expected: ${lib_path}" - echo " Run: uv run ragflow_deps/download_deps.py" + echo " Run: uv run python3 ragflow_deps/download_deps.py" echo " Or manually download: https://github.com/yfedoseev/office_oxide/releases/download/v${OFFICE_OXIDE_VERSION}/native-linux-x86_64.tar.gz" exit 1 } @@ -176,7 +176,7 @@ check_pdfium_deps() { echo " pdfium (static) not found" echo " Expected: ${lib_path}" - echo " Run: uv run ragflow_deps/download_deps.py" + echo " Run: uv run python3 ragflow_deps/download_deps.py" echo " Or: curl -fsSL https://github.com/kognitos/pdfium-static/releases/download/chromium%2F${PDFIUM_STATIC_VERSION}/pdfium-linux-x64-static.tgz | tar xz -C ${PDFIUM_STATIC_PREFIX}" return 1 } @@ -213,7 +213,7 @@ check_pdf_oxide_deps() { echo " pdf_oxide (static) not found" echo " Expected: ${lib_path}" - echo " Run: uv run ragflow_deps/download_deps.py" + echo " Run: uv run python3 ragflow_deps/download_deps.py" echo " Or: curl -fsSL https://github.com/yfedoseev/pdf_oxide/releases/download/v${PDF_OXIDE_VERSION}/pdf_oxide-go-ffi-linux-amd64.tar.gz | tar xz -C ${PDF_OXIDE_PREFIX}" return 1 } @@ -478,7 +478,7 @@ DEPENDENCIES: - cmake >= 4.0 - go >= 1.24 - g++ with C++17/23 support - - office_oxide native library (download with: uv run ragflow_deps/download_deps.py) + - office_oxide native library (download with: uv run python3 ragflow_deps/download_deps.py) - lld (Linux only): sudo apt install lld-20 && sudo ln -s /usr/bin/ld.lld-20 /usr/bin/ld.lld - pcre2 development files - Debian/Ubuntu: libpcre2-dev diff --git a/docker/launch_backend_service.sh b/docker/launch_backend_service.sh index 55c95f3098..a831e54664 100755 --- a/docker/launch_backend_service.sh +++ b/docker/launch_backend_service.sh @@ -118,7 +118,7 @@ run_server(){ if [[ "${API_PROXY_SCHEME}" == "go" ]]; then prepare_for_go server_name="ragflow_server" - server_cmd=("bin/ragflow_server") + server_cmd=("bin/ragflow_server" "--api") fi local retry_count=0 while ! $STOP && [ $retry_count -lt $MAX_RETRIES ]; do @@ -148,7 +148,7 @@ run_admin_server(){ if [[ "${API_PROXY_SCHEME}" == "go" ]]; then prepare_for_go server_name="admin_server" - server_cmd=("bin/admin_server") + server_cmd=("bin/ragflow_server" "--admin") fi local retry_count=0 while ! $STOP && [ $retry_count -lt $MAX_RETRIES ]; do diff --git a/internal/development.md b/internal/development.md index 732f0db1cc..3aa01ef9c2 100644 --- a/internal/development.md +++ b/internal/development.md @@ -28,7 +28,7 @@ They are **not** downloaded by `build.sh` — use the included download script: ```bash # From the project root, download and extract to ~/ragflow-native-libs/ -uv run ragflow_deps/download_deps.py +uv run python3 ragflow_deps/download_deps.py ``` This also requires `lld-20` on Linux (for Chromium-built pdfium): diff --git a/ragflow_deps/download_deps.py b/ragflow_deps/download_deps.py index aa4f7605ad..ad286be20e 100644 --- a/ragflow_deps/download_deps.py +++ b/ragflow_deps/download_deps.py @@ -22,7 +22,7 @@ # # Typical workflow: # -# uv run ragflow_deps/download_deps.py # download +# uv run python3 ragflow_deps/download_deps.py # download # cd ragflow_deps # docker build -f Dockerfile -t infiniflow/ragflow_deps . #