fmu-manipulation-toolbox 1.9rc9__py3-none-any.whl → 1.9rc10__py3-none-any.whl

fmu_manipulation_toolbox/__version__.py

@@ -1 +1 @@
-'V1.9-rc9'
+'V1.9-rc10'

fmu_manipulation_toolbox/split.py

@@ -111,16 +111,10 @@ class FMUSplitter:
                     fmu_file.writestr(file[len(directory):], data)
         logger.info(f"FMU Extraction of '{filename}'")
 
-
 class FMUSplitterDescription:
     def __init__(self, zip):
         self.zip = zip
-        self.links: Dict[str, Dict[int, FMUSplitterLink]] = {
-            "Real": {},
-            "Integer": {},
-            "Boolean": {},
-            "String": {}
-        }
+        self.links: Dict[str, Dict[int, FMUSplitterLink]] = dict((el, {}) for el in EmbeddedFMUPort.ALL_TYPES)
         self.vr_to_name: Dict[str, Dict[str, Dict[int, Dict[str, str]]]] = {} # name, fmi_type, vr <-> {name, causality}
         self.config: Dict[str, Any] = {
             "auto_input": False,
@@ -133,10 +127,11 @@ class FMUSplitterDescription:
 
         # used for modelDescription.xml parsing
         self.current_fmu_filename = None
+        self.current_fmi_version = None
         self.current_vr = None
         self.current_name = None
         self.current_causality = None
-        self.supported_fmi_types: Tuple[str] = ()
+        self.supported_fmi_types: Tuple[str] = tuple()
 
     @staticmethod
     def get_line(file):
@@ -146,14 +141,23 @@ class FMUSplitterDescription:
                 return line
         raise StopIteration
 
-    def start_element(self, name, attrs):
-        if name == "ScalarVariable":
+    def start_element(self, tag, attrs):
+        if tag == "fmiModelDescription":
+            self.current_fmi_version = attrs["fmiVersion"]
+        elif tag == "ScalarVariable":
             self.current_name = attrs["name"]
             self.current_vr = int(attrs["valueReference"])
             self.current_causality = attrs["causality"]
-        elif name in self.vr_to_name[self.current_fmu_filename]:
-            self.vr_to_name[self.current_fmu_filename][name][self.current_vr] = {"name": self.current_name,
-                                                                                 "causality": self.current_causality}
+        elif self.current_fmi_version == "2.0" and tag in EmbeddedFMUPort.FMI_TO_CONTAINER[2]:
+            fmi_type = EmbeddedFMUPort.FMI_TO_CONTAINER[2][tag]
+            self.vr_to_name[self.current_fmu_filename][fmi_type][self.current_vr] = {
+                "name": self.current_name,
+                "causality": self.current_causality}
+        elif self.current_fmi_version == "3.0" and tag in EmbeddedFMUPort.FMI_TO_CONTAINER[3]:
+            fmi_type = EmbeddedFMUPort.FMI_TO_CONTAINER[3][tag]
+            self.vr_to_name[self.current_fmu_filename][fmi_type][int(attrs["valueReference"])] = {
+                "name": attrs["name"],
+                "causality": attrs["causality"]}
         else:
             self.current_vr = None
             self.current_name = None
@@ -166,14 +170,10 @@ class FMUSplitterDescription:
         else:
             filename = f"{directory}/modelDescription.xml"
 
-        self.vr_to_name[fmu_filename] = {
-            "Real": {},
-            "Integer": {},
-            "Boolean": {},
-            "String": {}
-        }
+        self.vr_to_name[fmu_filename] = dict((el, {}) for el in EmbeddedFMUPort.ALL_TYPES)
         parser = xml.parsers.expat.ParserCreate()
         self.current_fmu_filename = fmu_filename
+        self.current_fmi_version = None
         self.current_vr = None
         self.current_name = None
         self.current_causality = None
@@ -266,14 +266,14 @@ class FMUSplitterDescription:
     def parse_txt_file(self, txt_filename: str):
         self.parse_model_description(str(Path(txt_filename).parent.parent), ".")
         logger.debug(f"Parsing container file '{txt_filename}'")
-
         with (self.zip.open(txt_filename) as file):
             self.parse_txt_file_header(file, txt_filename)
             self.parse_txt_file_ports(file)
 
             for fmu_filename in self.config["candidate_fmu"]:
                 # Inputs per FMUs
-                for fmi_type in ("Real", "Integer", "Boolean", "String"):
+
+                for fmi_type in self.supported_fmi_types:
                     nb_input = int(self.get_line(file))
                     for i in range(nb_input):
                         local, vr = self.get_line(file).split(" ")
@@ -285,7 +285,7 @@ class FMUSplitterDescription:
                         link.to_port.append(FMUSplitterPort(fmu_filename,
                                                             self.vr_to_name[fmu_filename][fmi_type][int(vr)]["name"]))
 
-                for fmi_type in ("Real", "Integer", "Boolean", "String"):
+                for fmi_type in self.supported_fmi_types:
                     nb_start = int(self.get_line(file))
                     for i in range(nb_start):
                         tokens = self.get_line(file).split(" ")
@@ -299,7 +299,7 @@ class FMUSplitterDescription:
                             self.config["start"] = [start_definition]
 
                 # Output per FMUs
-                for fmi_type in ("Real", "Integer", "Boolean", "String"):
+                for fmi_type in self.supported_fmi_types:
                     nb_output = int(self.get_line(file))
 
                     for i in range(nb_output):
@@ -311,6 +311,10 @@ class FMUSplitterDescription:
                             self.links[fmi_type][local] = link
                         link.from_port = FMUSplitterPort(fmu_filename,
                                                          self.vr_to_name[fmu_filename][fmi_type][int(vr)]["name"])
+                #conversion
+                nb_conversion = int(self.get_line(file))
+                for i in range(nb_conversion):
+                    self.get_line(file)
 
             logger.debug("End of parsing.")
 

{fmu_manipulation_toolbox-1.9rc9.dist-info → fmu_manipulation_toolbox-1.9rc10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fmu_manipulation_toolbox
-Version: 1.9rc9
+Version: 1.9rc10
 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.9rc9.dist-info → fmu_manipulation_toolbox-1.9rc10.dist-info}/RECORD

@@ -1,6 +1,6 @@
 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=a17zC1vWGKiyRqtqXxKoo5DItHBYHj480oIEWpgEdNw,11
+fmu_manipulation_toolbox/__version__.py,sha256=qsgfXycp13M4xRN0pMnvl2so7SqkBob6ChBzoU2KO50,12
 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=Ed6JsWM2oMs-jyGyKmrHHebNuG4qwiGLYtx0BREIiBE,45710
@@ -9,7 +9,7 @@ fmu_manipulation_toolbox/gui_style.py,sha256=s6WdrnNd_lCMWhuBf5LKK8wrfLXCU7pFTLU
 fmu_manipulation_toolbox/help.py,sha256=j8xmnCrwQpaW-SZ8hSqA1dlTXgaqzQWc4Yr3RH_oqck,6012
 fmu_manipulation_toolbox/operations.py,sha256=VQvFXRHF48e-ZLqoG8nbz61iB5lX6qAkqZHQ0m0lUPw,20577
 fmu_manipulation_toolbox/remoting.py,sha256=N25MDFkIcEWe9CIT1M4L9kea3j-8E7i2I1VOI6zIAdw,3876
-fmu_manipulation_toolbox/split.py,sha256=ONl1T37xJypF45GH3sZC6gKMSQ83xEl4xAWDSEOJsao,13571
+fmu_manipulation_toolbox/split.py,sha256=yFaW6yhvFjOXpRynWzitR7o7uSrxb-RxeFzmQNxUFHI,14147
 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=6UaSSY6UGGlOfIh_CTG-Gk3ZPSd88Pi2cFCuzb87eks,4839
@@ -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=5LphcmCaBa76MIq8WoA5FwhLNgu3LxmcaWa49dGQ11I,161560
+fmu_manipulation_toolbox/resources/darwin64/container.dylib,sha256=Qr6zN0nLpe3PgpYk8rXvAS_1se9qyj_06cCd9443n08,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=9-lH-dE6QqWg_FNxsFcF9zismk2Qq3PXNWSOqE2pBMk,34756
+fmu_manipulation_toolbox/resources/linux32/client_sm.so,sha256=TMVU2DhAnec90k0UvXkonybGGZlskonW-BIZ6qE9koM,34756
 fmu_manipulation_toolbox/resources/linux32/server_sm,sha256=gzKU0BTeaRkvhTMQtHHj3K8uYFyEdyGGn_mZy_jG9xo,21304
-fmu_manipulation_toolbox/resources/linux64/client_sm.so,sha256=p4zIi1YKQ_81oA6IaMOkKZGwkG-POi4vGj4TKemoHuY,32592
-fmu_manipulation_toolbox/resources/linux64/container.so,sha256=nqZspiOIdn1DwHdCEPJiEybE1JyeO2wTGGQacMYUXqM,135520
+fmu_manipulation_toolbox/resources/linux64/client_sm.so,sha256=CSQBv69pCLIzTtwu9gGMepzGRUoBoUU-j-Vr1jAncjc,32592
+fmu_manipulation_toolbox/resources/linux64/container.so,sha256=T_y9zagScUszMN12RJ4EERwCF2ssipD89ePdoWnZLmQ,135520
 fmu_manipulation_toolbox/resources/linux64/server_sm,sha256=MZn6vITN2qpBHYt_RaK2VnFFp00hk8fTALBHmXPtLwc,22608
-fmu_manipulation_toolbox/resources/win32/client_sm.dll,sha256=E0TqeuNbYeV3tp0S5PFMIK6ipTN4TCWeaUKAbTcHbnE,17920
-fmu_manipulation_toolbox/resources/win32/server_sm.exe,sha256=otceaiC_nRbGCtlExCBl8IlqHd4KMsRTPdVhHMx-jic,15360
-fmu_manipulation_toolbox/resources/win64/client_sm.dll,sha256=3DfTRKHVfwNvcOFjJbpe7T4Jm_wcenQ9x81hJQw2xwk,21504
-fmu_manipulation_toolbox/resources/win64/container.dll,sha256=iy0XO-TUcD27VLiKejB9kJTdBUUt0oh9J-kt1A_u_FI,98816
-fmu_manipulation_toolbox/resources/win64/server_sm.exe,sha256=_61NOrYKKUa0B_wZhogr47x8-1ppUCcaOsYRkrZ31Hc,18432
-fmu_manipulation_toolbox-1.9rc9.dist-info/licenses/LICENSE.txt,sha256=c_862mzyk6ownO3Gt6cVs0-53IXLi_-ZEQFNDVabESw,1285
-fmu_manipulation_toolbox-1.9rc9.dist-info/METADATA,sha256=m0zac5QSzdnCaQKDSXMt8bPm--ReqaBXPxNVkhOOQ3U,1156
-fmu_manipulation_toolbox-1.9rc9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fmu_manipulation_toolbox-1.9rc9.dist-info/entry_points.txt,sha256=HjOZkflbI1IuSY8BpOZre20m24M4GDQGCJfPIa7NrlY,264
-fmu_manipulation_toolbox-1.9rc9.dist-info/top_level.txt,sha256=9D_h-5BMjSqf9z-XFkbJL_bMppR2XNYW3WNuPkXou0k,25
-fmu_manipulation_toolbox-1.9rc9.dist-info/RECORD,,
+fmu_manipulation_toolbox/resources/win32/client_sm.dll,sha256=q7lMEHcmNgV3zsHzjGSMLnFO0KcolGSWTAr7WCb2EsI,17920
+fmu_manipulation_toolbox/resources/win32/server_sm.exe,sha256=tNUKn-KrTQfiM-9_H-HDgovI_okt2lnnErt7Mw1ATYQ,15360
+fmu_manipulation_toolbox/resources/win64/client_sm.dll,sha256=XTe0zd8CDxg3NmP2G91z2F6J3HfzEuRya-xAEEoV94g,21504
+fmu_manipulation_toolbox/resources/win64/container.dll,sha256=aj9N02L8cysKZSR2RPvPKV5e9eMV2aHUz0-XNq6iKK8,98816
+fmu_manipulation_toolbox/resources/win64/server_sm.exe,sha256=hLmKvTddvh8q0iIpySMAhAebv1LZkf53uMpKKIJn3Fs,18432
+fmu_manipulation_toolbox-1.9rc10.dist-info/licenses/LICENSE.txt,sha256=c_862mzyk6ownO3Gt6cVs0-53IXLi_-ZEQFNDVabESw,1285
+fmu_manipulation_toolbox-1.9rc10.dist-info/METADATA,sha256=QV7q42tQJ29jmn9Xz07jOg0gI_g_8LPqy5XYgMcSjb4,1157
+fmu_manipulation_toolbox-1.9rc10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fmu_manipulation_toolbox-1.9rc10.dist-info/entry_points.txt,sha256=HjOZkflbI1IuSY8BpOZre20m24M4GDQGCJfPIa7NrlY,264
+fmu_manipulation_toolbox-1.9rc10.dist-info/top_level.txt,sha256=9D_h-5BMjSqf9z-XFkbJL_bMppR2XNYW3WNuPkXou0k,25
+fmu_manipulation_toolbox-1.9rc10.dist-info/RECORD,,