Fix Ruff UP035 (also deprecated annotation symbols)

src/bonsai/bonsai/__init__.py

@@ -40,7 +40,8 @@ import uuid
 import shutil
 from collections import deque
 from pathlib import Path
-from typing import Union, Any, Generator
+from typing import Union, Any
+from collections.abc import Generator
 
 
 last_commit_hash = "8888888"

src/bonsai/bonsai/bim/__init__.py

@@ -22,7 +22,8 @@ import bpy.utils.previews
 import importlib
 from bpy_extras.io_utils import ImportHelper, ExportHelper
 from . import handler, ui, prop, operator
-from typing import Callable, Union
+from typing import Union
+from collections.abc import Callable
 
 try:
     from bonsai.translations import translations_dict

src/bonsai/bonsai/bim/handler.py

@@ -33,7 +33,8 @@ from bonsai.bim.module.model.decorator import WallAxisDecorator, SlabDirectionDe
 from bonsai.bim.module.nest.decorator import NestDecorator
 from mathutils import Vector
 from math import cos
-from typing import Union, Callable
+from typing import Union
+from collections.abc import Callable
 
 
 cwd = os.path.dirname(os.path.realpath(__file__))

src/bonsai/bonsai/bim/helper.py

@@ -27,7 +27,8 @@ import ifcopenshell.util.element
 import ifcopenshell.util.unit
 from ifcopenshell.util.doc import get_attribute_doc, get_predefined_type_doc, get_property_doc
 import bonsai.tool as tool
-from typing import Optional, Callable, Any, Union, Iterable, TYPE_CHECKING
+from typing import Optional, Any, Union, TYPE_CHECKING
+from collections.abc import Callable, Iterable
 
 if TYPE_CHECKING:
     import bonsai.bim.prop

src/bonsai/bonsai/bim/ifc.py

@@ -34,7 +34,8 @@ import bonsai.tool as tool
 from ifcopenshell.file import UndoSystemError
 from pathlib import Path
 from bonsai.tool.brick import BrickStore
-from typing import Union, Optional, TypedDict, Callable, NotRequired, Literal
+from typing import Union, Optional, TypedDict, NotRequired, Literal
+from collections.abc import Callable
 
 
 IFC_CONNECTED_TYPE = Union[bpy.types.Material, bpy.types.Object]

src/bonsai/bonsai/bim/import_ifc.py

@@ -38,7 +38,8 @@ import ifcopenshell.util.shape
 import bonsai.tool as tool
 from bonsai.bim.ifc import IfcStore, IFC_CONNECTED_TYPE
 from bonsai.tool.loader import OBJECT_DATA_TYPE
-from typing import Union, Optional, Any, Literal, Iterable
+from typing import Union, Optional, Any, Literal
+from collections.abc import Iterable
 from ifcopenshell.util.shape import MatrixType
 
 

src/bonsai/bonsai/bim/module/alignment/operator.py

@@ -38,8 +38,6 @@ import ifcopenshell.util.selector
 from datetime import datetime
 from dateutil import parser, relativedelta
 from bpy_extras.io_utils import ImportHelper
-from typing import get_args, TYPE_CHECKING
-from typing_extensions import assert_never
 
 
 class ImportAlignmentCSV(bpy.types.Operator, tool.Ifc.Operator, ImportHelper):

src/bonsai/bonsai/bim/module/bcf/prop.py

@@ -31,9 +31,6 @@ from bpy.props import (
     FloatVectorProperty,
     CollectionProperty,
 )
-from functools import partial
-from typing import Literal
-from typing_extensions import assert_never
 from bcf.agnostic.extensions import get_extensions_attributes
 from typing import TYPE_CHECKING, Union
 

src/bonsai/bonsai/bim/module/clash/ui.py

@@ -22,8 +22,7 @@ import bonsai.tool as tool
 import bonsai.bim.helper
 from bpy.types import Panel
 from bonsai.bim.module.clash.data import ClashData
