From 7b91f6f2c641c094ab5c1b9af3ee122039926ee7 Mon Sep 17 00:00:00 2001 From: Dan Allan Date: Fri, 21 Feb 2025 12:32:05 -0500 Subject: [PATCH] Update imports --- tiled/server/app.py | 2 +- tiled/server/authentication.py | 2 +- tiled/server/core.py | 3 +-- tiled/server/router.py | 3 +-- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/tiled/server/app.py b/tiled/server/app.py index 54429b2c5..e873ab47f 100644 --- a/tiled/server/app.py +++ b/tiled/server/app.py @@ -36,13 +36,13 @@ from tiled.server.protocols import ExternalAuthenticator, InternalAuthenticator +from .. import schemas from ..config import construct_build_app_kwargs from ..media_type_registration import ( compression_registry as default_compression_registry, ) from ..utils import SHARE_TILED_PATH, Conflicts, SpecialUsers, UnsupportedQueryType from ..validation_registration import validation_registry as default_validation_registry -from . import schemas from .authentication import get_current_principal from .compression import CompressionMiddleware from .dependencies import ( diff --git a/tiled/server/authentication.py b/tiled/server/authentication.py index dc974fe04..4dd3be474 100644 --- a/tiled/server/authentication.py +++ b/tiled/server/authentication.py @@ -46,6 +46,7 @@ from pydantic import BaseModel +from .. import schemas from ..authn_database import orm from ..authn_database.connection_pool import get_database_session from ..authn_database.core import ( @@ -58,7 +59,6 @@ lookup_valid_session, ) from ..utils import SHARE_TILED_PATH, SpecialUsers -from . import schemas from .core import DEFAULT_PAGE_SIZE, MAX_PAGE_SIZE, json_or_msgpack from .protocols import InternalAuthenticator, UserSessionState from .settings import Settings, get_settings diff --git a/tiled/server/core.py b/tiled/server/core.py index 65be00c5a..be4496953 100644 --- a/tiled/server/core.py +++ b/tiled/server/core.py @@ -21,7 +21,7 @@ from starlette.status import HTTP_200_OK, HTTP_304_NOT_MODIFIED, HTTP_400_BAD_REQUEST # Some are not directly used, but they register things on import. -from .. import queries +from .. import queries, schemas from ..adapters.mapping import MapAdapter from ..queries import KeyLookup, QueryValueError from ..serialization import register_builtin_serializers @@ -33,7 +33,6 @@ ensure_awaitable, safe_json_dump, ) -from . import schemas from .etag import tokenize from .links import links_for_node from .utils import record_timing diff --git a/tiled/server/router.py b/tiled/server/router.py index d5f613920..fcf852542 100644 --- a/tiled/server/router.py +++ b/tiled/server/router.py @@ -29,11 +29,10 @@ from tiled.schemas import About from tiled.server.protocols import ExternalAuthenticator, InternalAuthenticator -from .. import __version__ +from .. import __version__, schemas from ..structures.core import Spec, StructureFamily from ..utils import ensure_awaitable, patch_mimetypes, path_from_uri from ..validation_registration import ValidationError -from . import schemas from .authentication import get_authenticators, get_current_principal from .core import ( DEFAULT_PAGE_SIZE,