Merge pull request #112 from SmythOS/dev

APICall + AgentLog hotfix

Author: alaa-eddine-k

packages/core/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@smythos/sre",
-    "version": "1.5.53",
+    "version": "1.5.54",
     "description": "Smyth Runtime Environment",
     "author": "Alaa-eddine KADDOURI",
     "license": "MIT",

packages/core/src/Components/APICall/APICall.class.ts

@@ -115,7 +115,7 @@ export class APICall extends Component {
             let _error: any = undefined;
             try {
                 // To support both old and new OAuth configuration, we check for both oauth_con_id and oauthService.
-                if ((config?.data?.oauth_con_id !== '' && config?.data?.oauth_con_id !== 'None') || (config?.data?.oauthService !== '' && config.data.oauthService !== 'None')) {
+                if ((config?.data?.oauth_con_id !== undefined && config?.data?.oauth_con_id !== '' && config?.data?.oauth_con_id !== 'None') || (config?.data?.oauthService !== '' && config.data.oauthService !== 'None')) {
                     const additionalParams = extractAdditionalParamsForOAuth1(reqConfig);
                     const oauthHeaders = await generateOAuthHeaders(agent, config, reqConfig, logger, additionalParams);
                     //reqConfig.headers = { ...reqConfig.headers, ...oauthHeaders };

packages/core/src/subsystems/AgentManager/AgentLogger.class.ts

@@ -1,6 +1,6 @@
 import { Agent } from './Agent.class';
 
-import { encode } from 'gpt-tokenizer';
+//import { encode } from 'gpt-tokenizer';
 import { AgentCallLog } from '@sre/types/AgentLogger.types';
 import { debounce, delay, getDayFormattedDate, uid } from '@sre/utils';
 import { Logger } from '@sre/helpers/Log.helper';
@@ -93,10 +93,14 @@ class LogTransaction {
         if (sourceCptName) sourceId += `@${sourceCptName}@${curStepOrder}`;
         if (componentCptName) componentId += `@${componentCptName}@${nextStepOrder}`;
 
-        const inputTokensObj = encode(typeof firstData.input == 'string' ? firstData.input : JSON.stringify(firstData.input) || '');
-        const outputTokensObj = encode(typeof firstData.output == 'string' ? firstData.output : JSON.stringify(firstData.output) || '');
-        const inputTokens = inputTokensObj.length || undefined;
-        const outputTokens = outputTokensObj.length || undefined;
+        //const inputTokensObj = encode(typeof firstData.input == 'string' ? firstData.input : JSON.stringify(firstData.input) || '');
+        //const outputTokensObj = encode(typeof firstData.output == 'string' ? firstData.output : JSON.stringify(firstData.output) || '');
+        //const inputTokens = inputTokensObj.length || undefined;
+        //const outputTokens = outputTokensObj.length || undefined;
+
+        //token length calculation uses high CPU and does not bring much value ==> disabled
+        const inputTokens = undefined;
+        const outputTokens = undefined;
 
         const tags = firstData.tags || '';
         let raw_error =