Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding AstraDB as a DocumentStore #144

Merged
merged 80 commits into from
Jan 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
80 commits
Select commit Hold shift + click to select a range
3614505
astra haystack integration
BenAichaRihab Nov 13, 2023
0af8817
add delete
Nov 15, 2023
d907c63
test
Nov 15, 2023
cb8a1ff
update init for AstraClient and AstraDocumentStore
ElenaKusevska Nov 16, 2023
3652e92
Added method fetch_documents_by_id and fetch_document_by_id
jsbilgi Nov 17, 2023
139ac07
Added count_document
jsbilgi Nov 17, 2023
1c96047
Removed _index from init
jsbilgi Nov 18, 2023
4477202
Included batching and minor improvements in test module
jsbilgi Nov 20, 2023
cbc2af9
bug fix:AstraClient.find_index not checking for status code and statu…
ElenaKusevska Nov 18, 2023
19a9e82
add update_document(), insert(), and find_document() to AstraClient, …
ElenaKusevska Nov 21, 2023
85246f1
implement write_documents
ElenaKusevska Nov 22, 2023
7150813
Add precommit hook and git actions
Nov 22, 2023
84e8c6c
Minor changes to documentation and add requirements file
Nov 22, 2023
c0013bf
Refactor json calls to AstraClient
Nov 22, 2023
b58689f
rename folder
Nov 22, 2023
2b28264
Add example script
Nov 22, 2023
aca0242
add convert_filters function
david-polo Nov 22, 2023
cd3eec2
fix write_documents failng with DuplicatePolicy.FAIL when there are n…
ElenaKusevska Nov 22, 2023
f43906c
log additional info for insert and update in AstraDataStore.write_doc…
ElenaKusevska Nov 22, 2023
77ac4e1
fix: fixing document parsing and filter documents bugs
BenAichaRihab Nov 22, 2023
aeff7ac
Add to search and delete to example
Nov 22, 2023
5d2b960
Adding reqs and remove mistaken pop content
anomnaco Nov 22, 2023
6e37f79
adding logger back to astra client
BenAichaRihab Nov 26, 2023
9a8a77d
haystack version matching Document schema
anomnaco Nov 27, 2023
be8eeec
set duplicates policy on datastore init, set default duplicate policy…
ElenaKusevska Nov 27, 2023
e4713b2
Prepare for ci cd
Nov 27, 2023
2ea219a
Add tests to git actions
Nov 27, 2023
3c18eda
Modifying haystack rag pipeline example
anomnaco Nov 27, 2023
1633701
Update return type from queryResponse to Document
anomnaco Nov 27, 2023
7301fba
Update single retriever parent references
anomnaco Nov 27, 2023
7279a40
Add rag example and readme
anomnaco Nov 27, 2023
c85a1ac
Update examples with DuplicatePolicy
anomnaco Nov 27, 2023
78b3e15
Update Readme with DuplicatePolicy
anomnaco Nov 27, 2023
c02f54e
fix cicd pipeline
Nov 28, 2023
7694610
remove describe index stats
ElenaKusevska Nov 29, 2023
e1e6fca
Update requirements.txt and pyproject.toml with haystack versions
ElenaKusevska Nov 29, 2023
474262a
select haystack 1.22.1
ElenaKusevska Nov 29, 2023
cfbc6a4
pop id_hash_keys from metadata in Response object
ElenaKusevska Nov 29, 2023
0795587
fix requirements for pipeline_example
ElenaKusevska Nov 29, 2023
c06b382
fix haystack version typo in pyproject.toml
ElenaKusevska Nov 29, 2023
7e956d6
fix id_hash_key can't be set at haystack Document init
ElenaKusevska Nov 29, 2023
9afde47
comment out currently unused indexing pipeline in examples/example.py
ElenaKusevska Nov 29, 2023
67036ad
refoctor find
Dec 3, 2023
febd779
Add unit tests
Nov 28, 2023
59e2ab0
Skip tests with unsupported filter
Dec 1, 2023
7d7f97c
more fixes
Dec 1, 2023
d47621f
fixing unit test link
BenAichaRihab Dec 3, 2023
97946e3
more fixes
Dec 4, 2023
44b4361
Add model_name to astra_store on initializing in test_document_store.py
ElenaKusevska Dec 4, 2023
35830b3
all tests passing
Dec 4, 2023
389236e
Convert document[id] to document[_id] in write_documents
ElenaKusevska Dec 4, 2023
342c89b
Change id to _id in filter_documents
ElenaKusevska Dec 4, 2023
29be6d3
fix lint isssue for python3.9
david-polo Dec 4, 2023
fb9e3d3
fixing similarity score flag
BenAichaRihab Dec 6, 2023
b926c3f
pipeline example fix
anomnaco Dec 6, 2023
1f14bb2
examples document type fix
anomnaco Dec 7, 2023
2ea583f
Black Linting fixes
anomnaco Dec 7, 2023
c8a48ce
change to pyproject.toml to use haystack 2.0, update test_document_st…
ElenaKusevska Dec 7, 2023
0eabdbf
use new Document dataclass
Dec 8, 2023
7f617de
skip tests
Dec 10, 2023
6d43fbd
update write_documents for haystack 2.0
ElenaKusevska Dec 12, 2023
72f6c2c
remove -m "unit" option in Actions to not deselect tests
ElenaKusevska Dec 12, 2023
d69d3a4
remove model_name from test_document_store.py
ElenaKusevska Dec 12, 2023
3e7ad8e
Fix setting default duplicates policy
ElenaKusevska Dec 12, 2023
d1db400
test if datastore empty before deleting
ElenaKusevska Dec 12, 2023
09a339f
Raise exception if Document _id not string when writing documents
ElenaKusevska Dec 14, 2023
9602777
Implement batch size for delete limited to 20
ElenaKusevska Dec 14, 2023
69040b6
filters mapping
Dec 13, 2023
5545867
add test for default write documents behavior
ElenaKusevska Dec 15, 2023
6f7057a
add to_dict and from_dict
Dec 17, 2023
1644caa
update examples
mounaTay Dec 18, 2023
759f7c6
update retriever for haystack 2.0. Fix integration tests for updated
ElenaKusevska Dec 18, 2023
c3f05e9
fix linting errors
ElenaKusevska Dec 19, 2023
4a91b77
remove preprocessor.py in examples/
ElenaKusevska Dec 19, 2023
d51dbc8
Pipeline examples document fix
anomnaco Dec 19, 2023
b5b89e2
pipeline examples lint fix
anomnaco Dec 19, 2023
e718180
prepare for directory structure in haystack integrations repo
ElenaKusevska Dec 22, 2023
9cb8eac
Add Ci + Add PR fixes
mounaTay Jan 8, 2024
33405cd
Linter fixes
mounaTay Jan 9, 2024
5ca2d52
Update integrations/astra/tests/test_document_store.py
mounaTay Jan 11, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ integration:amazon-bedrock:
- any-glob-to-any-file: "integrations/amazon_bedrock/**/*"
- any-glob-to-any-file: ".github/workflows/amazon_bedrock.yml"

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

