Fix [Feature store] row expansion request should consider all applied…

… filters (#3058)
mlrun · Jan 28, 2025 · ec96cd4 · ec96cd4
1 parent 956ea27
commit ec96cd4
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 24 deletions.
diff --git a/src/actions/featureStore.js b/src/actions/featureStore.js
@@ -119,9 +119,9 @@ const featureStoreActions = {
   deleteFeatureVector: (project, featureVector) => () => {
     return featureStoreApi.deleteFeatureVector(project, featureVector)
   },
-  fetchEntity: (project, entityName, entityMetadataName) => dispatch => {
+  fetchEntity: (project, entityName, entityMetadataName, labels) => dispatch => {
     return featureStoreApi
-      .getEntity(project, entityName)
+      .getEntity(project, entityName, labels)
       .then(response => {
         const parsedEntities = parseFeatures(response.data, entityMetadataName)
 
@@ -204,9 +204,9 @@ const featureStoreActions = {
     type: FETCH_FEATURE_SETS_SUCCESS,
     payload: featureSets
   }),
-  fetchExpandedFeatureSet: (project, featureSet, tag) => dispatch => {
+  fetchExpandedFeatureSet: (project, featureSet, tag, labels) => dispatch => {
     return featureStoreApi
-      .getExpandedFeatureSet(project, featureSet, tag)
+      .getExpandedFeatureSet(project, featureSet, tag, labels)
       .then(response => {
         const generatedFeatureSets = parseFeatureSets(response.data?.feature_sets)
 
@@ -251,9 +251,9 @@ const featureStoreActions = {
   fetchFeatureSetSuccess: () => ({
     type: FETCH_FEATURE_SET_SUCCESS
   }),
-  fetchFeatureVector: (project, featureVector, tag) => dispatch => {
+  fetchFeatureVector: (project, featureVector, tag, labels) => dispatch => {
     return featureStoreApi
-      .getFeatureVector(project, featureVector, tag)
+      .getFeatureVector(project, featureVector, tag, labels)
       .then(response => {
         const generatedFeatureVectors = parseFeatureVectors(response.data?.feature_vectors)
 
@@ -314,9 +314,9 @@ const featureStoreActions = {
     type: FETCH_FEATURE_VECTORS_SUCCESS,
     payload: featureSets
   }),
-  fetchFeature: (project, featureName, featureMetadataName) => dispatch => {
+  fetchFeature: (project, featureName, featureMetadataName, labels) => dispatch => {
     return featureStoreApi
-      .getFeature(project, featureName)
+      .getFeature(project, featureName, labels)
       .then(response => {
         const parsedFeatures = parseFeatures(response.data, featureMetadataName)
 

diff --git a/src/api/featureStore-api.js b/src/api/featureStore-api.js
@@ -70,13 +70,20 @@ const featureStoreApi = {
     mainHttpClient.get(`/projects/${project}/feature-sets/*/tags`, config),
   fetchFeatureVectorsTags: (project, config) =>
     mainHttpClient.get(`/projects/${project}/feature-vectors/*/tags`, config),
-  getEntity: (project, entity) =>
-    mainHttpClientV2.get(`/projects/${project}/entities`, {
-      params: { name: entity }
-    }),
+  getEntity: (project, entity, labels) => {
+    const params = { name: entity }
+
+    if (labels) {
+      params.labels = labels
+    }
+
+    return mainHttpClientV2.get(`/projects/${project}/entities`, {
+      params
+    })
+  },
   getEntities: (project, filters, config) =>
     fetchFeatureStoreContent(`/projects/${project}/entities`, filters, config ?? {}, true, true),
-  getExpandedFeatureSet: (project, featureSet, tag) => {
+  getExpandedFeatureSet: (project, featureSet, tag, labels) => {
     const params = {
       name: featureSet,
       format: 'minimal'
@@ -86,6 +93,10 @@ const featureStoreApi = {
       params.tag = tag
     }
 
+    if (labels) {
+      params.labels = labels
+    }
+
     return mainHttpClient.get(`/projects/${project}/feature-sets`, {
       params
     })
@@ -105,7 +116,7 @@ const featureStoreApi = {
       true
     )
   },
-  getFeatureVector: (project, featureVector, tag) => {
+  getFeatureVector: (project, featureVector, tag, labels) => {
     const params = {
       name: featureVector
     }
@@ -114,6 +125,10 @@ const featureStoreApi = {
       params.tag = tag
     }
 
+    if (labels) {
+      params.labels = labels
+    }
+
     return mainHttpClient.get(`/projects/${project}/feature-vectors`, {
       params
     })
@@ -129,10 +144,17 @@ const featureStoreApi = {
       true
     )
   },
-  getFeature: (project, feature) =>
-    mainHttpClientV2.get(`/projects/${project}/features`, {
-      params: { name: feature }
-    }),
+  getFeature: (project, feature, labels) => {
+    const params = { name: feature }
+
+    if (labels) {
+      params.labels = labels
+    }
+
+    return mainHttpClientV2.get(`/projects/${project}/features`, {
+      params
+    })
+  },
   getFeatures: (project, filters, config) =>
     fetchFeatureStoreContent(
       `/projects/${project}/${FEATURES_TAB}`,

diff --git a/src/components/FeatureStore/FeatureSets/FeatureSets.js b/src/components/FeatureStore/FeatureSets/FeatureSets.js
@@ -196,7 +196,7 @@ const FeatureSets = ({
         }
       }))
 
-      fetchExpandedFeatureSet(item.project, item.name, featureSetsFilters.tag)
+      fetchExpandedFeatureSet(item.project, item.name, featureSetsFilters.tag, featureSetsFilters.labels)
         .then(result => {
           const content = [...parseFeatureSets(result)].map(contentItem =>
             createFeatureSetsRowData(contentItem, params.projectName, FEATURE_SETS_TAB, true)
@@ -221,7 +221,7 @@ const FeatureSets = ({
           }))
         })
     },
-    [fetchExpandedFeatureSet, featureSetsFilters.tag, params.projectName]
+    [fetchExpandedFeatureSet, featureSetsFilters.tag, featureSetsFilters.labels, params.projectName]
   )
 
   const { latestItems, toggleRow } = useGroupContent(

diff --git a/src/components/FeatureStore/FeatureVectors/FeatureVectors.js b/src/components/FeatureStore/FeatureVectors/FeatureVectors.js
@@ -278,7 +278,7 @@ const FeatureVectors = ({
         }
       }))
 
-      fetchFeatureVector(featureVector.project, featureVector.name, featureVectorsFilters.tag)
+      fetchFeatureVector(featureVector.project, featureVector.name, featureVectorsFilters.tag, featureVectorsFilters.labels)
         .then(result => {
           const content = sortListByDate(parseFeatureVectors(result), 'updated', false).map(
             contentItem =>
@@ -304,7 +304,7 @@ const FeatureVectors = ({
           }))
         })
     },
-    [fetchFeatureVector, featureVectorsFilters.tag, params.projectName]
+    [fetchFeatureVector, featureVectorsFilters.tag, featureVectorsFilters.labels, params.projectName]
   )
 
   const { latestItems, toggleRow } = useGroupContent(

diff --git a/src/components/FeatureStore/Features/Features.js b/src/components/FeatureStore/Features/Features.js
@@ -219,7 +219,7 @@ const Features = ({
         }
       }))
 
-      fetchData(feature.metadata.project, feature.name, feature.metadata.name)
+      fetchData(feature.metadata.project, feature.name, feature.metadata.name, featuresFilters.labels)
         .then(result => {
           if (result?.length > 0) {
             const content = [...result].map(contentItem =>
@@ -246,7 +246,7 @@ const Features = ({
           }))
         })
     },
-    [fetchEntity, fetchFeature, tableStore.isTablePanelOpen]
+    [featuresFilters.labels, fetchEntity, fetchFeature, tableStore.isTablePanelOpen]
   )
 
   const { latestItems, toggleRow } = useGroupContent(