fmu-manipulation-toolbox 1.8.2.dev2__py3-none-any.whl → 1.8.2.dev4__py3-none-any.whl

fmu_manipulation_toolbox/__version__.py

@@ -1 +1 @@
-'V1.8.2-dev2'
+'V1.8.2-dev4'

fmu_manipulation_toolbox/assembly.py

@@ -38,7 +38,7 @@ class Connection:
 
 class AssemblyNode:
     def __init__(self, name: Optional[str], step_size: float = None, mt=False, profiling=False,
-                 auto_link=True, auto_input=True, auto_output=True, auto_parameter=False):
+                 auto_link=True, auto_input=True, auto_output=True, auto_parameter=False, auto_local=False):
         self.name = name
         if step_size:
             try:
@@ -54,6 +54,7 @@ class AssemblyNode:
         self.auto_input = auto_input
         self.auto_output = auto_output
         self.auto_parameter = auto_parameter
+        self.auto_local = auto_local
 
         self.parent: Optional[AssemblyNode] = None
         self.children: Dict[str, AssemblyNode] = {}     # sub-containers
@@ -128,7 +129,8 @@ class AssemblyNode:
         container.add_implicit_rule(auto_input=self.auto_input,
                                     auto_output=self.auto_output,
                                     auto_link=self.auto_link,
-                                    auto_parameter=self.auto_parameter)
+                                    auto_parameter=self.auto_parameter,
+                                    auto_local=self.auto_local)
 
         container.make_fmu(self.name, self.step_size, mt=self.mt, profiling=self.profiling, debug=debug)
 
@@ -209,7 +211,8 @@ class AssemblyError(Exception):
 
 class Assembly:
     def __init__(self, filename: str, step_size=None, auto_link=True,  auto_input=True, debug=False,
-                 auto_output=True, mt=False, profiling=False, fmu_directory: Path = Path("."), auto_parameter=False):
+                 auto_output=True, mt=False, profiling=False, fmu_directory: Path = Path("."), auto_parameter=False,
+                 auto_local=False):
         self.filename = Path(filename)
         self.default_auto_input = auto_input
         self.debug = debug
@@ -217,6 +220,7 @@ class Assembly:
         self.default_step_size = step_size
         self.default_auto_link = auto_link
         self.default_auto_parameter = auto_parameter
+        self.default_auto_local = auto_local
         self.default_mt = mt
         self.default_profiling = profiling
         self.fmu_directory = fmu_directory
@@ -274,7 +278,7 @@ class Assembly:
         self.root = AssemblyNode(name, step_size=self.default_step_size, auto_link=self.default_auto_link,
                                  mt=self.default_mt, profiling=self.default_profiling,
                                  auto_input=self.default_auto_input, auto_output=self.default_auto_output,
-                                 auto_parameter=self.default_auto_parameter)
+                                 auto_parameter=self.default_auto_parameter, auto_local=self.default_auto_local)
 
         with open(self.input_pathname) as file:
             reader = csv.reader(file, delimiter=';')
@@ -379,14 +383,16 @@ class Assembly:
         auto_input = data.get("auto_input", self.default_auto_input)                        # 5
         auto_output = data.get("auto_output", self.default_auto_output)                     # 6
         auto_parameter = data.get("auto_parameter", self.default_auto_parameter)            # 6b
+        auto_local = data.get("auto_local", self.default_auto_local)                        # 6c
         step_size = data.get("step_size", self.default_step_size)                           # 7
 
         node = AssemblyNode(name, step_size=step_size, auto_link=auto_link, mt=mt, profiling=profiling,
-                            auto_input=auto_input, auto_output=auto_output, auto_parameter=auto_parameter)
+                            auto_input=auto_input, auto_output=auto_output, auto_parameter=auto_parameter,
+                            auto_local=auto_local)
 
         for key, value in data.items():
             if key in ('name', 'step_size', 'auto_link', 'auto_input', 'auto_output', 'mt', 'profiling',
-                       'auto_parameter'):
+                       'auto_parameter', 'auto_local'):
                 continue  # Already read
 
             elif key == "container":  # 8