integration:chroma:
- changed-files:
- any-glob-to-any-file: "integrations/chroma/**/*"
Expand Down
60 changes: 60 additions & 0 deletions .github/workflows/astra.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
# This workflow comes from https://github.com/ofek/hatch-mypyc
# https://github.com/ofek/hatch-mypyc/blob/5a198c0ba8660494d02716cfc9d79ce4adfb1442/.github/workflows/test.yml
name: Test / astra

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

defaults:
run:
working-directory: integrations/astra

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

env:
PYTHONUNBUFFERED: "1"
FORCE_COLOR: "1"

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: 1
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: Run tests
env:
ASTRA_DB_APPLICATION_TOKEN: ${{ secrets.ASTRA_DB_APPLICATION_TOKEN }}
ASTRA_DB_ID: ${{ secrets.ASTRA_DB_ID }}
run: hatch run cov
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,4 +77,3 @@ deepset-haystack
| [pinecone-haystack](integrations/pinecone/) | Document Store | [![PyPI - Version](https://img.shields.io/pypi/v/pinecone-haystack.svg?color=orange)](https://pypi.org/project/pinecone-haystack) | [![Test / pinecone](https://github.com/deepset-ai/haystack-core-integrations/actions/workflows/pinecone.yml/badge.svg)](https://github.com/deepset-ai/haystack-core-integrations/actions/workflows/pinecone.yml) |
| [qdrant-haystack](integrations/qdrant/) | Document Store | [![PyPI - Version](https://img.shields.io/pypi/v/qdrant-haystack.svg?color=orange)](https://pypi.org/project/qdrant-haystack) | [![Test / qdrant](https://github.com/deepset-ai/haystack-core-integrations/actions/workflows/qdrant.yml/badge.svg)](https://github.com/deepset-ai/haystack-core-integrations/actions/workflows/qdrant.yml) |
| [unstructured-fileconverter-haystack](integrations/unstructured/fileconverter/) | File converter | [![PyPI - Version](https://img.shields.io/pypi/v/unstructured-fileconverter-haystack.svg)](https://pypi.org/project/unstructured-fileconverter-haystack) | [![Test / unstructured / fileconverter](https://github.com/deepset-ai/haystack-core-integrations/actions/workflows/unstructured_fileconverter.yml/badge.svg)](https://github.com/deepset-ai/haystack-core-integrations/actions/workflows/unstructured_fileconverter.yml) |
| [weaviate-haystack](integrations/weaviate/) | Document Store | [![PyPI - Version](https://img.shields.io/pypi/v/weaviate-haystack.svg?color=orange)](https://pypi.org/project/weaviate-haystack) | [![Test / weaviate](https://github.com/deepset-ai/haystack-core-integrations/actions/workflows/weaviate.yml/badge.svg)](https://github.com/deepset-ai/haystack-core-integrations/actions/workflows/weaviate.yml) |
201 changes: 201 additions & 0 deletions integrations/astra/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,201 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.

"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.

2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.

3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.

4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:

(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and

(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and

(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and

(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.

You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.

5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.

6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.

8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright 2023-present deepset GmbH

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
94 changes: 94 additions & 0 deletions integrations/astra/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
[![test](https://github.com/deepset-ai/document-store/actions/workflows/test.yml/badge.svg)](https://github.com/deepset-ai/document-store/actions/workflows/test.yml)

# Astra Store

## Installation
install astra-haystack package locally to run integration tests:

Open in gitpod:
[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/Anant/astra-haystack/tree/main)

Switch Python version to 3.9 (Requires 3.8+ but not 3.12)
```
pyenv install 3.9
pyenv local 3.9
```

Local install for the package
`pip install -e .`
To execute integration tests, add needed environment variables
`ASTRA_DB_ID=<id>`
`ASTRA_DB_APPLICATION_TOKEN=<token>`
and execute
`python examples/example.py`

Install requirements
`pip install -r requirements.txt`

Export environment variables
```
export KEYSPACE_NAME=
export COLLECTION_NAME=
export OPENAI_API_KEY=
export ASTRA_DB_ID=
export ASTRA_DB_REGION=
export ASTRA_DB_APPLICATION_TOKEN=
```

run the python examples
`python example/example.py`
or
`python example/pipeline_example.py`

## Usage

This package includes Astra Document Store and Astra Retriever classes that integrate with Haystack, allowing you to easily perform document retrieval or RAG with Astra, and include those functions in Haystack pipelines.

### In order to use the Document Store directly:

Import the Document Store:
```
from astra_store.document_store import AstraDocumentStore
from haystack.preview.document_stores import DuplicatePolicy
```

Load in environment variables:
```
astra_id = os.getenv("ASTRA_DB_ID", "")
astra_region = os.getenv("ASTRA_DB_REGION", "us-east1")

astra_application_token = os.getenv("ASTRA_DB_APPLICATION_TOKEN", "")
collection_name = os.getenv("COLLECTION_NAME", "haystack_vector_search")
keyspace_name = os.getenv("KEYSPACE_NAME", "recommender_demo")
```

Create the Document Store object:
```
document_store = AstraDocumentStore(
astra_id=astra_id,
astra_region=astra_region,
astra_collection=collection_name,
astra_keyspace=keyspace_name,
astra_application_token=astra_application_token,
duplicates_policy=DuplicatePolicy.SKIP,
embedding_dim=384,
)
```

Then you can use the document store functions like count_document below:
`document_store.count_documents()`

### Using the Astra Retriever with Haystack Pipelines

Create the Document Store object like above, then import and create the Pipeline:

```
from haystack.preview import Pipeline
pipeline = Pipeline()
```

Add your AstraRetriever into the pipeline
`pipeline.add_component(instance=AstraSingleRetriever(document_store=document_store), name="retriever")`

Add other components and connect them as desired. Then run your pipeline:
`pipeline.run(...)`
Empty file.
Loading