@puca/puca-core 12.12.0 → 12.12.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -58,6 +58,9 @@ let LlmService = class LlmService {
|
|
|
58
58
|
this.logger.debug('Tool list', toolList.map((tool) => tool.tool.name));
|
|
59
59
|
let toolCallCount = 0;
|
|
60
60
|
let toolCallsRetries = 0;
|
|
61
|
+
let lastTool = '';
|
|
62
|
+
args.maxToolCalls = args.maxToolCalls || 15;
|
|
63
|
+
args.toolCallsRetry = args.toolCallsRetry || 5;
|
|
61
64
|
const messages = _.cloneDeep(args.messages);
|
|
62
65
|
while (true) {
|
|
63
66
|
try {
|
|
@@ -77,6 +80,10 @@ let LlmService = class LlmService {
|
|
|
77
80
|
messages.push(message);
|
|
78
81
|
const toolCall = _.get(chatCompletion, 'choices.0.message.tool_calls.0');
|
|
79
82
|
if (toolCall === null || toolCall === void 0 ? void 0 : toolCall.function) {
|
|
83
|
+
if (toolCall.function.name !== lastTool) {
|
|
84
|
+
toolCallsRetries = 0;
|
|
85
|
+
lastTool = toolCall.function.name;
|
|
86
|
+
}
|
|
80
87
|
const item = toolList.find((item) => item.tool.name === toolCall.function.name);
|
|
81
88
|
if (item) {
|
|
82
89
|
const toolArgs = toolCall.function.arguments;
|
|
@@ -86,7 +93,7 @@ let LlmService = class LlmService {
|
|
|
86
93
|
name: item.tool.name,
|
|
87
94
|
arguments: JSON.parse(toolArgs),
|
|
88
95
|
});
|
|
89
|
-
if (++toolCallCount >
|
|
96
|
+
if (++toolCallCount > args.maxToolCalls) {
|
|
90
97
|
throw new Error(`Tool call limit exceeded: ${toolCallCount} > ${args.maxToolCalls}`);
|
|
91
98
|
}
|
|
92
99
|
toolCallsRetries = 0;
|
|
@@ -97,7 +104,7 @@ let LlmService = class LlmService {
|
|
|
97
104
|
});
|
|
98
105
|
}
|
|
99
106
|
catch (e) {
|
|
100
|
-
if (++toolCallsRetries >=
|
|
107
|
+
if (++toolCallsRetries >= args.toolCallsRetry) {
|
|
101
108
|
throw new Error(`Error calling tool ${toolCall.function.name} with arguments ${toolCall.function.arguments}: ${e.message}`);
|
|
102
109
|
}
|
|
103
110
|
this.logger.error('Error calling tool', e.message);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"llm.service.js","sourceRoot":"","sources":["../../../src/core/services/llm.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4BAA2B;AAC3B,2CAA2C;AAC3C,uCAA2B;AAC3B,iCAAyB;AAGzB,qCAAiC;AACjC,qFAAuE;AAGvE,oEAAoF;AAG7E,IAAM,UAAU,GAAhB,MAAM,UAAU;IAKrB,YACmB,oBAA0C,EAC1C,mBAAwC;QADxC,yBAAoB,GAApB,oBAAoB,CAAsB;QAC1C,wBAAmB,GAAnB,mBAAmB,CAAqB;QAN1C,WAAM,GAAG,IAAI,eAAM,CAAC,YAAY,CAAC,CAAA;IAO9C,CAAC;IAEL,KAAK,CAAC,IAAI;QACR,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,WAAW,EAAE,KAAK,EAAE,IAAY,EAAE,EAAE;YACnF,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC;gBACvB,IAAI;aACL,CAAC,CAAA;QACJ,CAAC,EAEC,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAA;IACrB,CAAC;IAGD,KAAK,CAAC,IAAI,CAAC,IAWV;;QAOC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,YAAY,CAAC,kBAAkB,CAAC;eAC3E,OAAO,CAAC,GAAG,CAAC,WAAW,CAAA;QAE5B,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,YAAY,CAAC,gBAAgB,CAAC;eAC3E,OAAO,CAAC,GAAG,CAAC,SAAS,CAAA;QAG1B,IAAI,CAAC,OAAO,EAAE;YACZ,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,mDAAmD,CAAC,CAAA;YACrE,OAAO,IAAI,CAAA;SACZ;QAED,MAAM,MAAM,GAAG,IAAI,kBAAI,CAAC;YACtB,MAAM,EAAE,OAAO;SAChB,CAAC,CAAA;QAEF,MAAM,QAAQ,GAMR,EAAE,CAAA;QAER,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,UAAU,EAAE;YACpC,MAAM,cAAc,GAAG,MAAM,MAAM,CAAC,SAAS,EAAE,CAAA;YAC/C,IAAI,MAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,KAAK,0CAAE,MAAM,EAAE;gBACjC,QAAQ,CAAC,IAAI,CAAC,GAAG,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;oBACjD,OAAO;wBACL,IAAI,kCACC,IAAW,KACd,IAAI,EAAE,QAAQ,GACf;wBACD,MAAM;qBACP,CAAA;gBACH,CAAC,CAAC,CAAC,CAAA;aACJ;SACF;QAED,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;QAEtE,IAAI,aAAa,GAAG,CAAC,CAAA;QACrB,IAAI,gBAAgB,GAAG,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"llm.service.js","sourceRoot":"","sources":["../../../src/core/services/llm.service.ts"],"names":[],"mappings":"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"}
|