Cleaning classes

src/specklepy/core/api/models/__init__.py

@@ -29,6 +29,8 @@
     Stream,
     Streams,
 )
+from specklepy.core.api.models.instances import InstanceDefinitionProxy, InstanceProxy
+from specklepy.core.api.models.proxies import ColorProxy, GroupProxy
 from specklepy.core.api.models.subscription_messages import (
     ProjectModelsUpdatedMessage,
     ProjectUpdatedMessage,
@@ -68,4 +70,8 @@
     "Streams",
     "Activity",
     "ActivityCollection",
+    "InstanceProxy",
+    "InstanceDefinitionProxy",
+    "ColorProxy",
+    "GroupProxy",
 ]

src/specklepy/core/api/models/instances.py

@@ -0,0 +1,28 @@
+from specklepy.objects.base import Base
+
+
+class InstanceProxy(
+    Base,
+    speckle_type="Speckle.Core.Models.Instances.InstanceProxy",
+):
+    """
+    A proxy class for an instance (e.g, a rhino block, or an autocad block reference).
+    """
+
+    definitionId: str
+    transform: list[float]
+    units: str
+    maxDepth: int
+
+
+class InstanceDefinitionProxy(
+    Base,
+    speckle_type="Speckle.Core.Models.Instances.InstanceDefinitionProxy",
+):
+    """
+    A proxy class for an instance definition.
+    """
+
+    objects: list[str]
+    maxDepth: int
+    name: str

src/specklepy/core/api/models/proxies.py

@@ -0,0 +1,27 @@
+from specklepy.objects.base import Base
+
+
+class ColorProxy(
+    Base,
+    speckle_type="Speckle.Core.Models.Proxies.ColorProxy",
+):
+    """
+    Represents a color that is found on objects and collections in a root collection.
+    """
+
+    objects: list[str]
+    value: int
+    name: str | None  # nullable but required
+
+
+class GroupProxy(
+    Base,
+    speckle_type="Speckle.Core.Models.Proxies.GroupProxy",
+):
+    """
+    Grouped objects with a meaningful way for host application so use this proxy if you want to group object references for any purpose.
+    i.e. in rhino -> creating group make objects selectable/moveable/editable together.
+    """
+
+    objects: list[str]
+    name: str

src/specklepy/objects/__init__.py

@@ -1,14 +1,6 @@
 """Builtin Speckle object kit."""
 
-from specklepy.objects import (
-    GIS,
-    encoding,
-    geometry,
-    other,
-    primitive,
-    structural,
-    units,
-)
+from specklepy.objects import encoding, geometry, other, primitive, structural, units
 from specklepy.objects.base import Base
 
 __all__ = [
@@ -19,5 +11,4 @@
     "units",
     "structural",
     "primitive",
-    "GIS",
 ]

src/specklepy/objects/other.py

@@ -304,8 +304,9 @@ class RevitParameter(Base, speckle_type="Objects.BuiltElements.Revit.Parameter")
 
 
 class Collection(
-    Base, speckle_type="Speckle.Core.Models.Collection", detachable={"elements"}
+    Base,
+    speckle_type="Speckle.Core.Models.Collections.Collection",
+    detachable={"elements"},
 ):
     name: Optional[str] = None
-    collectionType: Optional[str] = None
     elements: Optional[List[Base]] = None