Skip to content

Commit f629dbf

Browse files
giulio93giulio93
committed
rename to RequireModel
1 parent fceed39 commit f629dbf

File tree

6 files changed

+54
-54
lines changed

6 files changed

+54
-54
lines changed

‎internal/e2e/daemon/brick_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ func TestBricksList(t *testing.T) {
8383
require.Equal(t, bIdx.Description, *brick.Description)
8484
require.Equal(t, "Arduino", *brick.Author)
8585
require.Equal(t, "installed", *brick.Status)
86-
require.Equal(t, bIdx.ModelRequired, *brick.RequireModel)
86+
require.Equal(t, bIdx.RequireModel, *brick.RequireModel)
8787
}
8888
}
8989

‎internal/orchestrator/bricks/bricks.go‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@ func (s *Service) List() (BrickListResult, error) {
5858
res := BrickListResult{Bricks: make([]BrickListItem, len(s.bricksIndex.Bricks))}
5959
for i, brick := range s.bricksIndex.Bricks {
6060
res.Bricks[i] = BrickListItem{
61-
ID: brick.ID,
62-
Name: brick.Name,
63-
Author: "Arduino", // TODO: for now we only support our bricks
64-
Description: brick.Description,
65-
Category: brick.Category,
66-
Status: "installed",
67-
ModelRequired: brick.ModelRequired,
61+
ID: brick.ID,
62+
Name: brick.Name,
63+
Author: "Arduino", // TODO: for now we only support our bricks
64+
Description: brick.Description,
65+
Category: brick.Category,
66+
Status: "installed",
67+
RequireModel: brick.RequireModel,
6868
Models: f.Map(s.modelsIndex.GetModelsByBrick(brick.ID), func(m modelsindex.AIModel) string {
6969
return m.ID
7070
}),
@@ -89,7 +89,7 @@ func (s *Service) AppBrickInstancesList(a *app.ArduinoApp) (AppBrickInstancesRes
8989
Author: "Arduino", // TODO: for now we only support our bricks
9090
Category: brick.Category,
9191
Status: "installed",
92-
ModelRequired: brick.ModelRequired, // TODO: in case is not set by the user, should we return false?
92+
RequireModel: brick.RequireModel,
9393
ModelID: brickInstance.Model, // TODO: in case is not set by the user, should we return the default model?
9494
Variables: variablesMap, // TODO: do we want to show also the default value of not explicitly set variables?
9595
ConfigVariables: configVariables,
@@ -123,7 +123,7 @@ func (s *Service) AppBrickInstanceDetails(a *app.ArduinoApp, brickID string) (Br
123123
Author: "Arduino", // TODO: for now we only support our bricks
124124
Category: brick.Category,
125125
Status: "installed", // For now every Arduino brick are installed
126-
ModelRequired: brick.ModelRequired,
126+
RequireModel: brick.RequireModel,
127127
Variables: variables,
128128
ConfigVariables: configVariables,
129129
ModelID: modelID,
@@ -198,18 +198,18 @@ func (s *Service) BricksDetails(id string, idProvider *app.IDProvider,
198198
}
199199

200200
return BrickDetailsResult{
201-
ID: id,
202-
Name: brick.Name,
203-
Author: "Arduino", // TODO: for now we only support our bricks
204-
Description: brick.Description,
205-
Category: brick.Category,
206-
ModelRequired: brick.ModelRequired,
207-
Status: "installed", // For now every Arduino brick are installed
208-
Variables: variables,
209-
Readme: readme,
210-
ApiDocsPath: apiDocsPath,
211-
CodeExamples: codeExamples,
212-
UsedByApps: usedByApps,
201+
ID: id,
202+
Name: brick.Name,
203+
Author: "Arduino", // TODO: for now we only support our bricks
204+
Description: brick.Description,
205+
Category: brick.Category,
206+
RequireModel: brick.RequireModel,
207+
Status: "installed", // For now every Arduino brick are installed
208+
Variables: variables,
209+
Readme: readme,
210+
ApiDocsPath: apiDocsPath,
211+
CodeExamples: codeExamples,
212+
UsedByApps: usedByApps,
213213
}, nil
214214
}
215215

‎internal/orchestrator/bricks/types.go‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ type BrickListResult struct {
2020
}
2121

2222
type BrickListItem struct {
23-
ID string `json:"id"`
24-
Name string `json:"name"`
25-
Author string `json:"author"`
26-
Description string `json:"description"`
27-
Category string `json:"category"`
28-
Status string `json:"status"`
29-
ModelRequired bool `json:"require_model"`
30-
Models []string `json:"models"`
23+
ID string `json:"id"`
24+
Name string `json:"name"`
25+
Author string `json:"author"`
26+
Description string `json:"description"`
27+
Category string `json:"category"`
28+
Status string `json:"status"`
29+
RequireModel bool `json:"require_model"`
30+
Models []string `json:"models"`
3131
}
3232

3333
type AppBrickInstancesResult struct {
@@ -42,7 +42,7 @@ type BrickInstance struct {
4242
Status string `json:"status"`
4343
Variables map[string]string `json:"variables,omitempty" description:"Deprecated: use config_variables instead. This field is kept for backward compatibility."`
4444
ConfigVariables []BrickConfigVariable `json:"config_variables,omitempty"`
45-
ModelRequired bool `json:"require_model,omitempty"`
45+
RequireModel bool `json:"require_model"`
4646
ModelID string `json:"model,omitempty"`
4747
}
4848

@@ -69,16 +69,16 @@ type AppReference struct {
6969
}
7070

7171
type BrickDetailsResult struct {
72-
ID string `json:"id"`
73-
Name string `json:"name"`
74-
Author string `json:"author"`
75-
Description string `json:"description"`
76-
Category string `json:"category"`
77-
Status string `json:"status"`
78-
ModelRequired bool `json:"require_model"`
79-
Variables map[string]BrickVariable `json:"variables,omitempty"`
80-
Readme string `json:"readme"`
81-
ApiDocsPath string `json:"api_docs_path"`
82-
CodeExamples []CodeExample `json:"code_examples"`
83-
UsedByApps []AppReference `json:"used_by_apps"`
72+
ID string `json:"id"`
73+
Name string `json:"name"`
74+
Author string `json:"author"`
75+
Description string `json:"description"`
76+
Category string `json:"category"`
77+
Status string `json:"status"`
78+
RequireModel bool `json:"require_model"`
79+
Variables map[string]BrickVariable `json:"variables,omitempty"`
80+
Readme string `json:"readme"`
81+
ApiDocsPath string `json:"api_docs_path"`
82+
CodeExamples []CodeExample `json:"code_examples"`
83+
UsedByApps []AppReference `json:"used_by_apps"`
8484
}

‎internal/orchestrator/bricksindex/bricks_index.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ type Brick struct {
5757
RequireContainer bool `yaml:"require_container"`
5858
Variables []BrickVariable `yaml:"variables,omitempty"`
5959
Ports []string `yaml:"ports,omitempty"`
60-
ModelRequired bool `yaml:"require_model,omitempty"`
60+
RequireModel bool `yaml:"require_model"`
6161
ModelName string `yaml:"model_name,omitempty"`
6262
MountDevicesIntoContainer bool `yaml:"mount_devices_into_container,omitempty"`
6363
RequiredDevices []string `yaml:"required_devices,omitempty"`

‎internal/orchestrator/bricksindex/bricks_index_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ func TestBricksIndex(t *testing.T) {
156156
- name: EI_V_ANOMALY_DETECTION_MODEL
157157
default_value: /models/ootb/ei/concrete-crack-anomaly-detection.eim
158158
description: path to the model file
159-
- id: arduino:fake_no_model
159+
- id: arduino:missing-model-require
160160
name: Camera Scanner
161161
description: Scans a camera for barcodes and QR codes
162162
require_container: false
@@ -178,7 +178,7 @@ func TestBricksIndex(t *testing.T) {
178178
require.True(t, found)
179179
require.Equal(t, "Image Classification", b_ic.Name)
180180
require.Equal(t, "mobilenet-image-classification", b_ic.ModelName)
181-
require.True(t, b_ic.ModelRequired)
181+
require.True(t, b_ic.RequireModel)
182182
require.Len(t, b_ic.Variables, 2)
183183
require.Equal(t, "CUSTOM_MODEL_PATH", b_ic.Variables[0].Name)
184184
require.Equal(t, "/opt/models/ei/", b_ic.Variables[0].DefaultValue)
@@ -191,9 +191,9 @@ func TestBricksIndex(t *testing.T) {
191191

192192
b_db, found := index.FindBrickByID("arduino:dbstorage_tsstore")
193193
require.True(t, found)
194-
require.False(t, b_db.ModelRequired)
194+
require.False(t, b_db.RequireModel)
195195

196-
b_fake, found := index.FindBrickByID("arduino:fake_no_model")
196+
bNoRequiredModel, found := index.FindBrickByID("arduino:missing-model-require")
197197
require.True(t, found)
198-
require.False(t, b_fake.ModelRequired)
198+
require.False(t, bNoRequiredModel.RequireModel)
199199
}

‎internal/orchestrator/orchestrator.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -667,10 +667,10 @@ type AppDetailedInfo struct {
667667
}
668668

669669
type AppDetailedBrick struct {
670-
ID string `json:"id" required:"true"`
671-
Name string `json:"name" required:"true"`
672-
Category string `json:"category,omitempty"`
673-
ModelRequired bool `json:"require_model,omitempty"`
670+
ID string `json:"id" required:"true"`
671+
Name string `json:"name" required:"true"`
672+
Category string `json:"category,omitempty"`
673+
RequireModel bool `json:"require_model"`
674674
}
675675

676676
func AppDetails(
@@ -733,7 +733,7 @@ func AppDetails(
733733
}
734734
res.Name = bi.Name
735735
res.Category = bi.Category
736-
res.ModelRequired = bi.ModelRequired
736+
res.RequireModel = bi.RequireModel
737737
return res
738738
}),
739739
}, nil

0 commit comments

Comments
 (0)