add graceful handling of non-existent vector stores and custom endpoint configmaps in GetPassthroughEmbeddingProviderInfo/ListExternalVectorStores

Author: jharan1

packages/gen-ai/bff/internal/api/aaa_vectorstores_handler_test.go

@@ -194,6 +194,35 @@ var _ = Describe("VectorStoresAAHandler", func() {
 		assert.Contains(t, errorInfo["message"], "namespace parameter is required")
 	})
 
+	It("should return 200 with empty list when the vector stores ConfigMap does not exist", func() {
+		t := GinkgoT()
+		rr := httptest.NewRecorder()
+
+		// opendatahub namespace exists but has no gen-ai-aa-vector-stores ConfigMap
+		req, err := http.NewRequest("GET", "/gen-ai/api/v1/aaa/vectorstores?namespace=opendatahub", nil)
+		require.NoError(t, err)
+
+		ctx := context.WithValue(req.Context(), constants.RequestIdentityKey, &integrations.RequestIdentity{
+			Token: "FAKE_BEARER_TOKEN",
+		})
+		ctx = context.WithValue(ctx, constants.NamespaceQueryParameterKey, "opendatahub")
+		req = req.WithContext(ctx)
+
+		app.VectorStoresAAHandler(rr, req, nil)
+
+		assert.Equal(t, http.StatusOK, rr.Code)
+
+		body, err := io.ReadAll(rr.Result().Body)
+		require.NoError(t, err)
+		defer rr.Result().Body.Close()
+
+		var response VectorStoresAAEnvelope
+		err = json.Unmarshal(body, &response)
+		require.NoError(t, err)
+
+		assert.Empty(t, response.Data, "Should return empty list when ConfigMap is absent")
+	})
+
 	It("should return 400 when request identity is missing", func() {
 		t := GinkgoT()
 		rr := httptest.NewRecorder()

packages/gen-ai/bff/internal/api/external_vectorstores_handler_test.go

@@ -237,4 +237,34 @@ var _ = Describe("ExternalVectorStoresListHandler", func() {
 		assert.Equal(t, "llama-stack", response.Data.ConfigMapInfo.Namespace)
 		assert.NotEmpty(t, response.Data.ConfigMapInfo.LastUpdated, "ConfigMap info should have last updated timestamp")
 	})
+
+	It("should return 200 with empty list when the vector stores ConfigMap does not exist", func() {
+		t := GinkgoT()
+		rr := httptest.NewRecorder()
+
+		// opendatahub namespace exists but has no gen-ai-aa-vector-stores ConfigMap
+		req, err := http.NewRequest("GET", "/api/v1/vectorstores/external?namespace=opendatahub", nil)
+		require.NoError(t, err)
+
+		ctx := context.WithValue(req.Context(), constants.RequestIdentityKey, &integrations.RequestIdentity{
+			Token: "FAKE_BEARER_TOKEN",
+		})
+		ctx = context.WithValue(ctx, constants.NamespaceQueryParameterKey, "opendatahub")
+		req = req.WithContext(ctx)
+
+		app.ExternalVectorStoresListHandler(rr, req, nil)
+
+		assert.Equal(t, http.StatusOK, rr.Code)
+
+		body, err := io.ReadAll(rr.Result().Body)
+		require.NoError(t, err)
+		defer rr.Result().Body.Close()
+
+		var response ExternalVectorStoresListEnvelope
+		err = json.Unmarshal(body, &response)
+		require.NoError(t, err)
+
+		assert.Empty(t, response.Data.VectorStores, "Should return empty list when ConfigMap is absent")
+		assert.Equal(t, 0, response.Data.TotalCount, "Should return zero total count when ConfigMap is absent")
+	})
 })

packages/gen-ai/bff/internal/api/lsd_responses_handler_test.go

