@memberjunction/server 1.0.1 → 1.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@memberjunction/server",
-  "version": "1.0.1",
+  "version": "1.0.4",
   "description": "MemberJunction: This project provides API access via GraphQL to the common data store.",
   "main": "dist/index.js",
   "types": "src/index.ts",
@@ -21,17 +21,18 @@
   "dependencies": {
     "@apollo/server": "^4.9.1",
     "@graphql-tools/utils": "^10.0.1",
-    "@memberjunction/ai": "^1.0.1",
-    "@memberjunction/aiengine": "^1.0.1",
-    "@memberjunction/core": "^1.0.1",
-    "@memberjunction/core-entities": "^1.0.1",
-    "@memberjunction/data-context": "^1.0.1",
-    "@memberjunction/data-context-server": "^1.0.1",
-    "@memberjunction/global": "^1.0.1",
-    "@memberjunction/storage": "^1.0.1",
-    "@memberjunction/queue": "^1.0.1",
-    "@memberjunction/sqlserver-dataprovider": "^1.0.1",
-    "@memberjunction/skip-types": "^1.0.1",
+    "@memberjunction/ai": "^1.0.4",
+    "@memberjunction/ai-openai": "^1.0.4",
+    "@memberjunction/aiengine": "^1.0.4",
+    "@memberjunction/core": "^1.0.4",
+    "@memberjunction/core-entities": "^1.0.4",
+    "@memberjunction/data-context": "^1.0.4",
+    "@memberjunction/data-context-server": "^1.0.4",
+    "@memberjunction/global": "^1.0.4",
+    "@memberjunction/storage": "^1.0.4",
+    "@memberjunction/queue": "^1.0.4",
+    "@memberjunction/sqlserver-dataprovider": "^1.0.4",
+    "@memberjunction/skip-types": "^1.0.4",
     "@types/cors": "^2.8.13",
     "@types/jsonwebtoken": "^8.5.9",
     "@types/node": "^18.11.14",

package/src/entitySubclasses/userViewEntity.server.ts

@@ -1,8 +1,10 @@
-import { MJGlobal, RegisterClass } from "@memberjunction/global";
+import { CleanJSON, MJGlobal, RegisterClass } from "@memberjunction/global";
 import { BaseEntity, EntityInfo, LogError, Metadata } from "@memberjunction/core";
-import { AIModelEntity, UserViewEntityExtended } from '@memberjunction/core-entities'
+import { AIModelEntity, AIModelEntityExtended, UserViewEntityExtended } from '@memberjunction/core-entities'
 import { BaseLLM, ChatParams, GetAIAPIKey } from "@memberjunction/ai";
 import { AIEngine } from "@memberjunction/aiengine";
+import { LoadOpenAILLM } from "@memberjunction/ai-openai";
+LoadOpenAILLM(); // this is to prevent tree shaking since the openai package is not directly used and rather instantiated dynamically in the LoadOpenAILLM function. Since no static code path exists tree shaking can result in this class being optimized out
 
 @RegisterClass(BaseEntity, 'User Views', 3) // high priority to ensure this is used ahead of the UserViewEntityExtended in the @memberjunction/core-entities package (which has priority of 2)
 export class UserViewEntity_Server extends UserViewEntityExtended  {
@@ -14,12 +16,24 @@ export class UserViewEntity_Server extends UserViewEntityExtended  {
     }
 
     /**
-     * Default implementation simply grabs the first AI model that is of type 1 (Language Model). If you want to override this to use a different model you can override this method in your subclass and return the model you want to use.
+     * Default implementation simply returns 'OpenAI' - override this in your subclass if you are using a different AI vendor.
      * @returns 
      */
-    protected GetAIModel(): AIModelEntity {
-        const model = AIEngine.Models.find(m => m.AIModelTypeID === 1/*elim this hardcoding by adding virtual field for Type to AI Models entity*/) // get the first llm 
-        return model;
+    protected get AIVendorName(): string {
+        return 'OpenAI';
+    }
+
+    /**
+     * Default implementation simply grabs the first AI model that matches GetAIModelName().
+     * @returns 
+     */
+    protected async GetAIModel(): Promise<AIModelEntityExtended> {
+        await AIEngine.LoadAIMetadata(this.ContextCurrentUser); // most of the time this is already loaded, but just in case it isn't we will load it here
+        const models = AIEngine.Models.filter(m => m.AIModelType.trim().toLowerCase() === 'llm' && 
+                                                   m.Vendor.trim().toLowerCase() === this.AIVendorName.trim().toLowerCase())  
+        // next, sort the models by the PowerRank field so that the highest power rank model is the first array element
+        models.sort((a, b) => b.PowerRank - a.PowerRank); // highest power rank first
+        return models[0];
     }
 
     /** 
@@ -29,11 +43,11 @@ export class UserViewEntity_Server extends UserViewEntityExtended  {
      */
     public async GenerateSmartFilterWhereClause(prompt: string, entityInfo: EntityInfo): Promise<{whereClause: string, userExplanation: string}> {
         try {
-            const model = this.GetAIModel();
+            const model = await this.GetAIModel();
             const llm = MJGlobal.Instance.ClassFactory.CreateInstance<BaseLLM>(BaseLLM, model.DriverClass, GetAIAPIKey(model.DriverClass)); 
 
             const chatParams: ChatParams = {
-                model: 'gpt-4',
+                model: model.APINameOrName,
                 messages: [      
                     {
                         role: 'system',
@@ -51,7 +65,11 @@ export class UserViewEntity_Server extends UserViewEntityExtended  {
                 if (llmResponse) {
                     // try to parse it as JSON
                     try {
-                        const parsed = JSON.parse(llmResponse);
+                        const cleansed = CleanJSON(llmResponse);
+                        if (!cleansed)
+                            throw new Error('Invalid JSON response from AI: ' + llmResponse);
+
+                        const parsed = JSON.parse(cleansed);
                         if (parsed.whereClause && parsed.whereClause.length > 0) {
                             // we have the where clause. Sometimes the LLM prefixes it with WHERE and somtimes not, we need to strip WHERE if it is there
                             const trimmed = parsed.whereClause.trim();

package/src/generated/generated.ts

@@ -2,7 +2,7 @@
 * ALL ENTITIES - TypeGraphQL Type Class Definition - AUTO GENERATED FILE
 * Generated Entities and Resolvers for Server
 * 
-* GENERATED: 4/3/2024, 5:30:40 PM
+* GENERATED: 4/8/2024, 7:27:10 PM
 * 
 *   >>> DO NOT MODIFY THIS FILE!!!!!!!!!!!!
 *   >>> YOUR CHANGES WILL BE OVERWRITTEN
@@ -7101,6 +7101,10 @@ export class ListDetail_ {
       
     @Field(() => Int) 
     Sequence: number;
+      
+    @Field() 
+    @MaxLength(200)
+    List: string;
     
 }
         
@@ -8821,6 +8825,10 @@ export class Authorization_ {
     @Field() 
     @MaxLength(8)
     UpdatedAt: Date;
+      
+    @Field({nullable: true}) 
+    @MaxLength(200)
+    Parent?: string;
     
     @Field(() => [mj_core_schema_server_object_types.AuthorizationRole_])
     AuthorizationRolesArray: mj_core_schema_server_object_types.AuthorizationRole_[]; // Link to AuthorizationRoles
@@ -9266,6 +9274,9 @@ export class AIModel_ {
     @Field(() => Int) 
     AIModelTypeID: number;
       
+    @Field(() => Boolean) 
+    IsActive: boolean;
+      
     @Field({nullable: true}) 
     Description?: string;
       
@@ -9277,8 +9288,12 @@ export class AIModel_ {
     @MaxLength(510)
     DriverImportPath?: string;
       
-    @Field(() => Boolean) 
-    IsActive: boolean;
+    @Field({nullable: true, description: 'The name of the model to use with API calls which might differ from the Name, if APIName is not provided, Name will be used for API calls'}) 
+    @MaxLength(200)
+    APIName?: string;
+      
+    @Field(() => Int, {nullable: true, description: 'A simplified power rank of each model for a given AI Model Type. For example, if we have GPT 3, GPT 3.5, and GPT 4, we would have a PowerRank of 1 for GPT3, 2 for GPT 3.5, and 3 for GPT 4. This can be used within model families like OpenAI or across all models. For example if you had Llama 2 in the mix which is similar to GPT 3.5 it would also have a PowerRank of 2. This can be used at runtime to pick the most/least powerful or compare model relative power.'}) 
+    PowerRank?: number;
       
     @Field() 
     @MaxLength(8)
@@ -9287,6 +9302,10 @@ export class AIModel_ {
     @Field() 
     @MaxLength(8)
     UpdatedAt: Date;
+      
+    @Field() 
+    @MaxLength(100)
+    AIModelType: string;
     
     @Field(() => [mj_core_schema_server_object_types.AIAction_])
     AIActionsArray: mj_core_schema_server_object_types.AIAction_[]; // Link to AIActions
@@ -9319,6 +9338,9 @@ export class UpdateAIModelInput {
     @Field(() => Int)
     AIModelTypeID: number;
 
+    @Field(() => Boolean)
+    IsActive: boolean;
+
     @Field({ nullable: true })
     Description: string;
 
@@ -9328,8 +9350,11 @@ export class UpdateAIModelInput {
     @Field({ nullable: true })
     DriverImportPath: string;
 
-    @Field(() => Boolean)
-    IsActive: boolean;
+    @Field({ nullable: true })
+    APIName: string;
+
+    @Field(() => Int, { nullable: true })
+    PowerRank: number;
 }
 
 //****************************************************************************
@@ -10569,6 +10594,10 @@ export class QueueTask_ {
       
     @Field({nullable: true}) 
     Comments?: string;
+      
+    @Field() 
+    @MaxLength(100)
+    Queue: string;
     
 }
         
@@ -11327,6 +11356,10 @@ export class Report_ {
     @Field({nullable: true}) 
     @MaxLength(510)
     OutputEvent?: string;
+      
+    @Field({nullable: true}) 
+    @MaxLength(200)
+    OutputWorkflow?: string;
     
     @Field(() => [mj_core_schema_server_object_types.ReportSnapshot_])
     ReportSnapshotsArray: mj_core_schema_server_object_types.ReportSnapshot_[]; // Link to ReportSnapshots