Skip to content

Commit a7d0404

Browse files
antonpirkerantonpirker
authored
Merge branch 'master' into bukzor/can-wait4-session-flusher
2 parents 8d24e88 + 18d3899 commit a7d0404

File tree

118 files changed

+7312
-2133
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+7312
-2133
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ jobs:
2424
timeout-minutes: 10
2525

2626
steps:
27-
- uses: actions/checkout@v4.2.2
28-
- uses: actions/setup-python@v5
27+
- uses: actions/checkout@v5.0.0
28+
- uses: actions/setup-python@v6
2929
with:
3030
python-version: 3.12
3131

@@ -39,8 +39,8 @@ jobs:
3939
timeout-minutes: 10
4040

4141
steps:
42-
- uses: actions/checkout@v4.2.2
43-
- uses: actions/setup-python@v5
42+
- uses: actions/checkout@v5.0.0
43+
- uses: actions/setup-python@v6
4444
with:
4545
python-version: 3.12
4646

@@ -58,8 +58,8 @@ jobs:
5858
timeout-minutes: 10
5959

6060
steps:
61-
- uses: actions/checkout@v4.2.2
62-
- uses: actions/setup-python@v5
61+
- uses: actions/checkout@v5.0.0
62+
- uses: actions/setup-python@v6
6363
with:
6464
python-version: 3.12
6565
- name: Setup build cache
@@ -89,8 +89,8 @@ jobs:
8989
timeout-minutes: 10
9090

9191
steps:
92-
- uses: actions/checkout@v4.2.2
93-
- uses: actions/setup-python@v5
92+
- uses: actions/checkout@v5.0.0
93+
- uses: actions/setup-python@v6
9494
with:
9595
python-version: 3.12
9696

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848

4949
steps:
5050
- name: Checkout repository
51-
uses: actions/checkout@v4.2.2
51+
uses: actions/checkout@v5.0.0
5252

5353
# Initializes the CodeQL tools for scanning.
5454
- name: Initialize CodeQL

‎.github/workflows/release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ jobs:
2020
steps:
2121
- name: Get auth token
2222
id: token
23-
uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
23+
uses: actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b # v2.1.1
2424
with:
2525
app-id: ${{ vars.SENTRY_RELEASE_BOT_CLIENT_ID }}
2626
private-key: ${{ secrets.SENTRY_RELEASE_BOT_PRIVATE_KEY }}
27-
- uses: actions/checkout@v4.2.2
27+
- uses: actions/checkout@v5.0.0
2828
with:
2929
token: ${{ steps.token.outputs.token }}
3030
fetch-depth: 0

‎.github/workflows/test-integrations-ai.yml‎

