PySimultan 0.4.7__py3-none-any.whl → 0.4.9__py3-none-any.whl

PySimultan2/__about__.py

@@ -1 +1 @@
-version = '0.4.7'
+version = '0.4.9'

PySimultan2/object_mapper.py

@@ -1,9 +1,12 @@
+from typing import Optional, Type, TYPE_CHECKING, Union
 from copy import copy
 from collections import UserList
 from colorlog import getLogger
+from weakref import WeakSet
 
+from . import config
 from .data_model import data_models
-from .utils import *
+from .utils import create_python_object, add_properties
 from .default_types import ComponentList, component_list_map, ComponentDictionary, component_dict_map
 
 from .simultan_object import SimultanObject
@@ -16,6 +19,9 @@ from .geometry.geometry_base import (SimultanLayer, SimultanVertex, SimultanEdge
 
 from .taxonomy_maps import TaxonomyMap, Content
 
+if TYPE_CHECKING:
+    from .data_model import DataModel
+
 logger = getLogger('PySimultan')
 
 default_registered_classes = {'ComponentList': ComponentList,
@@ -145,7 +151,8 @@ class PythonMapper(object):
 
         for component in component_list:
             typed_object = self.create_python_object(component, data_model=data_model)
-            typed_data.append(typed_object)
+            if typed_object is not None:
+                typed_data.append(typed_object)
         return typed_data
 
     def create_python_geometry_object(self, component, data_model=None, *args, **kwargs):
@@ -167,9 +174,11 @@ class PythonMapper(object):
         else:
             self.create_python_object(component, data_model, *args, **kwargs)
 
-    # @lru_cache(maxsize=500)
-    def create_python_object(self, component, cls=None, data_model=None, *args, **kwargs):
-
+    def get_mapped_class_from_component(self,
+                                        component,
+                                        data_model: Optional['DataModel'] = None,
+                                        *args,
+                                        **kwargs) -> Optional[Type[SimultanObject]]:
         if component is None:
             return None
 
@@ -182,24 +191,54 @@ class PythonMapper(object):
                       ):
             self.create_python_geometry_object(component, data_model, *args, **kwargs)
 
+        c_slots = [x.Target.Key for x in component.Slots.Items]
+        c_slot = list(set(c_slots) & set(self.registered_classes.keys()))
+        if len(c_slot) == 0:
+            if c_slots[0] not in self.registered_classes.keys() and self.load_undefined:
+
+                def new_init(self, *args, **kwargs):
+                    """
+                    Init method for undefined classes
+                    :param self:
+                    :param args:
+                    :param kwargs:
+                    :return:
+                    """
+                    pass
+
+                new_cls = type(c_slots[0],
+                               (object,),
+                               {'__init__': new_init}
+                               )
+
+                self.register(c_slots[0], new_cls)
+                c_slot = [c_slots[0]]
+                self.undefined_registered_classes[c_slot[0]] = new_cls
+                # self.create_mapped_class(c_slot[0], self.registered_classes[c_slot[0]])
+            elif c_slots[0] not in self.registered_classes.keys() and not self.load_undefined:
+                logger.debug(f'Component {component} has no registered taxonomy: {c_slots}')
+                return
+        elif len(c_slot) > 1:
+            num_superclasses = [len(self.registered_classes[x].__mro__) for x in c_slot]
+            c_slot = [c_slot[num_superclasses.index(max(num_superclasses))]]
+
+        if c_slot[0] not in self.mapped_classes.keys():
+            self.create_mapped_class(c_slot[0], self.registered_classes[c_slot[0]])
+
+        cls = self.mapped_classes[c_slot[0]]
+
+        return cls
+
+    # @lru_cache(maxsize=500)
+    def create_python_object(self, component, cls=None, data_model=None, *args, **kwargs) -> Optional[SimultanObject]:
+
         if cls is None:
-            c_slots = [x.Target.Key for x in component.Slots.Items]
-            c_slot = list(set(c_slots) & set(self.registered_classes.keys()))
-            if len(c_slot) == 0:
-                if c_slots[0] not in self.registered_classes.keys() and self.load_undefined:
-                    self.register(c_slots[0], SimultanObject)
-                    c_slot = [c_slots[0]]
-                    self.undefined_registered_classes[c_slot[0]] = SimultanObject
-                    self.create_mapped_class(c_slot[0], self.registered_classes[c_slot[0]])
-            elif len(c_slot) > 1:
-                num_superclasses = [len(self.registered_classes[x].__mro__) for x in c_slot]
-                c_slot = [c_slot[num_superclasses.index(max(num_superclasses))]]
-                # raise Warning(f'Component {component} has more than one registered taxonomy: {c_slot}')
-
-            if c_slot[0] not in self.mapped_classes.keys():
-                self.create_mapped_class(c_slot[0], self.registered_classes[c_slot[0]])
-
-            cls = self.mapped_classes[c_slot[0]]
+            cls = self.get_mapped_class_from_component(component,
+                                                       data_model,
+                                                       *args, **kwargs)
+
+        if cls is None:
+            return None
 
         if component is not None and component.Id in cls._cls_instances_dict.keys():
             return cls._cls_instances_dict[component.Id]

PySimultan2/taxonomy_maps.py

@@ -170,7 +170,8 @@ class TaxonomyMap(object):
         return self._taxonomies[data_model]
 
     def get_slot(self, data_model: 'DataModel'):
-        return SimTaxonomyEntryReference(self.get_or_create_simultan_taxonomy_entry(data_model=data_model, create=True))
+        return SimTaxonomyEntryReference(self.get_or_create_simultan_taxonomy_entry(data_model=data_model,
+                                                                                    create=True))
 
     @cache
     def get_content_by_property_name(self, property_name: str):

{pysimultan-0.4.7.dist-info → pysimultan-0.4.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: PySimultan
-Version: 0.4.7
+Version: 0.4.9
 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
@@ -42,9 +42,39 @@ Description-Content-Type: text/markdown
 ## Installation
 
 ```console
-pip install pysimultan-api
+pip install PySimultan
 ```
 
 ## License
 
 `pysimultan-api` is distributed under the terms of the [MIT](https://spdx.org/licenses/MIT.html) license.
+
+
+### Usage
+
+```python
+from PySimultan2 import DataModel, Content, TaxonomyMap, PythonMapper
+```
+
+
+## FreeCAD support
+
+PySimultanUI looks for a FreeCAD version in C:\Program Files\FreeCAD. If you don't have FreeCAD installed, you can 
+download it from the FreeCAD website or use the FreeCAD version provided in the FreeCAD-Bundle repository.
+Go to https://github.com/FreeCAD/FreeCAD-Bundle/releases/tag/weekly-builds and download the latest version 
+of FreeCAD for your OS. The version must be compiled with the same python version you are using (e.g. py311). 
+
+Extract the zip file to C:\Program Files\FreeCAD
+
+The directory structure should look like this:
+
+```
+C:\Program Files\FreeCAD
+│   ...
+│   FreeCAD_weekly-builds-37730-conda-Windows-x86_64-py311
+│       │   bin
+│       │   lib
+│       │   ...
+│
+
+```

{pysimultan-0.4.7.dist-info → pysimultan-0.4.9.dist-info}/RECORD

@@ -1,12 +1,12 @@
-PySimultan2/__about__.py,sha256=EXLXxXcwrzEc6_sD7Rj1mFJyQXofYegqzwczrtGZZUw,19
+PySimultan2/__about__.py,sha256=gGpYIcr8fwdgEn5xSczdDNlnQ7U-Hl42ws4fZif-nuQ,19
 PySimultan2/__init__.py,sha256=cabTN1Oz8xtFM31ouBKg5lwLqW5vtexDP669PYyNLnA,3224
 PySimultan2/data_model.py,sha256=CHLfdOFF1blU-TBcn9vK98ejNRMrXUS-hvQEkZI9y4U,27016
 PySimultan2/default_types.py,sha256=v_4awsUURLbu4Sfw7J_7BoQKirXbKdU9s7-wqgA4nNE,23112
 PySimultan2/files.py,sha256=gx3BA6WYjNVplqqes7jkPopp6O50pgLvantXgmitx54,12657
 PySimultan2/multi_values.py,sha256=ZFXlTLuZo32x7_7diYAp2XEjp5uwgHLgNOzN7v74-5I,13650
-PySimultan2/object_mapper.py,sha256=CM8L00-RRwUrU_wuhPAIgWJ_-Z0zLCbxo8rkxDzEoe8,10916
+PySimultan2/object_mapper.py,sha256=T15f-XBDAh9Bnr74-JBPUj0-lyzZ4OwDXnC7Yu009qA,12333
 PySimultan2/simultan_object.py,sha256=Plr9nwgRmKzdkTO7l8ksWekEow9pT-MgjjAfLlChgDI,17208
-PySimultan2/taxonomy_maps.py,sha256=aU9zUJph7QcInIZq0W-Vqoy4DYr0CEs-VsXwPMK_cxU,7976
+PySimultan2/taxonomy_maps.py,sha256=IYpIat6ZJi5MyCbsjAxWvVOWDRp_VvSMWUY3CApKSik,8061
 PySimultan2/utils.py,sha256=J3T7KDfONFeLWBulXmGMCaaOu5sfkDSHmI92JWO8dW4,62553
 PySimultan2/geometry/__init__.py,sha256=nJolTD1i5J8qUkOQa-r3D20aq3Co3sN31Xc0n4wJpJo,248
 PySimultan2/geometry/geometry_base.py,sha256=jOTNMISGLRjUUjVfPZ64A2Fp4oinv42polIct9bgIY4,23417
@@ -75,7 +75,7 @@ PySimultan2/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 PySimultan2/resources/assimp.dll,sha256=HwfDwXqoPDTFRyoQpA3qmgZoUdFtziJkV5fNtktEZEU,6081536
 PySimultan2/resources/defaultsettings.xml,sha256=s6Tk1tubLz5UYqXZWpD42EDHzedemRY1nEneoIVcUfg,392
 PySimultan2/resources/setup.bat,sha256=fjvvYfVM6TalS-QTSiKAbAId5nTsk8kGGo06ba-wWaY,32
-pysimultan-0.4.7.dist-info/METADATA,sha256=9PcCjKXasMhL1RrV9bLtZr8TaynqhDK22xXVpvsjtZo,1657
-pysimultan-0.4.7.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
-pysimultan-0.4.7.dist-info/licenses/LICENSE.txt,sha256=pmSr98k6N005KMojnZxzLGRuRlDjDx3PUrK1lFj53HA,1126
-pysimultan-0.4.7.dist-info/RECORD,,
+pysimultan-0.4.9.dist-info/METADATA,sha256=RsCYTnTlEZ9VIAt9wpsKNJtr25vcK7VE6ZKs-pZPGEc,2482
+pysimultan-0.4.9.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
+pysimultan-0.4.9.dist-info/licenses/LICENSE.txt,sha256=pmSr98k6N005KMojnZxzLGRuRlDjDx3PUrK1lFj53HA,1126
+pysimultan-0.4.9.dist-info/RECORD,,