Merge pull request #241 from specklesystems/speckle_type_sync_with_core

speckle type sync with core

example/many_children.py

@@ -1,12 +1,13 @@
+import os
+import random
+import string
+import time
+from pathlib import Path
 from typing import List
-from specklepy.objects import Base
+
 from specklepy.api import operations
+from specklepy.objects import Base
 from specklepy.transports.sqlite import SQLiteTransport
-import time
-from pathlib import Path
-import os
-import string
-import random
 
 
 class Sub(Base):

example/stream_objects.py

@@ -1,9 +1,10 @@
+import random
+import string
 from typing import List
+
+from specklepy.api import operations
 from specklepy.api.wrapper import StreamWrapper
 from specklepy.objects import Base
-from specklepy.api import operations
-import string
-import random
 
 
 class Sub(Base):

example/using_speckle_base.py

@@ -1,10 +1,11 @@
 """This is an example showcasing the usage of speckle `Base` class."""
 
 # the speckle.objects module exposes all speckle provided classes
-from specklepy.objects import Base
-from specklepy.api import operations
 from devtools import debug
 
+from specklepy.api import operations
+from specklepy.objects import Base
+
 
 class ExampleSub(Base):
     """

pyproject.toml

@@ -54,3 +54,6 @@ target-version = ["py37", "py38", "py39", "py310"]
 [build-system]
 requires = ["poetry-core>=1.0.0"]
 build-backend = "poetry.core.masonry.api"
+
+[tool.isort]
+profile = "black"

src/specklepy/api/client.py

@@ -1,29 +1,27 @@
 import re
+from typing import Dict
 from warnings import warn
+
 from deprecated import deprecated
-from specklepy.api.credentials import Account, get_account_from_token
-from specklepy.logging import metrics
-from specklepy.logging.exceptions import (
-    SpeckleException,
-    SpeckleWarning,
-)
-from typing import Dict
+from gql import Client
+from gql.transport.requests import RequestsHTTPTransport
+from gql.transport.websockets import WebsocketsTransport
 
 from specklepy.api import resources
+from specklepy.api.credentials import Account, get_account_from_token
 from specklepy.api.resources import (
+    active_user,
     branch,
     commit,
-    stream,
     object,
+    other_user,
     server,
-    user,
+    stream,
     subscriptions,
-    other_user,
-    active_user
+    user,
 )
-from gql import Client
-from gql.transport.requests import RequestsHTTPTransport
-from gql.transport.websockets import WebsocketsTransport
+from specklepy.logging import metrics
+from specklepy.logging.exceptions import SpeckleException, SpeckleWarning
 
 
 class SpeckleClient:

src/specklepy/api/credentials.py

@@ -1,11 +1,13 @@
 import os
-from pydantic import BaseModel, Field  # pylint: disable=no-name-in-module
 from typing import List, Optional
-from specklepy.logging import metrics
+
+from pydantic import BaseModel, Field  # pylint: disable=no-name-in-module
+
+from specklepy import paths
 from specklepy.api.models import ServerInfo
-from specklepy.transports.sqlite import SQLiteTransport
+from specklepy.logging import metrics
 from specklepy.logging.exceptions import SpeckleException
-from specklepy import paths
+from specklepy.transports.sqlite import SQLiteTransport
 
 
 class UserInfo(BaseModel):
@@ -64,7 +66,7 @@ def get_local_accounts(base_path: Optional[str] = None) -> List[Account]:
         json_acct_files.extend(
             file for file in os.listdir(json_path) if file.endswith(".json")
         )
-    
+
     except Exception:
         # cannot find or get the json account paths
         pass

src/specklepy/api/host_applications.py

@@ -1,5 +1,5 @@
-from enum import Enum
 from dataclasses import dataclass
+from enum import Enum
 from unicodedata import name
 
 

src/specklepy/api/models.py

@@ -1,7 +1,6 @@
 from datetime import datetime
 from typing import List, Optional
 
-
 from pydantic import BaseModel, Field
 
 
@@ -60,20 +59,20 @@ class Branches(BaseModel):
 
 
 class Stream(BaseModel):
-    id: Optional[str] = None 
+    id: Optional[str] = None
     name: Optional[str]
     role: Optional[str] = None
     isPublic: Optional[bool] = None
     description: Optional[str] = None
-    createdAt: Optional[datetime] = None 
-    updatedAt: Optional[datetime] = None 
+    createdAt: Optional[datetime] = None
+    updatedAt: Optional[datetime] = None
     collaborators: List[Collaborator] = Field(default_factory=list)
-    branches: Optional[Branches] = None 
-    commit: Optional[Commit] = None 
-    object: Optional[Object] = None 
-    commentCount: Optional[int] = None 
-    favoritedDate: Optional[datetime] = None 
-    favoritesCount: Optional[int] = None 
+    branches: Optional[Branches] = None
+    commit: Optional[Commit] = None
+    object: Optional[Object] = None
+    commentCount: Optional[int] = None
+    favoritedDate: Optional[datetime] = None
+    favoritesCount: Optional[int] = None
 
     def __repr__(self):
         return f"Stream( id: {self.id}, name: {self.name}, description: {self.description}, isPublic: {self.isPublic})"

src/specklepy/api/operations.py

@@ -1,10 +1,11 @@
 from typing import List, Optional
+
 from specklepy.logging import metrics
-from specklepy.objects.base import Base
-from specklepy.transports.sqlite import SQLiteTransport
 from specklepy.logging.exceptions import SpeckleException
-from specklepy.transports.abstract_transport import AbstractTransport
+from specklepy.objects.base import Base
 from specklepy.serialization.base_object_serializer import BaseObjectSerializer
+from specklepy.transports.abstract_transport import AbstractTransport
+from specklepy.transports.sqlite import SQLiteTransport
 
 
 def send(

src/specklepy/api/resource.py

@@ -1,15 +1,17 @@
-from graphql import DocumentNode
-from specklepy.api.credentials import Account
-from specklepy.transports.sqlite import SQLiteTransport
 from typing import Any, Dict, List, Optional, Tuple, Type, Union
+
 from gql.client import Client
 from gql.transport.exceptions import TransportQueryError
+from graphql import DocumentNode
+
+from specklepy.api.credentials import Account
 from specklepy.logging.exceptions import (
     GraphQLException,
     SpeckleException,
     UnsupportedException,
 )
 from specklepy.serialization.base_object_serializer import BaseObjectSerializer
+from specklepy.transports.sqlite import SQLiteTransport
 
 
 class ResourceBase(object):

src/specklepy/api/resources/__init__.py

@@ -1,9 +1,7 @@
-from pathlib import Path
-import sys
 import pkgutil
+import sys
 from importlib import import_module
 
-
 for (_, name, _) in pkgutil.iter_modules(__path__):
 
     imported_module = import_module("." + name, package=__name__)

src/specklepy/api/resources/active_user.py

@@ -1,11 +1,12 @@
-from typing import List, Optional
 from datetime import datetime, timezone
+from typing import List, Optional
+
 from gql import gql
+
+from specklepy.api.models import ActivityCollection, PendingStreamCollaborator, User
+from specklepy.api.resource import ResourceBase
 from specklepy.logging import metrics
 from specklepy.logging.exceptions import SpeckleException
-from specklepy.api.resource import ResourceBase
-from specklepy.api.models import ActivityCollection, PendingStreamCollaborator, User
-
 
 NAME = "active_user"
 

src/specklepy/api/resources/branch.py

@@ -1,6 +1,7 @@
 from gql import gql
-from specklepy.api.resource import ResourceBase
+
 from specklepy.api.models import Branch
+from specklepy.api.resource import ResourceBase
 from specklepy.logging import metrics
 
 NAME = "branch"

src/specklepy/api/resources/commit.py

@@ -1,10 +1,11 @@
-from typing import Optional, List
+from typing import List, Optional
+
 from gql import gql
-from specklepy.api.resource import ResourceBase
+
 from specklepy.api.models import Commit
+from specklepy.api.resource import ResourceBase
 from specklepy.logging import metrics
 
-
 NAME = "commit"
 
 

src/specklepy/api/resources/object.py

@@ -1,5 +1,7 @@
 from typing import Dict, List
+
 from gql import gql
+
 from specklepy.api.resource import ResourceBase
 from specklepy.objects.base import Base
 

src/specklepy/api/resources/other_user.py

@@ -1,13 +1,12 @@
-from typing import List, Optional, Union
 from datetime import datetime, timezone
+from typing import List, Optional, Union
+
 from gql import gql
+
+from specklepy.api.models import ActivityCollection, LimitedUser
+from specklepy.api.resource import ResourceBase
 from specklepy.logging import metrics
 from specklepy.logging.exceptions import SpeckleException
-from specklepy.api.resource import ResourceBase
-from specklepy.api.models import (
-    ActivityCollection,
-    LimitedUser,
-)
 
 NAME = "other_user"
 

src/specklepy/api/resources/server.py

@@ -1,12 +1,13 @@
 import re
 from typing import Any, Dict, List, Tuple
+
 from gql import gql
+
 from specklepy.api.models import ServerInfo
 from specklepy.api.resource import ResourceBase
 from specklepy.logging import metrics
 from specklepy.logging.exceptions import GraphQLException
 
-
 NAME = "server"
 
 

src/specklepy/api/resources/stream.py

@@ -1,12 +1,13 @@
 from datetime import datetime, timezone
 from typing import List, Optional
+
 from deprecated import deprecated
 from gql import gql
-from specklepy.logging import metrics
+
 from specklepy.api.models import ActivityCollection, PendingStreamCollaborator, Stream
 from specklepy.api.resource import ResourceBase
-from specklepy.logging.exceptions import UnsupportedException, SpeckleException
-
+from specklepy.logging import metrics
+from specklepy.logging.exceptions import SpeckleException, UnsupportedException
 
 NAME = "stream"
 

src/specklepy/api/resources/subscriptions.py

@@ -1,7 +1,9 @@
-from typing import Callable, Dict, List, Union
 from functools import wraps
+from typing import Callable, Dict, List, Union
+
 from gql import gql
 from graphql import DocumentNode
+
 from specklepy.api.resource import ResourceBase
 from specklepy.api.resources.stream import Stream
 from specklepy.logging.exceptions import SpeckleException

src/specklepy/api/resources/user.py

@@ -1,12 +1,13 @@
-from typing import List, Optional, Union
 from datetime import datetime, timezone
+from typing import List, Optional, Union
+
+from deprecated import deprecated
 from gql import gql
+
+from specklepy.api.models import ActivityCollection, PendingStreamCollaborator, User
+from specklepy.api.resource import ResourceBase
 from specklepy.logging import metrics
 from specklepy.logging.exceptions import SpeckleException
-from specklepy.api.resource import ResourceBase
-from specklepy.api.models import ActivityCollection, PendingStreamCollaborator, User
-from deprecated import deprecated
-
 
 NAME = "user"
 

src/specklepy/api/wrapper.py

@@ -1,14 +1,15 @@
+from urllib.parse import unquote, urlparse
 from warnings import warn
-from urllib.parse import urlparse, unquote
+
+from specklepy.api.client import SpeckleClient
 from specklepy.api.credentials import (
     Account,
     get_account_from_token,
     get_local_accounts,
 )
 from specklepy.logging import metrics
-from specklepy.api.client import SpeckleClient
-from specklepy.transports.server.server import ServerTransport
 from specklepy.logging.exceptions import SpeckleException, SpeckleWarning
+from specklepy.transports.server.server import ServerTransport
 
 
 class StreamWrapper:

src/specklepy/logging/metrics.py

@@ -1,14 +1,14 @@
-import sys
-import queue
-import hashlib
+import contextlib
 import getpass
+import hashlib
 import logging
-from typing import Optional
-import requests
-import threading
 import platform
-import contextlib
+import queue
+import sys
+import threading
+from typing import Optional
 
+import requests
 
 """
 Anonymous telemetry to help us understand how to make a better Speckle.

src/specklepy/objects/__init__.py

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