fixed circular import

bpy_speckle/convert/__init__.py

@@ -1,29 +0,0 @@
-from typing import Union
-from bpy_speckle.convert.to_native import convert_to_native
-from specklepy.objects.base import Base
-
-def get_speckle_subobjects(attr: Union[dict, Base], scale: float, name: str) -> list:
-    subobjects = []
-    keys = attr.keys() if isinstance(attr, dict) else attr.get_dynamic_member_names()
-    for key in keys:
-        if isinstance(attr[key], dict):
-            subtype = attr[key].get("type", None)
-            if subtype:
-                name = f"{name}.{key}"
-                subobject = convert_to_native(attr[key], name)
-
-                subobjects.append(subobject)
-                props = attr[key].get("properties", None)
-                if props:
-                    subobjects.extend(get_speckle_subobjects(props, scale, name))
-        elif hasattr(attr[key], "type"):
-            subtype = attr[key].type
-            if subtype:
-                name = "{}.{}".format(name, key)
-                subobject = convert_to_native(attr[key], name)
-
-                subobjects.append(subobject)
-                props = attr[key].get("properties", None)
-                if props:
-                    subobjects.extend(get_speckle_subobjects(props, scale, name))
-    return subobjects

bpy_speckle/convert/to_native.py

@@ -1,8 +1,8 @@
 import math
-from typing import Any, Dict, Iterable, List, Optional, Tuple, Union, Collection, cast
+from typing import Any, Dict, Iterable, List, Optional, Union, Collection, cast
 from bpy_speckle.convert.constants import DISPLAY_VALUE_PROPERTY_ALIASES, ELEMENTS_PROPERTY_ALIASES, OBJECT_NAME_MAX_LENGTH, OBJECT_NAME_SEPERATOR, SPECKLE_ID_LENGTH
-from bpy_speckle.convert.to_speckle import ConversionSkippedException
 from bpy_speckle.functions import get_default_traversal_func, get_scale_length, _report