@@ -447,6 +453,7 @@ class Assembly:
         json_node["auto_input"] = node.auto_input          # 5
         json_node["auto_output"] = node.auto_output        # 6
         json_node["auto_parameter"] = node.auto_parameter  # 6b
+        json_node["auto_local"] = node.auto_local          # 6c
 
         if node.step_size:
             json_node["step_size"] = node.step_size        # 7

fmu_manipulation_toolbox/cli.py

@@ -179,6 +179,9 @@ def fmucontainer():
     parser.add_argument("-auto-parameter", action="store_true", dest="auto_parameter", default=False,
                         help="Expose parameters of the embedded fmu's.")
 
+    parser.add_argument("-auto-local", action="store_true", dest="auto_local", default=False,
+                        help="Expose local variables of the embedded fmu's.")
+
     parser.add_argument("-no-auto-link", action="store_false", dest="auto_link", default=True,
                         help="Create ONLY explicit links.")
 
@@ -208,7 +211,8 @@ def fmucontainer():
             filename = description
         try:
             assembly = Assembly(filename, step_size=step_size, auto_link=config.auto_link,
-                                auto_input=config.auto_input, auto_output=config.auto_output, mt=config.mt,
+                                auto_input=config.auto_input, auto_output=config.auto_output,
+                                auto_local=config.auto_local, mt=config.mt,
                                 profiling=config.profiling, fmu_directory=fmu_directory, debug=config.debug,
                                 auto_parameter=config.auto_parameter)
         except FileNotFoundError as e:

fmu_manipulation_toolbox/fmu_container.py

@@ -308,7 +308,8 @@ class FMUContainer:
                     return ContainerPort(fmu, port.name)
         return None
 
-    def add_implicit_rule(self, auto_input=True, auto_output=True, auto_link=True, auto_parameter=False):
+    def add_implicit_rule(self, auto_input=True, auto_output=True, auto_link=True, auto_parameter=False,
+                          auto_local=False):
         # Auto Link outputs
         for fmu in self.execution_order:
             for port_name in fmu.ports:
@@ -332,11 +333,17 @@ class FMUContainer:
                             self.mark_ruled(cport, 'OUTPUT')
                             self.outputs[port_name] = cport
                             logger.info(f"AUTO OUTPUT: Expose {cport}")
-                    elif cport.port.causality == 'local' and port_name.startswith("container."):
-                        local_portname = "container." + cport.fmu.id + "." + port_name[10:]
-                        self.mark_ruled(cport, 'OUTPUT')
-                        self.outputs[local_portname] = cport
-                        logger.info(f"PROFILING: Expose {cport}")
+                    elif cport.port.causality == 'local':
+                        local_portname = None
+                        if port_name.startswith("container."):
+                            local_portname = "container." + cport.fmu.id + "." + port_name[10:]
+                            logger.info(f"PROFILING: Expose {cport}")
+                        elif auto_local:
+                            local_portname = cport.fmu.id + "." + port_name
+                            logger.info(f"AUTO LOCAL: Expose {cport}")
+                        if local_portname:
+                            self.mark_ruled(cport, 'OUTPUT')
+                            self.outputs[local_portname] = cport
 
         if auto_input:
             # Auto link inputs
@@ -668,7 +675,6 @@ class FMUContainer:
                                    os.path.relpath(os.path.join(root, file), base_directory))
         logger.info(f"'{fmu_filename}' is available.")
 
-    @staticmethod
-    def make_fmu_cleanup(base_directory: Path):
+    def make_fmu_cleanup(self, base_directory: Path):
         logger.debug(f"Delete directory '{base_directory}'")
-        shutil.rmtree(base_directory)
+        shutil.rmtree(self.long_path(base_directory))

