Skip to content

Commit 8090e4e

Browse files
author
jinhaiyang
committed
cogtts
2 parents 7d39bb1 + 4bec3a4 commit 8090e4e

Some content is hidden

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

46 files changed

+817
-334
lines changed

.github/actions/poetry_setup/action.yml

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,16 @@ runs:
3232
with:
3333
python-version: ${{ inputs.python-version }}
3434

35-
- uses: actions/cache@v4
36-
id: cache-bin-poetry
37-
name: Cache Poetry binary - Python ${{ inputs.python-version }}
38-
env:
39-
SEGMENT_DOWNLOAD_TIMEOUT_MIN: "1"
40-
with:
41-
path: |
42-
/opt/pipx/venvs/poetry
43-
# This step caches the poetry installation, so make sure it's keyed on the poetry version as well.
44-
key: bin-poetry-${{ runner.os }}-${{ runner.arch }}-py-${{ inputs.python-version }}-${{ inputs.poetry-version }}
35+
# - uses: actions/cache@v4
36+
# id: cache-bin-poetry
37+
# name: Cache Poetry binary - Python ${{ inputs.python-version }}
38+
# env:
39+
# SEGMENT_DOWNLOAD_TIMEOUT_MIN: "1"
40+
# with:
41+
# path: |
42+
# /opt/pipx/venvs/poetry
43+
# # This step caches the poetry installation, so make sure it's keyed on the poetry version as well.
44+
# key: bin-poetry-${{ runner.os }}-${{ runner.arch }}-py-${{ inputs.python-version }}-${{ inputs.poetry-version }}
4545

4646
- name: Refresh shell hashtable and fixup softlinks
4747
if: steps.cache-bin-poetry.outputs.cache-hit == 'true'
@@ -69,6 +69,14 @@ runs:
6969
/opt/pipx/venvs/poetry/bin/python --version
7070
/opt/pipx_bin/poetry --version
7171
72+
- name: Fix pip and upgrade pipx
73+
if: steps.cache-bin-poetry.outputs.cache-hit != 'true'
74+
shell: bash
75+
run: |
76+
python -m pip install --upgrade "pip<25"
77+
python -m pip install --upgrade pipx
78+
pipx --version
79+
7280
- name: Install poetry
7381
if: steps.cache-bin-poetry.outputs.cache-hit != 'true'
7482
shell: bash
@@ -90,4 +98,4 @@ runs:
9098
~/.cache/pypoetry/cache
9199
~/.cache/pypoetry/artifacts
92100
${{ env.WORKDIR }}/.venv
93-
key: py-deps-${{ runner.os }}-${{ runner.arch }}-py-${{ inputs.python-version }}-poetry-${{ inputs.poetry-version }}-${{ inputs.cache-key }}-${{ hashFiles(format('{0}/**/poetry.lock', env.WORKDIR)) }}
101+
key: py-deps-${{ runner.os }}-${{ runner.arch }}-py-${{ inputs.python-version }}-poetry-${{ inputs.poetry-version }}-${{ inputs.cache-key }}-${{ hashFiles(format('{0}/**/poetry.lock', env.WORKDIR)) }}

.github/workflows/_integration_test.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
description: "From which folder this pipeline executes"
1111

1212
env:
13-
POETRY_VERSION: "1.7.1"
13+
POETRY_VERSION: "1.8.2"
1414

1515
jobs:
1616
build:
@@ -41,7 +41,6 @@ jobs:
4141
working-directory: ${{ inputs.working-directory }}
4242
cache-key: core
4343

44-
4544
- name: Import test dependencies
4645
run: poetry install --with test
4746
working-directory: ${{ inputs.working-directory }}
@@ -64,4 +63,4 @@ jobs:
6463
6564
# grep will exit non-zero if the target message isn't found,
6665
# and `set -e` above will cause the step to fail.
67-
echo "$STATUS" | grep 'nothing to commit, working tree clean'
66+
echo "$STATUS" | grep 'nothing to commit, working tree clean'

