Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions doc/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ Changed
Fix
^^^
- Allow relative URLs in :data:`~scim2_models.Reference`.
- Models with multiples extensions could not be initialized. #37

[0.1.7] - 2024-06-16
--------------------
Expand Down
2 changes: 1 addition & 1 deletion doc/tutorial.rst
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ Schema extensions
=================

:rfc:`RFC7643 §3.3 <7643#section-3.3>` extensions are supported.
Extensions must be passed as resource type parameter, e.g. ``user = User[EnterpriseUser]`` or ``user = User[EnterpriseUser, SuperHero]``.
Extensions must be passed as resource type parameter, e.g. ``user = User[EnterpriseUser]`` or ``user = User[Union[EnterpriseUser, SuperHero]]``.
Extensions attributes are accessed with brackets, e.g. ``user[EnterpriseUser].employee_number``.

.. code-block:: python
Expand Down
3 changes: 3 additions & 0 deletions scim2_models/rfc7643/resource.py
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,9 @@ def get_extension_models(cls) -> Dict[str, Type]:
schemas."""

extension_models = cls.__pydantic_generic_metadata__.get("args", [])
if len(extension_models) == 1 and get_origin(extension_models[0]) == Union:
extension_models = get_args(extension_models[0])

by_schema = {
ext.model_fields["schemas"].default[0]: ext for ext in extension_models
}
Expand Down
20 changes: 20 additions & 0 deletions tests/test_resource_extension.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
import datetime
from typing import List
from typing import Optional
from typing import Union

import pytest

from scim2_models import EnterpriseUser
from scim2_models import Manager
from scim2_models import Meta
from scim2_models import Resource
from scim2_models import User


Expand Down Expand Up @@ -180,3 +184,19 @@ def test_invalid_setitem():

with pytest.raises(KeyError):
user[object] = "foobar"


class SuperHero(Resource):
schemas: List[str] = ["urn:ietf:params:scim:schemas:extension:enterprise:2.0:User"]

superpower: Optional[str] = None
"""The superhero superpower."""


def test_multiple_extensions_union():
"""Test that multiple extensions can be used by using Union."""

user_model = User[Union[EnterpriseUser, SuperHero]]
instance = user_model()
instance[SuperHero] = SuperHero(superpower="flight")
assert instance[SuperHero].superpower == "flight"