typing

src/ifcopenshell-python/ifcopenshell/api/style/add_surface_style.py

@@ -82,17 +82,13 @@ def add_surface_style(
 
     :param style: The IfcSurfaceStyle you want to add to presentation item
         to. See ifcopenshell.api.style.add_style.
-    :type style: ifcopenshell.entity_instance
     :param ifc_class: Choose from IfcSurfaceStyleShading,
         IfcSurfaceStyleRendering, IfcSurfaceStyleWithTextures,
         IfcSurfaceStyleLighting, IfcSurfaceStyleReflectance, or
         IfcExternallyDefinedSurfaceStyle.
-    :type ifc_class: str
     :param attributes: a dictionary of attribute names and values.
-    :type attributes: dict, optional
     :return: The newly created presentation item based on the provided
         ifc_class.
-    :rtype: ifcopenshell.entity_instance
 
     Example:
 

src/ifcopenshell-python/ifcopenshell/api/style/assign_material_style.py

@@ -19,6 +19,7 @@
 import ifcopenshell
 import ifcopenshell.api.style
 import ifcopenshell.util.element
+from typing import Any
 
 
 def assign_material_style(
@@ -115,6 +116,9 @@ def assign_material_style(
 
 
 class Usecase:
+    file: ifcopenshell.file
+    settings: dict[str, Any]
+
     def execute(self):
         self.style = self.settings["style"]
         if self.file.schema == "IFC2X3" or self.settings["should_use_presentation_style_assignment"]:

src/ifcopenshell-python/ifcopenshell/api/style/edit_presentation_style.py

@@ -28,11 +28,8 @@ def edit_presentation_style(
     IfcPresentationStyle, consult the IFC documentation.
 
     :param style: The IfcPresentationStyle entity you want to edit
-    :type style: ifcopenshell.entity_instance
     :param attributes: a dictionary of attribute names and values.
-    :type attributes: dict
     :return: None
-    :rtype: None
 
     Example:
 
@@ -44,7 +41,5 @@ def edit_presentation_style(
         # Change the name of the style to "Foo"
         ifcopenshell.api.style.edit_presentation_style(model, style=style, attributes={"Name": "Foo"})
     """
-    settings = {"style": style, "attributes": attributes or {}}
-
-    for name, value in settings["attributes"].items():
-        setattr(settings["style"], name, value)
+    for name, value in attributes.items():
+        setattr(style, name, value)

src/ifcopenshell-python/ifcopenshell/api/style/edit_surface_style.py

@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with IfcOpenShell.  If not, see <http://www.gnu.org/licenses/>.
 import ifcopenshell
-from typing import Any
+from typing import Any, Union
 
 
 def edit_surface_style(
@@ -36,11 +36,8 @@ def edit_surface_style(
     example below.
 
     :param style: The IfcPresentationStyle entity you want to edit
-    :type style: ifcopenshell.entity_instance
     :param attributes: a dictionary of attribute names and values.
-    :type attributes: dict
     :return: None
-    :rtype: None
 
     Example:
 
@@ -74,14 +71,18 @@ def edit_surface_style(
     """
     usecase = Usecase()
     usecase.file = file
-    usecase.settings = {"style": style, "attributes": attributes or {}}
-    return usecase.execute()
+    return usecase.execute(style, attributes)
 
 
 class Usecase:
-    def execute(self):
+    file: ifcopenshell.file
+    settings: dict[str, Any]
+
+    def execute(self, style: ifcopenshell.entity_instance, attributes: dict[str, Any]) -> None:
+        self.style = style
+
         attributes = {}
-        for attribute in self.settings["style"].wrapped_data.declaration().as_entity().all_attributes():
+        for attribute in style.wrapped_data.declaration().as_entity().all_attributes():
             attribute_type = attribute.type_of_attribute()
             if attribute_type.as_aggregation_type() is None:
                 attribute_type = attribute_type.declared_type().name()
@@ -90,7 +91,7 @@ class Usecase:
                 attribute_type = attribute_type.type_of_element()
             attributes[attribute.name()] = attribute_type
 
-        for key, value in self.settings["attributes"].items():
+        for key, value in attributes.items():
             attribute_class = attributes.get(key)
             if attribute_class == "IfcColourRgb":
                 self.edit_colour_rgb(key, value)
@@ -101,39 +102,37 @@ class Usecase:
             else:
                 setattr(self.settings["style"], key, value)
 
-    def edit_colour_rgb(self, name, value: dict):
-        if (attribute := getattr(self.settings["style"], name)) is None:
+    def edit_colour_rgb(self, name: str, value: dict[str, Any]):
+        if (attribute := getattr(self.style, name)) is None:
             attribute = self.file.createIfcColourRgb()
-            setattr(self.settings["style"], name, attribute)
+            setattr(self.style, name, attribute)
         attribute.Name = value.get("Name", None)
         attribute.Red = value["Red"]
         attribute.Green = value["Green"]
         attribute.Blue = value["Blue"]
 
-    def edit_colour_or_factor(self, name, value):
+    def edit_colour_or_factor(self, name: str, value: Union[dict[str, Any], ifcopenshell.entity_instance, None]):
         if isinstance(value, dict):
-            attribute = getattr(self.settings["style"], name)
+            attribute = getattr(self.style, name)
             if not attribute or not attribute.is_a("IfcColourRgb"):
                 colour = self.file.createIfcColourRgb(None, 0, 0, 0)
-                setattr(self.settings["style"], name, colour)
-                attribute = getattr(self.settings["style"], name)
+                setattr(self.style, name, colour)
+                attribute = getattr(self.style, name)
             attribute[1] = value["Red"]
             attribute[2] = value["Green"]
             attribute[3] = value["Blue"]
         else:  # assume it's float value for IfcNormalisedRatioMeasure or None
-            existing_value = getattr(self.settings["style"], name)
+            existing_value = getattr(self.style, name)
             if existing_value and existing_value.id():
                 self.file.remove(existing_value)
             if value is not None:
-                value = self.file.createIfcNormalisedRatioMeasure(value)
-            setattr(self.settings["style"], name, value)
+                value = self.file.create_entity("IfcNormalisedRatioMeasure", value)
+            setattr(self.style, name, value)
 
-    def edit_specular_highlight(self, value):
+    def edit_specular_highlight(self, value: Union[dict[str, Any], None]) -> None:
         if value is None:
-            self.settings["style"].SpecularHighlight = None
+            self.style.SpecularHighlight = None
         elif value.get("IfcSpecularExponent", None):
-            self.settings["style"].SpecularHighlight = self.file.createIfcSpecularExponent(value["IfcSpecularExponent"])
+            self.style.SpecularHighlight = self.file.createIfcSpecularExponent(value["IfcSpecularExponent"])
         elif value.get("IfcSpecularRoughness", None):
-            self.settings["style"].SpecularHighlight = self.file.createIfcSpecularRoughness(
-                value["IfcSpecularRoughness"]
-            )
+            self.style.SpecularHighlight = self.file.createIfcSpecularRoughness(value["IfcSpecularRoughness"])

src/ifcopenshell-python/ifcopenshell/api/style/remove_style.py

@@ -41,7 +41,6 @@ def remove_style(file: ifcopenshell.file, style: ifcopenshell.entity_instance) -
     """
     usecase = Usecase()
     usecase.file = file
-    usecase.settings = {"style": style}
     return usecase.execute(style)
 
 

src/ifcopenshell-python/ifcopenshell/api/style/remove_surface_style.py

@@ -24,9 +24,7 @@ def remove_surface_style(file: ifcopenshell.file, style: ifcopenshell.entity_ins
     """Removes a presentation item from a presentation style
 
     :param style: The IfcPresentationItem to remove.
-    :type style: ifcopenshell.entity_instance
     :return: None
-    :rtype: None
 
     Example:
 

src/ifcopenshell-python/ifcopenshell/api/style/unassign_representation_styles.py

@@ -16,6 +16,7 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with IfcOpenShell.  If not, see <http://www.gnu.org/licenses/>.
 import ifcopenshell
+from typing import Any
 
 
 def unassign_representation_styles(
@@ -63,6 +64,9 @@ def unassign_representation_styles(
 
 
 class Usecase:
+    file: ifcopenshell.file
+    settings: dict[str, Any]
+
     def execute(self):
         if not self.settings["styles"]:
             return []