Skip to content

Commit

Permalink
merge conflicts from main
Browse files Browse the repository at this point in the history
  • Loading branch information
raspawar committed Jan 30, 2025
2 parents 6f51017 + 4b003f2 commit f31053a
Show file tree
Hide file tree
Showing 302 changed files with 15,615 additions and 5,188 deletions.
10 changes: 10 additions & 0 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@ integration:astra:
- any-glob-to-any-file: "integrations/astra/**/*"
- any-glob-to-any-file: ".github/workflows/astra.yml"

integration:azure-ai-search:
- changed-files:
- any-glob-to-any-file: "integrations/azure_ai_search/**/*"
- any-glob-to-any-file: ".github/workflows/azure_ai_search.yml"

integration:chroma:
- changed-files:
- any-glob-to-any-file: "integrations/chroma/**/*"
Expand Down Expand Up @@ -124,6 +129,11 @@ integration:weaviate:
- any-glob-to-any-file: "integrations/weaviate/**/*"
- any-glob-to-any-file: ".github/workflows/weaviate.yml"

integration:snowflake:
- changed-files:
- any-glob-to-any-file: "integrations/snowflake/**/*"
- any-glob-to-any-file: ".github/workflows/snowflake.yml"

integration:deepeval:
- changed-files:
- any-glob-to-any-file: "integrations/deepeval/**/*"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/CI_license_compliance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ jobs:

# We keep the license inventory on FOSSA
- name: Send license report to Fossa
uses: fossas/fossa-action@v1.4.0
uses: fossas/fossa-action@v1.5.0
continue-on-error: true # not critical
with:
api-key: ${{ secrets.FOSSA_LICENSE_SCAN_TOKEN }}
Expand Down
27 changes: 19 additions & 8 deletions .github/workflows/CI_pypi_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,25 @@ jobs:
with:
config: cliff.toml
args: >
--include-path "${{ steps.pathfinder.outputs.project_path }}/*"
--include-path "${{ steps.pathfinder.outputs.project_path }}/**/*"
--tag-pattern "${{ steps.pathfinder.outputs.project_path }}-v*"
- name: Commit changelog
uses: EndBug/add-and-commit@v9
- name: Create Pull Request
uses: peter-evans/create-pull-request@v7
with:
author_name: "HaystackBot"
author_email: "[email protected]"
message: "Update the changelog"
add: ${{ steps.pathfinder.outputs.project_path }}
push: origin HEAD:main
token: ${{ secrets.HAYSTACK_BOT_TOKEN }}
commit-message: "Update changelog for ${{ steps.pathfinder.outputs.project_path }}"
branch: update-changelog-${{ steps.pathfinder.outputs.project_path }}
base: main
title: "docs: update changelog for ${{ steps.pathfinder.outputs.project_path }}"
add-paths: |
${{ steps.pathfinder.outputs.project_path }}/CHANGELOG.md
body: |
This PR updates the changelog for ${{ steps.pathfinder.outputs.project_path }} integration
with the latest changes just released on PyPi. Please review the changelog diff below and adjust it
if necessary.
A good changelog diff simply lists these latest changes on top of the CHANGELOG.md file.
If there are some diffs that seem out of place, please adjust the CHANGELOG.md file manually.
Either way, please merge this PR as soon as possible.
2 changes: 1 addition & 1 deletion .github/workflows/CI_readme_sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,6 @@ jobs:
ls tmp
- name: Sync API docs with Haystack docs version ${{ matrix.hs-docs-version }}
uses: readmeio/rdme@v8
uses: readmeio/rdme@v9
with:
rdme: docs ${{ steps.pathfinder.outputs.project_path }}/tmp --key=${{ secrets.README_API_KEY }} --version=${{ matrix.hs-docs-version }}
15 changes: 15 additions & 0 deletions .github/workflows/CI_stale.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: 'Stalebot'
on:
schedule:
- cron: '30 1 * * *'

jobs:
makestale:
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v9
with:
any-of-labels: 'community-triage'
stale-pr-message: 'This issue is stale because it has been open 30 days with no activity. Remove stale label or comment or this will be closed in 10 days.'
days-before-stale: 30
days-before-close: 10
4 changes: 2 additions & 2 deletions .github/workflows/amazon_bedrock.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ jobs:
# Do not authenticate on pull requests from forks
- name: AWS authentication
if: github.event.pull_request.head.repo.full_name == github.repository
uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502
uses: aws-actions/configure-aws-credentials@4fc4975a852c8cd99761e2de1f4ba73402e44dd9
with:
aws-region: ${{ env.AWS_REGION }}
role-to-assume: ${{ secrets.AWS_CI_ROLE_ARN }}
Expand All @@ -81,7 +81,7 @@ jobs:
- name: Nightly - run unit tests with Haystack main branch
if: github.event_name == 'schedule'
run: |
hatch run pip install git+https://github.com/deepset-ai/haystack.git
hatch run uv pip install git+https://github.com/deepset-ai/haystack.git@main
hatch run cov-retry -m "not integration"
- name: Send event to Datadog for nightly failures
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/amazon_sagemaker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
- name: Nightly - run unit tests with Haystack main branch
if: github.event_name == 'schedule'
run: |
hatch run pip install git+https://github.com/deepset-ai/haystack.git
hatch run uv pip install git+https://github.com/deepset-ai/haystack.git@main
hatch run cov-retry -m "not integration"
- name: Send event to Datadog for nightly failures
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/anthropic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ defaults:
working-directory: integrations/anthropic

