fmu-manipulation-toolbox 1.9rc5__py3-none-any.whl → 1.9rc7__py3-none-any.whl

fmu_manipulation_toolbox/__version__.py

@@ -1 +1 @@
-'V1.9-rc5'
+'V1.9-rc7'

fmu_manipulation_toolbox/cli/fmutool.py

@@ -89,7 +89,16 @@ def fmutool():
         for causality in cli_options.apply_on:
             logger.info(f"     - causality = {causality}")
 
-    for operation in cli_options.operations_list:
+    # Checker operations are added as a list into operations_list
+    def operation_iterator():
+        for op in cli_options.operations_list:
+            if isinstance(op, list):
+                for sub_op in op:
+                    yield sub_op
+            else:
+                yield op
+
+    for operation in operation_iterator():
         logger.info(f"     => {operation}")
         try:
             fmu.apply_operation(operation, cli_options.apply_on)

fmu_manipulation_toolbox/container.py

@@ -796,23 +796,26 @@ class FMUContainer:
     def make_fmu_xml_epilog_2(self, xml_file, index_offset):
         xml_file.write("  </ModelVariables>\n"
                        "\n"
-                       "  <ModelStructure>\n"
-                       "    <Outputs>\n")
+                       "  <ModelStructure>\n")
 
-        index = index_offset
-        for output in self.outputs.values():
-            if output.port.type_name in EmbeddedFMUPort.CONTAINER_TO_FMI[2]:
-                print(f'      <Unknown index="{index}"/>', file=xml_file)
-                index += 1
-        xml_file.write("    </Outputs>\n"
-                       "    <InitialUnknowns>\n")
-        index = index_offset
-        for output in self.outputs.values():
-            if output.port.type_name in EmbeddedFMUPort.CONTAINER_TO_FMI[2]:
-                print(f'      <Unknown index="{index}"/>', file=xml_file)
-                index += 1
-        xml_file.write("    </InitialUnknowns>\n"
-                       "  </ModelStructure>\n"
+
+        if self.outputs:
+            xml_file.write("    <Outputs>\n")
+            index = index_offset
+            for output in self.outputs.values():
+                if output.port.type_name in EmbeddedFMUPort.CONTAINER_TO_FMI[2]:
+                    print(f'      <Unknown index="{index}"/>', file=xml_file)
+                    index += 1
+            xml_file.write("    </Outputs>\n"
+                           "    <InitialUnknowns>\n")
+            index = index_offset
+            for output in self.outputs.values():
+                if output.port.type_name in EmbeddedFMUPort.CONTAINER_TO_FMI[2]:
+                    print(f'      <Unknown index="{index}"/>', file=xml_file)
+                    index += 1
+            xml_file.write("    </InitialUnknowns>\n")
+
+        xml_file.write("  </ModelStructure>\n"
                        "\n"
                        "</fmiModelDescription>")
 

fmu_manipulation_toolbox/remoting.py

@@ -19,8 +19,8 @@ class OperationAddRemotingWinAbstract(OperationAbstract):
             "Integer": [],
             "Boolean": []
         }
-        self.nb_input = 0;
-        self.nb_output = 0;
+        self.nb_input = 0
+        self.nb_output = 0
 
     def fmi_attrs(self, attrs):
         if not attrs["fmiVersion"] == "2.0":
@@ -60,9 +60,11 @@ class OperationAddRemotingWinAbstract(OperationAbstract):
                         fmu_bin[self.bitness_to] / "license.txt")
 
     def port_attrs(self, fmu_port) -> int:
+        vr = int(fmu_port["valueReference"])
+        causality = fmu_port.get("causality", "local")
         try:
-            self.vr[fmu_port.fmi_type].append(fmu_port["valueReference"])
-            if fmu_port["causality"] in ("input", "parameter"):
+            self.vr[fmu_port.fmi_type].append(vr)
+            if causality in ("input", "parameter"):
                 self.nb_input += 1
             else:
                 self.nb_output += 1

