-
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 'feature/ollama_integration' of https://github.com/Alist…
…airLR112/haystack-core-integrations into feature/ollama_integration main branch ahead of this local feature branch
- Loading branch information
Showing
13 changed files
with
750 additions
and
2 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,51 @@ | ||
| # This workflow comes from https://github.com/ofek/hatch-mypyc | ||
| # https://github.com/ofek/hatch-mypyc/blob/5a198c0ba8660494d02716cfc9d79ce4adfb1442/.github/workflows/test.yml | ||
| name: Test / pinecone | ||
|
|
||
| on: | ||
| schedule: | ||
| - cron: "0 0 * * *" | ||
| pull_request: | ||
| paths: | ||
| - "integrations/pinecone/**" | ||
| - ".github/workflows/pinecone.yml" | ||
|
|
||
| concurrency: | ||
| group: pinecone-${{ github.head_ref }} | ||
| cancel-in-progress: true | ||
|
|
||
| env: | ||
| PYTHONUNBUFFERED: "1" | ||
| FORCE_COLOR: "1" | ||
| PINECONE_API_KEY: ${{ secrets.PINECONE_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: | ||
| # Pinecone tests are time expensive, so the matrix is limited to Python 3.9 and 3.10 | ||
| os: [ubuntu-latest] | ||
| python-version: ["3.9", "3.10"] | ||
|
|
||
| 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 | ||
| working-directory: integrations/pinecone | ||
| if: matrix.python-version == '3.9' | ||
| run: hatch run lint:all | ||
|
|
||
| - name: Run tests | ||
| working-directory: integrations/pinecone | ||
| run: hatch run cov |
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 |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| [](https://github.com/deepset-ai/haystack-core-integrations/actions/workflows/pinecone.yml) | ||
|
|
||
| [](https://pypi.org/project/pinecone-haystack) | ||
| [](https://pypi.org/project/pinecone-haystack) | ||
|
|
||
| # Pinecone Document Store | ||
|
|
||
| Document Store for Haystack 2.x, supports Pinecone. | ||
|
|
||
| ## Installation | ||
|
|
||
| ```console | ||
| pip install pinecone-haystack | ||
| ``` | ||
|
|
||
| ## Testing | ||
|
|
||
| ```console | ||
| hatch run test | ||
| ``` | ||
|
|
||
| ## License | ||
|
|
||
| `pinecone-haystack` is distributed under the terms of the [Apache-2.0](https://spdx.org/licenses/Apache-2.0.html) license. |
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,186 @@ | ||
| [build-system] | ||
| requires = ["hatchling", "hatch-vcs"] | ||
| build-backend = "hatchling.build" | ||
|
|
||
| [project] | ||
| name = "pinecone_haystack" | ||
| dynamic = ["version"] | ||
| description = '' | ||
| readme = "README.md" | ||
| requires-python = ">=3.8" | ||
| license = "Apache-2.0" | ||
| keywords = [] | ||
| authors = [ | ||
| { name = "deepset GmbH", email = "[email protected]" }, | ||
| ] | ||
| classifiers = [ | ||
| "Development Status :: 4 - Beta", | ||
| "Programming Language :: Python", | ||
| "Programming Language :: Python :: 3.8", | ||
| "Programming Language :: Python :: 3.9", | ||
| "Programming Language :: Python :: 3.10", | ||
| "Programming Language :: Python :: 3.11", | ||
| "Programming Language :: Python :: Implementation :: CPython", | ||
| "Programming Language :: Python :: Implementation :: PyPy", | ||
| ] | ||
| dependencies = [ | ||
| "haystack-ai", | ||
| "pinecone-client", | ||
| ] | ||
|
|
||
| [project.urls] | ||
| Documentation = "https://github.com/deepset-ai/haystack-core-integrations/tree/main/integrations/pinecone#readme" | ||
| Issues = "https://github.com/deepset-ai/haystack-core-integrations/issues" | ||
| Source = "https://github.com/deepset-ai/haystack-core-integrations/tree/main/integrations/pinecone" | ||
|
|
||
| [tool.hatch.version] | ||
| source = "vcs" | ||
| tag-pattern = 'integrations\/pinecone-v(?P<version>.*)' | ||
|
|
||
| [tool.hatch.version.raw-options] | ||
| root = "../.." | ||
| git_describe_command = 'git describe --tags --match="integrations/pinecone-v[0-9]*"' | ||
|
|
||
| [tool.hatch.envs.default] | ||
| dependencies = [ | ||
| "coverage[toml]>=6.5", | ||
| "pytest", | ||
| "pytest-xdist", | ||
| ] | ||
| [tool.hatch.envs.default.scripts] | ||
| # Pinecone tests are slow (require HTTP requests), so we run them in parallel | ||
| # with pytest-xdist (https://pytest-xdist.readthedocs.io/en/stable/distribution.html) | ||
| test = "pytest -n auto --maxprocesses=3 {args:tests}" | ||
| test-cov = "coverage run -m pytest -n auto --maxprocesses=3 {args:tests}" | ||
| cov-report = [ | ||
| "- coverage combine", | ||
| "coverage report", | ||
| ] | ||
| cov = [ | ||
| "test-cov", | ||
| "cov-report", | ||
| ] | ||
|
|
||
| [[tool.hatch.envs.all.matrix]] | ||
| python = ["3.8", "3.9", "3.10", "3.11"] | ||
|
|
||
| [tool.hatch.envs.lint] | ||
| detached = true | ||
| dependencies = [ | ||
| "black>=23.1.0", | ||
| "mypy>=1.0.0", | ||
| "ruff>=0.0.243", | ||
| "numpy", | ||
| ] | ||
| [tool.hatch.envs.lint.scripts] | ||
| typing = "mypy --install-types --non-interactive {args:src/pinecone_haystack tests}" | ||
| style = [ | ||
| "ruff {args:.}", | ||
| "black --check --diff {args:.}", | ||
| ] | ||
| fmt = [ | ||
| "black {args:.}", | ||
| "ruff --fix {args:.}", | ||
| "style", | ||
| ] | ||
| all = [ | ||
| "style", | ||
| "typing", | ||
| ] | ||
|
|
||
| [tool.hatch.metadata] | ||
| allow-direct-references = true | ||
|
|
||
| [tool.black] | ||
| target-version = ["py37"] | ||
| line-length = 120 | ||
| skip-string-normalization = true | ||
|
|
||
| [tool.ruff] | ||
| target-version = "py37" | ||
| line-length = 120 | ||
| select = [ | ||
| "A", | ||
| "ARG", | ||
| "B", | ||
| "C", | ||
| "DTZ", | ||
| "E", | ||
| "EM", | ||
| "F", | ||
| "FBT", | ||
| "I", | ||
| "ICN", | ||
| "ISC", | ||
| "N", | ||
| "PLC", | ||
| "PLE", | ||
| "PLR", | ||
| "PLW", | ||
| "Q", | ||
| "RUF", | ||
| "S", | ||
| "T", | ||
| "TID", | ||
| "UP", | ||
| "W", | ||
| "YTT", | ||
| ] | ||
| ignore = [ | ||
| # Allow non-abstract empty methods in abstract base classes | ||
| "B027", | ||
| # Allow boolean positional values in function calls, like `dict.get(... True)` | ||
| "FBT003", | ||
| # Ignore checks for possible passwords | ||
| "S105", "S106", "S107", | ||
| # Ignore complexity | ||
| "C901", "PLR0911", "PLR0912", "PLR0913", "PLR0915", | ||
| ] | ||
| unfixable = [ | ||
| # Don't touch unused imports | ||
| "F401", | ||
| ] | ||
|
|
||
| [tool.ruff.isort] | ||
| known-first-party = ["pinecone_haystack"] | ||
|
|
||
| [tool.ruff.flake8-tidy-imports] | ||
| ban-relative-imports = "all" | ||
|
|
||
| [tool.ruff.per-file-ignores] | ||
| # Tests can use magic values, assertions, and relative imports | ||
| "tests/**/*" = ["PLR2004", "S101", "TID252"] | ||
|
|
||
| [tool.coverage.run] | ||
| source_pkgs = ["pinecone_haystack", "tests"] | ||
| branch = true | ||
| parallel = true | ||
| omit = [ | ||
| "example" | ||
| ] | ||
|
|
||
| [tool.coverage.paths] | ||
| pinecone_haystack = ["src/pinecone_haystack", "*/pinecone_haystack/src/pinecone_haystack"] | ||
| tests = ["tests", "*/pinecone_haystack/tests"] | ||
|
|
||
| [tool.coverage.report] | ||
| exclude_lines = [ | ||
| "no cov", | ||
| "if __name__ == .__main__.:", | ||
| "if TYPE_CHECKING:", | ||
| ] | ||
|
|
||
| [tool.pytest.ini_options] | ||
| minversion = "6.0" | ||
| markers = [ | ||
| "unit: unit tests", | ||
| "integration: integration tests" | ||
| ] | ||
|
|
||
| [[tool.mypy.overrides]] | ||
| module = [ | ||
| "pinecone.*", | ||
| "haystack.*", | ||
| "pytest.*" | ||
| ] | ||
| ignore_missing_imports = true |
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,6 @@ | ||
| # SPDX-FileCopyrightText: 2023-present deepset GmbH <[email protected]> | ||
| # | ||
| # SPDX-License-Identifier: Apache-2.0 | ||
| from pinecone_haystack.document_store import PineconeDocumentStore | ||
|
|
||
| __all__ = ["PineconeDocumentStore"] |
Oops, something went wrong.