@memberjunction/server 2.39.0 → 2.40.0

package/dist/resolvers/AskSkipResolver.js

@@ -22,7 +22,7 @@ import { LoadDataContextItemsServer } from '@memberjunction/data-context-server'
 import { LearningCycleScheduler } from '../scheduler/LearningCycleScheduler.js';
 LoadDataContextItemsServer();
 import { PUSH_STATUS_UPDATES_TOPIC } from '../generic/PushStatusResolver.js';
-import { ___skipAPIOrgId, ___skipAPIurl, ___skipLearningAPIurl, ___skipLearningCycleIntervalInMinutes, ___skipRunLearningCycles, apiKey, baseUrl, configInfo, graphqlPort, mj_core_schema } from '../config.js';
+import { apiKey, baseUrl, configInfo, graphqlPort, mj_core_schema } from '../config.js';
 import { registerEnumType } from 'type-graphql';
 import { MJGlobal, CopyScalarsAndArrays } from '@memberjunction/global';
 import { sendPostRequest } from '../util.js';
@@ -191,44 +191,60 @@ StopLearningCycleResultType = __decorate([
     ObjectType()
 ], StopLearningCycleResultType);
 export { StopLearningCycleResultType };
-let AskSkipResolver = class AskSkipResolver {
-    static { AskSkipResolver_1 = this; }
-    static _defaultNewChatName = 'New Chat';
-    static {
-        try {
-            const eventListener = MJGlobal.Instance.GetEventListener(true);
-            eventListener.subscribe(event => {
-                if (event.eventCode === MJ_SERVER_EVENT_CODE && event.args?.type === 'setupComplete') {
-                    try {
-                        if (___skipRunLearningCycles !== 'Y') {
-                            LogStatus('Skip AI Learning cycle scheduler not started: Disabled in configuration');
-                            return;
-                        }
-                        if (!___skipLearningAPIurl || ___skipLearningAPIurl.trim() === '') {
-                            LogError('Skip AI Learning cycle scheduler not started: Learning cycles are enabled but no API endpoint is configured');
-                            return;
-                        }
-                        const dataSources = event.args.dataSources;
-                        if (dataSources && dataSources.length > 0) {
-                            const scheduler = LearningCycleScheduler.Instance;
-                            scheduler.setDataSources(dataSources);
-                            const interval = ___skipLearningCycleIntervalInMinutes ?? 60;
+function initializeSkipLearningCycleScheduler() {
+    try {
+        const eventListener = MJGlobal.Instance.GetEventListener(true);
+        eventListener.subscribe(event => {
+            if (event.eventCode === MJ_SERVER_EVENT_CODE && event.args?.type === 'setupComplete') {
+                try {
+                    const skipConfigInfo = configInfo.askSkip;
+                    if (!skipConfigInfo) {
+                        LogStatus('Skip AI Learning Cycle Scheduler not started: Skip configuration not found');
+                        return;
+                    }
+                    if (!skipConfigInfo.learningCycleEnabled) {
+                        LogStatus('Skip AI Learning Cycles not enabled in configuration');
+                        return;
+                    }
+                    if (!skipConfigInfo.learningCycleURL || skipConfigInfo.learningCycleURL.trim().length === 0) {
+                        LogError('Skip AI Learning cycle scheduler not started: Learning cycles are enabled but no Learning Cycle API endpoint is configured');
+                        return;
+                    }
+                    const dataSources = event.args.dataSources;
+                    if (dataSources && dataSources.length > 0) {
+                        const scheduler = LearningCycleScheduler.Instance;
+                        scheduler.setDataSources(dataSources);
+                        const interval = skipConfigInfo.learningCycleIntervalInMinutes ?? 60;
+                        if (skipConfigInfo.learningCycleRunUponStartup) {
+                            LogStatus('Skip API Learning Cycle: Run Upon Startup is enabled, running learning cycle immediately');
                             scheduler.start(interval);
                         }
                         else {
-                            LogError('Cannot initialize Skip learning cycle scheduler: No data sources available');
+                            LogStatus(`Skip API Learning Cycle: Scheduler first run will start after interval of ${interval} minutes. If you want a learing cycle to run immediately, set the learningCycleRunUponStartup property in the config file to true.`);
+                            setTimeout(() => {
+                                LogStatus(`Skip API Learning Cycle: Starting scheduler after ${interval} minutes. If you want a learing cycle to run immediately, set the learningCycleRunUponStartup property in the config file to true.`);
+                                scheduler.start(interval);
+                            }, interval * 60 * 1000);
                         }
                     }
-                    catch (error) {
-                        LogError(`Error initializing Skip learning cycle scheduler: ${error}`);
+                    else {
+                        LogError('Cannot initialize Skip learning cycle scheduler: No data sources available');
                     }
                 }
-            });
-        }
-        catch (error) {
-            LogError(`Failed to initialize Skip learning cycle scheduler: ${error}`);
-        }
+                catch (error) {
+                    LogError(`Error initializing Skip learning cycle scheduler: ${error}`);
+                }
+            }
+        });
     }
+    catch (error) {
+        LogError(`Failed to initialize Skip learning cycle scheduler: ${error}`);
+    }
+}
+initializeSkipLearningCycleScheduler();
+let AskSkipResolver = class AskSkipResolver {
+    static { AskSkipResolver_1 = this; }
+    static _defaultNewChatName = 'New Chat';
     static _maxHistoricalMessages = 30;
     async ExecuteAskSkipRecordChat(UserQuestion, ConversationId, EntityName, compositeKey, { dataSource, userPayload }, pubSub) {
         const user = UserCache.Instance.Users.find((u) => u.Email.trim().toLowerCase() === userPayload.email.trim().toLowerCase());
@@ -271,17 +287,18 @@ let AskSkipResolver = class AskSkipResolver {
         return this.handleSimpleSkipChatPostRequest(input, convoEntity.ID, convoDetailEntity.ID, true, user);
     }
     async ExecuteAskSkipLearningCycle({ dataSource, userPayload }, ForceEntityRefresh) {
-        if (___skipRunLearningCycles !== 'Y') {
+        const skipConfigInfo = configInfo.askSkip;
+        if (!skipConfigInfo.learningCycleEnabled) {
             return {
                 success: false,
-                error: 'Learning cycles are disabled in configuration',
+                error: 'Learning cycles are not enabled in configuration',
                 elapsedTime: 0,
                 noteChanges: [],
                 queryChanges: [],
                 requestChanges: []
             };
         }
-        if (!___skipLearningAPIurl || ___skipLearningAPIurl.trim() === '') {
+        if (!skipConfigInfo.learningCycleURL || skipConfigInfo.learningCycleURL.trim().length === 0) {
             return {
                 success: false,
                 error: 'Learning cycle API endpoint is not configured',
@@ -296,7 +313,7 @@ let AskSkipResolver = class AskSkipResolver {
         if (!user)
             throw new Error(`User ${userPayload.email} not found in UserCache`);
         await AIEngine.Instance.Config(false, user);
-        const organizationId = ___skipAPIOrgId;
+        const organizationId = skipConfigInfo.orgID;
         const scheduler = LearningCycleScheduler.Instance;
         const runningStatus = scheduler.isOrganizationRunningCycle(organizationId);
         if (runningStatus.isRunning) {
@@ -331,17 +348,36 @@ let AskSkipResolver = class AskSkipResolver {
         try {
             LogStatus(`Building Skip Learning API request`);
             const input = await this.buildSkipLearningAPIRequest(learningCycleId, lastCompleteLearningCycleDate, true, true, true, false, dataSource, user, ForceEntityRefresh || false);
-            const response = await this.handleSimpleSkipLearningPostRequest(input, user, learningCycleId, agentID);
-            const endTime = new Date();
-            const elapsedTimeMs = endTime.getTime() - startTime.getTime();
-            LogStatus(`Learning cycle finished with status: ${response.success ? 'Success' : 'Failed'} in ${elapsedTimeMs / 1000} seconds`);
-            learningCycleEntity.Status = response.success ? 'Complete' : 'Failed';
-            learningCycleEntity.EndedAt = endTime;
-            if (!(await learningCycleEntity.Save())) {
-                LogError(`Failed to update learning cycle record: ${learningCycleEntity.LatestResult.Error}`);
+            if (input.newConversations.length === 0) {
+                LogStatus(`  Skip Learning Cycles: No new conversations to process for learning cycle`);
+                learningCycleEntity.Status = 'Complete';
+                learningCycleEntity.AgentSummary = 'No new conversations to process, learning cycle skipped, but recorded for audit purposes.';
+                learningCycleEntity.EndedAt = new Date();
+                if (!(await learningCycleEntity.Save())) {
+                    LogError(`Failed to update learning cycle record: ${learningCycleEntity.LatestResult.Error}`);
+                }
+                const result = {
+                    success: true,
+                    learningCycleSkipped: true,
+                    elapsedTime: 0,
+                    noteChanges: [],
+                    queryChanges: [],
+                    requestChanges: [],
+                };
+                return result;
+            }
+            else {
+                const response = await this.handleSimpleSkipLearningPostRequest(input, user, learningCycleId, agentID);
+                const endTime = new Date();
+                const elapsedTimeMs = endTime.getTime() - startTime.getTime();
+                LogStatus(`Learning cycle finished with status: ${response.success ? 'Success' : 'Failed'} in ${elapsedTimeMs / 1000} seconds`);
+                learningCycleEntity.Status = response.success ? 'Complete' : 'Failed';
+                learningCycleEntity.EndedAt = endTime;
+                if (!(await learningCycleEntity.Save())) {
+                    LogError(`Failed to update learning cycle record: ${learningCycleEntity.LatestResult.Error}`);
+                }
+                return response;
             }
-            scheduler.unregisterRunningCycle(organizationId);
-            return response;
         }
         catch (error) {
             learningCycleEntity.Status = 'Failed';
@@ -352,13 +388,21 @@ let AskSkipResolver = class AskSkipResolver {
             catch (saveError) {
                 LogError(`Failed to update learning cycle record after error: ${saveError}`);
             }
-            scheduler.unregisterRunningCycle(organizationId);
             throw error;
         }
+        finally {
+            try {
+                scheduler.unregisterRunningCycle(organizationId);
+            }
+            catch (error) {
+                LogError(`Failed to unregister organization ${organizationId} from running cycles: ${error}`);
+            }
+        }
     }
     async handleSimpleSkipLearningPostRequest(input, user, learningCycleId, agentID) {
-        LogStatus(`   >>> HandleSimpleSkipLearningPostRequest Sending request to Skip API: ${___skipLearningAPIurl}`);
-        const response = await sendPostRequest(___skipLearningAPIurl, input, true, null);
+        const skipConfigInfo = configInfo.askSkip;
+        LogStatus(`   >>> HandleSimpleSkipLearningPostRequest Sending request to Skip API: ${skipConfigInfo.learningCycleURL}`);
+        const response = await sendPostRequest(skipConfigInfo.learningCycleURL, input, true, null);
         if (response && response.length > 0) {
             const apiResponse = response[response.length - 1].value;
             LogStatus(`  Skip API response: ${apiResponse.success}`);
@@ -379,8 +423,9 @@ let AskSkipResolver = class AskSkipResolver {
         }
     }
     async handleSimpleSkipChatPostRequest(input, conversationID = '', UserMessageConversationDetailId = '', createAIMessageConversationDetail = false, user = null) {
-        LogStatus(`   >>> HandleSimpleSkipChatPostRequest Sending request to Skip API: ${___skipAPIurl}`);
-        const response = await sendPostRequest(___skipAPIurl, input, true, null);
+        const skipConfigInfo = configInfo.askSkip;
+        LogStatus(`   >>> HandleSimpleSkipChatPostRequest Sending request to Skip API: ${skipConfigInfo.chatURL}`);
+        const response = await sendPostRequest(skipConfigInfo.chatURL, input, true, null);
         if (response && response.length > 0) {
             const apiResponse = response[response.length - 1].value;
             const AIMessageConversationDetailID = createAIMessageConversationDetail
@@ -445,10 +490,6 @@ let AskSkipResolver = class AskSkipResolver {
                 }
             }
             else {
-                if (change.note.agentNoteType === "Human") {
-                    LogStatus(`WARNING: Cannot create a new Human note with the learning cycle. Operation ignored.`);
-                    return false;
-                }
                 noteEntity.NewRecord();
                 noteEntity.AgentID = agentID;
             }
@@ -506,10 +547,11 @@ cycle.`);
             return '';
         }
     }
-    async buildBaseSkipRequest(contextUser, dataSource, includeEntities, includeQueries, includeNotes, includeRequests, forceEntitiesRefresh = false, includeCallBackKeyAndAccessToken = false, additionalTokenInfo = {}) {
+    async buildBaseSkipRequest(contextUser, dataSource, includeEntities, includeQueries, includeNotes, filterUserNotesToContextUser, includeRequests, forceEntitiesRefresh = false, includeCallBackKeyAndAccessToken = false, additionalTokenInfo = {}) {
+        const skipConfigInfo = configInfo.askSkip;
         const entities = includeEntities ? await this.BuildSkipEntities(dataSource, forceEntitiesRefresh) : [];
         const queries = includeQueries ? this.BuildSkipQueries() : [];
-        const { notes, noteTypes } = includeNotes ? await this.BuildSkipAgentNotes(contextUser) : { notes: [], noteTypes: [] };
+        const { notes, noteTypes } = includeNotes ? await this.BuildSkipAgentNotes(contextUser, filterUserNotesToContextUser) : { notes: [], noteTypes: [] };
         const requests = includeRequests ? await this.BuildSkipRequests(contextUser) : [];
         let accessToken;
         if (includeCallBackKeyAndAccessToken) {
@@ -529,7 +571,7 @@ cycle.`);
             noteTypes,
             requests,
             accessToken,
-            organizationID: ___skipAPIOrgId,
+            organizationID: skipConfigInfo.orgID,
             organizationInfo: configInfo?.askSkip?.organizationInfo,
             apiKeys: this.buildSkipAPIKeys(),
             callingServerURL: accessToken ? `${baseUrl}:${graphqlPort}` : undefined,
@@ -538,7 +580,7 @@ cycle.`);
         };
     }
     async buildSkipLearningAPIRequest(learningCycleId, lastLearningCycleDate, includeEntities, includeQueries, includeNotes, includeRequests, dataSource, contextUser, forceEntitiesRefresh = false, includeCallBackKeyAndAccessToken = false) {
-        const baseRequest = await this.buildBaseSkipRequest(contextUser, dataSource, includeEntities, includeQueries, includeNotes, includeRequests, forceEntitiesRefresh, includeCallBackKeyAndAccessToken);
+        const baseRequest = await this.buildBaseSkipRequest(contextUser, dataSource, includeEntities, includeQueries, includeNotes, false, includeRequests, forceEntitiesRefresh, includeCallBackKeyAndAccessToken);
         const newConversations = await this.BuildSkipLearningCycleNewConversations(lastLearningCycleDate, dataSource, contextUser);
         const input = {
             organizationId: baseRequest.organizationID,
@@ -638,7 +680,7 @@ cycle.`);
             conversationId,
             requestPhase,
         };
-        const baseRequest = await this.buildBaseSkipRequest(contextUser, dataSource, includeEntities, includeQueries, includeNotes, includeRequests, forceEntitiesRefresh, includeCallBackKeyAndAccessToken, additionalTokenInfo);
+        const baseRequest = await this.buildBaseSkipRequest(contextUser, dataSource, includeEntities, includeQueries, includeNotes, true, includeRequests, forceEntitiesRefresh, includeCallBackKeyAndAccessToken, additionalTokenInfo);
         const artifacts = await this.buildSkipAPIArtifacts(contextUser, dataSource, conversationId);
         const input = {
             ...baseRequest,
@@ -804,7 +846,7 @@ cycle.`);
             };
         });
     }
-    async BuildSkipAgentNotes(contextUser) {
+    async BuildSkipAgentNotes(contextUser, filterUserNotesToContextUser) {
         try {
             await AIEngine.Instance.Config(false, contextUser);
             const agent = AIEngine.Instance.GetAgentByName('Skip');
@@ -824,6 +866,10 @@ cycle.`);
                         updatedAt: r.__mj_UpdatedAt,
                     };
                 });
+                if (filterUserNotesToContextUser) {
+                    notes = notes.filter((n) => n.type === 'Global' ||
+                        (n.type === 'User' && n.userId === contextUser.ID));
+                }
                 noteTypes = AIEngine.Instance.AgentNoteTypes.map((r) => {
                     return {
                         id: r.ID,
@@ -951,7 +997,7 @@ cycle.`);
     async refreshSkipEntities(dataSource) {
         try {
             const md = new Metadata();
-            const skipSpecialIncludeEntities = (configInfo.askSkip?.entitiesToSendSkip?.includeEntitiesFromExcludedSchemas ?? [])
+            const skipSpecialIncludeEntities = (configInfo.askSkip?.entitiesToSend?.includeEntitiesFromExcludedSchemas ?? [])
                 .map((e) => e.trim().toLowerCase());
             const entities = md.Entities.filter((e) => {
                 if (e.SchemaName !== mj_core_schema || skipSpecialIncludeEntities.includes(e.Name.trim().toLowerCase())) {
@@ -1261,7 +1307,8 @@ cycle.`);
         }
     }
     async HandleSkipChatRequest(input, UserQuestion, user, dataSource, ConversationId, userPayload, pubSub, md, convoEntity, convoDetailEntity, dataContext, dataContextEntity, conversationDetailCount) {
-        LogStatus(`   >>> HandleSkipRequest: Sending request to Skip API: ${___skipAPIurl}`);
+        const skipConfigInfo = configInfo.askSkip;
+        LogStatus(`   >>> HandleSkipRequest: Sending request to Skip API: ${skipConfigInfo.chatURL}`);
         if (conversationDetailCount > 10) {
             pubSub.publish(PUSH_STATUS_UPDATES_TOPIC, {
                 message: JSON.stringify({
@@ -1282,7 +1329,7 @@ cycle.`);
                 AIMessageConversationDetailId: '',
             };
         }
-        const response = await sendPostRequest(___skipAPIurl, input, true, null, (message) => {
+        const response = await sendPostRequest(skipConfigInfo.chatURL, input, true, null, (message) => {
             LogStatus(JSON.stringify(message, null, 4));
             if (message.type === 'status_update') {
                 pubSub.publish(PUSH_STATUS_UPDATES_TOPIC, {
@@ -1636,14 +1683,14 @@ cycle.`);
             AIMessageConversationDetailID: convoDetailEntityAI.ID,
         };
     }
-    getAgentNoteTypeIDByName(name) {
+    getAgentNoteTypeIDByName(name, defaultNoteType = 'AI') {
         const noteTypeID = AIEngine.Instance.AgentNoteTypes.find(nt => nt.Name.trim().toLowerCase() === name.trim().toLowerCase())?.ID;
         if (noteTypeID) {
             return noteTypeID;
         }
         else {
-            const AINoteTypeID = AIEngine.Instance.AgentNoteTypes.find(nt => nt.Name.trim().toLowerCase() === 'AI')?.ID;
-            return AINoteTypeID;
+            const defaultNoteTypeID = AIEngine.Instance.AgentNoteTypes.find(nt => nt.Name.trim().toLowerCase() === defaultNoteType.trim().toLowerCase())?.ID;
+            return defaultNoteTypeID;
         }
     }
     async getViewData(ViewId, user) {
@@ -1657,19 +1704,20 @@ cycle.`);
     async ManuallyExecuteSkipLearningCycle(OrganizationId) {
         try {
             LogStatus('Manual execution of Skip learning cycle requested via API');
-            if (___skipRunLearningCycles !== 'Y') {
+            const skipConfigInfo = configInfo.askSkip;
+            if (!skipConfigInfo.learningCycleEnabled) {
                 return {
                     Success: false,
-                    Message: 'Learning cycles are disabled in configuration'
+                    Message: 'Learning cycles are not enabled in configuration'
                 };
             }
-            if (!___skipLearningAPIurl || ___skipLearningAPIurl.trim() === '') {
+            if (!skipConfigInfo.learningCycleURL || skipConfigInfo.learningCycleURL.trim().length === 0) {
                 return {
                     Success: false,
                     Message: 'Learning cycle API endpoint is not configured'
                 };
             }
-            const orgId = OrganizationId || ___skipAPIOrgId;
+            const orgId = OrganizationId || skipConfigInfo.orgID;
             const result = await LearningCycleScheduler.Instance.manuallyExecuteLearningCycle(orgId);
             return {
                 Success: result,
@@ -1711,7 +1759,8 @@ cycle.`);
     }
     async IsOrganizationRunningLearningCycle(OrganizationId) {
         try {
-            const orgId = OrganizationId || ___skipAPIOrgId;
+            const skipConfigInfo = configInfo.askSkip;
+            const orgId = OrganizationId || skipConfigInfo.orgID;
             const status = LearningCycleScheduler.Instance.isOrganizationRunningCycle(orgId);
             if (!status.isRunning) {
                 return null;
@@ -1730,7 +1779,7 @@ cycle.`);
     }
     async StopLearningCycleForOrganization(OrganizationId) {
         try {
-            const orgId = OrganizationId || ___skipAPIOrgId;
+            const orgId = OrganizationId || configInfo.askSkip.orgID;
             const result = LearningCycleScheduler.Instance.stopLearningCycleForOrganization(orgId);
             return {
                 Success: result.success,