feat(objects): mesh transform helper

.devcontainer/Dockerfile

@@ -1,27 +0,0 @@
-# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.191.1/containers/python-3/.devcontainer/base.Dockerfile
-
-# [Choice] Python version: 3, 3.9, 3.8, 3.7, 3.6
-ARG VARIANT="3.9"
-FROM mcr.microsoft.com/vscode/devcontainers/python:0-${VARIANT}
-
-# [Choice] Node.js version: none, lts/*, 16, 14, 12, 10
-ARG NODE_VERSION="none"
-RUN if [ "${NODE_VERSION}" != "none" ]; then su vscode -c "umask 0002 && . /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi
-
-# [Optional] If your pip requirements rarely change, uncomment this section to add them to the image.
-# COPY requirements.txt /tmp/pip-tmp/
-# RUN pip3 --disable-pip-version-check --no-cache-dir install -r /tmp/pip-tmp/requirements.txt \
-#    && rm -rf /tmp/pip-tmp
-
-# [Optional] Uncomment this section to install additional OS packages.
-# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
-#     && apt-get -y install --no-install-recommends <your-package-list-here>
-
-# [Optional] Uncomment this line to install global node packages.
-# RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g <your-package-here>" 2>&1
-
-USER vscode
-
-RUN curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | python -
-
-ENV PATH=$PATH:$HOME/.poetry/env

.devcontainer/devcontainer.json

@@ -1,52 +0,0 @@
-// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
-// https://github.com/microsoft/vscode-dev-containers/tree/v0.191.1/containers/python-3
-{
-	"name": "Python 3",
-	// "build": {
-	// 	"dockerfile": "Dockerfile",
-	// 	"context": "..",
-	// 	"args": {
-	// 		// Update 'VARIANT' to pick a Python version: 3, 3.6, 3.7, 3.8, 3.9
-	// 		"VARIANT": "3.6",
-	// 		// Options
-	// 		"NODE_VERSION": "lts/*"
-	// 	}
-	// },
-	"dockerComposeFile": "./docker-compose.yaml",
-	"service": "specklepy",
-	"workspaceFolder": "/workspaces/specklepy",
-	"shutdownAction": "stopCompose",
-	// Set *default* container specific settings.json values on container create.
-	"settings": {
-		"python.pythonPath": "/usr/local/bin/python",
-		"python.languageServer": "Pylance",
-		"python.linting.enabled": true,
-		"python.linting.pylintEnabled": true,
-		"python.formatting.autopep8Path": "/usr/local/py-utils/bin/autopep8",
-		"python.formatting.blackPath": "/usr/local/py-utils/bin/black",
-		"python.formatting.yapfPath": "/usr/local/py-utils/bin/yapf",
-		"python.linting.banditPath": "/usr/local/py-utils/bin/bandit",
-		"python.linting.flake8Path": "/usr/local/py-utils/bin/flake8",
-		"python.linting.mypyPath": "/usr/local/py-utils/bin/mypy",
-		"python.linting.pycodestylePath": "/usr/local/py-utils/bin/pycodestyle",
-		"python.linting.pydocstylePath": "/usr/local/py-utils/bin/pydocstyle",
-		"python.linting.pylintPath": "/usr/local/py-utils/bin/pylint",
-		"python.testing.pytestArgs": [
-			"tests/",
-			"-s"
-		],
-		"python.testing.pytestEnabled": true,
-		"editor.formatOnSave": true,
-	},
-	// Add the IDs of extensions you want installed when the container is created.
-	"extensions": [
-		"ms-python.python",
-		"ms-python.vscode-pylance"
-	],
-	// Use 'forwardPorts' to make a list of ports inside the container available locally.
-	// "forwardPorts": [],
-	// Use 'postCreateCommand' to run commands after the container is created.
-	"postCreateCommand": "poetry config virtualenvs.create false && poetry install",
-	// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
-	"remoteUser": "vscode"
-}

.devcontainer/docker-compose.yaml

