PySimultan 0.7.0__py3-none-any.whl → 0.7.1__py3-none-any.whl

PySimultan2/__about__.py

@@ -1 +1 @@
-version = '0.7.0'
+version = '0.7.1'

PySimultan2/data_model.py

@@ -284,7 +284,7 @@ class DataModel:
         self.data = self.project_data_manager.Components
 
         self.create_component_dict.cache_clear()
-        self.get_component_by_id.cache_clear()
+        self.get_component_by_id_cached.cache_clear()
 
         return self.data
 
@@ -357,7 +357,7 @@ class DataModel:
             self.data.RemoveItem(index)
 
         self.create_component_dict.cache_clear()
-        self.get_component_by_id.cache_clear()
+        self.get_component_by_id_cached.cache_clear()
 
     def remove_component(self,
                          component: Union[SimComponent, SimultanObject] = None,
@@ -380,7 +380,7 @@ class DataModel:
             self.data.RemoveItem(index)
 
         self.create_component_dict.cache_clear()
-        self.get_component_by_id.cache_clear()
+        self.get_component_by_id_cached.cache_clear()
 
     def save(self):
         """
@@ -464,7 +464,7 @@ class DataModel:
             self.data.RemoveItem(index)
 
         self.create_component_dict.cache_clear()
-        self.get_component_by_id.cache_clear()
+        self.get_component_by_id_cached.cache_clear()
 
     def add_new_geometry_model(self, file_name: str, model_name: str = None, return_resource=False):
         """
@@ -601,7 +601,11 @@ class DataModel:
 
             existing_files = [x.current_full_path for x in self.project_data_manager.AssetManager.Resources]
             try:
-                act_filename = filename.replace('\\', os.sep)
+                if isinstance(filename, (PosixPath, WindowsPath)):
+                    # convert to SystemFileInfo
+                    act_filename = str(filename)
+                else:
+                    act_filename = filename.replace('\\', os.sep)
             except TypeError:
                 act_filename = filename
 
@@ -978,6 +982,23 @@ class DataModel:
         # print(item_id.GlobalId, item_id.LocalId)
         # _ = [print((x.Id.GlobalId, x.Id.LocalId)) for x in self.data.Items]
 
+        component = self.get_component_by_id_cached(item_id=item_id,
+                                                    search_subcomponents=search_subcomponents)
+        if component is None:
+            self.get_component_by_id_cached.cache_clear()
+            component = self.get_component_by_id_cached(item_id=item_id,
+                                                    search_subcomponents=search_subcomponents)
+
+        return component
+
+    @lru_cache()
+    def get_component_by_id_cached(self,
+                            item_id: SimId,
+                            search_subcomponents=False) -> Union[SimComponent, None]:
+
+        # print(item_id.GlobalId, item_id.LocalId)
+        # _ = [print((x.Id.GlobalId, x.Id.LocalId)) for x in self.data.Items]
+
         component = next((x for x in self.data.Items if x.Id.Equals(item_id)), None)
 
         if component is None and search_subcomponents:

PySimultan2/object_mapper.py

@@ -104,9 +104,9 @@ class PythonMapper(object):
     def register(self,
                  taxonomy: str,
                  cls: Type[Any],
-                 re_register=True,
-                 update_in_other_mappers=False,
-                 taxonomy_map=None):
+                 taxonomy_map: TaxonomyMap,
+                 re_register: bool = True,
+                 update_in_other_mappers: bool = False):
 
         # print(f'Registering {taxonomy} with {cls} {hash(cls)}')
 

