Update model test

Author: martacarbone

internal/orchestrator/bricks/bricks.go

@@ -312,7 +312,7 @@ func (s *Service) BrickCreate(
 		models := s.modelsIndex.GetModelsByBrick(brickInstance.ID)
 		idx := slices.IndexFunc(models, func(m modelsindex.AIModel) bool { return m.ID == *req.Model })
 		if idx == -1 {
-			return fmt.Errorf("model %s does not exsist", *req.Model)
+			return fmt.Errorf("model %s does not exist", *req.Model)
 		}
 		brickInstance.Model = models[idx].ID
 	}

internal/orchestrator/bricks/bricks_test.go

@@ -16,6 +16,8 @@
 package bricks
 
 import (
+	"errors"
+	"slices"
 	"testing"
 
 	"github.com/arduino/go-paths-helper"
@@ -24,6 +26,7 @@ import (
 
 	"github.com/arduino/arduino-app-cli/internal/orchestrator/app"
 	"github.com/arduino/arduino-app-cli/internal/orchestrator/bricksindex"
+	"github.com/arduino/arduino-app-cli/internal/orchestrator/modelsindex"
 )
 
 func TestBrickCreate(t *testing.T) {
@@ -190,3 +193,96 @@ func TestGetBrickInstanceVariableDetails(t *testing.T) {
 		})
 	}
 }
+
+func TestBrickCreateWithModulesUpdate(t *testing.T) {
+	bricksIndex, err := bricksindex.GenerateBricksIndexFromFile(paths.New("testdata"))
+	require.Nil(t, err)
+	modelsIndex, err := modelsindex.GenerateModelsIndexFromFile(paths.New("testdata"))
+	require.Nil(t, err)
+	brickService := NewService(modelsIndex, bricksIndex, nil)
+	model := "glass-breaking"
+	missingModel := "missing-model"
+
+	tests := []struct {
+		name                         string
+		model                        string
+		updateRequest                BrickCreateUpdateRequest
+		expectedErr                  error
+		expectedBrickModelDescriptor string
+	}{
+		{
+			name:  "add a brick with a defined model to an App",
+			model: "glass-breaking",
+			updateRequest: BrickCreateUpdateRequest{
+				ID:        "arduino:audio_classification",
+				Variables: nil,
+				Model:     &model,
+			},
+			expectedErr:                  nil,
+			expectedBrickModelDescriptor: "arduino:audio_classification",
+		},
+		{
+			name:  "add a brick with not existent model to an App",
+			model: "glass-breaking",
+			updateRequest: BrickCreateUpdateRequest{
+				ID:        "arduino:audio_classification",
+				Variables: nil,
+				Model:     &missingModel,
+			},
+			expectedErr:                  errors.New("model missing-model does not exist"),
+			expectedBrickModelDescriptor: "arduino:audio_classification",
+		},
+	}
+
+	for _, tt := range tests {
+		dummyApp := appDummySetup(t)
+		t.Run(tt.name, func(t *testing.T) {
+
+			brickErr := brickService.BrickCreate(tt.updateRequest, f.Must(app.Load(dummyApp.String())))
+			require.Equal(t, brickErr, tt.expectedErr)
+
+			after, err := app.Load(dummyApp.String())
+			require.Nil(t, err)
+			brickAddedToApp := slices.ContainsFunc(after.Descriptor.Bricks, func(b app.Brick) bool {
+				return b.ID == tt.expectedBrickModelDescriptor
+			})
+			if brickErr != nil {
+				require.False(t, brickAddedToApp)
+			} else {
+				require.True(t, brickAddedToApp)
+			}
+
+		})
+	}
+}
+
+/*
+	t.Run("add a brick to an App", func(t *testing.T) {
+		dummyApp := appDummySetup(t)
+
+		model := "glass-breaking"
+		req := BrickCreateUpdateRequest{
+			ID:        "arduino:audio_classification",
+			Variables: nil,
+			Model:     &model,
+		}
+
+		// act
+		err = brickService.BrickCreate(req, f.Must(app.Load(dummyApp.String())))
+		require.Nil(t, err)
+
+		// assert
+		after, err := app.Load(dummyApp.String())
+		require.Nil(t, err)
+		require.Len(t, after.Descriptor.Bricks, 2)
+		require.Equal(t, "arduino:audio_classification", after.Descriptor.Bricks[1].ID)
+	})
+*/
+
+func appDummySetup(t *testing.T) *paths.Path {
+	tempDummyApp := paths.New("testdata/dummy-app.temp")
+	err := tempDummyApp.RemoveAll()
+	require.Nil(t, err)
+	require.Nil(t, paths.New("testdata/dummy-app").CopyDirTo(tempDummyApp))
+	return tempDummyApp
+}

internal/orchestrator/bricks/models_test.go

@@ -23,18 +23,11 @@ bricks:
   mount_devices_into_container: false
   ports: []
   category: storage
-- id: arduino:test_brick_object_detection
-  name: Test brick
-  description: This is a test brick
-  variables:
-  - name: BRICK_VAR1
-    description: Brick level variable
-  - name: BRICK_VAR2
-    default_value: Brick level var2 default value
-  model: glass-breaking
-  #model_configuration_variables:
-  #   - MODEL_VAR1
-  #   - MODEL_VAR2
-- id: arduino:test_brick_video_object_detection
-  name: Test brick
-  description: This is a test brick
+- id: arduino:audio_classification
+  name: Audio Classification
+  description: 
+  require_container: true
+  require_model: true
+  require_devices: false
+  category: audio
+  model_name: glass-breaking

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

@@ -1,16 +1,9 @@
 models:
-- glass-breaking:
+ - glass-breaking:
     runner: brick
     name : "Glass breaking classifier"
     description: "A glass breaking classifier model to detect glass breaking sounds in audio recordings"
     model_configuration:
-      EI_AUDIO_CLASSIFICATION_MODEL: /models/ootb/ei/glass-breaking.eim
-      MODEL_VAR2: model variable 2
+      "EI_AUDIO_CLASSIFICATION_MODEL": "/models/ootb/ei/glass-breaking.eim"
     bricks:
-      - arduino:test_brick_object_detection:
-          model_configuration:
-            "EI_OBJ_DETECTION_MODEL": "/models/ootb/ei/lw-face-det.eim"
-      - arduino:test_brick_video_object_detection:
-          model_configuration:
-            "EI_V_OBJ_DETECTION_MODEL": "/models/ootb/ei/lw-face-det.eim"
-
+    - arduino:audio_classification