Merge branch 'main' into upgraded_lib_api

Author: cmaglie

Taskfile.yml

@@ -8,7 +8,7 @@ vars:
   GOLANGCI_LINT_VERSION: v2.4.0
   GOIMPORTS_VERSION: v0.29.0
   DPRINT_VERSION: 0.48.0
-  EXAMPLE_VERSION: "0.5.0"
+  EXAMPLE_VERSION: "0.5.1"
   RUNNER_VERSION: "0.5.0"
   VERSION: # if version is not passed we hack the semver by encoding the commit as pre-release
     sh: echo "${VERSION:-0.0.0-$(git rev-parse --short HEAD)}"

cmd/arduino-app-cli/app/app.go

@@ -50,5 +50,5 @@ func Load(idOrPath string) (app.ArduinoApp, error) {
 		return app.ArduinoApp{}, fmt.Errorf("invalid app path: %s", idOrPath)
 	}
 
-	return app.Load(id.ToPath().String())
+	return app.Load(id.ToPath())
 }

cmd/arduino-app-cli/app/new.go

@@ -32,7 +32,6 @@ func newCreateCmd(cfg config.Configuration) *cobra.Command {
 		icon        string
 		description string
 		bricks      []string
-		noPyton     bool
 		noSketch    bool
 		fromApp     string
 	)
@@ -44,22 +43,20 @@ func newCreateCmd(cfg config.Configuration) *cobra.Command {
 		RunE: func(cmd *cobra.Command, args []string) error {
 			cobra.MinimumNArgs(1)
 			name := args[0]
-			return createHandler(cmd.Context(), cfg, name, icon, description, noPyton, noSketch, fromApp)
+			return createHandler(cmd.Context(), cfg, name, icon, description, noSketch, fromApp)
 		},
 	}
 
 	cmd.Flags().StringVarP(&icon, "icon", "i", "", "Icon for the app")
 	cmd.Flags().StringVarP(&description, "description", "d", "", "Description for the app")
 	cmd.Flags().StringVarP(&fromApp, "from-app", "", "", "Create the new app from the path of an existing app")
 	cmd.Flags().StringArrayVarP(&bricks, "bricks", "b", []string{}, "List of bricks to include in the app")
-	cmd.Flags().BoolVarP(&noPyton, "no-python", "", false, "Do not include Python files")
 	cmd.Flags().BoolVarP(&noSketch, "no-sketch", "", false, "Do not include Sketch files")
-	cmd.MarkFlagsMutuallyExclusive("no-python", "no-sketch")
 
 	return cmd
 }
 