-from typing import TYPE_CHECKING
-from typing_extensions import assert_never
+from typing import TYPE_CHECKING, assert_never
 
 if TYPE_CHECKING:
     from bonsai.bim.module.clash.prop import BIMClashProperties, ClashSet, SmartClashGroup, Clash

src/bonsai/bonsai/bim/module/drawing/decoration.py

@@ -38,7 +38,8 @@ from bonsai.bim.module.drawing.shaders import add_verts_sequence, add_offsets
 from bonsai.bim.module.drawing.helper import format_distance
 from timeit import default_timer as timer
 from functools import cache
-from typing import Optional, Iterator, Union
+from typing import Optional, Union
+from collections.abc import Iterator
 
 UNSPECIAL_ELEMENT_COLOR = (0.2, 0.2, 0.2, 1)  # GREY
 

src/bonsai/bonsai/bim/module/drawing/prop.py

@@ -46,7 +46,8 @@ from bpy.props import (
     CollectionProperty,
     BoolVectorProperty,
 )
-from typing import TYPE_CHECKING, Literal, Any, Callable, get_args, Union
+from typing import TYPE_CHECKING, Literal, Any, get_args, Union
+from collections.abc import Callable
 
 
 diagram_scales_enum = []

src/bonsai/bonsai/bim/module/drawing/svgwriter.py

@@ -38,7 +38,8 @@ from bonsai.bim.module.drawing.data import DrawingsData
 from bonsai.bim.module.drawing.data import DecoratorData
 from math import pi, ceil, atan, degrees, acos
 from mathutils import geometry, Vector
-from typing import Optional, Self, Union, Sequence, Callable
+from typing import Optional, Self, Union
+from collections.abc import Callable, Sequence
 from pathlib import Path
 
 

src/bonsai/bonsai/bim/module/geometry/decorator.py

@@ -27,7 +27,7 @@ from bpy.types import SpaceView3D
 from mathutils import Vector, Matrix
 from gpu_extras.batch import batch_for_shader
 from bpy_extras.view3d_utils import location_3d_to_region_2d
-from typing import Sequence
+from collections.abc import Sequence
 
 
 class ItemDecorator:

src/bonsai/bonsai/bim/module/light/operator.py

@@ -28,7 +28,8 @@ from datetime import datetime
 import bpy
 import bonsai.tool as tool
 from pathlib import Path
-from typing import Union, Optional, Sequence
+from typing import Union, Optional
+from collections.abc import Sequence
 import json
 import math
 import time

src/bonsai/bonsai/bim/module/misc/operator.py

@@ -27,8 +27,7 @@ import bonsai.core.misc as core
 import bonsai.core.geometry as core_geometry
 import bonsai.core.root
 from mathutils import Vector, Matrix, Euler
-from typing import TYPE_CHECKING, Literal, get_args
-from typing_extensions import assert_never
+from typing import TYPE_CHECKING, Literal, get_args, assert_never
 
 
 class SetOverrideColour(bpy.types.Operator):

src/bonsai/bonsai/bim/module/model/opening.py

@@ -45,7 +45,8 @@ from bpy.types import SpaceView3D
 from bpy.props import FloatProperty
 from bpy_extras.object_utils import AddObjectHelper, object_data_add
 from gpu_extras.batch import batch_for_shader
-from typing import Union, Optional, Any, cast, Sequence
+from typing import Union, Optional, Any, cast
+from collections.abc import Sequence
 
 
 class FilledOpeningGenerator:

src/bonsai/bonsai/bim/module/project/prop.py

@@ -35,8 +35,8 @@ from bpy.props import (
     IntProperty,
     StringProperty,
 )
-from typing import TYPE_CHECKING, Literal, Union, get_args, Generator
-from typing_extensions import assert_never
+from typing import TYPE_CHECKING, Literal, Union, get_args, assert_never
+from collections.abc import Generator
 
 
 def get_export_schema(self: "BIMProjectProperties", context: bpy.types.Context) -> list[tuple[str, str, str]]:

