Skip to content

Commit 7907674

Browse files
abrookinsabrookins
committed
Merge branch 'main' into fix/RAAE-595-async-client-tweaks
2 parents 6259604 + f41581a commit 7907674

38 files changed

+2419
-2406
lines changed

‎.github/workflows/lint.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ jobs:
2828
- "3.10"
2929
- "3.11"
3030
- "3.12"
31+
- "3.13"
3132

3233
steps:
3334
- uses: actions/checkout@v2

‎.github/workflows/test.yml‎

Lines changed: 99 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ on:
1313
workflow_dispatch:
1414

1515
env:
16+
PYTHON_VERSION: "3.11"
1617
POETRY_VERSION: "1.8.3"
1718

1819
jobs:
@@ -23,7 +24,7 @@ jobs:
2324
strategy:
2425
fail-fast: false
2526
matrix:
26-
python-version: [3.9, '3.10', 3.11, 3.12]
27+
python-version: [3.9, '3.10', 3.11, 3.12, 3.13]
2728
connection: ['hiredis', 'plain']
2829
redis-stack-version: ['6.2.6-v9', 'latest', 'edge']
2930

@@ -34,73 +35,100 @@ jobs:
3435
- 6379:6379
3536

3637
steps:
37-
- uses: actions/checkout@v2
38-
- name: Set up Python ${{ matrix.python-version }}
39-
uses: actions/setup-python@v4
40-
with:
41-
python-version: ${{ matrix.python-version }}
42-
cache: 'pip'
43-
44-
- name: Install Poetry
45-
uses: snok/install-poetry@v1
46-
with:
47-
version: ${{ env.POETRY_VERSION }}
48-
49-
- name: Install dependencies
50-
run: |
51-
poetry install --all-extras
52-
53-
- name: Install hiredis if needed
54-
if: matrix.connection == 'hiredis'
55-
run: |
56-
poetry add hiredis
57-
58-
- name: Set Redis version
59-
run: |
60-
echo "REDIS_VERSION=${{ matrix.redis-stack-version }}" >> $GITHUB_ENV
61-
62-
- name: Authenticate to Google Cloud
63-
uses: google-github-actions/auth@v1
64-
with:
65-
credentials_json: ${{ secrets.GOOGLE_CREDENTIALS }}
66-
67-
- name: Run tests
68-
if: matrix.connection == 'plain' && matrix.redis-stack-version == 'latest'
69-
env:
70-
OPENAI_API_KEY: ${{ secrets.OPENAI_KEY }}
71-
GCP_LOCATION: ${{ secrets.GCP_LOCATION }}
72-
GCP_PROJECT_ID: ${{ secrets.GCP_PROJECT_ID }}
73-
COHERE_API_KEY: ${{ secrets.COHERE_API_KEY }}
74-
MISTRAL_API_KEY: ${{ secrets.MISTRAL_API_KEY }}
75-
VOYAGE_API_KEY: ${{ secrets.VOYAGE_API_KEY }}
76-
AZURE_OPENAI_API_KEY: ${{secrets.AZURE_OPENAI_API_KEY}}
77-
AZURE_OPENAI_ENDPOINT: ${{secrets.AZURE_OPENAI_ENDPOINT}}
78-
AZURE_OPENAI_DEPLOYMENT_NAME: ${{secrets.AZURE_OPENAI_DEPLOYMENT_NAME}}
79-
OPENAI_API_VERSION: ${{secrets.OPENAI_API_VERSION}}
80-
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
81-
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
82-
run: |
83-
poetry run test-verbose
84-
85-
- name: Run tests
86-
if: matrix.connection != 'plain' || matrix.redis-stack-version != 'latest'
87-
run: |
88-
SKIP_VECTORIZERS=True SKIP_RERANKERS=True poetry run test-verbose
89-
90-
- name: Run notebooks
91-
if: matrix.connection == 'plain' && matrix.redis-stack-version == 'latest'
92-
env:
93-
OPENAI_API_KEY: ${{ secrets.OPENAI_KEY }}
94-
GCP_LOCATION: ${{ secrets.GCP_LOCATION }}
95-
GCP_PROJECT_ID: ${{ secrets.GCP_PROJECT_ID }}
96-
COHERE_API_KEY: ${{ secrets.COHERE_API_KEY }}
97-
MISTRAL_API_KEY: ${{ secrets.MISTRAL_API_KEY }}
98-
VOYAGE_API_KEY: ${{ secrets.VOYAGE_API_KEY }}
99-
AZURE_OPENAI_API_KEY: ${{secrets.AZURE_OPENAI_API_KEY}}
100-
AZURE_OPENAI_ENDPOINT: ${{secrets.AZURE_OPENAI_ENDPOINT}}
101-
AZURE_OPENAI_DEPLOYMENT_NAME: ${{secrets.AZURE_OPENAI_DEPLOYMENT_NAME}}
102-
OPENAI_API_VERSION: ${{secrets.OPENAI_API_VERSION}}
103-
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
104-
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
105-
run: |
106-
cd docs/ && poetry run treon -v
38+
- name: Check out repository
39+
uses: actions/checkout@v3
40+
41+
- name: Set up Python ${{ matrix.python-version }}
42+
uses: actions/setup-python@v4
43+
with:
44+
python-version: ${{ matrix.python-version }}
45+
cache: 'pip'
46+
47+
- name: Install Poetry
48+
uses: snok/install-poetry@v1
49+
with:
50+
version: ${{ env.POETRY_VERSION }}
51+
52+
- name: Install dependencies
53+
run: |
54+
poetry install --all-extras
55+
56+
- name: Install hiredis if needed
57+
if: matrix.connection == 'hiredis'
58+
run: |
59+
poetry add hiredis
60+
61+
- name: Set Redis version
62+
run: |
63+
echo "REDIS_VERSION=${{ matrix.redis-stack-version }}" >> $GITHUB_ENV
64+
65+
- name: Authenticate to Google Cloud
66+
uses: google-github-actions/auth@v1
67+
with:
68+
credentials_json: ${{ secrets.GOOGLE_CREDENTIALS }}
69+
70+
- name: Run tests
71+
if: matrix.connection == 'plain' && matrix.redis-stack-version == 'latest'
72+
env:
73+
OPENAI_API_KEY: ${{ secrets.OPENAI_KEY }}
74+
GCP_LOCATION: ${{ secrets.GCP_LOCATION }}
75+
GCP_PROJECT_ID: ${{ secrets.GCP_PROJECT_ID }}
76+
COHERE_API_KEY: ${{ secrets.COHERE_API_KEY }}
77+
MISTRAL_API_KEY: ${{ secrets.MISTRAL_API_KEY }}
78+
VOYAGE_API_KEY: ${{ secrets.VOYAGE_API_KEY }}
79+
AZURE_OPENAI_API_KEY: ${{secrets.AZURE_OPENAI_API_KEY}}
80+
AZURE_OPENAI_ENDPOINT: ${{secrets.AZURE_OPENAI_ENDPOINT}}
81+
AZURE_OPENAI_DEPLOYMENT_NAME: ${{secrets.AZURE_OPENAI_DEPLOYMENT_NAME}}
82+
OPENAI_API_VERSION: ${{secrets.OPENAI_API_VERSION}}
83+
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
84+
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
85+
run: |
86+
make test-all
87+
88+
- name: Run tests
89+
if: matrix.connection != 'plain' || matrix.redis-stack-version != 'latest'
90+
run: |
91+
make test
92+
93+
- name: Run notebooks
94+
if: matrix.connection == 'plain' && matrix.redis-stack-version == 'latest'
95+
env:
96+
OPENAI_API_KEY: ${{ secrets.OPENAI_KEY }}
97+
GCP_LOCATION: ${{ secrets.GCP_LOCATION }}
98+
GCP_PROJECT_ID: ${{ secrets.GCP_PROJECT_ID }}
99+
COHERE_API_KEY: ${{ secrets.COHERE_API_KEY }}
100+
MISTRAL_API_KEY: ${{ secrets.MISTRAL_API_KEY }}
101+
VOYAGE_API_KEY: ${{ secrets.VOYAGE_API_KEY }}
102+
AZURE_OPENAI_API_KEY: ${{secrets.AZURE_OPENAI_API_KEY}}
103+
AZURE_OPENAI_ENDPOINT: ${{secrets.AZURE_OPENAI_ENDPOINT}}
104+
AZURE_OPENAI_DEPLOYMENT_NAME: ${{secrets.AZURE_OPENAI_DEPLOYMENT_NAME}}
105+
OPENAI_API_VERSION: ${{secrets.OPENAI_API_VERSION}}
106+
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
107+
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
108+
run: |
109+
make test-notebooks
110+
111+
docs:
112+
runs-on: ubuntu-latest
113+
steps:
114+
- name: Check out repository
115+
uses: actions/checkout@v3
116+
117+
- name: Set up Python
118+
uses: actions/setup-python@v4
119+
with:
120+
python-version: ${{ env.PYTHON_VERSION }}
121+
cache: 'pip'
122+
123+
- name: Install Poetry
124+
uses: snok/install-poetry@v1
125+
with:
126+
version: ${{ env.POETRY_VERSION }}
127+
128+
- name: Install dependencies
129+
run: |
130+
poetry install --all-extras
131+
132+
- name: Build docs
133+
run: |
134+
make docs-build

0 commit comments

Comments
 (0)