Merge branch 'main' into RHOAIENG-36419-Improve-error-handling-in-BFF-API-for-LlamaStack-errors-to-UI

Author: jharan1

backend/src/__tests__/featureStoreUtils.spec.ts

@@ -15,6 +15,7 @@ const NAMESPACE = {
   DEFAULT: 'default',
   TEST_NS: 'test-ns',
   NAMESPACE_WITH_DASH: 'namespace-with-dash',
+  TEST_FEAST_BANKING: 'test-feast-banking',
 } as const;
 
 const PROJECT = {
@@ -23,18 +24,24 @@ const PROJECT = {
   TEST: 'test',
   ENABLED_2: 'enabled-2',
   NO_LABELS: 'no-labels',
+  FRAUD_DETECT: 'fraud_detect',
+  CREDIT_SCORING_LOCAL: 'credit_scoring_local',
 } as const;
 
 const CONFIG_NAME = {
   BANKING: 'banking-config',
   RETAIL: 'retail-config',
+  FRAUD_DETECT: 'feast-fraud-detect-client',
+  CREDIT_SCORING_LOCAL: 'feast-sample-git-client',
 } as const;
 
 const SERVICE_NAME = {
   BANKING_REST: 'feast-banking-registry-rest',
   RETAIL_REST: 'feast-retail-registry-rest',
   TEST_REST: 'feast-test-registry-rest',
   COMPLEX_REST: 'feast-my-complex-name-registry-rest',
+  FRAUD_DETECT_REST: 'feast-fraud-detect-registry-rest',
+  CREDIT_SCORING_REST: 'feast-sample-git-registry-rest',
 } as const;
 
 const REGISTRY_URL = {
@@ -44,6 +51,8 @@ const REGISTRY_URL = {
   RETAIL_HTTPS: 'https://feast-retail-registry.default.svc.cluster.local',
   TEST_NO_PROTOCOL: 'feast-test-registry.test-ns.svc.cluster.local',
   COMPLEX_NAME: 'feast-my-complex-name-registry.namespace-with-dash.svc.cluster.local',
+  FRAUD_DETECT_HTTPS: 'https://feast-fraud-detect-registry.test-feast-banking.svc.cluster.local',
+  CREDIT_SCORING_HTTPS: 'https://feast-sample-git-registry.credit-namespace.svc.cluster.local',
   INVALID: 'invalid-url-format',
 } as const;
 
@@ -81,7 +90,7 @@ const createClientConfigInfo = (overrides: Partial<ClientConfigInfo> = {}): Clie
 });
 
 const createFeatureStoreCRD = (overrides: Partial<FeatureStoreCRD> = {}): FeatureStoreCRD => ({
-  apiVersion: 'feast.dev/v1alpha1',
+  apiVersion: 'feast.dev/v1',
   kind: 'FeatureStore',
   metadata: {
     name: PROJECT.BANKING,

backend/src/routes/api/featurestores/featureStores.ts

@@ -56,7 +56,7 @@ async function fetchFeatureStoreCRDs(
   try {
     const response = (await fastify.kube.customObjectsApi.listNamespacedCustomObject(
       'feast.dev',
-      'v1alpha1',
+      'v1',
       namespace,
       'featurestores',
     )) as CustomObjectResponse;

backend/src/routes/api/featurestores/fsworkbenchIntegration.ts

@@ -3,30 +3,23 @@ import { KubeFastifyInstance, OauthFastifyRequest } from '../../../types';
 import { getAccessToken, getDirectCallOptions } from '../../../utils/directCallUtils';
 import { secureRoute } from '../../../utils/route-security';
 import { getNamespaces } from '../../../utils/notebookUtils';
-import { orderBy } from 'lodash';
 import {
   parseNamespacesData,
   getClientConfigs,
   fetchFromRegistry,
   fetchConfigMap,
-  batchFetchConfigMapsByNamespace,
   type ClientConfigInfo,
   handleError,
 } from './featureStoreUtils';
-import { V1ConfigMap } from '@kubernetes/client-node';
-
-interface WorkbenchFeatureStoreConfig {
-  namespace: string;
-  configName: string;
-  configMap: V1ConfigMap | null;
-  hasAccessToFeatureStore: boolean;
-}
 
 interface WorkbenchResponse {
-  clientConfigs: WorkbenchFeatureStoreConfig[];
   namespaces: Array<{
     namespace: string;
-    clientConfigs: string[];
+    clientConfigs: Array<{
+      configName: string;
+      projectName: string;
+      hasAccessToFeatureStore: boolean;
+    }>;
   }>;
 }
 
@@ -38,7 +31,10 @@ async function checkFeatureStoreAccess(
 ): Promise<boolean> {
   try {
     const projects = await fetchFromRegistry(fastify, registryUrl, userToken);
-    const hasAccess = projects && projects.length > 0;
+    if (!projects || projects.length === 0) {
+      return false;
+    }
+    const hasAccess = projects.some((p) => p.name === projectName || p.project === projectName);
     return hasAccess;
   } catch (error) {
     fastify.log.info(
@@ -74,32 +70,6 @@ async function checkMultipleFeatureStoreAccess(
   return accessResults;
 }
 
-async function processNamespaceConfigs(
-  fastify: KubeFastifyInstance,
-  namespace: string,
-  clientConfigs: string[],
-  token?: string,
-): Promise<WorkbenchFeatureStoreConfig[]> {
-  const clientConfigsData = await getClientConfigs(fastify, { [namespace]: clientConfigs });
-
-  if (clientConfigsData.length === 0) {
-    return [];
-  }
-
-  const accessResults = await checkMultipleFeatureStoreAccess(fastify, clientConfigsData, token);
-
-  const configMapMap = await batchFetchConfigMapsByNamespace(fastify, clientConfigsData);
-
-  const configsWithAccess = clientConfigsData.map((config) => ({
-    namespace: config.namespace,
-    configName: config.configName,
-    configMap: configMapMap.get(`${config.namespace}/${config.configName}`) || null,
-    hasAccessToFeatureStore: accessResults.get(config.projectName) || false,
-  }));
-
-  return orderBy(configsWithAccess, ['hasAccessToFeatureStore'], ['desc']);
-}
-
 export default async (fastify: KubeFastifyInstance): Promise<void> => {
   fastify.get(
     '/workbench-integration',
@@ -114,7 +84,6 @@ export default async (fastify: KubeFastifyInstance): Promise<void> => {
 
         if (!feastConfig || !feastConfig.data?.namespaces) {
           return reply.send({
-            clientConfigs: [],
             namespaces: [],
           });
         }
@@ -129,20 +98,38 @@ export default async (fastify: KubeFastifyInstance): Promise<void> => {
 
         const token = await getAccessToken(await getDirectCallOptions(fastify, req, ''));
 
-        const namespacePromises = namespaces.map(({ namespace: ns, clientConfigs }) =>
-          processNamespaceConfigs(fastify, ns, clientConfigs, token),
+        const allClientConfigsData = await getClientConfigs(
+          fastify,
+          Object.fromEntries(
+            namespaces.map(({ namespace, clientConfigs }) => [namespace, clientConfigs]),
+          ),
         );
 
-        const namespaceResults = await Promise.all(namespacePromises);
-        const allClientConfigs = orderBy(
-          namespaceResults.flat(),
-          ['hasAccessToFeatureStore'],
-          ['desc'],
+        const accessResults = await checkMultipleFeatureStoreAccess(
+          fastify,
+          allClientConfigsData,
+          token,
         );
 
+        const namespaceResults = namespaces.map(({ namespace }) => {
+          const namespaceConfigs = allClientConfigsData.filter(
+            (config) => config.namespace === namespace,
+          );
+          const accessibleConfigs = namespaceConfigs
+            .filter((config) => accessResults.get(config.projectName))
+            .map((config) => ({
+              configName: config.configName,
+              projectName: config.projectName,
+              hasAccessToFeatureStore: accessResults.get(config.projectName) ?? false,
+            }));
+          return {
+            namespace,
+            clientConfigs: accessibleConfigs,
+          };
+        });
+
         const response: WorkbenchResponse = {
-          clientConfigs: allClientConfigs,
-          namespaces,
+          namespaces: namespaceResults.filter((ns) => ns.clientConfigs.length > 0),
         };
 
         return reply.send(response);

backend/src/types.ts

@@ -49,8 +49,10 @@ export type DashboardConfig = K8sResourceCommon & {
       disableKueue: boolean;
       disableLMEval: boolean;
       disableFeatureStore: boolean;
+      trainingJobs: boolean;
       genAiStudio: boolean;
       modelAsService: boolean;
+      mlflow: boolean;
     };
     // Intentionally disjointed from the CRD, we should move away from this code-wise now; CRD later
     // groupsConfig?: {

backend/src/utils/constants.ts

@@ -85,6 +85,8 @@ export const blankDashboardCR: DashboardConfig = {
       disableFineTuning: true,
       disableKueue: true,
       disableLMEval: true,
+      mlflow: false,
+      trainingJobs: false,
     },
     notebookController: {
       enabled: true,

frontend/src/__mocks__/mockDashboardConfig.ts

@@ -46,10 +46,14 @@ export type MockDashboardConfigType = {
   hardwareProfileOrder?: string[];
   pvcSize?: string;
   mlflow?: boolean;
+  projectRBAC?: boolean;
+  embedMLflow?: boolean;
 };
 
 export const mockDashboardConfig = ({
   mlflow = false,
+  projectRBAC = false,
+  embedMLflow = false,
   disableInfo = false,
   disableSupport = false,
   disableClusterManager = false,
@@ -209,6 +213,8 @@ export const mockDashboardConfig = ({
   spec: {
     dashboardConfig: {
       mlflow,
+      projectRBAC,
+      embedMLflow,
       enablement: true,
       disableInfo,
       disableSupport,

frontend/src/__mocks__/mockLLMInferenceServiceK8sResource.ts

@@ -1,6 +1,7 @@
 import { type LLMInferenceServiceKind } from '@odh-dashboard/llmd-serving/types';
 import { genUID } from '@odh-dashboard/internal/__mocks__/mockUtils';
 import { ServingRuntimeModelType } from '@odh-dashboard/internal/types';
+import { ModelAnnotation } from '#~/pages/projects/screens/spawner/storage/types.ts';
 
 type MockLLMInferenceServiceConfigType = {
   name?: string;
@@ -17,6 +18,7 @@ type MockLLMInferenceServiceConfigType = {
   additionalLabels?: Record<string, string>;
   isNonDashboardItem?: boolean;
   modelType?: ServingRuntimeModelType;
+  isStopped?: boolean;
 };
 
 export const mockLLMInferenceServiceK8sResource = ({
@@ -31,6 +33,7 @@ export const mockLLMInferenceServiceK8sResource = ({
   lastTransitionTime = '2023-03-17T16:12:41Z',
   isReady = true,
   url,
+  isStopped = false,
 }: MockLLMInferenceServiceConfigType): LLMInferenceServiceKind => ({
   apiVersion: 'serving.kserve.io/v1alpha1',
   kind: 'LLMInferenceService',
@@ -40,6 +43,7 @@ export const mockLLMInferenceServiceK8sResource = ({
       'opendatahub.io/hardware-profile-name': 'small-profile',
       'opendatahub.io/hardware-profile-namespace': 'opendatahub',
       'opendatahub.io/model-type': ServingRuntimeModelType.GENERATIVE,
+      ...(isStopped ? { [ModelAnnotation.STOPPED_ANNOTATION]: 'true' } : {}),
     },
     creationTimestamp,
     ...(deleted ? { deletionTimestamp: new Date().toUTCString() } : {}),

frontend/src/__mocks__/mockProjectK8sResource.ts

@@ -13,6 +13,7 @@ type MockResourceConfigType = {
   enableNIM?: boolean;
   isDSProject?: boolean;
   phase?: 'Active' | 'Terminating';
+  enableKueue?: boolean;
 };
 
 export const mockProjectK8sResource = ({
@@ -26,6 +27,7 @@ export const mockProjectK8sResource = ({
   description = '',
   isDSProject = true,
   phase = 'Active',
+  enableKueue = false,
 }: MockResourceConfigType): ProjectKind => ({
   kind: 'Project',
   apiVersion: 'project.openshift.io/v1',
@@ -39,6 +41,7 @@ export const mockProjectK8sResource = ({
         [KnownLabels.MODEL_SERVING_PROJECT]: 'false',
       }),
       ...(isDSProject && { [KnownLabels.DASHBOARD_RESOURCE]: 'true' }),
+      ...(enableKueue && { 'kueue.openshift.io/managed': 'true' }),
     },
     ...(hasAnnotations && {
       annotations: {

frontend/src/api/featureStore/custom.ts

@@ -0,0 +1,18 @@
+import { proxyGET } from '#~/api/proxyUtils';
+import { K8sAPIOptions } from '#~/k8sTypes';
+
+export type WorkbenchFeatureStoreResponse = {
+  namespaces: Array<{
+    namespace: string;
+    clientConfigs: Array<{
+      configName: string;
+      projectName: string;
+      hasAccessToFeatureStore: boolean;
+    }>;
+  }>;
+};
+
+export const getWorkbenchFeatureStores = (
+  opts?: K8sAPIOptions,
+): Promise<WorkbenchFeatureStoreResponse> =>
+  proxyGET<WorkbenchFeatureStoreResponse>('', '/api/featurestores/workbench-integration', {}, opts);

frontend/src/api/k8s/__tests__/roleBindings.spec.ts

@@ -3,11 +3,10 @@ import {
   k8sCreateResource,
   k8sDeleteResource,
   k8sGetResource,
-  k8sListResource,
   k8sPatchResource,
+  k8sListResourceItems,
 } from '@openshift/dynamic-plugin-sdk-utils';
 import { mockRoleBindingK8sResource } from '#~/__mocks__/mockRoleBindingK8sResource';
-import { mockK8sResourceList } from '#~/__mocks__/mockK8sResourceList';
 import { mock200Status, mock404Error } from '#~/__mocks__/mockK8sStatus';
 import { KnownLabels, RoleBindingKind, RoleBindingSubject } from '#~/k8sTypes';
 import {
@@ -27,18 +26,18 @@ import {
 } from '#~/concepts/roleBinding/types';
 
 jest.mock('@openshift/dynamic-plugin-sdk-utils', () => ({
-  k8sListResource: jest.fn(),
   k8sGetResource: jest.fn(),
   k8sCreateResource: jest.fn(),
   k8sDeleteResource: jest.fn(),
   k8sPatchResource: jest.fn(),
+  k8sListResourceItems: jest.fn(),
 }));
 
-const k8sListResourceMock = jest.mocked(k8sListResource<RoleBindingKind>);
 const k8sGetResourceMock = jest.mocked(k8sGetResource);
 const k8sCreateResourceMock = jest.mocked(k8sCreateResource);
 const k8sDeleteResourceMock = jest.mocked(k8sDeleteResource<RoleBindingKind, K8sStatus>);
 const k8sPatchResourceMock = jest.mocked(k8sPatchResource<RoleBindingKind>);
+const k8sListResourceItemsMock = jest.mocked(k8sListResourceItems<RoleBindingKind>);
 
 const roleBindingMock = mockRoleBindingK8sResource({});
 const namespace = 'namespace';
@@ -222,32 +221,32 @@ describe('generateRoleBindingPermissions', () => {
 
 describe('listRoleBindings', () => {
   it('should list role bindings without namespace and label selector', async () => {
-    k8sListResourceMock.mockResolvedValue(mockK8sResourceList([roleBindingMock]));
+    k8sListResourceItemsMock.mockResolvedValue([roleBindingMock]);
     const result = await listRoleBindings();
-    expect(k8sListResourceMock).toHaveBeenCalledWith({
+    expect(k8sListResourceItemsMock).toHaveBeenCalledWith({
       model: RoleBindingModel,
       queryOptions: {},
     });
-    expect(k8sListResourceMock).toHaveBeenCalledTimes(1);
+    expect(k8sListResourceItemsMock).toHaveBeenCalledTimes(1);
     expect(result).toStrictEqual([roleBindingMock]);
   });
 
   it('should list role bindings with namespace and label selector', async () => {
-    k8sListResourceMock.mockResolvedValue(mockK8sResourceList([roleBindingMock]));
+    k8sListResourceItemsMock.mockResolvedValue([roleBindingMock]);
     const result = await listRoleBindings(namespace, 'labelSelector');
-    expect(k8sListResourceMock).toHaveBeenCalledWith({
+    expect(k8sListResourceItemsMock).toHaveBeenCalledWith({
       model: RoleBindingModel,
       queryOptions: { ns: namespace, queryParams: { labelSelector: 'labelSelector' } },
     });
-    expect(k8sListResourceMock).toHaveBeenCalledTimes(1);
+    expect(k8sListResourceItemsMock).toHaveBeenCalledTimes(1);
     expect(result).toStrictEqual([roleBindingMock]);
   });
 
   it('should handle errors and rethrow', async () => {
-    k8sListResourceMock.mockRejectedValue(new Error('error1'));
+    k8sListResourceItemsMock.mockRejectedValue(new Error('error1'));
     await expect(listRoleBindings()).rejects.toThrow('error1');
-    expect(k8sListResourceMock).toHaveBeenCalledTimes(1);
-    expect(k8sListResourceMock).toHaveBeenCalledWith({
+    expect(k8sListResourceItemsMock).toHaveBeenCalledTimes(1);
+    expect(k8sListResourceItemsMock).toHaveBeenCalledWith({
       model: RoleBindingModel,
       queryOptions: {},
     });