@memberjunction/server 2.36.1 → 2.37.1

package/src/resolvers/AskSkipResolver.ts

@@ -1,5 +1,5 @@
-import { Arg, Ctx, Field, Int, Mutation, ObjectType, PubSub, PubSubEngine, Query, Resolver } from 'type-graphql';
-import { LogError, LogStatus, Metadata, KeyValuePair, RunView, UserInfo, CompositeKey, EntityFieldInfo, EntityInfo, EntityRelationshipInfo, AllMetadataArrays } from '@memberjunction/core';
+import { Arg, Ctx, Field, Mutation, ObjectType, PubSub, PubSubEngine, Query, Resolver } from 'type-graphql';
+import { LogError, LogStatus, Metadata, RunView, UserInfo, CompositeKey, EntityFieldInfo, EntityInfo, EntityRelationshipInfo } from '@memberjunction/core';
 import { AppContext, UserPayload, MJ_SERVER_EVENT_CODE } from '../types.js';
 import { BehaviorSubject } from 'rxjs';
 import { take } from 'rxjs/operators';
@@ -32,6 +32,9 @@ import {
   SkipConversation,
   SkipAPIArtifact,
   SkipAPIAgentRequest,
+  SkipAPIArtifactRequest,
+  SkipAPIArtifactType,
+  SkipAPIArtifactVersion,
 } from '@memberjunction/skip-types';
 
 import { PUSH_STATUS_UPDATES_TOPIC } from '../generic/PushStatusResolver.js';
