@memberjunction/server 1.0.3 → 1.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@memberjunction/server",
-  "version": "1.0.3",
+  "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,18 +21,18 @@
   "dependencies": {
     "@apollo/server": "^4.9.1",
     "@graphql-tools/utils": "^10.0.1",
-    "@memberjunction/ai": "^1.0.3",
-    "@memberjunction/ai-openai": "^1.0.3",
-    "@memberjunction/aiengine": "^1.0.3",
-    "@memberjunction/core": "^1.0.3",
-    "@memberjunction/core-entities": "^1.0.3",
-    "@memberjunction/data-context": "^1.0.3",
-    "@memberjunction/data-context-server": "^1.0.3",
-    "@memberjunction/global": "^1.0.3",
-    "@memberjunction/storage": "^1.0.3",
-    "@memberjunction/queue": "^1.0.3",
-    "@memberjunction/sqlserver-dataprovider": "^1.0.3",
-    "@memberjunction/skip-types": "^1.0.3",
+    "@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,6 +1,6 @@
 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";
@@ -16,21 +16,24 @@ export class UserViewEntity_Server extends UserViewEntityExtended  {
     }
 
     /**
-     * Default implementation simply returns 'gpt-4'. 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 get AIModelName(): string {
-        return 'gpt-4';
+    protected get AIVendorName(): string {
+        return 'OpenAI';
     }
 
     /**
      * Default implementation simply grabs the first AI model that matches GetAIModelName().
      * @returns 
      */
-    protected async GetAIModel(): Promise<AIModelEntity> {
+    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 model = AIEngine.Models.find(m => m.Name.trim().toLowerCase() === this.AIModelName.trim().toLowerCase())  
-        return model;
+        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];
     }
 
     /** 
@@ -44,7 +47,7 @@ export class UserViewEntity_Server extends UserViewEntityExtended  {
             const llm = MJGlobal.Instance.ClassFactory.CreateInstance<BaseLLM>(BaseLLM, model.DriverClass, GetAIAPIKey(model.DriverClass)); 
 
             const chatParams: ChatParams = {
-                model: this.AIModelName,
+                model: model.APINameOrName,
                 messages: [      
                     {
                         role: 'system',
@@ -65,7 +68,7 @@ export class UserViewEntity_Server extends UserViewEntityExtended  {
                         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