@finos/legend-application-marketplace 0.2.20 → 0.2.21

package/src/stores/ai/LegendMarketplaceAIChatStore.ts

@@ -44,9 +44,12 @@ import {
   LegendAIQuestionIntent,
   LegendAIResolvedEntities,
   TDSServiceSourceType,
+  classifyQuestionIntentFast,
   findLegendAIPlugin,
   processQuestionViaOrchestrator,
   handleMetadataQuestion,
+  buildMetadataOverview,
+  attachMetadataOverview,
   generateAndJudgeSql,
   executeSqlAndReport,
   analyzeOrchestratorResults,
@@ -59,8 +62,14 @@ import {
   createMessagePair,
   elapsedSeconds,
   LEGEND_AI_ORCHESTRATOR_FALLBACK_ACTION_ID,
+  cleanLlmSqlResponse,
+  isValidSqlCorrection,
 } from '@finos/legend-lego/legend-ai';
-import { QueryExplicitExecutionContextInfo } from '@finos/legend-graph';
+import {
+  QueryExplicitExecutionContextInfo,
+  extractElementNameFromPath,
+} from '@finos/legend-graph';
+import { generateGAVCoordinates } from '@finos/legend-storage';
 import {
   type V1_DataSpace,
   V1_deserializeDataSpace,
@@ -146,6 +155,16 @@ export function unwrapProductDetails(product: DataProductSearchResult): {
   return { groupId: '', artifactId: '', versionId: '', path: '' };
 }
 
+function toCoordinatesString(
+  coords: LegendAIOrchestratorDataProductCoordinates,
+): string {
+  return generateGAVCoordinates(
+    coords.group_id,
+    coords.artifact_id,
+    coords.version,
+  );
+}
+
 export class LegendMarketplaceAIChatStore {
   readonly baseStore: LegendMarketplaceBaseStore;
 
@@ -263,7 +282,7 @@ export class LegendMarketplaceAIChatStore {
     this.selectedProductMetadata = firstScope
       ? {
           name: firstScope.name,
-          coordinates: `${firstScope.coordinates.group_id}:${firstScope.coordinates.artifact_id}:${firstScope.coordinates.version}`,
+          coordinates: toCoordinatesString(firstScope.coordinates),
           serviceSummaries: [],
         }
       : undefined;
@@ -322,7 +341,7 @@ export class LegendMarketplaceAIChatStore {
   ): LegendAIProductMetadata {
     const metadata: LegendAIProductMetadata = {
       name: result.dataProductTitle ?? 'Unknown',
-      coordinates: `${coordinates.group_id}:${coordinates.artifact_id}:${coordinates.version}`,
+      coordinates: toCoordinatesString(coordinates),
       serviceSummaries: [],
       accessPointGroups: [],
     };
@@ -880,13 +899,9 @@ export class LegendMarketplaceAIChatStore {
     if (!groupId || !artifactId || !versionId || !path) {
       return;
     }
-    const key = `${groupId}:${artifactId}:${versionId}`;
+    const key = generateGAVCoordinates(groupId, artifactId, versionId);
     if (
-      this.scopeProducts.some(
-        (p) =>
-          `${p.coordinates.group_id}:${p.coordinates.artifact_id}:${p.coordinates.version}` ===
-          key,
-      )
+      this.scopeProducts.some((p) => toCoordinatesString(p.coordinates) === key)
     ) {
       return;
     }
@@ -923,7 +938,7 @@ export class LegendMarketplaceAIChatStore {
       this.selectedProductMetadata = firstScope
         ? {
             name: firstScope.name,
-            coordinates: `${firstScope.coordinates.group_id}:${firstScope.coordinates.artifact_id}:${firstScope.coordinates.version}`,
+            coordinates: toCoordinatesString(firstScope.coordinates),
             serviceSummaries: [],
           }
         : undefined;
@@ -1091,7 +1106,7 @@ export class LegendMarketplaceAIChatStore {
         this.baseStore.marketplaceServerClient
           .entitySearch(
             env,
-            coordinates.data_product.split('::').pop() ?? 'data',
+            extractElementNameFromPath(coordinates.data_product),
             entitySearchOptions,
           )
           .catch(() => undefined),
@@ -1343,6 +1358,73 @@ export class LegendMarketplaceAIChatStore {
     return relevant;
   }
 
+  private async handleNoServices(
+    question: string,
+    setMessages: MessageSetter,
+    startTime: number,
+    contextPromise: Promise<void>,
+  ): Promise<void> {
+    addThinkingStep(
+      setMessages,
+      'No dataset schemas available — entity search did not return results for this data product.',
+    );
+    completeThinkingSteps(setMessages);
+    updateLastAssistant(setMessages, () => ({
+      textAnswer:
+        'Could not resolve dataset schemas for this data product. You can try the Legend AI Orchestrator to generate a Pure query instead.',
+      isProcessing: false,
+    }));
+    this.offerOrchestratorFallback(question, setMessages, startTime);
+    await contextPromise;
+  }
+
+  private async handleZeroRows(
+    judgedSql: string,
+    question: string,
+    services: TDSServiceSchema[],
+    coordinates: LegendAIOrchestratorDataProductCoordinates,
+    metadata: LegendAIProductMetadata,
+    context: LegendAIOperationContext,
+    timing: { startTime: number; contextPromise: Promise<void> },
+  ): Promise<void> {
+    const { startTime, contextPromise } = timing;
+    const { setMessages } = context;
+    const coordinatesStr = toCoordinatesString(coordinates);
+    const corrected = await this.attemptZeroRowCorrection(
+      judgedSql,
+      question,
+      services,
+      coordinatesStr,
+      setMessages,
+      coordinates,
+    );
+    if (corrected) {
+      await contextPromise;
+      await this.safeAnalyzeResults(
+        question,
+        corrected.sql,
+        corrected.result,
+        metadata,
+        context,
+        startTime,
+      );
+      return;
+    }
+    const datasetList = services
+      .slice(0, MAX_RELEVANT_SERVICES)
+      .map((s) => s.title)
+      .join(', ');
+    const datasetSuffix =
+      services.length > MAX_RELEVANT_SERVICES
+        ? ` and ${services.length - MAX_RELEVANT_SERVICES} more`
+        : '';
+    updateLastAssistant(setMessages, () => ({
+      textAnswer: `The SQL 2.0 query executed successfully but returned **0 rows**. The applied filters may not match any records in the available datasets, or the specific values may not exist.\n\n**Queried datasets:** ${datasetList}${datasetSuffix}`,
+    }));
+    this.offerOrchestratorFallback(question, setMessages, startTime);
+    await contextPromise;
+  }
+
   private async dispatchWithSql2(
     question: string,
     relevantDatasetNames: string[],
@@ -1358,47 +1440,202 @@ export class LegendMarketplaceAIChatStore {
 
     const config = this.config;
     const history = this.buildConversationHistory();
-    const context = { config, plugin, history, setMessages };
+    const context = {
+      config,
+      plugin,
+      history,
+      setMessages,
+    };
 
-    const intent = await plugin.classifyQuestionIntent(question, false, config);
+    const services = this.getServicesForQuery(relevantDatasetNames);
+    const contextPromise =
+      services.length > 0
+        ? this.buildContextPromise(question, metadata, setMessages)
+        : Promise.resolve();
 
-    if (intent === LegendAIQuestionIntent.METADATA) {
+    const fastIntent = classifyQuestionIntentFast(question, true);
+
+    // ── Pure METADATA: fast classifier is confident, no data signals ──
+    if (
+      fastIntent.intent === LegendAIQuestionIntent.METADATA &&
+      !fastIntent.ambiguous
+    ) {
       await handleMetadataQuestion(
         question,
         metadata,
         context,
         Date.now(),
-        true,
+        services.length > 0,
       );
       return;
     }
 
-    const services = this.getServicesForQuery(relevantDatasetNames);
-    const coordinatesStr = `${coordinates.group_id}:${coordinates.artifact_id}:${coordinates.version}`;
-    const startTime = Date.now();
+    // ── Ambiguous: show both metadata overview + SQL results ──
+    if (fastIntent.ambiguous && services.length > 0) {
+      await this.handleAmbiguousIntent(
+        question,
+        services,
+        coordinates,
+        metadata,
+        context,
+        contextPromise,
+        setMessages,
+      );
+      return;
+    }
 
-    const contextPromise = this.buildContextPromise(
-      question,
+    await this.handleLlmJudgeFallback(
+      { question, ...fastIntent },
+      services,
+      coordinates,
       metadata,
+      context,
+      contextPromise,
       setMessages,
     );
+  }
 
-    if (services.length === 0) {
+  private async handleLlmJudgeFallback(
+    fastIntent: {
+      question: string;
+      intent: LegendAIQuestionIntent;
+      ambiguous: boolean;
+    },
+    services: TDSServiceSchema[],
+    coordinates: LegendAIOrchestratorDataProductCoordinates,
+    metadata: LegendAIProductMetadata,
+    context: LegendAIOperationContext,
+    contextPromise: Promise<void>,
+    setMessages: MessageSetter,
+  ): Promise<void> {
+    if (
+      fastIntent.intent === LegendAIQuestionIntent.METADATA ||
+      fastIntent.ambiguous
+    ) {
       addThinkingStep(
         setMessages,
-        'No dataset schemas available — entity search did not return results for this data product.',
+        services.length > 0
+          ? 'Checking product capabilities first and trying a data query if the datasets support it...'
+          : 'Checking product capabilities first...',
+      );
+    }
+
+    const intent = await context.plugin.classifyQuestionIntent(
+      fastIntent.question,
+      services.length > 0,
+      context.config,
+    );
+
+    if (intent === LegendAIQuestionIntent.METADATA) {
+      await handleMetadataQuestion(
+        fastIntent.question,
+        metadata,
+        context,
+        Date.now(),
+        services.length > 0,
+      );
+      return;
+    }
+
+    const startTime = Date.now();
+
+    if (services.length === 0) {
+      await this.handleNoServices(
+        fastIntent.question,
+        setMessages,
+        startTime,
+        contextPromise,
       );
-      completeThinkingSteps(setMessages);
-      updateLastAssistant(setMessages, () => ({
-        textAnswer:
-          'Could not resolve dataset schemas for this data product. You can try the Legend AI Orchestrator to generate a Pure query instead.',
-        isProcessing: false,
-      }));
-      this.offerOrchestratorFallback(question, setMessages, startTime);
-      await contextPromise;
       return;
     }
 
+    await this.runSqlPath(
+      fastIntent.question,
+      services,
+      coordinates,
+      metadata,
+      context,
+      contextPromise,
+      setMessages,
+    );
+  }
+
+  private async handleAmbiguousIntent(
+    question: string,
+    services: TDSServiceSchema[],
+    coordinates: LegendAIOrchestratorDataProductCoordinates,
+    metadata: LegendAIProductMetadata,
+    context: LegendAIOperationContext,
+    contextPromise: Promise<void>,
+    setMessages: MessageSetter,
+  ): Promise<void> {
+    addThinkingStep(
+      setMessages,
+      'Intent is ambiguous, providing metadata context and querying data...',
+    );
+
+    let metadataOverview: string | undefined;
+    try {
+      addThinkingStep(setMessages, 'Building metadata context...');
+      metadataOverview = await buildMetadataOverview(
+        question,
+        metadata,
+        context,
+      );
+    } catch {
+      addThinkingStep(
+        setMessages,
+        'Could not build metadata context — continuing with data query...',
+      );
+    }
+
+    try {
+      await this.runSqlPath(
+        question,
+        services,
+        coordinates,
+        metadata,
+        context,
+        contextPromise,
+        setMessages,
+      );
+      if (metadataOverview) {
+        attachMetadataOverview(setMessages, metadataOverview);
+      }
+    } catch (queryError) {
+      assertErrorThrown(queryError);
+      addThinkingStep(
+        setMessages,
+        'Query failed, answering from product metadata...',
+      );
+      await handleMetadataQuestion(
+        question,
+        metadata,
+        context,
+        Date.now(),
+        true,
+      );
+    }
+  }
+
+  /**
+   * Core SQL generation → execution → analysis pipeline.
+   * Extracted so both the direct DATA_QUERY path and the ambiguous-intent
+   * path can reuse it.
+   */
+  private async runSqlPath(
+    question: string,
+    services: TDSServiceSchema[],
+    coordinates: LegendAIOrchestratorDataProductCoordinates,
+    metadata: LegendAIProductMetadata,
+    context: LegendAIOperationContext,
+    contextPromise: Promise<void>,
+    setMessages: MessageSetter,
+  ): Promise<void> {
+    const { config, plugin } = context;
+    const coordinatesStr = toCoordinatesString(coordinates);
+    const startTime = Date.now();
+
     const totalColumns = services.reduce((sum, s) => sum + s.columns.length, 0);
     addThinkingStep(
       setMessages,
@@ -1445,39 +1682,15 @@ export class LegendMarketplaceAIChatStore {
       }
 
       if (sqlResult.rows.length === 0) {
-        const corrected = await this.attemptZeroRowCorrection(
+        await this.handleZeroRows(
           judgedSql,
           question,
           services,
-          coordinatesStr,
-          setMessages,
           coordinates,
+          metadata,
+          context,
+          { startTime, contextPromise },
         );
-        if (corrected) {
-          await contextPromise;
-          await this.safeAnalyzeResults(
-            question,
-            corrected.sql,
-            corrected.result,
-            metadata,
-            context,
-            startTime,
-          );
-          return;
-        }
-        const datasetList = services
-          .slice(0, MAX_RELEVANT_SERVICES)
-          .map((s) => s.title)
-          .join(', ');
-        const datasetSuffix =
-          services.length > MAX_RELEVANT_SERVICES
-            ? ` and ${services.length - MAX_RELEVANT_SERVICES} more`
-            : '';
-        updateLastAssistant(setMessages, () => ({
-          textAnswer: `The SQL 2.0 query executed successfully but returned **0 rows**. The applied filters may not match any records in the available datasets, or the specific values may not exist.\n\n**Queried datasets:** ${datasetList}${datasetSuffix}`,
-        }));
-        this.offerOrchestratorFallback(question, setMessages, startTime);
-        await contextPromise;
         return;
       }
 
@@ -1572,17 +1785,8 @@ export class LegendMarketplaceAIChatStore {
     }
     try {
       const raw = await plugin.callLLM(prompt, config);
-      const trimmed = raw
-        .trim()
-        .replace(/^```\w*\n?/, '')
-        .replace(/\n?```$/, '')
-        .replace(/;\s*$/, '')
-        .trim();
-      if (
-        trimmed.length === 0 ||
-        !trimmed.toLowerCase().startsWith('select') ||
-        trimmed === currentSql
-      ) {
+      const trimmed = cleanLlmSqlResponse(raw);
+      if (!isValidSqlCorrection(trimmed, currentSql)) {
         return undefined;
       }
       addThinkingStep(setMessages, 'Retrying with corrected filters...');

package/src/stores/cart/CartStore.ts

@@ -36,11 +36,17 @@ import {
   type CartSummary,
   type OrderDetails,
   type TerminalResult,
+  type TraderProfile,
+  type TraderProfileItem,
+  RecommendationSource,
 } from '@finos/legend-server-marketplace';
 import type { LegendMarketplaceBaseStore } from '../LegendMarketplaceBaseStore.js';
 import { APPLICATION_EVENT } from '@finos/legend-application';
 import { toastManager } from '../../components/Toast/CartToast.js';
 
+const boolToString = (val: boolean | undefined): 'true' | 'false' =>
+  val ? 'true' : 'false';
+
 enum BUSINESS_REASONS {
   NEW_HIRE = 'New Hire',
   NEW_ROLE = 'New Role',
@@ -83,6 +89,7 @@ export class CartStore {
       clearCart: flow,
       deleteCartItem: flow,
       addToCartWithAPI: flow,
+      addOrderProfileItemsToCart: flow,
     });
     this.baseStore = baseStore;
   }
@@ -168,7 +175,10 @@ export class CartStore {
     return [];
   }
 
-  *addToCartWithAPI(cartItemData: CartItemRequest): GeneratorFn<{
+  *addToCartWithAPI(
+    cartItemData: CartItemRequest,
+    suppressSuccessToast = false,
+  ): GeneratorFn<{
     success: boolean;
     recommendations?: TerminalResult[];
     message: string;
@@ -194,7 +204,7 @@ export class CartStore {
       const responseMessage: string = response.message;
       if (!/^2\d\d$/.test(String(response.status_code))) {
         toastManager.warning(responseMessage);
-      } else {
+      } else if (!suppressSuccessToast) {
         toastManager.success(responseMessage);
       }
 
@@ -229,20 +239,96 @@ export class CartStore {
     }
   }
 
+  /**
+   * Adds a list of order-profile items to the cart, skipping already-owned ones.
+   * Each item is added sequentially so that vendor-profile items can be added
+   * before their associated add-ons.
+   */
+  *addOrderProfileItemsToCart(
+    items: TraderProfileItem[],
+    suppressSuccessToast = false,
+  ): GeneratorFn<void> {
+    for (const item of items) {
+      if (item.isOwned) {
+        continue;
+      }
+      yield flowResult(
+        this.addToCartWithAPI(
+          {
+            id: item.id,
+            productName: item.productName,
+            providerName: item.providerName,
+            category: item.category,
+            price: item.price,
+            description: item.description ?? '',
+            isOwned: boolToString(item.isOwned),
+            ...(item.model === null || item.model === undefined
+              ? {}
+              : { model: item.model }),
+            skipWorkflow: true,
+            ...(item.isMandatory === undefined
+              ? {}
+              : { isMandatory: item.isMandatory }),
+            ...(item.vendorProfileId === undefined
+              ? {}
+              : { vendorProfileId: item.vendorProfileId }),
+            ...(item.permissionId === undefined
+              ? {}
+              : { permissionId: item.permissionId }),
+          },
+          suppressSuccessToast,
+        ),
+      );
+    }
+  }
+
+  /**
+   * Returns true when all non-owned items of the profile are present in the
+   * cart.  For multiselect profiles, at least one complete terminal bundle
+   * (terminal + its associated add-ons) must be fully in the cart.
+   */
+  isOrderProfileInCart(profile: TraderProfile): boolean {
+    const nonOwnedItems = profile.items.filter((item) => !item.isOwned);
+    const nonOwnedTerminals = nonOwnedItems.filter((item) => item.isTerminal);
+    if (profile.multiselect) {
+      return nonOwnedTerminals.some((terminal) => {
+        const selectedModel = terminal.model ?? null;
+        const bundleItems = [
+          terminal,
+          ...profile.items.filter(
+            (item) =>
+              !item.isTerminal &&
+              !item.isOwned &&
+              (selectedModel === null || item.model === selectedModel),
+          ),
+        ];
+        return bundleItems.every((item) => this.isItemInCart(item.id));
+      });
+    }
+    return (
+      nonOwnedItems.length > 0 &&
+      nonOwnedItems.every((item) => this.isItemInCart(item.id))
+    );
+  }
+
   providerToCartRequest(provider: TerminalResult): CartItemRequest {
+    const isInventory = provider.source === RecommendationSource.INVENTORY;
     return {
-      id: provider.id,
+      id: isInventory ? (provider.permissionId ?? provider.id) : provider.id,
       productName: provider.productName,
       providerName: provider.providerName,
       category: provider.category,
       price: provider.price,
       description: provider.description,
-      isOwned: provider.isOwned ? 'true' : 'false',
+      isOwned: boolToString(provider.isOwned),
       model: provider.model ?? provider.productName,
       skipWorkflow: provider.skipWorkflow ?? false,
       ...(provider.vendorProfileId !== undefined && {
         vendorProfileId: provider.vendorProfileId,
       }),
+      ...(provider.permissionId !== undefined && {
+        permissionId: provider.permissionId,
+      }),
       ...(provider.source !== undefined && {
         source: provider.source,
       }),

package/src/stores/lakehouse/entitlements/EntitlementsDashboardState.ts

@@ -311,17 +311,19 @@ export class EntitlementsDashboardState {
         filteredTasks,
         filteredContractsForUser,
         filteredCreatedByUserMap,
+        filteredDataRequests,
       } = this.filterByUserEnvironment(
         pendingTasksData,
         contractsForUser,
         contractsCreatedByUserMap,
+        dataRequestsCreatedByUser,
         envMap,
       );
       this.pendingTaskContractMap = pendingTasksData.taskContractMap;
       this.pendingTasks = filteredTasks;
       this.allContractsForUser = filteredContractsForUser;
       this.allContractsCreatedByUserMap = filteredCreatedByUserMap;
-      this.dataRequestsCreatedByUser = dataRequestsCreatedByUser;
+      this.dataRequestsCreatedByUser = filteredDataRequests;
 
       this.fetchingPendingTasksState.complete();
       this.fetchingContractsForUserState.complete();
@@ -766,11 +768,13 @@ export class EntitlementsDashboardState {
     },
     contractsForUser: V1_LiteDataContractWithUserStatus[],
     contractsCreatedByUserMap: Map<string, ContractCreatedByUserDetails>,
+    dataRequests: V1_DataRequestWithWorkflow[],
     envMap: Map<number, string>,
   ): {
     filteredTasks: V1_ContractUserEventRecord[];
     filteredContractsForUser: V1_LiteDataContractWithUserStatus[];
     filteredCreatedByUserMap: Map<string, ContractCreatedByUserDetails>;
+    filteredDataRequests: V1_DataRequestWithWorkflow[];
   } {
     const userEnv =
       this.lakehouseEntitlementsStore.marketplaceBaseStore.envState
@@ -796,10 +800,15 @@ export class EntitlementsDashboardState {
         filteredCreatedByUserMap.set(guid, details);
       }
     }
+    const filteredDataRequests = dataRequests.filter((dr) => {
+      const envType = dr.dataRequest.resourceEnvType;
+      return !envType || envType === userEnv;
+    });
     return {
       filteredTasks,
       filteredContractsForUser,
       filteredCreatedByUserMap,
+      filteredDataRequests,
     };
   }
 

package/tsconfig.json

@@ -62,6 +62,7 @@
     "./src/application/LegendMarketplacePluginManager.ts",
     "./src/application/__test-utils__/LegendMarketplaceApplicationTestUtils.ts",
     "./src/application/extensions/Core_LegendMarketplace_LegendApplicationPlugin.ts",
+    "./src/components/ProviderCard/orderProfileUtils.ts",
     "./src/components/__test-utils__/TEST_DATA__DataAPIs.ts",
     "./src/components/__test-utils__/TEST_DATA__LakehouseData.ts",
     "./src/components/__test-utils__/TEST_DATA__LakehouseSearchResultData.ts",
@@ -122,7 +123,10 @@
     "./src/components/MarketplaceCard/LegendMarketplaceListItem.tsx",
     "./src/components/MarketplaceSearchFiltersPanel/MarketplaceSearchFiltersPanel.tsx",
     "./src/components/Pagination/PaginationControls.tsx",
+    "./src/components/ProviderCard/LegendMarketplaceOrderProfileCard.tsx",
     "./src/components/ProviderCard/LegendMarketplaceTerminalCard.tsx",
+    "./src/components/ProviderCard/OrderProfileDetailModal.tsx",
+    "./src/components/ProviderCard/OrderProfileMultiselectModal.tsx",
     "./src/components/SearchBar/LegendMarketplaceSearchBar.tsx",
     "./src/components/Toast/CartToast.tsx",
     "./src/components/__test-utils__/LegendMarketplaceStoreTestUtils.tsx",