clean up kwargs

Author: Licini

src/compas/scene/context.py

@@ -119,7 +119,7 @@ def detect_current_context():
     return None
 
 
-def get_sceneobject_cls(item, context=None, sceneobject_type=None):
+def get_sceneobject_cls(item, context=None):
     """Get the scene object class for a given item in the current context. If no context is provided, the current context is detected.
     If the exact item type is not registered, a closest match in its inheritance hierarchy is used.
 
@@ -129,8 +129,6 @@ def get_sceneobject_cls(item, context=None, sceneobject_type=None):
         The item to get the scene object class for.
     context : Literal['Viewer', 'Rhino', 'Grasshopper', 'Blender'], optional
         The visualization context in which the pair should be registered.
-    sceneobject_type : :class:`~compas.scene.SceneObject`, optional
-        The scene object type to use.
 
     Raises
     ------
@@ -156,17 +154,15 @@ def get_sceneobject_cls(item, context=None, sceneobject_type=None):
         context = detect_current_context()
 
     itemtype = type(item)
-    cls = None
 
-    if sceneobject_type is not None:
-        cls = sceneobject_type
-    else:
-        context = ITEM_SCENEOBJECT[context]
+    context = ITEM_SCENEOBJECT[context]
+
+    cls = None
 
-        for inheritancetype in inspect.getmro(itemtype):
-            cls = context.get(inheritancetype, None)
-            if cls is not None:
-                break
+    for inheritancetype in inspect.getmro(itemtype):
+        cls = context.get(inheritancetype, None)
+        if cls is not None:
+            break
 
     if cls is None:
         raise SceneObjectNotRegisteredError("No scene object is registered for this data type: {} in this context: {}".format(itemtype, context))

src/compas/scene/sceneobject.py

@@ -21,13 +21,17 @@
 from .descriptors.protocol import DescriptorProtocol
 
 
-def SceneObjectFactory(item=None, scene=None, **kwargs):
+def SceneObjectFactory(item=None, scene=None, context=None, **kwargs):
     """Create appropriate SceneObject instance based on item type.
 
     Parameters
     ----------
     item : :class:`compas.data.Data`
         The data item to create a scene object for.
+    scene : :class:`compas.scene.Scene`, optional
+        The scene in which the scene object is created.
+    context : str, optional
+        The context in which the scene object is created.
     **kwargs : dict
         Additional keyword arguments to pass to the SceneObject constructor.
 
@@ -50,10 +54,10 @@ def SceneObjectFactory(item=None, scene=None, **kwargs):
         item._scene = scene
         return item
 
-    sceneobject_cls = get_sceneobject_cls(item, **kwargs)
+    sceneobject_cls = get_sceneobject_cls(item, context=context)
 
     # Create and return an instance of the appropriate scene object class
-    return sceneobject_cls(item=item, scene=scene, **kwargs)
+    return sceneobject_cls(item=item, scene=scene, context=context, **kwargs)
 
 
 class SceneObject(Data):

tests/compas/scene/test_scene.py

@@ -159,11 +159,6 @@ def test_get_sceneobject_cls_inheritance():
         cls = get_sceneobject_cls(item, context="fake")
         assert cls == FakeSceneObject
 
-    def test_get_sceneobject_cls_custom_type():
-        item = FakeItem()
-        cls = get_sceneobject_cls(item, context="fake", sceneobject_type=FakeSubSceneObject)
-        assert cls == FakeSubSceneObject
-
     def test_get_sceneobject_cls_no_registration():
         # Clear the registration
         context.ITEM_SCENEOBJECT.clear()