src/bonsai/bonsai/bim/module/pset/ui.py

@@ -35,8 +35,7 @@ from bonsai.bim.module.pset.data import (
     WorkSchedulePsetsData,
 )
 from bonsai.bim.module.material.data import ObjectMaterialData
-from typing import Any, Optional, TYPE_CHECKING
-from typing_extensions import assert_never
+from typing import Any, Optional, TYPE_CHECKING, assert_never
 
 if TYPE_CHECKING:
     from bonsai.bim.module.pset.prop import IfcProperty, PsetProperties

src/bonsai/bonsai/bim/module/qto/calculator.py

@@ -29,8 +29,7 @@ from mathutils import Vector, Matrix
 from mathutils.bvhtree import BVHTree
 from shapely.geometry import Polygon
 from shapely.ops import unary_union
-from typing import Literal, Union, Optional
-from typing_extensions import assert_never
+from typing import Literal, Union, Optional, assert_never
 
 
 AxisType = Literal["x", "y", "z"]

src/bonsai/bonsai/bim/module/qto/helper.py

@@ -19,7 +19,7 @@
 import bpy
 import bmesh
 import bonsai.tool as tool
-from typing import Callable
+from collections.abc import Callable
 
 
 def calculate_height(obj: bpy.types.Object) -> float:

src/bonsai/bonsai/bim/module/search/operator.py

@@ -39,8 +39,7 @@ from bpy.props import (
     FloatVectorProperty,
     CollectionProperty,
 )
-from typing import TYPE_CHECKING, Literal, get_args
-from typing_extensions import assert_never
+from typing import TYPE_CHECKING, Literal, get_args, assert_never
 
 
 class AddFilterGroup(Operator):

src/bonsai/bonsai/bim/module/sequence/operator.py

@@ -33,8 +33,7 @@ import ifcopenshell.util.selector
 from datetime import datetime
 from dateutil import parser, relativedelta
 from bpy_extras.io_utils import ImportHelper, ExportHelper
-from typing import get_args, TYPE_CHECKING
-from typing_extensions import assert_never
+from typing import get_args, TYPE_CHECKING, assert_never
 
 
 class EnableStatusFilters(bpy.types.Operator):

src/bonsai/bonsai/bim/module/structural/decorator.py

@@ -24,7 +24,8 @@ import blf
 import bonsai.tool as tool
 from bpy.types import SpaceView3D
 from gpu_extras.batch import batch_for_shader
-from typing import Iterable, Union
+from typing import Union
+from collections.abc import Iterable
 from bonsai.bim.module.structural.load_decoration_data import ShaderInfo
 
 

src/bonsai/bonsai/bim/module/structural/load_decoration_data.py

@@ -28,7 +28,8 @@ import ifcopenshell.util.unit
 import ifcopenshell.util.unit as ifcunit
 import bonsai.tool as tool
 from bonsai.bim.module.structural.shader import DecorationShader
-from typing import Literal, TypedDict, Iterable
+from typing import Literal, TypedDict
+from collections.abc import Iterable
 
 
 class MemberInfo(TypedDict):

src/bonsai/bonsai/bim/module/void/data.py

@@ -19,7 +19,8 @@
 import bpy
 import ifcopenshell
 import bonsai.tool as tool
-from typing import Any, Generator, Union
+from typing import Any, Union
+from collections.abc import Generator
 
 
 def refresh():

src/bonsai/bonsai/bim/operator.py

@@ -42,7 +42,8 @@ from mathutils import Vector, Euler
 from math import radians
 from pathlib import Path
 from collections import namedtuple
-from typing import Iterable, Union, TYPE_CHECKING
+from typing import Union, TYPE_CHECKING
+from collections.abc import Iterable
 
 if TYPE_CHECKING:
     from bonsai.bim.prop import MultipleFileSelect

src/bonsai/bonsai/bim/prop.py

@@ -45,8 +45,7 @@ from bpy.props import (
     FloatVectorProperty,
     CollectionProperty,
 )
