@memberjunction/server 2.110.1 → 2.111.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@memberjunction/server",
-  "version": "2.110.1",
+  "version": "2.111.1",
   "description": "MemberJunction: This project provides API access via GraphQL to the common data store.",
   "main": "./dist/index.js",
   "types": "./src/index.ts",
@@ -22,42 +22,42 @@
   "dependencies": {
     "@apollo/server": "^4.9.1",
     "@graphql-tools/utils": "^10.0.1",
-    "@memberjunction/actions": "2.110.1",
-    "@memberjunction/ai": "2.110.1",
-    "@memberjunction/ai-core-plus": "2.110.1",
-    "@memberjunction/ai-agents": "2.110.1",
-    "@memberjunction/ai-provider-bundle": "2.110.1",
-    "@memberjunction/aiengine": "2.110.1",
-    "@memberjunction/ai-prompts": "2.110.1",
-    "@memberjunction/ai-agent-manager": "2.110.1",
-    "@memberjunction/ai-agent-manager-actions": "2.110.1",
-    "@memberjunction/ai-vectors-pinecone": "2.110.1",
-    "@memberjunction/core": "2.100.3",
-    "@memberjunction/core-actions": "2.110.1",
-    "@memberjunction/actions-apollo": "2.110.1",
-    "@memberjunction/actions-bizapps-accounting": "2.110.1",
-    "@memberjunction/actions-bizapps-crm": "2.110.1",
-    "@memberjunction/actions-bizapps-lms": "2.110.1",
-    "@memberjunction/actions-bizapps-social": "2.110.1",
-    "@memberjunction/component-registry-client-sdk": "2.110.1",
-    "@memberjunction/core-entities": "2.110.1",
-    "@memberjunction/core-entities-server": "2.110.1",
-    "@memberjunction/data-context": "2.110.1",
-    "@memberjunction/data-context-server": "2.110.1",
-    "@memberjunction/doc-utils": "2.110.1",
-    "@memberjunction/entity-communications-server": "2.110.1",
-    "@memberjunction/external-change-detection": "2.110.1",
-    "@memberjunction/global": "2.100.3",
-    "@memberjunction/graphql-dataprovider": "2.110.1",
-    "@memberjunction/queue": "2.110.1",
-    "@memberjunction/scheduling-base-types": "2.110.1",
-    "@memberjunction/scheduling-engine-base": "2.110.1",
-    "@memberjunction/scheduling-engine": "2.110.1",
-    "@memberjunction/scheduling-actions": "2.110.1",
-    "@memberjunction/skip-types": "2.110.1",
-    "@memberjunction/sqlserver-dataprovider": "2.110.1",
-    "@memberjunction/storage": "2.110.1",
-    "@memberjunction/templates": "2.110.1",
+    "@memberjunction/actions": "2.111.1",
+    "@memberjunction/actions-apollo": "2.111.1",
+    "@memberjunction/actions-bizapps-accounting": "2.111.1",
+    "@memberjunction/actions-bizapps-crm": "2.111.1",
+    "@memberjunction/actions-bizapps-lms": "2.111.1",
+    "@memberjunction/actions-bizapps-social": "2.111.1",
+    "@memberjunction/ai": "2.111.1",
+    "@memberjunction/ai-agent-manager": "2.111.1",
+    "@memberjunction/ai-agent-manager-actions": "2.111.1",
+    "@memberjunction/ai-agents": "2.111.1",
+    "@memberjunction/ai-core-plus": "2.111.1",
+    "@memberjunction/ai-prompts": "2.111.1",
+    "@memberjunction/ai-provider-bundle": "2.111.1",
+    "@memberjunction/ai-vectors-pinecone": "2.111.1",
+    "@memberjunction/aiengine": "2.111.1",
+    "@memberjunction/component-registry-client-sdk": "2.111.1",
+    "@memberjunction/core": "2.111.1",
+    "@memberjunction/core-actions": "2.111.1",
+    "@memberjunction/core-entities": "2.111.1",
+    "@memberjunction/core-entities-server": "2.111.1",
+    "@memberjunction/data-context": "2.111.1",
+    "@memberjunction/data-context-server": "2.111.1",
+    "@memberjunction/doc-utils": "2.111.1",
+    "@memberjunction/entity-communications-server": "2.111.1",
+    "@memberjunction/external-change-detection": "2.111.1",
+    "@memberjunction/global": "2.111.1",
+    "@memberjunction/graphql-dataprovider": "2.111.1",
+    "@memberjunction/queue": "2.111.1",
+    "@memberjunction/scheduling-actions": "2.111.1",
+    "@memberjunction/scheduling-base-types": "2.111.1",
+    "@memberjunction/scheduling-engine": "2.111.1",
+    "@memberjunction/scheduling-engine-base": "2.111.1",
+    "@memberjunction/skip-types": "2.111.1",
+    "@memberjunction/sqlserver-dataprovider": "2.111.1",
+    "@memberjunction/storage": "2.111.1",
+    "@memberjunction/templates": "2.111.1",
     "@types/compression": "^1.7.5",
     "@types/cors": "^2.8.13",
     "@types/jsonwebtoken": "9.0.6",
@@ -66,7 +66,7 @@
     "axios": "^1.6.7",
     "body-parser": "^1.20.2",
     "class-validator": "^0.14.0",
-    "cloudevents": "^8.0.2",
+    "cloudevents": "^10",
     "compression": "^1.7.4",
     "cors": "^2.8.5",
     "cosmiconfig": "9.0.0",
@@ -91,7 +91,12 @@
     "zod": "^3.23.4"
   },
   "devDependencies": {
+    "@jest/globals": "^30.2.0",
     "pkgroll": "2.1.1",
     "typescript": "^5.4.5"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/MemberJunction/MJ"
   }
 }