Lines changed: 21 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -22,85 +22,6 @@ env:
2222
CACHED_BUILD_PATHS: |
2323
${{ github.workspace }}/dist-serverless
2424
jobs:
25-
test-ai-latest:
26-
name: AI (latest)
27-
timeout-minutes: 30
28-
runs-on: ${{ matrix.os }}
29-
strategy:
30-
fail-fast: false
31-
matrix:
32-
python-version: ["3.9","3.11","3.12"]
33-
# python3.6 reached EOL and is no longer being supported on
34-
# new versions of hosted runners on Github Actions
35-
# ubuntu-20.04 is the last version that supported python3.6
36-
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
37-
os: [ubuntu-22.04]
38-
# Use Docker container only for Python 3.6
39-
container: ${{ matrix.python-version == '3.6' && 'python:3.6' || null }}
40-
steps:
41-
- uses: actions/[email protected]
42-
- uses: actions/setup-python@v5
43-
if: ${{ matrix.python-version != '3.6' }}
44-
with:
45-
python-version: ${{ matrix.python-version }}
46-
allow-prereleases: true
47-
- name: Setup Test Env
48-
run: |
49-
pip install "coverage[toml]" tox
50-
- name: Erase coverage
51-
run: |
52-
coverage erase
53-
- name: Test anthropic latest
54-
run: |
55-
set -x # print commands that are executed
56-
./scripts/runtox.sh "py${{ matrix.python-version }}-anthropic-latest"
57-
- name: Test cohere latest
58-
run: |
59-
set -x # print commands that are executed
60-
./scripts/runtox.sh "py${{ matrix.python-version }}-cohere-latest"
61-
- name: Test langchain latest
62-
run: |
63-
set -x # print commands that are executed
64-
./scripts/runtox.sh "py${{ matrix.python-version }}-langchain-latest"
65-
- name: Test openai latest
66-
run: |
67-
set -x # print commands that are executed
68-
./scripts/runtox.sh "py${{ matrix.python-version }}-openai-latest"
69-
- name: Test openai_agents latest
70-
run: |
71-
set -x # print commands that are executed
72-
./scripts/runtox.sh "py${{ matrix.python-version }}-openai_agents-latest"
73-
- name: Test huggingface_hub latest
74-
run: |
75-
set -x # print commands that are executed
76-
./scripts/runtox.sh "py${{ matrix.python-version }}-huggingface_hub-latest"
77-
- name: Generate coverage XML (Python 3.6)
78-
if: ${{ !cancelled() && matrix.python-version == '3.6' }}
79-
run: |
80-
export COVERAGE_RCFILE=.coveragerc36
81-
coverage combine .coverage-sentry-*
82-
coverage xml --ignore-errors
83-
- name: Generate coverage XML
84-
if: ${{ !cancelled() && matrix.python-version != '3.6' }}
85-
run: |
86-
coverage combine .coverage-sentry-*
87-
coverage xml
88-
- name: Upload coverage to Codecov
89-
if: ${{ !cancelled() }}
90-
uses: codecov/[email protected]
91-
with:
92-
token: ${{ secrets.CODECOV_TOKEN }}
93-
files: coverage.xml
94-
# make sure no plugins alter our coverage reports
95-
plugin: noop
96-
verbose: true
97-
- name: Upload test results to Codecov
98-
if: ${{ !cancelled() }}
99-
uses: codecov/test-results-action@v1
100-
with:
101-
token: ${{ secrets.CODECOV_TOKEN }}
102-
files: .junitxml
103-
verbose: true
10425
test-ai-pinned:
10526
name: AI (pinned)
10627
timeout-minutes: 30
@@ -117,8 +38,8 @@ jobs:
11738
# Use Docker container only for Python 3.6
11839
container: ${{ matrix.python-version == '3.6' && 'python:3.6' || null }}
11940
steps:
120-
- uses: actions/checkout@v4.2.2
121-
- uses: actions/setup-python@v5
41+
- uses: actions/checkout@v5.0.0
42+
- uses: actions/setup-python@v6
12243
if: ${{ matrix.python-version != '3.6' }}
12344
with:
12445
python-version: ${{ matrix.python-version }}
@@ -137,14 +58,26 @@ jobs:
13758
run: |
13859
set -x # print commands that are executed
13960
./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-cohere"
140-
- name: Test langchain pinned
61+
- name: Test langchain-base pinned
62+
run: |
63+
set -x # print commands that are executed
64+
./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-langchain-base"
65+
- name: Test langchain-notiktoken pinned
66+
run: |
67+
set -x # print commands that are executed
68+
./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-langchain-notiktoken"
69+
- name: Test openai-base pinned
70+
run: |
71+
set -x # print commands that are executed
72+
./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-openai-base"
73+
- name: Test openai-notiktoken pinned
14174
run: |
14275
set -x # print commands that are executed
143-
./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-langchain"
144-
- name: Test openai pinned
76+
./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-openai-notiktoken"
77+
- name: Test langgraph pinned
14578
run: |
14679
set -x # print commands that are executed
147-
./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-openai"
80+
./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-langgraph"
14881
- name: Test openai_agents pinned
14982
run: |
15083
set -x # print commands that are executed
@@ -166,12 +99,12 @@ jobs:
16699
coverage xml
167100
- name: Upload coverage to Codecov
168101
if: ${{ !cancelled() }}
169-
uses: codecov/codecov-action@v5.4.3
102+
uses: codecov/codecov-action@v5.5.1
170103
with:
171104
token: ${{ secrets.CODECOV_TOKEN }}
172105
files: coverage.xml
173106
# make sure no plugins alter our coverage reports
174-
plugin: noop
107+
plugins: noop
175108
verbose: true
176109
- name: Upload test results to Codecov
177110
if: ${{ !cancelled() }}
@@ -188,6 +121,6 @@ jobs:
188121
runs-on: ubuntu-22.04
189122
steps:
190123
- name: Check for failures
191-
if: contains(needs.test-ai-pinned.result, 'failure') || contains(needs.test-ai-pinned.result, 'skipped')
124+
if: needs.test-ai-pinned.result != 'success'
192125
run: |
193126
echo "One of the dependent jobs has failed. You may need to re-run it." && exit 1

