Fix ResourceType::from_resource for resources with multiple extensions

Author: J-Bu

scim2_models/rfc7643/resource_type.py

@@ -1,5 +1,8 @@
 from typing import Annotated
 from typing import Optional
+from typing import Union
+from typing import get_args
+from typing import get_origin
 
 from pydantic import Field
 from typing_extensions import Self
@@ -82,7 +85,16 @@ def from_resource(cls, resource_model: type[Resource]) -> Self:
         """Build a naive ResourceType from a resource model."""
         schema = resource_model.model_fields["schemas"].default[0]
         name = schema.split(":")[-1]
-        extensions = resource_model.__pydantic_generic_metadata__["args"]
+        if resource_model.__pydantic_generic_metadata__["args"]:
+            extensions = resource_model.__pydantic_generic_metadata__["args"][0]
+            extensions = (
+                get_args(extensions)
+                if get_origin(extensions) == Union
+                else [extensions]
+            )
+        else:
+            extensions = []
+
         return ResourceType(
             id=name,
             name=name,

tests/test_resource_type.py

@@ -1,6 +1,11 @@
+from typing import Annotated
+from typing import Union
+
 from scim2_models import EnterpriseUser
+from scim2_models import Extension
 from scim2_models import Reference
 from scim2_models import ResourceType
+from scim2_models import Required
 from scim2_models import User
 
 
@@ -61,3 +66,28 @@ def test_from_resource_with_extensions():
         == "urn:ietf:params:scim:schemas:extension:enterprise:2.0:User"
     )
     assert not enterprise_user_rt.schema_extensions[0].required
+
+
+def test_from_resource_with_mulitple_extensions():
+    class TestExtension(Extension):
+        schemas: Annotated[list[str], Required.true] = ["urn:ietf:params:scim:schemas:extension:Test:1.0:User"]
+
+        test: str | None = None
+        test2: list[str] | None = None
+
+    enterprise_user_rt = ResourceType.from_resource(User[Union[EnterpriseUser, TestExtension]])
+    assert enterprise_user_rt.id == "User"
+    assert enterprise_user_rt.name == "User"
+    assert enterprise_user_rt.description == "User"
+    assert enterprise_user_rt.endpoint == "/Users"
+    assert enterprise_user_rt.schema_ == "urn:ietf:params:scim:schemas:core:2.0:User"
+    assert (
+        enterprise_user_rt.schema_extensions[0].schema_
+        == "urn:ietf:params:scim:schemas:extension:enterprise:2.0:User"
+    )
+    assert not enterprise_user_rt.schema_extensions[0].required
+    assert (
+        enterprise_user_rt.schema_extensions[1].schema_
+        == "urn:ietf:params:scim:schemas:extension:Test:1.0:User"
+    )
+    assert not enterprise_user_rt.schema_extensions[1].required