Skip to content

Pinecone upsert optimization #10

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

Open
wants to merge 23 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
adb13cd
Optimize documents upsert using asynchronous requests
ivanazeljkovic Nov 8, 2023
24031b3
Remove print statement
ivanazeljkovic Nov 8, 2023
5918ded
Fix mypy and pylint issues
ivanazeljkovic Nov 9, 2023
f8507cb
chore: remove `preview` code from the 1.x release line (#6447)
masci Nov 29, 2023
41e9c29
fix: load_from_deepset_cloud without name in yaml (#6478)
tstadel Dec 4, 2023
f90694c
fix: Pinecone define pod, pod_type (#6357)
x110 Dec 4, 2023
73c3302
Change use_auth_token to token in TransformersDocumentClassifier (#6493)
mateoPecina Dec 6, 2023
6e20adf
Change type of PromptModel invocation_layer_class init param (#6497)
silvanocerza Dec 6, 2023
850cf34
fix: mypy `"str" not callable` for `PromptModelInvocationLayer` (#6529)
julian-risch Dec 12, 2023
5304193
fix: `HFInvocationLayer` - convert `use_auth_token` to `token` (#6533)
anakin87 Dec 12, 2023
295af24
chore: remove `OpenAIAnswerGenerator` (#6531)
ZanSara Dec 13, 2023
6501e3f
feat: Add MongoDB Atlas document store (#6471)
NoahStapp Dec 14, 2023
5693dd0
fix: make `minor_version_release.yml` to run on the v1.x branch (#6547)
ZanSara Dec 14, 2023
9afa66a
Update unstable version to 1.24.0-rc0
github-actions[bot] Dec 14, 2023
46f95a0
update version
ZanSara Dec 14, 2023
8fe8e48
fix release notes
ZanSara Dec 14, 2023
03a05e2
update version
ZanSara Dec 14, 2023
c812250
feat: Add AWS bedrock embeddings to embedding encoder (#6406)
jlonge4 Dec 17, 2023
8a9df97
bug: fix Agent Final Response Discarding text after newline (#6574)
Tsadoq Dec 18, 2023
28c0c01
feat: Weights and score normalization for `JoinDocuments` node with r…
robpasternak Dec 21, 2023
5ff81c2
feat: Add model kwargs to SentenceTransformersRanker (#6627)
sjrl Dec 22, 2023
011c582
Merge branch 'v1.23.x' into feature/pinecone-upsert-optimization
ivanazeljkovic Dec 25, 2023
241fa7e
Fixed conflict
ivanazeljkovic Dec 25, 2023
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: 0 additions & 5 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@
proposal:
- proposals/text/*

# 2.x
2.x:
- haystack/preview/**/*
- test/preview/**/*

# Topics
topic:tests:
- test/**/*
Expand Down
8 changes: 0 additions & 8 deletions .github/utils/pydoc-markdown.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,3 @@ for file in ../config/* ; do
echo "Converting $file..."
pydoc-markdown "$file"
done
# render preview markdown docs
cd ..
rm -rf temp-preview && mkdir temp-preview
cd temp-preview
for file in ../config-preview/* ; do
echo "Converting $file..."
pydoc-markdown "$file"
done
2 changes: 0 additions & 2 deletions .github/workflows/ci_metrics.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@ on:
workflow_run:
workflows:
- "end-to-end"
- "end-to-end (Preview)"
- "Linting"
- "Tests"
- "Tests (Preview)"
- "REST API Tests"
types:
- completed
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ on:
- ready_for_review
paths:
- "e2e/**/*.py"
- "!e2e/preview/**/*.py" # See e2e_preview.yml
- ".github/workflows/e2e.yml"

env:
Expand All @@ -31,7 +30,6 @@ jobs:
folder:
- "document_search"
- "pipelines"
- "preview"

runs-on: ubuntu-latest

Expand Down Expand Up @@ -59,7 +57,7 @@ jobs:
run: docker run -d -p 8080:8080 --name haystack_test_weaviate --env AUTHENTICATION_ANONYMOUS_ACCESS_ENABLED='true' --env PERSISTENCE_DATA_PATH='/var/lib/weaviate' --env ENABLE_EXPERIMENTAL_BM25='true' --env DISK_USE_READONLY_PERCENTAGE='95' semitechnologies/weaviate:1.17.2

- name: Install Haystack
run: pip install -e .[inference,elasticsearch7,faiss,weaviate,opensearch,dev,pdf,preview] langdetect
run: pip install -e .[inference,elasticsearch7,faiss,weaviate,opensearch,dev,pdf] langdetect

# FIXME caching prevents PRs from running the e2e tests properly

Expand Down
42 changes: 0 additions & 42 deletions .github/workflows/e2e_preview.yml

This file was deleted.

3 changes: 1 addition & 2 deletions .github/workflows/examples_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ on:
pull_request:
paths:
- "examples/**"
- "!examples/preview/**"
types:
- opened
- reopened
Expand Down Expand Up @@ -48,7 +47,7 @@ jobs:
pip install .[inference,dev,elasticsearch,preprocessing,file-conversion]

- name: Run
run: pytest examples/ --ignore examples/preview/
run: pytest examples/

- name: Calculate alert data
id: calculator
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ on:
paths:
- "**.py"
- "**/pyproject.toml"
- "!haystack/preview/**/*.py"
- "!test/preview/**/*.py"
- "!e2e/preview/**/*.py"

env:
PYTHON_VERSION: "3.8"
Expand Down Expand Up @@ -74,7 +71,7 @@ jobs:

- name: Install Haystack
run: |
pip install ".[all,dev]"
pip install ".[all,dev]" pydoc-markdown
pip install ./haystack-linter

- name: Pylint
Expand Down
78 changes: 0 additions & 78 deletions .github/workflows/linting_preview.yml

This file was deleted.

3 changes: 0 additions & 3 deletions .github/workflows/linting_skipper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ on:
paths-ignore:
- "**.py"
- "**/pyproject.toml"
- "!haystack/preview/**/*.py"
- "!test/preview/**/*.py"
- "!e2e/preview/**/*.py"

jobs:
mypy:
Expand Down
12 changes: 7 additions & 5 deletions .github/workflows/minor_version_release.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Minor Version Release
name: Minor Version Release (1.x)

on:
workflow_dispatch:
Expand All @@ -12,6 +12,8 @@ jobs:
steps:
- name: Checkout this repo
uses: actions/checkout@v4
with:
ref: "v1.x"

- name: Define all versions
id: versions
Expand All @@ -30,20 +32,20 @@ jobs:
git checkout -b v${{ steps.versions.outputs.current_release_minor }}.x
git push -u origin v${{ steps.versions.outputs.current_release_minor }}.x --tags

- name: Bump version on main
- name: Bump version on v1.x
shell: bash
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
git checkout main
git checkout v1.x
NEW_VERSION=$(awk -F. '/[0-9]+\./{$2++;print}' OFS=. < VERSION.txt)
echo "$NEW_VERSION" > VERSION.txt
cat VERSION.txt
git add .
git commit -m "Update unstable version to $NEW_VERSION"
VERSION_TAG="v$NEW_VERSION"
git tag $VERSION_TAG -m"$VERSION_TAG"
git push --atomic origin main $VERSION_TAG
git push --atomic origin v1.x $VERSION_TAG

- uses: actions/setup-python@v4
with:
Expand All @@ -56,5 +58,5 @@ jobs:
env:
RDME_API_KEY: ${{ secrets.README_API_KEY }}
run: |
git checkout main
git checkout v1.x
python ./.github/utils/release_docs.py --new-version ${{ steps.versions.outputs.current_release_minor }}
55 changes: 0 additions & 55 deletions .github/workflows/preview_imports.yml

This file was deleted.

23 changes: 0 additions & 23 deletions .github/workflows/pypi_release_preview.yml

This file was deleted.

10 changes: 0 additions & 10 deletions .github/workflows/readme_sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,16 +53,6 @@ jobs:
with:
rdme: docs ./docs/pydoc/temp --key="$README_API_KEY" --version=${{ steps.current-version.outputs.minor }}-unstable

- name: Sync preview docs with 2.0
# Sync the preview docs to the `2.0` version on Readme
id: sync-main-preview
if: github.ref_name == 'main' && github.event_name == 'push'
uses: readmeio/[email protected]
env:
README_API_KEY: ${{ secrets.README_API_KEY }}
with:
rdme: docs ./docs/pydoc/temp-preview --key="$README_API_KEY" --version=2.0

- name: Sync docs with current release
# Mutually exclusive with the previous one, this step is supposed to only run on version branches.
# Sync the current Haystack version `X.Y.Z` with its corresponding Readme version `X.Y`.
Expand Down
Loading