{fmu_manipulation_toolbox-1.9rc5.dist-info → fmu_manipulation_toolbox-1.9rc7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fmu_manipulation_toolbox
-Version: 1.9rc5
+Version: 1.9rc7
 Summary: FMU Manipulation Toolbox is a python application for modifying Functional Mock-up Units (FMUs) without recompilation or bundling them into FMU Containers
 Home-page: https://github.com/grouperenault/fmu_manipulation_toolbox/
 Author: Nicolas.LAURENT@Renault.com

{fmu_manipulation_toolbox-1.9rc5.dist-info → fmu_manipulation_toolbox-1.9rc7.dist-info}/RECORD

@@ -1,20 +1,20 @@
 fmu_manipulation_toolbox/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fmu_manipulation_toolbox/__main__.py,sha256=FpG0ITBz5q-AvIbXplVh_1g1zla5souFGtpiDdECxEw,352
-fmu_manipulation_toolbox/__version__.py,sha256=niVpMeIUg7iKHRlsUPuXHpvJ5XeFDKAdI2L5ilFhMbg,11
+fmu_manipulation_toolbox/__version__.py,sha256=R7smX8GS97dJQQkbyMyuJlII_VKNOhykVYnb42E_LKw,11
 fmu_manipulation_toolbox/assembly.py,sha256=XQ_1sB6K1Dk2mnNe-E3_6Opoeub7F9Qaln0EUDzsop8,26553
 fmu_manipulation_toolbox/checker.py,sha256=jw1omfrMMIMHlIpHXpWBcQgIiS9hnHe5T9CZ5KlbVGs,2422
-fmu_manipulation_toolbox/container.py,sha256=Anubg08tr0HRb1_6rUqIRoE3E6emv6pKqDbs2aezv38,45625
+fmu_manipulation_toolbox/container.py,sha256=Ed6JsWM2oMs-jyGyKmrHHebNuG4qwiGLYtx0BREIiBE,45710
 fmu_manipulation_toolbox/gui.py,sha256=ax-IbGO7GyBG0Mb5okN588CKQDfMxoF1uZtD1_CYnjc,29199
 fmu_manipulation_toolbox/gui_style.py,sha256=s6WdrnNd_lCMWhuBf5LKK8wrfLXCU7pFTLUfvqkJVno,6633
 fmu_manipulation_toolbox/help.py,sha256=aklKiLrsE0adSzQ5uoEB1sBDmI6s4l231gavu4XxxzA,5856
 fmu_manipulation_toolbox/operations.py,sha256=WayxcpnVRpvxGOXx2I5Vh9ThVbj6IRW6Vr8qKfqck8Y,17348
-fmu_manipulation_toolbox/remoting.py,sha256=vsvGRIUr-VxUkpBMCfE_G0kYVnB2CN03ts_Imi2uLk8,3814
+fmu_manipulation_toolbox/remoting.py,sha256=N25MDFkIcEWe9CIT1M4L9kea3j-8E7i2I1VOI6zIAdw,3876
 fmu_manipulation_toolbox/split.py,sha256=NVkfdTRR0jj_VOdgtxHQoKptkAg5TFVUA7nUx3_o9Pg,13336
 fmu_manipulation_toolbox/version.py,sha256=OhBLkZ1-nhC77kyvffPNAf6m8OZe1bYTnNf_PWs1NvM,392
 fmu_manipulation_toolbox/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fmu_manipulation_toolbox/cli/fmucontainer.py,sha256=bxiOcVwHHLQaVtTga77t_UdE6duPX1kTXef53LyPqbA,4738
 fmu_manipulation_toolbox/cli/fmusplit.py,sha256=QSMHZJlNOYbaPgI6Z9QHr95mrC3PuXDeUXR2sHm73HU,1636
-fmu_manipulation_toolbox/cli/fmutool.py,sha256=OuPrDeqnbsMGV50Jq7ugX7q19gt9WI2v1HMXvOvzozM,5637
+fmu_manipulation_toolbox/cli/fmutool.py,sha256=nCXcTZxBcgnZIe_oRYqKLdB6z_ZryXyIOpsaP6Tptak,5921
 fmu_manipulation_toolbox/cli/utils.py,sha256=gNhdlFYSSNSb0fovzS0crnxgmqqKXe0KtoZZFhRKhfg,1375
 fmu_manipulation_toolbox/resources/checkbox-checked-disabled.png,sha256=FWIuyrXlaNLLePHfXj7j9ca5rT8Hgr14KCe1EqTCZyk,2288
 fmu_manipulation_toolbox/resources/checkbox-checked-hover.png,sha256=KNlV-d_aJNTTvUVXKGT9DBY30sIs2LwocLJrFKNKv8k,2419
@@ -33,7 +33,7 @@ fmu_manipulation_toolbox/resources/icon_fmu.png,sha256=EuygB2xcoM2WAfKKdyKG_UvTL
 fmu_manipulation_toolbox/resources/license.txt,sha256=5ODuU8g8pIkK-NMWXu_rjZ6k7gM7b-N2rmg87-2Kmqw,1583
 fmu_manipulation_toolbox/resources/mask.png,sha256=px1U4hQGL0AmZ4BQPknOVREpMpTSejbah3ntkpqAzFA,3008
 fmu_manipulation_toolbox/resources/model.png,sha256=EAf_HnZJe8zYGZygerG1MMt2U-tMMZlifzXPj4_iORA,208788
-fmu_manipulation_toolbox/resources/darwin64/container.dylib,sha256=hc8FpHbqZDkpnLRy8oKfhk7iSTW7G89B4sACASW4Ta8,161560
+fmu_manipulation_toolbox/resources/darwin64/container.dylib,sha256=G_Q-Nyb4f_eOYWuBawtCCnXvBl4duwh826fGoG95-Cs,161560
 fmu_manipulation_toolbox/resources/fmi-2.0/fmi2Annotation.xsd,sha256=OGfyJtaJntKypX5KDpuZ-nV1oYLZ6HV16pkpKOmYox4,2731
 fmu_manipulation_toolbox/resources/fmi-2.0/fmi2AttributeGroups.xsd,sha256=HwyV7LBse-PQSv4z1xjmtzPU3Hjnv4mluq9YdSBNHMQ,3704
 fmu_manipulation_toolbox/resources/fmi-2.0/fmi2ModelDescription.xsd,sha256=JM4j_9q-pc40XYHb28jfT3iV3aYM5JLqD5aRjO72K1E,18939
@@ -53,19 +53,19 @@ fmu_manipulation_toolbox/resources/fmi-3.0/fmi3Type.xsd,sha256=TaHRoUBIFtmdEwBKB
 fmu_manipulation_toolbox/resources/fmi-3.0/fmi3Unit.xsd,sha256=CK_F2t5LfyQ6eSNJ8soTFMVK9DU8vD2WiMi2MQvjB0g,3746
 fmu_manipulation_toolbox/resources/fmi-3.0/fmi3Variable.xsd,sha256=3YU-3q1-c-namz7sMe5cxnmOVOJsRSmfWR02PKv3xaU,19171
 fmu_manipulation_toolbox/resources/fmi-3.0/fmi3VariableDependency.xsd,sha256=YQSBwXt4IsDlyegY8bX-qQHGSfE5TipTPfo2g2yqq1c,3082
-fmu_manipulation_toolbox/resources/linux32/client_sm.so,sha256=ytv2fMHRYkQS4v_ODKVCt3Z_19k7tCYTKT8kKOK0Pu0,34756
-fmu_manipulation_toolbox/resources/linux32/server_sm,sha256=pHXd5rRyJrCEUPGxVcK3irE86ThxVUTBRn_rgOZdSYg,21224
-fmu_manipulation_toolbox/resources/linux64/client_sm.so,sha256=xBgQTTiww_SON8bHP4UP6UT8PqzzHiBgJHTiiG3Asi8,32592
-fmu_manipulation_toolbox/resources/linux64/container.so,sha256=cCue2KyQjBi75dJnlySPVmAGb8H0WzpHqhxYkB7Aay4,135520
-fmu_manipulation_toolbox/resources/linux64/server_sm,sha256=A6-IQUCN51r5rQkEW9lJJuZKqRPgeoxyMwjc5NNMq-A,22552
-fmu_manipulation_toolbox/resources/win32/client_sm.dll,sha256=1HXgBXj0FwLmT7xPdlWCYsTRu-TnggJTTNtkrDS7v0o,17408
-fmu_manipulation_toolbox/resources/win32/server_sm.exe,sha256=h4CkEB4a47vF_Dsnwbvy9YwIra8mn_taWYTkBdlDrNc,15360
-fmu_manipulation_toolbox/resources/win64/client_sm.dll,sha256=diUwWUB_pKjbU2NT8q4JUaby6ppAQnxbTj6ZCAxjTK8,20992
-fmu_manipulation_toolbox/resources/win64/container.dll,sha256=-EnDn6FIpLxX3L0vp1tGAOp78fQAQfaIWl4tC0P1rj8,98816
-fmu_manipulation_toolbox/resources/win64/server_sm.exe,sha256=5woZaxLhHP5xr7tOSCz6JmaHK9Wb0xuB0pzdROUDDpU,18432
-fmu_manipulation_toolbox-1.9rc5.dist-info/licenses/LICENSE.txt,sha256=c_862mzyk6ownO3Gt6cVs0-53IXLi_-ZEQFNDVabESw,1285
-fmu_manipulation_toolbox-1.9rc5.dist-info/METADATA,sha256=8O6lxLDyaW5Fu3qxa4PNsyawnvBtEtDuozgyHxvJ-4w,1156
-fmu_manipulation_toolbox-1.9rc5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fmu_manipulation_toolbox-1.9rc5.dist-info/entry_points.txt,sha256=HjOZkflbI1IuSY8BpOZre20m24M4GDQGCJfPIa7NrlY,264
-fmu_manipulation_toolbox-1.9rc5.dist-info/top_level.txt,sha256=9D_h-5BMjSqf9z-XFkbJL_bMppR2XNYW3WNuPkXou0k,25
-fmu_manipulation_toolbox-1.9rc5.dist-info/RECORD,,
+fmu_manipulation_toolbox/resources/linux32/client_sm.so,sha256=UapKWBFpTV9F-ehbBijh7Q1SeylBjVOhUVKJ3wVXPsE,34756
+fmu_manipulation_toolbox/resources/linux32/server_sm,sha256=gzKU0BTeaRkvhTMQtHHj3K8uYFyEdyGGn_mZy_jG9xo,21304
+fmu_manipulation_toolbox/resources/linux64/client_sm.so,sha256=IIqzR9WmMZUpRbwcCXyMHJnx920zvdO1wrWuAlrfyUE,32592
+fmu_manipulation_toolbox/resources/linux64/container.so,sha256=i0HjYarS79uDaPzhOd3bY7vjqVR_cSL89fo6hepb184,135520
+fmu_manipulation_toolbox/resources/linux64/server_sm,sha256=MZn6vITN2qpBHYt_RaK2VnFFp00hk8fTALBHmXPtLwc,22608
+fmu_manipulation_toolbox/resources/win32/client_sm.dll,sha256=UYr8gstiVAOcOaZSPXdMV0qBLreUFHEBaAPISTLlfJA,17920
+fmu_manipulation_toolbox/resources/win32/server_sm.exe,sha256=YEVu547ZwrORLAsryjaWgII9iqgg2zxPEM61J--Dm1M,15360
+fmu_manipulation_toolbox/resources/win64/client_sm.dll,sha256=4W3Giq_aJf2GUPcLUXmjRiop02VtSySywFgtKVJ-NSU,21504
+fmu_manipulation_toolbox/resources/win64/container.dll,sha256=r8hdfh4T9de8tvrG7Xlz0cJi1_XzdGuly7LCIdFagZk,98816
+fmu_manipulation_toolbox/resources/win64/server_sm.exe,sha256=2PibjuEn-6MIwh4Wl7yD7mZ1ikSjzBsh36Ne5CGPqfQ,18432
+fmu_manipulation_toolbox-1.9rc7.dist-info/licenses/LICENSE.txt,sha256=c_862mzyk6ownO3Gt6cVs0-53IXLi_-ZEQFNDVabESw,1285
+fmu_manipulation_toolbox-1.9rc7.dist-info/METADATA,sha256=f8pnsoOG3D6mbzbycL5kF7XMlxyqWoK9Uk1jTyttbdg,1156
+fmu_manipulation_toolbox-1.9rc7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fmu_manipulation_toolbox-1.9rc7.dist-info/entry_points.txt,sha256=HjOZkflbI1IuSY8BpOZre20m24M4GDQGCJfPIa7NrlY,264
+fmu_manipulation_toolbox-1.9rc7.dist-info/top_level.txt,sha256=9D_h-5BMjSqf9z-XFkbJL_bMppR2XNYW3WNuPkXou0k,25
+fmu_manipulation_toolbox-1.9rc7.dist-info/RECORD,,