@memberjunction/server 2.103.0 → 2.104.0

package/src/resolvers/AskSkipResolver.ts

@@ -1,4 +1,4 @@
-import { Arg, Ctx, Field, Mutation, ObjectType, PubSub, PubSubEngine, Query, Resolver } from 'type-graphql';
+import { Arg, Ctx, Field, InputType, Mutation, ObjectType, PubSub, PubSubEngine, Query, Resolver } from 'type-graphql';
 import { LogError, LogStatus, Metadata, RunView, UserInfo, CompositeKey, EntityFieldInfo, EntityInfo, EntityRelationshipInfo, EntitySaveOptions, EntityDeleteOptions, IMetadataProvider } from '@memberjunction/core';
 import { AppContext, UserPayload, MJ_SERVER_EVENT_CODE } from '../types.js';
 import { BehaviorSubject } from 'rxjs';
@@ -66,6 +66,18 @@ import { AIEngine } from '@memberjunction/aiengine';
 import { deleteAccessToken, GetDataAccessToken, registerAccessToken, tokenExists } from './GetDataResolver.js';
 import e from 'express';
 
+/**
+ * Skip API Endpoints Configuration
+ * Defines all available endpoints for the Skip API
+ */
+const SKIP_API_ENDPOINTS = {
+  CHAT: '/chat',
+  LEARNING: '/learning',
+  FEEDBACK_COMPONENT: '/feedback/component',
+  REGISTRY: '/registry',
+  // Add more endpoints as needed
+} as const;
+
 /**
  * Store for active conversation streams
  * Maps conversationID to the last status message received
@@ -368,7 +380,9 @@ function initializeSkipLearningCycleScheduler() {
           }
           
           // Check if we have a valid endpoint when cycles are enabled
-          if (!skipConfigInfo.learningCycleURL || skipConfigInfo.learningCycleURL.trim().length === 0) {
+          const hasLearningEndpoint = (skipConfigInfo.url && skipConfigInfo.url.trim().length > 0) ||
+                                      (skipConfigInfo.learningCycleURL && skipConfigInfo.learningCycleURL.trim().length > 0);
+          if (!hasLearningEndpoint) {
             LogError('Skip AI Learning cycle scheduler not started: Learning cycles are enabled but no Learning Cycle API endpoint is configured');
             return;
           }
@@ -577,7 +591,9 @@ export class AskSkipResolver {
       }
       
       // Check if we have a valid endpoint when cycles are enabled
-      if (!skipConfigInfo.learningCycleURL || skipConfigInfo.learningCycleURL.trim().length === 0) {
+      const hasLearningEndpoint = (skipConfigInfo.url && skipConfigInfo.url.trim().length > 0) ||
+                                  (skipConfigInfo.learningCycleURL && skipConfigInfo.learningCycleURL.trim().length > 0);
+      if (!hasLearningEndpoint) {
         return {
           success: false,
           error: 'Learning cycle API endpoint is not configured',
@@ -729,9 +745,10 @@ export class AskSkipResolver {
     userPayload: UserPayload
   ): Promise<SkipAPILearningCycleResponse> {
     const skipConfigInfo = configInfo.askSkip;
-    LogStatus(`   >>> HandleSimpleSkipLearningPostRequest Sending request to Skip API: ${skipConfigInfo.learningCycleURL}`);
+    const learningURL = skipConfigInfo.url ? `${skipConfigInfo.url}${SKIP_API_ENDPOINTS.LEARNING}` : skipConfigInfo.learningCycleURL;
+    LogStatus(`   >>> HandleSimpleSkipLearningPostRequest Sending request to Skip API: ${learningURL}`);
 
-    const response = await sendPostRequest(skipConfigInfo.learningCycleURL, input, true, this.buildSkipPostHeaders());
+    const response = await sendPostRequest(learningURL, input, true, this.buildSkipPostHeaders());
 
     if (response && response.length > 0) {
       // the last object in the response array is the final response from the Skip API
@@ -789,10 +806,11 @@ export class AskSkipResolver {
     userPayload: UserPayload = null
   ): Promise<AskSkipResultType> {
     const skipConfigInfo = configInfo.askSkip;
-    LogStatus(`   >>> HandleSimpleSkipChatPostRequest Sending request to Skip API: ${skipConfigInfo.chatURL}`);
+    const chatURL = skipConfigInfo.url ? `${skipConfigInfo.url}${SKIP_API_ENDPOINTS.CHAT}` : skipConfigInfo.chatURL;
+    LogStatus(`   >>> HandleSimpleSkipChatPostRequest Sending request to Skip API: ${chatURL}`);
 
     try {
-      const response = await sendPostRequest(skipConfigInfo.chatURL, input, true, this.buildSkipPostHeaders());
+      const response = await sendPostRequest(chatURL, input, true, this.buildSkipPostHeaders());
 
       if (response && response.length > 0) {
         // the last object in the response array is the final response from the Skip API
@@ -2428,7 +2446,8 @@ cycle.`);
     startTime: Date
   ): Promise<AskSkipResultType> {
     const skipConfigInfo = configInfo.askSkip;
-    LogStatus(`   >>> HandleSkipRequest: Sending request to Skip API: ${skipConfigInfo.chatURL}`);
+    const chatURL = skipConfigInfo.url ? `${skipConfigInfo.url}${SKIP_API_ENDPOINTS.CHAT}` : skipConfigInfo.chatURL;
+    LogStatus(`   >>> HandleSkipRequest: Sending request to Skip API: ${chatURL}`);
 
     if (conversationDetailCount > 10) {
       // Set status of conversation to Available since we still want to allow the user to ask questions
@@ -2459,7 +2478,7 @@ cycle.`);
     let response;
     try {
       response = await sendPostRequest(
-        skipConfigInfo.chatURL,
+        chatURL,
         input,
         true,
         this.buildSkipPostHeaders(),
@@ -3259,7 +3278,9 @@ cycle.`);
       }
       
       // Check if we have a valid endpoint when cycles are enabled
-      if (!skipConfigInfo.learningCycleURL || skipConfigInfo.learningCycleURL.trim().length === 0) {
+      const hasLearningEndpoint = (skipConfigInfo.url && skipConfigInfo.url.trim().length > 0) ||
+                                  (skipConfigInfo.learningCycleURL && skipConfigInfo.learningCycleURL.trim().length > 0);
+      if (!hasLearningEndpoint) {
         return {
           Success: false,
           Message: 'Learning cycle API endpoint is not configured'
@@ -3394,6 +3415,7 @@ cycle.`);
       };
     }
   }
+
 }
 
 export default AskSkipResolver;

package/src/resolvers/ComponentRegistryResolver.ts

@@ -1,15 +1,17 @@
-import { Arg, Ctx, Field, InputType, ObjectType, Query, Resolver } from 'type-graphql';
+import { Arg, Ctx, Field, InputType, ObjectType, Query, Mutation, Resolver } from 'type-graphql';
 import { UserInfo, Metadata, LogError, LogStatus } from '@memberjunction/core';
 import { UserCache } from '@memberjunction/sqlserver-dataprovider';
 import { ComponentEntity, ComponentRegistryEntity, ComponentMetadataEngine } from '@memberjunction/core-entities';
 import { ComponentSpec } from '@memberjunction/interactive-component-types';
-import { 
+import {
     ComponentRegistryClient,
     ComponentResponse,
     ComponentSearchResult,
     DependencyTree,
     RegistryError,
-    RegistryErrorCode
+    RegistryErrorCode,
+    ComponentFeedbackParams as SDKComponentFeedbackParams,
+    ComponentFeedbackResponse as SDKComponentFeedbackResponse
 } from '@memberjunction/component-registry-client-sdk';
 import { AppContext } from '../types.js';
 import { configInfo } from '../config.js';
@@ -96,6 +98,61 @@ class ComponentDependencyTreeType {
     dependencies?: ComponentDependencyTreeType[];
 }
 
+/**
+ * Input type for submitting component feedback
+ * Registry-agnostic feedback collection for any component from any registry
+ */
+@InputType()
+class ComponentFeedbackInput {
+    @Field()
+    componentName: string;
+
+    @Field()
+    componentNamespace: string;
+
+    @Field({ nullable: true })
+    componentVersion?: string;
+
+    @Field({ nullable: true })
+    registryName?: string;
+
+    @Field()
+    rating: number;
+
+    @Field({ nullable: true })
+    feedbackType?: string;
+
+    @Field({ nullable: true })
+    comments?: string;
+
+    @Field({ nullable: true })
+    conversationID?: string;
+
+    @Field({ nullable: true })
+    conversationDetailID?: string;
+
+    @Field({ nullable: true })
+    reportID?: string;
+
+    @Field({ nullable: true })
+    dashboardID?: string;
+}
+
+/**
+ * Response type for component feedback submission
+ */
+@ObjectType()
+class ComponentFeedbackResponse {
+    @Field()
+    success: boolean;
+
+    @Field({ nullable: true })
+    feedbackID?: string;
+
+    @Field({ nullable: true })
+    error?: string;
+}
+
 /**
  * Resolver for Component Registry operations
  * 
@@ -153,7 +210,8 @@ export class ComponentRegistryExtendedResolver {
                 namespace,
                 name,
                 version: version || 'latest',
-                hash: hash
+                hash: hash,
+                userEmail: user.Email
             });
             
             // If not modified (304), return response with notModified flag
@@ -532,4 +590,75 @@ export class ComponentRegistryExtendedResolver {
             limit: result.limit
         };
     }
+
+    /**
+     * Send feedback for a component from any registry
+     * This is a registry-agnostic mutation that allows feedback collection
+     * for components from any source registry (Skip, MJ Central, etc.)
+     */
+    @Mutation(() => ComponentFeedbackResponse)
+    async SendComponentFeedback(
+        @Arg('feedback') feedback: ComponentFeedbackInput,
+        @Ctx() { userPayload }: AppContext
+    ): Promise<ComponentFeedbackResponse> {
+        try {
+            // Get user from cache
+            const user = UserCache.Instance.Users.find((u) => u.Email.trim().toLowerCase() === userPayload.email?.trim().toLowerCase());
+            if (!user) {
+                return {
+                    success: false,
+                    error: `User ${userPayload.email} not found in UserCache`
+                };
+            }
+
+            // Registry name is required for feedback submission
+            if (!feedback.registryName) {
+                return {
+                    success: false,
+                    error: 'Registry name is required for feedback submission'
+                };
+            }
+
+            // Get registry configuration
+            const registry = await this.getRegistryByName(feedback.registryName, user);
+            if (!registry) {
+                return {
+                    success: false,
+                    error: `Registry not found: ${feedback.registryName}`
+                };
+            }
+
+            // Check user permissions
+            await this.checkUserAccess(user, registry.ID);
+
+            // Create client using the same pattern as GetRegistryComponent
+            // This respects REGISTRY_URI_OVERRIDE_* and REGISTRY_API_KEY_* environment variables
+            const registryClient = this.createClientForRegistry(registry);
+
+            const sdkParams: SDKComponentFeedbackParams = {
+                componentName: feedback.componentName,
+                componentNamespace: feedback.componentNamespace,
+                componentVersion: feedback.componentVersion,
+                registryName: feedback.registryName,
+                rating: feedback.rating,
+                feedbackType: feedback.feedbackType,
+                comments: feedback.comments,
+                conversationID: feedback.conversationID,
+                conversationDetailID: feedback.conversationDetailID,
+                reportID: feedback.reportID,
+                dashboardID: feedback.dashboardID,
+                userEmail: user.Email  // Pass the authenticated user's email to the registry
+            };
+
+            const result = await registryClient.submitFeedback(sdkParams);
+
+            return result;
+        } catch (error) {
+            LogError(error);
+            return {
+                success: false,
+                error: error instanceof Error ? error.message : 'Unknown error'
+            };
+        }
+    }
 }