-from typing import Any, Union, Literal, get_args, TYPE_CHECKING
-from typing_extensions import assert_never
+from typing import Any, Union, Literal, get_args, TYPE_CHECKING, assert_never
 
 cwd = os.path.dirname(os.path.realpath(__file__))
 

src/bonsai/bonsai/core/geometry.py

@@ -17,7 +17,8 @@
 # along with Bonsai.  If not, see <http://www.gnu.org/licenses/>.
 
 from __future__ import annotations
-from typing import TYPE_CHECKING, Optional, Sequence, Union
+from typing import TYPE_CHECKING, Optional, Union
+from collections.abc import Sequence
 
 if TYPE_CHECKING:
     import bpy

src/bonsai/bonsai/core/model.py

@@ -17,7 +17,7 @@
 # along with Bonsai.  If not, see <http://www.gnu.org/licenses/>.
 
 from __future__ import annotations
-from typing import TYPE_CHECKING, Optional, Literal, Iterable
+from typing import TYPE_CHECKING, Optional, Literal
 
 if TYPE_CHECKING:
     import bpy

src/bonsai/bonsai/core/resource.py

@@ -19,7 +19,8 @@
 # ############################################################################ #
 
 from __future__ import annotations
-from typing import TYPE_CHECKING, Optional, Union, Iterable
+from typing import TYPE_CHECKING, Optional
+from collections.abc import Iterable
 
 if TYPE_CHECKING:
     import bpy

src/bonsai/bonsai/tool/blender.py

@@ -42,8 +42,16 @@ from mathutils import Vector
 from pathlib import Path
 from functools import lru_cache, cache
 from bonsai.bim.ifc import IFC_CONNECTED_TYPE
-from typing import Any, Optional, Union, Literal, Iterable, Callable, TypeVar, Generator, TYPE_CHECKING, Sequence, Sized
-from typing_extensions import assert_never
+from typing import (
+    Any,
+    Optional,
+    Union,
+    Literal,
+    TypeVar,
+    TYPE_CHECKING,
+    assert_never,
+)
+from collections.abc import Iterable, Callable, Generator, Sequence, Sized
 
 if TYPE_CHECKING:
     import bpy.stub_internal.rna_enums as rna_enums

src/bonsai/bonsai/tool/boundary.py

@@ -22,7 +22,8 @@ import mathutils
 import bonsai.core.tool
 import bonsai.tool as tool
 from mathutils import Matrix, Vector
-from typing import Any, Sequence, TYPE_CHECKING
+from typing import Any, TYPE_CHECKING
+from collections.abc import Sequence
 
 if TYPE_CHECKING:
     from bonsai.bim.module.boundary.prop import BIMBoundaryProperties, BIMObjectBoundaryProperties

src/bonsai/bonsai/tool/brick.py

@@ -30,7 +30,8 @@ import bonsai.core.tool
 import bonsai.tool as tool
 from pathlib import Path
 from contextlib import contextmanager
-from typing import Generator, Any, Union, TYPE_CHECKING
+from typing import Any, Union, TYPE_CHECKING
+from collections.abc import Generator
 
 try:
     import brickschema

src/bonsai/bonsai/tool/classification.py

@@ -22,8 +22,7 @@ import ifcopenshell.api
 import ifcopenshell.util.classification
 import bonsai.core.tool
 import bonsai.tool as tool
-from typing import Any, Optional, Union, Literal, Iterable, Callable
-from typing_extensions import assert_never
+from typing import Union, assert_never
 
 
 class Classification(bonsai.core.tool.Classification):

src/bonsai/bonsai/tool/cost.py

@@ -28,8 +28,8 @@ import ifcopenshell.util.unit
 import bonsai.bim.helper
 import json
 from pathlib import Path
-from typing import Optional, Any, Generator, Union, Literal, TYPE_CHECKING
-from typing_extensions import assert_never
+from typing import Optional, Any, Union, Literal, TYPE_CHECKING, assert_never
+from collections.abc import Generator
 
 if TYPE_CHECKING:
     from bonsai.bim.module.cost.prop import BIMCostProperties, CostItemQuantity