@@ -1,49 +0,0 @@
-version: "3.3"  # optional since v1.27.0
-services:
-  postgres:
-    image: circleci/postgres:12
-    environment:
-      POSTGRES_DB: speckle2_test
-      POSTGRES_PASSWORD: speckle
-      POSTGRES_USER: speckle
-      # ports:
-      #   - "5432:5432"
-    network_mode: host
-  redis:
-    image: circleci/redis:6
-    # ports:
-    #   - "6379:6379"
-    network_mode: host
-  speckle-server:
-    image: speckle/speckle-server
-    command: ["bash", "-c", "/wait && node bin/www"]
-    environment:
-      POSTGRES_URL: "localhost"
-      POSTGRES_USER: "speckle"
-      POSTGRES_PASSWORD: "speckle"
-      POSTGRES_DB: "speckle2_test"
-      REDIS_URL: "redis://localhost"
-      SESSION_SECRET: "keyboard cat"
-      STRATEGY_LOCAL: "true"
-      CANONICAL_URL: "http://localhost:3000"
-      WAIT_HOSTS: localhost:5432, localhost:6379
-    # ports:
-    #   - "3000:3000"
-    network_mode: host
-
-  specklepy:
-    build:
-      dockerfile: Dockerfile
-      context: .
-      args:
-        VARIANT: 3.9
-        NODE_VERSION: lts/*
-    volumes:
-      # Mounts the project folder to '/workspace'. While this file is in .devcontainer,
-      # mounts are relative to the first file in the list, which is a level up.
-      - ..:/workspaces/specklepy:cached
-    # Overrides default command so things don't shut down after the process ends.
-    command: /bin/sh -c "while sleep 1000; do :; done"
-    network_mode: host
-# networks:
-#     default:

.gitattributes

@@ -1,3 +0,0 @@
-* text=auto eol=lf
-*.{cmd,[cC][mM][dD]} text eol=crlf
-*.{bat,[bB][aA][tT]} text eol=crlf

specklepy/api/client.py

@@ -1,10 +1,6 @@
 import re
-from warnings import warn
+from gql.client import SyncClientSession
-from specklepy.logging.exceptions import (
+from specklepy.logging.exceptions import SpeckleException
-    GraphQLException,
-    SpeckleException,
-    SpeckleWarning,
-)
 from typing import Dict
 
 from specklepy.api import resources
@@ -18,8 +14,9 @@ from specklepy.api.resources import (
     subscriptions,
 )
 from specklepy.api.models import ServerInfo
-from gql import Client
+from gql import Client, gql
 from gql.transport.requests import RequestsHTTPTransport
+from gql.transport.aiohttp import AIOHTTPTransport
 from gql.transport.websockets import WebsocketsTransport
 
 
@@ -80,8 +77,6 @@ class SpeckleClient:
         # Check compatibility with the server
         try:
             serverInfo = self.server.get()
-            if isinstance(serverInfo, Exception):
-                raise serverInfo
             if not isinstance(serverInfo, ServerInfo):
                 raise Exception("Couldn't get ServerInfo")
         except Exception as ex:
@@ -116,13 +111,6 @@ class SpeckleClient:
 
         self._init_resources()
 
-        if isinstance(self.user.get(), GraphQLException):
-            warn(
-                SpeckleWarning(
-                    f"Invalid token - could not authenticate Speckle Client for server {self.url}"
-                )
-            )
-
     def execute_query(self, query: str) -> Dict:
         return self.httpclient.execute(query)
 

specklepy/api/credentials.py

@@ -118,8 +118,8 @@ class StreamWrapper:
     commit_id: str = None
     object_id: str = None
     branch_name: str = None
-    _client: SpeckleClient = None
+    client: SpeckleClient = None
-    _account: Account = None
+    account: Account = None
 
     def __repr__(self):
         return f"StreamWrapper( server: {self.host}, stream_id: {self.stream_id}, type: {self.type} )"
@@ -179,15 +179,15 @@ class StreamWrapper:
         """
         Gets an account object for this server from the local accounts db (added via Speckle Manager or a json file)
         """
-        if self._account:
+        if self.account:
-            return self._account
+            return self.account
 
-        self._account = next(
+        self.account = next(
             (a for a in get_local_accounts() if self.host in a.serverInfo.url),
             None,
         )
 
-        return self._account
+        return self.account
 
     def get_client(self, token: str = None) -> SpeckleClient:
         """
@@ -200,22 +200,22 @@ class StreamWrapper:
         Returns:
             SpeckleClient -- authenticated with a corresponding local account or the provided token
         """
-        if self._client and token is None:
+        if self.client and token is None:
-            return self._client
+            return self.client
 
-        if not self._account:
+        if not self.account:
             self.get_account()
 
-        if not self._client:
+        if not self.client:
-            self._client = SpeckleClient(host=self.host, use_ssl=self.use_ssl)
+            self.client = SpeckleClient(host=self.host, use_ssl=self.use_ssl)
 
-        if self._account is None and token is None:
+        if self.account is None and token is None:
             warn(f"No local account found for server {self.host}", SpeckleWarning)
-            return self._client
+            return self.client
 
-        self._client.authenticate(self._account.token if self._account else token)
+        self.client.authenticate(self.account.token if self.account else token)
 
-        return self._client
+        return self.client
 
     def get_transport(self, token: str = None) -> ServerTransport:
         """
@@ -225,6 +225,6 @@ class StreamWrapper:
         Returns:
             ServerTransport -- constructed for this stream with a pre-authenticated client
         """
-        if not self._client or not self._client.me:
+        if not self.client or not self.client.me:
             self.get_client(token)
-        return ServerTransport(self.stream_id, self._client)
+        return ServerTransport(self.stream_id, self.client)

specklepy/objects/base.py

@@ -252,9 +252,6 @@ class Base(_RegisteringBase):
         if t is None:
             return value
 
-        if value is None:
-            return None
-
         if t.__module__ == "typing":
             origin = getattr(t, "__origin__")
             t = (
@@ -313,9 +310,7 @@ class Base(_RegisteringBase):
 
     @units.setter
     def units(self, value: str):
-        units = get_units_from_string(value)
+        self._units = get_units_from_string(value)
-        if units:
-            self._units = units
 
     def get_member_names(self) -> List[str]:
         """Get all of the property names on this object, dynamic or not"""

specklepy/objects/geometry.py

@@ -33,7 +33,6 @@ class Point(Base, speckle_type=GEOMETRY + "Point"):
 
     @classmethod
     def from_list(cls, args: List[float]) -> "Point":
-        """Create a new Point from a list of three floats representing the x, y, and z coordinates"""
         return cls(x=args[0], y=args[1], z=args[2])
 
     def to_list(self) -> List[Any]:
@@ -41,7 +40,6 @@ class Point(Base, speckle_type=GEOMETRY + "Point"):
 
     @classmethod
     def from_coords(cls, x: float = 0.0, y: float = 0.0, z: float = 0.0):
-        """Create a new Point from x, y, and z values"""
         pt = Point()
         pt.x, pt.y, pt.z = x, y, z
         return pt
@@ -218,7 +216,6 @@ class Polyline(Base, speckle_type=GEOMETRY + "Polyline", chunkable={"value": 200
 
     @classmethod
     def from_points(cls, points: List[Point]):
-        """Create a new Polyline from a list of Points"""
         polyline = cls()
         polyline.units = points[0].units
         polyline.value = []
@@ -394,27 +391,14 @@ class Mesh(
     area: float = None
     volume: float = None
 
-    @classmethod
+    def transform_to(self, transform: "Transform") -> "Mesh":
-    def create(
+        mesh = Mesh(vertices=transform.apply_to_points_values(self.vertices))
-        cls,
+        for attr in set(self.get_serializable_attributes()) - {"vertices"}:
-        vertices: List[float],
+            orig_val = getattr(self, attr, None)
-        faces: List[int],
+            if orig_val:
-        colors: List[int] = None,
+                setattr(mesh, attr, orig_val)
-        texture_coordinates: List[float] = None,
-    ) -> "Mesh":
-        """
-        Create a new Mesh from lists representing its vertices, faces,
-        colors (optional), and texture coordinates (optional).
 
-        This will initialise empty lists for colors and texture coordinates
+        return mesh
-        if you do not provide any.
-        """
-        return cls(
-            vertices=vertices,
-            faces=faces,
-            colors=colors or [],
-            textureCoordinates=texture_coordinates or [],
-        )
 
 
 class Surface(Base, speckle_type=GEOMETRY + "Surface"):

specklepy/objects/structural/__init__.py

@@ -1,40 +0,0 @@
-"""Builtin Speckle object kit."""
-
-from specklepy.objects.structural.analysis import *
-from specklepy.objects.structural.properties import *
-from specklepy.objects.structural.material import *
-from specklepy.objects.structural.geometry import *
-from specklepy.objects.structural.loading import *
-from specklepy.objects.structural.axis import Axis
-
-__all__ = [
-    "Element1D",
-    "Element2D",
-    "Element3D",
-    "Axis",
-    "Node",
-    "Restraint",
-    "Load",
-    "LoadBeam",
-    "LoadCase",
-    "LoadCombinations",
-    "LoadFace",
-    "LoadGravity",
-    "LoadNode",
-    "Model",
-    "ModelInfo",
-    "ModelSettings",
-    "ModelUnits",
-    "Concrete",
-    "Material",
-    "Steel",
-    "Timber",
-    "Property",
-    "Property1D",
-    "Property2D",
-    "Property3D",
-    "PropertyDamper",
-    "PropertyMass",
-    "PropertySpring",
-    "SectionProfile",
-]

specklepy/objects/structural/analysis.py

@@ -1,53 +0,0 @@
-from enum import Enum
-import enum
-from typing import Any, List, Optional
-
-from ..base import Base
-from ..geometry import *
-from .properties import *
-
-STRUCTURAL_ANALYSIS = "Objects.Structural.Analysis."
-
-
-class ModelUnits(Base, speckle_type=STRUCTURAL_ANALYSIS + "ModelUnits"):
-    length: str = None
-    sections: str = None
-    displacements: str = None
-    stress: str = None
-    force: str = None
-    mass: str = None
-    time: str = None
-    temperature: str = None
-    velocity: str = None
-    acceleration: str = None
-    energy: str = None
-    angle: str = None
-    strain: str = None
-
-
-class ModelSettings(Base, speckle_type=STRUCTURAL_ANALYSIS + "ModelSettings"):
-    modelUnits: ModelUnits = None
-    steelCode: str = None
-    concreteCode: str = None
-    coincidenceTolerance: float = 0.0
-
-
-class ModelInfo(Base, speckle_type=STRUCTURAL_ANALYSIS + "ModelInfo"):
-    name: str = None
-    description: str = None
-    projectNumber: str = None
-    projectName: str = None
-    settings: ModelSettings = None
-    initials: str = None
-    application: str = None
-
-
-class Model(Base, speckle_type=STRUCTURAL_ANALYSIS + "Model"):
-    specs: ModelInfo = None
-    nodes: List = None
-    elements: List = None
-    loads: List = None
-    restraints: List = None
-    properties: List = None
-    materials: List = None
-    layerDescription: str = None

specklepy/objects/structural/axis.py

@@ -1,8 +0,0 @@
-from ..base import Base
-from ..geometry import Plane
-
-
-class Axis(Base, speckle_type="Objects.Structural.Geometry.Axis"):
-    name: str = None
-    axisType: str = None
-    plane: Plane = None

specklepy/objects/structural/geometry.py

@@ -1,109 +0,0 @@
-from enum import Enum
-import enum
-from typing import Any, List, Optional
-
-from ..base import Base
-from ..geometry import *
-from .properties import *
-from .axis import Axis
-
-STRUCTURAL_GEOMETRY = "Objects.Structural.Geometry"
-
-
-class ElementType1D(int, Enum):
-    Beam = 0
-    Brace = 1
-    Bar = 2
-    Column = 3
-    Rod = 4
-    Spring = 5
-    Tie = 6
-    Strut = 7
-    Link = 8
-    Damper = 9
-    Cable = 10
-    Spacer = 11
-    Other = 12
-    Null = 13
-
-
-class ElementType2D(int, Enum):
-    Quad4 = 0
-    Quad8 = 1
-    Triangle3 = 2
-    Triangle6 = 3
-
-
-class ElementType3D(int, Enum):
-    Brick8 = 0
-    Wedge6 = 1
-    Pyramid5 = 2
-    Tetra4 = 3
-
-
-class Restraint(Base, speckle_type=STRUCTURAL_GEOMETRY + ".Restraint"):
-    code: str = None
-    stiffnessX: float = 0.0
-    stiffnessY: float = 0.0
-    stiffnessZ: float = 0.0
-    stiffnessXX: float = 0.0
-    stiffnessYY: float = 0.0
-    stiffnessZZ: float = 0.0
-    units: str = None
-
-
-class Node(Base, speckle_type=STRUCTURAL_GEOMETRY + ".Node"):
-    name: str = None
-    basePoint: Point = None
-    constraintAxis: Axis = None
-    restraint: Restraint = None
-    springProperty: PropertySpring = None
-    massProperty: PropertyMass = None
-    damperProperty: PropertyDamper = None
-    units: str = None
-
-
-class Element1D(Base, speckle_type=STRUCTURAL_GEOMETRY + ".Element1D"):
-    name: str = None
-    baseLine: Line = None
-    property: Property1D = None
-    type: ElementType1D = None
-    end1Releases: Restraint = None
-    end2Releases: Restraint = None
-    end1Offset: Vector = None
-    end2Offset: Vector = None
-    orientationNode: Node = None
-    orinetationAngle: float = 0.0
-    localAxis: Plane = None
-    parent: Base = None
-    end1Node: Node = Node
-    end2Node: Node = Node
-    topology: List = None
-    displayMesh: Mesh = None
-    units: str = None
-
-
-class Element2D(Base, speckle_type=STRUCTURAL_GEOMETRY + ".Element2D"):
-    name: str = None
-    property: Property2D = None
-    type: ElementType2D = None
-    offset: float = 0.0
-    orientationAngle: float = 0.0
-    parent: Base = None
-    topology: List = None
-    displayMesh: Mesh = None
-    units: str = None
-
-
-class Element3D(Base, speckle_type=STRUCTURAL_GEOMETRY + ".Element3D"):
-    name: str = None
-    baseMesh: Mesh = None
-    property: Property3D = None
-    type: ElementType3D = None
-    orientationAngle: float = 0.0
-    parent: Base = None
-    topology: List
-    units: str = None
-
-
-# class Storey needs ependency on built elements first

specklepy/objects/structural/loading.py

@@ -1,144 +0,0 @@
-from enum import Enum
-from typing import Any, List, Optional
-
-from ..base import Base
-from .geometry import *
-
-STRUCTURAL_LOADING = "Objects.Structural.Loading."
-
-
-class LoadType(int, Enum):
-
-    none = 0
-    Dead = 1
-    SuperDead = 2
-    Soil = 3
-    Live = 4
-    LiveRoof = 5
-    ReducibleLive = 6
-    Wind = 7
-    Snow = 8
-    Rain = 9
-    Thermal = 10
-    Notional = 11
-    Prestress = 12
-    Equivalent = 13
-    Accidental = 14
-    SeismicRSA = 15
-    SeismicAccTorsion = 16
-    SeismicStatic = 17
-    Other = 18
-
-
-class ActionType(int, Enum):
-
-    none = 0
-    Permanent = 1
-    Variable = 2
-    Accidental = 3
-
-
-class BeamLoadType(int, Enum):
-
-    Point = 0
-    Uniform = 1
-    Linear = 2
-    Patch = 3
-    TriLinear = 4
-
-
-class FaceLoadType(int, Enum):
-
-    Constant = 0
-    Variable = 1
-    Point = 2
-
-
-class LoadDirection2D(int, Enum):
-
-    X = 0
-    Y = 1
-    Z = 2
-
-
-class LoadDirection(int, Enum):
-
-    X = 0
-    Y = 1
-    Z = 2
-    XX = 3
-    YY = 4
-    ZZ = 5
-
-
-class LoadAxisType(int, Enum):
-    Global = 0
-    Local = 1  # local element axes
-    DeformedLocal = (
-        2  # element local axis that is embedded in the element as it deforms
-    )
-
-
-class CombinationType(int, Enum):
-
-    LinearAdd = 0
-    Envelope = 1
-    AbsoluteAdd = 2
-    SRSS = 3
-    RangeAdd = 4
-
-
-class LoadCase(Base, speckle_type=STRUCTURAL_LOADING + "LoadCase"):
-    name: str = None
-    loadType: LoadType = None
-    group: str = None
-    actionType: ActionType = None
-    description: str = None
-
-
-class Load(Base, speckle_type=STRUCTURAL_LOADING + "Load"):
-    name: str = None
-    units: str = None
-    loadCase: LoadCase = None
-
-
-class LoadBeam(Load, speckle_type=STRUCTURAL_LOADING + "LoadBeam"):
-    elements: List = None
-    loadType: BeamLoadType = None
-    direction: LoadDirection = None
-    loadAxis: Axis = None
-    loadAxisType: LoadAxisType = None
-    isProjected: bool = None
-    values: List = None
-    positions: List = None
-
-
-class LoadCombinations(Base, speckle_type=STRUCTURAL_LOADING + "LoadCombination"):
-    name: str = None
-    loadCases: List
-    loadFactors: List
-    combinationType: CombinationType
-
-
-class LoadFace(Load, speckle_type=STRUCTURAL_LOADING + "LoadFace"):
-    elements: List = None
-    loadType: FaceLoadType = None
-    direction: LoadDirection2D = None
-    loadAxis: Axis = None
-    loadAxisType: LoadAxisType = None
-    isProjected: bool = None
-    values: List = None
-    positions: List = None
-
-
-class LoadGravity(Load, speckle_type=STRUCTURAL_LOADING + "LoadGravity"):
-    elements: List = None
-    nodes: List = None
-    gravityFactors: Vector = None
-
-
-class LoadNode(Load, speckle_type=STRUCTURAL_LOADING + "LoadNode"):
-    nodes: List = None
-    loadAxis: Axis = None
-    direction: LoadDirection = None
-    value: float = 0.0

specklepy/objects/structural/material.py

@@ -1,60 +0,0 @@
-from enum import Enum
-from typing import Any, List, Optional
-
-from ..base import Base
-
-
-STRUCTURAL_MATERIALS = "Objects.Structural.Materials"
-
-
-class MaterialType(int, Enum):
-    Concrete = 0
-    Steel = 1
-    Timber = 2
-    Aluminium = 3
-    Masonry = 4
-    FRP = 5
-    Glass = 6
-    Fabric = 7
-    Rebar = 8
-    Tendon = 9
-    ColdFormed = 10
-    Other = 11
-
-
-class Material(Base, speckle_type=STRUCTURAL_MATERIALS):
-    name: str = None
-    grade: str = None
-    materialType: MaterialType = None
-    designCode: str = None
-    codeYear: str = None
-    strength: float = 0.0
-    elasticModulus: float = 0.0
-    poissonsRatio: float = 0.0
-    shearModulus: float = 0.0
-    density: float = 0.0
-    thermalExpansivity: float = 0.0
-    dampingRatio: float = 0.0
-    cost: float = 0.0
-    materialSafetyFactor: float = 0.0
-
-
-class Concrete(Material, speckle_type=STRUCTURAL_MATERIALS + ".Concrete"):
-    compressiveStrength: float = 0.0
-    tensileStrength: float = 0.0
-    flexuralStrength: float = 0.0
-    maxCompressiveStrength: float = 0.0
-    maxTensileStrength: float = 0.0
-    maxAggregateSize: float = 0.0
-    lightweight: bool = None
-
-
-class Steel(Material, speckle_type=STRUCTURAL_MATERIALS + ".Steel"):
-    yieldStrength: float = 0.0
-    ultimateStrength: float = 0.0
-    maxStrain: float = 0.0
-    strainHardeningModulus: float = 0.0
-
-
-class Timber(Material, speckle_type=STRUCTURAL_MATERIALS + ".Timber"):
-    species: str = None

specklepy/objects/structural/properties.py

@@ -1,214 +0,0 @@
-from enum import Enum
-from typing import Any, List, Optional
-
-
-from ..base import Base
-
-from .material import *
-from .axis import Axis
-
-
-STRUCTURAL_PROPERTY = "Objectives.Structural.Properties"
-
-
-class MemberType(int, Enum):
-    Beam = 0
-    Column = 1
-    Generic1D = 2
-    Slab = 3
-    Wall = 4
-    Generic2D = 5
-    VoidCutter1D = 6
-    VoidCutter2D = 7
-
-
-class BaseReferencePoint(int, Enum):
-    Centroid = 0
-    TopLeft = 1
-    TopCentre = 2
-    TopRight = 3
-    MidLeft = 4
-    MidRight = 5
-    BotLeft = 6
-    BotCentre = 7
-    BotRight = 8
-
-
-class ReferenceSurface(int, Enum):
-    Top = 0
-    Middle = 1
-    Bottom = 2
-
-
-class PropertyType2D(int, Enum):
-
-    Stress = 0
-    Fabric = 1
-    Plate = 2
-    Shell = 3
-    Curved = 4
-    Wall = 5
-    Strain = 6
-    Axi = 7
-    Load = 8
-
-
-class PropertyType3D(int, Enum):
-    Solid = 0
-    Infinite = 1
-
-
-class ShapeType(int, Enum):
-    Rectangular = 0
-    Circular = 1
-    I = 2
-    Tee = 3
-    Angle = 4
-    Channel = 5
-    Perimeter = 6
-    Box = 7
-    Catalogue = 8
-    Explicit = 9
-
-
-class PropertyTypeSpring(int, Enum):
-    Axial = 0
-    Torsional = 1
-    General = 2
-    Matrix = 3
-    TensionOnly = 4
-    CompressionOnly = 5
-    Connector = 6
-    LockUp = 7
-    Gap = 8
-    Friction = 9
-
-
-class PropertyTypeDamper(int, Enum):
-    Axial = 0
-    Torsional = 1
-    General = 2
-
-
-class Property(Base, speckle_type=STRUCTURAL_PROPERTY):
-    name: str = None
-
-
-class SectionProfile(Base, speckle_type=STRUCTURAL_PROPERTY + ".SectionProfile"):
-    name: str = None
-    shapeType: ShapeType = None
-    area: float = 0.0
-    Iyy: float = 0.0
-    Izz: float = 0.0
-    J: float = 0.0
-    Ky: float = 0.0
-    weight: float = 0.0
-    units: str = None
-
-
-class Property1D(Property, speckle_type=STRUCTURAL_PROPERTY + ".Property1D"):
-    memberType: MemberType = None
-    Material: Material = None
-    SectionProfile: SectionProfile = None
-    BaseReferencePoint: BaseReferencePoint = None
-    offsetY: float = 0.0
-    offsetZ: float = 0.0
-
-
-class Property2D(Property, speckle_type=STRUCTURAL_PROPERTY + ".Property2D"):
-    PropertyType2D: PropertyType2D = None
-    thickness: float = 0.0
-    Material: Material = None
-    axis: Axis = None
-    referenceSurface: ReferenceSurface = None
-    zOffset: float = 0.0
-    modifierInPlane: float = 0.0
-    modifierBending: float = 0.0
-    modifierShear: float = 0.0
-    modifierVolume: float = 0.0
-
-
-class Property3D(Property, speckle_type=STRUCTURAL_PROPERTY + ".Property3D"):
-    PropertyType3D: PropertyType3D = None
-    Material: Material = None
-    axis: Axis = None
-
-
-class PropertyDamper(Property, speckle_type=STRUCTURAL_PROPERTY + ".PropertyDamper"):
-    damperType: PropertyTypeDamper = None
-    dampingX: float = 0.0
-    dampingY: float = 0.0
-    dampingZ: float = 0.0
-    dampingXX: float = 0.0
-    dampingYY: float = 0.0
-    dampingZZ: float = 0.0
-
-
-class PropertyMass(Property, speckle_type=STRUCTURAL_PROPERTY + ".PropertyMass"):
-    mass: float = 0.0
-    inertiaXX: float = 0.0
-    inertiaYY: float = 0.0
-    inertiaZZ: float = 0.0
-    inertiaXY: float = 0.0
-    inertiaYZ: float = 0.0
-    inertiaZX: float = 0.0
-    massModified: bool = None
-    massModifierX: float = 0.0
-    massModifierY: float = 0.0
-    massModifierZ: float = 0.0
-
-
-class PropertySpring(Property, speckle_type=STRUCTURAL_PROPERTY + ".PropertySpring"):
-    springType: PropertyTypeSpring = None
-    springCurveX: float = 0.0
-    stiffnessX: float = 0.0
-    springCurveY: float = 0.0
-    stiffnessY: float = 0.0
-    springCurveZ: float = 0.0
-    stiffnessZ: float = 0.0
-    springCurveXX: float = 0.0
-    stiffnessXX: float = 0.0
-    springCurveYY: float = 0.0
-    stiffnessYY: float = 0.0
-    springCurveZZ: float = 0.0
-    stiffnessZZ: float = 0.0
-    dampingRatio: float = 0.0
-    dampingX: float = 0.0
-    dampingY: float = 0.0
-    dampingZ: float = 0.0
-    dampingXX: float = 0.0
-    dampingYY: float = 0.0
-    dampingZZ: float = 0.0
-    matrix: float = 0.0
-    postiveLockup: float = 0.0
-    frictionCoefficient: float = 0.0
-
-
-class ReferenceSurfaceEnum(int, Enum):
-    Concrete = 0
-    Steel = 1
-    Timber = 2
-    Aluminium = 3
-    Masonry = 4
-    FRP = 5
-    Glass = 6
-    Fabric = 7
-    Rebar = 8
-    Tendon = 9
-    ColdFormed = 10
-    Other = 11
-
-
-class shapeType(int, Enum):
-    Concrete = 0
-    Steel = 1
-    Timber = 2
-    Aluminium = 3
-    Masonry = 4
-    FRP = 5
-    Glass = 6
-    Fabric = 7
-    Rebar = 8
-    Tendon = 9
-    ColdFormed = 10
-    Other = 11

specklepy/objects/structural/results.py

@@ -1,176 +0,0 @@
-from enum import Enum
-import enum
-from typing import Any, List, Optional
-
-from ..base import Base
-from ..geometry import *
-from .loading import *
-from .geometry import *
-from .analysis import Model
-
-STRUCTURAL_RESULTS = "Objects.Structural.Results."
-
-
-class Result(Base, speckle_type=STRUCTURAL_RESULTS + "Result"):
-    resultCase: Base = None
-    permutation: str = None
-    description: str = None
-
-
-class ResultSet1D(Result, speckle_type=STRUCTURAL_RESULTS + "ResultSet1D"):
-    results1D: List
-
-
-class Result1D(Result, speckle_type=STRUCTURAL_RESULTS + "Result1D"):
-    element: Element1D = None
-    position: float = 0.0
-    dispX: float = 0.0
-    dispY: float = 0.0
-    dispZ: float = 0.0
-    rotXX: float = 0.0
-    rotYY: float = 0.0
-    rotZZ: float = 0.0
-    forceX: float = 0.0
-    forceY: float = 0.0
-    forceZ: float = 0.0
-    momentXX: float = 0.0
-    momentYY: float = 0.0
-    momentZZ: float = 0.0
-    axialStress: float = 0.0
-    shearStressY: float = 0.0
-    shearStressZ: float = 0.0
-    bendingStressYPos: float = 0.0
-    bendingStressYNeg: float = 0.0
-    bendingStressZPos: float = 0.0
-    bendingStressZNeg: float = 0.0
-    combinedStressMax: float = 0.0
-    combinedStressMin: float = 0.0
-
-
-class ResultSet2D(Result, speckle_type=STRUCTURAL_RESULTS + "ResultSet2D"):
-    results2D: List
-
-
-class Result2D(Result, speckle_type=STRUCTURAL_RESULTS + "Result2D"):
-    element: Element2D = None
-    position: List
-    dispX: float = 0.0
-    dispY: float = 0.0
-    dispZ: float = 0.0
-    forceXX: float = 0.0
-    forceYY: float = 0.0
-    forceXY: float = 0.0
-    momentXX: float = 0.0
-    momentYY: float = 0.0
-    momentXY: float = 0.0
-    shearX: float = 0.0
-    shearY: float = 0.0
-    stressTopXX: float = 0.0
-    stressTopYY: float = 0.0
-    stressTopZZ: float = 0.0
-    stressTopXY: float = 0.0
-    stressTopYZ: float = 0.0
-    stressTopZX: float = 0.0
-    stressMidXX: float = 0.0
-    stressMidYY: float = 0.0
-    stressMidZZ: float = 0.0
-    stressMidXY: float = 0.0
-    stressMidYZ: float = 0.0
-    stressMidZX: float = 0.0
-    stressBotXX: float = 0.0
-    stressBotYY: float = 0.0
-    stressBotZZ: float = 0.0
-    stressBotXY: float = 0.0
-    stressBotYZ: float = 0.0
-    stressBotZX: float = 0.0
-
-
-class ResultSet3D(Result, speckle_type=STRUCTURAL_RESULTS + "ResultSet3D"):
-    results3D: List
-
-
-class Result3D(Result, speckle_type=STRUCTURAL_RESULTS + "Result3D"):
-    element: Element3D = None
-    position: List
-    dispX: float = 0.0
-    dispY: float = 0.0
-    dispZ: float = 0.0
-    stressXX: float = 0.0
-    stressYY: float = 0.0
-    stressZZ: float = 0.0
-    stressXY: float = 0.0
-    stressYZ: float = 0.0
-    stressZX: float = 0.0
-
-
-class ResultGlobal(Result, speckle_type=STRUCTURAL_RESULTS + "ResultGlobal"):
-    model: Model = None
-    loadX: float = 0.0
-    loadY: float = 0.0
-    loadZ: float = 0.0
-    loadXX: float = 0.0
-    loadYY: float = 0.0
-    loadZZ: float = 0.0
-    reactionX: float = 0.0
-    reactionY: float = 0.0
-    reactionZ: float = 0.0
-    reactionXX: float = 0.0
-    reactionYY: float = 0.0
-    reactionZZ: float = 0.0
-    mode: float = 0.0
-    frequency: float = 0.0
-    loadFactor: float = 0.0
-    modalStiffness: float = 0.0
-    modalGeoStiffness: float = 0.0
-    effMassX: float = 0.0
-    effMassY: float = 0.0
-    effMassZ: float = 0.0
-    effMassXX: float = 0.0
-    effMassYY: float = 0.0
-    effMassZZ: float = 0.0
-
-
-class ResultSetNode(Result, speckle_type=STRUCTURAL_RESULTS + "ResultSetNode"):
-    resultsNode: List
-
-
-class ResultNode(Result, speckle_type=STRUCTURAL_RESULTS + " ResultNode"):
-    node: Node = None
-    dispX: float = 0.0
-    dispY: float = 0.0
-    dispZ: float = 0.0
-    rotXX: float = 0.0
-    rotYY: float = 0.0
-    rotZZ: float = 0.0
-    reactionX: float = 0.0
-    reactionY: float = 0.0
-    reactionZ: float = 0.0
-    reactionXX: float = 0.0
-    reactionYY: float = 0.0
-    reactionZZ: float = 0.0
-    constraintX: float = 0.0
-    constraintY: float = 0.0
-    constraintZ: float = 0.0
-    constraintXX: float = 0.0
-    constraintYY: float = 0.0
-    constraintZZ: float = 0.0
-    velX: float = 0.0
-    velY: float = 0.0
-    velZ: float = 0.0
-    velXX: float = 0.0
-    velYY: float = 0.0
-    velZZ: float = 0.0
-    accX: float = 0.0
-    accY: float = 0.0
-    accZ: float = 0.0
-    accXX: float = 0.0
-    accYY: float = 0.0
-    accZZ: float = 0.0
-
-
-class ResultSetAll(Base, speckle_type=None):
-    resultSet1D: ResultSet1D = None
-    resultSet2D: ResultSet2D = None
-    resultSet3D: ResultSet3D = None
-    resultsGlobal: ResultGlobal = None
-    resultsNode: ResultSetNode = None

specklepy/objects/units.py

@@ -1,5 +1,4 @@
-from warnings import warn
+from specklepy.logging.exceptions import SpeckleException
-from specklepy.logging.exceptions import SpeckleException, SpeckleWarning
 
 UNITS = ["mm", "cm", "m", "in", "ft", "yd", "mi"]
 
@@ -29,12 +28,6 @@ UNITS_ENCODINGS = {
 
 
 def get_units_from_string(unit: str):
-    if not isinstance(unit, str):
-        warn(
-            f"Invalid units: expected type str but received {type(unit)} ({unit}). Skipping - no units will be set.",
-            SpeckleWarning,
-        )
-        return
     unit = str.lower(unit)
     for name, alternates in UNITS_STRINGS.items():
         if unit in alternates:

specklepy/serialization/base_object_serializer.py

@@ -1,15 +1,11 @@
 import ujson
 import hashlib
 import re
+
 from uuid import uuid4
-from warnings import warn
 from typing import Any, Dict, List, Tuple
 from specklepy.objects.base import Base, DataChunk
-from specklepy.logging.exceptions import (
+from specklepy.logging.exceptions import SerializationException, SpeckleException
-    SerializationException,
-    SpeckleException,
-    SpeckleWarning,
-)
 from specklepy.transports.abstract_transport import AbstractTransport
 import specklepy.objects.geometry
 import specklepy.objects.other
@@ -21,19 +17,6 @@ def hash_obj(obj: Any) -> str:
     return hashlib.sha256(ujson.dumps(obj).encode()).hexdigest()[:32]
 
 
-def safe_json_loads(obj: str, obj_id=None) -> Any:
-    try:
-        return ujson.loads(obj)
-    except ValueError as err:
-        import json
-
-        warn(
-            f"Failed to deserialise object (id: {obj_id}). This is likely a ujson big int error - falling back to json. \nError: {err}",
-            SpeckleWarning,
-        )
-        return json.loads(obj)
-
-
 class BaseObjectSerializer:
     read_transport: AbstractTransport
     write_transports: List[AbstractTransport]
@@ -77,19 +60,14 @@ class BaseObjectSerializer:
             chunkable = False
             detach = False
 
-            # skip props marked to be ignored with "__" or "_"
+            # skip nulls or props marked to be ignored with "__" or "_"
-            if prop.startswith(("__", "_")):
+            if value is None or prop.startswith(("__", "_")):
                 continue
 
             # don't prepopulate id as this will mess up hashing
             if prop == "id":
                 continue
 
-            # allow serialisation of nulls
-            if value is None:
-                object_builder[prop] = value
-                continue
-
             # only bother with chunking and detaching if there is a write transport
             if self.write_transports:
                 dynamic_chunk_match = prop.startswith("@") and re.match(
@@ -260,7 +238,7 @@ class BaseObjectSerializer:
         """
         if not obj_string:
             return None
-        obj = safe_json_loads(obj_string)
+        obj = ujson.loads(obj_string)
         return self.recompose_base(obj=obj)
 
     def recompose_base(self, obj: dict) -> Base:
@@ -276,7 +254,7 @@ class BaseObjectSerializer:
         if not obj:
             return
         if isinstance(obj, str):
-            obj = safe_json_loads(obj)
+            obj = ujson.loads(obj)
 
         if "speckle_type" in obj and obj["speckle_type"] == "reference":
             obj = self.get_child(obj=obj)
@@ -314,7 +292,7 @@ class BaseObjectSerializer:
                     raise SpeckleException(
                         f"Could not find the referenced child object of id `{ref_hash}` in the given read transport: {self.read_transport.name}"
                     )
-                ref_obj = safe_json_loads(ref_obj_str, ref_hash)
+                ref_obj = ujson.loads(ref_obj_str)
                 base.__setattr__(prop, self.recompose_base(obj=ref_obj))
 
             # 3. handle all other cases (base objects, lists, and dicts)
@@ -372,5 +350,4 @@ class BaseObjectSerializer:
             raise SpeckleException(
                 f"Could not find the referenced child object of id `{ref_hash}` in the given read transport: {self.read_transport.name}"
             )
-
+        return ujson.loads(ref_obj_str)
-        return safe_json_loads(ref_obj_str, ref_hash)

specklepy/transports/server/batch_sender.py

@@ -92,15 +92,10 @@ class BatchSender(object):
 
     def _bg_send_batch(self, session, batch):
         object_ids = [obj[0] for obj in batch]
-        try:
+        server_has_object = session.post(
-            server_has_object = session.post(
+            url=f"{self.server_url}/api/diff/{self.stream_id}",
-                url=f"{self.server_url}/api/diff/{self.stream_id}",
+            data={"objects": json.dumps(object_ids)},
-                data={"objects": json.dumps(object_ids)},
+        ).json()
-            ).json()
-        except Exception as ex:
-            raise SpeckleException(
-                f"Invalid credentials - cannot send objects to server {self.server_url}"
-            ) from ex
 
         new_object_ids = [x for x in object_ids if not server_has_object[x]]
         new_object_ids = set(new_object_ids)

tests/test_base.py

@@ -77,18 +77,6 @@ def test_speckle_type_cannot_be_set(base: Base) -> None:
     assert base.speckle_type == "Base"
 
 
-def test_setting_units():
-    b = Base(units="foot")
-    assert b.units == "ft"
-
-    with pytest.raises(SpeckleException):
-        b.units = "big"
-
-    b.units = None  # invalid args are skipped
-    b.units = 7
-    assert b.units == "ft"
-
-
 def test_base_of_custom_speckle_type() -> None:
     b1 = Base.of_type("BirdHouse", name="Tweety's Crib")
     assert b1.speckle_type == "BirdHouse"

tests/test_client_and_ops.py

@@ -1,31 +0,0 @@
-import pytest
-from specklepy.api import operations
-from specklepy.api.client import SpeckleClient
-from specklepy.objects.base import Base
-from specklepy.transports.server import ServerTransport
-from specklepy.logging.exceptions import SpeckleException, SpeckleWarning
-
-
-def test_invalid_authentication():
-    client = SpeckleClient()
-
-    with pytest.warns(SpeckleWarning):
-        client.authenticate("fake token")
-
-
-def test_invalid_send():
-    client = SpeckleClient()
-    client.me = {"token": "fake token"}
-    transport = ServerTransport("3073b96e86", client)
-
-    with pytest.raises(SpeckleException):
-        operations.send(Base(), [transport])
-
-
-def test_invalid_receive():
-    client = SpeckleClient()
-    client.me = {"token": "fake token"}
-    transport = ServerTransport("fake stream", client)
-
-    with pytest.raises(SpeckleException):
-        operations.receive("fake object", transport)

tests/test_geometry.py

@@ -3,7 +3,6 @@ from typing import Callable
 
 import pytest
 from specklepy.api import operations
-from specklepy.logging.exceptions import SpeckleException
 from specklepy.objects.base import Base
 from specklepy.objects.encoding import CurveArray, ObjectArray
 from specklepy.objects.geometry import (
@@ -451,15 +450,3 @@ def test_serialized_brep_attributes(brep: Brep):
 
     for k in removed_keys:
         assert k not in serialized_dict.keys()
-
-
-def test_mesh_create():
-    vertices = [2, 1, 2, 4, 77.3, 5, 33, 4, 2]
-    faces = [1, 2, 3, 4, 5, 6, 7]
-    mesh = Mesh.create(vertices, faces)
-
-    with pytest.raises(SpeckleException):
-        bad_mesh = Mesh.create(vertices=7, faces=faces)
-
-    assert mesh.vertices == vertices
-    assert mesh.textureCoordinates == []

tests/test_serialization.py

@@ -89,9 +89,3 @@ class TestSerialization:
         deserialised = operations.deserialize(untyped)
 
         assert deserialised == {"foo": "bar"}
-
-    def test_big_int(self):
-        big_int = '{"big": ' + str(2 ** 64) + "}"
-        deserialised = operations.deserialize(big_int)
-
-        assert deserialised == {"big": 2 ** 64}

tests/test_transforms.py

@@ -1,7 +1,7 @@
 from typing import List
 import pytest
 from specklepy.api import operations
-from specklepy.objects.geometry import Point, Vector
+from specklepy.objects.geometry import Mesh, Point, Vector
 from specklepy.objects.other import (
     Transform,
     BlockInstance,
@@ -43,6 +43,15 @@ def vector_value():
     return [1, 1, 2]
 
 
+@pytest.fixture()
+def mesh():
+    return Mesh(
+        vertices=[-7, 5, 1, -8, 4, 0, -7, 3, 0, -6, 4, 0],
+        faces=[1, 1, 2, 3, 0],
+        units="feet",
+    )
+
+
 @pytest.fixture()
 def transform():
     """Translates to [1, 2, 0] and scales z by 0.5"""
@@ -130,3 +139,13 @@ def test_transform_serialisation(transform: Transform):
     deserialized = operations.deserialize(serialized)
 
     assert transform.get_id() == deserialized.get_id()
+
+
+def test_mesh_transform(mesh: Mesh, transform: Transform):
+    new_mesh = mesh.transform_to(transform)
+
+    assert mesh.vertices != new_mesh.vertices
+
+    new_mesh.vertices = mesh.vertices
+
+    assert mesh.get_id() == new_mesh.get_id()