mirror of
https://github.com/apache/superset.git
synced 2026-09-05 23:12:01 +00:00
Enzo MartellucciandClaude Sonnet 5
0aec4e04e3
check_dependencies has zero callers today, so this has never been
exercised: it read an x-dependsOn entry (e.g. "dataBinding", the
schema-facing alias) directly as a getattr name against the parsed model,
but Pydantic attribute access always uses the Python field name
("data_binding"), never the alias, even under populate_by_name=True --
confirmed directly against a real parsed model. Resolves alias -> field
name via model_fields before getattr, falling back to the raw name for
anything that isn't aliased.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
129 lines
4.0 KiB
Python
129 lines
4.0 KiB
Python
# Licensed to the Apache Software Foundation (ASF) under one
|
|
# or more contributor license agreements. See the NOTICE file
|
|
# distributed with this work for additional information
|
|
# regarding copyright ownership. The ASF licenses this file
|
|
# to you under the Apache License, Version 2.0 (the
|
|
# "License"); you may not use this file except in compliance
|
|
# with the License. You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing,
|
|
# software distributed under the License is distributed on an
|
|
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
|
# KIND, either express or implied. See the License for the
|
|
# specific language governing permissions and limitations
|
|
# under the License.
|
|
from __future__ import annotations
|
|
|
|
from typing import ClassVar
|
|
|
|
import pytest
|
|
from pydantic import BaseModel, ConfigDict, Field
|
|
from superset_core.semantic_layers.config import (
|
|
build_configuration_schema,
|
|
check_dependencies,
|
|
)
|
|
|
|
|
|
class _NoOverride(BaseModel):
|
|
b: int = 0
|
|
a: int = 0
|
|
|
|
|
|
class _WithOverride(BaseModel):
|
|
field_order: ClassVar[list[str]] = ["a", "b"]
|
|
|
|
b: int = 0
|
|
a: int = 0
|
|
|
|
|
|
class _WithBadOverride(BaseModel):
|
|
field_order: ClassVar[list[str]] = ["a", "c"]
|
|
|
|
b: int = 0
|
|
a: int = 0
|
|
|
|
|
|
class _Nested(BaseModel):
|
|
field_order: ClassVar[list[str]] = ["y", "x"]
|
|
|
|
x: int = 0
|
|
y: int = 0
|
|
|
|
|
|
class _NestedBase(BaseModel):
|
|
y: int
|
|
|
|
|
|
class _NestedComposed(_NestedBase):
|
|
field_order: ClassVar[list[str]] = ["y", "x"]
|
|
|
|
x: int
|
|
|
|
|
|
class _Outer(BaseModel):
|
|
nested: _Nested
|
|
|
|
|
|
class _OuterComposed(BaseModel):
|
|
nested: _NestedComposed
|
|
|
|
|
|
def test_no_field_order_behaves_as_today() -> None:
|
|
# Unchanged behavior: model-field declaration order (b, a), not alphabetical.
|
|
schema = build_configuration_schema(_NoOverride)
|
|
assert list(schema["properties"]) == ["b", "a"]
|
|
|
|
|
|
def test_field_order_override_reorders_properties() -> None:
|
|
schema = build_configuration_schema(_WithOverride)
|
|
assert list(schema["properties"]) == ["a", "b"]
|
|
|
|
|
|
def test_field_order_override_must_be_exact_permutation() -> None:
|
|
with pytest.raises(ValueError, match="field_order"):
|
|
build_configuration_schema(_WithBadOverride)
|
|
|
|
|
|
def test_field_order_applies_to_nested_defs_models() -> None:
|
|
# `_Nested` only ever appears inside `$defs`, never as the top-level
|
|
# `config_class` -- this is the DataBinding-inside-MetricTileControls shape.
|
|
schema = build_configuration_schema(_Outer)
|
|
assert list(schema["$defs"]["_Nested"]["properties"]) == ["y", "x"]
|
|
|
|
|
|
def test_field_order_on_nested_model_with_inherited_field() -> None:
|
|
# `x` is inherited from `_NestedBase` (like DataBinding inheriting
|
|
# `metrics` from MetricControl), so Pydantic's natural field order would
|
|
# put `x` first; the override pins it back.
|
|
schema = build_configuration_schema(_OuterComposed)
|
|
assert list(schema["$defs"]["_NestedComposed"]["properties"]) == ["y", "x"]
|
|
assert schema["$defs"]["_NestedComposed"]["required"] == ["y", "x"]
|
|
|
|
|
|
class _Aliased(BaseModel):
|
|
model_config = ConfigDict(populate_by_name=True)
|
|
|
|
data_binding: int = Field(alias="dataBinding")
|
|
|
|
|
|
def test_check_dependencies_resolves_alias() -> None:
|
|
# x-dependsOn is written using the schema-facing alias ("dataBinding"),
|
|
# but Pydantic attribute access always uses the Python field name
|
|
# ("data_binding") -- confirmed directly that getattr(parsed, "dataBinding")
|
|
# misses even under populate_by_name=True.
|
|
configuration = _Aliased(dataBinding=1)
|
|
assert getattr(configuration, "dataBinding", "MISSING") == "MISSING"
|
|
assert check_dependencies({"x-dependsOn": ["dataBinding"]}, configuration)
|
|
|
|
|
|
def test_check_dependencies_false_when_dependency_falsy() -> None:
|
|
configuration = _Aliased(dataBinding=0)
|
|
assert not check_dependencies({"x-dependsOn": ["dataBinding"]}, configuration)
|
|
|
|
|
|
def test_check_dependencies_true_when_no_dependencies_declared() -> None:
|
|
configuration = _Aliased(dataBinding=0)
|
|
assert check_dependencies({}, configuration)
|