ChatGPT/FastGPT
1
0
Fork 0
mirror of https://github.com/labring/FastGPT.git synced 2025-07-24 05:23:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: mobild sso login (#2636)

Browse Source 
* fix: mobild sso login

* feat: max call tool times
This commit is contained in:
Archer
2024-09-07 18:24:38 +08:00
committed by GitHub
parent d45cb2f84a
commit 52ac445557
4 changed files with 64 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/service/core/workflow/dispatch/agent/runTool/index.ts
View File

@@ -134,6 +134,7 @@ export const dispatchRunTools = async (props: DispatchToolModuleProps): Promise<
...props,
toolNodes,
toolModel,
maxRunToolTimes: 30,
messages: adaptMessages
});
}

26
packages/service/core/workflow/dispatch/agent/runTool/toolChoice.ts
View File

@@ -45,13 +45,12 @@ export const runToolWithToolChoice = async (
messages: ChatCompletionMessageParam[];
toolNodes: ToolNodeItemType[];
toolModel: LLMModelItemType;
maxRunToolTimes: number;
},
response?: RunToolResponse
): Promise<RunToolResponse> => {
const { messages, toolNodes, toolModel, maxRunToolTimes, ...workflowProps } = props;
const {
toolModel,
toolNodes,
messages,
res,
requestOrigin,
runtimeNodes,
@@ -59,7 +58,12 @@ export const runToolWithToolChoice = async (
stream,
workflowStreamResponse,
params: { temperature = 0, maxToken = 4000, aiChatVision }
} = props;
} = workflowProps;
if (maxRunToolTimes <= 0 && response) {
return response;
}
const assistantResponses = response?.assistantResponses || [];
const tools: ChatCompletionTool[] = toolNodes.map((item) => {
@@ -196,7 +200,7 @@ export const runToolWithToolChoice = async (
})();
const toolRunResponse = await dispatchWorkFlow({
...props,
...workflowProps,
isToolCall: true,
runtimeNodes: runtimeNodes.map((item) =>
item.nodeId === toolNode.nodeId
@@ -252,11 +256,22 @@ export const runToolWithToolChoice = async (
role: ChatCompletionRequestMessageRoleEnum.Assistant,
tool_calls: toolCalls
};
/*
...
user
assistant: tool data
*/
const concatToolMessages = [
...requestMessages,
assistantToolMsgParams
] as ChatCompletionMessageParam[];
const tokens = await countGptMessagesTokens(concatToolMessages, tools);
/*
...
user
assistant: tool data
tool: tool response
*/
const completeMessages = [
...concatToolMessages,
...toolsRunResponse.map((item) => item?.toolMsgParams)
@@ -314,6 +329,7 @@ export const runToolWithToolChoice = async (
return runToolWithToolChoice(
{
...props,
maxRunToolTimes: maxRunToolTimes - 1,
messages: completeMessages
},
{