{fmu_manipulation_toolbox-1.8.2.dev2.dist-info → fmu_manipulation_toolbox-1.8.2.dev4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: fmu_manipulation_toolbox
-Version: 1.8.2.dev2
+Version: 1.8.2.dev4
 Summary: FMU Manipulation Toobox is a python application which help to modify a Functional Mock-up Units (FMUs) without recompilation or to group them into FMU Containers
 Home-page: https://github.com/grouperenault/fmu_manipulation_toolbox/
 Author: Nicolas.LAURENT@Renault.com

{fmu_manipulation_toolbox-1.8.2.dev2.dist-info → fmu_manipulation_toolbox-1.8.2.dev4.dist-info}/RECORD

@@ -1,10 +1,10 @@
 fmu_manipulation_toolbox/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 fmu_manipulation_toolbox/__main__.py,sha256=mAzrtkil506DS0F3g3CEbHdtZsZotzntcNhIn_lNJkw,344
-fmu_manipulation_toolbox/__version__.py,sha256=XRMZw6r5zNWqAwUNVSOks2uHYTZKCrn1E3G40AmC86I,14
-fmu_manipulation_toolbox/assembly.py,sha256=pgGuePOsUbPqTP3IYbeHtMIaqm8dCqI1k55dIezcAEg,25080
+fmu_manipulation_toolbox/__version__.py,sha256=j6FaYga73uUHXyGuI1eM_Hg2B5t4QR2p3FdDGukGywE,14
+fmu_manipulation_toolbox/assembly.py,sha256=pAAE_eWPfD-8BzZ7gvaHARhQt4-IV2jVvsMnJXeAtLI,25541
 fmu_manipulation_toolbox/checker.py,sha256=lE2MpH4BAKCDjUvbr06N56u7ao8hWXaJgMKaLvmhFTQ,2272
-fmu_manipulation_toolbox/cli.py,sha256=g_03DdH5lNZ7DsD5CoAeA_nGeDlsw19nhli9dousdew,10347
-fmu_manipulation_toolbox/fmu_container.py,sha256=SGA-zSLyHojkg1upXA6wdM-KaZTsl6FO5UtSRZt2YkY,28390
+fmu_manipulation_toolbox/cli.py,sha256=PVdz2eg-D7bnkPXjke7t9_mAuT77gBJWib558HB2-p8,10582
+fmu_manipulation_toolbox/fmu_container.py,sha256=VTZlRTXAYcaYLijgN4ReuG6hLQ2XRgxctPJdEYRfOcc,28755
 fmu_manipulation_toolbox/fmu_operations.py,sha256=WE-lCNNOYr3pakMkwzpsp_lBhb2P4s7Ez5HnxQLbVdk,15814
 fmu_manipulation_toolbox/gui.py,sha256=bGG4iPddGsT4tLBv1zjSpbIkyctHVfbRt0kGxdTTrTc,29219
 fmu_manipulation_toolbox/gui_style.py,sha256=jjDhzSw5hu_6-bOOhsvI_MxQZOqt9SjpKK6T83Gubr4,2926
@@ -37,16 +37,16 @@ fmu_manipulation_toolbox/resources/fmi-2.0/fmi2VariableDependency.xsd,sha256=Tc9
 fmu_manipulation_toolbox/resources/linux32/client_sm.so,sha256=xVdY2zy13pa2DcvFiweSNpp7E6DiONqeoBdlcJHrW_k,35940
 fmu_manipulation_toolbox/resources/linux32/server_sm,sha256=1TLGqNPyM5UVOrCfzNqWyF6ClLksY3EiY3CSsrnp6c0,22836
 fmu_manipulation_toolbox/resources/linux64/client_sm.so,sha256=EhY1XHo1YcQn6yqZ7wk5okqtZyp0MrcCsGcudqE-aIM,37000
-fmu_manipulation_toolbox/resources/linux64/container.so,sha256=mlzbV-mzP9umrY_7WM4mpxohEG97uTjEpc6nxlv1f-c,45984
+fmu_manipulation_toolbox/resources/linux64/container.so,sha256=vT6W-xb6sdybEFnujZEO5lvl2zwf_0VCEtsn0PL28Cs,45984
 fmu_manipulation_toolbox/resources/linux64/server_sm,sha256=ulfoPvmaYe9nInYcVEyj7mD9zDzGk56OUoWx1mPKLiE,22768
-fmu_manipulation_toolbox/resources/win32/client_sm.dll,sha256=wct4eXJaoHjb-IZkVJJUbnCsdRE-61C_IQF9LUNIEwQ,17920
-fmu_manipulation_toolbox/resources/win32/server_sm.exe,sha256=YVqy_jmyCMe1AXV0Gg3uUZyUHjDn0sGOw1L6OptauUQ,15872
-fmu_manipulation_toolbox/resources/win64/client_sm.dll,sha256=eI6HGuuX9zVAWTAc0veQo4VqD8m0WswxO_zcaYbJxvQ,22016
-fmu_manipulation_toolbox/resources/win64/container.dll,sha256=YwnHFnuuv_fZG1KdkBqf4iWagLlGXeuEfjVOr4Lm4BE,36864
-fmu_manipulation_toolbox/resources/win64/server_sm.exe,sha256=1AJoXNlr-dKzrcdNKsqU_iQYtK1WgWBU039jL61aofY,19456
-fmu_manipulation_toolbox-1.8.2.dev2.dist-info/LICENSE.txt,sha256=c_862mzyk6ownO3Gt6cVs0-53IXLi_-ZEQFNDVabESw,1285
-fmu_manipulation_toolbox-1.8.2.dev2.dist-info/METADATA,sha256=QJH35Er0kNos3fOG2ZyW0V39EPevhax9Zbv8Xw2QWaA,1068
-fmu_manipulation_toolbox-1.8.2.dev2.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-fmu_manipulation_toolbox-1.8.2.dev2.dist-info/entry_points.txt,sha256=jCPLMBdS-eOvmRfDv7n0wHZSbJHccHviW03mz5vwO-Q,124
-fmu_manipulation_toolbox-1.8.2.dev2.dist-info/top_level.txt,sha256=9D_h-5BMjSqf9z-XFkbJL_bMppR2XNYW3WNuPkXou0k,25
-fmu_manipulation_toolbox-1.8.2.dev2.dist-info/RECORD,,
+fmu_manipulation_toolbox/resources/win32/client_sm.dll,sha256=hHVz73BsPfqHAp57iDI36LC1528P6PnHcEVjeaVdlO4,17920
+fmu_manipulation_toolbox/resources/win32/server_sm.exe,sha256=gP9raQQLJoAudrKod9Ge75DixILc4amtoneSmTPJ_8U,15872
+fmu_manipulation_toolbox/resources/win64/client_sm.dll,sha256=Bqa4ubYbyZ_-FLquFAbZf6DxYMt3qdqLQ_t_GwdSO7M,22016
+fmu_manipulation_toolbox/resources/win64/container.dll,sha256=hnRiy7ofyMLZSlD4DrUra67QNN3FVDaxDFOqtPrvX1Y,36864
+fmu_manipulation_toolbox/resources/win64/server_sm.exe,sha256=2NnGROVFQd33k7vPjAf8txybw5kaoVA1gPngdXmTV0g,19456
+fmu_manipulation_toolbox-1.8.2.dev4.dist-info/LICENSE.txt,sha256=c_862mzyk6ownO3Gt6cVs0-53IXLi_-ZEQFNDVabESw,1285
+fmu_manipulation_toolbox-1.8.2.dev4.dist-info/METADATA,sha256=22HV25P8a6eq4X1xxPo0M6OBd5Aoy-eOdGqNW4RyFlc,1068
+fmu_manipulation_toolbox-1.8.2.dev4.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+fmu_manipulation_toolbox-1.8.2.dev4.dist-info/entry_points.txt,sha256=jCPLMBdS-eOvmRfDv7n0wHZSbJHccHviW03mz5vwO-Q,124
+fmu_manipulation_toolbox-1.8.2.dev4.dist-info/top_level.txt,sha256=9D_h-5BMjSqf9z-XFkbJL_bMppR2XNYW3WNuPkXou0k,25
+fmu_manipulation_toolbox-1.8.2.dev4.dist-info/RECORD,,

{fmu_manipulation_toolbox-1.8.2.dev2.dist-info → fmu_manipulation_toolbox-1.8.2.dev4.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (75.8.2)
 Root-Is-Purelib: true
 Tag: py3-none-any