Skip to content

Remove registry overrides when building app kwargs #1072

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 8, 2025
Merged

Remove registry overrides when building app kwargs #1072

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 13 additions & 37 deletions tiled/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,18 @@
from datetime import timedelta
from functools import cache
from pathlib import Path
from typing import Optional

import jsonschema

from .adapters.mapping import MapAdapter
from .media_type_registration import (
CompressionRegistry,
SerializationRegistry,
default_compression_registry,
default_deserialization_registry,
default_serialization_registry,
)
from .query_registration import QueryRegistry, default_query_registry
from .query_registration import default_query_registry
from .utils import import_object, parse, prepend_to_sys_path
from .validation_registration import ValidationRegistry, default_validation_registry
from .validation_registration import default_validation_registry


@cache
Expand All @@ -39,38 +36,17 @@ def schema():
return yaml.safe_load(file)


def construct_build_app_kwargs(
config,
*,
source_filepath=None,
query_registry: Optional[QueryRegistry] = None,
compression_registry: Optional[CompressionRegistry] = None,
serialization_registry: Optional[SerializationRegistry] = None,
deserialization_registry: Optional[SerializationRegistry] = None,
validation_registry: Optional[ValidationRegistry] = None,
):
def construct_build_app_kwargs(config, *, source_filepath=None):
"""
Given parsed configuration, construct arguments for build_app(...).

The parameters query_registry, compression_registry, and
serialization_registry are used by the tests to inject separate registry
instances. By default, the singleton global instances of these registries
are used (and modified).
The singleton global instances of the registries are used (and modified).
"""
config = copy.deepcopy(config) # Avoid mutating input.
startup_tasks = []
shutdown_tasks = []
background_tasks = []
if query_registry is None:
query_registry = default_query_registry
if serialization_registry is None:
serialization_registry = default_serialization_registry
if deserialization_registry is None:
deserialization_registry = default_deserialization_registry
if compression_registry is None:
compression_registry = default_compression_registry
if validation_registry is None:
validation_registry = default_validation_registry

sys_path_additions = []
if source_filepath:
if os.path.isdir(source_filepath):
Expand Down Expand Up @@ -186,30 +162,30 @@ def construct_build_app_kwargs(
for structure_family, values in config.get("media_types", {}).items():
for media_type, import_path in values.items():
serializer = import_object(import_path, accept_live_object=True)
serialization_registry.register(
default_serialization_registry.register(
structure_family, media_type, serializer
)
for ext, media_type in config.get("file_extensions", {}).items():
serialization_registry.register_alias(ext, media_type)
default_serialization_registry.register_alias(ext, media_type)

for item in config.get("specs", []):
if "validator" in item:
validator = import_object(item["validator"])
else:
# no-op
validator = _no_op_validator
validation_registry.register(item["spec"], validator)
default_validation_registry.register(item["spec"], validator)

# TODO Make compression_registry extensible via configuration.
return {
"tree": root_tree,
"authentication": auth_spec,
"server_settings": server_settings,
"query_registry": query_registry,
"serialization_registry": serialization_registry,
"deserialization_registry": deserialization_registry,
"compression_registry": compression_registry,
"validation_registry": validation_registry,
"query_registry": default_query_registry,
"serialization_registry": default_serialization_registry,
"deserialization_registry": default_deserialization_registry,
"compression_registry": default_compression_registry,
"validation_registry": default_validation_registry,
"tasks": {
"startup": startup_tasks,
"shutdown": shutdown_tasks,
Expand Down
Loading