package/src/agents/skip-sdk.ts

@@ -21,17 +21,19 @@ import {
     SkipEntityRelationshipInfo,
     SkipAPIAgentNote,
     SkipAPIAgentNoteType,
-    SkipAPIArtifact
+    SkipAPIArtifact,
+    SkipAPIArtifactVersion,
+    SkipAPIArtifactType
 } from '@memberjunction/skip-types';
 import { DataContext } from '@memberjunction/data-context';
-import { UserInfo, LogStatus, LogError, Metadata, RunView, EntityInfo, EntityFieldInfo, EntityRelationshipInfo } from '@memberjunction/core';
+import { UserInfo, LogStatus, LogError, Metadata, RunQuery, EntityInfo, EntityFieldInfo, EntityRelationshipInfo } from '@memberjunction/core';
 import { sendPostRequest } from '../util.js';
 import { configInfo, baseUrl, publicUrl, graphqlPort, graphqlRootPath, apiKey as callbackAPIKey } from '../config.js';
 import { GetAIAPIKey } from '@memberjunction/ai';
+import { AIEngine } from '@memberjunction/aiengine';
 import { CopyScalarsAndArrays } from '@memberjunction/global';
 import mssql from 'mssql';
 import { registerAccessToken, GetDataAccessToken } from '../resolvers/GetDataResolver.js';
-import { ArtifactTypeEntity } from '@memberjunction/core-entities';
 import { BehaviorSubject } from 'rxjs';
 import { take } from 'rxjs/operators';
 
