update llamastack Not Found error wrapping

Author: jharan1

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

@@ -32,7 +32,7 @@ func (app *App) getDefaultStatusCodeForLlamaStackClientError(errorCode string) i
 		return http.StatusBadRequest
 	case llamastack.ErrCodeUnauthorized:
 		return http.StatusUnauthorized
-	case llamastack.ErrCodeModelNotFound:
+	case llamastack.ErrCodeNotFound:
 		return http.StatusNotFound
 	case llamastack.ErrCodeConnectionFailed, llamastack.ErrCodeTimeout, llamastack.ErrCodeServerUnavailable:
 		return http.StatusServiceUnavailable

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

@@ -38,8 +38,8 @@ func TestHandleLlamaStackClientError(t *testing.T) {
 			expectedBodyContains: "unauthorized",
 		},
 		{
-			name:                 "LlamaStackError with ModelNotFound code",
-			inputError:           llamastack.NewModelNotFoundError("gpt-4"),
+			name:                 "LlamaStackError with NotFound code",
+			inputError:           llamastack.NewNotFoundError("resource not found"),
 			expectedStatusCode:   http.StatusNotFound,
 			expectedBodyContains: "not_found",
 		},
@@ -94,8 +94,8 @@ func TestGetDefaultStatusCodeForLlamaStackClientError(t *testing.T) {
 			expectedStatusCode: http.StatusUnauthorized,
 		},
 		{
-			name:               "ModelNotFound code returns 404",
-			errorCode:          llamastack.ErrCodeModelNotFound,
+			name:               "NotFound code returns 404",
+			errorCode:          llamastack.ErrCodeNotFound,
 			expectedStatusCode: http.StatusNotFound,
 		},
 		{
@@ -165,11 +165,11 @@ func TestMapLlamaStackClientErrorToHTTPError(t *testing.T) {
 		},
 		{
 			name:               "not found error",
-			lsErr:              llamastack.NewModelNotFoundError("gpt-4"),
+			lsErr:              llamastack.NewNotFoundError("resource not found"),
 			statusCode:         http.StatusNotFound,
 			expectedCode:       "not_found",
 			expectedStatusCode: http.StatusNotFound,
-			expectedMessage:    "model 'gpt-4' not found or is not available",
+			expectedMessage:    "resource not found",
 		},
 		{
 			name:               "service unavailable error",
@@ -236,17 +236,17 @@ func TestLlamaStackHelpersIntegration(t *testing.T) {
 		assert.Contains(t, rr.Body.String(), "input is required")
 	})
 
-	t.Run("should handle LlamaStackError with model not found", func(t *testing.T) {
+	t.Run("should handle LlamaStackError with not found", func(t *testing.T) {
 		req := httptest.NewRequest("GET", "/test", nil)
 		rr := httptest.NewRecorder()
 
-		lsErr := llamastack.NewModelNotFoundError("gpt-4")
+		lsErr := llamastack.NewNotFoundError("resource not found")
 
 		app.handleLlamaStackClientError(rr, req, lsErr)
 
 		assert.Equal(t, http.StatusNotFound, rr.Code)
 		assert.Contains(t, rr.Body.String(), `"code": "not_found"`)
-		assert.Contains(t, rr.Body.String(), "gpt-4")
+		assert.Contains(t, rr.Body.String(), "resource not found")
 	})
 
 	t.Run("should fall back to serverErrorResponse for unknown error type", func(t *testing.T) {

packages/gen-ai/bff/internal/integrations/llamastack/errors.go

@@ -33,7 +33,7 @@ const (
 	ErrCodeServerUnavailable = "SERVER_UNAVAILABLE"
 	ErrCodeUnauthorized      = "UNAUTHORIZED"
 	ErrCodeInvalidRequest    = "INVALID_REQUEST"
-	ErrCodeModelNotFound     = "MODEL_NOT_FOUND"
+	ErrCodeNotFound          = "NOT_FOUND"
 	ErrCodeInternalError     = "INTERNAL_ERROR"
 )
 
@@ -86,9 +86,9 @@ func NewInvalidRequestError(message string) *LlamaStackError {
 	return NewLlamaStackError(ErrCodeInvalidRequest, message, 400)
 }
 
-// NewModelNotFoundError creates a model not found error
-func NewModelNotFoundError(modelName string) *LlamaStackError {
-	return NewLlamaStackError(ErrCodeModelNotFound, fmt.Sprintf("model '%s' not found or is not available", modelName), 404)
+// NewNotFoundError creates a not found error
+func NewNotFoundError(message string) *LlamaStackError {
+	return NewLlamaStackError(ErrCodeNotFound, message, 404)
 }
 
 // wrapClientError wraps errors from the llamastack OpenAI client into our LlamaStackError type for consistent error handling.
@@ -116,7 +116,6 @@ func wrapClientError(err error, operation string, metadata ...interface{}) error
 	// Check for network-level errors (connection refused, timeout, DNS failures, etc.)
 	var urlErr *url.Error
 	if errors.As(err, &urlErr) {
-		fmt.Printf("DEBUG wrapClientError: detected *url.Error\n")
 		message := fmt.Sprintf("failed to connect to LlamaStack server while %s: %s", operation, urlErr.Err.Error())
 		lsErr := NewConnectionError("LlamaStack server", message)
 		lsErr.Metadata = meta
@@ -137,7 +136,7 @@ func wrapClientError(err error, operation string, metadata ...interface{}) error
 		case http.StatusUnauthorized:
 			lsErr = NewUnauthorizedError(message)
 		case http.StatusNotFound:
-			lsErr = NewModelNotFoundError(message)
+			lsErr = NewNotFoundError(message)
 		case http.StatusServiceUnavailable, http.StatusGatewayTimeout, http.StatusRequestTimeout:
 			lsErr = NewServerUnavailableError(message)
 		default: