chore: add unit test

Author: rjtokenring

internal/orchestrator/app/parser_test.go

@@ -1,6 +1,7 @@
 package app
 
 import (
+	"os"
 	"testing"
 
 	"github.com/arduino/go-paths-helper"
@@ -73,3 +74,37 @@ func TestIsSingleEmoji(t *testing.T) {
 		})
 	}
 }
+
+func TestArduinoApp_Load(t *testing.T) {
+	tempDir := t.TempDir()
+	err := paths.New(tempDir).MkdirAll()
+	require.NoError(t, err)
+
+	// Create minimal setup
+	err = paths.New(tempDir, "python").MkdirAll()
+	require.NoError(t, err)
+	err = os.WriteFile(paths.New(tempDir, "python", "main.py").String(), []byte("print('Hello World')"), 0600)
+	require.NoError(t, err)
+	// Create a valid app.yaml file
+	appYaml := paths.New(tempDir, "app.yaml")
+
+	appDescriptor :=
+		`name: Test App
+bricks:
+  - arduino:object_detection:
+      model: yolox-object-detection
+      variables:
+        "EI_OBJ_DETECTION_MODEL": "/home/arduino/.arduino-bricks/ei-models/face-det.eim"
+`
+
+	err = os.WriteFile(appYaml.String(), []byte(appDescriptor), 0600)
+	require.NoError(t, err)
+
+	app, err := Load(tempDir)
+	require.NoError(t, err)
+	require.Equal(t, "Test App", app.Name)
+	require.Equal(t, 1, len(app.Descriptor.Bricks))
+	require.Equal(t, "arduino:object_detection", app.Descriptor.Bricks[0].ID)
+	require.Equal(t, "yolox-object-detection", app.Descriptor.Bricks[0].Model)
+	require.Equal(t, "/home/arduino/.arduino-bricks/ei-models/face-det.eim", app.Descriptor.Bricks[0].Variables["EI_OBJ_DETECTION_MODEL"])
+}

internal/orchestrator/orchestrator.go

@@ -207,6 +207,7 @@ func StartApp(
 				}
 			})
 
+			slog.Debug("starting app", slog.String("command", strings.Join(commands, " ")), slog.Any("envs", envs))
 			process, err := paths.NewProcess(envs.AsList(), commands...)
 			if err != nil {
 				yield(StreamMessage{error: err})
@@ -245,6 +246,7 @@ func getAppEnvironmentVariables(app app.ArduinoApp, brickIndex *bricksindex.Bric
 			maps.Insert(envs, maps.All(m.ModelConfiguration))
 		}
 
+		slog.Debug("adding Brick", slog.String("brickID", brick.ID), slog.String("model", brick.Model), slog.Any("variables", brick.Variables))
 		maps.Insert(envs, maps.All(brick.Variables))
 	}
 

internal/orchestrator/orchestrator_test.go

@@ -478,6 +478,91 @@ models:
 	// we ignore HOST_IP since it's dynamic
 }
 
+func TestGetAppEnvironmentVariablesWithCustomModelOverrides(t *testing.T) {
+	cfg := setTestOrchestratorConfig(t)
+	idProvider := app.NewAppIDProvider(cfg)
+
+	docker, err := dockerClient.NewClientWithOpts(
+		dockerClient.FromEnv,
+		dockerClient.WithAPIVersionNegotiation(),
+	)
+	require.NoError(t, err)
+	dockerCli, err := command.NewDockerCli(
+		command.WithAPIClient(docker),
+		command.WithBaseContext(t.Context()),
+	)
+	require.NoError(t, err)
+
+	err = dockerCli.Initialize(&flags.ClientOptions{})
+	require.NoError(t, err)
+
+	appId := createApp(t, "app1", false, idProvider, cfg)
+	appDesc, err := app.Load(appId.ToPath().String())
+	require.NoError(t, err)
+	appDesc.Descriptor.Bricks = []app.Brick{
+		{
+			ID: "arduino:object_detection",
+			Variables: map[string]string{
+				"EI_OBJ_DETECTION_MODEL": "/home/arduino/.arduino-bricks/ei-models/face-det.eim",
+			}, // override the default model via ENV variable
+		},
+	}
+
+	bricksIndexContent := []byte(`
+bricks:
+- id: arduino:object_detection
+  name: Object Detection
+  description: "Brick for object detection using a pre-trained model. It processes\
+    \ images and returns the predicted class label, bounding-boxes and confidence\
+    \ score.\nBrick is designed to work with pre-trained models provided by framework\
+    \ or with custom object detection models trained on Edge Impulse platform. \n"
+  require_container: true
+  require_model: true
+  require_devices: false
+  category: video
+  model_name: yolox-object-detection
+  variables:
+  - name: CUSTOM_MODEL_PATH
+    default_value: /home/arduino/.arduino-bricks/ei-models
+    description: path to the custom model directory
+  - name: EI_OBJ_DETECTION_MODEL
+    default_value: /models/ootb/ei/yolo-x-nano.eim
+    description: path to the model file
+`)
+	err = cfg.AssetsDir().Join("bricks-list.yaml").WriteFile(bricksIndexContent)
+	require.NoError(t, err)
+	bricksIndex, err := bricksindex.GenerateBricksIndexFromFile(cfg.AssetsDir())
+	assert.NoError(t, err)
+
+	modelsIndexContent := []byte(`
+models:
+- yolox-object-detection:
+    runner: brick
+    name : "General purpose object detection - YoloX"
+    description: "General purpose object detection model based on YoloX Nano. This model is trained on the COCO dataset and can detect 80 different object classes."
+    model_configuration:
+      "EI_OBJ_DETECTION_MODEL": "/models/ootb/ei/yolo-x-nano.eim"
+    metadata:
+    source: "edgeimpulse"
+    ei-project-id: 717280
+    source-model-id: "YOLOX-Nano"
+    source-model-url: "https://github.com/Megvii-BaseDetection/YOLOX"
+    bricks:
+    - arduino:object_detection
+    - arduino:video_object_detection
+`)
+	err = cfg.AssetsDir().Join("models-list.yaml").WriteFile(modelsIndexContent)
+	require.NoError(t, err)
+	modelIndex, err := modelsindex.GenerateModelsIndexFromFile(cfg.AssetsDir())
+	require.NoError(t, err)
+
+	env := getAppEnvironmentVariables(appDesc, bricksIndex, modelIndex)
+	require.Equal(t, cfg.AppsDir().Join("app1").String(), env["APP_HOME"])
+	require.Equal(t, "/home/arduino/.arduino-bricks/ei-models/face-det.eim", env["EI_OBJ_DETECTION_MODEL"])
+	require.Equal(t, "/home/arduino/.arduino-bricks/ei-models", env["CUSTOM_MODEL_PATH"])
+	// we ignore HOST_IP since it's dynamic
+}
+
 func TestValidateDevice(t *testing.T) {
 
 	t.Run("valid", func(t *testing.T) {