src/bonsai/bonsai/tool/debug.py

@@ -31,7 +31,8 @@ import bonsai.tool as tool
 from bonsai.bim.ifc import IfcStore
 from mathutils import Vector
 from collections import defaultdict
-from typing import Iterable, Literal, TYPE_CHECKING
+from typing import Literal, TYPE_CHECKING
+from collections.abc import Iterable
 
 if TYPE_CHECKING:
     from bonsai.bim.module.debug.prop import BIMDebugProperties

src/bonsai/bonsai/tool/drawing.py

@@ -51,7 +51,8 @@ from shapely.ops import unary_union
 from lxml import etree
 from mathutils import Vector, Matrix
 from fractions import Fraction
-from typing import Optional, Union, Iterable, Any, Literal, Sequence, TYPE_CHECKING, NamedTuple, get_args
+from typing import Optional, Union, Any, Literal, TYPE_CHECKING, NamedTuple
+from collections.abc import Iterable, Sequence
 from pathlib import Path
 
 if TYPE_CHECKING:

src/bonsai/bonsai/tool/feature.py

@@ -24,7 +24,8 @@ import bonsai.bim.helper
 import bonsai.core.geometry
 import ifcopenshell
 import ifcopenshell.util.representation
-from typing import Iterable, TYPE_CHECKING
+from typing import TYPE_CHECKING
+from collections.abc import Iterable
 
 if TYPE_CHECKING:
     from bonsai.bim.module.void.prop import BIMBooleanProperties

src/bonsai/bonsai/tool/geometry.py

@@ -59,17 +59,15 @@ from mathutils.bvhtree import BVHTree
 from bonsai.bim.ifc import IfcStore
 from typing import (
     Union,
-    Iterable,
     Optional,
     Literal,
-    Iterator,
     TYPE_CHECKING,
     get_args,
-    Generator,
     cast,
     TypeGuard,
     Any,
 )
+from collections.abc import Iterable, Iterator, Generator
 from typing_extensions import TypeIs
 
 if TYPE_CHECKING:

src/bonsai/bonsai/tool/material.py

@@ -27,8 +27,7 @@ import bonsai.bim.helper
 import ifcopenshell.util.unit
 import ifcopenshell.util.element
 from collections import defaultdict
-from typing import Union, Any, TYPE_CHECKING, Optional, Literal
-from typing_extensions import assert_never
+from typing import Union, Any, TYPE_CHECKING, Optional
 
 if TYPE_CHECKING:
     # Avoid circular imports.

src/bonsai/bonsai/tool/model.py

@@ -49,7 +49,8 @@ from bonsai.bim import import_ifc
 from bonsai.bim.module.model.data import AuthoringData, RailingData, RoofData, WindowData, DoorData
 from bonsai.bim.module.model.opening import FilledOpeningGenerator
 from ifcopenshell.util.shape_builder import ShapeBuilder, np_to_3d
-from typing import Optional, Union, TypeVar, Any, Iterable, Literal, TYPE_CHECKING, Sequence, TypedDict
+from typing import Optional, Union, TypeVar, Any, Literal, TYPE_CHECKING, TypedDict
+from collections.abc import Iterable, Sequence
 
 T = TypeVar("T")
 V_ = tool.Blender.V_

src/bonsai/bonsai/tool/owner.py

@@ -22,8 +22,7 @@ import bonsai.core.tool
 import bonsai.tool as tool
 import bonsai.bim.helper
 import ifcopenshell
-from typing import Union, Any, TYPE_CHECKING, Literal
-from typing_extensions import assert_never
+from typing import Union, Any, TYPE_CHECKING, Literal, assert_never
 
 if TYPE_CHECKING:
     from bonsai.bim.module.owner.prop import BIMOwnerProperties

src/bonsai/bonsai/tool/project.py