+from bpy_speckle.convert.util import ConversionSkippedException
 from mathutils import (
     Matrix as MMatrix,
     Vector as MVector,

bpy_speckle/convert/util.py

@@ -1,5 +1,5 @@
 import math
-from typing import Any, Dict, Optional, Tuple, Union, cast
+from typing import Any, Dict, Optional, Tuple, Union
 from bmesh.types import BMesh
 import bpy, struct, idprop
 
@@ -9,7 +9,6 @@
 from bpy_speckle.convert.constants import IGNORED_PROPERTY_KEYS
 from bpy_speckle.functions import _report
 from bpy.types import Material, Object, Collection as BCollection
-from mathutils import Matrix as MMatrix
 
 from bpy_speckle.specklepy_extras.traversal import TraversalContext
 
@@ -421,7 +420,7 @@ def link_object_to_collection_nested(obj: Object, col: BCollection):
     for child in obj.children: #type: ignore
         link_object_to_collection_nested(child, col)
 
-def add_to_heirarchy(converted: Union[Object, BCollection], traversalContext : TraversalContext, converted_objects: Dict[str, Union[Object, BCollection]], preserve_transform: bool) -> None:
+def add_to_heirarchy(converted: Union[Object, BCollection], traversalContext : 'TraversalContext', converted_objects: Dict[str, Union[Object, BCollection]], preserve_transform: bool) -> None:
     nextParent = traversalContext.parent
 
     # Traverse up the tree to find a direct parent object, and a containing collection

bpy_speckle/functions.py

@@ -1,13 +1,8 @@
-from typing import Callable, Dict, Optional, Set, Union
-import bpy
-
-from bpy.types import Object, Context, Collection as BCollection
+from typing import Callable
 from specklepy.objects.base import Base
-from specklepy.objects.other import Instance
 from bpy_speckle.convert.constants import ELEMENTS_PROPERTY_ALIASES
-from bpy_speckle.properties.scene import SpeckleSceneSettings
 
-from bpy_speckle.specklepy_extras.traversal import GraphTraversal, TraversalContext, TraversalRule
+from bpy_speckle.specklepy_extras.traversal import GraphTraversal, TraversalRule
 
 """
 Speckle functions
@@ -79,6 +74,3 @@ def get_default_traversal_func(can_convert_to_native: Callable[[Base], bool]) ->
     )
 
     return GraphTraversal([ignore_rule, convertable_rule, default_rule])
-
-def get_speckle(context: Context) -> 'SpeckleSceneSettings':
-    return context.scene.speckle #type: ignore

bpy_speckle/operators/commit.py

@@ -1,12 +1,10 @@
 """
 Commit operators
 """
-from typing import cast
 import bpy
 from bpy.props import BoolProperty
-from bpy_speckle.functions import _report, get_speckle
 from bpy_speckle.clients import speckle_clients
-from bpy_speckle.properties.scene import SpeckleSceneSettings
+from bpy_speckle.properties.scene import get_speckle
 
 
 class DeleteCommit(bpy.types.Operator):

bpy_speckle/operators/streams.py

@@ -2,7 +2,7 @@
 Stream operators
 """
 from math import radians
-from typing import Any, Callable, Dict, Iterable, List, Optional, Union, cast
+from typing import Callable, Dict, Optional, Union, cast
 import webbrowser
 import bpy
 from bpy.props import (
@@ -29,11 +29,10 @@
     get_default_traversal_func,
     _report,
     get_scale_length,
-    get_speckle,
 )
 from bpy_speckle.clients import speckle_clients
 from bpy_speckle.operators.users import add_user_stream
-from bpy_speckle.properties.scene import SpeckleSceneSettings, SpeckleUserObject
+from bpy_speckle.properties.scene import SpeckleSceneSettings, SpeckleUserObject, get_speckle
 from bpy_speckle.convert.util import ConversionSkippedException, add_to_heirarchy
 from specklepy.api.models import Commit
 from specklepy.api import operations, host_applications
@@ -45,8 +44,6 @@
 from specklepy.logging.exceptions import SpeckleException
 from specklepy.logging import metrics
 
-from bpy_speckle.specklepy_extras.traversal import TraversalContext
-
 ObjectCallback = Optional[Callable[[bpy.types.Context, Object, Base], Object]]
 ReceiveCompleteCallback = Optional[Callable[[bpy.types.Context, Dict[str, Union[Object, Collection]]], None]]
 

bpy_speckle/operators/users.py

@@ -4,9 +4,9 @@
 from typing import cast
 import bpy
 from bpy.types import Context
-from bpy_speckle.functions import _report, get_speckle
+from bpy_speckle.functions import _report
 from bpy_speckle.clients import speckle_clients
-from bpy_speckle.properties.scene import SpeckleCommitObject, SpeckleSceneSettings, SpeckleUserObject
+from bpy_speckle.properties.scene import SpeckleCommitObject, SpeckleSceneSettings, SpeckleUserObject, get_speckle
 from specklepy.api.client import SpeckleClient
 from specklepy.api.models import Stream
 from specklepy.api.credentials import get_local_accounts

bpy_speckle/properties/scene.py

@@ -13,7 +13,6 @@
     PointerProperty,
 )
 
-
 class SpeckleSceneObject(bpy.types.PropertyGroup):
     name: bpy.props.StringProperty(default="")
 
@@ -191,4 +190,7 @@ def validate_commit_selection(self) ->Tuple[SpeckleUserObject, SpeckleStreamObje
         return (user, stream, branch, commit)
 
 class SelectionException(Exception):
-    pass
+    pass
+
+def get_speckle(context: bpy.types.Context) -> SpeckleSceneSettings:
+    return context.scene.speckle #type: ignore

pyproject.toml

@@ -7,7 +7,7 @@ license = "Apache-2.0"
 
 [tool.poetry.dependencies]
 python = ">=3.8, <4.0.0"
-specklepy = "^2.15.0"
+specklepy = "^2.15.1"
 attrs = "^23.1.0"
 
 # [tool.poetry.group.local_specklepy.dependencies]