Skip to content

Commit 0190e93

Browse files
davidsbatistadavidsbatista
committed
Merge branch 'main' into feat/adding-delete-all-docs-to-QdrantDocumentStore
2 parents cfad373 + d45a048 commit 0190e93

46 files changed

Lines changed: 3188 additions & 322 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/labeler.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
# Integrations
2+
integration:aimlapi:
3+
- changed-files:
4+
- any-glob-to-any-file: "integrations/aimlapi/**/*"
5+
- any-glob-to-any-file: ".github/workflows/aimlapi.yml"
6+
27
integration:amazon-bedrock:
38
- changed-files:
49
- any-glob-to-any-file: "integrations/amazon_bedrock/**/*"
@@ -169,6 +174,11 @@ integration:stackit:
169174
- any-glob-to-any-file: "integrations/stackit/**/*"
170175
- any-glob-to-any-file: ".github/workflows/stackit.yml"
171176

177+
integration:together-ai:
178+
- changed-files:
179+
- any-glob-to-any-file: "integrations/together_ai/**/*"
180+
- any-glob-to-any-file: ".github/workflows/together_ai.yml"
181+
172182
integration:unstructured-fileconverter:
173183
- changed-files:
174184
- any-glob-to-any-file: "integrations/unstructured/**/*"

‎.github/workflows/llama_stack.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
max_attempts: 3
4444
command: |
4545
curl -fsSL https://ollama.com/install.sh | sh
46-
ollama serve &
46+
nohup ollama serve > ollama.log 2>&1 &
4747
4848
# Check if the service is up and running with a timeout of 60 seconds
4949
timeout=60
@@ -110,12 +110,13 @@ jobs:
110110
hatch run uv pip install -r requirements_lowest_direct.txt
111111
hatch run test:unit
112112
113-
- name: Nightly - run unit tests with Haystack main branch
113+
# Since this integration inherits from OpenAIChatGenerator, we run ALL tests with Haystack main branch to catch regressions
114+
- name: Nightly - run tests with Haystack main branch
114115
if: github.event_name == 'schedule'
115116
run: |
116117
hatch env prune
117118
hatch run uv pip install git+https://github.com/deepset-ai/haystack.git@main
118-
hatch run test:unit
119+
hatch run test:all
119120
120121
- name: Send event to Datadog for nightly failures
121122
if: failure() && github.event_name == 'schedule'

‎.github/workflows/meta_llama.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,13 @@ jobs:
6666
hatch run uv pip install -r requirements_lowest_direct.txt
6767
hatch run test:unit
6868
69-
- name: Nightly - run unit tests with Haystack main branch
69+
# Since this integration inherits from OpenAIChatGenerator, we run ALL tests with Haystack main branch to catch regressions
70+
- name: Nightly - run tests with Haystack main branch
7071
if: github.event_name == 'schedule'
7172
run: |
7273
hatch env prune
7374
hatch run uv pip install git+https://github.com/deepset-ai/haystack.git@main
74-
hatch run test:unit
75+
hatch run test:all
7576
7677
- name: Send event to Datadog for nightly failures
7778
if: failure() && github.event_name == 'schedule'

‎.github/workflows/mistral.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,13 @@ jobs:
6767
hatch run uv pip install -r requirements_lowest_direct.txt
6868
hatch run test:unit
6969
70-
- name: Nightly - run unit tests with Haystack main branch
70+
# Since this integration inherits from OpenAIChatGenerator, we run ALL tests with Haystack main branch to catch regressions
71+
- name: Nightly - run tests with Haystack main branch
7172
if: github.event_name == 'schedule'
7273
run: |
7374
hatch env prune
7475
hatch run uv pip install git+https://github.com/deepset-ai/haystack.git@main
75-
hatch run test:unit
76+
hatch run test:all
7677
7778
- name: Send event to Datadog for nightly failures
7879
if: failure() && github.event_name == 'schedule'

‎.github/workflows/nvidia.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,13 @@ jobs:
6868
hatch run uv pip install -r requirements_lowest_direct.txt
6969
hatch run test:unit
7070
71-
- name: Nightly - run unit tests with Haystack main branch
71+
# Since this integration inherits from OpenAIChatGenerator, we run ALL tests with Haystack main branch to catch regressions
72+
- name: Nightly - run tests with Haystack main branch
7273
if: github.event_name == 'schedule'
7374
run: |
7475
hatch env prune
7576
hatch run uv pip install git+https://github.com/deepset-ai/haystack.git@main
76-
hatch run test:unit
77+
hatch run test:all
7778
7879
- name: Send event to Datadog for nightly failures
7980
if: failure() && github.event_name == 'schedule'

‎.github/workflows/ollama.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
max_attempts: 3
4747
command: |
4848
curl -fsSL https://ollama.com/install.sh | sh
49-
ollama serve &
49+
nohup ollama serve > ollama.log 2>&1 &
5050
5151
# Check if the service is up and running with a timeout of 60 seconds
5252
timeout=60