concurrency:
group: cohere-${{ github.head_ref }}
group: anthropic-${{ github.head_ref }}
cancel-in-progress: true

env:
Expand Down Expand Up @@ -59,7 +59,7 @@ jobs:
- name: Nightly - run unit tests with Haystack main branch
if: github.event_name == 'schedule'
run: |
hatch run pip install git+https://github.com/deepset-ai/haystack.git
hatch run uv pip install git+https://github.com/deepset-ai/haystack.git@main
hatch run cov-retry -m "not integration"
- name: Send event to Datadog for nightly failures
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/astra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
- name: Nightly - run unit tests with Haystack main branch
if: github.event_name == 'schedule'
run: |
hatch run pip install git+https://github.com/deepset-ai/haystack.git
hatch run uv pip install git+https://github.com/deepset-ai/haystack.git@main
hatch run cov-retry -m "not integration"
- name: Send event to Datadog for nightly failures
Expand Down
72 changes: 72 additions & 0 deletions .github/workflows/azure_ai_search.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
# This workflow comes from https://github.com/ofek/hatch-mypyc
# https://github.com/ofek/hatch-mypyc/blob/5a198c0ba8660494d02716cfc9d79ce4adfb1442/.github/workflows/test.yml
name: Test / azure_ai_search

on:
schedule:
- cron: "0 0 * * *"
pull_request:
paths:
- "integrations/azure_ai_search/**"
- ".github/workflows/azure_ai_search.yml"

concurrency:
group: azure_ai_search-${{ github.head_ref }}
cancel-in-progress: true

env:
PYTHONUNBUFFERED: "1"
FORCE_COLOR: "1"
AZURE_SEARCH_API_KEY: ${{ secrets.AZURE_SEARCH_API_KEY }}
AZURE_SEARCH_SERVICE_ENDPOINT: ${{ secrets.AZURE_SEARCH_SERVICE_ENDPOINT }}

defaults:
run:
working-directory: integrations/azure_ai_search

jobs:
run:
name: Python ${{ matrix.python-version }} on ${{ startsWith(matrix.os, 'macos-') && 'macOS' || startsWith(matrix.os, 'windows-') && 'Windows' || 'Linux' }}
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
max-parallel: 3
matrix:
os: [ubuntu-latest, windows-latest]
python-version: ["3.9", "3.10", "3.11"]

steps:
- uses: actions/checkout@v4

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

- name: Install Hatch
run: pip install --upgrade hatch

- name: Lint
if: matrix.python-version == '3.9'
run: hatch run lint:all

- name: Generate docs
if: matrix.python-version == '3.9' && runner.os == 'Linux'
run: hatch run docs

- name: Run tests
run: hatch run cov-retry

- name: Nightly - run unit tests with Haystack main branch
if: github.event_name == 'schedule'
run: |
hatch run uv pip install git+https://github.com/deepset-ai/haystack.git@main
hatch run cov-retry -m "not integration"
- name: Send event to Datadog for nightly failures
if: failure() && github.event_name == 'schedule'
uses: ./.github/actions/send_failure
with:
title: |
Core integrations nightly tests failure: ${{ github.workflow }}
api-key: ${{ secrets.CORE_DATADOG_API_KEY }}
8 changes: 6 additions & 2 deletions .github/workflows/chroma.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
python-version: ["3.8", "3.9", "3.10"]
python-version: ["3.9", "3.10", "3.11"]

steps:
- name: Support longpaths
Expand All @@ -56,13 +56,17 @@ jobs:
if: matrix.python-version == '3.9' && runner.os == 'Linux'
run: hatch run docs

- name: Run Chroma server on Linux/macOS
if: matrix.os != 'windows-latest'
run: hatch run chroma run &

- name: Run tests
run: hatch run cov-retry