@@ -30,6 +30,8 @@ import (
 	"github.com/opendatahub-io/gen-ai/internal/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	"k8s.io/apimachinery/pkg/runtime/schema"
 )
 
 var _ = Describe("LlamaStackCreateResponseHandler", func() {
@@ -1631,6 +1633,16 @@ func TestGetPassthroughEmbeddingSecret(t *testing.T) {
 		assert.Contains(t, err.Error(), "configmap not found")
 	})
 
+	t.Run("returns no passthrough data when vector stores ConfigMap does not exist", func(t *testing.T) {
+		client := &customEndpointMockClient{
+			vectorStoresDocErr: apierrors.NewNotFound(schema.GroupResource{Resource: "configmaps"}, "gen-ai-aa-vector-stores"),
+		}
+		providerData, err := newApp(client).getProviderData(newCtx(), "inf-model", "", "", []string{"vs-1"})
+		require.NoError(t, err)
+		assert.NotContains(t, providerData, "passthrough_url")
+		assert.NotContains(t, providerData, "passthrough_api_key")
+	})
+
 	t.Run("returns error when external models ConfigMap read fails", func(t *testing.T) {
 		client := &customEndpointMockClient{
 			vectorStoresDoc:         vsDoc,
@@ -1641,6 +1653,17 @@ func TestGetPassthroughEmbeddingSecret(t *testing.T) {
 		assert.Contains(t, err.Error(), "external models configmap unavailable")
 	})
 
+	t.Run("returns no passthrough data when external models ConfigMap does not exist", func(t *testing.T) {
+		client := &customEndpointMockClient{
+			vectorStoresDoc:         vsDoc,
+			externalModelsConfigErr: apierrors.NewNotFound(schema.GroupResource{Resource: "configmaps"}, "gen-ai-aa-custom-model-endpoints"),
+		}
+		providerData, err := newApp(client).getProviderData(newCtx(), "inf-model", "", "", []string{"vs-1"})
+		require.NoError(t, err)
+		assert.NotContains(t, providerData, "passthrough_url")
+		assert.NotContains(t, providerData, "passthrough_api_key")
+	})
+
 	t.Run("returns error when secret fetch fails", func(t *testing.T) {
 		client := &customEndpointMockClient{
 			vectorStoresDoc:      vsDoc,

packages/gen-ai/bff/internal/repositories/external_models.go

@@ -13,6 +13,7 @@ import (
 	"github.com/opendatahub-io/gen-ai/internal/integrations/externalmodels"
 	"github.com/opendatahub-io/gen-ai/internal/integrations/kubernetes"
 	"github.com/opendatahub-io/gen-ai/internal/models"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
 )
 
 type ExternalModelsRepository struct{}
@@ -83,7 +84,8 @@ type PassthroughEmbeddingInfo struct {
 
 // GetPassthroughEmbeddingProviderInfo finds the first vector store in vectorStoreIDs that uses
 // a custom-endpoint (remote::passthrough) embedding model and returns its URL and API key.
-// Returns (nil, nil) when none of the stores use a passthrough embedding model — not an error.
+// Returns (nil, nil) if Vector Stores or External Models config not found, or when none of
+// the stores use a passthrough embedding model — not an error.
 // Returns a non-nil error when ConfigMap or Secret reads fail so callers can fail closed.
 func (r *ExternalModelsRepository) GetPassthroughEmbeddingProviderInfo(
 	client kubernetes.KubernetesClientInterface,
@@ -94,6 +96,9 @@ func (r *ExternalModelsRepository) GetPassthroughEmbeddingProviderInfo(
 ) (*PassthroughEmbeddingInfo, error) {
 	vsDoc, err := client.GetVectorStoresConfig(ctx, namespace)
 	if err != nil {
+		if apierrors.IsNotFound(err) {
+			return nil, nil
+		}
 		return nil, fmt.Errorf("failed to get vector stores config: %w", err)
 	}
 
@@ -104,6 +109,9 @@ func (r *ExternalModelsRepository) GetPassthroughEmbeddingProviderInfo(
 
 	externalModelsConfig, err := client.GetExternalModelsConfig(ctx, namespace)
 	if err != nil {
+		if apierrors.IsNotFound(err) {
+			return nil, nil
+		}
 		return nil, fmt.Errorf("failed to get external models config: %w", err)
 	}
 

packages/gen-ai/bff/internal/repositories/external_vectorstores.go

@@ -10,6 +10,7 @@ import (
 	kubernetes "github.com/opendatahub-io/gen-ai/internal/integrations/kubernetes"
 	"github.com/opendatahub-io/gen-ai/internal/models"
 	"gopkg.in/yaml.v2"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
 )
 
 // ExternalVectorStoresRepository handles external vector store operations
@@ -35,6 +36,8 @@ type ExternalVectorStoresResult struct {
 // parses the providers and registered_resources sections, and resolves provider metadata per store.
 // Embedding model status (not_available / available / registered) is computed client-side by the
 // frontend using the already-loaded merged models data.
+// Returns an empty result (not an error) when the ConfigMap does not exist — a fresh namespace
+// with no external vector stores configured is a valid empty state.
 func (r *ExternalVectorStoresRepository) ListExternalVectorStores(
 	ctx context.Context,
 	k8sClient kubernetes.KubernetesClientInterface,
@@ -43,6 +46,9 @@ func (r *ExternalVectorStoresRepository) ListExternalVectorStores(
 ) (*ExternalVectorStoresResult, error) {
 	configMap, err := k8sClient.GetConfigMap(ctx, identity, namespace, constants.VectorStoresConfigMapName)
 	if err != nil {
+		if apierrors.IsNotFound(err) {
+			return &ExternalVectorStoresResult{VectorStores: []models.ExternalVectorStoreSummary{}}, nil
+		}
 		return nil, fmt.Errorf("failed to get vector stores ConfigMap: %w", err)
 	}