@memberjunction/server 2.56.0 → 2.58.0

package/src/index.ts

@@ -40,6 +40,23 @@ LoadCoreEntitiesServerSubClasses(); // prevent tree shaking for this dynamic mod
 import { LoadAgentManagementActions } from '@memberjunction/ai-agent-manager-actions';
 LoadAgentManagementActions();
 
+
+import { resolve } from 'node:path';
+import { DataSourceInfo, raiseEvent } from './types.js';
+import { LoadOpenAILLM } from '@memberjunction/ai-openai';
+import { LoadAnthropicLLM } from '@memberjunction/ai-anthropic';
+import { LoadGroqLLM } from '@memberjunction/ai-groq';
+import { LoadCerebrasLLM } from '@memberjunction/ai-cerebras';
+import { LoadMistralLLM } from '@memberjunction/ai-mistral';
+// Load AI LLMs
+// These imports are necessary to ensure the LLMs are registered in the MemberJunction AI
+// system. They are not tree-shaken because they are dynamically loaded at runtime.
+LoadOpenAILLM();
+LoadAnthropicLLM();
+LoadGroqLLM();
+LoadCerebrasLLM();
+LoadMistralLLM();
+
 import { ExternalChangeDetectorEngine } from '@memberjunction/external-change-detection';
 
 const cacheRefreshInterval = configInfo.databaseSettings.metadataCacheRefreshInterval;
@@ -80,8 +97,6 @@ export { GetReadOnlyDataSource, GetReadWriteDataSource } from './util.js';
 
 export * from './generated/generated.js';
 
-import { resolve } from 'node:path';
-import { DataSourceInfo, raiseEvent } from './types.js';
 
 export type MJServerOptions = {
   onBeforeServe?: () => void | Promise<void>;

package/src/resolvers/AskSkipResolver.ts

@@ -1318,6 +1318,10 @@ cycle.`);
         vendorDriverName: 'MistralLLM',
         apiKey: GetAIAPIKey('MistralLLM'),
       },
+      {
+        vendorDriverName: 'CerebrasLLM',
+        apiKey: GetAIAPIKey('CerebrasLLM'),
+      },
     ];
   }
 

package/src/resolvers/FileResolver.ts

@@ -1,4 +1,4 @@
-import { EntityPermissionType, Metadata } from '@memberjunction/core';
+import { EntityPermissionType, Metadata, FieldValueCollection } from '@memberjunction/core';
 import { FileEntity, FileStorageProviderEntity } from '@memberjunction/core-entities';
 import {
   AppContext,
@@ -57,23 +57,27 @@ export class FileResolver extends FileResolverBase {
     fileEntity.CheckPermissions(EntityPermissionType.Create, true);
 
     // Check to see if there's already an object with that name
-    const [sameName] = await this.findBy(context.dataSource, 'Files', { Name: input.Name, ProviderID: input.ProviderID }, context.userPayload.userRecord);
+    const [sameName] = await this.findBy(
+      context.dataSource,
+      'Files',
+      { Name: input.Name, ProviderID: input.ProviderID },
+      context.userPayload.userRecord
+    );
     const NameExists = Boolean(sameName);
 
-    const fileRecord = (await super.CreateFile({ ...input, Status: 'Pending' }, context, pubSub)) as File_;
+    const success = fileEntity.NewRecord(FieldValueCollection.FromObject({ ...input, Status: 'Pending' }));
 
     // If there's a problem creating the file record, the base resolver will return null
-    if (!fileRecord) {
+    if (!success) {
       return null;
     }
 
     // Create the upload URL and get the record updates (provider key, content type, etc)
-    const { updatedInput, UploadUrl } = await createUploadUrl(providerEntity, fileRecord);
+    const { updatedInput, UploadUrl } = await createUploadUrl(providerEntity, fileEntity);
 
     // Save the file record with the updated input
     const mapper = new FieldMapper();
-    await fileEntity.LoadFromData(mapper.ReverseMapFields({ ...input }));
-    fileEntity.SetMany(mapper.ReverseMapFields({ ...updatedInput }));
+    fileEntity.SetMany(mapper.ReverseMapFields({ ...updatedInput }), true, true);
     await fileEntity.Save();
     const File = mapper.MapFields({ ...fileEntity.GetAll() });
 

package/src/resolvers/RunAIAgentResolver.ts

@@ -3,7 +3,7 @@ import { UserPayload } from '../types.js';
 import { LogError, LogStatus } from '@memberjunction/core';
 import { AIAgentEntity } from '@memberjunction/core-entities';
 import { AgentRunner } from '@memberjunction/ai-agents';
-import { ExecuteAgentResult } from '@memberjunction/aiengine';
+import { ExecuteAgentResult } from '@memberjunction/ai-core-plus';
 import { AIEngine } from '@memberjunction/aiengine';
 import { ResolverBase } from '../generic/ResolverBase.js';
 import { PUSH_STATUS_UPDATES_TOPIC } from '../generic/PushStatusResolver.js';

package/src/resolvers/RunAIPromptResolver.ts

@@ -2,7 +2,8 @@ import { Resolver, Mutation, Arg, Ctx, ObjectType, Field, Int } from 'type-graph
 import { UserPayload } from '../types.js';
 import { LogError, LogStatus, Metadata } from '@memberjunction/core';
 import { AIPromptEntity } from '@memberjunction/core-entities';
-import { AIPromptRunner, AIPromptParams } from '@memberjunction/ai-prompts';
+import { AIPromptRunner } from '@memberjunction/ai-prompts';
+import { AIPromptParams } from '@memberjunction/ai-core-plus';
 import { ResolverBase } from '../generic/ResolverBase.js';
 
 @ObjectType()
@@ -45,8 +46,8 @@ export class RunAIPromptResolver extends ResolverBase {
         @Arg('promptId') promptId: string,
         @Ctx() { userPayload }: { userPayload: UserPayload },
         @Arg('data', { nullable: true }) data?: string,
-        @Arg('modelId', { nullable: true }) modelId?: string,
-        @Arg('vendorId', { nullable: true }) vendorId?: string,
+        @Arg('overrideModelId', { nullable: true }) overrideModelId?: string,
+        @Arg('overrideVendorId', { nullable: true }) overrideVendorId?: string,
         @Arg('configurationId', { nullable: true }) configurationId?: string,
         @Arg('skipValidation', { nullable: true }) skipValidation?: boolean,
         @Arg('templateData', { nullable: true }) templateData?: string,
@@ -137,12 +138,18 @@ export class RunAIPromptResolver extends ResolverBase {
             promptParams.prompt = promptEntity;
             promptParams.data = parsedData;
             promptParams.templateData = parsedTemplateData;
-            promptParams.modelId = modelId;
-            promptParams.vendorId = vendorId;
             promptParams.configurationId = configurationId;
             promptParams.contextUser = currentUser;
             promptParams.skipValidation = skipValidation || false;
             
+            // Set override if model or vendor ID provided
+            if (overrideModelId || overrideVendorId) {
+                promptParams.override = {
+                    modelId: overrideModelId,
+                    vendorId: overrideVendorId
+                };
+            }
+            
             // Parse and set conversation messages if provided
             if (messages) {
                 try {