‎.github/workflows/test-integrations-cloud.yml‎

Lines changed: 6 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -22,93 +22,14 @@ env:
2222
CACHED_BUILD_PATHS: |
2323
${{ github.workspace }}/dist-serverless
2424
jobs:
25-
test-cloud-latest:
26-
name: Cloud (latest)
27-
timeout-minutes: 30
28-
runs-on: ${{ matrix.os }}
29-
strategy:
30-
fail-fast: false
31-
matrix:
32-
python-version: ["3.8","3.11","3.12","3.13"]
33-
# python3.6 reached EOL and is no longer being supported on
34-
# new versions of hosted runners on Github Actions
35-
# ubuntu-20.04 is the last version that supported python3.6
36-
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
37-
os: [ubuntu-22.04]
38-
services:
39-
docker:
40-
image: docker:dind # Required for Docker network management
41-
options: --privileged # Required for Docker-in-Docker operations
42-
# Use Docker container only for Python 3.6
43-
container: ${{ matrix.python-version == '3.6' && 'python:3.6' || null }}
44-
steps:
45-
- uses: actions/[email protected]
46-
- uses: actions/setup-python@v5
47-
if: ${{ matrix.python-version != '3.6' }}
48-
with:
49-
python-version: ${{ matrix.python-version }}
50-
allow-prereleases: true
51-
- name: Setup Test Env
52-
run: |
53-
pip install "coverage[toml]" tox
54-
- name: Erase coverage
55-
run: |
56-
coverage erase
57-
- name: Test aws_lambda latest
58-
run: |
59-
set -x # print commands that are executed
60-
./scripts/runtox.sh "py${{ matrix.python-version }}-aws_lambda-latest"
61-
- name: Test boto3 latest
62-
run: |
63-
set -x # print commands that are executed
64-
./scripts/runtox.sh "py${{ matrix.python-version }}-boto3-latest"
65-
- name: Test chalice latest
66-
run: |
67-
set -x # print commands that are executed
68-
./scripts/runtox.sh "py${{ matrix.python-version }}-chalice-latest"
69-
- name: Test cloud_resource_context latest
70-
run: |
71-
set -x # print commands that are executed
72-
./scripts/runtox.sh "py${{ matrix.python-version }}-cloud_resource_context-latest"
73-
- name: Test gcp latest
74-
run: |
75-
set -x # print commands that are executed
76-
./scripts/runtox.sh "py${{ matrix.python-version }}-gcp-latest"
77-
- name: Generate coverage XML (Python 3.6)
78-
if: ${{ !cancelled() && matrix.python-version == '3.6' }}
79-
run: |
80-
export COVERAGE_RCFILE=.coveragerc36
81-
coverage combine .coverage-sentry-*
82-
coverage xml --ignore-errors
83-
- name: Generate coverage XML
84-
if: ${{ !cancelled() && matrix.python-version != '3.6' }}
85-
run: |
86-
coverage combine .coverage-sentry-*
87-
coverage xml
88-
- name: Upload coverage to Codecov
89-
if: ${{ !cancelled() }}
90-
uses: codecov/[email protected]
91-
with:
92-
token: ${{ secrets.CODECOV_TOKEN }}
93-
files: coverage.xml
94-
# make sure no plugins alter our coverage reports
95-
plugin: noop
96-
verbose: true
97-
- name: Upload test results to Codecov
98-
if: ${{ !cancelled() }}
99-
uses: codecov/test-results-action@v1
100-
with:
101-
token: ${{ secrets.CODECOV_TOKEN }}
102-
files: .junitxml
103-
verbose: true
10425
test-cloud-pinned:
10526
name: Cloud (pinned)
10627
timeout-minutes: 30
10728
runs-on: ${{ matrix.os }}
10829
strategy:
10930
fail-fast: false
11031
matrix:
111-
python-version: ["3.6","3.7","3.8","3.9","3.11","3.12","3.13"]
32+
python-version: ["3.6","3.7","3.8","3.9","3.10","3.11","3.12","3.13"]
11233
# python3.6 reached EOL and is no longer being supported on
11334
# new versions of hosted runners on Github Actions
11435
# ubuntu-20.04 is the last version that supported python3.6
@@ -121,8 +42,8 @@ jobs:
12142
# Use Docker container only for Python 3.6
12243
container: ${{ matrix.python-version == '3.6' && 'python:3.6' || null }}
12344
steps:
124-
- uses: actions/checkout@v4.2.2
125-
- uses: actions/setup-python@v5
45+
- uses: actions/checkout@v5.0.0
46+
- uses: actions/setup-python@v6
12647
if: ${{ matrix.python-version != '3.6' }}
12748
with:
12849
python-version: ${{ matrix.python-version }}
@@ -166,12 +87,12 @@ jobs:
16687
coverage xml
16788
- name: Upload coverage to Codecov
16889
if: ${{ !cancelled() }}
169-
uses: codecov/codecov-action@v5.4.3
90+
uses: codecov/codecov-action@v5.5.1
17091
with:
17192
token: ${{ secrets.CODECOV_TOKEN }}
17293
files: coverage.xml
17394
# make sure no plugins alter our coverage reports
174-
plugin: noop
95+
plugins: noop
17596
verbose: true
17697
- name: Upload test results to Codecov
17798
if: ${{ !cancelled() }}
@@ -188,6 +109,6 @@ jobs:
188109
runs-on: ubuntu-22.04
189110
steps:
190111
- name: Check for failures
191-
if: contains(needs.test-cloud-pinned.result, 'failure') || contains(needs.test-cloud-pinned.result, 'skipped')
112+
if: needs.test-cloud-pinned.result != 'success'
192113
run: |
193114
echo "One of the dependent jobs has failed. You may need to re-run it." && exit 1

