add multipatch geometry and units

Updated docker compose

docker-compose.yml

@@ -52,28 +52,26 @@ services:
   ####
   # Speckle Server
   #######
+
   speckle-frontend:
-    image: speckle/speckle-frontend:latest
+    image: speckle/speckle-frontend-2:latest
     restart: always
     ports:
       - "0.0.0.0:8080:8080"
-    environment:
-      FILE_SIZE_LIMIT_MB: 100
 
   speckle-server:
     image: speckle/speckle-server:latest
     restart: always
     healthcheck:
       test:
-        [
-          "CMD",
-          "node",
-          "-e",
-          "require('node:http').request({headers: {'Content-Type': 'application/json'}, port:3000, hostname:'127.0.0.1', path:'/graphql?query={serverInfo{version}}', method: 'GET' }, (res) => { body = ''; res.on('data', (chunk) => {body += chunk;}); res.on('end', () => {process.exit(res.statusCode != 200 || body.toLowerCase().includes('error'));}); }).end();",
-        ]
+        - CMD
+        - /nodejs/bin/node
+        - -e
+        - "try { require('node:http').request({headers: {'Content-Type': 'application/json'}, port:3000, hostname:'127.0.0.1', path:'/readiness', method: 'GET', timeout: 2000 }, (res) => { body = ''; res.on('data', (chunk) => {body += chunk;}); res.on('end', () => {process.exit(res.statusCode != 200 || body.toLowerCase().includes('error'));}); }).end(); } catch { process.exit(1); }"
       interval: 10s
-      timeout: 3s
-      retries: 30
+      timeout: 10s
+      retries: 3
+      start_period: 90s
     ports:
       - "0.0.0.0:3000:3000"
     depends_on:
@@ -98,6 +96,7 @@ services:
       S3_CREATE_BUCKET: "true"
 
       FILE_SIZE_LIMIT_MB: 100
+      MAX_PROJECT_MODELS_PER_PAGE: 500
 
       # TODO: Change this to a unique secret for this server
       SESSION_SECRET: "TODO:ReplaceWithLongString"
@@ -111,47 +110,6 @@ services:
       POSTGRES_DB: "speckle"
       ENABLE_MP: "false"
 
-  preview-service:
-    image: speckle/speckle-preview-service:latest
-    restart: always
-    depends_on:
-      speckle-server:
-        condition: service_healthy
-    mem_limit: "1000m"
-    memswap_limit: "1000m"
-    environment:
-      DEBUG: "preview-service:*"
-      PG_CONNECTION_STRING: "postgres://speckle:speckle@postgres/speckle"
-
-  webhook-service:
-    image: speckle/speckle-webhook-service:latest
-    restart: always
-    depends_on:
-      speckle-server:
-        condition: service_healthy
-    environment:
-      DEBUG: "webhook-service:*"
-      PG_CONNECTION_STRING: "postgres://speckle:speckle@postgres/speckle"
-      WAIT_HOSTS: postgres:5432
-
-  fileimport-service:
-    image: speckle/speckle-fileimport-service:latest
-    restart: always
-    depends_on:
-      speckle-server:
-        condition: service_healthy
-    environment:
-      DEBUG: "fileimport-service:*"
-      PG_CONNECTION_STRING: "postgres://speckle:speckle@postgres/speckle"
-      WAIT_HOSTS: postgres:5432
-
-      S3_ENDPOINT: "http://minio:9000"
-      S3_ACCESS_KEY: "minioadmin"
-      S3_SECRET_KEY: "minioadmin"
-      S3_BUCKET: "speckle-server"
-
-      SPECKLE_SERVER_URL: "http://speckle-server:3000"
-
 networks:
   default:
     name: speckle-server

src/speckle_automate/__init__.py

@@ -1,5 +1,5 @@
 """This module contains an SDK for working with Speckle Automate."""
