fix: ruff I001 import sorting and float(usable_height) unit mismatch

Add [tool.ruff.lint.isort] known-third-party config so FreeCAD, FreeCADGui,
and Part are classified consistently on macOS and Linux. Revert import
reordering to alphabetical within a single block.

Remove float() wrappers from usable_height in make_scoop() which stripped
FreeCAD Quantity units, causing "Unit mismatch in plus operation" at runtime.
Use targeted type: ignore[arg-type] comments for the freecad-stubs false
positives instead.

Author: graelo

freecad/gridfinity_workbench/feature_construction.py

@@ -1,5 +1,7 @@
 """Module containing gridfinity feature constructions."""
 
+from __future__ import annotations
+
 import math
 from typing import Literal
 
@@ -187,8 +189,24 @@ def scoop_properties(obj: fc.DocumentObject, *, scoop_default: bool) -> None:
     ).Scoop = scoop_default
 
 
-def make_scoop(obj: fc.DocumentObject) -> Part.Shape:
-    """Create scoop."""
+def make_scoop(
+    obj: fc.DocumentObject,
+    *,
+    usable_height: None | fc.Units.Quantity = None,
+) -> Part.Shape:
+    """Create scoop.
+
+    Args:
+        obj: The object onto which to add the scoop.
+        usable_height: Override the obj's UsableHeight value (for EcoBins).
+
+    EcoBins are constructed in such a way that when the scoop is added, the
+    proper usable height (for correct geometry) has to be provided separately.
+
+    """
+    if usable_height is None:
+        usable_height = obj.UsableHeight
+
     scooprad1 = obj.ScoopRadius + unitmm
     scooprad2 = obj.ScoopRadius + unitmm
     scooprad3 = obj.ScoopRadius + unitmm
@@ -203,8 +221,8 @@ def make_scoop(obj: fc.DocumentObject) -> Part.Shape:
         scooprad1 = xdivscoop - unitmm
     if obj.ScoopRadius > xcomp_w and obj.xDividers > 0:
         scooprad2 = xcomp_w - 2 * unitmm
-    if obj.ScoopRadius > obj.UsableHeight > 0:
-        scooprad3 = obj.UsableHeight - obj.LabelShelfStackingOffset
+    if obj.ScoopRadius > usable_height > 0:
+        scooprad3 = usable_height - obj.LabelShelfStackingOffset
 
     scooprad = min(obj.ScoopRadius, scooprad1, scooprad2, scooprad3)
 
@@ -214,17 +232,17 @@ def make_scoop(obj: fc.DocumentObject) -> Part.Shape:
     v1 = fc.Vector(
         obj.xTotalWidth + obj.Clearance - obj.WallThickness,
         0,
-        -obj.UsableHeight + scooprad,
+        -usable_height + scooprad,
     )
     v2 = fc.Vector(
         obj.xTotalWidth + obj.Clearance - obj.WallThickness,
         0,
-        -obj.UsableHeight,
+        -usable_height,  # type: ignore[arg-type]
     )
     v3 = fc.Vector(
         obj.xTotalWidth + obj.Clearance - obj.WallThickness - scooprad,
         0,
-        -obj.UsableHeight,
+        -usable_height,  # type: ignore[arg-type]
     )
 
     l1 = Part.LineSegment(v1, v2)
@@ -237,7 +255,7 @@ def make_scoop(obj: fc.DocumentObject) -> Part.Shape:
         - scooprad
         + scooprad * math.sin(math.pi / 4),
         0,
-        -obj.UsableHeight + scooprad - scooprad * math.sin(math.pi / 4),
+        -usable_height + scooprad - scooprad * math.sin(math.pi / 4),
     )
 
     c1 = Part.Arc(v1, vc1, v3)
@@ -268,7 +286,7 @@ def make_scoop(obj: fc.DocumentObject) -> Part.Shape:
         scoopbox = Part.makeBox(
             stacking_lip_offset.Value,
             obj.yTotalWidth - obj.WallThickness * 2,
-            obj.UsableHeight,
+            usable_height,  # type: ignore[arg-type]
             fc.Vector(
                 obj.xTotalWidth + obj.Clearance - obj.WallThickness,
                 obj.Clearance + obj.WallThickness,
@@ -280,7 +298,7 @@ def make_scoop(obj: fc.DocumentObject) -> Part.Shape:
         edges = [
             edge
             for edge in funcfuse.Edges
-            if abs(edge.Vertexes[0].Z - edge.Vertexes[1].Z) == obj.UsableHeight
+            if abs(edge.Vertexes[0].Z - edge.Vertexes[1].Z) == usable_height
             and edge.Vertexes[0].X == edge.Vertexes[1].X
         ]
 

freecad/gridfinity_workbench/features.py

@@ -4,9 +4,8 @@
 
 from abc import abstractmethod
 
-import Part
-
 import FreeCAD as fc  # noqa: N813
+import Part
 
 from . import baseplate_feature_construction as baseplate_feat
 from . import const, grid_initial_layout, label_shelf, utils
@@ -315,11 +314,7 @@ def generate_gridfinity_shape(self, obj: fc.DocumentObject) -> Part.Shape:
 
         # Now add scoop, but only where eco compartments exist (reversed logic)
         if obj.Scoop:
-            # Store original UsableHeight and adjust for eco bin's deeper compartment
-            original_usable_height = obj.UsableHeight
-            obj.UsableHeight = obj.TotalHeight - obj.BaseWallThickness
-            scoop = feat.make_scoop(obj)
-            obj.UsableHeight = original_usable_height  # Restore original value
+            scoop = feat.make_scoop(obj, usable_height=obj.TotalHeight - obj.BaseWallThickness)
             # Only add scoop where compartments exist - use intersection to constrain
             scoop_constrained = scoop.common(eco_compartments)
             fuse_total = fuse_total.fuse(scoop_constrained)
@@ -679,11 +674,7 @@ def generate_gridfinity_shape(self, obj: fc.DocumentObject) -> Part.Shape:
 
         # Now add scoop, but only where eco compartments exist (reversed logic)
         if obj.Scoop:
-            # Store original UsableHeight and adjust for eco bin's deeper compartment
-            original_usable_height = obj.UsableHeight
-            obj.UsableHeight = obj.TotalHeight - obj.BaseWallThickness
-            scoop = feat.make_scoop(obj)
-            obj.UsableHeight = original_usable_height  # Restore original value
+            scoop = feat.make_scoop(obj, usable_height=obj.TotalHeight - obj.BaseWallThickness)
             # Only add scoop where compartments exist - use intersection to constrain
             scoop_constrained = scoop.common(compartments)
             fuse_total = fuse_total.fuse(scoop_constrained)

freecad/gridfinity_workbench/utils.py

@@ -9,7 +9,7 @@
 import math
 from typing import TYPE_CHECKING
 
-import FreeCAD as fc  # noqa:N813
+import FreeCAD as fc  # noqa: N813
 import FreeCADGui as fcg  # noqa: N813
 import Part
 

pyproject.toml

@@ -33,3 +33,6 @@ ignore = ["ANN003", "EM101", "EM102", "RET504", "TRY003", "S101", "SIM300"]
 # PT009  - pytest-unittest-assertion: we use unittest framework, not pytest
 "**/tests/*" = ["INP001", "D100", "D101", "D102", "PT027", "PT009"]
 "freecad/gridfinity_workbench/test_gridfinity.py" = ["D100", "D101", "D102", "PT027", "PT009"]
+
+[tool.ruff.lint.isort]
+known-third-party = ["FreeCAD", "FreeCADGui", "Part"]