‎.github/workflows/test-integrations-common.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ jobs:
3838
# Use Docker container only for Python 3.6
3939
container: ${{ matrix.python-version == '3.6' && 'python:3.6' || null }}
4040
steps:
41-
- uses: actions/checkout@v4.2.2
42-
- uses: actions/setup-python@v5
41+
- uses: actions/checkout@v5.0.0
42+
- uses: actions/setup-python@v6
4343
if: ${{ matrix.python-version != '3.6' }}
4444
with:
4545
python-version: ${{ matrix.python-version }}
@@ -67,12 +67,12 @@ jobs:
6767
coverage xml
6868
- name: Upload coverage to Codecov
6969
if: ${{ !cancelled() }}
70-
uses: codecov/codecov-action@v5.4.3
70+
uses: codecov/codecov-action@v5.5.1
7171
with:
7272
token: ${{ secrets.CODECOV_TOKEN }}
7373
files: coverage.xml
7474
# make sure no plugins alter our coverage reports
75-
plugin: noop
75+
plugins: noop
7676
verbose: true
7777
- name: Upload test results to Codecov
7878
if: ${{ !cancelled() }}
@@ -89,6 +89,6 @@ jobs:
8989
runs-on: ubuntu-22.04
9090
steps:
9191
- name: Check for failures
92-
if: contains(needs.test-common-pinned.result, 'failure') || contains(needs.test-common-pinned.result, 'skipped')
92+
if: needs.test-common-pinned.result != 'success'
9393
run: |
9494
echo "One of the dependent jobs has failed. You may need to re-run it." && exit 1

0 commit comments

Comments
 (0)