- name: Nightly - run unit tests with Haystack main branch
if: github.event_name == 'schedule'
run: |
hatch run pip install git+https://github.com/deepset-ai/haystack.git
hatch run uv pip install git+https://github.com/deepset-ai/haystack.git@main
hatch run cov-retry -m "not integration"
- name: Send event to Datadog for nightly failures
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cohere.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
- name: Nightly - run unit tests with Haystack main branch
if: github.event_name == 'schedule'
run: |
hatch run pip install git+https://github.com/deepset-ai/haystack.git
hatch run uv pip install git+https://github.com/deepset-ai/haystack.git@main
hatch run cov-retry -m "not integration"
- name: Send event to Datadog for nightly failures
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deepeval.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
- name: Nightly - run unit tests with Haystack main branch
if: github.event_name == 'schedule'
run: |
hatch run pip install git+https://github.com/deepset-ai/haystack.git
hatch run uv pip install git+https://github.com/deepset-ai/haystack.git@main
hatch run cov-retry -m "not integration"
- name: Send event to Datadog for nightly failures
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/elasticsearch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
- name: Nightly - run unit tests with Haystack main branch
if: github.event_name == 'schedule'
run: |
hatch run pip install git+https://github.com/deepset-ai/haystack.git
hatch run uv pip install git+https://github.com/deepset-ai/haystack.git@main
hatch run cov-retry -m "not integration"
- name: Send event to Datadog for nightly failures
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/fastembed.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
- name: Nightly - run unit tests with Haystack main branch
if: github.event_name == 'schedule'
run: |
hatch run pip install git+https://github.com/deepset-ai/haystack.git
hatch run uv pip install git+https://github.com/deepset-ai/haystack.git@main
hatch run cov-retry -m "not integration"
- name: Send event to Datadog for nightly failures
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/google_ai.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
- name: Nightly - run unit tests with Haystack main branch
if: github.event_name == 'schedule'
run: |
hatch run pip install git+https://github.com/deepset-ai/haystack.git
hatch run uv pip install git+https://github.com/deepset-ai/haystack.git@main
hatch run cov-retry -m "not integration"
- name: Send event to Datadog for nightly failures
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/google_vertex.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
- name: Nightly - run unit tests with Haystack main branch
if: github.event_name == 'schedule'
run: |
hatch run pip install git+https://github.com/deepset-ai/haystack.git
hatch run uv pip install git+https://github.com/deepset-ai/haystack.git@main
hatch run cov-retry -m "not integration"
- name: Send event to Datadog for nightly failures
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/instructor_embedders.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
- name: Nightly - run unit tests with Haystack main branch
if: github.event_name == 'schedule'
run: |
hatch run pip install git+https://github.com/deepset-ai/haystack.git
hatch run uv pip install git+https://github.com/deepset-ai/haystack.git@main
hatch run cov-retry -m "not integration"
- name: Send event to Datadog for nightly failures
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/jina.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
- name: Nightly - run unit tests with Haystack main branch
if: github.event_name == 'schedule'
run: |
hatch run pip install git+https://github.com/deepset-ai/haystack.git
hatch run uv pip install git+https://github.com/deepset-ai/haystack.git@main
hatch run cov-retry -m "not integration"
- name: Send event to Datadog for nightly failures
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/langfuse.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jobs:
- name: Nightly - run unit tests with Haystack main branch
if: github.event_name == 'schedule'
run: |
hatch run pip install git+https://github.com/deepset-ai/haystack.git
hatch run uv pip install git+https://github.com/deepset-ai/haystack.git@main
hatch run cov-retry -m "not integration"
- name: Send event to Datadog for nightly failures
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/llama_cpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
- name: Nightly - run unit tests with Haystack main branch
if: github.event_name == 'schedule'
run: |
hatch run pip install git+https://github.com/deepset-ai/haystack.git
hatch run uv pip install git+https://github.com/deepset-ai/haystack.git@main
hatch run cov-retry -m "not integration"
- name: Send event to Datadog for nightly failures
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mistral.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
- name: Nightly - run unit tests with Haystack main branch
if: github.event_name == 'schedule'
run: |
hatch run pip install git+https://github.com/deepset-ai/haystack.git
hatch run uv pip install git+https://github.com/deepset-ai/haystack.git@main
hatch run cov-retry -m "not integration"
- name: Send event to Datadog for nightly failures
Expand Down
15 changes: 8 additions & 7 deletions .github/workflows/mongodb_atlas.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ name: Test / mongodb_atlas

on:
schedule:
- cron: "0 0 * * *"
- cron: '0 0 * * *'
pull_request:
paths:
- "integrations/mongodb_atlas/**"
- ".github/workflows/mongodb_atlas.yml"
- 'integrations/mongodb_atlas/**'
- '.github/workflows/mongodb_atlas.yml'

defaults:
run:
Expand All @@ -19,9 +19,10 @@ concurrency:
cancel-in-progress: true

env:
PYTHONUNBUFFERED: "1"
FORCE_COLOR: "1"
PYTHONUNBUFFERED: '1'
FORCE_COLOR: '1'
MONGO_CONNECTION_STRING: ${{ secrets.MONGO_CONNECTION_STRING }}
MONGO_CONNECTION_STRING_2: ${{ secrets.MONGO_CONNECTION_STRING_2 }}

jobs:
run:
Expand All @@ -31,7 +32,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
python-version: ["3.9", "3.10", "3.11"]
python-version: ['3.9', '3.10', '3.11']

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -59,7 +60,7 @@ jobs:
- name: Nightly - run unit tests with Haystack main branch
if: github.event_name == 'schedule'
run: |
hatch run pip install git+https://github.com/deepset-ai/haystack.git
hatch run uv pip install git+https://github.com/deepset-ai/haystack.git@main
hatch run cov-retry -m "not integration"
- name: Send event to Datadog for nightly failures
Expand Down
Loading

0 comments on commit f31053a

Please sign in to comment.