Skip to content

Commit d7260db

Browse files
committed
Merge branch 'v3' of github.com:deepset-ai/haystack into merge-v3-into-main
2 parents b1d12ff + f317d87 commit d7260db

395 files changed

Lines changed: 23427 additions & 64486 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/e2e.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
pip install hatch==${{ env.HATCH_VERSION }} --uploaded-prior-to=P1D
4444
4545
- name: Run tests
46-
run: hatch run e2e:test
46+
run: hatch run test:e2e
4747

4848
- name: Notify Slack on nightly failure
4949
if: failure() && github.event_name == 'schedule'

.github/workflows/slow.yml

Lines changed: 0 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -59,55 +59,15 @@ jobs:
5959
# List of Python files that trigger slow integration tests when modified
6060
filters: |
6161
changes:
62-
- "haystack/components/audio/whisper_local.py"
63-
- "haystack/components/classifiers/zero_shot_document_classifier.py"
64-
- "haystack/components/converters/tika.py"
65-
- "haystack/components/embedders/hugging_face_api_document_embedder.py"
66-
- "haystack/components/embedders/hugging_face_api_text_embedder.py"
67-
- "haystack/components/embedders/backends/sentence_transformers_backend.py"
68-
- "haystack/components/embedders/backends/sentence_transformers_sparse_backend.py"
69-
- "haystack/components/embedders/image/sentence_transformers_doc_image_embedder.py"
70-
- "haystack/components/embedders/sentence_transformers_text_embedder.py"
71-
- "haystack/components/embedders/sentence_transformers_sparse_document_embedder.py"
72-
- "haystack/components/embedders/sentence_transformers_sparse_text_embedder.py"
7362
- "haystack/components/evaluators/sas_evaluator.py"
74-
- "haystack/components/generators/chat/hugging_face_api.py"
75-
- "haystack/components/generators/chat/hugging_face_local.py"
76-
- "haystack/components/generators/hugging_face_api.py"
77-
- "haystack/components/generators/hugging_face_local_generator.py"
7863
- "haystack/components/generators/openai_dalle.py"
7964
- "haystack/components/preprocessors/embedding_based_document_splitter.py"
80-
- "haystack/components/rankers/sentence_transformers_diversity.py"
81-
- "haystack/components/rankers/sentence_transformers_similarity.py"
82-
- "haystack/components/rankers/transformers_similarity.py"
83-
- "haystack/components/readers/extractive.py"
8465
- "haystack/components/retrievers/multi_query_embedding_retriever.py"
85-
- "haystack/components/routers/transformers_text_router.py"
86-
- "haystack/components/routers/zero_shot_text_router.py"
8766
88-
- "test/components/audio/test_whisper_local.py"
89-
- "test/components/classifiers/test_zero_shot_document_classifier.py"
90-
- "test/components/converters/test_tika_doc_converter.py"
91-
- "test/components/embedders/test_hugging_face_api_document_embedder.py"
92-
- "test/components/embedders/test_hugging_face_api_text_embedder.py"
93-
- "test/components/embedders/image/test_sentence_transformers_doc_image_embedder.py"
94-
- "test/components/embedders/test_sentence_transformers_text_embedder.py"
95-
- "test/components/embedders/test_sentence_transformers_sparse_document_embedder.py"
96-
- "test/components/embedders/test_sentence_transformers_sparse_text_embedder.py"
9767
- "test/components/evaluators/test_sas_evaluator.py"
98-
- "test/components/generators/chat/test_hugging_face_api.py"
99-
- "test/components/generators/chat/test_hugging_face_local.py"
100-
- "test/components/generators/test_hugging_face_api.py"
101-
- "test/components/generators/test_hugging_face_local_generator.py"
10268
- "test/components/generators/test_openai_dalle.py"
10369
- "test/components/preprocessors/test_embedding_based_document_splitter.py"
104-
- "test/components/rankers/test_sentence_transformers_diversity.py"
105-
- "test/components/rankers/test_sentence_transformers_similarity.py"
106-
- "test/components/rankers/test_transformers_similarity.py"
107-
- "test/components/readers/test_extractive.py"
10870
- "test/components/retrievers/test_multi_query_embedding_retriever.py"
109-
- "test/components/routers/test_transformers_text_router.py"
110-
- "test/components/routers/test_zero_shot_text_router.py"
11171
11272
slow-integration-tests:
11373
name: Slow Tests / ${{ matrix.os }}
@@ -126,13 +86,6 @@ jobs:
12686
fail-fast: false
12787
matrix:
12888
os: [ubuntu-latest, macos-latest, windows-latest]
129-
include:
130-
- os: ubuntu-latest
131-
install_cmd: "sudo apt update && sudo apt install ffmpeg"
132-
- os: macos-latest
133-
install_cmd: "brew install ffmpeg"
134-
- os: windows-latest
135-
install_cmd: "echo 'No additional dependencies needed'"
13689

13790
steps:
13891
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
@@ -150,15 +103,6 @@ jobs:
150103
python -m pip install --upgrade pip
151104
pip install hatch==${{ env.HATCH_VERSION }} --uploaded-prior-to=P1D
152105
153-
- name: Run Tika
154-
if: matrix.os == 'ubuntu-latest'
155-
run: |
156-
docker run -d -p 9998:9998 apache/tika:2.9.0.0@sha256:92d055a84e9efbedb5541fb38d635a44a16a875d88d1014c183af9eb93a09aaf
157-
158-
- name: Install Whisper dependencies
159-
shell: bash
160-
run: ${{ matrix.install_cmd }}
161-
162106
- name: Run tests
163107
run: hatch run test:integration-only-slow
164108

0 commit comments

Comments
 (0)