GeneralBots/botserver
2
1
Fork 0
Code Issues Pull requests 1 Projects Releases 323 Packages Wiki Activity Actions

new(all): Azure OpenAI added as new LLM provider.

Browse source
This commit is contained in:
Rodrigo Rodriguez 2024-05-25 10:20:56 -03:00
parent 14ff832c58
commit 47120be1ce
1 changed files with 27 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
packages/core.gbapp/services/GBCoreService.ts
View file

@ -726,6 +726,8 @@ ENDPOINT_UPDATE=true
let params; let params;
name = name.trim(); name = name.trim();
// Gets .gbot Params from specified bot.
if (instance.params) { if (instance.params) {
params = typeof (instance.params) === 'object' ? instance.params : JSON.parse(instance.params); params = typeof (instance.params) === 'object' ? instance.params : JSON.parse(instance.params);
@ -733,25 +735,41 @@ ENDPOINT_UPDATE=true
value = params ? params[name] : defaultValue; value = params ? params[name] : defaultValue;
} }
params = GBUtil.caseInsensitive(instance['dataValues']); // Gets specified bot instance values.
if (params && !value) {
value = instance['dataValues'][name];
const minBoot = GBServer.globals.minBoot as any;
if (!value && instance != minBoot.instance) {
params = GBUtil.caseInsensitive(minBoot.instance.dataValues);
value = params[name];
if(minBoot.instance.params){ params = GBUtil.caseInsensitive(instance['dataValues']);
if (params && !value) {
// Retrieves the value from specified bot instance (no params collection).
value = instance['dataValues'][name];
// If still not found, get from boot bot params.
const minBoot = GBServer.globals.minBoot as any;
if (!value && instance.botId != minBoot.instance.botId) {
instance = minBoot.instance; instance = minBoot.instance;
if(instance.params){
params = typeof (instance.params) === 'object' ? instance.params : JSON.parse(instance.params); params = typeof (instance.params) === 'object' ? instance.params : JSON.parse(instance.params);
params = GBUtil.caseInsensitive(params); params = GBUtil.caseInsensitive(params);
value = params ? params[name] : defaultValue; value = params ? params[name] : defaultValue;
} }
// If still did not found in boot bot params, try instance fields.
if (!value){
value = instance['dataValues'][name];
}
} }
} }
if (value === undefined) { if (value === undefined) {
value = null; value = null;
} }
if (value && typeof defaultValue === 'boolean') { if (value && typeof defaultValue === 'boolean') {
return new Boolean(value ? value.toString().toLowerCase() === 'true' : defaultValue).valueOf(); return new Boolean(value ? value.toString().toLowerCase() === 'true' : defaultValue).valueOf();
} }