@futdevpro/nts-dynamo 1.14.41 → 1.14.42
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.
- package/build/_modules/ai/_modules/open-ai/_services/oai-llm-chat.service-base.js +4 -5
- package/build/_modules/ai/_modules/open-ai/_services/oai-llm-chat.service-base.js.map +1 -1
- package/build/_modules/bot/_models/bot-message-wrapper.interface.d.ts +1 -0
- package/build/_modules/bot/_models/bot-message-wrapper.interface.d.ts.map +1 -1
- package/build/_modules/bot/_models/bot-message-wrapper.interface.js +1 -0
- package/build/_modules/bot/_models/bot-message-wrapper.interface.js.map +1 -1
- package/build/_modules/bot/_services/bot-io.control-service.js +1 -1
- package/build/_modules/bot/_services/bot-io.control-service.js.map +1 -1
- package/package.json +1 -1
- package/src/_modules/ai/_modules/open-ai/_services/oai-llm-chat.service-base.ts +3 -3
- package/src/_modules/bot/_models/bot-message-wrapper.interface.ts +2 -0
- package/src/_modules/bot/_services/bot-io.control-service.ts +1 -1
|
@@ -340,7 +340,7 @@ class DyNTS_OAI_LLMChat_ServiceBase extends oai_llm_service_base_1.DyNTS_OAI_LLM
|
|
|
340
340
|
*/
|
|
341
341
|
async resolveConversation(set) {
|
|
342
342
|
try {
|
|
343
|
-
if (set.conversation.
|
|
343
|
+
if (!set.conversation.some(message => message.role === ai_1.DyFM_AI_MessageRole.system)) {
|
|
344
344
|
/* throw new DyFM_Error({
|
|
345
345
|
...this.getDefaultErrorSettings(
|
|
346
346
|
'resolveConversation',
|
|
@@ -349,11 +349,10 @@ class DyNTS_OAI_LLMChat_ServiceBase extends oai_llm_service_base_1.DyNTS_OAI_LLM
|
|
|
349
349
|
),
|
|
350
350
|
errorCode: `${DyNTS_global_settings.systemShortCodeName}|DyNTS-OAB-RC1`,
|
|
351
351
|
}); */
|
|
352
|
-
|
|
353
|
-
|
|
352
|
+
/* DyFM_Log.error('System message found in conversation', {
|
|
353
|
+
conversation: set.conversation,
|
|
354
354
|
});
|
|
355
|
-
|
|
356
|
-
else {
|
|
355
|
+
} else { */
|
|
357
356
|
set.conversation.unshift(this.getDefaultSystemMessage(set.settings));
|
|
358
357
|
}
|
|
359
358
|
// conversation shortening
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oai-llm-chat.service-base.js","sourceRoot":"","sources":["../../../../../../src/_modules/ai/_modules/open-ai/_services/oai-llm-chat.service-base.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"oai-llm-chat.service-base.js","sourceRoot":"","sources":["../../../../../../src/_modules/ai/_modules/open-ai/_services/oai-llm-chat.service-base.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,6 +14,7 @@ export declare class DyNTS_Bot_MessageWrapper_Base<T_MessagingPlatformMessage ex
|
|
|
14
14
|
isVoiceBased: boolean;
|
|
15
15
|
isDM: boolean;
|
|
16
16
|
replyToMessageId?: string;
|
|
17
|
+
replyToMessageAuthorId?: string;
|
|
17
18
|
mentions: string[];
|
|
18
19
|
issuer: string;
|
|
19
20
|
rawPlatformMessage: T_MessagingPlatformMessage;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bot-message-wrapper.interface.d.ts","sourceRoot":"","sources":["../../../../src/_modules/bot/_models/bot-message-wrapper.interface.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uCAAuC,EAAE,MAAM,kDAAkD,CAAC;AAC3G,OAAO,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAG3E,qBAAa,6BAA6B,CACxC,0BAA0B,SAAS,GAAG,GAAG,GAAG,EAC5C,0BAA0B,SAAS,GAAG,GAAG,GAAG;IAG5C,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,OAAO,CAAC;IACf,WAAW,EAAE,OAAO,CAAC;IACrB,YAAY,EAAE,OAAO,CAAC;IACtB,IAAI,EAAE,OAAO,CAAC;IAEd,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IAEf,kBAAkB,EAAE,0BAA0B,CAAC;IAE/C,OAAO,EAAE,wBAAwB,CAAC,0BAA0B,CAAC,CAAC;IAG9D,6DAA6D;IAC7D,QAAQ,EAAE,uCAAuC,CAC/C,0BAA0B,EAC1B,0BAA0B,EAC1B,GAAG,EAAE,8BAA8B,CACnC,GAAG,CACJ,CAAC;CACH;AAED;;;;GAIG;AACH,qBAAa,wBAAwB,CACnC,0BAA0B,SAAS,GAAG,GAAG,GAAG,EAC5C,0BAA0B,SAAS,GAAG,GAAG,GAAG,EAC5C,uBAAuB,SAAS,GAAG,GAAG,GAAG,CACzC,SAAQ,6BAA6B,CACrC,0BAA0B,EAC1B,0BAA0B,CAE3B;gBAGG,GAAG,EAAE,6BAA6B,CAChC,0BAA0B,EAC1B,0BAA0B,CAE3B;IAOG,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,wBAAwB,CAAC,0BAA0B,CAAC,CAAC;IAIrF,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAI3B,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,wBAAwB,CAAC,0BAA0B,CAAC,EAAE,CAAC;IAI7F,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAI7B,kBAAkB,IAAI,OAAO;CAG9B"}
|
|
1
|
+
{"version":3,"file":"bot-message-wrapper.interface.d.ts","sourceRoot":"","sources":["../../../../src/_modules/bot/_models/bot-message-wrapper.interface.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uCAAuC,EAAE,MAAM,kDAAkD,CAAC;AAC3G,OAAO,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAG3E,qBAAa,6BAA6B,CACxC,0BAA0B,SAAS,GAAG,GAAG,GAAG,EAC5C,0BAA0B,SAAS,GAAG,GAAG,GAAG;IAG5C,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,OAAO,CAAC;IACf,WAAW,EAAE,OAAO,CAAC;IACrB,YAAY,EAAE,OAAO,CAAC;IACtB,IAAI,EAAE,OAAO,CAAC;IAEd,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAEhC,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IAEf,kBAAkB,EAAE,0BAA0B,CAAC;IAE/C,OAAO,EAAE,wBAAwB,CAAC,0BAA0B,CAAC,CAAC;IAG9D,6DAA6D;IAC7D,QAAQ,EAAE,uCAAuC,CAC/C,0BAA0B,EAC1B,0BAA0B,EAC1B,GAAG,EAAE,8BAA8B,CACnC,GAAG,CACJ,CAAC;CACH;AAED;;;;GAIG;AACH,qBAAa,wBAAwB,CACnC,0BAA0B,SAAS,GAAG,GAAG,GAAG,EAC5C,0BAA0B,SAAS,GAAG,GAAG,GAAG,EAC5C,uBAAuB,SAAS,GAAG,GAAG,GAAG,CACzC,SAAQ,6BAA6B,CACrC,0BAA0B,EAC1B,0BAA0B,CAE3B;gBAGG,GAAG,EAAE,6BAA6B,CAChC,0BAA0B,EAC1B,0BAA0B,CAE3B;IAOG,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,wBAAwB,CAAC,0BAA0B,CAAC,CAAC;IAIrF,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAI3B,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,wBAAwB,CAAC,0BAA0B,CAAC,EAAE,CAAC;IAI7F,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAI7B,kBAAkB,IAAI,OAAO;CAG9B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bot-message-wrapper.interface.js","sourceRoot":"","sources":["../../../../src/_modules/bot/_models/bot-message-wrapper.interface.ts"],"names":[],"mappings":";;;AAIA,MAAa,6BAA6B;IAKxC,EAAE,CAAS;IACX,OAAO,CAAS;IAChB,QAAQ,CAAS;IACjB,UAAU,CAAS;IACnB,iBAAiB,CAAS;IAC1B,SAAS,CAAS;IAClB,WAAW,CAAS;IACpB,SAAS,CAAS;IAClB,KAAK,CAAU;IACf,WAAW,CAAU;IACrB,YAAY,CAAU;IACtB,IAAI,CAAU;IAEd,gBAAgB,CAAU;IAC1B,QAAQ,CAAW,CAAC,WAAW;IAC/B,MAAM,CAAS;IAEf,kBAAkB,CAA6B,CAAC,6DAA6D;IAE7G,OAAO,CAAuD;IAC9D,2DAA2D;IAE3D,6DAA6D;IAC7D,QAAQ,CAKN;CACH;
|
|
1
|
+
{"version":3,"file":"bot-message-wrapper.interface.js","sourceRoot":"","sources":["../../../../src/_modules/bot/_models/bot-message-wrapper.interface.ts"],"names":[],"mappings":";;;AAIA,MAAa,6BAA6B;IAKxC,EAAE,CAAS;IACX,OAAO,CAAS;IAChB,QAAQ,CAAS;IACjB,UAAU,CAAS;IACnB,iBAAiB,CAAS;IAC1B,SAAS,CAAS;IAClB,WAAW,CAAS;IACpB,SAAS,CAAS;IAClB,KAAK,CAAU;IACf,WAAW,CAAU;IACrB,YAAY,CAAU;IACtB,IAAI,CAAU;IAEd,gBAAgB,CAAU;IAC1B,sBAAsB,CAAU;IAEhC,QAAQ,CAAW,CAAC,WAAW;IAC/B,MAAM,CAAS;IAEf,kBAAkB,CAA6B,CAAC,6DAA6D;IAE7G,OAAO,CAAuD;IAC9D,2DAA2D;IAE3D,6DAA6D;IAC7D,QAAQ,CAKN;CACH;AApCD,sEAoCC;AAED;;;;GAIG;AACH,MAAa,wBAIX,SAAQ,6BAIT;IAEC,YACE,GAIC;QAED,KAAK,EAAE,CAAC;QAER,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAC3B,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,OAAe;QACzB,OAAO,MAAM,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC3D,CAAC;IAED,KAAK,CAAC,UAAU;QACd,MAAM,IAAI,CAAC,QAAQ,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC;IACjD,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,KAAa;QAC/B,OAAO,MAAM,IAAI,CAAC,QAAQ,CAAC,uBAAuB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAClE,CAAC;IAED,KAAK,CAAC,MAAM;QACV,MAAM,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IAC1C,CAAC;IAED,kBAAkB;QAChB,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC;IAClC,CAAC;CACF;AAzCD,4DAyCC"}
|
|
@@ -108,7 +108,7 @@ class DyNTS_Bot_IO_ControlService extends singleton_service_1.DyNTS_SingletonSer
|
|
|
108
108
|
fsm_dynamo_1.DyFM_Log.H_error('🚫❌ Bot not initialized yet. END wont respond to message:', message.content, new Error('Bot not initialized yet').stack);
|
|
109
109
|
return false;
|
|
110
110
|
}
|
|
111
|
-
const isReplyForYou = message.
|
|
111
|
+
const isReplyForYou = message.replyToMessageAuthorId && message.replyToMessageAuthorId === message.provider.botId; // Simplified check
|
|
112
112
|
const isPinged = message.content.includes(message.provider.botId) ||
|
|
113
113
|
message.content.includes(`@${message.provider.botDisplayName}`) ||
|
|
114
114
|
isReplyForYou;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bot-io.control-service.js","sourceRoot":"","sources":["../../../../src/_modules/bot/_services/bot-io.control-service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"bot-io.control-service.js","sourceRoot":"","sources":["../../../../src/_modules/bot/_services/bot-io.control-service.ts"],"names":[],"mappings":";;;AAAA,sDAAwE;AAGxE,iFAAkF;AAElF,uFAAmF;AAKnF,MAAsB,2BAA4B,SAAQ,0CAAsB;IAEpE,UAAU,CAAgC;IAG1C,WAAW,CAAoC;IAGzD,IAAI,eAAe;QACjB,OAAO,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC;IACzC,CAAC;IAED;;;;;;;;;;QAUI;IAEJ,kBAAkB,CAAW;IAE7B,KAAK,CAAC,KAAK,CAAC,MAAc;QACxB,IAAI,CAAC;YACH,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,wBAAwB,EAAE,CAAC;YAClD,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,yBAAyB,EAAE,CAAC;YAEpD,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;gBACrB,MAAM,IAAI,uBAAU,CAAC;oBACnB,GAAG,IAAI,CAAC,uBAAuB,CAAC,OAAO,EAAE,IAAI,KAAK,CAAC,oCAAoC,CAAC,EAAE,MAAM,CAAC;oBACjG,SAAS,EAAE,GAAG,6CAAqB,CAAC,mBAAmB,mBAAmB;iBAC3E,CAAC,CAAA;YACJ,CAAC;YAED,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;gBACtB,MAAM,IAAI,uBAAU,CAAC;oBACnB,GAAG,IAAI,CAAC,uBAAuB,CAAC,OAAO,EAAE,IAAI,KAAK,CAAC,oCAAoC,CAAC,EAAE,MAAM,CAAC;oBACjG,SAAS,EAAE,GAAG,6CAAqB,CAAC,mBAAmB,mBAAmB;iBAC3E,CAAC,CAAA;YACJ,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,IAAI,uBAAU,CAAC;gBACnB,GAAG,IAAI,CAAC,uBAAuB,CAAC,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC;gBACvD,SAAS,EAAE,GAAG,6CAAqB,CAAC,mBAAmB,oBAAoB;aAC5E,CAAC,CAAA;QACJ,CAAC;IACH,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,MAAc;QACxB,IAAI,CAAC;YACH,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC;gBAC1B,MAAM,IAAI,uBAAU,CAAC;oBACnB,GAAG,IAAI,CAAC,uBAAuB,CAC7B,aAAa,EACb,IAAI,KAAK,CACP,oCAAoC;wBACpC,iEAAiE,CAClE,EACD,aAAa,CACd;oBACD,SAAS,EAAE,GAAG,6CAAqB,CAAC,mBAAmB,oBAAoB;iBAC5E,CAAC,CAAA;YACJ,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,IAAI,uBAAU,CAAC;gBACnB,GAAG,IAAI,CAAC,uBAAuB,CAAC,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC;gBACvD,SAAS,EAAE,GAAG,6CAAqB,CAAC,mBAAmB,oBAAoB;aAC5E,CAAC,CAAA;QACJ,CAAC;IACH,CAAC;IAOD;;OAEG;IACH,KAAK,CAAC,iBAAiB,CACrB,OAA6D,EAC7D,MAAc;QAEd,IAAI,CAAC;YACH,sCAAsC;YACtC,MAAM,WAAW,GAA8B,6CAAqB,CAAC,YAAY,CAAC;YAElF,IAAI,WAAW,EAAE,UAAU,IAAI,CAAC,EAAE,CAAC;gBACjC,qBAAQ,CAAC,KAAK,CAAC,qBAAqB,OAAO,CAAC,iBAAiB,MAAM,OAAO,CAAC,QAAQ,CAAC,IAAI,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC,CAAA;YACnH,CAAC;YAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,0BAA0B,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAExE,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,OAAO;YACT,CAAC;YAED,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAEvE,IAAI,kBAAkB,EAAE,CAAC;gBACvB,OAAO;YACT,CAAC;YAED,OAAO,MAAM,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACnD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,uBAAU,CAAC,SAAS,CAAC,4BAA4B,EAAE,KAAK,CAAC,CAAC;YAE1D,MAAM,WAAW,GAAG,6CAAqB,CAAC,YAAyC,CAAC;YAEpF,IAAI,CAAC,IAAI,CAAC,kBAAkB,IAAI,WAAW,EAAE,UAAU,IAAI,CAAC,EAAE,CAAC;gBAC7D,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;oBACrB,MAAM,OAAO,CAAC,QAAQ,CAAC,cAAc,CACnC,OAAO,EACP,iBAAiB,6CAAqB,CAAC,mBAAmB,oBAAoB;wBAC5E,8CAA8C;wBAC9C,uBAAU,CAAC,aAAa,CAAC,KAAK,CAAC,CAClC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;wBACZ,uBAAU,CAAC,SAAS,CAAC,6CAA6C,EAAE,GAAG,CAAC,CAAC;oBAC3E,CAAC,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;YAED,MAAM,IAAI,uBAAU,CAAC;gBACnB,GAAG,IAAI,CAAC,uBAAuB,CAAC,kBAAkB,EAAE,KAAK,EAAE,MAAM,CAAC;gBAClE,SAAS,EAAE,GAAG,6CAAqB,CAAC,mBAAmB,mBAAmB;aAC3E,CAAC,CAAA;QACJ,CAAC;IACH,CAAC;IAED,KAAK,CAAC,0BAA0B,CAC9B,OAA6D,EAC7D,MAAc;QAEd,IAAI,CAAC;YACH,MAAM,WAAW,GAAG,6CAAqB,CAAC,YAAyC,CAAC;YAEpF,IAAI,CAAC,OAAO,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,UAAU,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;gBACrE,qBAAQ,CAAC,OAAO,CACd,2DAA2D,EAAE,OAAO,CAAC,OAAO,EAC5E,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC,KAAK,CAC3C,CAAA;gBAED,OAAO,KAAK,CAAC;YACf,CAAC;YAED,MAAM,aAAa,GAAG,OAAO,CAAC,sBAAsB,IAAI,OAAO,CAAC,sBAAsB,KAAK,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,mBAAmB;YACtI,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC;gBAC/D,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,cAAc,EAAE,CAAC;gBAC/D,aAAa,CAAC;YAChB,MAAM,YAAY,GAAG,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,QAAQ,CAAC,KAAK;gBAC9D,OAAO,CAAC,iBAAiB,KAAK,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC;YAChE,MAAM,aAAa,GAAG,WAAW,EAAE,eAAe,EAAE,SAAS,EAAE,IAAI,CACjE,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CACvC,IAAI,KAAK,CAAC;YACX,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;YACxC,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,EAAE,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,0BAA0B;YACtF,MAAM,kBAAkB,GAAG,WAAW,EAAE,eAAe,EAAE,eAAe,EAAE,QAAQ,CAChF,WAAW,CACZ,IAAI,CAAC,WAAW,IAAI,WAAW,EAAE,eAAe,EAAE,WAAW,CAAC,CAAC;YAChE,MAAM,gBAAgB,GAAG,WAAW,EAAE,eAAe,EAAE,eAAe,EAAE,QAAQ,CAC9E,WAAW,CACZ,IAAI,CAAC,WAAW,IAAI,WAAW,EAAE,eAAe,EAAE,WAAW,CAAC,CAAC;YAEhE,IAAI,CAAC,gBAAgB,EAAE,CAAC;gBACtB,IAAI,WAAW,EAAE,UAAU,IAAI,CAAC,EAAE,CAAC;oBACjC,qBAAQ,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAA;gBAC/C,CAAC;gBAED,IAAI,CAAC,YAAY,IAAI,QAAQ,EAAE,CAAC;oBAC9B,OAAO,CAAC,QAAQ,CAAC,cAAc,CAC7B,OAAO,EACP,uFAAuF,CACxF,CAAA;gBACH,CAAC;gBAED,OAAO,KAAK,CAAC;YACf,CAAC;YAED,IAAI,YAAY,EAAE,CAAC;gBACjB,IAAI,WAAW,EAAE,UAAU,IAAI,CAAC,EAAE,CAAC;oBACjC,qBAAQ,CAAC,IAAI,CAAC,mCAAmC,CAAC,CAAA;gBACpD,CAAC;gBAED,OAAO,KAAK,CAAC;YACf,CAAC;YAED,IAAI,aAAa,EAAE,CAAC;gBAClB,IAAI,WAAW,EAAE,UAAU,IAAI,CAAC,EAAE,CAAC;oBACjC,qBAAQ,CAAC,IAAI,CAAC,uDAAuD,EACnE,WAAW,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,CAC7C,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CACvC,EACD,OAAO,CAAC,OAAO,CAChB,CAAA;gBACH,CAAC;gBAED,OAAO,KAAK,CAAC;YACf,CAAC;YAED,IACE,OAAO,CAAC,KAAK;gBACb,CAAC,WAAW,EAAE,0BAA0B,EACxC,CAAC;gBACD,IAAI,QAAQ,IAAI,WAAW,EAAE,UAAU,IAAI,CAAC,EAAE,CAAC;oBAC7C,qBAAQ,CAAC,IAAI,CAAC,8CAA8C,CAAC,CAAA;oBAC7D,OAAO,CAAC,QAAQ,CAAC,cAAc,CAC7B,OAAO,EACP,6CAA6C,CAC9C,CAAA;gBACH,CAAC;gBAED,OAAO,KAAK,CAAC;YACf,CAAC;YAED,IAAI,CAAC,QAAQ,IAAI,CAAC,kBAAkB,EAAE,CAAC;gBACrC,IAAI,WAAW,EAAE,UAAU,IAAI,CAAC,EAAE,CAAC;oBACjC,qBAAQ,CAAC,IAAI,CAAC,2EAA2E,CAAC,CAAA;gBAC5F,CAAC;gBAED,OAAO,KAAK,CAAC;YACf,CAAC;YAED,MAAM,aAAa,GAAG,WAAW,EAAE,YAAY,KAAK,KAAK;gBACvD,WAAW,EAAE,YAAY,EAAE,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC;gBACrD,WAAW,EAAE,YAAY,EAAE,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC;gBACvD,WAAW,EAAE,YAAY,EAAE,QAAQ,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;YAEjE,IAAI,CAAC,aAAa,EAAE,CAAC;gBACnB,IAAI,WAAW,EAAE,UAAU,IAAI,CAAC,EAAE,CAAC;oBACjC,qBAAQ,CAAC,IAAI,CAAC,2BAA2B,EAAE,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAA;oBACzF,OAAO,CAAC,QAAQ,CAAC,cAAc,CAC7B,OAAO,EACP,oEAAoE,CACrE,CAAA;gBACH,CAAC;gBAED,OAAO,KAAK,CAAC;YACf,CAAC;YAED,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;gBACzB,IAAI,WAAW,EAAE,UAAU,IAAI,CAAC,EAAE,CAAC;oBACjC,qBAAQ,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAA;gBAClD,CAAC;gBAED,OAAO,KAAK,CAAC;YACf,CAAC;YAED,OAAO,IAAI,CAAC;QACd,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,IAAI,uBAAU,CAAC;gBACnB,GAAG,IAAI,CAAC,uBAAuB,CAAC,4BAA4B,EAAE,KAAK,EAAE,MAAM,CAAC;gBAC5E,SAAS,EAAE,GAAG,6CAAqB,CAAC,mBAAmB,mBAAmB;aAC3E,CAAC,CAAA;QACJ,CAAC;IACH,CAAC;IAED,KAAK,CAAC,eAAe,CACnB,OAA6D,EAC7D,MAAc;QAEd,IAAI,CAAC;YACH,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAExD,IAAI,SAAS,EAAE,CAAC;gBACd,MAAM,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YACxD,CAAC;YAED,OAAO,OAAO,CAAC,SAAS,CAAC,CAAC;QAC5B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,IAAI,uBAAU,CAAC;gBACnB,GAAG,IAAI,CAAC,uBAAuB,CAAC,iBAAiB,EAAE,KAAK,EAAE,MAAM,CAAC;gBACjE,SAAS,EAAE,GAAG,6CAAqB,CAAC,mBAAmB,oBAAoB;aAC5E,CAAC,CAAA;QACJ,CAAC;IACH,CAAC;IAED,KAAK,CAAC,SAAS,CACb,OAA6D,EAC7D,MAAc;QAEd,IAAI,CAAC;YACH,MAAM,WAAW,GAAG,6CAAqB,CAAC,YAAyC,CAAC;YACpF,IAAI,mBAAmB,GAAG,KAAK,CAAC;YAEhC,IAAI,CAAC,WAAW,EAAE,eAAe,EAAE,eAAe,EAAE,CAAC;gBACnD,mBAAmB,GAAG,IAAI,CAAC;YAC7B,CAAC;iBAAM,IACL,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,eAAe,CAAC,eAAe,CAAC,EAC9E,CAAC;gBACD,mBAAmB,GAAG,IAAI,CAAC;YAC7B,CAAC;YAED,IAAI,CAAC,mBAAmB,EAAE,CAAC;gBACzB,OAAO,KAAK,CAAC;YACf,CAAC;YAED,MAAM,aAAa,GAAG,WAAW,EAAE,eAAe,EAAE,QAAQ,EAAE,IAAI,CAChE,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,UAAU,CAC5C,GAAG,WAAW,CAAC,eAAe,CAAC,eAAe,GAAG,OAAO,CAAC,OAAO,EAAE,CACnE,CACF,CAAC;YAEF,OAAO,OAAO,CAAC,aAAa,CAAC,CAAC;QAChC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,IAAI,uBAAU,CAAC;gBACnB,GAAG,IAAI,CAAC,uBAAuB,CAAC,WAAW,EAAE,KAAK,EAAE,MAAM,CAAC;gBAC3D,SAAS,EAAE,GAAG,6CAAqB,CAAC,mBAAmB,mBAAmB;aAC3E,CAAC,CAAA;QACJ,CAAC;IACH,CAAC;CACF;AA1TD,kEA0TC"}
|
package/package.json
CHANGED
|
@@ -437,7 +437,7 @@ export class DyNTS_OAI_LLMChat_ServiceBase extends DyNTS_OAI_LLM_ServiceBase imp
|
|
|
437
437
|
set: DyFM_AI_ConversationBase_Input<DyFM_OAI_CallSettings>
|
|
438
438
|
): Promise<string | ChatCompletion> {
|
|
439
439
|
try {
|
|
440
|
-
if (set.conversation.
|
|
440
|
+
if (!set.conversation.some(message => message.role === DyFM_AI_MessageRole.system)) {
|
|
441
441
|
/* throw new DyFM_Error({
|
|
442
442
|
...this.getDefaultErrorSettings(
|
|
443
443
|
'resolveConversation',
|
|
@@ -446,10 +446,10 @@ export class DyNTS_OAI_LLMChat_ServiceBase extends DyNTS_OAI_LLM_ServiceBase imp
|
|
|
446
446
|
),
|
|
447
447
|
errorCode: `${DyNTS_global_settings.systemShortCodeName}|DyNTS-OAB-RC1`,
|
|
448
448
|
}); */
|
|
449
|
-
DyFM_Log.error('System message found in conversation', {
|
|
449
|
+
/* DyFM_Log.error('System message found in conversation', {
|
|
450
450
|
conversation: set.conversation,
|
|
451
451
|
});
|
|
452
|
-
} else {
|
|
452
|
+
} else { */
|
|
453
453
|
set.conversation.unshift(this.getDefaultSystemMessage(set.settings));
|
|
454
454
|
}
|
|
455
455
|
|
|
@@ -157,7 +157,7 @@ export abstract class DyNTS_Bot_IO_ControlService extends DyNTS_SingletonService
|
|
|
157
157
|
return false;
|
|
158
158
|
}
|
|
159
159
|
|
|
160
|
-
const isReplyForYou = message.
|
|
160
|
+
const isReplyForYou = message.replyToMessageAuthorId && message.replyToMessageAuthorId === message.provider.botId; // Simplified check
|
|
161
161
|
const isPinged = message.content.includes(message.provider.botId) ||
|
|
162
162
|
message.content.includes(`@${message.provider.botDisplayName}`) ||
|
|
163
163
|
isReplyForYou;
|