@@ -40,6 +43,9 @@ import {
   AIAgentLearningCycleEntity,
   AIAgentNoteEntity,
   AIAgentRequestEntity,
+  ArtifactTypeEntity,
+  ConversationArtifactEntity,
+  ConversationArtifactVersionEntity,
   ConversationDetailEntity,
   ConversationEntity,
   DataContextEntity,
@@ -47,7 +53,7 @@ import {
   UserNotificationEntity,
 } from '@memberjunction/core-entities';
 import { DataSource } from 'typeorm';
-import { ___skipAPIOrgId, ___skipAPIurl, ___skipLearningAPIurl, ___skipLearningCycleIntervalInMinutes, apiKey, baseUrl, configInfo, graphqlPort, mj_core_schema } from '../config.js';
+import { ___skipAPIOrgId, ___skipAPIurl, ___skipLearningAPIurl, ___skipLearningCycleIntervalInMinutes, ___skipRunLearningCycles, apiKey, baseUrl, configInfo, graphqlPort, mj_core_schema } from '../config.js';
 
 import { registerEnumType } from 'type-graphql';
 import { MJGlobal, CopyScalarsAndArrays } from '@memberjunction/global';
@@ -56,6 +62,8 @@ import { GetAIAPIKey } from '@memberjunction/ai';
 import { CompositeKeyInputType } from '../generic/KeyInputOutputTypes.js';
 import { AIAgentEntityExtended, AIEngine } from '@memberjunction/aiengine';
 import { deleteAccessToken, GetDataAccessToken, registerAccessToken, tokenExists } from './GetDataResolver.js';
+import e from 'express';
+import { Skip } from '@graphql-tools/utils';
 
 enum SkipResponsePhase {
   ClarifyingQuestion = 'clarifying_question',
@@ -155,6 +163,23 @@ export class StopLearningCycleResultType {
   CycleDetails: CycleDetailsType;
 }
 
+/**
+ * Internally used type
+ */
+type BaseSkipRequest = {
+  entities: SkipEntityInfo[],
+  queries: SkipQueryInfo[],
+  notes: SkipAPIAgentNote[],
+  noteTypes: SkipAPIAgentNoteType[],
+  requests: SkipAPIAgentRequest[], 
+  accessToken: GetDataAccessToken,
+  organizationID: string,
+  organizationInfo: any,
+  apiKeys: SkipAPIRequestAPIKey[],
+  callingServerURL: string,
+  callingServerAPIKey: string,
+  callingServerAccessToken: string
+}
 @Resolver(AskSkipResultType)
 export class AskSkipResolver {
   private static _defaultNewChatName = 'New Chat';
@@ -162,14 +187,23 @@ export class AskSkipResolver {
   // Static initializer that runs when the class is loaded - initializes the learning cycle scheduler
   static {
     try {
-      LogStatus('Initializing Skip AI Learning Cycle Scheduler');
-      
       // Set up event listener for server initialization
       const eventListener = MJGlobal.Instance.GetEventListener(true);
       eventListener.subscribe(event => {
         // Filter for our server's setup complete 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;
+            }
+            
+            // Check if we have a valid endpoint when cycles are enabled
+            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) {
               // Initialize the scheduler
@@ -181,7 +215,6 @@ export class AskSkipResolver {
               // Default is 60 minutes, if the interval is not set in the config, use 60 minutes
               const interval = ___skipLearningCycleIntervalInMinutes ?? 60;
               scheduler.start(interval);
-              LogStatus(`📅 Skip AI Learning cycle scheduler started with ${interval} minute interval`);
             } else {
               LogError('Cannot initialize Skip learning cycle scheduler: No data sources available');
             }
@@ -190,8 +223,6 @@ export class AskSkipResolver {
           }
         }
       });
-      
-      LogStatus('Skip AI Learning Cycle Scheduler initialization listener registered');
     } catch (error) {
       // Handle any errors from the static initializer
       LogError(`Failed to initialize Skip learning cycle scheduler: ${error}`);
@@ -283,6 +314,30 @@ export class AskSkipResolver {
     @Ctx() { dataSource, userPayload }: AppContext,
     @Arg('ForceEntityRefresh', () => Boolean, { nullable: true }) ForceEntityRefresh?: boolean
   ) {
+      // First check if learning cycles are enabled in configuration
+      if (___skipRunLearningCycles !== 'Y') {
+        return {
+          success: false,
+          error: 'Learning cycles are disabled in configuration',
+          elapsedTime: 0,
+          noteChanges: [],
+          queryChanges: [],
+          requestChanges: []
+        };
+      }
+      
+      // Check if we have a valid endpoint when cycles are enabled
+      if (!___skipLearningAPIurl || ___skipLearningAPIurl.trim() === '') {
+        return {
+          success: false,
+          error: 'Learning cycle API endpoint is not configured',
+          elapsedTime: 0,
+          noteChanges: [],
+          queryChanges: [],
+          requestChanges: []
+        };
+      }
+      
       const startTime = new Date();
       // First, get the user from the cache
       const user = UserCache.Instance.Users.find((u) => u.Email.trim().toLowerCase() === userPayload.email.trim().toLowerCase());
@@ -308,8 +363,6 @@ export class AskSkipResolver {
         };
       }
 
-      LogStatus(`Starting learning cycle for AI agent Skip`);
-
       // Get the Skip agent ID
       const md = new Metadata();
       const skipAgent = AIEngine.Instance.GetAgentByName('Skip');
@@ -342,7 +395,7 @@ export class AskSkipResolver {
       try {
         // Build the request to Skip learning API
         LogStatus(`Building Skip Learning API request`);
-        const input = await this.buildSkipLearningAPIRequest(learningCycleId, lastCompleteLearningCycleDate, true, true, true, true, dataSource, user, ForceEntityRefresh || false);
+        const input = await this.buildSkipLearningAPIRequest(learningCycleId, lastCompleteLearningCycleDate, true, true, true, false, dataSource, user, ForceEntityRefresh || false);
 
         // Make the API request
         const response = await this.handleSimpleSkipLearningPostRequest(input, user, learningCycleId, agentID);
@@ -625,7 +678,7 @@ cycle.`);
     forceEntitiesRefresh: boolean = false,
     includeCallBackKeyAndAccessToken: boolean = false,
     additionalTokenInfo: any = {}
-  ) {
+  ): Promise<BaseSkipRequest> {
     
     const entities = includeEntities ? await this.BuildSkipEntities(dataSource, forceEntitiesRefresh) : [];
     const queries = includeQueries ? this.BuildSkipQueries() : [];
@@ -657,7 +710,7 @@ cycle.`);
       noteTypes,
       requests, 
       accessToken,
-      organizationId: ___skipAPIOrgId,
+      organizationID: ___skipAPIOrgId,
       organizationInfo: configInfo?.askSkip?.organizationInfo,
       apiKeys: this.buildSkipAPIKeys(),
       callingServerURL: accessToken ? `${baseUrl}:${graphqlPort}` : undefined,
@@ -698,7 +751,7 @@ cycle.`);
 
     // Create the learning-specific request object
     const input: SkipAPILearningCycleRequest = {
-      organizationId: baseRequest.organizationId,
+      organizationId: baseRequest.organizationID,
       organizationInfo: baseRequest.organizationInfo,
       learningCycleId,
       lastLearningCycleDate,
@@ -858,23 +911,101 @@ cycle.`);
       additionalTokenInfo
     );
 
+    const artifacts: SkipAPIArtifact[] = await this.buildSkipAPIArtifacts(contextUser, dataSource, conversationId);
+
     // Create the chat-specific request object
     const input: SkipAPIRequest = {
+      ...baseRequest,
       messages,
       conversationID: conversationId.toString(),
       dataContext: <DataContext>CopyScalarsAndArrays(dataContext), // we are casting this to DataContext as we're pushing this to the Skip API, and we don't want to send the real DataContext object, just a copy of the scalar and array properties
-      organizationID: baseRequest.organizationId,
       requestPhase,
-      entities: baseRequest.entities,
-      queries: baseRequest.queries,
-      notes: baseRequest.notes,
-      noteTypes: baseRequest.noteTypes,
-      apiKeys: baseRequest.apiKeys,
+      artifacts: artifacts
     };
     
     return input;
   }
 
+  /**
+   * Builds up an array of SkipAPIArtifact types to send across information about the artifacts associated with this particular
+   * conversation.
+   * @param contextUser 
+   * @param dataSource 
+   * @param conversationId 
+   * @returns 
+   */
+  protected async buildSkipAPIArtifacts(contextUser: UserInfo, dataSource: DataSource, conversationId: string): Promise<SkipAPIArtifact[]> {
+    const md = new Metadata();
+    const ei = md.EntityByName('MJ: Conversation Artifacts');
+    const rv = new RunView();
+    const results = await rv.RunViews([
+      {
+        EntityName: "MJ: Conversation Artifacts",
+        ExtraFilter: `ConversationID='${conversationId}'`, // get artifacts linked to this convo
+        OrderBy: "__mj_CreatedAt"
+      },
+      {
+        EntityName: "MJ: Artifact Types", // get all artifact types
+        OrderBy: "Name"
+      },
+      {
+        EntityName: "MJ: Conversation Artifact Versions",
+        ExtraFilter: `ConversationArtifactID IN (SELECT ID FROM [${ei.SchemaName}].[${ei.BaseView}] WHERE ConversationID='${conversationId}')`,
+        OrderBy: 'ConversationArtifactID, __mj_CreatedAt'
+      }
+    ], contextUser);
+    if (results && results.length > 0 && results.every((r) => r.Success)) {
+      const types: SkipAPIArtifactType[] = results[1].Results.map((a: ArtifactTypeEntity) => {
+        const retVal: SkipAPIArtifactType = {
+          id: a.ID,
+          name: a.Name,
+          description: a.Description,
+          contentType: a.ContentType,
+          enabled: a.IsEnabled,
+          createdAt: a.__mj_CreatedAt,
+          updatedAt: a.__mj_UpdatedAt
+        }
+        return retVal;
+      });
+      const allConvoArtifacts = results[0].Results.map((a: ConversationArtifactEntity) => {
+        const rawVersions: ConversationArtifactVersionEntity[] = results[2].Results as ConversationArtifactVersionEntity[];
+        const thisArtifactsVersions = rawVersions.filter(rv => rv.ConversationArtifactID === a.ID);
+        const versionsForThisArtifact: SkipAPIArtifactVersion[] = thisArtifactsVersions.map((v: ConversationArtifactVersionEntity) => {
+          const versionRetVal: SkipAPIArtifactVersion = {
+            id: v.ID,
+            artifactId: v.ConversationArtifactID,
+            version: v.Version,
+            configuration: v.Configuration,
+            content: v.Content,
+            comments: v.Comments,
+            createdAt: v.__mj_CreatedAt,
+            updatedAt: v.__mj_UpdatedAt
+          };
+          return versionRetVal;
+        });
+        const artifactRetVal: SkipAPIArtifact = {
+          id: a.ID,
+          name: a.Name,
+          description: a.Description,
+          comments: a.Comments,
+          sharingScope: a.SharingScope as 'None' |'SpecificUsers' |'Everyone' |'Public',
+          versions: versionsForThisArtifact,
+          conversationId: a.ConversationID,
+          artifactType: types.find((t => t.id === a.ArtifactTypeID)),
+          createdAt: a.__mj_CreatedAt,
+          updatedAt: a.__mj_UpdatedAt
+        };
+        return artifactRetVal;
+      });
+
+      return allConvoArtifacts;
+    }
+    else {
+      return [];
+    }
+  }
+
+
   /**
    * Executes a script in the context of a data context and returns the results
    * @param pubSub
@@ -1452,7 +1583,6 @@ cycle.`);
     convoDetailEntity.Message = UserQuestion;
     convoDetailEntity.Role = 'User';
     convoDetailEntity.HiddenToUser = false;
-    convoDetailEntity.Set('Sequence', 1); // using weakly typed here because we're going to get rid of this field soon
     let convoDetailSaveResult: boolean = await convoDetailEntity.Save();
     if (!convoDetailSaveResult) {
       LogError(`Error saving conversation detail entity for user message: ${UserQuestion}`, undefined, convoDetailEntity.LatestResult);
@@ -1782,7 +1912,8 @@ cycle.`);
       user,
       convoEntity,
       pubSub,
-      userPayload
+      userPayload,
+      dataSource
     );
     const response: AskSkipResultType = {
       Success: true,
@@ -2012,11 +2143,66 @@ cycle.`);
     user: UserInfo,
     convoEntity: ConversationEntity,
     pubSub: PubSubEngine,
-    userPayload: UserPayload
+    userPayload: UserPayload,
+    dataSource: DataSource
   ): Promise<{ AIMessageConversationDetailID: string }> {
     const sTitle = apiResponse.reportTitle;
     const sResult = JSON.stringify(apiResponse);
 
+    // first up, let's see if Skip asked us to create an artifact or add a new version to an existing artifact, or NOT
+    // use artifacts at all...
+    let artifactId: string = null;
+    let artifactVersionId: string = null;
+
+    if (apiResponse.artifactRequest?.action === 'new_artifact' || apiResponse.artifactRequest?.action === 'new_artifact_version') {
+      // Skip has requested that we create a new artifact or add a new version to an existing artifact
+      artifactId = apiResponse.artifactRequest.artifactId; // will only be populated if action == new_artifact_version
+      let newVersion: number = 0;
+      if (apiResponse.artifactRequest?.action === 'new_artifact') {
+        const artifactEntity = await md.GetEntityObject<ConversationArtifactEntity>('MJ: Convesration Artifacts', user);
+        // create the new artifact here
+        artifactEntity.NewRecord();
+        artifactEntity.ConversationID = convoEntity.ID;
+        artifactEntity.Name = apiResponse.artifactRequest.name;
+        artifactEntity.Description = apiResponse.artifactRequest.description;
+        if (await artifactEntity.Save()) {
+          // saved, grab the new ID
+          artifactId = artifactEntity.ID;
+        }
+        else {
+          LogError(`Error saving artifact entity for conversation: ${convoEntity.ID}`, undefined, artifactEntity.LatestResult);
+        }
+        newVersion = 1;
+      }
+      else {
+        // we are updating an existing artifact with a new vesrion so we need to get the old max version and increment it
+        const ei = md.EntityByName("MJ: Convesration Artifacts");        
+        const sSQL = `SELECT ISNULL(MAX(Version),0) AS MaxVersion FROM [${ei.SchemaName}].[${ei.BaseView}] WHERE ID = '${artifactId}'`;
+        const result = await dataSource.query(sSQL);
+        if (result && result.length > 0) {
+          newVersion = result[0].MaxVersion + 1;
+        } else {
+          LogError(`Error getting max version for artifact ID: ${artifactId}`, undefined, result);
+        }
+      }
+      if (artifactId && newVersion > 0) {
+        // only do this if we were provided an artifact ID or we saved a new one above successfully
+        const artifactVersionEntity = await md.GetEntityObject<ConversationArtifactVersionEntity>('MJ: Conversation Artifact Versions', user);
+        // create the new artifact version here
+        artifactVersionEntity.NewRecord();
+        artifactVersionEntity.ConversationArtifactID = artifactId;
+        artifactVersionEntity.Version = newVersion;
+        artifactVersionEntity.Configuration = sResult; // store the full response here
+        if (await artifactVersionEntity.Save()) {
+          // success saving the new version, set the artifactVersionId
+          artifactVersionId = artifactVersionEntity.ID;
+        }
+        else {
+          LogError(`Error saving Artifact Version record`)
+        }
+      }
+    }
+
     // Create a conversation detail record for the Skip response
     const convoDetailEntityAI = <ConversationDetailEntity>await md.GetEntityObject('Conversation Details', user);
     convoDetailEntityAI.NewRecord();
@@ -2024,7 +2210,13 @@ cycle.`);
     convoDetailEntityAI.Message = sResult;
     convoDetailEntityAI.Role = 'AI';
     convoDetailEntityAI.HiddenToUser = false;
-    convoDetailEntityAI.Set('Sequence', 2); // using weakly typed here because we're going to get rid of this field soon
+    if (artifactId && artifactId.length > 0) {
+      // bind the new convo detail record to the artifact + version for this response
+      convoDetailEntityAI.ArtifactID = artifactId;
+      if (artifactVersionId && artifactVersionId.length > 0) {
+        convoDetailEntityAI.ArtifactVersionID = artifactVersionId;
+      }
+    }    
     const convoDetailSaveResult: boolean = await convoDetailEntityAI.Save();
     if (!convoDetailSaveResult) {
       LogError(`Error saving conversation detail entity for AI message: ${sResult}`, undefined, convoDetailEntityAI.LatestResult);
@@ -2070,7 +2262,7 @@ cycle.`);
     // Save the data context items...
     // FOR NOW, we don't want to store the data in the database, we will just load it from the data context when we need it
     // we need a better strategy to persist because the cost of storage and retrieval/parsing is higher than just running the query again in many/most cases
-    dataContext.SaveItems(user, false);
+    await dataContext.SaveItems(user, false);
 
     // send a UI update trhough pub-sub
     pubSub.publish(PUSH_STATUS_UPDATES_TOPIC, {
@@ -2121,6 +2313,22 @@ cycle.`);
     try {
       LogStatus('Manual execution of Skip learning cycle requested via API');
       
+      // First check if learning cycles are enabled in configuration
+      if (___skipRunLearningCycles !== 'Y') {
+        return {
+          Success: false,
+          Message: 'Learning cycles are disabled in configuration'
+        };
+      }
+      
+      // Check if we have a valid endpoint when cycles are enabled
+      if (!___skipLearningAPIurl || ___skipLearningAPIurl.trim() === '') {
+        return {
+          Success: false,
+          Message: 'Learning cycle API endpoint is not configured'
+        };
+      }
+      
       // Use the organization ID from config if not provided
       const orgId = OrganizationId || ___skipAPIOrgId;
       

package/src/scheduler/LearningCycleScheduler.ts

@@ -39,22 +39,21 @@ export class LearningCycleScheduler extends BaseSingleton<LearningCycleScheduler
   /**
    * Start the scheduler with the specified interval in minutes
    * @param intervalMinutes The interval in minutes between runs
+   * @param skipLearningAPIurl The URL for the learning cycle API endpoint
    */
   public start(intervalMinutes: number = 60): void {
-    
-    // start learning cycle immediately upon the server start
-    this.runLearningCycle()
-      .catch(error => LogError(`Error in initial learning cycle: ${error}`));
-    
-    const intervalMs = intervalMinutes * 60 * 1000;
-    
     LogStatus(`Starting learning cycle scheduler with interval of ${intervalMinutes} minutes`);
     
-    // Schedule the recurring task
+    // Set up the interval for recurring calls
+    const intervalMs = intervalMinutes * 60 * 1000;
     this.intervalId = setInterval(() => {
       this.runLearningCycle()
         .catch(error => LogError(`Error in scheduled learning cycle: ${error}`));
     }, intervalMs);
+    
+    // Start learning cycle immediately upon the server start
+    this.runLearningCycle()
+      .catch(error => LogError(`Error in initial learning cycle: ${error}`));
   }
   
   /**
@@ -76,8 +75,6 @@ export class LearningCycleScheduler extends BaseSingleton<LearningCycleScheduler
     const startTime = new Date();
     
     try {
-      LogStatus('Starting scheduled learning cycle execution');
-
       // Make sure we have data sources
       if (!this.dataSources || this.dataSources.length === 0) {
         throw new Error('No data sources available for the learning cycle');