@@ -451,104 +453,115 @@ export class SkipSDK {
     }
 
     /**
-     * Build artifacts for a conversation
-     * Uses ConversationDetailArtifact join table to get artifacts that were outputs from previous conversation details
-     * Direction = 'Output' means the artifact was generated by Skip, Direction = 'Input' means it was passed in
-     * Note: ConversationArtifact entity is deprecated - we now use the core Artifact entity
+     * Build artifacts for a conversation using optimized query
+     * Uses GetConversationArtifactsForAgent query which joins through ConversationDetailArtifact
+     * to get artifacts that were outputs from Skip agent's conversation details
      */
     private async buildArtifacts(contextUser: UserInfo, dataSource: mssql.ConnectionPool, conversationId: string): Promise<SkipAPIArtifact[]> {
-        const rv = new RunView();
+        try {
+            const rq = new RunQuery();
 
-        // Query ConversationDetailArtifact to find artifacts that were outputs (generated by Skip)
-        // These are the artifacts we want to pass back as context for future requests
-        const results = await rv.RunViews([
-            {
-                EntityName: "MJ: Conversation Detail Artifacts",
-                ExtraFilter: `Direction='Output' AND ConversationDetailID IN (SELECT ID FROM [${Metadata.Provider.ConfigData.MJCoreSchemaName}].[vwConversationDetails] WHERE ConversationID='${conversationId}')`,
-                OrderBy: "__mj_CreatedAt"
-            },
-            {
-                EntityName: "MJ: Artifacts",
-                OrderBy: "__mj_CreatedAt"
-            },
-            {
-                EntityName: "MJ: Artifact Types",
-                OrderBy: "Name"
-            },
-            {
-                EntityName: "MJ: Artifact Versions",
-                OrderBy: 'ArtifactID, __mj_CreatedAt'
+            // Ensure AIEngine is configured and get Skip agent ID
+            await AIEngine.Instance.Config(false, contextUser);
+            const skipAgent = AIEngine.Instance.GetAgentByName('Skip');
+            const skipAgentId = skipAgent?.ID;
+
+            if (!skipAgentId) {
+                LogError('[SkipSDK] Skip agent not found in AIEngine');
             }
-        ], contextUser);
 
-        if (!results || results.length === 0 || !results.every(r => r.Success)) {
-            return [];
-        }
+            // Use optimized query that replaces 4 RunView calls with 1 query
+            // This query includes Configuration field needed for component spec extraction
+            // Filter by Skip agent ID to only get artifacts created by Skip (not delegation agents)
+            const result = await rq.RunQuery({
+                QueryName: 'GetConversationArtifactsForAgent',
+                CategoryPath: 'MJ/Conversations',
+                Parameters: {
+                    ConversationID: conversationId,
+                    AgentID: skipAgentId // Filter to only artifacts created by Skip agent
+                }
+            }, contextUser);
 
-        // Get the artifact VERSION IDs from ConversationDetailArtifact where Direction='Output'
-        // ConversationDetailArtifact links to ArtifactVersionID, not ArtifactID directly
-        const outputVersionIds = new Set(
-            results[0].Results
-                .map((cda: any) => cda.ArtifactVersionID)
-                .filter(id => id) // Filter out null/undefined
-        );
+            if (!result.Success || !result.Results || result.Results.length === 0) {
+                return [];
+            }
 
-        const types = results[2].Results.map((a: ArtifactTypeEntity) => ({
-            id: a.ID,
-            name: a.Name,
-            description: a.Description,
-            contentType: a.ContentType,
-            enabled: a.IsEnabled,
-            createdAt: a.__mj_CreatedAt,
-            updatedAt: a.__mj_UpdatedAt
-        }));
+            // Query returns flat result set: one row per artifact version
+            // Group by ArtifactID to build SkipAPIArtifact objects with their versions
+            const artifactMap = new Map<string, {
+                artifact: any,
+                artifactType: SkipAPIArtifactType,
+                versions: SkipAPIArtifactVersion[]
+            }>();
+
+            // Process each row (represents one version)
+            for (const row of result.Results) {
+                const artifactId = row.ArtifactID;
+
+                // Initialize artifact entry if not exists
+                if (!artifactMap.has(artifactId)) {
+                    // Map database sharingScope values to SkipAPIArtifact expected values
+                    let sharingScope: 'None' | 'SpecificUsers' | 'Everyone' | 'Public' = 'None';
+                    const dbSharingScope = (row.SharingScope || '').toLowerCase();
+                    if (dbSharingScope === 'always' || dbSharingScope === 'everyone') {
+                        sharingScope = 'Everyone';
+                    } else if (dbSharingScope === 'public') {
+                        sharingScope = 'Public';
+                    } else if (dbSharingScope === 'specific users' || dbSharingScope === 'specificusers') {
+                        sharingScope = 'SpecificUsers';
+                    }
 
-        // Get the versions that were outputs
-        const allVersions: any[] = results[3].Results as any[];
-        const outputVersions = allVersions.filter(v => outputVersionIds.has(v.ID));
+                    artifactMap.set(artifactId, {
+                        artifact: {
+                            id: artifactId,
+                            conversationId: conversationId,
+                            name: row.ArtifactName,
+                            description: row.ArtifactDescription || '',
+                            sharingScope: sharingScope,
+                            comments: row.ArtifactComments || '',
+                            createdAt: new Date(row.ArtifactCreatedAt),
+                            updatedAt: new Date(row.ArtifactUpdatedAt)
+                        },
+                        artifactType: {
+                            id: row.ArtifactTypeID,
+                            name: row.ArtifactTypeName,
+                            description: row.ArtifactTypeDescription,
+                            contentType: row.ArtifactTypeContentType,
+                            enabled: true,
+                            createdAt: new Date(row.ArtifactTypeCreatedAt),
+                            updatedAt: new Date(row.ArtifactTypeUpdatedAt)
+                        },
+                        versions: []
+                    });
+                }
 
-        // Group versions by their parent ArtifactID to build SkipAPIArtifact objects
-        const versionsByArtifactId = new Map<string, any[]>();
-        outputVersions.forEach(v => {
-            if (!versionsByArtifactId.has(v.ArtifactID)) {
-                versionsByArtifactId.set(v.ArtifactID, []);
+                // Add this version to the artifact
+                const entry = artifactMap.get(artifactId)!;
+                entry.versions.push({
+                    id: row.VersionID,
+                    artifactId: artifactId,
+                    conversationDetailID: row.ConversationDetailID, // Direct from join table!
+                    version: row.Version,
+                    configuration: row.Configuration || '',
+                    content: row.Content || '',
+                    comments: row.VersionComments || '',
+                    createdAt: new Date(row.VersionCreatedAt),
+                    updatedAt: new Date(row.VersionUpdatedAt)
+                });
             }
-            versionsByArtifactId.get(v.ArtifactID)!.push(v);
-        });
-
-        const allArtifacts = results[1].Results as any[];
-        const artifacts = allArtifacts
-            .filter(a => versionsByArtifactId.has(a.ID)) // Only include artifacts that have output versions
-            .map((a: any) => {
-            const thisArtifactsVersions = versionsByArtifactId.get(a.ID) || [];
-
-            const versions = thisArtifactsVersions.map((v: any) => ({
-                id: v.ID,
-                artifactId: v.ArtifactID,
-                version: v.Version,
-                configuration: v.Configuration,
-                content: v.Content,
-                comments: v.Comments,
-                createdAt: v.__mj_CreatedAt,
-                updatedAt: v.__mj_UpdatedAt
-            }));
 
-            return {
-                id: a.ID,
-                conversationId: conversationId, // Set from parameter since Artifact doesn't have ConversationID
-                name: a.Name,
-                description: a.Description,
-                artifactType: types.find(t => t.id === a.ArtifactTypeID),
-                sharingScope: a.SharingScope,
-                currentVersion: versions.length > 0 ? Math.max(...versions.map(v => v.version)) : 1,
-                versions,
-                comments: a.Comments || '', // Use artifact comments if available
-                createdAt: a.__mj_CreatedAt,
-                updatedAt: a.__mj_UpdatedAt
-            };
-        });
+            // Convert map to SkipAPIArtifact array
+            const artifacts: SkipAPIArtifact[] = Array.from(artifactMap.values()).map(entry => ({
+                ...entry.artifact,
+                artifactType: entry.artifactType,
+                versions: entry.versions
+            }));
 
-        return artifacts;
+            return artifacts;
+        } catch (error) {
+            LogError(`Failed to build artifacts for conversation ${conversationId}: ${error}`);
+            return [];
+        }
     }
 
     /**