package/src/resolvers/RunAIAgentResolver.ts

@@ -22,7 +22,7 @@ export class AIAgentRunResult {
     executionTimeMs?: number;
 
     @Field()
-    payload: string; // JSON serialized ExecuteAgentResult with scalars only
+    result: string; // JSON serialized ExecuteAgentResult with scalars only
 }
 
 @ObjectType()
@@ -315,7 +315,8 @@ export class RunAIAgentResolver extends ResolverBase {
         templateData?: string,
         lastRunId?: string,
         autoPopulateLastRunPayload?: boolean,
-        configurationId?: string
+        configurationId?: string,
+        conversationDetailId?: string
     ): Promise<AIAgentRunResult> {
         const startTime = Date.now();
         
@@ -361,7 +362,8 @@ export class RunAIAgentResolver extends ResolverBase {
                 lastRunId: lastRunId,
                 autoPopulateLastRunPayload: autoPopulateLastRunPayload,
                 configurationId: configurationId,
-                data: parsedData
+                data: parsedData,
+                conversationDetailId: conversationDetailId,
             });
 
             // Update agent run ref once available
@@ -376,7 +378,7 @@ export class RunAIAgentResolver extends ResolverBase {
 
             // Create sanitized payload for JSON serialization
             const sanitizedResult = this.sanitizeAgentResult(result);
-            const payload = JSON.stringify(sanitizedResult);
+            const returnResult = JSON.stringify(sanitizedResult);
 
             // Log completion
             if (result.success) {
@@ -389,7 +391,7 @@ export class RunAIAgentResolver extends ResolverBase {
                 success: result.success,
                 errorMessage: result.agentRun?.ErrorMessage || undefined,
                 executionTimeMs: executionTime,
-                payload
+                result: returnResult
             };
 
         } catch (error) {
@@ -407,7 +409,7 @@ export class RunAIAgentResolver extends ResolverBase {
                 success: false,
                 errorMessage: errorResult.errorMessage,
                 executionTimeMs: executionTime,
-                payload: JSON.stringify(errorResult)
+                result: JSON.stringify(errorResult)
             };
         }
     }
