Skip to content

Commit fbf5a64

Browse files
jamescalamjamescalam
authored
Merge pull request #493 from aurelio-labs/james/full-hybrid-support
feat: hybrid router and async pinecone upgrades
2 parents 69b4932 + 6aead63 commit fbf5a64

23 files changed

+3140
-2957
lines changed

‎.github/workflows/docs.yml

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Release Docs
22

33
on:
44
release:
5-
types: [released]
5+
types: [ released ]
66

77
jobs:
88
build-docs:
@@ -14,44 +14,44 @@ jobs:
1414
strategy:
1515
matrix:
1616
python-version:
17-
- "3.13"
17+
- "3.13"
1818
env:
19-
POETRY_VERSION: "1.8.4"
19+
POETRY_VERSION: "2.0.1"
2020
steps:
21-
- uses: actions/checkout@v4
22-
- name: Cache Poetry
23-
uses: actions/cache@v4
24-
with:
25-
path: ~/.poetry
26-
key: ${{ runner.os }}-poetry-${{ hashFiles('**/poetry.lock') }}
27-
restore-keys: |
28-
${{ runner.os }}-poetry-
29-
- name: Install poetry
30-
run: |
31-
pipx install poetry==$POETRY_VERSION
32-
- name: Set up Python ${{ matrix.python-version }}
33-
uses: actions/setup-python@v4
34-
with:
35-
python-version: ${{ matrix.python-version }}
36-
cache: poetry
37-
- name: Install dependencies
38-
run: |
39-
poetry install --all-extras
40-
- name: Build docs
41-
run: |
42-
poetry run sphinx-build -M html docs/source docs/build
43-
- name: Authenticate to Google Cloud
44-
id: auth
45-
uses: google-github-actions/auth@v2
46-
with:
47-
credentials_json: ${{ secrets.GOOGLE_CREDENTIALS }}
48-
- name: Upload Docs
49-
run: |
50-
gcloud storage rsync docs/build/html gs://docs-bucket-production/semantic-router --recursive --delete-unmatched-destination-objects
51-
# - name: Upload Docs
52-
# id: upload-directory
53-
# uses: google-github-actions/upload-cloud-storage@v2
54-
# with:
55-
# path: docs/build/html
56-
# destination: docs-bucket-production/semantic-router
57-
# parent: false
21+
- uses: actions/checkout@v4
22+
- name: Cache Poetry
23+
uses: actions/cache@v4
24+
with:
25+
path: ~/.poetry
26+
key: ${{ runner.os }}-poetry-${{ hashFiles('**/poetry.lock') }}
27+
restore-keys: |
28+
${{ runner.os }}-poetry-
29+
- name: Install poetry
30+
run: |
31+
pipx install poetry==$POETRY_VERSION
32+
- name: Set up Python ${{ matrix.python-version }}
33+
uses: actions/setup-python@v4
34+
with:
35+
python-version: ${{ matrix.python-version }}
36+
cache: poetry
37+
- name: Install dependencies
38+
run: |
39+
poetry install --all-extras
40+
- name: Build docs
41+
run: |
42+
poetry run sphinx-build -M html docs/source docs/build
43+
- name: Authenticate to Google Cloud
44+
id: auth
45+
uses: google-github-actions/auth@v2
46+
with:
47+
credentials_json: ${{ secrets.GOOGLE_CREDENTIALS }}
48+
- name: Upload Docs
49+
run: |
50+
gcloud storage rsync docs/build/html gs://docs-bucket-production/semantic-router --recursive --delete-unmatched-destination-objects
51+
# - name: Upload Docs
52+
# id: upload-directory
53+
# uses: google-github-actions/upload-cloud-storage@v2
54+
# with:
55+
# path: docs/build/html
56+
# destination: docs-bucket-production/semantic-router
57+
# parent: false

‎.github/workflows/lint.yml

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,39 +2,40 @@ name: lint
22

33
on:
44
push:
5-
branches: [main]
5+
branches: [ main ]
66
pull_request:
77

8+
89
env:
9-
POETRY_VERSION: "1.8.4"
10+
POETRY_VERSION: "2.0.1"
1011

