Skip to content

Commit b095cb6

Browse files
authored
Merge branch 'main' into releases
2 parents f41b64a + bebd1aa commit b095cb6

24 files changed

Lines changed: 203 additions & 111 deletions

File tree

backend/app/model/model_platform.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
from pydantic import BeforeValidator
1818

1919
PLATFORM_ALIAS_MAPPING: Final[dict[str, str]] = {
20-
"z.ai": "openai-compatible-model",
20+
"z.ai": "zhipu",
2121
"ModelArk": "openai-compatible-model",
2222
"grok": "openai-compatible-model",
23-
"ernie": "openai-compatible-model",
23+
"ernie": "qianfan",
2424
"llama.cpp": "openai-compatible-model",
2525
}
2626

backend/app/utils/single_agent_worker.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ def __init__(
6767
self.worker = worker # change type hint
6868

6969
async def _process_task(
70-
self, task: Task, dependencies: list[Task]
70+
self, task: Task, dependencies: list[Task], stream_callback=None
7171
) -> TaskState:
7272
r"""Processes a task with its dependencies using an efficient agent
7373
management system.

backend/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ readme = "README.md"
66
requires-python = ">=3.11,<3.12"
77
dependencies = [
88
"pip>=23.0",
9-
"camel-ai[eigent]==0.2.90a5",
9+
"camel-ai[eigent]==0.2.90a6",
1010
"fastapi>=0.115.12",
1111
"fastapi-babel>=1.0.0",
1212
"uvicorn[standard]>=0.34.2",

backend/tests/app/model/test_model_platform.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424

2525
def test_normalize_model_platform_maps_known_aliases():
2626
assert normalize_model_platform("grok") == "openai-compatible-model"
27-
assert normalize_model_platform("z.ai") == "openai-compatible-model"
27+
assert normalize_model_platform("z.ai") == "zhipu"
2828
assert normalize_model_platform("ModelArk") == "openai-compatible-model"
29-
assert normalize_model_platform("ernie") == "openai-compatible-model"
29+
assert normalize_model_platform("ernie") == "qianfan"
3030
assert normalize_model_platform("llama.cpp") == "openai-compatible-model"
3131

3232

@@ -49,5 +49,5 @@ class _Model(BaseModel):
4949
optional_model_platform="ModelArk",
5050
)
5151

52-
assert item.model_platform == "openai-compatible-model"
52+
assert item.model_platform == "qianfan"
5353
assert item.optional_model_platform == "openai-compatible-model"

backend/uv.lock

Lines changed: 54 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/images/model_setting.png

10.2 KB
Loading

server/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ requires-python = ">=3.12,<3.13"
77
dependencies = [
88
"alembic>=1.15.2",
99
"openai>=1.99.3,<2",
10-
"camel-ai==0.2.90a5",
10+
"camel-ai==0.2.90a6",
1111
"pydantic[email]>=2.11.1",
1212
"click>=8.1.8",
1313
"fastapi>=0.115.12",

0 commit comments

Comments
 (0)