@@ -465,7 +467,8 @@ export class RunAIAgentResolver extends ResolverBase {
         @Arg('templateData', { nullable: true }) templateData?: string,
         @Arg('lastRunId', { nullable: true }) lastRunId?: string,
         @Arg('autoPopulateLastRunPayload', { nullable: true }) autoPopulateLastRunPayload?: boolean,
-        @Arg('configurationId', { nullable: true }) configurationId?: string
+        @Arg('configurationId', { nullable: true }) configurationId?: string,
+        @Arg('conversationDetailId', { nullable: true }) conversationDetailId?: string
     ): Promise<AIAgentRunResult> {
         const p = GetReadWriteProvider(providers);
         return this.executeAIAgent(
@@ -479,7 +482,8 @@ export class RunAIAgentResolver extends ResolverBase {
             templateData,
             lastRunId,
             autoPopulateLastRunPayload,
-            configurationId
+            configurationId,
+            conversationDetailId
         );
     }
 
@@ -499,7 +503,8 @@ export class RunAIAgentResolver extends ResolverBase {
         @Arg('templateData', { nullable: true }) templateData?: string,
         @Arg('lastRunId', { nullable: true }) lastRunId?: string,
         @Arg('autoPopulateLastRunPayload', { nullable: true }) autoPopulateLastRunPayload?: boolean,
-        @Arg('configurationId', { nullable: true }) configurationId?: string
+        @Arg('configurationId', { nullable: true }) configurationId?: string,
+        @Arg('conversationDetailId', { nullable: true }) conversationDetailId?: string
     ): Promise<AIAgentRunResult> {
         const p = GetReadWriteProvider(providers);
         return this.executeAIAgent(
@@ -513,7 +518,8 @@ export class RunAIAgentResolver extends ResolverBase {
             templateData,
             lastRunId,
             autoPopulateLastRunPayload,
-            configurationId
+            configurationId,
+            conversationDetailId
         );
     }