Skip to content

Commit 210e472

Browse files
committed
Merge branch 'serverless-devs'
2 parents 832d4a2 + 94a0ea0 commit 210e472

File tree

8 files changed

+24
-10
lines changed

8 files changed

+24
-10
lines changed

.gitignore

+2-2
Original file line numberDiff line numberDiff line change
@@ -158,5 +158,5 @@ cython_debug/
158158
# and can be added to the global gitignore or merged into this file. For a more nuclear
159159
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
160160
#.idea/
161-
publish.yaml
162-
.signore
161+
docker-compose.yml
162+
Makefile

.signore

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
node_modules
22
.env
3+
.git
34
.DS_Store
45
agentcraft-all/agentcraft-fe/.next/cache
56
cache
67
Makefile
78
docker-compose.yml
8-
postgresql
9+
postgresql/data
10+
venv
11+
Dockerfile

publish.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Effective: Public
55
Name: AgentCraft
66
Provider:
77
- 阿里云
8-
Version: 0.0.21 #dev0.0.59
8+
Version: 0.0.21 #dev0.0.61
99
Description: 基于Serverless架构的开源智能体平台,可以快速构建构内容提取、知识库、图文生成助手等智能应用
1010
HomePage: https://github.com/devsapp/agentcraft
1111
Tags: #标签详情

src/agentcraft-all/agentcraft-be/app/chat/service.py

-1
Original file line numberDiff line numberDiff line change
@@ -590,7 +590,6 @@ def model_chat_stream(agent_session_id,
590590
] += chunk["choices"][0]["delta"]["content"]
591591
except json.JSONDecodeError as err:
592592
logger.error(err)
593-
logger.info(f"usage: {usage}")
594593
# """添加检索来源信息"""
595594
# if len(search_choices) > 0:
596595
# result_text = "\n\n相关链接\n"

src/agentcraft-all/agentcraft-be/app/db.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,8 @@
7979
model_ip_limit INTEGER NOT NULL DEFAULT 50,
8080
exact_search_limit INTEGER NOT NULL DEFAULT 1,
8181
fuzzy_search_limit INTEGER NOT NULL DEFAULT 3,
82-
is_public INTEGER NOT NULL DEFAULT 0
82+
is_public INTEGER DEFAULT 0,
83+
default_answer VARCHAR(255)
8384
);"""
8485
)
8586
CREATE_AGENT_DATASET_TABLE = text(
@@ -195,7 +196,7 @@
195196
model_ip_limit INTEGER NOT NULL DEFAULT 50,
196197
exact_search_limit INTEGER NOT NULL DEFAULT 1,
197198
fuzzy_search_limit INTEGER NOT NULL DEFAULT 3,
198-
is_public INTEGER NOT NULL DEFAULT 0
199+
is_public INTEGER DEFAULT 0
199200
);"""
200201
)
201202

@@ -235,7 +236,7 @@
235236
description VARCHAR(255) NOT NULL,
236237
input_schema TEXT NOT NULL,
237238
output_schema TEXT NOT NULL,
238-
need_llm_call INTEGER NOT NULL DEFAULT 1,
239+
need_llm_call INTEGER DEFAULT 1,
239240
type INTEGER NOT NULL,
240241
proxy_url TEXT,
241242
author TEXT NOT NULL,

src/agentcraft-all/agentcraft-fe/constants/foundation-model.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
export const AGENTCRAFT_FM_QWEN_BIZ = 'agentcraft-fm-qwen-biz';
1+
export const AGENTCRAFT_FM_QWEN_BIZ = 'agentcraft-fm-dashscope-biz'; // 弃用 agentcraft-fm-qwen-biz
22
export const AGENTCRAFT_FM_DASHSCOPE_BIZ ='agentcraft-fm-dashscope-biz';
33
export const AGENTCRAFT_FM_ZHIPUAI_BIZ ='agentcraft-fm-zhipuai-biz'; //智谱AI
44
export const AGENTCRAFT_FM_BAICHUANAI_BIZ ='agentcraft-fm-baichuanai-biz'; // 百川AI

src/agentcraft-all/agentcraft-fe/store/quickStart.ts

-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ export async function createFoundationModelOnly(payload: any) {
120120
description: payload.description,
121121
region: payload.region,
122122
apiKey: payload.apiKey,
123-
model: payload.model,
124123
name: payload.name,
125124
}
126125

src/agentcraft-all/agentcraft-fe/store/workspace.ts

+12
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,18 @@ export async function deleteWorkspace(id: number) {
8484
},
8585
});
8686

87+
}
88+
export async function updateWorkspace(id: number, payload: WorkspaceRequestPayload) {
89+
90+
return await request(`/api/workspace/update?id=${id}`, {
91+
method: "POST",
92+
body: JSON.stringify(payload),
93+
headers: {
94+
"Content-Type": "application/json",
95+
},
96+
});
97+
98+
8799
}
88100

89101
export async function addWorkspace(payload: WorkspaceRequestPayload) {

0 commit comments

Comments
 (0)