factory function instead of class

Author: Licini

src/compas/scene/scene.py

@@ -119,7 +119,7 @@ def add(self, item, parent=None, **kwargs):
             del kwargs["context"]  # otherwist the SceneObject receives "context" twice, which results in an error
 
         # Create a corresponding new scene object
-        sceneobject = SceneObjectFactory.create(item=item, context=self.context, scene=self, **kwargs)
+        sceneobject = SceneObjectFactory(item=item, context=self.context, scene=self, **kwargs)
 
         # Add the scene object and item to the data store
         self.objectstore[str(sceneobject.guid)] = sceneobject

src/compas/scene/sceneobject.py

@@ -21,47 +21,39 @@
 from .descriptors.protocol import DescriptorProtocol
 
 
-class SceneObjectFactory:
-    """Factory class for creating appropriate SceneObject instances based on input item type.
+def SceneObjectFactory(item=None, scene=None, **kwargs):
+    """Create appropriate SceneObject instance based on item type.
 
-    This factory encapsulates the logic for selecting the right SceneObject subclass
-    for a given data item, making the creation process more explicit and easier to understand.
+    Parameters
+    ----------
+    item : :class:`compas.data.Data`
+        The data item to create a scene object for.
+    **kwargs : dict
+        Additional keyword arguments to pass to the SceneObject constructor.
+
+    Returns
+    -------
+    :class:`compas.scene.SceneObject`
+        A SceneObject instance of the appropriate subclass for the given item.
+
+    Raises
+    ------
+    ValueError
+        If item is None.
+    SceneObjectNotRegisteredError
+        If no scene object is registered for the item type in the current context.
     """
+    if item is None:
+        raise ValueError("Cannot create a scene object for None. Please ensure you pass an instance of a supported class.")
 
-    @staticmethod
-    def create(item=None, scene=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.
-        **kwargs : dict
-            Additional keyword arguments to pass to the SceneObject constructor.
-
-        Returns
-        -------
-        :class:`compas.scene.SceneObject`
-            A SceneObject instance of the appropriate subclass for the given item.
-
-        Raises
-        ------
-        ValueError
-            If item is None.
-        SceneObjectNotRegisteredError
-            If no scene object is registered for the item type in the current context.
-        """
-        if item is None:
-            raise ValueError("Cannot create a scene object for None. Please ensure you pass an instance of a supported class.")
-
-        if isinstance(item, SceneObject):
-            item._scene = scene
-            return item
+    if isinstance(item, SceneObject):
+        item._scene = scene
+        return item
 
-        sceneobject_cls = get_sceneobject_cls(item, **kwargs)
+    sceneobject_cls = get_sceneobject_cls(item, **kwargs)
 
-        # Create and return an instance of the appropriate scene object class
-        return sceneobject_cls(item=item, scene=scene, **kwargs)
+    # Create and return an instance of the appropriate scene object class
+    return sceneobject_cls(item=item, scene=scene, **kwargs)
 
 
 class SceneObject(Data):

tests/compas/scene/test_scene.py

@@ -47,29 +47,29 @@ def test_get_sceneobject_cls_with_orderly_registration():
         register(FakeItem, FakeSceneObject, context="fake")
         register(FakeSubItem, FakeSubSceneObject, context="fake")
         item = FakeItem()
-        sceneobject = SceneObjectFactory.create(item, context="fake")
+        sceneobject = SceneObjectFactory(item=item, context="fake")
         assert isinstance(sceneobject, FakeSceneObject)
 
         item = FakeSubItem()
-        sceneobject = SceneObjectFactory.create(item, context="fake")
+        sceneobject = SceneObjectFactory(item=item, context="fake")
         assert isinstance(sceneobject, FakeSubSceneObject)
 
     def test_get_sceneobject_cls_with_out_of_order_registration():
         register(FakeSubItem, FakeSubSceneObject, context="fake")
         register(FakeItem, FakeSceneObject, context="fake")
         item = FakeItem()
-        sceneobject = SceneObjectFactory.create(item, context="fake")
+        sceneobject = SceneObjectFactory(item=item, context="fake")
         assert isinstance(sceneobject, FakeSceneObject)
 
         item = FakeSubItem()
-        sceneobject = SceneObjectFactory.create(item, context="fake")
+        sceneobject = SceneObjectFactory(item=item, context="fake")
         assert isinstance(sceneobject, FakeSubSceneObject)
 
         def test_sceneobject_auto_context_discovery(mocker):
             register_fake_context()
 
             item = FakeItem()
-            sceneobject = SceneObjectFactory.create(item)
+            sceneobject = SceneObjectFactory(item=item)
 
             assert isinstance(sceneobject, FakeSceneObject)
 
@@ -79,7 +79,7 @@ def test_sceneobject_auto_context_discovery_no_context(mocker):
 
             with pytest.raises(SceneObjectNotRegisteredError):
                 item = FakeSubItem()
-                _ = SceneObjectFactory.create(item)
+                _ = SceneObjectFactory(item=item)
 
     def test_sceneobject_transform():
         scene = Scene()