PATCH: better element filter (#889)

* better element filter

* remove prints

* limit max depth to 4

Author: Bimdata-io

bimdata_api_client/api/collaboration_api.py

@@ -8815,7 +8815,7 @@ def create_document(
     ):
         """Create a document  # noqa: E501
 
-        Create a document. If the document is one of {'POINT_CLOUD', 'OBJ', 'DWG', 'IFC', 'DXF', 'GLTF'}, a model will be created and attached to this document  Required scopes: document:write  # noqa: E501
+        Create a document. If the document is one of {'POINT_CLOUD', 'DWG', 'OBJ', 'DXF', 'GLTF', 'IFC'}, a model will be created and attached to this document  Required scopes: document:write  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
 

bimdata_api_client/api/model_api.py

@@ -19727,7 +19727,7 @@ def get_element(
     ):
         """Retrieve an element of a model  # noqa: E501
 
-        Retrieve an element of a model      `property_filter` simple syntax:         {             \"name\": \"property_name\",             \"comparator\": \"contains\" | \"icontains\" | \"exact\" | \"gt\" | \"gte\" | \"lt\" | \"lte\" | \"startswith\" | \"istartswith\" | \"endswith\" | \"iendswith\",             \"value\": \"property_value\"         }     `property_filter` combinatory syntax:         {             \"operande\": \"AND\" | \"OR\",             \"conditions\": [                 {                     \"operande\": \"AND\" | \"OR\",                     \"conditions\": [...],                 }                 // OR                 {                     \"name\": \"property_name\",                     \"comparator\": \"contains\" | \"icontains\" | \"exact\" | \"gt\" | \"gte\" | \"lt\" | \"lte\" | \"startswith\" | \"istartswith\" | \"endswith\" | \"iendswith\",                     \"value\": \"property_value\"                 },                 ...             ]         }       Required scopes: ifc:read, model:read  # noqa: E501
+        Retrieve an element of a model      `property_filter` simple syntax:         {             \"name\": \"property_name\",             \"comparator\": \"contains\" | \"icontains\" | \"exact\" | \"gt\" | \"gte\" | \"lt\" | \"lte\" | \"startswith\" | \"istartswith\" | \"endswith\" | \"iendswith\",             \"value\": \"property_value\"         }     `property_filter` combinatory syntax:         {             \"operator\": \"AND\" | \"OR\",             \"conditions\": [                 {                     \"operator\": \"AND\" | \"OR\",                     \"conditions\": [...],                 }                 // OR                 {                     \"name\": \"property_name\",                     \"comparator\": \"contains\" | \"icontains\" | \"exact\" | \"gt\" | \"gte\" | \"lt\" | \"lte\" | \"startswith\" | \"istartswith\" | \"endswith\" | \"iendswith\",                     \"value\": \"property_value\"                 },                 ...             ]         }       Required scopes: ifc:read, model:read  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
 
@@ -20690,7 +20690,7 @@ def get_elements(
     ):
         """Retrieve all elements of a model  # noqa: E501
 
-        Retrieve all elements of a model. If not filtered, the json may be very large. To efficently retrieve all elements and their data, see `getRawElements` or `getSimpleElements`      `property_filter` simple syntax:         {             \"name\": \"property_name\",             \"comparator\": \"contains\" | \"icontains\" | \"exact\" | \"gt\" | \"gte\" | \"lt\" | \"lte\" | \"startswith\" | \"istartswith\" | \"endswith\" | \"iendswith\",             \"value\": \"property_value\"         }     `property_filter` combinatory syntax:         {             \"operande\": \"AND\" | \"OR\",             \"conditions\": [                 {                     \"operande\": \"AND\" | \"OR\",                     \"conditions\": [...],                 }                 // OR                 {                     \"name\": \"property_name\",                     \"comparator\": \"contains\" | \"icontains\" | \"exact\" | \"gt\" | \"gte\" | \"lt\" | \"lte\" | \"startswith\" | \"istartswith\" | \"endswith\" | \"iendswith\",                     \"value\": \"property_value\"                 },                 ...             ]         }       Required scopes: ifc:read, model:read  # noqa: E501
+        Retrieve all elements of a model. If not filtered, the json may be very large. To efficently retrieve all elements and their data, see `getRawElements` or `getSimpleElements`      `property_filter` simple syntax:         {             \"name\": \"property_name\",             \"comparator\": \"contains\" | \"icontains\" | \"exact\" | \"gt\" | \"gte\" | \"lt\" | \"lte\" | \"startswith\" | \"istartswith\" | \"endswith\" | \"iendswith\",             \"value\": \"property_value\"         }     `property_filter` combinatory syntax:         {             \"operator\": \"AND\" | \"OR\",             \"conditions\": [                 {                     \"operator\": \"AND\" | \"OR\",                     \"conditions\": [...],                 }                 // OR                 {                     \"name\": \"property_name\",                     \"comparator\": \"contains\" | \"icontains\" | \"exact\" | \"gt\" | \"gte\" | \"lt\" | \"lte\" | \"startswith\" | \"istartswith\" | \"endswith\" | \"iendswith\",                     \"value\": \"property_value\"                 },                 ...             ]         }       Required scopes: ifc:read, model:read  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
 
@@ -22560,7 +22560,7 @@ def get_properties_types(
             classification (str): [optional]
             classification__notation (str): [optional]
             property_filter (str): [optional]
-            type (str): [optional]
+            type (str): Filter by IfcType. [optional]
             _return_http_data_only (bool): response data without head status
                 code and headers. Default is True.
             _preload_content (bool): if False, the urllib3.HTTPResponse object
@@ -22810,7 +22810,7 @@ def get_raw_elements(
     ):
         """Retrieve all elements in a optimized format  # noqa: E501
 
-        Instead of a nested representation, this route respond with a flat structure and indices pointing to related object. The IFC file will not be updated. The created elements will be accessible over the API and when exporting an IFC file. Returns elements, property_sets, properties, definitions and units in a JSON optimized structure      `property_filter` simple syntax:         {             \"name\": \"property_name\",             \"comparator\": \"contains\" | \"icontains\" | \"exact\" | \"gt\" | \"gte\" | \"lt\" | \"lte\" | \"startswith\" | \"istartswith\" | \"endswith\" | \"iendswith\",             \"value\": \"property_value\"         }     `property_filter` combinatory syntax:         {             \"operande\": \"AND\" | \"OR\",             \"conditions\": [                 {                     \"operande\": \"AND\" | \"OR\",                     \"conditions\": [...],                 }                 // OR                 {                     \"name\": \"property_name\",                     \"comparator\": \"contains\" | \"icontains\" | \"exact\" | \"gt\" | \"gte\" | \"lt\" | \"lte\" | \"startswith\" | \"istartswith\" | \"endswith\" | \"iendswith\",                     \"value\": \"property_value\"                 },                 ...             ]         }       Required scopes: ifc:read, model:read  # noqa: E501
+        Instead of a nested representation, this route respond with a flat structure and indices pointing to related object. The IFC file will not be updated. The created elements will be accessible over the API and when exporting an IFC file. Returns elements, property_sets, properties, definitions and units in a JSON optimized structure      `property_filter` simple syntax:         {             \"name\": \"property_name\",             \"comparator\": \"contains\" | \"icontains\" | \"exact\" | \"gt\" | \"gte\" | \"lt\" | \"lte\" | \"startswith\" | \"istartswith\" | \"endswith\" | \"iendswith\",             \"value\": \"property_value\"         }     `property_filter` combinatory syntax:         {             \"operator\": \"AND\" | \"OR\",             \"conditions\": [                 {                     \"operator\": \"AND\" | \"OR\",                     \"conditions\": [...],                 }                 // OR                 {                     \"name\": \"property_name\",                     \"comparator\": \"contains\" | \"icontains\" | \"exact\" | \"gt\" | \"gte\" | \"lt\" | \"lte\" | \"startswith\" | \"istartswith\" | \"endswith\" | \"iendswith\",                     \"value\": \"property_value\"                 },                 ...             ]         }       Required scopes: ifc:read, model:read  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
 
@@ -22990,7 +22990,7 @@ def get_simple_elements(
     ):
         """Retrieve all elements of a model with a simple value representation  # noqa: E501
 
-        Retrieve all elements of a model with a simple value representation      `property_filter` simple syntax:         {             \"name\": \"property_name\",             \"comparator\": \"contains\" | \"icontains\" | \"exact\" | \"gt\" | \"gte\" | \"lt\" | \"lte\" | \"startswith\" | \"istartswith\" | \"endswith\" | \"iendswith\",             \"value\": \"property_value\"         }     `property_filter` combinatory syntax:         {             \"operande\": \"AND\" | \"OR\",             \"conditions\": [                 {                     \"operande\": \"AND\" | \"OR\",                     \"conditions\": [...],                 }                 // OR                 {                     \"name\": \"property_name\",                     \"comparator\": \"contains\" | \"icontains\" | \"exact\" | \"gt\" | \"gte\" | \"lt\" | \"lte\" | \"startswith\" | \"istartswith\" | \"endswith\" | \"iendswith\",                     \"value\": \"property_value\"                 },                 ...             ]         }       Required scopes: ifc:read, model:read  # noqa: E501
+        Retrieve all elements of a model with a simple value representation      `property_filter` simple syntax:         {             \"name\": \"property_name\",             \"comparator\": \"contains\" | \"icontains\" | \"exact\" | \"gt\" | \"gte\" | \"lt\" | \"lte\" | \"startswith\" | \"istartswith\" | \"endswith\" | \"iendswith\",             \"value\": \"property_value\"         }     `property_filter` combinatory syntax:         {             \"operator\": \"AND\" | \"OR\",             \"conditions\": [                 {                     \"operator\": \"AND\" | \"OR\",                     \"conditions\": [...],                 }                 // OR                 {                     \"name\": \"property_name\",                     \"comparator\": \"contains\" | \"icontains\" | \"exact\" | \"gt\" | \"gte\" | \"lt\" | \"lte\" | \"startswith\" | \"istartswith\" | \"endswith\" | \"iendswith\",                     \"value\": \"property_value\"                 },                 ...             ]         }       Required scopes: ifc:read, model:read  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
 

bimdata_api_client/model/write_folder.py

@@ -107,17 +107,17 @@ def openapi_types():
         """
         lazy_import()
         return {
-            'user_permission': (int,),  # noqa: E501
-            'groups_permissions': ([GroupFolderRead],),  # noqa: E501
-            'id': (int,),  # noqa: E501
+            'updated_at': (datetime,),  # noqa: E501
             'name': (str,),  # noqa: E501
-            'type': (str,),  # noqa: E501
-            'created_by': (bool, date, datetime, dict, float, int, list, str, none_type,),  # noqa: E501
             'nature': (str,),  # noqa: E501
-            'updated_at': (datetime,),  # noqa: E501
             'created_at': (datetime,),  # noqa: E501
-            'default_permission': (int,),  # noqa: E501
+            'type': (str,),  # noqa: E501
+            'user_permission': (int,),  # noqa: E501
+            'created_by': (bool, date, datetime, dict, float, int, list, str, none_type,),  # noqa: E501
+            'groups_permissions': ([GroupFolderRead],),  # noqa: E501
+            'id': (int,),  # noqa: E501
             'parent_id': (int, none_type,),  # noqa: E501
+            'default_permission': (int,),  # noqa: E501
             'children': ([WriteFolder], none_type,),  # noqa: E501
         }
 
@@ -127,48 +127,48 @@ def discriminator():
 
 
     attribute_map = {
-        'user_permission': 'user_permission',  # noqa: E501
-        'groups_permissions': 'groups_permissions',  # noqa: E501
-        'id': 'id',  # noqa: E501
+        'updated_at': 'updated_at',  # noqa: E501
         'name': 'name',  # noqa: E501
-        'type': 'type',  # noqa: E501
-        'created_by': 'created_by',  # noqa: E501
         'nature': 'nature',  # noqa: E501
-        'updated_at': 'updated_at',  # noqa: E501
         'created_at': 'created_at',  # noqa: E501
-        'default_permission': 'default_permission',  # noqa: E501
+        'type': 'type',  # noqa: E501
+        'user_permission': 'user_permission',  # noqa: E501
+        'created_by': 'created_by',  # noqa: E501
+        'groups_permissions': 'groups_permissions',  # noqa: E501
+        'id': 'id',  # noqa: E501
         'parent_id': 'parent_id',  # noqa: E501
+        'default_permission': 'default_permission',  # noqa: E501
         'children': 'children',  # noqa: E501
     }
 
     read_only_vars = {
+        'updated_at',  # noqa: E501
+        'nature',  # noqa: E501
+        'created_at',  # noqa: E501
+        'type',  # noqa: E501
         'user_permission',  # noqa: E501
+        'created_by',  # noqa: E501
         'groups_permissions',  # noqa: E501
         'id',  # noqa: E501
-        'type',  # noqa: E501
-        'created_by',  # noqa: E501
-        'nature',  # noqa: E501
-        'updated_at',  # noqa: E501
-        'created_at',  # noqa: E501
     }
 
     _composed_schemas = {}
 
     @classmethod
     @convert_js_args_to_python_args
-    def _from_openapi_data(cls, user_permission, groups_permissions, id, name, type, created_by, nature, updated_at, created_at, *args, **kwargs):  # noqa: E501
+    def _from_openapi_data(cls, updated_at, name, nature, created_at, type, user_permission, created_by, groups_permissions, id, *args, **kwargs):  # noqa: E501
         """WriteFolder - a model defined in OpenAPI
 
         Args:
-            user_permission (int): Aggregate of group user permissions and folder default permission
-            groups_permissions ([GroupFolderRead]): List of group permissions
-            id (int):
+            updated_at (datetime): Date of the last update
             name (str): Name of the folder
-            type (str): DEPRECATED: Use 'nature' instead. Value is \"Folder\". It is usefull to parse the tree and discriminate folders and files
-            created_by (bool, date, datetime, dict, float, int, list, str, none_type):
             nature (str): Value is \"Folder\". It is usefull to parse the tree and discriminate folders and files
-            updated_at (datetime): Date of the last update
             created_at (datetime): Creation date
+            type (str): DEPRECATED: Use 'nature' instead. Value is \"Folder\". It is usefull to parse the tree and discriminate folders and files
+            user_permission (int): Aggregate of group user permissions and folder default permission
+            created_by (bool, date, datetime, dict, float, int, list, str, none_type):
+            groups_permissions ([GroupFolderRead]): List of group permissions
+            id (int):
 
         Keyword Args:
             _check_type (bool): if True, values for parameters in openapi_types
@@ -201,8 +201,8 @@ def _from_openapi_data(cls, user_permission, groups_permissions, id, name, type,
                                 Animal class but this time we won't travel
                                 through its discriminator because we passed in
                                 _visited_composed_classes = (Animal,)
-            default_permission (int): Permission for a Folder  * `1` - denied * `50` - read_only * `100` - read_write. [optional]  # noqa: E501
             parent_id (int, none_type): [optional]  # noqa: E501
+            default_permission (int): Permission for a Folder  * `1` - denied * `50` - read_only * `100` - read_write. [optional]  # noqa: E501
             children ([WriteFolder], none_type): [optional]  # noqa: E501
         """
 
@@ -231,15 +231,15 @@ def _from_openapi_data(cls, user_permission, groups_permissions, id, name, type,
         self._configuration = _configuration
         self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
 
-        self.user_permission = user_permission
-        self.groups_permissions = groups_permissions
-        self.id = id
+        self.updated_at = updated_at
         self.name = name
-        self.type = type
-        self.created_by = created_by
         self.nature = nature
-        self.updated_at = updated_at
         self.created_at = created_at
+        self.type = type
+        self.user_permission = user_permission
+        self.created_by = created_by
+        self.groups_permissions = groups_permissions
+        self.id = id
         for var_name, var_value in kwargs.items():
             if var_name not in self.attribute_map and \
                         self._configuration is not None and \
@@ -295,8 +295,8 @@ def __init__(self, name, *args, **kwargs):  # noqa: E501
                                 Animal class but this time we won't travel
                                 through its discriminator because we passed in
                                 _visited_composed_classes = (Animal,)
-            default_permission (int): Permission for a Folder  * `1` - denied * `50` - read_only * `100` - read_write. [optional]  # noqa: E501
             parent_id (int, none_type): [optional]  # noqa: E501
+            default_permission (int): Permission for a Folder  * `1` - denied * `50` - read_only * `100` - read_write. [optional]  # noqa: E501
             children ([WriteFolder], none_type): [optional]  # noqa: E501
         """