refactoring

Author: mirkoCrobu

internal/orchestrator/bricks/bricks.go

@@ -202,7 +202,13 @@ func (s *Service) BricksDetails(id string, idProvider *app.IDProvider,
 		ApiDocsPath:  apiDocsPath,
 		CodeExamples: codeExamples,
 		UsedByApps:   usedByApps,
-		Models:       s.modelsIndex.GetModelsLiteInfoByBrick(brick.ID),
+		Models: f.Map(s.modelsIndex.GetModelsByBrick(brick.ID), func(m modelsindex.AIModel) AIModelLite {
+			return AIModelLite{
+				ID:          m.ID,
+				Name:        m.Name,
+				Description: m.ModuleDescription,
+			}
+		}),
 	}, nil
 }
 

internal/orchestrator/bricks/types.go

@@ -15,8 +15,6 @@
 
 package bricks
 
-import "github.com/arduino/arduino-app-cli/internal/orchestrator/modelsindex"
-
 type BrickListResult struct {
 	Bricks []BrickListItem `json:"bricks"`
 }
@@ -68,16 +66,22 @@ type AppReference struct {
 }
 
 type BrickDetailsResult struct {
-	ID           string                    `json:"id"`
-	Name         string                    `json:"name"`
-	Author       string                    `json:"author"`
-	Description  string                    `json:"description"`
-	Category     string                    `json:"category"`
-	Status       string                    `json:"status"`
-	Variables    map[string]BrickVariable  `json:"variables,omitempty"`
-	Readme       string                    `json:"readme"`
-	ApiDocsPath  string                    `json:"api_docs_path"`
-	CodeExamples []CodeExample             `json:"code_examples"`
-	UsedByApps   []AppReference            `json:"used_by_apps"`
-	Models       []modelsindex.AIModelLite `json:"models"`
+	ID           string                   `json:"id"`
+	Name         string                   `json:"name"`
+	Author       string                   `json:"author"`
+	Description  string                   `json:"description"`
+	Category     string                   `json:"category"`
+	Status       string                   `json:"status"`
+	Variables    map[string]BrickVariable `json:"variables,omitempty"`
+	Readme       string                   `json:"readme"`
+	ApiDocsPath  string                   `json:"api_docs_path"`
+	CodeExamples []CodeExample            `json:"code_examples"`
+	UsedByApps   []AppReference           `json:"used_by_apps"`
+	Models       []AIModelLite            `json:"models"`
+}
+
+type AIModelLite struct {
+	ID          string `json:"id"`
+	Name        string `json:"name"`
+	Description string `json:"description"`
 }

internal/orchestrator/modelsindex/models_index.go

@@ -53,12 +53,6 @@ type AIModel struct {
 	ModelConfiguration map[string]string `yaml:"model_configuration,omitempty"`
 }
 
-type AIModelLite struct {
-	ID                string `json:"id"`
-	Name              string `json:"name"`
-	ModuleDescription string `json:"description"`
-}
-
 type ModelsIndex struct {
 	models []AIModel
 }
@@ -88,25 +82,6 @@ func (m *ModelsIndex) GetModelsByBrick(brick string) []AIModel {
 	return matches
 }
 
-func (m *ModelsIndex) GetModelsLiteInfoByBrick(brick string) []AIModelLite {
-	var matches []AIModelLite
-	for i := range m.models {
-		if len(m.models[i].Bricks) > 0 && slices.Contains(m.models[i].Bricks, brick) {
-			matches = append(matches,
-				AIModelLite{
-					ID:                m.models[i].ID,
-					Name:              m.models[i].Name,
-					ModuleDescription: m.models[i].ModuleDescription,
-				},
-			)
-		}
-	}
-	if len(matches) == 0 {
-		return []AIModelLite{}
-	}
-	return matches
-}
-
 func (m *ModelsIndex) GetModelsByBricks(bricks []string) []AIModel {
 	var matchingModels []AIModel
 	for _, model := range m.models {

internal/orchestrator/modelsindex/modelsindex_test.go

@@ -69,15 +69,4 @@ func TestModelsIndex(t *testing.T) {
 		assert.Equal(t, "face-detection", models[0].ID)
 		assert.Equal(t, "yolox-object-detection", models[1].ID)
 	})
-
-	t.Run("it gets models lite by a brick", func(t *testing.T) {
-		model := modelsIndex.GetModelsLiteInfoByBrick("not-existing-brick")
-		assert.Empty(t, model)
-
-		model = modelsIndex.GetModelsLiteInfoByBrick("arduino:object_detection")
-		assert.Len(t, model, 1)
-		assert.Equal(t, "face-detection", model[0].ID)
-		assert.Equal(t, "Face bounding box detection. This model is trained on the WIDER FACE dataset and can detect faces in images.", model[0].ModuleDescription)
-		assert.Equal(t, "Lightweight-Face-Detection", model[0].Name)
-	})
 }