@memberjunction/server 2.16.1 → 2.18.0

package/src/generic/ResolverBase.ts

@@ -573,8 +573,11 @@ export class ResolverBase {
         return this.MapFieldNamesToCodeNames(entityName, entityObject.GetAll());
       }
       // save failed, return null
-      else throw entityObject.LatestResult.Message;
-    } else return null;
+      else 
+        throw entityObject.LatestResult?.Message;
+    } 
+    else 
+      return null;
   }
 
   // Before/After CREATE Event Hooks for Sub-Classes to Override

package/src/resolvers/AskSkipResolver.ts

@@ -19,6 +19,7 @@ import {
   SkipAPIRequestAPIKey,
   SkipRequestPhase,
   SkipAPIAgentNote,
+  SkipAPIAgentNoteType,
 } from '@memberjunction/skip-types';
 
 import { PUSH_STATUS_UPDATES_TOPIC } from '../generic/PushStatusResolver.js';
@@ -37,6 +38,7 @@ import { MJGlobal, CopyScalarsAndArrays } from '@memberjunction/global';
 import { sendPostRequest } from '../util.js';
 import { GetAIAPIKey } from '@memberjunction/ai';
 import { CompositeKeyInputType } from '../generic/KeyInputOutputTypes.js';
+import { AIAgentEntityExtended, AIEngine } from '@memberjunction/aiengine';
 
 enum SkipResponsePhase {
   ClarifyingQuestion = 'clarifying_question',
@@ -232,7 +234,7 @@ export class AskSkipResolver {
   ): Promise<SkipAPIRequest> {
     const entities = includeEntities ? this.BuildSkipEntities() : [];
     const queries = includeQueries ? this.BuildSkipQueries() : [];
-    const notes = includeNotes ? await this.BuildSkipAgentNotes(contextUser) : [];
+    const {notes, noteTypes} = includeNotes ? await this.BuildSkipAgentNotes(contextUser) : {notes: [], noteTypes: []}; 
     const input: SkipAPIRequest = {
       apiKeys: this.buildSkipAPIKeys(),
       organizationInfo: configInfo?.askSkip?.organizationInfo,
@@ -243,7 +245,8 @@ export class AskSkipResolver {
       requestPhase: requestPhase,
       entities: entities,
       queries: queries,
-      notes: notes
+      notes: notes,
+      noteTypes: noteTypes
     };
     return input;
   }
@@ -343,9 +346,14 @@ export class AskSkipResolver {
     );
   }
 
-  protected BuildSkipQueries(): SkipQueryInfo[] {
+  /**
+   * Packages up the Approved queries from the metadata
+   * @returns 
+   */
+  protected BuildSkipQueries(status: "Pending" | "In-Review" | "Approved" | "Rejected" | "Obsolete" = 'Approved'): SkipQueryInfo[] {
     const md = new Metadata();
-    return md.Queries.map((q) => {
+    const approvedQueries = md.Queries.filter((q) => q.Status === status);
+    return approvedQueries.map((q) => {
       return {
         id: q.ID,
         name: q.Name,
@@ -386,38 +394,49 @@ export class AskSkipResolver {
   /**
    * Builds up the array of notes that are applicable for Skip to receive from MJAPI
    */
-  protected async BuildSkipAgentNotes(contextUser: UserInfo): Promise<SkipAPIAgentNote[]> {
+  protected async BuildSkipAgentNotes(contextUser: UserInfo): Promise<{notes: SkipAPIAgentNote[], noteTypes: SkipAPIAgentNoteType[]}> {
     try {
-      const md = new Metadata();
-      if (md.EntityByName('AI Agent Notes')) {
-        const rv = new RunView();
-        const result = await rv.RunView({
-          EntityName: "AI Agent Notes",
-          ExtraFilter: "Agent='Skip'"
-        }, contextUser)
-        if (result && result.Success) {
-          return result.Results.map((r) => {
-            return {
-              id: r.ID,
-              typeId: r.TypeID,
-              type: r.Type,
-              note: r.Note,
-              createdAt: r.__mj_CreatedAt,
-              updatedAt: r.__mj_UpdatedAt,
-            }
-          });
-        }
-        else 
-          return [];    
+      // if already configured this does nothing, just makes sure we're configured
+      await AIEngine.Instance.Config(false, contextUser); 
+
+      const agent: AIAgentEntityExtended = AIEngine.Instance.GetAgentByName('Skip');
+      if (agent) {
+        let notes: SkipAPIAgentNote[] = [];
+        let noteTypes: SkipAPIAgentNoteType[] = [];
+        
+        notes = agent.Notes.map((r) => {
+          return {
+            id: r.ID,
+            agentNoteTypeId: r.AgentNoteTypeID,
+            agentNoteType: r.AgentNoteType,
+            note: r.Note,
+            type: r.Type,
+            userId: r.UserID,
+            user: r.User,
+            createdAt: r.__mj_CreatedAt,
+            updatedAt: r.__mj_UpdatedAt,
+          }
+        });
+
+        noteTypes = AIEngine.Instance.AgentNoteTypes.map((r) => {
+          return {
+            id: r.ID,
+            name: r.Name,
+            description: r.Description
+          }
+        });
+
+        // now return the notes and note types
+        return {notes, noteTypes};
       }
       else {
-        console.warn(`No AI Agent Notes entity found in the metadata, so no notes will be sent to Skip`);
-        return []; // no agent notes configured in this MJ system, so not an error, just return empty array
+        console.warn(`No AI Agent found with the name 'Skip' in the AI Engine, so no notes will be sent to Skip`);
+        return {notes: [], noteTypes: []}; // no agent found, so nothing to do
       }
     }
     catch (e) {
       LogError(e);
-      return []; // non- fatal error just return an empty array
+      return {notes: [], noteTypes: []}; // non- fatal error just return empty arrays
     }
   }
 
@@ -629,7 +648,7 @@ export class AskSkipResolver {
       const md = new Metadata();
       const e = md.Entities.find((e) => e.Name === 'Conversation Details');
       const sql = `SELECT
-                      ${maxHistoricalMessages ? 'TOP ' + maxHistoricalMessages : ''} ID, Message, Role, __mj_CreatedAt
+                      ${maxHistoricalMessages ? 'TOP ' + maxHistoricalMessages : ''} *
                    FROM
                       ${e.SchemaName}.${e.BaseView}
                    WHERE
@@ -689,6 +708,13 @@ export class AskSkipResolver {
             content: skipRole === 'system' ? outputMessage : r.Message,
             role: skipRole,
             conversationDetailID: r.ID,
+            hiddenToUser: r.HiddenToUser,
+            userRating: r.UserRating,
+            userFeedback: r.UserFeedback,
+            reflectionInsights: r.ReflectionInsights,
+            summaryOfEarlierConveration: r.SummaryOfEarlierConversation,
+            createdAt: r.__mj_CreatedAt,
+            updatedAt: r.__mj_UpdatedAt,
           };
           return m;
         });