1112
jobs:
1213
build:
1314
runs-on: ubuntu-latest
1415
strategy:
1516
matrix:
1617
python-version:
17-
- "3.13"
18+
- "3.13"
1819
steps:
19-
- uses: actions/checkout@v3
20-
- name: Cache Poetry
21-
uses: actions/cache@v4
22-
with:
23-
path: ~/.poetry
24-
key: ${{ runner.os }}-poetry-${{ hashFiles('**/poetry.lock') }}
25-
restore-keys: |
26-
${{ runner.os }}-poetry-
27-
- name: Install poetry
28-
run: |
29-
pipx install poetry==$POETRY_VERSION
30-
- name: Set up Python ${{ matrix.python-version }}
31-
uses: actions/setup-python@v4
32-
with:
33-
python-version: ${{ matrix.python-version }}
34-
cache: poetry
35-
- name: Install dependencies
36-
run: |
37-
poetry install
38-
- name: Analyzing the code with our lint
39-
run: |
40-
make lint
20+
- uses: actions/checkout@v3
21+
- name: Cache Poetry
22+
uses: actions/cache@v4
23+
with:
24+
path: ~/.poetry
25+
key: ${{ runner.os }}-poetry-${{ hashFiles('**/poetry.lock') }}
26+
restore-keys: |
27+
${{ runner.os }}-poetry-
28+
- name: Install poetry
29+
run: |
30+
pipx install poetry==$POETRY_VERSION
31+
- name: Set up Python ${{ matrix.python-version }}
32+
uses: actions/setup-python@v4
33+
with:
34+
python-version: ${{ matrix.python-version }}
35+
cache: poetry
36+
- name: Install dependencies
37+
run: |
38+
poetry install
39+
- name: Analyzing the code with our lint
40+
run: |
41+
make lint

‎.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Release
33
on:
44
push:
55
tags:
6-
- '*'
6+
- '*'
77

88
jobs:
99
build:
@@ -33,7 +33,7 @@ jobs:
3333
python-version: '3.13'
3434
- name: Install Poetry
3535
run: |
36-
curl -sSL https://install.python-poetry.org | python - -y --version 1.8.4
36+
curl -sSL https://install.python-poetry.org | python - -y --version 2.0.1
3737
- name: Publish to PyPI
3838
run: |
3939
poetry config repositories.remote https://upload.pypi.org/legacy/

‎.github/workflows/test.yml

Lines changed: 45 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -3,56 +3,57 @@ name: Test
33
on:
44
pull_request:
55

6+
67
env:
7-
POETRY_VERSION: "1.8.4"
8+
POETRY_VERSION: "2.0.1"
89

910
jobs:
1011
build:
1112
runs-on: ubuntu-latest
1213
strategy:
1314
matrix:
1415
python-version:
15-
- "3.10"
16-
- "3.11"
17-
- "3.12"
18-
- "3.13"
16+
- "3.10"
17+
- "3.11"
18+
- "3.12"
19+
- "3.13"
1920
steps:
20-
- uses: actions/checkout@v4
21-
- name: Cache Poetry
22-
uses: actions/cache@v4
23-
with:
24-
path: ~/.poetry
25-
key: ${{ runner.os }}-poetry-${{ hashFiles('**/poetry.lock') }}
26-
restore-keys: |
27-
${{ runner.os }}-poetry-
28-
- name: Install poetry
29-
run: |
30-
pipx install poetry==$POETRY_VERSION
31-
- name: Set up Python ${{ matrix.python-version }}
32-
uses: actions/setup-python@v4
33-
with:
34-
python-version: ${{ matrix.python-version }}
35-
cache: poetry
36-
- name: Install dependencies
37-
run: |
38-
poetry install --all-extras
39-
- name: Install nltk
40-
run: |
41-
pip install nltk
42-
- name: Download nltk data
43-
run: |
44-
python -m nltk.downloader punkt stopwords wordnet punkt_tab
45-
- name: Pytest All
46-
env:
47-
PINECONE_API_KEY: ${{ secrets.PINECONE_API_KEY }}
48-
OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
49-
COHERE_API_KEY: ${{ secrets.COHERE_API_KEY }}
50-
run: |
51-
make test
52-
- name: Upload coverage to Codecov
53-
uses: codecov/codecov-action@v2
54-
env:
55-
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
56-
with:
57-
file: ./coverage.xml
58-
fail_ci_if_error: false
21+
- uses: actions/checkout@v4
22+
- name: Cache Poetry
23+
uses: actions/cache@v4
24+
with:
25+
path: ~/.poetry
26+
key: ${{ runner.os }}-poetry-${{ hashFiles('**/poetry.lock') }}
27+
restore-keys: |
28+
${{ runner.os }}-poetry-
29+
- name: Install poetry
30+
run: |
31+
pipx install poetry==$POETRY_VERSION
32+
- name: Set up Python ${{ matrix.python-version }}
33+
uses: actions/setup-python@v4
34+
with:
35+
python-version: ${{ matrix.python-version }}
36+
cache: poetry
37+
- name: Install dependencies
38+
run: |
39+
poetry install --all-extras
40+
- name: Install nltk
41+
run: |
42+
pip install nltk
43+
- name: Download nltk data
44+
run: |
45+
python -m nltk.downloader punkt stopwords wordnet punkt_tab
46+
- name: Pytest All
47+
env:
48+
PINECONE_API_KEY: ${{ secrets.PINECONE_API_KEY }}
49+
OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
50+
COHERE_API_KEY: ${{ secrets.COHERE_API_KEY }}
51+
run: |
52+
make test
53+
- name: Upload coverage to Codecov
54+
uses: codecov/codecov-action@v2
55+
env:
56+
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
57+
with:
58+
file: ./coverage.xml
59+
fail_ci_if_error: false

0 commit comments

Comments
 (0)