scim2-server 0.1.8__tar.gz → 0.2.0__tar.gz

{scim2_server-0.1.8 → scim2_server-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: scim2-server
-Version: 0.1.8
+Version: 0.2.0
 Summary: Lightweight SCIM2 server prototype
 Keywords: scim,scim2,provisioning,rfc7643,rfc7644
 Author: Yaal Coop, Christian Friedrich Coors
@@ -222,8 +222,8 @@ Requires-Dist: scim2-filter-parser>=0.7.0
 Requires-Dist: scim2-models>=0.6.1
 Requires-Dist: werkzeug>=3.0.3
 Requires-Python: >=3.10
-Project-URL: funding, https://github.com/sponsors/python-scim
 Project-URL: repository, https://github.com/python-scim/scim2-server
+Project-URL: funding, https://github.com/sponsors/python-scim
 Description-Content-Type: text/markdown
 
 # scim2-server
@@ -247,7 +247,7 @@ The only optional feature currently missing is support for Bulk operations ([RFC
 ## Usage
 
 ```shell
-$ scim2-server [-h] [--schema SCHEMA] [--resource-type RESOURCE_TYPE] [--bearer-token BEARER_TOKEN] [--hostname HOSTNAME] [--port PORT] [--reverse-proxy] [--dump-resources DUMP_RESOURCES]
+$ scim2-server [-h] [--schema SCHEMA] [--resource-type RESOURCE_TYPE] [--bearer-token BEARER_TOKEN] [--hostname HOSTNAME] [--port PORT] [--reverse-proxy] [--dump-resources DUMP_RESOURCES] [--debug]
 ```
 
 - `-h`/`--help`: Show help message
@@ -258,6 +258,18 @@ $ scim2-server [-h] [--schema SCHEMA] [--resource-type RESOURCE_TYPE] [--bearer-
 - `--hostname`: The hostname to listen on. Defaults to `127.0.0.1`.
 - `--port`: The port to listen on. Defaults to `8080`.
 - `--dump-resources`: Dump a JSON document containing all resources when the provider exits normally.
+- `--debug`: Enable the interactive Werkzeug debugger, the reloader and the logging of the WSGI environment of each request. The debugger allows arbitrary code execution and the environment contains the bearer tokens, so never use this option on a server reachable by others.
+
+### Container
+
+A container image is published on the GitHub container registry for each release.
+The server listens on `0.0.0.0:8080` inside the container, and the command line arguments are passed to `scim2-server`:
+
+```shell
+$ docker run --publish 8080:8080 ghcr.io/python-scim/scim2-server --bearer-token secret
+```
+
+To build the image yourself, use `docker build --file Containerfile .` or `podman build .`.
 
 ## Notes
 

{scim2_server-0.1.8 → scim2_server-0.2.0}/README.md

@@ -19,7 +19,7 @@ The only optional feature currently missing is support for Bulk operations ([RFC
 ## Usage
 
 ```shell
-$ scim2-server [-h] [--schema SCHEMA] [--resource-type RESOURCE_TYPE] [--bearer-token BEARER_TOKEN] [--hostname HOSTNAME] [--port PORT] [--reverse-proxy] [--dump-resources DUMP_RESOURCES]
+$ scim2-server [-h] [--schema SCHEMA] [--resource-type RESOURCE_TYPE] [--bearer-token BEARER_TOKEN] [--hostname HOSTNAME] [--port PORT] [--reverse-proxy] [--dump-resources DUMP_RESOURCES] [--debug]
 ```
 
 - `-h`/`--help`: Show help message
@@ -30,6 +30,18 @@ $ scim2-server [-h] [--schema SCHEMA] [--resource-type RESOURCE_TYPE] [--bearer-
 - `--hostname`: The hostname to listen on. Defaults to `127.0.0.1`.
 - `--port`: The port to listen on. Defaults to `8080`.
 - `--dump-resources`: Dump a JSON document containing all resources when the provider exits normally.
+- `--debug`: Enable the interactive Werkzeug debugger, the reloader and the logging of the WSGI environment of each request. The debugger allows arbitrary code execution and the environment contains the bearer tokens, so never use this option on a server reachable by others.
+
+### Container
+
+A container image is published on the GitHub container registry for each release.
+The server listens on `0.0.0.0:8080` inside the container, and the command line arguments are passed to `scim2-server`:
+
+```shell
+$ docker run --publish 8080:8080 ghcr.io/python-scim/scim2-server --bearer-token secret
+```
+
+To build the image yourself, use `docker build --file Containerfile .` or `podman build .`.
 
 ## Notes
 

scim2_server-0.2.0/pyproject.toml

@@ -0,0 +1,174 @@
+[build-system]
+requires = ["uv_build>=0.12.16,<0.13.0"]
+build-backend = "uv_build"
+
+[project]
+name = "scim2-server"
+version = "0.2.0"
+description = "Lightweight SCIM2 server prototype"
+readme = "README.md"
+keywords = [
+    "scim",
+    "scim2",
+    "provisioning",
+    "rfc7643",
+    "rfc7644",
+]
+classifiers = [
+    "Intended Audience :: Developers",
+    "Development Status :: 4 - Beta",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
+    "Programming Language :: Python :: Implementation :: CPython",
+    "License :: OSI Approved :: Apache Software License",
+    "Environment :: Web Environment",
+    "Programming Language :: Python",
+    "Operating System :: OS Independent",
+]
+requires-python = ">= 3.10"
+dependencies = [
+    "scim2-filter-parser>=0.7.0",
+    "scim2-models>=0.6.1",
+    "werkzeug>=3.0.3",
+]
+
+[[project.authors]]
+name = "Yaal Coop"
+email = "contact@yaal.coop"
+
+[[project.authors]]
+name = "Christian Friedrich Coors"
+email = "me@ccoors.de"
+
+[project.license]
+file = "LICENSE"
+
+[project.urls]
+repository = "https://github.com/python-scim/scim2-server"
+funding = "https://github.com/sponsors/python-scim"
+
+[project.scripts]
+scim2-server = "scim2_server.cli:main"
+
+[dependency-groups]
+dev = [
+    "httpx>=0.27.0",
+    "pytest>=8.2.2",
+    "pytest-coverage>=0.0",
+    "prek>=0.1.0",
+    "time-machine>=2.14.2",
+    "tox-uv>=1.16.0",
+]
+
+[tool.uv.build-backend]
+module-root = ""
+
+[tool.coverage.run]
+source = [
+    "scim2_server",
+    "tests",
+]
+omit = [
+    ".tox/*",
+    "examples/*",
+    "scim2_server/cli.py",
+]
+branch = true
+
+[tool.coverage.report]
+exclude_lines = [
+    "@pytest.mark.skip",
+    "@pytest.mark.xfail",
+    "pragma: no cover",
+    "raise NotImplementedError",
+    '\.\.\.\s*$',
+]
+
+[tool.ruff.lint]
+select = [
+    "B",
+    "D",
+    "E",
+    "F",
+    "I",
+    "UP",
+]
+ignore = [
+    "E501",
+    "E722",
+    "D100",
+    "D101",
+    "D102",
+    "D103",
+    "D104",
+    "D105",
+    "D106",
+    "D107",
+    "D203",
+    "D213",
+]
+
+[tool.ruff.lint.isort]
+force-single-line = true
+
+[tool.ruff.format]
+docstring-code-format = true
+
+[tool.pytest.ini_options]
+addopts = "--doctest-modules --doctest-glob='*.rst'"
+doctest_optionflags = "ALLOW_UNICODE IGNORE_EXCEPTION_DETAIL ELLIPSIS"
+
+[tool.tox]
+requires = ["tox>=4.19"]
+env_list = [
+    "style",
+    "py310",
+    "py311",
+    "py312",
+    "py313",
+    "py314",
+    "minversions",
+    "coverage",
+]
+
+[tool.tox.env_run_base]
+runner = "uv-venv-lock-runner"
+dependency_groups = ["dev"]
+commands = [[
+    "pytest",
+    "--showlocals",
+    "--full-trace",
+    "{posargs}",
+]]
+
+[tool.tox.env.style]
+runner = "uv-venv-runner"
+commands = [[
+    "prek",
+    "run",
+    "--all-files",
+    "--show-diff-on-failure",
+]]
+
+[tool.tox.env.minversions]
+runner = "uv-venv-runner"
+uv_resolution = "lowest-direct"
+
+[tool.tox.env.coverage]
+commands = [
+    [
+    "pytest",
+    "--cov",
+    "--cov-fail-under=100",
+    "--cov-report",
+    "term:skip-covered",
+    "{posargs}",
+],
+    [
+    "coverage",
+    "html",
+],
+]

scim2_server-0.1.8/pyproject.toml → scim2_server-0.2.0/pyproject.toml.orig

@@ -1,10 +1,10 @@
 [build-system]
-requires = ["uv_build>=0.8.9,<0.9.0"]
+requires = ["uv_build>=0.12.16,<0.13.0"]
 build-backend = "uv_build"
 
 [project]
 name = "scim2-server"
-version = "0.1.8"
+version = "0.2.0"
 description = "Lightweight SCIM2 server prototype"
 authors = [
     {name="Yaal Coop", email="contact@yaal.coop"},

{scim2_server-0.1.8 → scim2_server-0.2.0}/scim2_server/backend.py

@@ -11,7 +11,6 @@ from scim2_filter_parser.parser import SCIMParser
 from scim2_models import Attribute
 from scim2_models import BaseModel
 from scim2_models import CaseExact
-from scim2_models import Error
 from scim2_models import Extension
 from scim2_models import Meta
 from scim2_models import Resource
@@ -19,11 +18,11 @@ from scim2_models import ResourceType
 from scim2_models import Schema
 from scim2_models import SearchRequest
 from scim2_models import Uniqueness
+from scim2_models import UniquenessException
 from werkzeug.http import generate_etag
 
 from scim2_server.filter import evaluate_filter
 from scim2_server.operators import ResolveSortOperator
-from scim2_server.utils import SCIMException
 from scim2_server.utils import get_by_alias
 
 
@@ -120,10 +119,9 @@ class Backend:
             Resources. The List must contain a copy of resources.
             Mutating elements in the List must not modify the data
             stored in the backend.
-        :raises SCIMException: If the backend only supports querying for
-            one resource type at a time, setting resource_type_id to
-            None the backend may raise a
-            SCIMException(Error.make_too_many_error()).
+        :raises TooManyException: If the backend only supports querying
+            for one resource type at a time, setting resource_type_id to
+            None the backend may raise TooManyException.
         """
         raise NotImplementedError
 
@@ -353,7 +351,7 @@ class InMemoryBackend(Backend):
                 if existing_resource.meta.resource_type == resource_type_id:
                     existing_value = unique_attribute.get_attribute(existing_resource)
                     if existing_value == new_value:
-                        raise SCIMException(Error.make_uniqueness_error())
+                        raise UniquenessException()
 
         self.resources.append(resource)
         return resource
@@ -392,7 +390,7 @@ class InMemoryBackend(Backend):
                             existing_resource
                         )
                         if existing_value == new_value:
-                            raise SCIMException(Error.make_uniqueness_error())
+                            raise UniquenessException()
 
             self.resources[found_res_idx] = updated_resource
             return updated_resource

{scim2_server-0.1.8 → scim2_server-0.2.0}/scim2_server/cli.py

@@ -44,9 +44,14 @@ def main():
         type=argparse.FileType("w"),
         help="Dump resources to a JSON file on exit",
     )
+    parser.add_argument(
+        "--debug",
+        action="store_true",
+        help="Enable the interactive debugger, the reloader and the logging of the WSGI environment",
+    )
     args = parser.parse_args()
 
-    logging.basicConfig(level=logging.DEBUG)
+    logging.basicConfig(level=logging.DEBUG if args.debug else logging.INFO)
 
     from werkzeug.serving import run_simple
 
@@ -77,7 +82,8 @@ def main():
         for bearer_token in args.bearer_token:
             app.register_bearer_token(bearer_token)
 
-    app = log_environ(app)
+    if args.debug:
+        app = log_environ(app)
     if args.reverse_proxy:
         app = ProxyFix(app, x_for=1, x_proto=1, x_host=1, x_port=1, x_prefix=1)
 
@@ -85,8 +91,8 @@ def main():
         args.hostname,
         args.port,
         app,
-        use_debugger=True,
-        use_reloader=True,
+        use_debugger=args.debug,
+        use_reloader=args.debug,
     )
 
     if args.dump_resources:

{scim2_server-0.1.8 → scim2_server-0.2.0}/scim2_server/filter.py

@@ -3,9 +3,8 @@ from types import NoneType
 from scim2_filter_parser import ast as scim2ast
 from scim2_models import BaseModel
 from scim2_models import CaseExact
-from scim2_models import Error
+from scim2_models import InvalidFilterException
 
-from scim2_server.utils import SCIMException
 from scim2_server.utils import get_by_alias
 from scim2_server.utils import parse_new_value
 
@@ -125,4 +124,4 @@ def check_comparable_value(value):
     status code 400) with "scimType" of "invalidFilter"."
     """
     if isinstance(value, bytes | bool | NoneType):
-        raise SCIMException(Error.make_invalid_filter_error())
+        raise InvalidFilterException()

{scim2_server-0.1.8 → scim2_server-0.2.0}/scim2_server/operators.py

@@ -5,15 +5,18 @@ from scim2_filter_parser.lexer import SCIMLexer
 from scim2_filter_parser.parser import SCIMParser
 from scim2_models import BaseModel
 from scim2_models import CaseExact
-from scim2_models import Error
+from scim2_models import InvalidPathException
+from scim2_models import InvalidValueException
 from scim2_models import Mutability
+from scim2_models import MutabilityException
+from scim2_models import NoTargetException
 from scim2_models import PatchOperation
 from scim2_models import Required
 from scim2_models import Resource
 from scim2_models import Returned
+from scim2_models import SensitiveException
 
 from scim2_server.filter import evaluate_filter
-from scim2_server.utils import SCIMException
 from scim2_server.utils import get_by_alias
 from scim2_server.utils import get_or_create
 from scim2_server.utils import handle_extension
@@ -55,7 +58,7 @@ def parse_attribute_path(attribute_path: str | None) -> dict[str, Any] | None:
 
     match = ATTRIBUTE_PATH_REGEX.match(attribute_path)
     if not match:
-        raise SCIMException(Error.make_invalid_path_error())
+        raise InvalidPathException()
     parse_attribute_path.cache[attribute_path] = match.groupdict()
     return match.groupdict()
 
@@ -148,7 +151,7 @@ class Operator:
         attribute_name = get_by_alias(type(model), attribute)
         multi_valued_attribute = get_or_create(model, attribute_name, True)
         if not isinstance(multi_valued_attribute, list):
-            raise SCIMException(Error.make_invalid_path_error())
+            raise InvalidPathException()
         token_stream = SCIMLexer().tokenize(condition)
         condition = SCIMParser().parse(token_stream)
         self.init_return(model, attribute_name, sub_attribute, self.value)
@@ -160,13 +163,13 @@ class Operator:
         self, attribute: str, condition: str, model: BaseModel
     ):
         if self.REQUIRES_VALUE and not isinstance(self.value, dict):
-            raise SCIMException(Error.make_invalid_value_error())
+            raise InvalidValueException()
         attribute_name = get_by_alias(type(model), attribute)
         multi_valued_attribute = get_or_create(
             model, attribute_name, self.REQUIRES_VALUE
         )
         if not isinstance(multi_valued_attribute, list):
-            raise SCIMException(Error.make_invalid_path_error())
+            raise InvalidPathException()
         token_stream = SCIMLexer().tokenize(condition)
         condition = SCIMParser().parse(token_stream)
         if self.REQUIRES_VALUE:
@@ -196,7 +199,7 @@ class Operator:
                 self.match_attribute(sub_path, value)
         else:
             if not isinstance(complex_attribute, BaseModel):
-                raise SCIMException(Error.make_invalid_path_error())
+                raise InvalidPathException()
             self.match_attribute(sub_path, complex_attribute)
 
     def match_attribute(self, attribute: str, model: BaseModel):
@@ -205,9 +208,9 @@ class Operator:
 
     def call_on_root(self, model: Resource):
         if not self.OPERATE_ON_ROOT:
-            raise SCIMException(Error.make_no_target_error())
+            raise NoTargetException()
         if not isinstance(self.value, dict):
-            raise SCIMException(Error.make_invalid_value_error())
+            raise InvalidValueException()
         for k, v in self.value.items():
             ext, scim_name = handle_extension(model, k)
             if ext == model:
@@ -233,7 +236,7 @@ class AddOperator(Operator):
             return
 
         if model.get_field_annotation(alias, Mutability) == Mutability.read_only:
-            raise SCIMException(Error.make_mutability_error())
+            raise MutabilityException()
 
         if model.get_field_multiplicity(alias):
             if getattr(model, alias) is None:
@@ -247,7 +250,7 @@ class AddOperator(Operator):
                 model.get_field_annotation(alias, Required) == Required.true
                 and not new_value
             ):
-                raise SCIMException(Error.make_invalid_value_error())
+                raise InvalidValueException()
             setattr(model, alias, new_value)
 
 
@@ -268,10 +271,10 @@ class RemoveOperator(Operator):
             Mutability.read_only,
             Mutability.immutable,
         ):
-            raise SCIMException(Error.make_mutability_error())
+            raise MutabilityException()
 
         if model.get_field_annotation(alias, Required) == Required.true:
-            raise SCIMException(Error.make_invalid_value_error())
+            raise InvalidValueException()
 
         setattr(model, alias, None)
 
@@ -283,7 +286,7 @@ class ReplaceOperator(Operator):
     def operation(cls, model: BaseModel, attribute: str, value: Any):
         alias = get_by_alias(type(model), attribute)
         if model.get_field_multiplicity(alias) and not isinstance(value, list):
-            raise SCIMException(Error.make_invalid_value_error())
+            raise InvalidValueException()
 
         existing_value = getattr(model, alias)
         new_value = parse_new_value(model, alias, value)
@@ -291,13 +294,13 @@ class ReplaceOperator(Operator):
             return
 
         if model.get_field_annotation(alias, Mutability) == Mutability.read_only:
-            raise SCIMException(Error.make_mutability_error())
+            raise MutabilityException()
 
         if (
             model.get_field_annotation(alias, Required) == Required.true
             and not new_value
         ):
-            raise SCIMException(Error.make_invalid_value_error())
+            raise InvalidValueException()
         setattr(model, alias, new_value)
 
 
@@ -372,7 +375,7 @@ class ResolveOperator(Operator):
             model.get_field_annotation(alias, Mutability) == Mutability.write_only
             or model.get_field_annotation(alias, Returned) == Returned.never
         ):
-            raise SCIMException(Error.make_sensitive_error())
+            raise SensitiveException()
 
     @classmethod
     def operation(

{scim2_server-0.1.8 → scim2_server-0.2.0}/scim2_server/provider.py

@@ -20,6 +20,7 @@ from scim2_models import PatchOp
 from scim2_models import Resource
 from scim2_models import ResourceType
 from scim2_models import Schema
+from scim2_models import SCIMException
 from scim2_models import SearchRequest
 from scim2_models import ServiceProviderConfig
 from scim2_models import Sort
@@ -39,7 +40,6 @@ from werkzeug.routing.exceptions import RequestRedirect
 
 from scim2_server.backend import Backend
 from scim2_server.operators import patch_resource
-from scim2_server.utils import SCIMException
 from scim2_server.utils import merge_resources
 
 
@@ -537,7 +537,7 @@ class SCIMProvider:
             return self.make_error(Error(status=e.code, detail=e.description))
         except SCIMException as e:
             self.log.exception(e)
-            return self.make_error(e.scim_error)
+            return self.make_error(e.to_error())
         except ValidationError as e:
             self.log.exception(e)
             return self.make_error(Error(status=400, detail=str(e)))

{scim2_server-0.1.8 → scim2_server-0.2.0}/scim2_server/utils.py

@@ -8,21 +8,16 @@ from typing import Any
 from pydantic import EmailStr
 from pydantic import ValidationError
 from scim2_models import BaseModel
-from scim2_models import Error
 from scim2_models import Extension
+from scim2_models import InvalidValueException
 from scim2_models import Mutability
+from scim2_models import MutabilityException
+from scim2_models import NoTargetException
 from scim2_models import Resource
 from scim2_models import ResourceType
 from scim2_models import Schema
 
 
-class SCIMException(Exception):
-    """A wrapper class, because an "Error" does not inherit from Exception and should not be raised."""
-
-    def __init__(self, scim_error: Error):
-        self.scim_error = scim_error
-
-
 def load_json_resource(json_name: str) -> list:
     """Load a JSON document from the scim2_server package resources."""
     fp = importlib.resources.files("scim2_server") / "resources" / json_name
@@ -69,7 +64,7 @@ def merge_resources(target: Resource, updates: BaseModel):
         if mutability == Mutability.immutable and getattr(
             target, set_attribute
         ) not in (None, new_value):
-            raise SCIMException(Error.make_mutability_error())
+            raise MutabilityException()
         setattr(target, set_attribute, new_value)
 
 
@@ -82,8 +77,8 @@ def get_by_alias(
     :param scim_name: SCIM attribute name
     :param allow_none: Allow returning None if attribute is not found
     :return: pydantic attribute name
-    :raises SCIMException: If no attribute is found and allow_none is
-        False
+    :raises NoTargetException: If no attribute is found and allow_none
+        is False
     """
     try:
         return next(
@@ -94,7 +89,7 @@ def get_by_alias(
     except StopIteration as e:
         if allow_none:
             return None
-        raise SCIMException(Error.make_no_target_error()) from e
+        raise NoTargetException() from e
 
 
 def get_or_create(
@@ -107,7 +102,7 @@ def get_or_create(
     :param check_mutability: If True, validate that the attribute is
         mutable
     :return: A complex attribute model
-    :raises SCIMException: If attribute is not mutable and
+    :raises MutabilityException: If attribute is not mutable and
         check_mutability is True
     """
     if check_mutability:
@@ -115,7 +110,7 @@ def get_or_create(
             Mutability.read_only,
             Mutability.immutable,
         ):
-            raise SCIMException(Error.make_mutability_error())
+            raise MutabilityException()
     ret = getattr(model, attribute_name, None)
     if not ret:
         if model.get_field_multiplicity(attribute_name):
@@ -149,51 +144,56 @@ def handle_extension(resource: Resource, scim_name: str) -> tuple[BaseModel, str
     return resource, scim_name
 
 
-def model_validate_from_dict(field_root_type: type[BaseModel], value: dict) -> Any:
-    """Workaround for some of the "special" requirements for MS Entra, mixing display and displayName in some cases."""
-    if (
-        "display" not in value
-        and "display" in field_root_type.model_fields
-        and "displayName" in value
-    ):
-        value["display"] = value["displayName"]
-        del value["displayName"]
-    return field_root_type.model_validate(value)
+def parse_value(field_root_type: type, value: Any) -> Any:
+    """Parse a PATCH value according to the target field root type."""
+    if isinstance(value, dict):
+        if not hasattr(field_root_type, "model_fields"):
+            raise TypeError
+
+        # Work around mixed display/displayName payloads emitted by MS Entra.
+        if (
+            "display" not in value
+            and "display" in field_root_type.model_fields
+            and "displayName" in value
+        ):
+            value = value.copy()
+            value["display"] = value["displayName"]
+            del value["displayName"]
+        return field_root_type.model_validate(value)
+
+    if field_root_type is bool and isinstance(value, str):
+        return not value.lower() == "false"
+
+    if field_root_type is datetime.datetime and isinstance(value, str):
+        # ISO 8601 datetime format (notably with the Z suffix) are only supported from Python 3.11
+        if sys.version_info < (3, 11):  # pragma: no cover
+            return datetime.datetime.fromisoformat(re.sub(r"Z$", "+00:00", value))
+        return datetime.datetime.fromisoformat(value)
+
+    if field_root_type is EmailStr and isinstance(value, str):
+        return value
+
+    if hasattr(field_root_type, "model_fields"):
+        primary_value = get_by_alias(field_root_type, "value", True)
+        if primary_value is not None:
+            return field_root_type(value=value)
+        raise TypeError
+
+    return field_root_type(value)
 
 
 def parse_new_value(model: BaseModel, attribute_name: str, value: Any) -> Any:
     """Given a model and attribute name, attempt to parse a new value so that the type matches the type expected by the model.
 
-    :raises SCIMException: If attribute can not be mapped to the
-        required type
+    :raises InvalidValueException: If attribute can not be mapped to
+        the required type
     """
     field_root_type = model.get_field_root_type(attribute_name)
     try:
-        if isinstance(value, dict):
-            new_value = model_validate_from_dict(field_root_type, value)
-        elif isinstance(value, list):
-            new_value = [model_validate_from_dict(field_root_type, v) for v in value]
+        if isinstance(value, list):
+            new_value = [parse_value(field_root_type, v) for v in value]
         else:
-            if field_root_type is bool and isinstance(value, str):
-                new_value = not value.lower() == "false"
-            elif field_root_type is datetime.datetime and isinstance(value, str):
-                # ISO 8601 datetime format (notably with the Z suffix) are only supported from Python 3.11
-                if sys.version_info < (3, 11):  # pragma: no cover
-                    new_value = datetime.datetime.fromisoformat(
-                        re.sub(r"Z$", "+00:00", value)
-                    )
-                else:
-                    new_value = datetime.datetime.fromisoformat(value)
-            elif field_root_type is EmailStr and isinstance(value, str):
-                new_value = value
-            elif hasattr(field_root_type, "model_fields"):
-                primary_value = get_by_alias(field_root_type, "value", True)
-                if primary_value is not None:
-                    new_value = field_root_type(value=value)
-                else:
-                    raise TypeError
-            else:
-                new_value = field_root_type(value)
+            new_value = parse_value(field_root_type, value)
     except (AttributeError, TypeError, ValueError, ValidationError) as e:
-        raise SCIMException(Error.make_invalid_value_error()) from e
+        raise InvalidValueException() from e
     return new_value