Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/workflows/langfuse.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,6 @@ jobs:
- name: Install Hatch
run: pip install hatch

# TODO: Once this integration is properly typed, use hatch run test:types
# https://github.com/deepset-ai/haystack-core-integrations/issues/1771
- name: Lint
if: matrix.python-version == '3.10' && runner.os == 'Linux'
run: hatch run fmt-check && hatch run test:types
Expand Down
28 changes: 12 additions & 16 deletions .github/workflows/pinecone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ env:
PYTHONUNBUFFERED: "1"
FORCE_COLOR: "1"
PINECONE_API_KEY: ${{ secrets.PINECONE_API_KEY }}
TEST_MATRIX_OS: '["ubuntu-latest"]'
TEST_MATRIX_PYTHON: '["3.10", "3.14"]'

jobs:
compute-test-matrix:
Expand All @@ -40,13 +38,20 @@ jobs:
run:
working-directory: .
outputs:
os: ${{ steps.set.outputs.os }}
python-version: ${{ steps.set.outputs.python-version }}
matrix: ${{ steps.set.outputs.matrix }}
steps:
- id: set
run: |
echo 'os=${{ github.event_name == 'push' && '["ubuntu-latest"]' || env.TEST_MATRIX_OS }}' >> "$GITHUB_OUTPUT"
echo 'python-version=${{ github.event_name == 'push' && '["3.10"]' || env.TEST_MATRIX_PYTHON }}' >> "$GITHUB_OUTPUT"
if [ "${{ github.event_name }}" = "push" ]; then
echo 'matrix=[{"os":"ubuntu-latest","python-version":"3.10","INDEX_NAME":"index-310"}]' >> "$GITHUB_OUTPUT"
else
MATRIX='['
# Pinecone tests are time expensive, so only test on Ubuntu
MATRIX+='{"os":"ubuntu-latest","python-version":"3.10","INDEX_NAME":"index-310"},'
MATRIX+='{"os":"ubuntu-latest","python-version":"3.14","INDEX_NAME":"index-313"}'
MATRIX+=']'
echo "matrix=$MATRIX" >> "$GITHUB_OUTPUT"
fi

run:
name: Python ${{ matrix.python-version }} on ${{ startsWith(matrix.os, 'macos-') && 'macOS' || startsWith(matrix.os, 'windows-') && 'Windows' || 'Linux' }}
Expand All @@ -58,14 +63,7 @@ jobs:
strategy:
fail-fast: false
matrix:
# Pinecone tests are time expensive, so only test on Ubuntu
os: ${{ fromJSON(needs.compute-test-matrix.outputs.os) }}
python-version: ${{ fromJSON(needs.compute-test-matrix.outputs.python-version) }}
include:
- python-version: "3.10"
INDEX_NAME: "index-310"
- python-version: "3.14"
INDEX_NAME: "index-313"
include: ${{ fromJSON(needs.compute-test-matrix.outputs.matrix) }}

steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
Expand All @@ -78,8 +76,6 @@ jobs:
- name: Install Hatch
run: pip install hatch

# TODO: Once this integration is properly typed, use hatch run test:types
# https://github.com/deepset-ai/haystack-core-integrations/issues/1771
- name: Lint
if: matrix.python-version == '3.10' && runner.os == 'Linux'
run: hatch run fmt-check && hatch run test:types
Expand Down
2 changes: 0 additions & 2 deletions integrations/llama_cpp/tests/models/.gitignore

This file was deleted.

4 changes: 3 additions & 1 deletion integrations/llama_cpp/tests/test_chat_generator.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@

@pytest.fixture
def model_path():
return Path(__file__).parent / "models"
path = Path.home() / ".cache" / "haystack_llama_cpp_tests"
path.mkdir(parents=True, exist_ok=True)
return path


def get_current_temperature(location: Annotated[str, "The city and state, e.g. San Francisco, CA"]):
Expand Down
4 changes: 3 additions & 1 deletion integrations/llama_cpp/tests/test_generator.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@

@pytest.fixture
def model_path():
return Path(__file__).parent / "models"
path = Path.home() / ".cache" / "haystack_llama_cpp_tests"
path.mkdir(parents=True, exist_ok=True)
return path


def download_file(file_link, filename, capsys):
Expand Down
Loading