@memberjunction/server 2.89.0 → 2.90.0

package/src/generic/ResolverBase.ts

@@ -16,7 +16,7 @@ import {
   RunViewResult,
   UserInfo,
 } from '@memberjunction/core';
-import { AuditLogEntity, ErrorLogEntity, UserViewEntity } from '@memberjunction/core-entities';
+import { AuditLogEntity, ErrorLogEntity, UserViewEntityExtended } from '@memberjunction/core-entities';
 import { SQLServerDataProvider, UserCache } from '@memberjunction/sqlserver-dataprovider';
 import { PubSubEngine } from 'type-graphql';
 import { GraphQLError } from 'graphql';
@@ -117,7 +117,7 @@ export class ResolverBase {
   async RunViewByNameGeneric(viewInput: RunViewByNameInput, provider: DatabaseProviderBase, userPayload: UserPayload, pubSub: PubSubEngine) {
     try {
       const rv = provider as any as IRunViewProvider;
-      const result = await rv.RunView<UserViewEntity>({
+      const result = await rv.RunView<UserViewEntityExtended>({
         EntityName: 'User Views',
         ExtraFilter: "Name='" + viewInput.ViewName + "'",
       }, userPayload.userRecord);
@@ -155,7 +155,7 @@ export class ResolverBase {
   async RunViewByIDGeneric(viewInput: RunViewByIDInput, provider: DatabaseProviderBase, userPayload: UserPayload, pubSub: PubSubEngine) {
     try {
       const contextUser = this.GetUserFromPayload(userPayload);
-      const viewInfo = await provider.GetEntityObject<UserViewEntity>('User Views', contextUser);
+      const viewInfo = await provider.GetEntityObject<UserViewEntityExtended>('User Views', contextUser);
       await viewInfo.Load(viewInput.ViewID);
       return this.RunViewGenericInternal(
         provider,
@@ -187,12 +187,12 @@ export class ResolverBase {
       const entity = md.Entities.find((e) => e.Name === viewInput.EntityName);
       if (!entity) throw new Error(`Entity ${viewInput.EntityName} not found in metadata`);
 
-      const viewInfo: UserViewEntity = {
+      const viewInfo: UserViewEntityExtended = {
         ID: '',
         Entity: viewInput.EntityName,
         EntityID: entity.ID,
         EntityBaseView: entity.BaseView as string,
-      } as UserViewEntity; // only providing a few bits of data here, but it's enough to get the view to run
+      } as UserViewEntityExtended; // only providing a few bits of data here, but it's enough to get the view to run
 
       return this.RunViewGenericInternal(
         provider,
@@ -228,12 +228,12 @@ export class ResolverBase {
     let params: RunViewGenericParams[] = [];
     for (const viewInput of viewInputs) {
       try {
-        let viewInfo: UserViewEntity | null = null;
+        let viewInfo: UserViewEntityExtended | null = null;
 
         if (viewInput.ViewName) {
           viewInfo = this.safeFirstArrayElement(await this.findBy(provider, 'User Views', { Name: viewInput.ViewName }, userPayload.userRecord));
         } else if (viewInput.ViewID) {
-          viewInfo = await provider.GetEntityObject<UserViewEntity>('User Views', contextUser);
+          viewInfo = await provider.GetEntityObject<UserViewEntityExtended>('User Views', contextUser);
           await viewInfo.Load(viewInput.ViewID);
         } else if (viewInput.EntityName) {
           const entity = md.Entities.find((e) => e.Name === viewInput.EntityName);
@@ -247,7 +247,7 @@ export class ResolverBase {
             Entity: viewInput.EntityName,
             EntityID: entity.ID,
             EntityBaseView: entity.BaseView,
-          } as UserViewEntity;
+          } as UserViewEntityExtended;
         } else {
           throw new Error('Unable to determine input type');
         }
@@ -356,7 +356,7 @@ export class ResolverBase {
    */
   protected async RunViewGenericInternal(
     provider: DatabaseProviderBase,
-    viewInfo: UserViewEntity,
+    viewInfo: UserViewEntityExtended,
     extraFilter: string,
     orderBy: string,
     userSearchString: string,

package/src/generic/RunViewResolver.ts

@@ -4,7 +4,7 @@ import { ResolverBase } from './ResolverBase.js';
 import { LogError, LogStatus } from '@memberjunction/core';
 import { RequireSystemUser } from '../directives/RequireSystemUser.js';
 import { GetReadOnlyProvider } from '../util.js';
-import { UserViewEntity } from '@memberjunction/core-entities';
+import { UserViewEntityExtended } from '@memberjunction/core-entities';
 
 /********************************************************************************
  * The PURPOSE of this resolver is to provide a generic way to run a view and return the results.
@@ -468,7 +468,7 @@ export class RunViewResolver extends ResolverBase {
       if (rawData === null) 
         return null;
 
-      const viewInfo = super.safeFirstArrayElement<UserViewEntity>(await super.findBy<UserViewEntity>(provider, "User Views", { Name: input.ViewName }, userPayload.userRecord));
+      const viewInfo = super.safeFirstArrayElement<UserViewEntityExtended>(await super.findBy<UserViewEntityExtended>(provider, "User Views", { Name: input.ViewName }, userPayload.userRecord));
       const returnData = this.processRawData(rawData.Results, viewInfo.EntityID);
       return {
         Results: returnData,
@@ -495,7 +495,7 @@ export class RunViewResolver extends ResolverBase {
       if (rawData === null) 
         return null;
 
-      const viewInfo = super.safeFirstArrayElement<UserViewEntity>(await super.findBy<UserViewEntity>(provider, "User Views", { ID: input.ViewID }, userPayload.userRecord));
+      const viewInfo = super.safeFirstArrayElement<UserViewEntityExtended>(await super.findBy<UserViewEntityExtended>(provider, "User Views", { ID: input.ViewID }, userPayload.userRecord));
       const returnData = this.processRawData(rawData.Results, viewInfo.EntityID);
       return {
         Results: returnData,
@@ -613,7 +613,7 @@ export class RunViewResolver extends ResolverBase {
       const rawData = await super.RunViewByIDGeneric(input, provider, userPayload, pubSub);
       if (rawData === null) return null;
 
-      const viewInfo = super.safeFirstArrayElement<UserViewEntity>(await super.findBy<UserViewEntity>(provider, "User Views", { ID: input.ViewID }, userPayload.userRecord));
+      const viewInfo = super.safeFirstArrayElement<UserViewEntityExtended>(await super.findBy<UserViewEntityExtended>(provider, "User Views", { ID: input.ViewID }, userPayload.userRecord));
       const returnData = this.processRawData(rawData.Results, viewInfo.EntityID);
       return {
         Results: returnData,

package/src/resolvers/AskSkipResolver.ts

@@ -1441,6 +1441,9 @@ cycle.`);
         createdAt: q.__mj_CreatedAt,
         updatedAt: q.__mj_UpdatedAt,
         categoryID: q.CategoryID,
+        embeddingVector: q.EmbeddingVector,
+        embeddingModelID: q.EmbeddingModelID,
+        embeddingModelName: q.EmbeddingModel,
         fields: q.Fields.map((f) => {
           return {
             id: f.ID,

package/src/resolvers/RunAIAgentResolver.ts

@@ -1,7 +1,7 @@
 import { Resolver, Mutation, Arg, Ctx, ObjectType, Field, PubSub, PubSubEngine, Subscription, Root, ResolverFilterData, ID } from 'type-graphql';
 import { UserPayload } from '../types.js';
 import { LogError, LogStatus } from '@memberjunction/core';
-import { AIAgentEntity } from '@memberjunction/core-entities';
+import { AIAgentEntityExtended } from '@memberjunction/core-entities';
 import { AgentRunner } from '@memberjunction/ai-agents';
 import { ExecuteAgentResult } from '@memberjunction/ai-core-plus';
 import { AIEngine } from '@memberjunction/aiengine';
@@ -169,12 +169,12 @@ export class RunAIAgentResolver extends ResolverBase {
     /**
      * Validate the agent entity
      */
-    private async validateAgent(agentId: string, currentUser: any): Promise<AIAgentEntity> {
+    private async validateAgent(agentId: string, currentUser: any): Promise<AIAgentEntityExtended> {
         // Use AIEngine to get cached agent data
         await AIEngine.Instance.Config(false, currentUser);
         
         // Find agent in cached collection
-        const agentEntity = AIEngine.Instance.Agents.find((a: AIAgentEntity) => a.ID === agentId);
+        const agentEntity = AIEngine.Instance.Agents.find((a: AIAgentEntityExtended) => a.ID === agentId);
         
         if (!agentEntity) {
             throw new Error(`AI Agent with ID ${agentId} not found`);

package/src/resolvers/RunAIPromptResolver.ts

@@ -1,7 +1,7 @@
 import { Resolver, Mutation, Arg, Ctx, ObjectType, Field, Int } from 'type-graphql';
 import { UserPayload } from '../types.js';
 import { LogError, LogStatus, Metadata } from '@memberjunction/core';
-import { AIPromptEntity } from '@memberjunction/core-entities';
+import { AIPromptEntityExtended } from '@memberjunction/core-entities';
 import { AIPromptRunner } from '@memberjunction/ai-prompts';
 import { AIPromptParams } from '@memberjunction/ai-core-plus';
 import { ResolverBase } from '../generic/ResolverBase.js';
@@ -112,7 +112,7 @@ export class RunAIPromptResolver extends ResolverBase {
             const md = new Metadata();
             
             // Load the AI prompt entity
-            const promptEntity = await md.GetEntityObject<AIPromptEntity>('AI Prompts', currentUser);
+            const promptEntity = await md.GetEntityObject<AIPromptEntityExtended>('AI Prompts', currentUser);
             await promptEntity.Load(promptId);
             
             if (!promptEntity.IsSaved) {

package/src/types.ts

@@ -1,11 +1,9 @@
 import { DatabaseProviderBase, UserInfo } from '@memberjunction/core';
-import { UserViewEntity } from '@memberjunction/core-entities';
+import { UserViewEntityExtended } from '@memberjunction/core-entities';
 import { GraphQLSchema } from 'graphql';
-import { PubSubEngine } from 'type-graphql';
 import sql from 'mssql';
 import { getSystemUser } from './auth/index.js';
 import { MJEvent, MJEventType, MJGlobal } from '@memberjunction/global';
-import { SQLServerDataProvider } from '@memberjunction/sqlserver-dataprovider';
 
 export type UserPayload = {
   email: string;
@@ -66,7 +64,7 @@ export type DirectiveBuilder = {
 };
 
 export type RunViewGenericParams = {
-  viewInfo: UserViewEntity;
+  viewInfo: UserViewEntityExtended;
   provider: DatabaseProviderBase;
   extraFilter: string;
   orderBy: string;