[BUGS] Fix CI Workflow Errors (#64)

* Update CI workflows and Poetry version

Renamed check_diffs.yml to CI.yml and refactored workflow to remove dynamic directory detection, now explicitly linting and testing 'libs/oci' and 'libs/oracledb'. Updated Poetry version to 2.2.1 in all workflow files for consistency and added workflow_dispatch for manual CI triggers.

* Refactor OCI code to appease the lint god

Simplify _lint.yml.
Rephrase OCI code base to pass make lint checks.

* Fix make lint error

Fix make lint error:
tests/unit_tests/llms/test_oci_model_deployment_endpoint.py:60: error: Missing named argument "response" for "HTTPError"  [call-arg]
Found 1 error in 1 file (checked 29 source files)

* Use Union type to pass make lint check

Use Union type to pass make lint check:

tests/integration_tests/vectorstores/test_oraclevs.py:1891: error: X | Y syntax for unions requires Python 3.10  [syntax]
tests/integration_tests/vectorstores/test_oraclevs.py:2028: error: X | Y syntax for unions requires Python 3.10  [syntax]
Found 2 errors in 1 file (checked 22 source files)
make: *** [Makefile:33: lint] Error 1

* Add LangGraph and related packages for integration tests

Add LangGraph and related packages for integration tests.

* Add placeholder integration test for OCI

Introduces a placeholder test in the OCI integration tests to ensure no errors are raised when no tests are selected.

* Revert commit: Refactor OCI code to appease the lint god

* Refactor to pass make lint checks

Refactor to pass make lint checks

* Refactor oracledb to pass make lint tests

* Remove placeholder integration tests and compile-integration-tests job from the CI workflow

Deleted test_placeholder.py files and the 'compile' pytest marker from both oci and oracledb libraries. Also removed the compile-integration-tests job from the CI workflow, as these placeholders are no longer needed.

* Use default 88 line length in ruff formatting

* Remove noqa: E501 comments and reformat long lines

This commit removes unnecessary '# noqa: E501' comments throughout the codebase and reformats long lines for improved readability. Docstrings, function signatures, and code examples have been wrapped or split across lines where appropriate. No functional changes were made.

* Fix typo in test JSON string for tool calling

Corrects the closing quote in the 'arguments' field of the test_meta_tool_calling test to ensure the escaped JSON is properly formatted.

* Fix escaped JSON string in test_oci_generative_ai.py

Corrects the escaped JSON string in the 'arguments' field of the test_meta_tool_calling test to ensure proper formatting and accurate test coverage.

* Remove extra noqa:E501 and split long strings

Split long error messages and test strings across multiple lines to improve readability and remove unnecessary noqa: E501 comments. Also reformatted SQL condition string construction in oraclevs.py for better clarity.

* Remove redundant Poetry check command

Eliminates the duplicate 'poetry check' command, leaving only 'poetry check --lock' to validate the Poetry configuration and lock file.

Author: paxiaatucsdedu

.github/workflows/check_diffs.yml renamed to .github/workflows/CI.yml

@@ -5,6 +5,7 @@ on:
   push:
     branches: [main]
   pull_request:
+  workflow_dispatch:  # Allows manual triggering from GitHub UI
 
 # If another push to the same PR or branch happens while this workflow is still running,
 # cancel the earlier run in favor of the next run.
@@ -17,62 +18,36 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  POETRY_VERSION: "1.7.1"
+  POETRY_VERSION: "2.2.1"
 
 jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
-        with:
-          python-version: '3.10'
-      - id: files
-        uses: Ana06/get-changed-files@v2.2.0
-      - id: set-matrix
-        run: |
-          python .github/scripts/check_diff.py ${{ steps.files.outputs.all }} >> $GITHUB_OUTPUT
-    outputs:
-      dirs-to-lint: ${{ steps.set-matrix.outputs.dirs-to-lint }}
-      dirs-to-test: ${{ steps.set-matrix.outputs.dirs-to-test }}
   lint:
     name: cd ${{ matrix.working-directory }}
-    needs: [ build ]
-    if: ${{ needs.build.outputs.dirs-to-lint != '[]' }}
     strategy:
       matrix:
-        working-directory: ${{ fromJson(needs.build.outputs.dirs-to-lint) }}
+        working-directory:
+          - "libs/oci"
+          - "libs/oracledb"
     uses: ./.github/workflows/_lint.yml
     with:
       working-directory: ${{ matrix.working-directory }}
     secrets: inherit
 
   test:
     name: cd ${{ matrix.working-directory }}
-    needs: [ build ]
-    if: ${{ needs.build.outputs.dirs-to-test != '[]' }}
     strategy:
       matrix:
-        working-directory: ${{ fromJson(needs.build.outputs.dirs-to-test) }}
+        working-directory:
+          - "libs/oci"
+          - "libs/oracledb"
     uses: ./.github/workflows/_test.yml
     with:
       working-directory: ${{ matrix.working-directory }}
     secrets: inherit
 
-  compile-integration-tests:
-    name: cd ${{ matrix.working-directory }}
-    needs: [ build ]
-    if: ${{ needs.build.outputs.dirs-to-test != '[]' }}
-    strategy:
-      matrix:
-        working-directory: ${{ fromJson(needs.build.outputs.dirs-to-test) }}
-    uses: ./.github/workflows/_compile_integration_test.yml
-    with:
-      working-directory: ${{ matrix.working-directory }}
-    secrets: inherit
   ci_success:
     name: "CI Success"
-    needs: [build, lint, test, compile-integration-tests]
+    needs: [lint, test]
     if: |
       always()
     runs-on: ubuntu-latest

.github/workflows/_compile_integration_test.yml

@@ -9,7 +9,7 @@ on:
         description: "From which folder this pipeline executes"
 
 env:
-  POETRY_VERSION: "1.7.1"
+  POETRY_VERSION: "2.2.1"
 
 jobs:
   build:

.github/workflows/_lint.yml

@@ -9,7 +9,7 @@ on:
         description: "From which folder this pipeline executes"
 
 env:
-  POETRY_VERSION: "1.7.1"
+  POETRY_VERSION: "2.2.1"
   WORKDIR: ${{ inputs.working-directory == '' && '.' || inputs.working-directory }}
 
   # This env var allows us to get inline annotations when ruff has complaints.
@@ -42,17 +42,10 @@ jobs:
           working-directory: ${{ inputs.working-directory }}
           cache-key: lint-with-extras
 
-      - name: Check Poetry File
-        shell: bash
+      - name: Check Poetry configuration
         working-directory: ${{ inputs.working-directory }}
         run: |
-          poetry check
-
-      - name: Check lock file
-        shell: bash
-        working-directory: ${{ inputs.working-directory }}
-        run: |
-          poetry lock --check
+          poetry check --lock
 
       - name: Install dependencies
         # Also installs dev/lint/test/typing dependencies, to ensure we have
@@ -65,38 +58,9 @@ jobs:
         # It doesn't matter how you change it, any change will cause a cache-bust.
         working-directory: ${{ inputs.working-directory }}
         run: |
-          poetry install --with lint,typing
-
-      - name: Get .mypy_cache to speed up mypy
-        uses: actions/cache@v4
-        env:
-          SEGMENT_DOWNLOAD_TIMEOUT_MIN: "2"
-        with:
-          path: |
-            ${{ env.WORKDIR }}/.mypy_cache
-          key: mypy-lint-${{ runner.os }}-${{ runner.arch }}-py${{ matrix.python-version }}-${{ inputs.working-directory }}-${{ hashFiles(format('{0}/poetry.lock', inputs.working-directory)) }}
-
-
-      - name: Analysing the code with our lint
-        working-directory: ${{ inputs.working-directory }}
-        run: |
-          make lint_package
-
-      - name: Install unit+integration test dependencies
-        working-directory: ${{ inputs.working-directory }}
-        run: |
-          poetry install --with test,test_integration
-
-      - name: Get .mypy_cache_test to speed up mypy
-        uses: actions/cache@v4
-        env:
-          SEGMENT_DOWNLOAD_TIMEOUT_MIN: "2"
-        with:
-          path: |
-            ${{ env.WORKDIR }}/.mypy_cache_test
-          key: mypy-test-${{ runner.os }}-${{ runner.arch }}-py${{ matrix.python-version }}-${{ inputs.working-directory }}-${{ hashFiles(format('{0}/poetry.lock', inputs.working-directory)) }}
+          poetry install --with lint,typing,test,test_integration
 
-      - name: Analysing the code with our lint
+      - name: Run linting
         working-directory: ${{ inputs.working-directory }}
         run: |
-          make lint_tests
+          make lint

.github/workflows/_test.yml

@@ -9,7 +9,7 @@ on:
         description: "From which folder this pipeline executes"
 
 env:
-  POETRY_VERSION: "1.7.1"
+  POETRY_VERSION: "2.2.1"
 
 jobs:
   build:

libs/oci/Makefile

@@ -27,14 +27,13 @@ lint_tests: PYTHON_FILES=tests
 lint_tests: MYPY_CACHE=.mypy_cache_test
 
 lint lint_diff lint_package lint_tests:
-	poetry run ruff .
-	poetry run ruff format $(PYTHON_FILES) --diff
-	poetry run ruff --select I $(PYTHON_FILES)
-	mkdir -p $(MYPY_CACHE); poetry run mypy $(PYTHON_FILES) --cache-dir $(MYPY_CACHE)
+	[ "$(PYTHON_FILES)" = "" ] || poetry run ruff check $(PYTHON_FILES)
+	[ "$(PYTHON_FILES)" = "" ] || poetry run ruff format $(PYTHON_FILES) --diff
+	[ "$(PYTHON_FILES)" = "" ] || mkdir -p $(MYPY_CACHE) && poetry run mypy $(PYTHON_FILES) --cache-dir $(MYPY_CACHE)
 
 format format_diff:
 	poetry run ruff format $(PYTHON_FILES)
-	poetry run ruff --select I --fix $(PYTHON_FILES)
+	poetry run ruff check --select I --fix $(PYTHON_FILES)
 
 spell_check:
 	poetry run codespell --toml pyproject.toml