fix cli parsing

Author: StephenSmith25

pythonfmu3/builder.py

@@ -13,7 +13,7 @@
 from xml.dom.minidom import parseString
 from xml.etree.ElementTree import Element, SubElement, tostring
 from .osutil import get_lib_extension, get_platform
-from .fmi3slave import FMI3_MODEL_OPTIONS, Fmi3Slave, Fmi3SlaveBase
+from .fmi3slave import FMI3_MODEL_OPTIONS_COMMON, FMI3_MODEL_OPTIONS_COSIM, FMI3_MODEL_OPTIONS_MX, Fmi3Slave, Fmi3SlaveBase
 
 FilePath = Union[str, Path]
 HERE = Path(__file__).parent
@@ -137,16 +137,20 @@ def build_FMU(
             dest_file = dest / f"{model_identifier}.fmu"
 
             type_node = xml.find("CoSimulation")
-            option_names = [opt.name for opt in FMI3_MODEL_OPTIONS]
-            if type_node:
+            option_names = [opt.name for opt in FMI3_MODEL_OPTIONS_COMMON]
+            cosim_option_names = option_names.copy()
+            cosim_option_names.extend(opt.name for opt in FMI3_MODEL_OPTIONS_COSIM)
+            if type_node is not None:
                 for option, value in options.items():
-                    if option in option_names:
+                    if option in cosim_option_names:
                         type_node.set(option, str(value).lower())
 
             type_node = xml.find("ModelExchange")
-            if type_node:
+            mx_option_names = option_names.copy()
+            mx_option_names.extend(opt.name for opt in FMI3_MODEL_OPTIONS_MX)
+            if type_node is not None:
                 for option, value in options.items():
-                    if option in option_names:
+                    if option in mx_option_names:
                         type_node.set(option, str(value).lower())
 
             with zipfile.ZipFile(dest_file, "w") as zip_fmu:
@@ -247,7 +251,25 @@ def create_command_parser(parser: argparse.ArgumentParser):
         default=None
     )
 
-    for option in FMI3_MODEL_OPTIONS:
+    for option in FMI3_MODEL_OPTIONS_COMMON:
+        action = "store_false" if option.value else "store_true"
+        parser.add_argument(
+            f"--{option.cli}",
+            dest=option.name,
+            help=f"If given, {option.name}={action[6:]}",
+            action=action
+        )
+
+    for option in FMI3_MODEL_OPTIONS_COSIM:
+        action = "store_false" if option.value else "store_true"
+        parser.add_argument(
+            f"--{option.cli}",
+            dest=option.name,
+            help=f"If given, {option.name}={action[6:]}",
+            action=action
+        )
+    
+    for option in FMI3_MODEL_OPTIONS_MX:
         action = "store_false" if option.value else "store_true"
         parser.add_argument(
             f"--{option.cli}",

pythonfmu3/fmi3slave.py

@@ -21,14 +21,22 @@
 
 ModelOptions = namedtuple("ModelOptions", ["name", "value", "cli"])
 
-FMI3_MODEL_OPTIONS: List[ModelOptions] = [
+FMI3_MODEL_OPTIONS_COMMON: List[ModelOptions] = [
     ModelOptions("needsExecutionTool", True, "no-external-tool"),
-    ModelOptions("canHandleVariableCommunicationStepSize", True, "no-variable-step"),
     ModelOptions("canBeInstantiatedOnlyOncePerProcess", False, "only-one-per-process"),
     ModelOptions("canGetAndSetFMUState", False, "handle-state"),
     ModelOptions("canSerializeFMUState", False, "serialize-state")
 ]
 
+FMI3_MODEL_OPTIONS_COSIM: List[ModelOptions] = [
+    ModelOptions("canHandleVariableCommunicationStepSize", True, "no-variable-step"),
+]
+
+FMI3_MODEL_OPTIONS_MX: List[ModelOptions] = [
+    ModelOptions("needsCompletedIntegratorStep", False, "needs-completed-step"),
+]
+
+
 class Fmi3StepResult(NamedTuple):
     status: Fmi3Status = Fmi3Status.ok
     eventHandlingNeeded: bool = False
@@ -103,23 +111,26 @@ def to_xml(self, model_options: Dict[str, str] = dict()) -> Element:
         root = Element("fmiModelDescription", attrib)
 
         options = dict()
-        for option in FMI3_MODEL_OPTIONS:
+        for option in FMI3_MODEL_OPTIONS_COMMON:
             value = model_options.get(option.name, option.value)
             options[option.name] = str(value).lower()
+        
         options["modelIdentifier"] = self.modelName
-        options["canNotUseMemoryManagementFunctions"] = "true"
+
+        options_cs = options.copy()
+        for option in FMI3_MODEL_OPTIONS_COSIM:
+            options_cs[option.name] = str(value).lower()
 
-        options_me = dict()
-        options_me["canGetAndSetFMUState"] = "true"
-        options_me["modelIdentifier"] = self.modelName
-        options_me["needsCompletedIntegratorStep"] = "false"
+        options_me = options.copy()
+        for option in FMI3_MODEL_OPTIONS_MX:
+            options_me[option.name] = str(value).lower()
 
         # check if we have cosim mixin or model exchange mixin
         if isinstance(self, ModelExchange):
             SubElement(root, "ModelExchange", attrib=options_me)
 
         if isinstance(self, CoSimulation):
-            SubElement(root, "CoSimulation", attrib=options)
+            SubElement(root, "CoSimulation", attrib=options_cs)
 
         if self.units:
             unit_defs = SubElement(root, "UnitDefinitions")