chore: bump to scim2-models 0.2.4

Author: azmeuk

pyproject.toml

@@ -29,7 +29,7 @@ classifiers = [
 requires-python = ">= 3.11"
 dependencies = [
     "scim2-filter-parser>=0.7.0",
-    "scim2-models>=0.2.3",
+    "scim2-models>=0.2.4",
     "werkzeug>=3.0.3",
 ]
 

scim2_server/operators.py

@@ -17,7 +17,6 @@
 from scim2_server.utils import get_by_alias
 from scim2_server.utils import get_or_create
 from scim2_server.utils import handle_extension
-from scim2_server.utils import is_multi_valued
 from scim2_server.utils import parse_new_value
 
 ATTRIBUTE_PATH_REGEX = re.compile(
@@ -221,7 +220,7 @@ class AddOperator(Operator):
     @classmethod
     def operation(cls, model: BaseModel, attribute: str, value: Any):
         alias = get_by_alias(model, attribute)
-        if is_multi_valued(model, alias) and isinstance(value, list):
+        if model.get_field_multiplicity(alias) and isinstance(value, list):
             for v in value:
                 cls.operation(model, attribute, v)
             return
@@ -234,7 +233,7 @@ def operation(cls, model: BaseModel, attribute: str, value: Any):
         if model.get_field_annotation(alias, Mutability) == Mutability.read_only:
             raise SCIMException(Error.make_mutability_error())
 
-        if is_multi_valued(model, alias):
+        if model.get_field_multiplicity(alias):
             if getattr(model, alias) is None:
                 setattr(model, alias, [])
             if getattr(new_value, "primary", False):
@@ -281,7 +280,7 @@ class ReplaceOperator(Operator):
     @classmethod
     def operation(cls, model: BaseModel, attribute: str, value: Any):
         alias = get_by_alias(model, attribute)
-        if is_multi_valued(model, alias) and not isinstance(value, list):
+        if model.get_field_multiplicity(alias) and not isinstance(value, list):
             raise SCIMException(Error.make_invalid_value_error())
 
         existing_value = getattr(model, alias)

scim2_server/utils.py

@@ -1,11 +1,7 @@
 import datetime
 import importlib
 import json
-from types import UnionType
 from typing import Any
-from typing import Union
-from typing import get_args
-from typing import get_origin
 
 from pydantic import EmailStr
 from pydantic import ValidationError
@@ -95,17 +91,6 @@ def get_by_alias(r: BaseModel, scim_name: str, allow_none: bool = False) -> str
         raise SCIMException(Error.make_no_target_error()) from e
 
 
-def is_multi_valued(model: BaseModel, attribute_name: str) -> bool:
-    """Check whether a given attribute of a model is multi-valued."""
-    attribute_type = model.model_fields[attribute_name].annotation
-
-    if get_origin(attribute_type) in (Union, UnionType):
-        attribute_type = get_args(attribute_type)[0]
-
-    origin = get_origin(attribute_type)
-    return isinstance(origin, type) and issubclass(origin, list)
-
-
 def get_schemas(resource: Resource) -> list[str]:
     """Return a list of all schemas possible for a given resource.
 
@@ -136,7 +121,7 @@ def get_or_create(
             raise SCIMException(Error.make_mutability_error())
     ret = getattr(model, attribute_name, None)
     if not ret:
-        if is_multi_valued(model, attribute_name):
+        if model.get_field_multiplicity(attribute_name):
             ret = []
             setattr(model, attribute_name, ret)
         else:

tests/test_utils.py

@@ -15,7 +15,6 @@
 from scim2_server.operators import ResolveOperator
 from scim2_server.utils import SCIMException
 from scim2_server.utils import get_or_create
-from scim2_server.utils import is_multi_valued
 from scim2_server.utils import merge_resources
 
 
@@ -366,17 +365,6 @@ class Foo(Resource):
         with pytest.raises(SCIMException, match="mutability"):
             merge_resources(stored, Foo(immutable_string="D"))
 
-    def test_is_multi_valued(self):
-        class Foo(Resource):
-            schemas: list[str] = ["urn:example:2.0:Foo"]
-            some_string: str | None = None
-            multi_valued_string: list[str] | None = None
-
-        res = Foo()
-        assert is_multi_valued(res, "schemas")
-        assert not is_multi_valued(res, "some_string")
-        assert is_multi_valued(res, "multi_valued_string")
-
     def test_get_or_create_mutability(self):
         u = User()
         with pytest.raises(SCIMException, match="immutable"):