update tests

Author: giulio93

internal/api/docs/openapi.yaml

@@ -1390,6 +1390,11 @@ components:
           type: string
         id:
           type: string
+        models:
+          items:
+            type: string
+          nullable: true
+          type: array
         name:
           type: string
         require_model:

internal/orchestrator/bricks/bricks_test.go

@@ -639,43 +639,3 @@ func TestAppBrickInstanceModelsDetails(t *testing.T) {
 		})
 	}
 }
-
-func TestAppBrickInstanceDetails(t *testing.T) {
-	bricksIndex, err := bricksindex.GenerateBricksIndexFromFile(paths.New("testdata"))
-	require.Nil(t, err)
-	brickService := NewService(nil, bricksIndex, nil)
-	tempDirectory := t.TempDir()
-
-	app := app.ArduinoApp{
-		Name: "TestApp",
-		Descriptor: app.AppDescriptor{
-			Bricks: []app.Brick{
-				{
-					ID: "arduino:image_classification",
-				},
-			},
-		},
-		FullPath: paths.New(tempDirectory),
-	}
-	configVariables, _ := brickService.AppBrickInstanceDetails(&app, bricksIndex.Bricks[2].ID)
-
-	expectedConfigVariables := BrickInstance{
-		Name:     "Image Classification",
-		ID:       "arduino:image_classification",
-		Author:   "Arduino",
-		Category: "video",
-		Status:   "installed",
-		Variables: map[string]string{
-			"CUSTOM_MODEL_PATH":       "/home/arduino/.arduino-bricks/ei-models",
-			"EI_CLASSIFICATION_MODEL": "/models/ootb/ei/mobilenet-v2-224px.eim",
-		},
-		ConfigVariables: []BrickConfigVariable{
-			{Name: "CUSTOM_MODEL_PATH", Value: "/home/arduino/.arduino-bricks/ei-models", Description: "path to the custom model directory", Required: false},
-			{Name: "EI_CLASSIFICATION_MODEL", Value: "/models/ootb/ei/mobilenet-v2-224px.eim", Description: "path to the model file", Required: false},
-		},
-		RequireModel: true,
-		ModelID:      "mobilenet-image-classification",
-	}
-
-	require.Equal(t, expectedConfigVariables, configVariables)
-}

internal/orchestrator/bricks/testdata/bricks-list.yaml

@@ -43,3 +43,5 @@ bricks:
   - name: EI_CLASSIFICATION_MODEL
     default_value: /models/ootb/ei/mobilenet-v2-224px.eim
     description: path to the model file
+
+

internal/orchestrator/bricksindex/bricks_index_test.go

@@ -33,20 +33,33 @@ func TestGenerateBricksIndexFromFile(t *testing.T) {
 	require.Equal(t, []string{"7000"}, b.Ports)
 
 	// Check if variables are correctly set
-	b, found = index.FindBrickByID("arduino:image_classification")
+	bWebUI, found := index.FindBrickByID("arduino:web_ui")
 	require.True(t, found)
-	require.Equal(t, "Image Classification", b.Name)
-	require.Equal(t, "mobilenet-image-classification", b.ModelName)
-	require.True(t, b.RequireModel)
-	require.Len(t, b.Variables, 2)
-	require.Equal(t, "CUSTOM_MODEL_PATH", b.Variables[0].Name)
-	require.Equal(t, "/opt/models/ei/", b.Variables[0].DefaultValue)
-	require.Equal(t, "path to the custom model directory", b.Variables[0].Description)
-	require.Equal(t, "EI_CLASSIFICATION_MODEL", b.Variables[1].Name)
-	require.Equal(t, "/models/ootb/ei/mobilenet-v2-224px.eim", b.Variables[1].DefaultValue)
-	require.Equal(t, "path to the model file", b.Variables[1].Description)
-	require.False(t, b.Variables[0].IsRequired())
-	require.False(t, b.Variables[1].IsRequired())
+	require.Equal(t, []string{"7000"}, bWebUI.Ports)
+
+	// Check if variables are correctly set
+	bWebUI, found = index.FindBrickByID("arduino:image_classification")
+	require.True(t, found)
+	require.Equal(t, "Image Classification", bWebUI.Name)
+	require.Equal(t, "mobilenet-image-classification", bWebUI.ModelName)
+	require.True(t, bWebUI.RequireModel)
+	require.Len(t, bWebUI.Variables, 2)
+	require.Equal(t, "CUSTOM_MODEL_PATH", bWebUI.Variables[0].Name)
+	require.Equal(t, "/opt/models/ei/", bWebUI.Variables[0].DefaultValue)
+	require.Equal(t, "path to the custom model directory", bWebUI.Variables[0].Description)
+	require.Equal(t, "EI_CLASSIFICATION_MODEL", bWebUI.Variables[1].Name)
+	require.Equal(t, "/models/ootb/ei/mobilenet-v2-224px.eim", bWebUI.Variables[1].DefaultValue)
+	require.Equal(t, "path to the model file", bWebUI.Variables[1].Description)
+	require.False(t, bWebUI.Variables[0].IsRequired())
+	require.False(t, bWebUI.Variables[1].IsRequired())
+
+	bDb, found := index.FindBrickByID("arduino:dbstorage_tsstore")
+	require.True(t, found)
+	require.False(t, bDb.RequireModel)
+
+	bNoRequireModel, found := index.FindBrickByID("arduino:missing-model-require")
+	require.True(t, found)
+	require.False(t, bNoRequireModel.RequireModel)
 }
 
 func TestBricksIndexYAMLFormats(t *testing.T) {

internal/orchestrator/bricksindex/testdata/bricks-list.yaml

@@ -130,4 +130,9 @@ bricks:
     description: path to the custom model directory
   - name: EI_V_ANOMALY_DETECTION_MODEL
     default_value: /models/ootb/ei/concrete-crack-anomaly-detection.eim
-    description: path to the model file
+    description: path to the model file
+- id: arduino:missing-model-require
+  name: Camera Scanner
+  description: Scans a camera for barcodes and QR codes
+  require_container: false
+  ports: []