From e978e4f632cbb7cd007d32d139eded8874d30cc6 Mon Sep 17 00:00:00 2001 From: Jedd Morgan <45512892+JR-Morgan@users.noreply.github.com> Date: Thu, 31 Oct 2024 13:58:44 +0000 Subject: [PATCH] Re-export deprecated resources and models --- src/specklepy/api/client.py | 15 ++-- .../api/{models.py => models/__init__.py} | 0 src/specklepy/api/resources/__init__.py | 48 ++++++++++--- .../{ => current}/active_user_resource.py | 10 +-- .../resources/{ => current}/model_resource.py | 4 +- .../{ => current}/other_user_resource.py | 10 +-- .../{ => current}/project_invite_resource.py | 6 +- .../{ => current}/project_resource.py | 7 +- .../{server.py => current/server_resource.py} | 4 +- .../{ => current}/subscription_resource.py | 6 +- .../{ => current}/version_resource.py | 6 +- .../resources/{ => deprecated}/active_user.py | 4 +- .../api/resources/{ => deprecated}/branch.py | 7 +- .../api/resources/{ => deprecated}/commit.py | 7 +- .../api/resources/{ => deprecated}/object.py | 7 +- .../resources/{ => deprecated}/other_user.py | 4 +- .../api/resources/deprecated/server.py | 9 +++ .../api/resources/{ => deprecated}/stream.py | 7 +- .../{ => deprecated}/subscriptions.py | 11 ++- .../api/resources/{ => deprecated}/user.py | 2 +- src/specklepy/core/api/client.py | 18 ++--- src/specklepy/core/api/credentials.py | 2 +- .../core/api/inputs/project_inputs.py | 2 +- src/specklepy/core/api/models/__init__.py | 71 +++++++++++++++++++ .../api/{new_models.py => models/current.py} | 55 ++++++-------- .../api/{models.py => models/deprecated.py} | 23 ------ .../core/api/models/subscription_messages.py | 36 ++++++++++ src/specklepy/core/api/resources/__init__.py | 43 +++++++++++ .../{ => current}/active_user_resource.py | 8 ++- .../resources/{ => current}/model_resource.py | 2 +- .../{ => current}/other_user_resource.py | 8 ++- .../{ => current}/project_invite_resource.py | 2 +- .../{ => current}/project_resource.py | 3 +- .../{server.py => current/server_resource.py} | 2 +- .../{ => current}/subscription_resource.py | 2 +- .../{ => current}/version_resource.py | 2 +- .../resources/{ => deprecated}/active_user.py | 4 +- .../api/resources/{ => deprecated}/branch.py | 2 +- .../api/resources/{ => deprecated}/commit.py | 2 +- .../api/resources/{ => deprecated}/object.py | 0 .../resources/{ => deprecated}/other_user.py | 4 +- .../core/api/resources/deprecated/server.py | 11 +++ .../api/resources/{ => deprecated}/stream.py | 6 +- .../{ => deprecated}/subscriptions.py | 7 +- .../api/resources/{ => deprecated}/user.py | 0 tests/integration/client/test_active_user.py | 5 +- .../client/test_active_user_resource.py | 4 +- .../integration/client/test_model_resource.py | 4 +- .../client/test_other_user_resource.py | 2 +- .../client/test_project_invite_resource.py | 4 +- .../client/test_project_resource.py | 2 +- .../client/test_subscription_resource.py | 2 +- .../client/test_version_resource.py | 4 +- tests/integration/conftest.py | 4 +- tests/unit/test_account_server_migration.py | 2 +- 55 files changed, 354 insertions(+), 168 deletions(-) rename src/specklepy/api/{models.py => models/__init__.py} (100%) rename src/specklepy/api/resources/{ => current}/active_user_resource.py (97%) rename src/specklepy/api/resources/{ => current}/model_resource.py (93%) rename src/specklepy/api/resources/{ => current}/other_user_resource.py (95%) rename src/specklepy/api/resources/{ => current}/project_invite_resource.py (88%) rename src/specklepy/api/resources/{ => current}/project_resource.py (90%) rename src/specklepy/api/resources/{server.py => current/server_resource.py} (95%) rename src/specklepy/api/resources/{ => current}/subscription_resource.py (92%) rename src/specklepy/api/resources/{ => current}/version_resource.py (92%) rename src/specklepy/api/resources/{ => deprecated}/active_user.py (58%) rename src/specklepy/api/resources/{ => deprecated}/branch.py (95%) rename src/specklepy/api/resources/{ => deprecated}/commit.py (96%) rename src/specklepy/api/resources/{ => deprecated}/object.py (91%) rename src/specklepy/api/resources/{ => deprecated}/other_user.py (60%) create mode 100644 src/specklepy/api/resources/deprecated/server.py rename src/specklepy/api/resources/{ => deprecated}/stream.py (98%) rename src/specklepy/api/resources/{ => deprecated}/subscriptions.py (92%) rename src/specklepy/api/resources/{ => deprecated}/user.py (98%) create mode 100644 src/specklepy/core/api/models/__init__.py rename src/specklepy/core/api/{new_models.py => models/current.py} (82%) rename src/specklepy/core/api/{models.py => models/deprecated.py} (89%) create mode 100644 src/specklepy/core/api/models/subscription_messages.py rename src/specklepy/core/api/resources/{ => current}/active_user_resource.py (99%) rename src/specklepy/core/api/resources/{ => current}/model_resource.py (98%) rename src/specklepy/core/api/resources/{ => current}/other_user_resource.py (98%) rename src/specklepy/core/api/resources/{ => current}/project_invite_resource.py (98%) rename src/specklepy/core/api/resources/{ => current}/project_resource.py (98%) rename src/specklepy/core/api/resources/{server.py => current/server_resource.py} (99%) rename src/specklepy/core/api/resources/{ => current}/subscription_resource.py (99%) rename src/specklepy/core/api/resources/{ => current}/version_resource.py (98%) rename src/specklepy/core/api/resources/{ => deprecated}/active_user.py (62%) rename src/specklepy/core/api/resources/{ => deprecated}/branch.py (99%) rename src/specklepy/core/api/resources/{ => deprecated}/commit.py (99%) rename src/specklepy/core/api/resources/{ => deprecated}/object.py (100%) rename src/specklepy/core/api/resources/{ => deprecated}/other_user.py (62%) create mode 100644 src/specklepy/core/api/resources/deprecated/server.py rename src/specklepy/core/api/resources/{ => deprecated}/stream.py (99%) rename src/specklepy/core/api/resources/{ => deprecated}/subscriptions.py (96%) rename src/specklepy/core/api/resources/{ => deprecated}/user.py (100%) diff --git a/src/specklepy/api/client.py b/src/specklepy/api/client.py index f227a3f..5755cc5 100644 --- a/src/specklepy/api/client.py +++ b/src/specklepy/api/client.py @@ -2,6 +2,13 @@ from deprecated import deprecated from specklepy.api.credentials import Account from specklepy.api.resources import ( + ActiveUserResource, + ModelResource, + OtherUserResource, + ProjectInviteResource, + ProjectResource, + SubscriptionResource, + VersionResource, branch, commit, object, @@ -10,13 +17,6 @@ from specklepy.api.resources import ( subscriptions, user, ) -from specklepy.api.resources.active_user_resource import ActiveUserResource -from specklepy.api.resources.model_resource import ModelResource -from specklepy.api.resources.other_user_resource import OtherUserResource -from specklepy.api.resources.project_invite_resource import ProjectInviteResource -from specklepy.api.resources.project_resource import ProjectResource -from specklepy.api.resources.subscription_resource import SubscriptionResource -from specklepy.api.resources.version_resource import VersionResource from specklepy.core.api.client import SpeckleClient as CoreSpeckleClient from specklepy.logging import metrics @@ -119,6 +119,7 @@ class SpeckleClient(CoreSpeckleClient): account=self.account, basepath=self.ws_url, client=self.wsclient, + # todo: why doesn't this take a server version ) # Deprecated Resources self.user = user.Resource( diff --git a/src/specklepy/api/models.py b/src/specklepy/api/models/__init__.py similarity index 100% rename from src/specklepy/api/models.py rename to src/specklepy/api/models/__init__.py diff --git a/src/specklepy/api/resources/__init__.py b/src/specklepy/api/resources/__init__.py index 13beff4..c154ff8 100644 --- a/src/specklepy/api/resources/__init__.py +++ b/src/specklepy/api/resources/__init__.py @@ -1,9 +1,41 @@ -import pkgutil -import sys -from importlib import import_module +from specklepy.api.resources.current.active_user_resource import ActiveUserResource +from specklepy.api.resources.current.model_resource import ModelResource +from specklepy.api.resources.current.other_user_resource import OtherUserResource +from specklepy.api.resources.current.project_invite_resource import ( + ProjectInviteResource, +) +from specklepy.api.resources.current.project_resource import ProjectResource +from specklepy.api.resources.current.server_resource import ServerResource +from specklepy.api.resources.current.subscription_resource import SubscriptionResource +from specklepy.api.resources.current.version_resource import VersionResource +from specklepy.api.resources.deprecated import ( + active_user, + branch, + commit, + object, + other_user, + server, + stream, + subscriptions, + user, +) -for _, name, _ in pkgutil.iter_modules(__path__): - imported_module = import_module("." + name, package=__name__) - - if hasattr(imported_module, "Resource"): - setattr(sys.modules[__name__], name, imported_module) +__all__ = [ + "ActiveUserResource", + "ModelResource", + "OtherUserResource", + "ProjectInviteResource", + "ProjectResource", + "ServerResource", + "SubscriptionResource", + "VersionResource", + "active_user", + "branch", + "commit", + "object", + "other_user", + "server", + "stream", + "subscriptions", + "user", +] diff --git a/src/specklepy/api/resources/active_user_resource.py b/src/specklepy/api/resources/current/active_user_resource.py similarity index 97% rename from src/specklepy/api/resources/active_user_resource.py rename to src/specklepy/api/resources/current/active_user_resource.py index 2d2d849..9716b3f 100644 --- a/src/specklepy/api/resources/active_user_resource.py +++ b/src/specklepy/api/resources/current/active_user_resource.py @@ -6,16 +6,16 @@ from deprecated import deprecated from specklepy.core.api.inputs.project_inputs import UserProjectsFilter from specklepy.core.api.inputs.user_inputs import UserUpdateInput from specklepy.core.api.models import ( - FE1_DEPRECATION_REASON, - FE1_DEPRECATION_VERSION, PendingStreamCollaborator, + Project, ResourceCollection, User, ) -from specklepy.core.api.new_models import Project -from specklepy.core.api.resources.active_user_resource import ( - ActiveUserResource as CoreResource, +from specklepy.core.api.models.deprecated import ( + FE1_DEPRECATION_REASON, + FE1_DEPRECATION_VERSION, ) +from specklepy.core.api.resources import ActiveUserResource as CoreResource from specklepy.logging import metrics diff --git a/src/specklepy/api/resources/model_resource.py b/src/specklepy/api/resources/current/model_resource.py similarity index 93% rename from src/specklepy/api/resources/model_resource.py rename to src/specklepy/api/resources/current/model_resource.py index cfd71d0..e97d9f6 100644 --- a/src/specklepy/api/resources/model_resource.py +++ b/src/specklepy/api/resources/current/model_resource.py @@ -7,8 +7,8 @@ from specklepy.core.api.inputs.model_inputs import ( UpdateModelInput, ) from specklepy.core.api.inputs.project_inputs import ProjectModelsFilter -from specklepy.core.api.new_models import Model, ModelWithVersions, ResourceCollection -from specklepy.core.api.resources.model_resource import ModelResource as CoreResource +from specklepy.core.api.models import Model, ModelWithVersions, ResourceCollection +from specklepy.core.api.resources import ModelResource as CoreResource from specklepy.logging import metrics diff --git a/src/specklepy/api/resources/other_user_resource.py b/src/specklepy/api/resources/current/other_user_resource.py similarity index 95% rename from src/specklepy/api/resources/other_user_resource.py rename to src/specklepy/api/resources/current/other_user_resource.py index 163ed09..9ab8248 100644 --- a/src/specklepy/api/resources/other_user_resource.py +++ b/src/specklepy/api/resources/current/other_user_resource.py @@ -4,15 +4,15 @@ from typing import List, Optional, Union from deprecated import deprecated from specklepy.core.api.models import ( - FE1_DEPRECATION_REASON, - FE1_DEPRECATION_VERSION, ActivityCollection, LimitedUser, + UserSearchResultCollection, ) -from specklepy.core.api.new_models import UserSearchResultCollection -from specklepy.core.api.resources.other_user_resource import ( - OtherUserResource as CoreResource, +from specklepy.core.api.models.deprecated import ( + FE1_DEPRECATION_REASON, + FE1_DEPRECATION_VERSION, ) +from specklepy.core.api.resources import OtherUserResource as CoreResource from specklepy.logging import metrics from specklepy.logging.exceptions import SpeckleException diff --git a/src/specklepy/api/resources/project_invite_resource.py b/src/specklepy/api/resources/current/project_invite_resource.py similarity index 88% rename from src/specklepy/api/resources/project_invite_resource.py rename to src/specklepy/api/resources/current/project_invite_resource.py index 114b00b..9181085 100644 --- a/src/specklepy/api/resources/project_invite_resource.py +++ b/src/specklepy/api/resources/current/project_invite_resource.py @@ -7,10 +7,8 @@ from specklepy.core.api.inputs.project_inputs import ( ProjectInviteCreateInput, ProjectInviteUseInput, ) -from specklepy.core.api.new_models import PendingStreamCollaborator, ProjectWithTeam -from specklepy.core.api.resources.project_invite_resource import ( - ProjectInviteResource as CoreResource, -) +from specklepy.core.api.models import PendingStreamCollaborator, ProjectWithTeam +from specklepy.core.api.resources import ProjectInviteResource as CoreResource from specklepy.logging import metrics diff --git a/src/specklepy/api/resources/project_resource.py b/src/specklepy/api/resources/current/project_resource.py similarity index 90% rename from src/specklepy/api/resources/project_resource.py rename to src/specklepy/api/resources/current/project_resource.py index dbfa382..502aef8 100644 --- a/src/specklepy/api/resources/project_resource.py +++ b/src/specklepy/api/resources/current/project_resource.py @@ -6,11 +6,8 @@ from specklepy.core.api.inputs.project_inputs import ( ProjectUpdateInput, ProjectUpdateRoleInput, ) -from specklepy.core.api.models import Project -from specklepy.core.api.new_models import ProjectWithModels, ProjectWithTeam -from specklepy.core.api.resources.project_resource import ( - ProjectResource as CoreResource, -) +from specklepy.core.api.models import Project, ProjectWithModels, ProjectWithTeam +from specklepy.core.api.resources import ProjectResource as CoreResource from specklepy.logging import metrics diff --git a/src/specklepy/api/resources/server.py b/src/specklepy/api/resources/current/server_resource.py similarity index 95% rename from src/specklepy/api/resources/server.py rename to src/specklepy/api/resources/current/server_resource.py index 1e3bb13..85ee78e 100644 --- a/src/specklepy/api/resources/server.py +++ b/src/specklepy/api/resources/current/server_resource.py @@ -1,11 +1,11 @@ from typing import Any, Dict, List, Tuple from specklepy.api.models import ServerInfo -from specklepy.core.api.resources.server import Resource as CoreResource +from specklepy.core.api.resources import ServerResource as CoreResource from specklepy.logging import metrics -class Resource(CoreResource): +class ServerResource(CoreResource): """API Access class for the server""" def __init__(self, account, basepath, client) -> None: diff --git a/src/specklepy/api/resources/subscription_resource.py b/src/specklepy/api/resources/current/subscription_resource.py similarity index 92% rename from src/specklepy/api/resources/subscription_resource.py rename to src/specklepy/api/resources/current/subscription_resource.py index a102ad2..51f8436 100644 --- a/src/specklepy/api/resources/subscription_resource.py +++ b/src/specklepy/api/resources/current/subscription_resource.py @@ -3,15 +3,13 @@ from typing import Callable, Optional, Sequence from pydantic import BaseModel from typing_extensions import TypeVar -from specklepy.core.api.new_models import ( +from specklepy.core.api.models import ( ProjectModelsUpdatedMessage, ProjectUpdatedMessage, ProjectVersionsUpdatedMessage, UserProjectsUpdatedMessage, ) -from specklepy.core.api.resources.subscription_resource import ( - SubscriptionResource as CoreResource, -) +from specklepy.core.api.resources import SubscriptionResource as CoreResource from specklepy.logging import metrics TEventArgs = TypeVar("TEventArgs", bound=BaseModel) diff --git a/src/specklepy/api/resources/version_resource.py b/src/specklepy/api/resources/current/version_resource.py similarity index 92% rename from src/specklepy/api/resources/version_resource.py rename to src/specklepy/api/resources/current/version_resource.py index f208751..f3d48da 100644 --- a/src/specklepy/api/resources/version_resource.py +++ b/src/specklepy/api/resources/current/version_resource.py @@ -8,10 +8,8 @@ from specklepy.core.api.inputs.version_inputs import ( MoveVersionsInput, UpdateVersionInput, ) -from specklepy.core.api.new_models import ResourceCollection, Version -from specklepy.core.api.resources.version_resource import ( - VersionResource as CoreResource, -) +from specklepy.core.api.models import ResourceCollection, Version +from specklepy.core.api.resources import VersionResource as CoreResource from specklepy.logging import metrics diff --git a/src/specklepy/api/resources/active_user.py b/src/specklepy/api/resources/deprecated/active_user.py similarity index 58% rename from src/specklepy/api/resources/active_user.py rename to src/specklepy/api/resources/deprecated/active_user.py index d4d854a..1fc4039 100644 --- a/src/specklepy/api/resources/active_user.py +++ b/src/specklepy/api/resources/deprecated/active_user.py @@ -1,7 +1,7 @@ from deprecated import deprecated -from specklepy.api.resources.active_user_resource import ActiveUserResource -from specklepy.core.api.models import FE1_DEPRECATION_VERSION +from specklepy.api.resources import ActiveUserResource +from specklepy.core.api.models.deprecated import FE1_DEPRECATION_VERSION @deprecated(reason="Renamed to ActiveUserResource", version=FE1_DEPRECATION_VERSION) diff --git a/src/specklepy/api/resources/branch.py b/src/specklepy/api/resources/deprecated/branch.py similarity index 95% rename from src/specklepy/api/resources/branch.py rename to src/specklepy/api/resources/deprecated/branch.py index 6cc46ce..a96ff13 100644 --- a/src/specklepy/api/resources/branch.py +++ b/src/specklepy/api/resources/deprecated/branch.py @@ -3,8 +3,11 @@ from typing import Optional, Union from deprecated import deprecated from specklepy.api.models import Branch -from specklepy.core.api.models import FE1_DEPRECATION_REASON, FE1_DEPRECATION_VERSION -from specklepy.core.api.resources.branch import Resource as CoreResource +from specklepy.core.api.models.deprecated import ( + FE1_DEPRECATION_REASON, + FE1_DEPRECATION_VERSION, +) +from specklepy.core.api.resources.deprecated.branch import Resource as CoreResource from specklepy.logging import metrics from specklepy.logging.exceptions import SpeckleException diff --git a/src/specklepy/api/resources/commit.py b/src/specklepy/api/resources/deprecated/commit.py similarity index 96% rename from src/specklepy/api/resources/commit.py rename to src/specklepy/api/resources/deprecated/commit.py index de00882..91ebee4 100644 --- a/src/specklepy/api/resources/commit.py +++ b/src/specklepy/api/resources/deprecated/commit.py @@ -3,8 +3,11 @@ from typing import List, Optional, Union from deprecated import deprecated from specklepy.api.models import Commit -from specklepy.core.api.models import FE1_DEPRECATION_REASON, FE1_DEPRECATION_VERSION -from specklepy.core.api.resources.commit import Resource as CoreResource +from specklepy.core.api.models.deprecated import ( + FE1_DEPRECATION_REASON, + FE1_DEPRECATION_VERSION, +) +from specklepy.core.api.resources.deprecated.commit import Resource as CoreResource from specklepy.logging import metrics from specklepy.logging.exceptions import SpeckleException diff --git a/src/specklepy/api/resources/object.py b/src/specklepy/api/resources/deprecated/object.py similarity index 91% rename from src/specklepy/api/resources/object.py rename to src/specklepy/api/resources/deprecated/object.py index 4188e40..573e6f5 100644 --- a/src/specklepy/api/resources/object.py +++ b/src/specklepy/api/resources/deprecated/object.py @@ -2,8 +2,11 @@ from typing import Dict, List from deprecated import deprecated -from specklepy.core.api.models import FE1_DEPRECATION_REASON, FE1_DEPRECATION_VERSION -from specklepy.core.api.resources.object import Resource as CoreResource +from specklepy.core.api.models.deprecated import ( + FE1_DEPRECATION_REASON, + FE1_DEPRECATION_VERSION, +) +from specklepy.core.api.resources.deprecated.object import Resource as CoreResource from specklepy.logging import metrics from specklepy.objects.base import Base diff --git a/src/specklepy/api/resources/other_user.py b/src/specklepy/api/resources/deprecated/other_user.py similarity index 60% rename from src/specklepy/api/resources/other_user.py rename to src/specklepy/api/resources/deprecated/other_user.py index 52f683f..2bdc575 100644 --- a/src/specklepy/api/resources/other_user.py +++ b/src/specklepy/api/resources/deprecated/other_user.py @@ -1,7 +1,7 @@ from deprecated import deprecated -from specklepy.api.resources.other_user_resource import OtherUserResource -from specklepy.core.api.models import FE1_DEPRECATION_VERSION +from specklepy.api.resources import OtherUserResource +from specklepy.core.api.models.deprecated import FE1_DEPRECATION_VERSION @deprecated(reason="Renamed to OtherUserResource", version=FE1_DEPRECATION_VERSION) diff --git a/src/specklepy/api/resources/deprecated/server.py b/src/specklepy/api/resources/deprecated/server.py new file mode 100644 index 0000000..f44203c --- /dev/null +++ b/src/specklepy/api/resources/deprecated/server.py @@ -0,0 +1,9 @@ +from deprecated import deprecated + +from specklepy.api.resources import ServerResource +from specklepy.core.api.models.deprecated import FE1_DEPRECATION_VERSION + + +@deprecated(reason="Renamed to ActiveUserResource", version=FE1_DEPRECATION_VERSION) +class Resource(ServerResource): + """Renamed to ServerResource""" diff --git a/src/specklepy/api/resources/stream.py b/src/specklepy/api/resources/deprecated/stream.py similarity index 98% rename from src/specklepy/api/resources/stream.py rename to src/specklepy/api/resources/deprecated/stream.py index 65ccc0a..688290a 100644 --- a/src/specklepy/api/resources/stream.py +++ b/src/specklepy/api/resources/deprecated/stream.py @@ -4,8 +4,11 @@ from typing import List, Optional from deprecated import deprecated from specklepy.api.models import PendingStreamCollaborator, Stream -from specklepy.core.api.models import FE1_DEPRECATION_REASON, FE1_DEPRECATION_VERSION -from specklepy.core.api.resources.stream import Resource as CoreResource +from specklepy.core.api.models.deprecated import ( + FE1_DEPRECATION_REASON, + FE1_DEPRECATION_VERSION, +) +from specklepy.core.api.resources.deprecated.stream import Resource as CoreResource from specklepy.logging import metrics diff --git a/src/specklepy/api/resources/subscriptions.py b/src/specklepy/api/resources/deprecated/subscriptions.py similarity index 92% rename from src/specklepy/api/resources/subscriptions.py rename to src/specklepy/api/resources/deprecated/subscriptions.py index 1cc7783..3530e74 100644 --- a/src/specklepy/api/resources/subscriptions.py +++ b/src/specklepy/api/resources/deprecated/subscriptions.py @@ -3,9 +3,14 @@ from typing import Callable, Dict, List, Optional, Union from deprecated import deprecated from graphql import DocumentNode -from specklepy.core.api.models import FE1_DEPRECATION_REASON, FE1_DEPRECATION_VERSION -from specklepy.core.api.resources.subscription_resource import check_wsclient -from specklepy.core.api.resources.subscriptions import Resource as CoreResource +from specklepy.core.api.models.deprecated import ( + FE1_DEPRECATION_REASON, + FE1_DEPRECATION_VERSION, +) +from specklepy.core.api.resources.current.subscription_resource import check_wsclient +from specklepy.core.api.resources.deprecated.subscriptions import ( + Resource as CoreResource, +) from specklepy.logging import metrics diff --git a/src/specklepy/api/resources/user.py b/src/specklepy/api/resources/deprecated/user.py similarity index 98% rename from src/specklepy/api/resources/user.py rename to src/specklepy/api/resources/deprecated/user.py index 3f45768..6d45033 100644 --- a/src/specklepy/api/resources/user.py +++ b/src/specklepy/api/resources/deprecated/user.py @@ -4,7 +4,7 @@ from typing import List, Optional, Union from deprecated import deprecated from specklepy.api.models import PendingStreamCollaborator, User -from specklepy.core.api.resources.user import Resource as CoreResource +from specklepy.core.api.resources.deprecated.user import Resource as CoreResource from specklepy.logging import metrics from specklepy.logging.exceptions import SpeckleException diff --git a/src/specklepy/core/api/client.py b/src/specklepy/core/api/client.py index 8bc8ca9..3c1511d 100644 --- a/src/specklepy/core/api/client.py +++ b/src/specklepy/core/api/client.py @@ -11,21 +11,21 @@ from gql.transport.websockets import WebsocketsTransport from specklepy.core.api import resources from specklepy.core.api.credentials import Account, get_account_from_token from specklepy.core.api.resources import ( + ActiveUserResource, + ModelResource, + OtherUserResource, + ProjectInviteResource, + ProjectResource, + ServerResource, + SubscriptionResource, + VersionResource, branch, commit, object, - server, stream, subscriptions, user, ) -from specklepy.core.api.resources.active_user_resource import ActiveUserResource -from specklepy.core.api.resources.model_resource import ModelResource -from specklepy.core.api.resources.other_user_resource import OtherUserResource -from specklepy.core.api.resources.project_invite_resource import ProjectInviteResource -from specklepy.core.api.resources.project_resource import ProjectResource -from specklepy.core.api.resources.subscription_resource import SubscriptionResource -from specklepy.core.api.resources.version_resource import VersionResource from specklepy.logging import metrics from specklepy.logging.exceptions import SpeckleException, SpeckleWarning @@ -198,7 +198,7 @@ class SpeckleClient: return self.httpclient.execute(query) def _init_resources(self) -> None: - self.server = server.Resource( + self.server = ServerResource( account=self.account, basepath=self.url, client=self.httpclient ) diff --git a/src/specklepy/core/api/credentials.py b/src/specklepy/core/api/credentials.py index 9999ce2..5b0eeaa 100644 --- a/src/specklepy/core/api/credentials.py +++ b/src/specklepy/core/api/credentials.py @@ -5,7 +5,7 @@ from urllib.parse import urlparse from pydantic import BaseModel, Field # pylint: disable=no-name-in-module -from specklepy.core.api.models import ServerInfo +from specklepy.core.api.models.deprecated import ServerInfo from specklepy.core.helpers import speckle_path_provider from specklepy.logging.exceptions import SpeckleException from specklepy.transports.sqlite import SQLiteTransport diff --git a/src/specklepy/core/api/inputs/project_inputs.py b/src/specklepy/core/api/inputs/project_inputs.py index 3cb19ea..fa7261d 100644 --- a/src/specklepy/core/api/inputs/project_inputs.py +++ b/src/specklepy/core/api/inputs/project_inputs.py @@ -2,7 +2,7 @@ from typing import Optional, Sequence from pydantic import BaseModel -from specklepy.core.api.models import ProjectVisibility +from specklepy.core.api.enums import ProjectVisibility class ProjectCreateInput(BaseModel): diff --git a/src/specklepy/core/api/models/__init__.py b/src/specklepy/core/api/models/__init__.py new file mode 100644 index 0000000..92c7247 --- /dev/null +++ b/src/specklepy/core/api/models/__init__.py @@ -0,0 +1,71 @@ +from specklepy.core.api.models.current import ( + AuthStrategy, + LimitedUser, + Model, + ModelWithVersions, + PendingStreamCollaborator, + Project, + ProjectCollaborator, + ProjectCommentCollection, + ProjectWithModels, + ProjectWithTeam, + ResourceCollection, + ServerConfiguration, + ServerInfo, + ServerMigration, + User, + UserSearchResultCollection, + Version, +) +from specklepy.core.api.models.deprecated import ( + Activity, + ActivityCollection, + Branch, + Branches, + Collaborator, + Commit, + Commits, + Object, + Stream, + Streams, +) +from specklepy.core.api.models.subscription_messages import ( + ProjectModelsUpdatedMessage, + ProjectUpdatedMessage, + ProjectVersionsUpdatedMessage, + UserProjectsUpdatedMessage, +) + +__all__ = [ + "User", + "ResourceCollection", + "ServerMigration", + "AuthStrategy", + "ServerConfiguration", + "ServerInfo", + "LimitedUser", + "PendingStreamCollaborator", + "ProjectCollaborator", + "Version", + "Model", + "ModelWithVersions", + "Project", + "ProjectWithModels", + "ProjectWithTeam", + "ProjectCommentCollection", + "UserSearchResultCollection", + "UserProjectsUpdatedMessage", + "ProjectModelsUpdatedMessage", + "ProjectUpdatedMessage", + "ProjectVersionsUpdatedMessage", + "Collaborator", + "Commit", + "Commits", + "Object", + "Branch", + "Branches", + "Stream", + "Streams", + "Activity", + "ActivityCollection", +] diff --git a/src/specklepy/core/api/new_models.py b/src/specklepy/core/api/models/current.py similarity index 82% rename from src/specklepy/core/api/new_models.py rename to src/specklepy/core/api/models/current.py index f166386..549c4c4 100644 --- a/src/specklepy/core/api/new_models.py +++ b/src/specklepy/core/api/models/current.py @@ -3,17 +3,33 @@ from typing import Generic, List, Optional, TypeVar from pydantic import BaseModel -from specklepy.core.api.enums import ( - ProjectModelsUpdatedMessageType, - ProjectUpdatedMessageType, - ProjectVersionsUpdatedMessageType, - ProjectVisibility, - UserProjectsUpdatedMessageType, -) +from specklepy.core.api.enums import ProjectVisibility +from specklepy.core.api.models.deprecated import Streams T = TypeVar("T") +class User(BaseModel): + id: str + email: Optional[str] = None + name: str + bio: Optional[str] = None + company: Optional[str] = None + avatar: Optional[str] = None + verified: Optional[bool] = None + role: Optional[str] = None + streams: Optional["Streams"] = None + + def __repr__(self): + return ( + f"User( id: {self.id}, name: {self.name}, email: {self.email}, company:" + f" {self.company} )" + ) + + def __str__(self) -> str: + return self.__repr__() + + class ResourceCollection(BaseModel, Generic[T]): totalCount: int items: List[T] @@ -153,28 +169,3 @@ class ProjectCommentCollection(ResourceCollection[T], Generic[T]): class UserSearchResultCollection(BaseModel): items: List[LimitedUser] cursor: Optional[str] = None - - -class UserProjectsUpdatedMessage(BaseModel): - id: str - type: UserProjectsUpdatedMessageType - project: Optional[Project] - - -class ProjectModelsUpdatedMessage(BaseModel): - id: str - type: ProjectModelsUpdatedMessageType - model: Optional[Model] - - -class ProjectUpdatedMessage(BaseModel): - id: str - type: ProjectUpdatedMessageType - project: Optional[Project] - - -class ProjectVersionsUpdatedMessage(BaseModel): - id: str - type: ProjectVersionsUpdatedMessageType - modelId: Optional[str] - version: Optional[Version] diff --git a/src/specklepy/core/api/models.py b/src/specklepy/core/api/models/deprecated.py similarity index 89% rename from src/specklepy/core/api/models.py rename to src/specklepy/core/api/models/deprecated.py index 741bf66..1ea17fc 100644 --- a/src/specklepy/core/api/models.py +++ b/src/specklepy/core/api/models/deprecated.py @@ -4,33 +4,10 @@ from typing import List, Optional from deprecated import deprecated from pydantic import BaseModel, Field -from specklepy.core.api.new_models import * # noqa: F403 - FE1_DEPRECATION_REASON = "Stream/Branch/Commit API is now deprecated, Use the new Project/Model/Version API functions in Client}" FE1_DEPRECATION_VERSION = "2.20" -class User(BaseModel): - id: str - email: Optional[str] = None - name: str - bio: Optional[str] = None - company: Optional[str] = None - avatar: Optional[str] = None - verified: Optional[bool] = None - role: Optional[str] = None - streams: Optional["Streams"] = None - - def __repr__(self): - return ( - f"User( id: {self.id}, name: {self.name}, email: {self.email}, company:" - f" {self.company} )" - ) - - def __str__(self) -> str: - return self.__repr__() - - @deprecated(reason=FE1_DEPRECATION_REASON, version=FE1_DEPRECATION_VERSION) class Collaborator(BaseModel): id: Optional[str] = None diff --git a/src/specklepy/core/api/models/subscription_messages.py b/src/specklepy/core/api/models/subscription_messages.py new file mode 100644 index 0000000..35e4ed7 --- /dev/null +++ b/src/specklepy/core/api/models/subscription_messages.py @@ -0,0 +1,36 @@ +from typing import Optional + +from pydantic import BaseModel + +from specklepy.core.api.enums import ( + ProjectModelsUpdatedMessageType, + ProjectUpdatedMessageType, + ProjectVersionsUpdatedMessageType, + UserProjectsUpdatedMessageType, +) +from specklepy.core.api.models.current import Model, Project, Version + + +class UserProjectsUpdatedMessage(BaseModel): + id: str + type: UserProjectsUpdatedMessageType + project: Optional[Project] + + +class ProjectModelsUpdatedMessage(BaseModel): + id: str + type: ProjectModelsUpdatedMessageType + model: Optional[Model] + + +class ProjectUpdatedMessage(BaseModel): + id: str + type: ProjectUpdatedMessageType + project: Optional[Project] + + +class ProjectVersionsUpdatedMessage(BaseModel): + id: str + type: ProjectVersionsUpdatedMessageType + modelId: Optional[str] + version: Optional[Version] diff --git a/src/specklepy/core/api/resources/__init__.py b/src/specklepy/core/api/resources/__init__.py index e69de29..5321e24 100644 --- a/src/specklepy/core/api/resources/__init__.py +++ b/src/specklepy/core/api/resources/__init__.py @@ -0,0 +1,43 @@ +from specklepy.core.api.resources.current.active_user_resource import ActiveUserResource +from specklepy.core.api.resources.current.model_resource import ModelResource +from specklepy.core.api.resources.current.other_user_resource import OtherUserResource +from specklepy.core.api.resources.current.project_invite_resource import ( + ProjectInviteResource, +) +from specklepy.core.api.resources.current.project_resource import ProjectResource +from specklepy.core.api.resources.current.server_resource import ServerResource +from specklepy.core.api.resources.current.subscription_resource import ( + SubscriptionResource, +) +from specklepy.core.api.resources.current.version_resource import VersionResource +from specklepy.core.api.resources.deprecated import ( + active_user, + branch, + commit, + object, + other_user, + server, + stream, + subscriptions, + user, +) + +__all__ = [ + "ActiveUserResource", + "ModelResource", + "OtherUserResource", + "ProjectInviteResource", + "ProjectResource", + "ServerResource", + "SubscriptionResource", + "VersionResource", + "active_user", + "branch", + "commit", + "object", + "other_user", + "server", + "stream", + "subscriptions", + "user", +] diff --git a/src/specklepy/core/api/resources/active_user_resource.py b/src/specklepy/core/api/resources/current/active_user_resource.py similarity index 99% rename from src/specklepy/core/api/resources/active_user_resource.py rename to src/specklepy/core/api/resources/current/active_user_resource.py index 74bf496..90bee1c 100644 --- a/src/specklepy/core/api/resources/active_user_resource.py +++ b/src/specklepy/core/api/resources/current/active_user_resource.py @@ -7,14 +7,16 @@ from gql import gql from specklepy.core.api.inputs.project_inputs import UserProjectsFilter from specklepy.core.api.inputs.user_inputs import UserUpdateInput from specklepy.core.api.models import ( - FE1_DEPRECATION_REASON, - FE1_DEPRECATION_VERSION, ActivityCollection, PendingStreamCollaborator, + Project, ResourceCollection, User, ) -from specklepy.core.api.new_models import Project +from specklepy.core.api.models.deprecated import ( + FE1_DEPRECATION_REASON, + FE1_DEPRECATION_VERSION, +) from specklepy.core.api.resource import ResourceBase from specklepy.core.api.responses import DataResponse from specklepy.logging.exceptions import GraphQLException diff --git a/src/specklepy/core/api/resources/model_resource.py b/src/specklepy/core/api/resources/current/model_resource.py similarity index 98% rename from src/specklepy/core/api/resources/model_resource.py rename to src/specklepy/core/api/resources/current/model_resource.py index 87c2f60..6945bbd 100644 --- a/src/specklepy/core/api/resources/model_resource.py +++ b/src/specklepy/core/api/resources/current/model_resource.py @@ -9,7 +9,7 @@ from specklepy.core.api.inputs.model_inputs import ( UpdateModelInput, ) from specklepy.core.api.inputs.project_inputs import ProjectModelsFilter -from specklepy.core.api.new_models import Model, ModelWithVersions, ResourceCollection +from specklepy.core.api.models import Model, ModelWithVersions, ResourceCollection from specklepy.core.api.resource import ResourceBase from specklepy.core.api.responses import DataResponse diff --git a/src/specklepy/core/api/resources/other_user_resource.py b/src/specklepy/core/api/resources/current/other_user_resource.py similarity index 98% rename from src/specklepy/core/api/resources/other_user_resource.py rename to src/specklepy/core/api/resources/current/other_user_resource.py index 90ab175..c1c8acf 100644 --- a/src/specklepy/core/api/resources/other_user_resource.py +++ b/src/specklepy/core/api/resources/current/other_user_resource.py @@ -5,12 +5,14 @@ from deprecated import deprecated from gql import gql from specklepy.core.api.models import ( - FE1_DEPRECATION_REASON, - FE1_DEPRECATION_VERSION, ActivityCollection, LimitedUser, + UserSearchResultCollection, +) +from specklepy.core.api.models.deprecated import ( + FE1_DEPRECATION_REASON, + FE1_DEPRECATION_VERSION, ) -from specklepy.core.api.new_models import UserSearchResultCollection from specklepy.core.api.resource import ResourceBase from specklepy.core.api.responses import DataResponse from specklepy.logging.exceptions import SpeckleException diff --git a/src/specklepy/core/api/resources/project_invite_resource.py b/src/specklepy/core/api/resources/current/project_invite_resource.py similarity index 98% rename from src/specklepy/core/api/resources/project_invite_resource.py rename to src/specklepy/core/api/resources/current/project_invite_resource.py index fea5ca6..c931505 100644 --- a/src/specklepy/core/api/resources/project_invite_resource.py +++ b/src/specklepy/core/api/resources/current/project_invite_resource.py @@ -7,7 +7,7 @@ from specklepy.core.api.inputs.project_inputs import ( ProjectInviteCreateInput, ProjectInviteUseInput, ) -from specklepy.core.api.new_models import PendingStreamCollaborator, ProjectWithTeam +from specklepy.core.api.models import PendingStreamCollaborator, ProjectWithTeam from specklepy.core.api.resource import ResourceBase from specklepy.core.api.responses import DataResponse diff --git a/src/specklepy/core/api/resources/project_resource.py b/src/specklepy/core/api/resources/current/project_resource.py similarity index 98% rename from src/specklepy/core/api/resources/project_resource.py rename to src/specklepy/core/api/resources/current/project_resource.py index e4975cd..9029001 100644 --- a/src/specklepy/core/api/resources/project_resource.py +++ b/src/specklepy/core/api/resources/current/project_resource.py @@ -8,8 +8,7 @@ from specklepy.core.api.inputs.project_inputs import ( ProjectUpdateInput, ProjectUpdateRoleInput, ) -from specklepy.core.api.models import Project -from specklepy.core.api.new_models import ProjectWithModels, ProjectWithTeam +from specklepy.core.api.models import Project, ProjectWithModels, ProjectWithTeam from specklepy.core.api.resource import ResourceBase from specklepy.core.api.responses import DataResponse diff --git a/src/specklepy/core/api/resources/server.py b/src/specklepy/core/api/resources/current/server_resource.py similarity index 99% rename from src/specklepy/core/api/resources/server.py rename to src/specklepy/core/api/resources/current/server_resource.py index 4f869ce..b4bd494 100644 --- a/src/specklepy/core/api/resources/server.py +++ b/src/specklepy/core/api/resources/current/server_resource.py @@ -11,7 +11,7 @@ from specklepy.logging.exceptions import GraphQLException NAME = "server" -class Resource(ResourceBase): +class ServerResource(ResourceBase): """API Access class for the server""" def __init__(self, account, basepath, client) -> None: diff --git a/src/specklepy/core/api/resources/subscription_resource.py b/src/specklepy/core/api/resources/current/subscription_resource.py similarity index 99% rename from src/specklepy/core/api/resources/subscription_resource.py rename to src/specklepy/core/api/resources/current/subscription_resource.py index 447dd2e..da80b1d 100644 --- a/src/specklepy/core/api/resources/subscription_resource.py +++ b/src/specklepy/core/api/resources/current/subscription_resource.py @@ -6,7 +6,7 @@ from graphql import DocumentNode from pydantic import BaseModel from typing_extensions import TypeVar -from specklepy.core.api.new_models import ( +from specklepy.core.api.models import ( ProjectModelsUpdatedMessage, ProjectUpdatedMessage, ProjectVersionsUpdatedMessage, diff --git a/src/specklepy/core/api/resources/version_resource.py b/src/specklepy/core/api/resources/current/version_resource.py similarity index 98% rename from src/specklepy/core/api/resources/version_resource.py rename to src/specklepy/core/api/resources/current/version_resource.py index de9405a..f72ebe5 100644 --- a/src/specklepy/core/api/resources/version_resource.py +++ b/src/specklepy/core/api/resources/current/version_resource.py @@ -10,7 +10,7 @@ from specklepy.core.api.inputs.version_inputs import ( MoveVersionsInput, UpdateVersionInput, ) -from specklepy.core.api.new_models import ResourceCollection, Version +from specklepy.core.api.models import ResourceCollection, Version from specklepy.core.api.resource import ResourceBase from specklepy.core.api.responses import DataResponse diff --git a/src/specklepy/core/api/resources/active_user.py b/src/specklepy/core/api/resources/deprecated/active_user.py similarity index 62% rename from src/specklepy/core/api/resources/active_user.py rename to src/specklepy/core/api/resources/deprecated/active_user.py index 1d4aa3f..411c06d 100644 --- a/src/specklepy/core/api/resources/active_user.py +++ b/src/specklepy/core/api/resources/deprecated/active_user.py @@ -1,7 +1,7 @@ from deprecated import deprecated -from specklepy.core.api.models import FE1_DEPRECATION_VERSION -from specklepy.core.api.resources.active_user_resource import ActiveUserResource +from specklepy.core.api.models.deprecated import FE1_DEPRECATION_VERSION +from specklepy.core.api.resources import ActiveUserResource @deprecated( diff --git a/src/specklepy/core/api/resources/branch.py b/src/specklepy/core/api/resources/deprecated/branch.py similarity index 99% rename from src/specklepy/core/api/resources/branch.py rename to src/specklepy/core/api/resources/deprecated/branch.py index df633df..7967a4a 100644 --- a/src/specklepy/core/api/resources/branch.py +++ b/src/specklepy/core/api/resources/deprecated/branch.py @@ -3,7 +3,7 @@ from typing import Optional from deprecated import deprecated from gql import gql -from specklepy.core.api.models import ( +from specklepy.core.api.models.deprecated import ( FE1_DEPRECATION_REASON, FE1_DEPRECATION_VERSION, Branch, diff --git a/src/specklepy/core/api/resources/commit.py b/src/specklepy/core/api/resources/deprecated/commit.py similarity index 99% rename from src/specklepy/core/api/resources/commit.py rename to src/specklepy/core/api/resources/deprecated/commit.py index b2da0e7..6b8b3a1 100644 --- a/src/specklepy/core/api/resources/commit.py +++ b/src/specklepy/core/api/resources/deprecated/commit.py @@ -3,7 +3,7 @@ from typing import List, Optional, Union from deprecated import deprecated from gql import gql -from specklepy.core.api.models import ( +from specklepy.core.api.models.deprecated import ( FE1_DEPRECATION_REASON, FE1_DEPRECATION_VERSION, Commit, diff --git a/src/specklepy/core/api/resources/object.py b/src/specklepy/core/api/resources/deprecated/object.py similarity index 100% rename from src/specklepy/core/api/resources/object.py rename to src/specklepy/core/api/resources/deprecated/object.py diff --git a/src/specklepy/core/api/resources/other_user.py b/src/specklepy/core/api/resources/deprecated/other_user.py similarity index 62% rename from src/specklepy/core/api/resources/other_user.py rename to src/specklepy/core/api/resources/deprecated/other_user.py index 0db1b60..9f63043 100644 --- a/src/specklepy/core/api/resources/other_user.py +++ b/src/specklepy/core/api/resources/deprecated/other_user.py @@ -1,7 +1,7 @@ from deprecated import deprecated -from specklepy.core.api.models import FE1_DEPRECATION_VERSION -from specklepy.core.api.resources.other_user_resource import OtherUserResource +from specklepy.core.api.models.deprecated import FE1_DEPRECATION_VERSION +from specklepy.core.api.resources import OtherUserResource @deprecated( diff --git a/src/specklepy/core/api/resources/deprecated/server.py b/src/specklepy/core/api/resources/deprecated/server.py new file mode 100644 index 0000000..4abf4ad --- /dev/null +++ b/src/specklepy/core/api/resources/deprecated/server.py @@ -0,0 +1,11 @@ +from deprecated import deprecated + +from specklepy.core.api.models.deprecated import FE1_DEPRECATION_VERSION +from specklepy.core.api.resources import ServerResource + +NAME = "server" + + +@deprecated(reason="Renamed to ServerResource", version=FE1_DEPRECATION_VERSION) +class Resource(ServerResource): + """API Access class for the server""" diff --git a/src/specklepy/core/api/resources/stream.py b/src/specklepy/core/api/resources/deprecated/stream.py similarity index 99% rename from src/specklepy/core/api/resources/stream.py rename to src/specklepy/core/api/resources/deprecated/stream.py index 9db1368..21edafc 100644 --- a/src/specklepy/core/api/resources/stream.py +++ b/src/specklepy/core/api/resources/deprecated/stream.py @@ -5,12 +5,14 @@ from deprecated import deprecated from gql import gql from specklepy.core.api.models import ( - FE1_DEPRECATION_REASON, - FE1_DEPRECATION_VERSION, ActivityCollection, PendingStreamCollaborator, Stream, ) +from specklepy.core.api.models.deprecated import ( + FE1_DEPRECATION_REASON, + FE1_DEPRECATION_VERSION, +) from specklepy.core.api.resource import ResourceBase from specklepy.logging.exceptions import SpeckleException, UnsupportedException diff --git a/src/specklepy/core/api/resources/subscriptions.py b/src/specklepy/core/api/resources/deprecated/subscriptions.py similarity index 96% rename from src/specklepy/core/api/resources/subscriptions.py rename to src/specklepy/core/api/resources/deprecated/subscriptions.py index 055effd..f9826f5 100644 --- a/src/specklepy/core/api/resources/subscriptions.py +++ b/src/specklepy/core/api/resources/deprecated/subscriptions.py @@ -5,9 +5,12 @@ from deprecated import deprecated from gql import gql from graphql import DocumentNode -from specklepy.core.api.models import FE1_DEPRECATION_REASON, FE1_DEPRECATION_VERSION +from specklepy.core.api.models.deprecated import ( + FE1_DEPRECATION_REASON, + FE1_DEPRECATION_VERSION, + Stream, +) from specklepy.core.api.resource import ResourceBase -from specklepy.core.api.resources.stream import Stream from specklepy.logging.exceptions import SpeckleException NAME = "subscribe" diff --git a/src/specklepy/core/api/resources/user.py b/src/specklepy/core/api/resources/deprecated/user.py similarity index 100% rename from src/specklepy/core/api/resources/user.py rename to src/specklepy/core/api/resources/deprecated/user.py diff --git a/tests/integration/client/test_active_user.py b/tests/integration/client/test_active_user.py index 7f35139..89f2c83 100644 --- a/tests/integration/client/test_active_user.py +++ b/tests/integration/client/test_active_user.py @@ -2,7 +2,6 @@ import pytest from specklepy.api.client import SpeckleClient from specklepy.api.models import Activity, ActivityCollection, User -from specklepy.core.api.inputs.user_inputs import UserUpdateInput from specklepy.logging.exceptions import GraphQLException @@ -21,9 +20,9 @@ class TestUser: bio = "i am a ghost in the machine" with pytest.raises(GraphQLException): - client.active_user.update(input=UserUpdateInput()) + client.active_user.update(bio=None) - updated = client.active_user.update(input=UserUpdateInput(bio=bio)) + updated = client.active_user.update(bio=bio) assert isinstance(updated, User) assert isinstance(updated, User) diff --git a/tests/integration/client/test_active_user_resource.py b/tests/integration/client/test_active_user_resource.py index ac01cd5..ceba9f7 100644 --- a/tests/integration/client/test_active_user_resource.py +++ b/tests/integration/client/test_active_user_resource.py @@ -3,8 +3,8 @@ import pytest from specklepy.api.client import SpeckleClient from specklepy.core.api.inputs.project_inputs import ProjectCreateInput from specklepy.core.api.inputs.user_inputs import UserUpdateInput -from specklepy.core.api.models import User -from specklepy.core.api.new_models import ResourceCollection +from specklepy.core.api.models.current import ResourceCollection +from specklepy.core.api.models.deprecated import User @pytest.mark.run() diff --git a/tests/integration/client/test_model_resource.py b/tests/integration/client/test_model_resource.py index 6295a96..eddb125 100644 --- a/tests/integration/client/test_model_resource.py +++ b/tests/integration/client/test_model_resource.py @@ -7,8 +7,8 @@ from specklepy.core.api.inputs.model_inputs import ( UpdateModelInput, ) from specklepy.core.api.inputs.project_inputs import ProjectCreateInput -from specklepy.core.api.models import Model, Project -from specklepy.core.api.new_models import ProjectWithModels, ResourceCollection +from specklepy.core.api.models.current import ProjectWithModels, ResourceCollection +from specklepy.core.api.models.deprecated import Model, Project from specklepy.logging.exceptions import GraphQLException diff --git a/tests/integration/client/test_other_user_resource.py b/tests/integration/client/test_other_user_resource.py index 97fe451..2c39aaa 100644 --- a/tests/integration/client/test_other_user_resource.py +++ b/tests/integration/client/test_other_user_resource.py @@ -1,7 +1,7 @@ import pytest from specklepy.api.client import SpeckleClient -from specklepy.core.api.models import User +from specklepy.core.api.models.deprecated import User @pytest.mark.run() diff --git a/tests/integration/client/test_project_invite_resource.py b/tests/integration/client/test_project_invite_resource.py index f0e6878..1c51bd2 100644 --- a/tests/integration/client/test_project_invite_resource.py +++ b/tests/integration/client/test_project_invite_resource.py @@ -9,8 +9,8 @@ from specklepy.core.api.inputs.project_inputs import ( ProjectInviteUseInput, ProjectUpdateRoleInput, ) -from specklepy.core.api.models import PendingStreamCollaborator, Project -from specklepy.core.api.new_models import LimitedUser, ProjectWithTeam +from specklepy.core.api.models.current import LimitedUser, ProjectWithTeam +from specklepy.core.api.models.deprecated import PendingStreamCollaborator, Project @pytest.mark.run() diff --git a/tests/integration/client/test_project_resource.py b/tests/integration/client/test_project_resource.py index 05e25d5..261127c 100644 --- a/tests/integration/client/test_project_resource.py +++ b/tests/integration/client/test_project_resource.py @@ -6,7 +6,7 @@ from specklepy.core.api.inputs.project_inputs import ( ProjectCreateInput, ProjectUpdateInput, ) -from specklepy.core.api.models import Project +from specklepy.core.api.models.deprecated import Project from specklepy.logging.exceptions import GraphQLException diff --git a/tests/integration/client/test_subscription_resource.py b/tests/integration/client/test_subscription_resource.py index 0a4af5e..5ea5b72 100644 --- a/tests/integration/client/test_subscription_resource.py +++ b/tests/integration/client/test_subscription_resource.py @@ -15,7 +15,7 @@ from specklepy.core.api.inputs.project_inputs import ( ProjectCreateInput, ProjectUpdateInput, ) -from specklepy.core.api.new_models import ( +from specklepy.core.api.models.current import ( Model, Project, ProjectModelsUpdatedMessage, diff --git a/tests/integration/client/test_version_resource.py b/tests/integration/client/test_version_resource.py index ff7d89d..b0ab718 100644 --- a/tests/integration/client/test_version_resource.py +++ b/tests/integration/client/test_version_resource.py @@ -9,8 +9,8 @@ from specklepy.core.api.inputs.version_inputs import ( MoveVersionsInput, UpdateVersionInput, ) -from specklepy.core.api.models import Model, Project, Version -from specklepy.core.api.new_models import ModelWithVersions, ResourceCollection +from specklepy.core.api.models.current import ModelWithVersions, ResourceCollection +from specklepy.core.api.models.deprecated import Model, Project, Version from specklepy.logging.exceptions import GraphQLException from tests.integration.conftest import create_version diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py index 31910c0..1ce9c68 100644 --- a/tests/integration/conftest.py +++ b/tests/integration/conftest.py @@ -9,8 +9,8 @@ import requests from specklepy.api.client import SpeckleClient from specklepy.core.api import operations from specklepy.core.api.inputs.version_inputs import CreateVersionInput -from specklepy.core.api.models import Stream -from specklepy.core.api.new_models import Version +from specklepy.core.api.models.current import Version +from specklepy.core.api.models.deprecated import Stream from specklepy.logging import metrics from specklepy.objects.base import Base from specklepy.objects.fakemesh import FakeDirection, FakeMesh diff --git a/tests/unit/test_account_server_migration.py b/tests/unit/test_account_server_migration.py index a0af9c6..e66225f 100644 --- a/tests/unit/test_account_server_migration.py +++ b/tests/unit/test_account_server_migration.py @@ -6,7 +6,7 @@ from urllib.parse import urlparse import pytest from specklepy.core.api.credentials import Account, UserInfo, get_accounts_for_server -from specklepy.core.api.models import ServerInfo, ServerMigration +from specklepy.core.api.models.deprecated import ServerInfo, ServerMigration from specklepy.core.helpers import speckle_path_provider