‎.github/workflows/openrouter.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,13 @@ jobs:
6666
hatch run uv pip install -r requirements_lowest_direct.txt
6767
hatch run test:unit
6868
69-
- name: Nightly - run unit tests with Haystack main branch
69+
# Since this integration inherits from OpenAIChatGenerator, we run ALL tests with Haystack main branch to catch regressions
70+
- name: Nightly - run tests with Haystack main branch
7071
if: github.event_name == 'schedule'
7172
run: |
7273
hatch env prune
7374
hatch run uv pip install git+https://github.com/deepset-ai/haystack.git@main
74-
hatch run test:unit
75+
hatch run test:all
7576
7677
- name: Send event to Datadog for nightly failures
7778
if: failure() && github.event_name == 'schedule'

‎.github/workflows/stackit.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,13 @@ jobs:
6666
hatch run uv pip install -r requirements_lowest_direct.txt
6767
hatch run test:unit
6868
69-
- name: Nightly - run unit tests with Haystack main branch
69+
# Since this integration inherits from OpenAIChatGenerator, we run ALL tests with Haystack main branch to catch regressions
70+
- name: Nightly - run tests with Haystack main branch
7071
if: github.event_name == 'schedule'
7172
run: |
7273
hatch env prune
7374
hatch run uv pip install git+https://github.com/deepset-ai/haystack.git@main
74-
hatch run test:unit
75+
hatch run test:all
7576
7677
- name: Send event to Datadog for nightly failures
7778
if: failure() && github.event_name == 'schedule'

‎.github/workflows/sync_code_to_deepset.yml‎

Lines changed: 0 additions & 55 deletions
This file was deleted.

‎.github/workflows/together_ai.yml‎

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
# This workflow comes from https://github.com/ofek/hatch-mypyc
2+
# https://github.com/ofek/hatch-mypyc/blob/5a198c0ba8660494d02716cfc9d79ce4adfb1442/.github/workflows/test.yml
3+
name: Test / together_ai
4+
5+
on:
6+
schedule:
7+
- cron: "0 0 * * *"
8+
pull_request:
9+
paths:
10+
- "integrations/together_ai/**"
11+
- "!integrations/together_ai/*.md"
12+
- ".github/workflows/together_ai.yml"
13+
14+
defaults:
15+
run:
16+
working-directory: integrations/together_ai
17+
18+
concurrency:
19+
group: together_ai-${{ github.head_ref }}
20+
cancel-in-progress: true
21+
22+
env:
23+
PYTHONUNBUFFERED: "1"
24+
FORCE_COLOR: "1"
25+
TOGETHER_API_KEY: ${{ secrets.TOGETHER_AI_API_KEY }}
26+
27+
jobs:
28+
run:
29+
name: Python ${{ matrix.python-version }} on ${{ startsWith(matrix.os, 'macos-') && 'macOS' || startsWith(matrix.os, 'windows-') && 'Windows' || 'Linux' }}
30+
runs-on: ${{ matrix.os }}
31+
strategy:
32+
fail-fast: false
33+
matrix:
34+
os: [ubuntu-latest, windows-latest, macos-latest]
35+
python-version: ["3.9", "3.13"]
36+
37+
steps:
38+
- name: Support longpaths
39+
if: matrix.os == 'windows-latest'
40+
working-directory: .
41+
run: git config --system core.longpaths true
42+
43+
- uses: actions/checkout@v5
44+
45+
- name: Set up Python ${{ matrix.python-version }}
46+
uses: actions/setup-python@v6
47+
with:
48+
python-version: ${{ matrix.python-version }}
49+
50+
- name: Install Hatch
51+
run: pip install --upgrade hatch
52+
- name: Lint
53+
if: matrix.python-version == '3.9' && runner.os == 'Linux'
54+
run: hatch run fmt-check && hatch run test:types
55+
56+
- name: Generate docs
57+
if: matrix.python-version == '3.9' && runner.os == 'Linux'
58+
run: hatch run docs
59+
60+
- name: Run tests
61+
run: hatch run test:cov-retry
62+
63+
- name: Run unit tests with lowest direct dependencies
64+
run: |
65+
hatch run uv pip compile pyproject.toml --resolution lowest-direct --output-file requirements_lowest_direct.txt
66+
hatch run uv pip install -r requirements_lowest_direct.txt
67+
hatch run test:unit
68+
69+
# Since this integration inherits from OpenAIChatGenerator, we run ALL tests with Haystack main branch to catch regressions
70+
- name: Nightly - run tests with Haystack main branch
71+
if: github.event_name == 'schedule'
72+
run: |
73+
hatch env prune
74+
hatch run uv pip install git+https://github.com/deepset-ai/haystack.git@main
75+
hatch run test:all
76+
77+
- name: Send event to Datadog for nightly failures
78+
if: failure() && github.event_name == 'schedule'
79+
uses: ./.github/actions/send_failure
80+
with:
81+
title: |
82+
Core integrations nightly tests failure: ${{ github.workflow }}
83+
api-key: ${{ secrets.CORE_DATADOG_API_KEY }}

0 commit comments

Comments
 (0)