{pysimultan-0.7.0.dist-info → pysimultan-0.7.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PySimultan
-Version: 0.7.0
+Version: 0.7.1
 Project-URL: Documentation, https://github.com/Bühler Maximilian/PySimultan2#readme
 Project-URL: Issues, https://github.com/Bühler Maximilian/PySimultan2/issues
 Project-URL: Source, https://github.com/Bühler Maximilian/PySimultan2
@@ -14,8 +14,6 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
-Classifier: Programming Language :: Python :: 3.14
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Requires-Python: >=3.8
@@ -168,6 +166,9 @@ print(instances[0].param_1)
 
 
 # Change Log
+## [0.6.4] - 2025-06-06
+Updated SIMULTAN version to 0.7.18
+
 ## [0.5.9.7] - 2025-01-09
 - Added default component support to Mapper: if a default component is not present in the datamodel, it is automatically added
 - Fixed content naming bug: Content.name is now used for the name of the TaxonomyEntry in SIMULTAN

{pysimultan-0.7.0.dist-info → pysimultan-0.7.1.dist-info}/RECORD

@@ -1,11 +1,11 @@
 PySimultan2/CHANGELOG.md,sha256=sFTVr_AgFyqf4HPmShaAHKaHcT5A3MjL2s2VVzEdoyM,1340
-PySimultan2/__about__.py,sha256=ULR6Ed8mKB12pi3lDol8_GrYHqrtpm763NOpO0AGl88,19
+PySimultan2/__about__.py,sha256=CofaMtE6-CSasTw6dBDKRTVix5Q4zlkB7yu8mbXp9uk,19
 PySimultan2/__init__.py,sha256=PGVR1uhY01dF5tHyad-znURUZ_LVB95vsjId2BT0aJM,3245
-PySimultan2/data_model.py,sha256=5E-AJfnXNJq-Y6srN7DfvCDwkZXqXQBDXTsFlQ2Zh6g,44104
+PySimultan2/data_model.py,sha256=7qYAVHT8IbbKUy25g0CiPQrloLh7ukReIThatVGcWEs,45109
 PySimultan2/default_types.py,sha256=NnBgf16CElEAWH7tA0qLKqFHZ4_YS00HAJpKHG1CmjQ,30581
 PySimultan2/files.py,sha256=8JCWtUPS89POsPrmn_kCrHzmiBsLb1iWhw-A9qQLcR8,34716
 PySimultan2/multi_values.py,sha256=CkmfifA-mHL3Cnm496tGQuUchpmNF7JCulyrhUFAM_I,15638
-PySimultan2/object_mapper.py,sha256=Vq4LsX5m6J1dsdlIC6V7sXEUGZYpkgPD6kwOdo5dLRI,19888
+PySimultan2/object_mapper.py,sha256=iVjQBV0mwVxCxSCloBrV0Jq8oR9BG34EIEf90bXweHM,19912
 PySimultan2/simultan_object.py,sha256=-3dTlkyoVdrXmSZgozz7fTHJnaxN63utYPXOXTCuEOY,20837
 PySimultan2/taxonomy_maps.py,sha256=hhgXhRXIPTD2briG_yYZssJ9musOnzs0LC4e8e78e40,10323
 PySimultan2/type_setter_lookup.py,sha256=PGa5_EtV7SM15w3uxy0fA3LiQ0TaS4Ys0LYR5zs8aNk,3748
@@ -13,20 +13,12 @@ PySimultan2/utils.py,sha256=FNJzBVqN31oRKak4NNx9xNmKMrROKphgbh6XfQCmlMw,67115
 PySimultan2/geometry/__init__.py,sha256=nJolTD1i5J8qUkOQa-r3D20aq3Co3sN31Xc0n4wJpJo,248
 PySimultan2/geometry/geometry_base.py,sha256=TwABfQEsqxAIGLqwvqVXEV-GA5sYGBJSJm7e58QmNzM,24015
 PySimultan2/geometry/utils.py,sha256=J25YsK8sso_UL7xRusItQZvyjtvxdOsSPelBQYFABhY,8519
-PySimultan2/resources/AssimpNet.dll,sha256=x8uwMHPRmEH9fDQihfEQLUdblM1u7RP-CCnUjOpXcLo,205312
-PySimultan2/resources/AvalonDock.dll,sha256=9tCcw7cpaVq0bh1H2sfcxb8EWhySmgujPs89lAqIPZs,500224
-PySimultan2/resources/BruTile.dll,sha256=sJOMQaku5jxcbL7XEd9pehBopyFEHOZzaLyNZyD6u7U,203264
 PySimultan2/resources/ClosedXML.dll,sha256=dzkwJaBvIdou7SZSE5lsEART_jlnMMztEZu_jBuHp74,1198592
 PySimultan2/resources/ControlzEx.dll,sha256=S26xw5MnNiIoyiCmVFbFOmUx1yx_zAyXBdDSOSidZxQ,463160
-PySimultan2/resources/Cyotek.Drawing.BitmapFont.dll,sha256=JG8HbAq5s796e02jB9QklO2cOyKPtHmhY6vc7KUs0OQ,41800
 PySimultan2/resources/DocumentFormat.OpenXml.dll,sha256=JjiBI17BpHztipV39dQdXAjhHo6Ic0xRjijJJuBQLLo,6108592
 PySimultan2/resources/DotSpatial.Projections.dll,sha256=dK4oFLcpUK3i6CZ3qIcX5B0npYd-W4hHJz7RJvM77ho,1541632
 PySimultan2/resources/ExcelNumberFormat.dll,sha256=18Rbjk4QJ4MeL8jN-UH69R0opm_qz8qqc32nMmLntQc,30720
 PySimultan2/resources/Fluent.dll,sha256=9b7QKKj8-Ynhe4WqSVfiP82PkxYz_kI_GXYi_KQxrEU,2598400
-PySimultan2/resources/HelixToolkit.Core.Wpf.dll,sha256=EU2-CBh2SDNjwZEP2pOBJhLUf0lKpOL77dYH4fS3wZY,592384
-PySimultan2/resources/HelixToolkit.SharpDX.Core.Wpf.dll,sha256=KgLYD_QrOxwu90Zk59KLsquAGthP_B-FW0GyHEkyDk0,613888
-PySimultan2/resources/HelixToolkit.SharpDX.Core.dll,sha256=iKE8TEEAEX9FCg-6CipTCq79aiR79d6jep0rwMCAwgM,1733120
-PySimultan2/resources/HelixToolkit.dll,sha256=HjbeIX5qCQOm-2HhJCd7ZjCwGAeVoaAHo3SHV8_B4ak,6656
 PySimultan2/resources/MathNet.Numerics.dll,sha256=g7QaYI5DhAnWUg0BEk9S9XQJ4il5HA4HTjFazn2fQTQ,1600000
 PySimultan2/resources/Microsoft.AspNetCore.Authorization.dll,sha256=P7_HRwCqdk3q1MD7UtlAXMN_E8gZRdzme6ESGZsXHNk,49272
 PySimultan2/resources/Microsoft.AspNetCore.Metadata.dll,sha256=jddQwxkgfjmJ6vlXok-PbfnIquNDs6VHvspFEopiTAY,17016
@@ -39,36 +31,20 @@ PySimultan2/resources/Microsoft.WindowsAPICodePack.dll,sha256=aB9FK5RWRh1onyayOe
 PySimultan2/resources/Microsoft.Xaml.Behaviors.dll,sha256=j3gq16397qqTMYMGWqegvpOHq85gOOkSRV54UnsErco,145272
 PySimultan2/resources/Newtonsoft.Json.Bson.dll,sha256=tgbl3XemJCyh8d9xfrU9lQWuVpBDMLl1wI1PLb6MMxk,90624
 PySimultan2/resources/Newtonsoft.Json.dll,sha256=etsgJYQb32kqVnEuCK_nXhcwxx1keKj-1XWs1DJRpmI,639488
-PySimultan2/resources/Python.Runtime.dll,sha256=i8TGSK2uHgN4_JwFn8llwTNrhXtqU-l05M8-CdMIy7Q,438784
 PySimultan2/resources/SIMULTAN.Lang.dll,sha256=wdjTnQSZIwF_L0UXZU9g1diA2BsUka3Lw2Gmkd-64Hw,2622464
 PySimultan2/resources/SIMULTAN.Lang.xml,sha256=vm96Db9QoZUrInbqOvefJOuPP0w5p2HsThH-vWzHv7M,756713
 PySimultan2/resources/SIMULTAN.Plugins.dll,sha256=Carb7bpERnYpx_y8uGyp6aQOord9G6WsLBh3eU-22KM,12288
 PySimultan2/resources/SIMULTAN.Plugins.xml,sha256=bGo63WDD97GSwK54J0kHfreGFI6gtqDWdk6PBBeqFwU,15912
-PySimultan2/resources/SIMULTAN.UI.dll,sha256=7PQVsIAd1cswnN8rVlXqnmTLXvWi4Emz7ic6RZgnznY,1246208
-PySimultan2/resources/SIMULTAN.UI.xml,sha256=7p7ds4NgHMNvwFGUtSRLh_FwjA96ThaZFRdh31-n8FU,843644
 PySimultan2/resources/SIMULTAN.dll,sha256=9JJ55e2-HJBrWo9jnrqaakFILmZQ6l_IZVcguOltBSU,1814528
 PySimultan2/resources/SIMULTAN.xml,sha256=V4taNP246hAtxBGiJCHsLYt6lUXi964UeaM-Q7H-l14,2001198
-PySimultan2/resources/SharpDX.D3DCompiler.dll,sha256=qyDGhqpcMo0zkNAdSdyX9sxWRxGRZq6ce4FIBXvxXSI,57856
-PySimultan2/resources/SharpDX.DXGI.dll,sha256=GMTsibwN7s_JG8t-ofKaJpDpKIADw2bqAnAzdLS21zI,147968
-PySimultan2/resources/SharpDX.Direct2D1.dll,sha256=HkRyV1YspAeY05q0E4pkFy3Hrrkd96fr9SzlmVnDekc,495616
-PySimultan2/resources/SharpDX.Direct3D11.dll,sha256=XBwIVxhA-_S5haBjrGlXEwWWqIg5IKcXT7fFFoJt2rE,282624
-PySimultan2/resources/SharpDX.Direct3D9.dll,sha256=aXAe2nQzrAAQq6QWudnCRc14aUdw1LtrdUG4O6zkHVU,338944
 PySimultan2/resources/SharpDX.Mathematics.dll,sha256=ajtUzW3A6l7UwfVpZgpPacGrVHHP24QZmdSyZOHOThI,215552
-PySimultan2/resources/SharpDX.dll,sha256=UY1FparshMs36D7iz1jFA6tqJf67jEi1MxY0DJZ-hL0,275968
 PySimultan2/resources/Sprache.Calc.dll,sha256=QyBWSMEL5UXootOCTzYWlAkDgGcseeVgDaw_W7K32zc,22528
 PySimultan2/resources/Sprache.dll,sha256=4c4dDHP9ztxaBDpgWYBUhKKkzPl5eISQimpThGZl0t8,59904
-PySimultan2/resources/System.Collections.Immutable.dll,sha256=YkpsmK2tsFnupt75OgF4vW0fedXRXfvGwPKONArInxk,245920
 PySimultan2/resources/System.Data.OleDb.dll,sha256=-AAzdmyo01QNgD9qnUIewEImplJFVNDGUlqE17qmRYA,124024
 PySimultan2/resources/System.Net.Http.Formatting.dll,sha256=xQBIin4YpqDObdqwau_5dr8XQEq54hlxV4gBgNtUqbc,179672
-PySimultan2/resources/System.Reflection.Metadata.dll,sha256=Z_vYHE6IgOvBi3DLxLhfX-v6o01lTfD0B4oW6B8IsyA,475912
 PySimultan2/resources/System.Reflection.MetadataLoadContext.dll,sha256=P4PBRwAGWL27sNc754Wd28t_koJKBFYJ2FyolrD1xo0,242296
-PySimultan2/resources/XAMLMarkupExtensions.dll,sha256=Ck7FAAFHqSSwMtGJebfun-88OCEplWxY2YKMwlFaF84,36864
 PySimultan2/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-PySimultan2/resources/assimp.dll,sha256=HwfDwXqoPDTFRyoQpA3qmgZoUdFtziJkV5fNtktEZEU,6081536
-PySimultan2/resources/componentmanager.user,sha256=hrzr1US4pqkFnLHXcvPkvrgGd7QvlxaV8mhS6fuikEs,760
-PySimultan2/resources/defaultsettings.xml,sha256=QCkKmhNMxwSvC-aYUUMhkCkXqRSrkuFt5s4FEI5x1wo,396
-PySimultan2/resources/setup.bat,sha256=fjvvYfVM6TalS-QTSiKAbAId5nTsk8kGGo06ba-wWaY,32
-pysimultan-0.7.0.dist-info/METADATA,sha256=r4xzQDNrwkuvysgDOdu-ARt8bUDXsNzaltB1RmQP0po,6650
-pysimultan-0.7.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-pysimultan-0.7.0.dist-info/licenses/LICENSE.txt,sha256=FgR_YZkk7oYz4087xYXfcBCXGuTStFrsOWTH4bbpa3c,1821
-pysimultan-0.7.0.dist-info/RECORD,,
+pysimultan-0.7.1.dist-info/METADATA,sha256=J-zJleZLZr1YGrUvr9Jdj2FugAslZm_K-jIybKZboow,6608
+pysimultan-0.7.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+pysimultan-0.7.1.dist-info/licenses/LICENSE.txt,sha256=FgR_YZkk7oYz4087xYXfcBCXGuTStFrsOWTH4bbpa3c,1821
+pysimultan-0.7.1.dist-info/RECORD,,