-from speckle_automate import fixtures
+
 from speckle_automate.automation_context import AutomationContext
 from speckle_automate.runner import execute_automate_function, run_function
 from speckle_automate.schema import (
@@ -21,5 +21,4 @@ __all__ = [
     "ObjectResultLevel",
     "run_function",
     "execute_automate_function",
-    "fixtures",
 ]

src/speckle_automate/automation_context.py

@@ -264,7 +264,7 @@ class AutomationContext:
         files = {path_obj.name: open(str(path_obj), "rb")}
 
         url = (
-            f"{self.automation_run_data.speckle_server_url}/api/stream/"
+            f"{self.automation_run_data.speckle_server_url}api/stream/"
             f"{self.automation_run_data.project_id}/blob"
         )
         data = (
@@ -290,6 +290,10 @@ class AutomationContext:
         """Mark the current run a failure."""
         self._mark_run(AutomationStatus.FAILED, status_message)
 
+    def mark_run_exception(self, status_message: str) -> None:
+        """Mark the current run a failure."""
+        self._mark_run(AutomationStatus.EXCEPTION, status_message)
+
     def mark_run_success(self, status_message: Optional[str]) -> None:
         """Mark the current run a success with an optional message."""
         self._mark_run(AutomationStatus.SUCCEEDED, status_message)

src/speckle_automate/runner.py

@@ -132,7 +132,10 @@ def execute_automate_function(
 
         # if we've gotten this far, the execution should technically be completed as expected
         # thus exiting with 0 is the schemantically correct thing to do
-        exit(0)
+        exit_code = (
+            1 if automation_context.run_status == AutomationStatus.EXCEPTION else 0
+        )
+        exit(exit_code)
 
     else:
         raise NotImplementedError(f"Command: '{command}' is not supported.")
@@ -175,6 +178,7 @@ def run_function(
         if automation_context.run_status not in [
             AutomationStatus.FAILED,
             AutomationStatus.SUCCEEDED,
+            AutomationStatus.EXCEPTION,
         ]:
             automation_context.mark_run_success(
                 "WARNING: Automate assumed a success status,"
@@ -183,7 +187,7 @@ def run_function(
     except Exception:
         trace = traceback.format_exc()
         print(trace)
-        automation_context.mark_run_failed(
+        automation_context.mark_run_exception(
             "Function error. Check the automation run logs for details."
         )
     finally:

src/speckle_automate/schema.py

@@ -63,6 +63,7 @@ class AutomationStatus(str, Enum):
     RUNNING = "RUNNING"
     FAILED = "FAILED"
     SUCCEEDED = "SUCCEEDED"
+    EXCEPTION = "EXCEPTION"
 
 
 class ObjectResultLevel(str, Enum):

src/specklepy/api/client.py

@@ -21,7 +21,7 @@ class SpeckleClient(CoreSpeckleClient):
     The `SpeckleClient` is your entry point for interacting with
     your Speckle Server's GraphQL API.
     You'll need to have access to a server to use it,
-    or you can use our public server `speckle.xyz`.
+    or you can use our public server `app.speckle.systems`.
 
     To authenticate the client, you'll need to have downloaded
     the [Speckle Manager](https://speckle.guide/#speckle-manager)
@@ -32,7 +32,7 @@ class SpeckleClient(CoreSpeckleClient):
     from specklepy.api.credentials import get_default_account
 
     # initialise the client
-    client = SpeckleClient(host="speckle.xyz") # or whatever your host is
+    client = SpeckleClient(host="app.speckle.systems") # or whatever your host is
     # client = SpeckleClient(host="localhost:3000", use_ssl=False) or use local server
 
     # authenticate the client with an account (account has been added in Speckle Manager)
@@ -47,7 +47,7 @@ class SpeckleClient(CoreSpeckleClient):
     ```
     """
 
-    DEFAULT_HOST = "speckle.xyz"
+    DEFAULT_HOST = "app.speckle.systems"
     USE_SSL = True
 
     def __init__(

src/specklepy/api/wrapper.py

@@ -22,7 +22,7 @@ class StreamWrapper(CoreStreamWrapper):
     from specklepy.api.wrapper import StreamWrapper
 
     # provide any stream, branch, commit, object, or globals url
-    wrapper = StreamWrapper("https://speckle.xyz/streams/3073b96e86/commits/604bea8cc6")
+    wrapper = StreamWrapper("https://app.speckle.systems/streams/3073b96e86/commits/604bea8cc6")
 
     # get an authenticated SpeckleClient if you have a local account for the server
     client = wrapper.get_client()

src/specklepy/core/api/client.py

@@ -30,7 +30,7 @@ class SpeckleClient:
     The `SpeckleClient` is your entry point for interacting with
     your Speckle Server's GraphQL API.
     You'll need to have access to a server to use it,
-    or you can use our public server `speckle.xyz`.
+    or you can use our public server `app.speckle.systems`.
 
     To authenticate the client, you'll need to have downloaded
     the [Speckle Manager](https://speckle.guide/#speckle-manager)
@@ -41,7 +41,7 @@ class SpeckleClient:
     from specklepy.api.credentials import get_default_account
 
     # initialise the client
-    client = SpeckleClient(host="speckle.xyz") # or whatever your host is
+    client = SpeckleClient(host="app.speckle.systems") # or whatever your host is
     # client = SpeckleClient(host="localhost:3000", use_ssl=False) or use local server
 
     # authenticate the client with an account (account has been added in Speckle Manager)
@@ -56,7 +56,7 @@ class SpeckleClient:
     ```
     """
 
-    DEFAULT_HOST = "speckle.xyz"
+    DEFAULT_HOST = "app.speckle.systems"
     USE_SSL = True
 
     def __init__(

src/specklepy/core/api/wrapper.py

@@ -30,7 +30,7 @@ class StreamWrapper:
     from specklepy.api.wrapper import StreamWrapper
 
     # provide any stream, branch, commit, object, or globals url
-    wrapper = StreamWrapper("https://speckle.xyz/streams/3073b96e86/commits/604bea8cc6")
+    wrapper = StreamWrapper("https://app.speckle.systems/streams/3073b96e86/commits/604bea8cc6")
 
     # get an authenticated SpeckleClient if you have a local account for the server
     client = wrapper.get_client()

src/specklepy/objects/GIS/__init__.py

@@ -1,12 +1,22 @@
 """Builtin Speckle object kit."""
 
 from specklepy.objects.GIS.CRS import CRS
+from specklepy.objects.GIS.features import (
+    GisMultipatchFeature,
+    GisNonGeometricFeature,
+    GisPointFeature,
+    GisPolygonFeature,
+    GisPolylineFeature,
+)
 from specklepy.objects.GIS.geometry import (
     GisLineElement,
     GisPointElement,
     GisPolygonElement,
     GisPolygonGeometry,
     GisRasterElement,
+    PolygonGeometry,
+    PolygonGeometry3d,
+    GisMultipatchGeometry,
 )
 from specklepy.objects.GIS.layers import RasterLayer, VectorLayer
 
@@ -14,9 +24,17 @@ __all__ = [
     "VectorLayer",
     "RasterLayer",
     "GisPolygonGeometry",
+    "PolygonGeometry",
+    "PolygonGeometry3d",
+    "GisMultipatchGeometry",
     "GisPolygonElement",
     "GisLineElement",
     "GisPointElement",
     "GisRasterElement",
     "CRS",
+    "GisPointFeature",
+    "GisPolylineFeature",
+    "GisPolygonFeature",
+    "GisMultipatchFeature",
+    "GisNonGeometricFeature",
 ]

src/specklepy/objects/GIS/features.py

@@ -0,0 +1,107 @@
+from typing import List, Optional
+
+from specklepy.objects.base import Base
+from specklepy.objects.geometry import Mesh, Point, Polyline
+from specklepy.objects.GIS.geometry import PolygonGeometry
+
+
+class GisNonGeometricFeature(Base, speckle_type="Objects.GIS.GisNonGeometricFeature"):
+    """GIS Table feature"""
+
+    attributes: Base
+
+    def __init__(
+        self,
+        attributes: Optional[Base] = None,
+    ) -> None:
+        self.attributes = attributes or Base()
+
+
+class GisPointFeature(
+    Base,
+    detachable={"displayValue"},
+    speckle_type="Objects.GIS.GisPointFeature",
+):
+    """Gis Point Feature"""
+
+    attributes: Base
+    displayValue: List[Point]
+
+    @property
+    def geometry(self) -> List[Point]:
+        return self.displayValue
+
+    def __init__(
+        self,
+        attributes: Optional[Base] = None,
+        displayValue: Optional[List[Point]] = None,
+    ) -> None:
+        self.attributes = attributes or Base()
+        displayValue = displayValue or []
+
+
+class GisPolylineFeature(
+    Base,
+    detachable={"displayValue"},
+    speckle_type="Objects.GIS.GisPolylineFeature",
+):
+    """Gis Polyline Feature"""
+
+    attributes: Base
+    displayValue: List[Polyline]
+
+    @property
+    def geometry(self) -> List[Polyline]:
+        return self.displayValue
+
+    def __init__(
+        self,
+        attributes: Optional[Base] = None,
+        displayValue: Optional[List[Point]] = None,
+    ) -> None:
+        self.attributes = attributes or Base()
+        displayValue = displayValue or []
+
+
+class GisPolygonFeature(
+    Base,
+    detachable={"displayValue", "geometry"},
+    speckle_type="Objects.GIS.GisPolygonFeature",
+):
+    """Gis Polygon Feature"""
+
+    attributes: Base
+    displayValue: List[Mesh]
+    geometry: List[PolygonGeometry]
+
+    def __init__(
+        self,
+        geometry: List[PolygonGeometry],
+        attributes: Optional[Base] = None,
+        displayValue: Optional[List[Point]] = None,
+    ) -> None:
+        self.geometry = geometry
+        self.attributes = attributes or Base()
+        displayValue = displayValue or []
+
+
+class GisMultipatchFeature(
+    Base,
+    detachable={"displayValue", "geometry"},
+    speckle_type="Objects.GIS.GisMultipatchFeature",
+):
+    """Gis Multipatch Feature"""
+
+    attributes: Base
+    displayValue: List[Mesh]
+    geometry: List[Base]  # GisMultipatchGeometry or PolygonGeometry3d
+
+    def __init__(
+        self,
+        geometry: List[Base],
+        attributes: Optional[Base] = None,
+        displayValue: Optional[List[Point]] = None,
+    ) -> None:
+        self.geometry = geometry
+        self.attributes = attributes or Base()
+        displayValue = displayValue or []

src/specklepy/objects/GIS/geometry.py

@@ -1,5 +1,7 @@
 from typing import List, Optional, Union
 
+from deprecated import deprecated
+
 from specklepy.objects.base import Base
 from specklepy.objects.geometry import (
     Arc,
@@ -12,23 +14,69 @@ from specklepy.objects.geometry import (
 )
 
 
-class GisPolygonGeometry(
-    Base, speckle_type="Objects.GIS.PolygonGeometry", detachable={"displayValue"}
-):
+class PolygonGeometry(Base, speckle_type="Objects.GIS.PolygonGeometry"):
     """GIS Polygon Geometry"""
 
-    boundary: Optional[Union[Polyline, Arc, Line, Circle, Polycurve]] = None
-    voids: Optional[List[Union[Polyline, Arc, Line, Circle, Polycurve]]] = None
-    displayValue: Optional[List[Mesh]] = None
+    boundary: Polyline
+    voids: List[Polyline]
+
+    def __init__(
+        self,
+        units: str,
+        boundary: Polyline,
+        voids: Optional[List[Polyline]] = None,
+    ) -> None:
+        super().__init__(units=units)
+        self.boundary = boundary
+        self.voids = voids or []
 
 
+GisPolygonGeometry = PolygonGeometry
+
+
+class PolygonGeometry3d(
+    PolygonGeometry,
+    speckle_type="Objects.GIS.PolygonGeometry3d",
+):
+    """GIS Polygon3d Geometry"""
+
+    def __init__(
+        self,
+        units: str,
+        boundary: Polyline,
+        voids: Optional[List[Polyline]] = None,
+    ) -> None:
+        super().__init__(units=units, boundary=boundary, voids=voids)
+
+
+class GisMultipatchGeometry(
+    Base,
+    speckle_type="Objects.GIS.GisMultipatchGeometry",
+):
+    """GIS Polygon3d Geometry"""
+
+    def __init__(
+        self,
+        units: str,
+        faces: List[int],
+        vertices: List[float],
+        colors: Optional[List[int]],
+    ) -> None:
+        super().__init__(units=units)
+        self.faces = faces
+        self.vertices = vertices
+        self.colors = colors or []
+
+
+@deprecated(version="2.20", reason="Replaced with GisPolygonFeature")
 class GisPolygonElement(Base, speckle_type="Objects.GIS.PolygonElement"):
     """GIS Polygon element"""
 
-    geometry: Optional[List[GisPolygonGeometry]] = None
+    geometry: Optional[List[PolygonGeometry]] = None
     attributes: Optional[Base] = None
 
 
+@deprecated(version="2.20", reason="Replaced with GisPolyineFeature")
 class GisLineElement(Base, speckle_type="Objects.GIS.LineElement"):
     """GIS Polyline element"""
 
@@ -36,6 +84,7 @@ class GisLineElement(Base, speckle_type="Objects.GIS.LineElement"):
     attributes: Optional[Base] = None
 
 
+@deprecated(version="2.20", reason="Replaced with GisPointFeature")
 class GisPointElement(Base, speckle_type="Objects.GIS.PointElement"):
     """GIS Point element"""
 
@@ -68,6 +117,7 @@ class GisTopography(
     """GIS Raster element with 3d Topography representation"""
 
 
+@deprecated(version="2.20", reason="Replaced with GisNonGeometricFeature")
 class GisNonGeometryElement(Base, speckle_type="Objects.GIS.NonGeometryElement"):
     """GIS Table feature"""
 

src/specklepy/objects/other.py

@@ -295,17 +295,33 @@ class RevitParameter(Base, speckle_type="Objects.BuiltElements.Revit.Parameter")
     value: Any = None
     applicationUnitType: Optional[str] = None  # eg UnitType UT_Length
     applicationUnit: Optional[str] = None  # DisplayUnitType eg DUT_MILLIMITERS
-    applicationInternalName: Optional[
-        str
-    ] = None  # BuiltInParameterName or GUID for shared parameter
+    applicationInternalName: Optional[str] = (
+        None  # BuiltInParameterName or GUID for shared parameter
+    )
     isShared: bool = False
     isReadOnly: bool = False
     isTypeParameter: bool = False
 
 
+@deprecated(
+    version="2.20", reason="Collections namespace changed, collectionType deprecated"
+)
 class Collection(
     Base, speckle_type="Speckle.Core.Models.Collection", detachable={"elements"}
 ):
     name: Optional[str] = None
     collectionType: Optional[str] = None
     elements: Optional[List[Base]] = None
+
+
+class Collection(  # noqa: F811
+    Base,
+    speckle_type="Speckle.Core.Models.Collections.Collection",
+    detachable={"elements"},
+):
+    name: str
+    elements: List[Base]
+
+    def init(self, name: str, elements: Optional[List[Base]] = None):
+        self.name = name
+        self.elements = elements or []

tests/integration/conftest.py

@@ -23,7 +23,7 @@ def host():
 def seed_user(host):
     seed = uuid.uuid4().hex
     user_dict = {
-        "email": f"{seed[0:7]}@spockle.com",
+        "email": f"{seed[0:7]}@example.org",
         "password": "$uper$3cr3tP@ss",
         "name": f"{seed[0:7]} Name",
         "company": "test spockle",

tests/integration/test_stream.py

@@ -183,7 +183,7 @@ class TestStream:
         # NOTE: only works for server admins
         # invited = client.stream.invite_batch(
         #     stream_id=stream.id,
-        #     emails=["userA@speckle.xyz", "userB@speckle.xyz"],
+        #     emails=["userA@example.org", "userB@example.org"],
         #     user_ids=[second_user.id],
         #     message="yeehaw 🤠",
         # )
@@ -192,7 +192,7 @@ class TestStream:
 
         # invited_only_email = client.stream.invite_batch(
         #     stream_id=stream.id,
-        #     emails=["userC@speckle.xyz"],
+        #     emails=["userC@example.org"],
         #     message="yeehaw 🤠",
         # )
 

tests/integration/test_wrapper.py

@@ -100,16 +100,20 @@ def test_parse_globals_as_commit():
 
 
 #! NOTE: the following three tests may not pass locally
-# if you have a `speckle.xyz` account in manager
+# if you have a `app.speckle.systems` account in manager
 def test_get_client_without_auth():
-    wrap = StreamWrapper("https://speckle.xyz/streams/4c3ce1459c/commits/8b9b831792")
+    wrap = StreamWrapper(
+        "https://app.speckle.systems/streams/4c3ce1459c/commits/8b9b831792"
+    )
     client = wrap.get_client()
 
     assert client is not None
 
 
 def test_get_new_client_with_token(user_path):
-    wrap = StreamWrapper("https://speckle.xyz/streams/4c3ce1459c/commits/8b9b831792")
+    wrap = StreamWrapper(
+        "https://app.speckle.systems/streams/4c3ce1459c/commits/8b9b831792"
+    )
     client = wrap.get_client()
     client = wrap.get_client(token="super-secret-token")
 
@@ -117,7 +121,9 @@ def test_get_new_client_with_token(user_path):
 
 
 def test_get_transport_with_token():
-    wrap = StreamWrapper("https://speckle.xyz/streams/4c3ce1459c/commits/8b9b831792")
+    wrap = StreamWrapper(
+        "https://app.speckle.systems/streams/4c3ce1459c/commits/8b9b831792"
+    )
     client = wrap.get_client()
     assert not client.account.token  # unauthenticated bc no local accounts