fix passed options in generatedproject flow

Author: mehrdadh

apps/microtvm/arduino/template_project/microtvm_api_server.py

@@ -69,7 +69,11 @@ class BoardAutodetectFailed(Exception):
 ) + [
     server.ProjectOption(
         "arduino_cli_cmd",
-        required=(["generate_project", "flash", "open_transport"] if not ARDUINO_CLI_CMD else None),
+        required=(
+            ["generate_project", "build", "flash", "open_transport"]
+            if not ARDUINO_CLI_CMD
+            else None
+        ),
         optional=(
             ["generate_project", "build", "flash", "open_transport"] if ARDUINO_CLI_CMD else None
         ),

python/tvm/micro/project.py

@@ -28,6 +28,17 @@
 from .transport import Transport, TransportTimeouts
 
 
+def add_unspecified_options(options: dict, server_project_options: list) -> dict:
+    """Adds default value of project template options that are not specified by user."""
+    if not options:
+        options = dict()
+    for option in server_project_options:
+        name = option["name"]
+        if name not in options.keys():
+            options[name] = option["default"]
+    return options
+
+
 class ProjectTransport(Transport):
     """A Transport implementation that uses the Project API client."""
 
@@ -69,10 +80,10 @@ def from_directory(cls, project_dir: Union[pathlib.Path, str], options: dict):
 
     def __init__(self, api_client, options):
         self._api_client = api_client
-        self._options = options
         self._info = self._api_client.server_info_query(__version__)
         if self._info["is_template"]:
             raise TemplateProjectError()
+        self._options = add_unspecified_options(options, self._info["project_options"])
 
     def build(self):
         self._api_client.build(self._options)
@@ -121,19 +132,10 @@ def _check_project_options(self, options: dict):
                         Here is a list of available options:{list(available_options)}."""
             )
 
-    def _add_unspecified_options(self, options: dict):
-        """Adds default value of project options that are not specified by user."""
-        if not options:
-            options = dict()
-        for option in self._info["project_options"]:
-            name = option["name"]
-            if name not in options.keys():
-                options[name] = option["default"]
-
     def generate_project_from_mlf(self, model_library_format_path, project_dir, options: dict):
         """Generate a project from MLF file."""
         self._check_project_options(options)
-        self._add_unspecified_options(options)
+        options = add_unspecified_options(options, self._info["project_options"])
 
         self._api_client.generate_project(
             model_library_format_path=str(model_library_format_path),

tests/micro/arduino/test_arduino_workflow.py

@@ -54,12 +54,10 @@ def project_dir(workflow_workspace_dir):
 # We MUST pass workspace_dir, not project_dir, or the workspace will be dereferenced
 # too soon. We can't use the board fixture either for the reason mentioned above.
 @pytest.fixture(scope="module")
-def project(request, arduino_cli_cmd, microtvm_debug, workflow_workspace_dir):
+def project(request, microtvm_debug, workflow_workspace_dir):
     board = request.config.getoption("--board")
     serial_number = request.config.getoption("--serial-number")
-    return test_utils.make_kws_project(
-        board, arduino_cli_cmd, microtvm_debug, workflow_workspace_dir, serial_number
-    )
+    return test_utils.make_kws_project(board, microtvm_debug, workflow_workspace_dir, serial_number)
 
 
 def _get_directory_elements(directory):