Skip to content

Commit a091a26

Browse files
committed
fixing yaml ser
1 parent 403207c commit a091a26

File tree

5 files changed

+7
-8
lines changed

5 files changed

+7
-8
lines changed

internal/orchestrator/bricks/bricks.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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,
92+
ModelRequired: brick.ModelRequired, // TODO: in case is not set by the user, should we return false?
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,

internal/orchestrator/bricks/types.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ type BrickListItem struct {
2626
Description string `json:"description"`
2727
Category string `json:"category"`
2828
Status string `json:"status"`
29-
ModelRequired bool `json:"model_required"`
29+
ModelRequired bool `json:"require_model"`
3030
Models []string `json:"models"`
3131
}
3232

@@ -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:"model_required,omitempty"`
45+
ModelRequired bool `json:"require_model,omitempty"`
4646
ModelID string `json:"model,omitempty"`
4747
}
4848

@@ -75,7 +75,7 @@ type BrickDetailsResult struct {
7575
Description string `json:"description"`
7676
Category string `json:"category"`
7777
Status string `json:"status"`
78-
ModelRequired bool `json:"model_required"`
78+
ModelRequired bool `json:"require_model"`
7979
Variables map[string]BrickVariable `json:"variables,omitempty"`
8080
Readme string `json:"readme"`
8181
ApiDocsPath string `json:"api_docs_path"`

internal/orchestrator/bricksindex/bricks_index.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,9 @@ type Brick struct {
5555
Category string `yaml:"category,omitempty"`
5656
RequiresDisplay string `yaml:"requires_display,omitempty"`
5757
RequireContainer bool `yaml:"require_container"`
58-
RequireModel bool `yaml:"require_model"`
5958
Variables []BrickVariable `yaml:"variables,omitempty"`
6059
Ports []string `yaml:"ports,omitempty"`
61-
ModelRequired bool `yaml:"model_required,omitempty"`
60+
ModelRequired bool `yaml:"require_model,omitempty"`
6261
ModelName string `yaml:"model_name,omitempty"`
6362
MountDevicesIntoContainer bool `yaml:"mount_devices_into_container,omitempty"`
6463
RequiredDevices []string `yaml:"required_devices,omitempty"`

internal/orchestrator/bricksindex/bricks_index_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ func TestBricksIndex(t *testing.T) {
173173
require.True(t, found)
174174
require.Equal(t, "Image Classification", b.Name)
175175
require.Equal(t, "mobilenet-image-classification", b.ModelName)
176-
require.True(t, b.RequireModel)
176+
require.True(t, b.ModelRequired)
177177
require.Len(t, b.Variables, 2)
178178
require.Equal(t, "CUSTOM_MODEL_PATH", b.Variables[0].Name)
179179
require.Equal(t, "/opt/models/ei/", b.Variables[0].DefaultValue)

internal/orchestrator/orchestrator.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -670,7 +670,7 @@ type AppDetailedBrick struct {
670670
ID string `json:"id" required:"true"`
671671
Name string `json:"name" required:"true"`
672672
Category string `json:"category,omitempty"`
673-
ModelRequired bool `json:"model_required,omitempty"`
673+
ModelRequired bool `json:"require_model,omitempty"`
674674
}
675675

676676
func AppDetails(

0 commit comments

Comments
 (0)