-
Notifications
You must be signed in to change notification settings - Fork 127
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into fix/weaviate-schema-class-name
- Loading branch information
Showing
31 changed files
with
921 additions
and
72 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| # This workflow comes from https://github.com/ofek/hatch-mypyc | ||
| # https://github.com/ofek/hatch-mypyc/blob/5a198c0ba8660494d02716cfc9d79ce4adfb1442/.github/workflows/test.yml | ||
| name: Test / langfuse | ||
|
|
||
| on: | ||
| schedule: | ||
| - cron: "0 0 * * *" | ||
| pull_request: | ||
| paths: | ||
| - "integrations/langfuse/**" | ||
| - ".github/workflows/langfuse.yml" | ||
|
|
||
| defaults: | ||
| run: | ||
| working-directory: integrations/langfuse | ||
|
|
||
| concurrency: | ||
| group: langfuse-${{ github.head_ref }} | ||
| cancel-in-progress: true | ||
|
|
||
| env: | ||
| PYTHONUNBUFFERED: "1" | ||
| FORCE_COLOR: "1" | ||
| LANGFUSE_SECRET_KEY: ${{ secrets.LANGFUSE_SECRET_KEY }} | ||
| LANGFUSE_PUBLIC_KEY: ${{ secrets.LANGFUSE_PUBLIC_KEY }} | ||
| OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }} | ||
|
|
||
| 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 | ||
| matrix: | ||
| os: [ubuntu-latest, windows-latest, macos-latest] | ||
| python-version: ["3.9", "3.10"] | ||
|
|
||
| steps: | ||
| - name: Support longpaths | ||
| if: matrix.os == 'windows-latest' | ||
| working-directory: . | ||
| run: git config --system core.longpaths true | ||
|
|
||
| - 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' && runner.os == 'Linux' | ||
| run: hatch run lint:all | ||
|
|
||
| - name: Generate docs | ||
| if: matrix.python-version == '3.9' && runner.os == 'Linux' | ||
| run: hatch run docs | ||
|
|
||
| - name: Run tests | ||
| id: tests | ||
| run: hatch run cov | ||
|
|
||
| - name: Nightly - run unit tests with Haystack main branch | ||
| if: github.event_name == 'schedule' | ||
| id: nightly-haystack-main | ||
| run: | | ||
| hatch run pip install git+https://github.com/deepset-ai/haystack.git | ||
| hatch run test -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 failure: | ||
| ${{ (steps.tests.conclusion == 'nightly-haystack-main') && 'nightly-haystack-main' || 'tests' }} | ||
| - ${{ github.workflow }} | ||
| api-key: ${{ secrets.CORE_DATADOG_API_KEY }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,7 @@ | ||
| # SPDX-FileCopyrightText: 2023-present John Doe <[email protected]> | ||
| # | ||
| # SPDX-License-Identifier: Apache-2.0 | ||
| import operator | ||
| import uuid | ||
| from typing import List | ||
| from unittest import mock | ||
|
|
@@ -56,6 +57,9 @@ def assert_documents_are_equal(self, received: List[Document], expected: List[Do | |
| This can happen for example when the Document Store sets a score to returned Documents. | ||
| Since we can't know what the score will be, we can't compare the Documents reliably. | ||
| """ | ||
| received.sort(key=operator.attrgetter("id")) | ||
| expected.sort(key=operator.attrgetter("id")) | ||
|
|
||
| for doc_received, doc_expected in zip(received, expected): | ||
| assert doc_received.content == doc_expected.content | ||
| assert doc_received.meta == doc_expected.meta | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -24,7 +24,7 @@ classifiers = [ | |
| ] | ||
| dependencies = [ | ||
| "haystack-ai", | ||
| "cohere<5", | ||
| "cohere==5.*", | ||
| ] | ||
|
|
||
| [project.urls] | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.