Skip to content

Commit 75ce6a7

Browse files
sentrivanasentrivana
authored
Merge branch 'master' into ivana/fix-profiler-reentry
2 parents 6b923fe + 4456351 commit 75ce6a7

Some content is hidden

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

41 files changed

+961
-530
lines changed

‎.github/workflows/ci.yml‎

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

2626
steps:
27-
- uses: actions/checkout@v4.2.2
27+
- uses: actions/checkout@v5.0.0
2828
- uses: actions/setup-python@v5
2929
with:
3030
python-version: 3.12
@@ -39,7 +39,7 @@ jobs:
3939
timeout-minutes: 10
4040

4141
steps:
42-
- uses: actions/checkout@v4.2.2
42+
- uses: actions/checkout@v5.0.0
4343
- uses: actions/setup-python@v5
4444
with:
4545
python-version: 3.12
@@ -58,7 +58,7 @@ jobs:
5858
timeout-minutes: 10
5959

6060
steps:
61-
- uses: actions/checkout@v4.2.2
61+
- uses: actions/checkout@v5.0.0
6262
- uses: actions/setup-python@v5
6363
with:
6464
python-version: 3.12
@@ -89,7 +89,7 @@ jobs:
8989
timeout-minutes: 10
9090

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

‎.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: 14 additions & 85 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-
plugins: 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,7 +38,7 @@ 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
41+
- uses: actions/checkout@v5.0.0
12142
- uses: actions/setup-python@v5
12243
if: ${{ matrix.python-version != '3.6' }}
12344
with:
@@ -137,14 +58,22 @@ 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
14170
run: |
14271
set -x # print commands that are executed
143-
./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-langchain"
144-
- name: Test openai pinned
72+
./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-openai-base"
73+
- name: Test openai-notiktoken pinned
14574
run: |
14675
set -x # print commands that are executed
147-
./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-openai"
76+
./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-openai-notiktoken"
14877
- name: Test openai_agents pinned
14978
run: |
15079
set -x # print commands that are executed
@@ -166,7 +95,7 @@ jobs:
16695
coverage xml
16796
- name: Upload coverage to Codecov
16897
if: ${{ !cancelled() }}
169-
uses: codecov/codecov-action@v5.4.3
98+
uses: codecov/codecov-action@v5.5.0
17099
with:
171100
token: ${{ secrets.CODECOV_TOKEN }}
172101
files: coverage.xml

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
# Use Docker container only for Python 3.6
4343
container: ${{ matrix.python-version == '3.6' && 'python:3.6' || null }}
4444
steps:
45-
- uses: actions/checkout@v4.2.2
45+
- uses: actions/checkout@v5.0.0
4646
- uses: actions/setup-python@v5
4747
if: ${{ matrix.python-version != '3.6' }}
4848
with:
@@ -87,7 +87,7 @@ jobs:
8787
coverage xml
8888
- name: Upload coverage to Codecov
8989
if: ${{ !cancelled() }}
90-
uses: codecov/codecov-action@v5.4.3
90+
uses: codecov/codecov-action@v5.5.0
9191
with:
9292
token: ${{ secrets.CODECOV_TOKEN }}
9393
files: coverage.xml
@@ -121,7 +121,7 @@ jobs:
121121
# Use Docker container only for Python 3.6
122122
container: ${{ matrix.python-version == '3.6' && 'python:3.6' || null }}
123123
steps:
124-
- uses: actions/checkout@v4.2.2
124+
- uses: actions/checkout@v5.0.0
125125
- uses: actions/setup-python@v5
126126
if: ${{ matrix.python-version != '3.6' }}
127127
with:
@@ -166,7 +166,7 @@ jobs:
166166
coverage xml
167167
- name: Upload coverage to Codecov
168168
if: ${{ !cancelled() }}
169-
uses: codecov/codecov-action@v5.4.3
169+
uses: codecov/codecov-action@v5.5.0
170170
with:
171171
token: ${{ secrets.CODECOV_TOKEN }}
172172
files: coverage.xml

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ 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
41+
- uses: actions/checkout@v5.0.0
4242
- uses: actions/setup-python@v5
4343
if: ${{ matrix.python-version != '3.6' }}
4444
with:
@@ -67,7 +67,7 @@ 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.0
7171
with:
7272
token: ${{ secrets.CODECOV_TOKEN }}
7373
files: coverage.xml

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
# Use Docker container only for Python 3.6
5757
container: ${{ matrix.python-version == '3.6' && 'python:3.6' || null }}
5858
steps:
59-
- uses: actions/checkout@v4.2.2
59+
- uses: actions/checkout@v5.0.0
6060
- uses: actions/setup-python@v5
6161
if: ${{ matrix.python-version != '3.6' }}
6262
with:
@@ -107,7 +107,7 @@ jobs:
107107
coverage xml
108108
- name: Upload coverage to Codecov
109109
if: ${{ !cancelled() }}
110-
uses: codecov/codecov-action@v5.4.3
110+
uses: codecov/codecov-action@v5.5.0
111111
with:
112112
token: ${{ secrets.CODECOV_TOKEN }}
113113
files: coverage.xml
@@ -155,7 +155,7 @@ jobs:
155155
# Use Docker container only for Python 3.6
156156
container: ${{ matrix.python-version == '3.6' && 'python:3.6' || null }}
157157
steps:
158-
- uses: actions/checkout@v4.2.2
158+
- uses: actions/checkout@v5.0.0
159159
- uses: actions/setup-python@v5
160160
if: ${{ matrix.python-version != '3.6' }}
161161
with:
@@ -206,7 +206,7 @@ jobs:
206206
coverage xml
207207
- name: Upload coverage to Codecov
208208
if: ${{ !cancelled() }}
209-
uses: codecov/codecov-action@v5.4.3
209+
uses: codecov/codecov-action@v5.5.0
210210
with:
211211
token: ${{ secrets.CODECOV_TOKEN }}
212212
files: coverage.xml

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ 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
41+
- uses: actions/checkout@v5.0.0
4242
- uses: actions/setup-python@v5
4343
if: ${{ matrix.python-version != '3.6' }}
4444
with:
@@ -79,7 +79,7 @@ jobs:
7979
coverage xml
8080
- name: Upload coverage to Codecov
8181
if: ${{ !cancelled() }}
82-
uses: codecov/codecov-action@v5.4.3
82+
uses: codecov/codecov-action@v5.5.0
8383
with:
8484
token: ${{ secrets.CODECOV_TOKEN }}
8585
files: coverage.xml

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ 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
41+
- uses: actions/checkout@v5.0.0
4242
- uses: actions/setup-python@v5
4343
if: ${{ matrix.python-version != '3.6' }}
4444
with:
@@ -67,7 +67,7 @@ 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.0
7171
with:
7272
token: ${{ secrets.CODECOV_TOKEN }}
7373
files: coverage.xml

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ 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
41+
- uses: actions/checkout@v5.0.0
4242
- uses: actions/setup-python@v5
4343
if: ${{ matrix.python-version != '3.6' }}
4444
with:
@@ -79,7 +79,7 @@ jobs:
7979
coverage xml
8080
- name: Upload coverage to Codecov
8181
if: ${{ !cancelled() }}
82-
uses: codecov/codecov-action@v5.4.3
82+
uses: codecov/codecov-action@v5.5.0
8383
with:
8484
token: ${{ secrets.CODECOV_TOKEN }}
8585
files: coverage.xml

0 commit comments

Comments
 (0)