refactor: use scim2-models path management

Author: azmeuk

doc/changelog.rst

@@ -1,6 +1,13 @@
 Changelog
 =========
 
+[0.2.5] - Unreleased
+--------------------
+
+Changed
+^^^^^^^
+- Use scim2-models native path management.
+
 [0.2.4] - 2025-10-10
 --------------------
 

pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "uv_build"
 [project]
 name = "scim2-tester"
 version = "0.2.4"
-description = " Check SCIM RFCs server compliance"
+description = "Check SCIM RFCs server compliance"
 authors = [{name="Yaal Coop", email="contact@yaal.coop"}]
 license = {file = "LICENSE.md"}
 readme = "README.md"
@@ -27,8 +27,8 @@ classifiers = [
 
 requires-python = ">= 3.10"
 dependencies = [
-    "scim2-client>=0.6.1",
-    "scim2-models>=0.5.0",
+    "scim2-client>=0.7.0",
+    "scim2-models>=0.6.1",
 ]
 
 [project.urls]
@@ -40,9 +40,6 @@ funding = "https://github.com/sponsors/python-scim"
 [tool.uv.build-backend]
 module-root = ""
 
-[tool.uv.sources]
-scim2-models = { path = "../scim2-models", editable = true }
-
 [project.optional-dependencies]
 httpx = [
     "scim2-client[httpx]>=0.4.0",

scim2_tester/checkers/resource_get.py

@@ -19,7 +19,7 @@ def _model_from_resource_type(
     corresponding Python model class registered in the SCIM client.
     """
     for resource_model in context.client.resource_models:
-        if resource_model.model_fields["schemas"].default[0] == resource_type.schema_:
+        if resource_model.__schema__ == resource_type.schema_:
             return resource_model
 
     return None

scim2_tester/filling.py

@@ -5,20 +5,15 @@
 from inspect import isclass
 from typing import TYPE_CHECKING
 from typing import Any
-from typing import get_args
-from typing import get_origin
 
+from pydantic import Base64Bytes
 from scim2_models import ComplexAttribute
 from scim2_models import Extension
-from scim2_models import ExternalReference
 from scim2_models import Mutability
 from scim2_models import Reference
 from scim2_models import Required
 from scim2_models import Resource
-from scim2_models import URIReference
 from scim2_models.path import Path
-from scim2_models.utils import UNION_TYPES
-from scim2_models.utils import Base64Bytes
 
 if TYPE_CHECKING:
     from scim2_tester.utils import CheckContext
@@ -37,23 +32,13 @@ def get_random_example_value(path: Path[Any]) -> Any | None:
 
 
 def get_model_from_ref_type(
-    context: "CheckContext", ref_type: type, different_than: type[Resource[Any]] | None
+    context: "CheckContext",
+    ref_type: type[Reference],
+    different_than: type[Resource[Any]] | None,
 ) -> type[Resource[Any]]:
-    """Return "User" from "Union[Literal['User'], Literal['Group']]"."""
-
-    def get_model_from_ref_type_(ref_type: type) -> Any:
-        if get_origin(ref_type) in UNION_TYPES:
-            return [
-                get_model_from_ref_type_(sub_ref_type)
-                for sub_ref_type in get_args(ref_type)
-            ]
-
-        model_name = get_args(ref_type)[0]
-        model = context.client.get_resource_model(model_name)
-        return model
-
-    models = get_model_from_ref_type_(ref_type)
-    models = models if isinstance(models, list) else [models]
+    """Return the Resource model referenced by a Reference type."""
+    ref_names = ref_type.__reference_types__
+    models = [context.client.get_resource_model(ref_name) for ref_name in ref_names]
     acceptable_models = [model for model in models if model != different_than]
 
     if not acceptable_models:
@@ -116,16 +101,17 @@ def generate_random_value(
     elif field_type is bool:
         value = random.choice([True, False])
 
-    elif get_origin(field_type) is Reference and get_args(field_type)[0] != Any:
-        ref_type = get_args(field_type)[0]
-        if ref_type not in (ExternalReference, URIReference):
-            ref_model = get_model_from_ref_type(context, ref_type, different_than=model)
+    elif isclass(field_type) and issubclass(field_type, Reference):
+        ref_types = field_type.__reference_types__
+        if not ref_types or "external" in ref_types or "uri" in ref_types:
+            value = f"https://{str(uuid.uuid4())}.test"
+        else:
+            ref_model = get_model_from_ref_type(
+                context, field_type, different_than=model
+            )
             ref_obj = context.resource_manager.create_and_register(ref_model)
             value = ref_obj.meta.location if ref_obj.meta else None
 
-        else:
-            value = f"https://{str(uuid.uuid4())}.test"
-
     elif isclass(field_type) and issubclass(field_type, Enum):
         value = random.choice(list(field_type))
 
@@ -134,11 +120,6 @@ def generate_random_value(
             context, field_type(), mutability=mutability, required=required
         )  # type: ignore[arg-type]
 
-    elif isclass(field_type) and issubclass(field_type, Extension):
-        value = fill_with_random_values(
-            context, field_type(), mutability=mutability, required=required
-        )  # type: ignore[arg-type]
-
     elif field_type is None and isclass(model) and issubclass(model, Extension):
         value = fill_with_random_values(
             context, model(), mutability=mutability, required=required

tests/conftest.py

@@ -11,10 +11,12 @@
 
 @pytest.fixture
 def scim_client(httpserver):
-    client = Client(base_url=f"http://localhost:{httpserver.port}")
-    scim_client = SyncSCIMClient(client, resource_models=[User[EnterpriseUser], Group])
-    scim_client.register_naive_resource_types()
-    return scim_client
+    with Client(base_url=f"http://localhost:{httpserver.port}") as client:
+        scim_client = SyncSCIMClient(
+            client, resource_models=[User[EnterpriseUser], Group]
+        )
+        scim_client.register_naive_resource_types()
+        yield scim_client
 
 
 @pytest.fixture

tests/test_filling.py

@@ -1,14 +1,15 @@
 """Test automatic field filling functionality."""
 
 from typing import Annotated
-from typing import Literal
+from typing import Union
 from unittest.mock import patch
 
 from scim2_models import Email
 from scim2_models import EnterpriseUser
 from scim2_models import Group
 from scim2_models import Mutability
 from scim2_models import PhoneNumber
+from scim2_models import Reference
 from scim2_models import Required
 from scim2_models import User
 from scim2_models.attributes import ComplexAttribute
@@ -32,7 +33,7 @@ def test_generate_random_value_bytes_field(testing_context):
 
 def test_model_resolution_from_reference_type(testing_context):
     """Ensures model resolution from reference type excludes specified models."""
-    ref_type = Literal["User"] | Literal["Group"]
+    ref_type = Reference[Union["User", "Group"]]
     different_than = Group
 
     result = get_model_from_ref_type(testing_context, ref_type, different_than)
@@ -239,7 +240,7 @@ class TestComplexAttr(ComplexAttribute):
         immutable_field: Annotated[str | None, Mutability.immutable] = None
 
     class TestResource(Resource):
-        schemas: list[str] = ["urn:test:TestResource"]
+        __schema__: str = "urn:test:TestResource"
         test_attr: TestComplexAttr | None = None
 
     filled = fill_with_random_values(testing_context, TestResource())
@@ -261,7 +262,7 @@ class TestResource(Resource):
 
 def test_get_model_from_ref_type_fallback_when_no_acceptable_models(testing_context):
     """Ensures fallback to first model when all models are excluded by different_than."""
-    ref_type = Literal["User"]
+    ref_type = Reference["User"]
     result = get_model_from_ref_type(
         testing_context, ref_type, different_than=User[EnterpriseUser]
     )

tests/test_resource.py

@@ -27,7 +27,7 @@ class Complex(ComplexAttribute):
 
 
 class CustomModel(Resource):
-    schemas: list[str] = ["org:test:CustomModel"]
+    __schema__: str = "org:test:CustomModel"
 
     class Type(str, Enum):
         foo = "foo"

tests/test_utils.py

@@ -14,6 +14,7 @@
 from scim2_tester.utils import checker
 from scim2_tester.utils import fields_equality
 from scim2_tester.utils import get_registered_tags
+from tests.utils import build_nested_response
 
 
 def test_checker_decorator_with_tags():
@@ -335,3 +336,14 @@ def test_check_result_repr():
     assert "title=" not in repr_str
     assert "reason='Success without name'" in repr_str
     assert "Status.SUCCESS" in repr_str
+
+
+def test_build_nested_response_with_unknown_extension_urn():
+    """Test build_nested_response initializes namespace for unknown extension URNs."""
+    base_response = {"id": "123", "userName": "test"}
+    path = "urn:custom:extension:fieldName"
+
+    result = build_nested_response(base_response, path, "value")
+
+    assert "urn:custom:extension" in result
+    assert result["urn:custom:extension"]["fieldName"] == "value"