fix: catalog conversion not handling all cases (#1750)

* fix: catalog conversion not handling all cases Fixes #1749 Signed-off-by: Jeff MAURY <jmaury@redhat.com> * fix: add unit tests Signed-off-by: Jeff MAURY <jmaury@redhat.com> * fix: apply suggestion from @lstocchi Co-authored-by: Luca Stocchi <49404737+lstocchi@users.noreply.github.com> Signed-off-by: Jeff MAURY <jmaury@redhat.com> --------- Signed-off-by: Jeff MAURY <jmaury@redhat.com> Co-authored-by: Luca Stocchi <49404737+lstocchi@users.noreply.github.com>
containers · Sep 19, 2024 · a376180 · a376180
1 parent 7435841
commit a376180
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/packages/backend/src/utils/catalogUtils.spec.ts b/packages/backend/src/utils/catalogUtils.spec.ts
@@ -19,6 +19,7 @@
 import { test, expect, describe } from 'vitest';
 import {
   CatalogFormat,
+  hasCatalogWrongFormat,
   isNonNullObject,
   merge,
   sanitize,
@@ -82,6 +83,7 @@ describe('sanitize', () => {
         },
       ],
     };
+    expect(hasCatalogWrongFormat(raw)).toBeTruthy();
     const catalog = sanitize(raw);
     expect(catalog.version).equals(CatalogFormat.CURRENT);
     expect(catalog.models[0].backend).equals('llama-cpp');
@@ -123,6 +125,7 @@ describe('sanitize', () => {
       ],
     };
 
+    expect(hasCatalogWrongFormat(raw)).toBeFalsy();
     expect(() => sanitize(raw)).toThrowError('the catalog is using an invalid version');
   });
 
@@ -160,6 +163,7 @@ describe('sanitize', () => {
         },
       ],
     };
+    expect(hasCatalogWrongFormat(raw)).toBeFalsy();
     const catalog = sanitize(raw);
     expect(catalog.version).equals(CatalogFormat.CURRENT);
     expect(catalog.models[0].backend).toBeUndefined();

diff --git a/packages/backend/src/utils/catalogUtils.ts b/packages/backend/src/utils/catalogUtils.ts
@@ -50,7 +50,9 @@ export function sanitize(rawObject: object): ApplicationCatalog {
 }
 
 export function hasCatalogWrongFormat(raw: object): boolean {
-  return 'recipes' in raw && Array.isArray(raw.recipes) && !!raw.recipes.find(r => 'models' in r);
+  return (
+    !('version' in raw) || ('recipes' in raw && Array.isArray(raw.recipes) && !!raw.recipes.find(r => 'models' in r))
+  );
 }
 
 function adaptToCurrent(raw: object): object & { version: string } {
@@ -59,7 +61,7 @@ function adaptToCurrent(raw: object): object & { version: string } {
     raw.recipes.forEach(recipe => {
       recipe.backend = recipe.backend ?? 'llama-cpp';
       recipe.recommended = recipe.recommended ?? recipe.models ?? []; // Copy models to recommended if not present
-      recipe.models = []; // Clear models to avoid duplication
+      delete recipe.models; // Clear models to avoid duplication
     });
   }