@@ -35,7 +35,7 @@ from collections import defaultdict
 from bonsai.bim.ifc import IfcStore
 from ifcopenshell.api.project.append_asset import APPENDABLE_ASSET_TYPES
 from pathlib import Path
-from typing import Optional, Union, TYPE_CHECKING, Generator
+from typing import Optional, Union, TYPE_CHECKING
 
 if TYPE_CHECKING:
     from bonsai.bim.module.project.prop import BIMProjectProperties

src/bonsai/bonsai/tool/pset.py

@@ -26,8 +26,7 @@ import bonsai.bim.helper
 import bonsai.core.tool
 import bonsai.tool as tool
 import bonsai.bim.schema
-from typing import Union, Literal, Any, TYPE_CHECKING
-from typing_extensions import assert_never
+from typing import Union, Literal, Any, TYPE_CHECKING, assert_never
 
 
 if TYPE_CHECKING:

src/bonsai/bonsai/tool/pset_template.py

@@ -25,8 +25,7 @@ import ifcopenshell.util.element
 import bonsai.core.tool
 import bonsai.tool as tool
 from pathlib import Path
-from typing import Union, Literal, Any, final
-from typing_extensions import assert_never, TYPE_CHECKING
+from typing import Literal, final, TYPE_CHECKING
 from bonsai.bim.ifc import IfcStore
 
 if TYPE_CHECKING:

src/bonsai/bonsai/tool/sequence.py

@@ -38,7 +38,8 @@ import bonsai.bim.helper
 from dateutil import parser
 from datetime import datetime
 from datetime import time as datetime_time
-from typing import Optional, Any, Union, Literal, TYPE_CHECKING, Iterable
+from typing import Optional, Any, Union, Literal, TYPE_CHECKING
+from collections.abc import Iterable
 from mathutils import Color
 
 if TYPE_CHECKING:

src/bonsai/bonsai/tool/spatial.py

@@ -42,7 +42,8 @@ import numpy as np
 from math import pi
 from mathutils import Vector, Matrix
 from shapely import Polygon
-from typing import Generator, Optional, Union, Literal, Any, Iterable, TYPE_CHECKING
+from typing import Optional, Union, Literal, Any, TYPE_CHECKING
+from collections.abc import Generator, Iterable
 from collections import defaultdict
 from natsort import natsorted
 

src/bonsai/bonsai/tool/style.py

@@ -28,7 +28,8 @@ import bonsai.core.tool
 import bonsai.tool as tool
 import bonsai.bim.helper
 from mathutils import Color
-from typing import Union, Any, Optional, Literal, TYPE_CHECKING, Sequence
+from typing import Union, Any, Optional, Literal, TYPE_CHECKING
+from collections.abc import Sequence
 
 if TYPE_CHECKING:
     from bonsai.bim.prop import Attribute

src/bonsai/bonsai/tool/unit.py

@@ -24,8 +24,7 @@ import ifcopenshell
 import bonsai.bim.helper
 import bonsai.core.tool
 import bonsai.tool as tool
-from typing import Union, Literal, Any, TYPE_CHECKING
-from typing_extensions import assert_never
+from typing import Union, Literal, Any, TYPE_CHECKING, assert_never
 
 if TYPE_CHECKING:
     from bonsai.bim.module.unit.prop import BIMUnitProperties

src/bonsai/bonsai/tool/web.py

@@ -26,7 +26,7 @@ import bonsai.core.tool
 import bonsai.tool as tool
 import ifcopenshell.api.sequence
 import ifcopenshell.api.cost
-from typing import Any, Dict, Optional
+from typing import Any, Optional
 import time
 import socket
 import sys

src/bonsai/test/core/bootstrap.py

@@ -20,8 +20,7 @@ import sys
 import json
 import pytest
 import bonsai.core.tool
-from typing import Any, Optional, TypedDict, Literal
-from typing_extensions import Self
+from typing import Any, Optional, TypedDict, Literal, Self
 
 
 @pytest.fixture