-func createHandler(ctx context.Context, cfg config.Configuration, name string, icon string, description string, noPython, noSketch bool, fromApp string) error {
+func createHandler(ctx context.Context, cfg config.Configuration, name string, icon string, description string, noSketch bool, fromApp string) error {
 	if fromApp != "" {
 		id, err := servicelocator.GetAppIDProvider().ParseID(fromApp)
 		if err != nil {
@@ -88,7 +85,6 @@ func createHandler(ctx context.Context, cfg config.Configuration, name string, i
 			Name:        name,
 			Icon:        icon,
 			Description: description,
-			SkipPython:  noPython,
 			SkipSketch:  noSketch,
 		}, servicelocator.GetAppIDProvider(), cfg)
 		if err != nil {

cmd/arduino-app-cli/internal/servicelocator/servicelocator.go

@@ -42,11 +42,11 @@ func Init(cfg config.Configuration) {
 
 var (
 	GetBricksIndex = sync.OnceValue(func() *bricksindex.BricksIndex {
-		return f.Must(bricksindex.GenerateBricksIndexFromFile(GetStaticStore().GetAssetsFolder()))
+		return f.Must(bricksindex.Load(GetStaticStore().GetAssetsFolder()))
 	})
 
 	GetModelsIndex = sync.OnceValue(func() *modelsindex.ModelsIndex {
-		return f.Must(modelsindex.GenerateModelsIndexFromFile(GetStaticStore().GetAssetsFolder()))
+		return f.Must(modelsindex.Load(GetStaticStore().GetAssetsFolder()))
 	})
 
 	GetProvisioner = sync.OnceValue(func() *orchestrator.Provision {

cmd/gendoc/docs.go

@@ -609,7 +609,6 @@ Contains a JSON object with the details of an error.
 			Path:        "/v1/apps",
 			Request:     handlers.CreateAppRequest{},
 			Parameters: (*struct {
-				SkipPython bool `query:"skip-python" description:"If true, the app will not be created with the python part."`
 				SkipSketch bool `query:"skip-sketch" description:"If true, the app will not be created with the sketch part."`
 			})(nil),
 			CustomSuccessResponse: &CustomResponseDef{

debian/arduino-app-cli/etc/needrestart/conf.d/arduino-adbd.conf

@@ -0,0 +1,3 @@
+# exclude adbd from service that need to be restarted.
+$nrconf{override_rc}{qr(^adbd\.service$)} = 0;
+

internal/api/docs/openapi.yaml

@@ -45,12 +45,6 @@ paths:
       description: Creates a new app in the default app location.
       operationId: createApp
       parameters:
-      - description: If true, the app will not be created with the python part.
-        in: query
-        name: skip-python
-        schema:
-          description: If true, the app will not be created with the python part.
-          type: boolean
       - description: If true, the app will not be created with the sketch part.
         in: query
         name: skip-sketch
@@ -1155,6 +1149,15 @@ components:
             $ref: '#/components/schemas/ErrorResponse'
       description: Precondition Failed
   schemas:
+    AIModel:
+      properties:
+        description:
+          type: string
+        id:
+          type: string
+        name:
+          type: string
+      type: object
     AIModelItem:
       properties:
         brick_ids:
@@ -1191,7 +1194,7 @@ components:
       properties:
         bricks:
           items:
-            $ref: '#/components/schemas/BrickInstance'
+            $ref: '#/components/schemas/BrickInstanceListItem'
           nullable: true
           type: array
       type: object
@@ -1203,6 +1206,8 @@ components:
           type: string
         name:
           type: string
+        require_model:
+          type: boolean
       required:
       - id
       - name
@@ -1318,6 +1323,11 @@ components:
             $ref: '#/components/schemas/CodeExample'
           nullable: true
           type: array
+        compatible_models:
+          items:
+            $ref: '#/components/schemas/AIModel'
+          nullable: true
+          type: array
         description:
           type: string
         id:
@@ -1326,6 +1336,8 @@ components:
           type: string
         readme:
           type: string
+        require_model:
+          type: boolean
         status:
           type: string
         used_by_apps:
@@ -1344,6 +1356,11 @@ components:
           type: string
         category:
           type: string
+        compatible_models:
+          items:
+            $ref: '#/components/schemas/AIModel'
+          nullable: true
+          type: array
         config_variables:
           items:
             $ref: '#/components/schemas/BrickConfigVariable'
@@ -1354,6 +1371,35 @@ components:
           type: string
         name:
           type: string
+        require_model:
+          type: boolean
+        status:
+          type: string
+        variables:
+          additionalProperties:
+            type: string
+          description: 'Deprecated: use config_variables instead. This field is kept
+            for backward compatibility.'
+          type: object
+      type: object
+    BrickInstanceListItem:
+      properties:
+        author:
+          type: string
+        category:
+          type: string
+        config_variables:
+          items:
+            $ref: '#/components/schemas/BrickConfigVariable'
+          type: array
+        id:
+          type: string
+        model:
+          type: string
+        name:
+          type: string
+        require_model:
+          type: boolean
         status:
           type: string
         variables:
@@ -1373,13 +1419,10 @@ components:
           type: string
         id:
           type: string
-        models:
-          items:
-            type: string
-          nullable: true
-          type: array
         name:
           type: string
+        require_model:
+          type: boolean
         status:
           type: string
       type: object

internal/api/handlers/app_create.go

@@ -44,17 +44,9 @@ func HandleAppCreate(
 		defer r.Body.Close()
 
 		queryParams := r.URL.Query()
-		skipPythonStr := queryParams.Get("skip-python")
 		skipSketchStr := queryParams.Get("skip-sketch")
-
-		skipPython := queryParamsValidator(skipPythonStr)
 		skipSketch := queryParamsValidator(skipSketchStr)
 
-		if skipPython && skipSketch {
-			render.EncodeResponse(w, http.StatusBadRequest, models.ErrorResponse{Details: "cannot skip both python and sketch"})
-			return
-		}
-
 		var req CreateAppRequest
 		if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
 			slog.Error("unable to decode app create request", slog.String("error", err.Error()))
@@ -68,7 +60,6 @@ func HandleAppCreate(
 				Name:        req.Name,
 				Icon:        req.Icon,
 				Description: req.Description,
-				SkipPython:  skipPython,
 				SkipSketch:  skipSketch,
 			},
 			idProvider,

internal/api/handlers/app_delete.go

@@ -42,7 +42,7 @@ func HandleAppDelete(
 			return
 		}
 
-		app, err := app.Load(id.ToPath().String())
+		app, err := app.Load(id.ToPath())
 		if err != nil {
 			slog.Error("Unable to parse the app.yaml", slog.String("error", err.Error()), slog.String("path", id.String()))
 			render.EncodeResponse(w, http.StatusInternalServerError, models.ErrorResponse{Details: "unable to find the app"})

internal/api/handlers/app_details.go

@@ -45,7 +45,7 @@ func HandleAppDetails(
 			return
 		}
 
-		app, err := app.Load(id.ToPath().String())
+		app, err := app.Load(id.ToPath())
 		if err != nil {
 			slog.Error("Unable to parse the app.yaml", slog.String("error", err.Error()), slog.String("path", id.String()))
 			render.EncodeResponse(w, http.StatusInternalServerError, models.ErrorResponse{Details: "unable to find the app"})
@@ -81,7 +81,7 @@ func HandleAppDetailsEdits(
 			render.EncodeResponse(w, http.StatusPreconditionFailed, models.ErrorResponse{Details: "invalid id"})
 			return
 		}
-		appToEdit, err := app.Load(id.ToPath().String())
+		appToEdit, err := app.Load(id.ToPath())
 		if err != nil {
 			slog.Error("Unable to parse the app.yaml", slog.String("error", err.Error()), slog.String("path", id.String()))
 			render.EncodeResponse(w, http.StatusInternalServerError, models.ErrorResponse{Details: "unable to find the app"})