.github/workflows/_release.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ on:
1515
default: '.'
1616
description: "From which folder this pipeline executes"
1717
env:
18-
PYTHON_VERSION: "3.8"
19-
POETRY_VERSION: "1.7.1"
18+
PYTHON_VERSION: "3.9"
19+
POETRY_VERSION: "1.8.2"
2020

2121
jobs:
2222
build:
@@ -154,19 +154,19 @@ jobs:
154154
--extra-index-url https://test.pypi.org/simple/ \
155155
"$PKG_NAME==$VERSION"
156156
157-
- name: Run unit tests
158-
run: make tests
159-
env:
160-
ZHIPUAI_API_KEY: ${{ secrets.ZHIPUAI_API_KEY }}
161-
ZHIPUAI_BASE_URL: ${{ secrets.ZHIPUAI_BASE_URL }}
162-
working-directory: ${{ inputs.working-directory }}
157+
# - name: Run unit tests
158+
# run: make tests
159+
# env:
160+
# ZHIPUAI_API_KEY: ${{ secrets.ZHIPUAI_API_KEY }}
161+
# ZHIPUAI_BASE_URL: ${{ secrets.ZHIPUAI_BASE_URL }}
162+
# working-directory: ${{ inputs.working-directory }}
163163

164-
- name: Run integration tests
165-
env:
166-
ZHIPUAI_API_KEY: ${{ secrets.ZHIPUAI_API_KEY }}
167-
ZHIPUAI_BASE_URL: ${{ secrets.ZHIPUAI_BASE_URL }}
168-
run: make integration_tests
169-
working-directory: ${{ inputs.working-directory }}
164+
# - name: Run integration tests
165+
# env:
166+
# ZHIPUAI_API_KEY: ${{ secrets.ZHIPUAI_API_KEY }}
167+
# ZHIPUAI_BASE_URL: ${{ secrets.ZHIPUAI_BASE_URL }}
168+
# run: make integration_tests
169+
# working-directory: ${{ inputs.working-directory }}
170170

171171
publish:
172172
needs:

.github/workflows/_test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
description: "From which folder this pipeline executes"
1111

1212
env:
13-
POETRY_VERSION: "1.7.1"
13+
POETRY_VERSION: "1.8.2"
1414

1515
jobs:
1616
build:
@@ -58,4 +58,4 @@ jobs:
5858
5959
# grep will exit non-zero if the target message isn't found,
6060
# and `set -e` above will cause the step to fail.
61-
echo "$STATUS" | grep 'nothing to commit, working tree clean'
61+
echo "$STATUS" | grep 'nothing to commit, working tree clean'

.github/workflows/_test_release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ on:
99
description: "From which folder this pipeline executes"
1010

1111
env:
12-
POETRY_VERSION: "1.7.1"
13-
PYTHON_VERSION: "3.8"
12+
POETRY_VERSION: "1.8.2"
13+
PYTHON_VERSION: "3.9"
1414

1515
jobs:
1616
build:

LICENSE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 清华智谱, Inc.
3+
Copyright (c) Zhipu, Inc.
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
1818
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
1919
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2020
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21-
SOFTWARE.
21+
SOFTWARE.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515

1616
### Python版本支持
17-
正式的 Python (3.8, 3.9, 3.10, 3.11, 3.12)
17+
正式的 Python (3.9, 3.10, 3.11, 3.12)
1818

1919
### 使用 pip 安装 `zhipuai` 软件包及其依赖
2020

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "zhipuai"
3-
version = "2.1.5.20250106"
3+
version = "2.1.5.20250625"
44
description = "A SDK library for accessing big model apis from ZhipuAI"
55
authors = ["Zhipu AI"]
66
readme = "README.md"

tests/agent/glm3_agent.py

Lines changed: 0 additions & 141 deletions
This file was deleted.

tests/agent/test_agent.py

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)