From: Aleš Mrázek Date: Fri, 25 Jul 2025 23:19:41 +0000 (+0200) Subject: python: datamodel/globals.py moved to utils/modeling/validation_context.py X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa8b418866e00fd6a813db4f0907c8144ecb58dc;p=thirdparty%2Fknot-resolver.git python: datamodel/globals.py moved to utils/modeling/validation_context.py --- diff --git a/python/knot_resolver/client/__init__.py b/python/knot_resolver/client/__init__.py index 5b82d3be8..1e8c1479d 100644 --- a/python/knot_resolver/client/__init__.py +++ b/python/knot_resolver/client/__init__.py @@ -1,5 +1,5 @@ from pathlib import Path -from knot_resolver.datamodel.globals import Context, set_global_validation_context +from knot_resolver.utils.modeling.validation_context import Context, set_global_validation_context set_global_validation_context(Context(Path("."), False)) diff --git a/python/knot_resolver/client/commands/convert.py b/python/knot_resolver/client/commands/convert.py index eea383e1f..3aa18ed92 100644 --- a/python/knot_resolver/client/commands/convert.py +++ b/python/knot_resolver/client/commands/convert.py @@ -5,9 +5,13 @@ from typing import List, Optional, Tuple, Type from knot_resolver.client.command import Command, CommandArgs, CompWords, comp_get_words, register_command from knot_resolver.datamodel import KresConfig -from knot_resolver.datamodel.globals import Context, reset_global_validation_context, set_global_validation_context from knot_resolver.utils.modeling import try_to_parse from knot_resolver.utils.modeling.exceptions import DataParsingError, DataValidationError +from knot_resolver.utils.modeling.validation_context import ( + Context, + reset_global_validation_context, + set_global_validation_context, +) @register_command diff --git a/python/knot_resolver/client/commands/validate.py b/python/knot_resolver/client/commands/validate.py index 2a336db3e..d2f604598 100644 --- a/python/knot_resolver/client/commands/validate.py +++ b/python/knot_resolver/client/commands/validate.py @@ -5,9 +5,13 @@ from typing import List, Tuple, Type from knot_resolver.client.command import Command, CommandArgs, CompWords, comp_get_words, register_command from knot_resolver.datamodel import KresConfig -from knot_resolver.datamodel.globals import Context, reset_global_validation_context, set_global_validation_context from knot_resolver.utils.modeling import try_to_parse from knot_resolver.utils.modeling.exceptions import DataParsingError, DataValidationError +from knot_resolver.utils.modeling.validation_context import ( + Context, + reset_global_validation_context, + set_global_validation_context, +) @register_command diff --git a/python/knot_resolver/datamodel/config_schema.py b/python/knot_resolver/datamodel/config_schema.py index 2cc2680c9..617306291 100644 --- a/python/knot_resolver/datamodel/config_schema.py +++ b/python/knot_resolver/datamodel/config_schema.py @@ -9,7 +9,6 @@ from knot_resolver.datamodel.defer_schema import DeferSchema from knot_resolver.datamodel.dns64_schema import Dns64Schema from knot_resolver.datamodel.dnssec_schema import DnssecSchema from knot_resolver.datamodel.forward_schema import ForwardSchema -from knot_resolver.datamodel.globals import Context, get_global_validation_context, set_global_validation_context from knot_resolver.datamodel.local_data_schema import LocalDataSchema, RPZSchema, RuleSchema from knot_resolver.datamodel.logging_schema import LoggingSchema from knot_resolver.datamodel.lua_schema import LuaSchema @@ -25,6 +24,11 @@ from knot_resolver.datamodel.webmgmt_schema import WebmgmtSchema from knot_resolver.utils.modeling import ConfigSchema from knot_resolver.utils.modeling.base_schema import lazy_default from knot_resolver.utils.modeling.exceptions import AggregateDataValidationError, DataValidationError +from knot_resolver.utils.modeling.validation_context import ( + Context, + get_global_validation_context, + set_global_validation_context, +) WORKERS_MAX = 256 diff --git a/python/knot_resolver/datamodel/types/files.py b/python/knot_resolver/datamodel/types/files.py index 1e7cea040..58777f684 100644 --- a/python/knot_resolver/datamodel/types/files.py +++ b/python/knot_resolver/datamodel/types/files.py @@ -8,8 +8,12 @@ from pwd import getpwnam, getpwuid from typing import Any, Dict, Tuple, Type, TypeVar from knot_resolver.constants import GROUP, USER -from knot_resolver.datamodel.globals import get_permissions_default, get_resolve_root, get_strict_validation from knot_resolver.utils.modeling.base_value_type import BaseValueType +from knot_resolver.utils.modeling.validation_context import ( + get_permissions_default, + get_resolve_root, + get_strict_validation, +) logger = logging.getLogger(__name__) diff --git a/python/knot_resolver/manager/server.py b/python/knot_resolver/manager/server.py index 8096f03cc..c40d4d3c5 100644 --- a/python/knot_resolver/manager/server.py +++ b/python/knot_resolver/manager/server.py @@ -26,7 +26,6 @@ from knot_resolver.controller.registered_workers import command_single_registere from knot_resolver.datamodel import kres_config_json_schema from knot_resolver.datamodel.cache_schema import CacheClearRPCSchema from knot_resolver.datamodel.config_schema import KresConfig, get_rundir_without_validation -from knot_resolver.datamodel.globals import Context, set_global_validation_context from knot_resolver.datamodel.management_schema import ManagementSchema from knot_resolver.manager import files, metrics from knot_resolver.utils import custom_atexit as atexit @@ -39,6 +38,7 @@ from knot_resolver.utils.modeling.exceptions import AggregateDataValidationError from knot_resolver.utils.modeling.parsing import DataFormat, data_combine, try_to_parse from knot_resolver.utils.modeling.query import query from knot_resolver.utils.modeling.types import NoneType +from knot_resolver.utils.modeling.validation_context import Context, set_global_validation_context from knot_resolver.utils.systemd_notify import systemd_notify from .config_store import ConfigStore diff --git a/python/knot_resolver/datamodel/globals.py b/python/knot_resolver/utils/modeling/validation_context.py similarity index 100% rename from python/knot_resolver/datamodel/globals.py rename to python/knot_resolver/utils/modeling/validation_context.py diff --git a/tests/manager/__init__.py b/tests/manager/__init__.py index 5b82d3be8..1e8c1479d 100644 --- a/tests/manager/__init__.py +++ b/tests/manager/__init__.py @@ -1,5 +1,5 @@ from pathlib import Path -from knot_resolver.datamodel.globals import Context, set_global_validation_context +from knot_resolver.utils.modeling.validation_context import Context, set_global_validation_context set_global_validation_context(Context(Path("."), False))