chore: apply ruff migrations

Author: azmeuk

scim2_server/backend.py

@@ -4,10 +4,6 @@
 import pickle
 import uuid
 from threading import Lock
-from typing import Dict
-from typing import List
-from typing import Optional
-from typing import Tuple
 from typing import Union
 
 from scim2_filter_parser import lexer
@@ -35,10 +31,10 @@ class Backend:
     """The base class for a SCIM provider backend."""
 
     def __init__(self):
-        self.schemas: Dict[str, Schema] = {}
-        self.resource_types: Dict[str, ResourceType] = {}
-        self.resource_types_by_endpoint: Dict[str, ResourceType] = {}
-        self.models_dict: Dict[str, BaseModel] = {}
+        self.schemas: dict[str, Schema] = {}
+        self.resource_types: dict[str, ResourceType] = {}
+        self.resource_types_by_endpoint: dict[str, ResourceType] = {}
+        self.models_dict: dict[str, BaseModel] = {}
 
     def __enter__(self):
         """Allows the backend to be used as a context manager.
@@ -59,7 +55,7 @@ def get_schemas(self):
         """Returns all schemas registered with the backend."""
         return self.schemas.values()
 
-    def get_schema(self, schema_id: str) -> Optional[Schema]:
+    def get_schema(self, schema_id: str) -> Schema | None:
         """Gets a schema by its id."""
         return self.schemas.get(schema_id)
 
@@ -93,15 +89,15 @@ def get_resource_types(self):
         """Returns all resource types registered with the backend."""
         return self.resource_types.values()
 
-    def get_resource_type(self, resource_type_id: str) -> Optional[ResourceType]:
+    def get_resource_type(self, resource_type_id: str) -> ResourceType | None:
         """Returns the resource type by its id."""
         return self.resource_types.get(resource_type_id)
 
-    def get_resource_type_by_endpoint(self, endpoint: str) -> Optional[ResourceType]:
+    def get_resource_type_by_endpoint(self, endpoint: str) -> ResourceType | None:
         """Returns the resource type by its endpoint."""
         return self.resource_types_by_endpoint.get(endpoint.lower())
 
-    def get_model(self, resource_type_id: str) -> Optional[BaseModel]:
+    def get_model(self, resource_type_id: str) -> BaseModel | None:
         """Returns the Pydantic Python model for a given resource type."""
         return self.models_dict.get(resource_type_id)
 
@@ -112,8 +108,8 @@ def get_models(self):
     def query_resources(
         self,
         search_request: SearchRequest,
-        resource_type_id: Optional[str] = None,
-    ) -> Tuple[int, List[Resource]]:
+        resource_type_id: str | None = None,
+    ) -> tuple[int, list[Resource]]:
         """Queries the backend for a set of resources.
 
         :param search_request: SearchRequest instance describing the
@@ -131,7 +127,7 @@ def query_resources(
         """
         raise NotImplementedError
 
-    def get_resource(self, resource_type_id: str, object_id: str) -> Optional[Resource]:
+    def get_resource(self, resource_type_id: str, object_id: str) -> Resource | None:
         """Queries the backend for a resources by its ID.
 
         :param resource_type_id: ID of the resource type to get the
@@ -155,7 +151,7 @@ def delete_resource(self, resource_type_id: str, object_id: str) -> bool:
 
     def create_resource(
         self, resource_type_id: str, resource: Resource
-    ) -> Optional[Resource]:
+    ) -> Resource | None:
         """Creates a resource.
 
         :param resource_type_id: ID of the resource type to create.
@@ -168,7 +164,7 @@ def create_resource(
 
     def update_resource(
         self, resource_type_id: str, resource: Resource
-    ) -> Optional[Resource]:
+    ) -> Resource | None:
         """Updates a resource. The resource is identified by its ID.
 
         :param resource_type_id: ID of the resource type to update.
@@ -193,7 +189,7 @@ class InMemoryBackend(Backend):
     class UniquenessDescriptor:
         """Used to mimic uniqueness constraints e.g. from a SQL database."""
 
-        schema: Optional[str]
+        schema: str | None
         attribute_name: str
         case_exact: bool
 
@@ -207,8 +203,8 @@ def get_attribute(self, resource: Resource):
 
     @classmethod
     def collect_unique_attrs(
-        cls, attributes: List[Attribute], schema: Optional[str]
-    ) -> List[UniquenessDescriptor]:
+        cls, attributes: list[Attribute], schema: str | None
+    ) -> list[UniquenessDescriptor]:
         ret = []
         for attr in attributes:
             if attr.uniqueness != Uniqueness.none:
@@ -221,8 +217,8 @@ def collect_unique_attrs(
 
     @classmethod
     def collect_resource_unique_attrs(
-        cls, resource_type: ResourceType, schemas: Dict[str, Schema]
-    ) -> List[List[UniquenessDescriptor]]:
+        cls, resource_type: ResourceType, schemas: dict[str, Schema]
+    ) -> list[list[UniquenessDescriptor]]:
         ret = cls.collect_unique_attrs(schemas[resource_type.schema_].attributes, None)
         for extension in resource_type.schema_extensions or []:
             ret.extend(
@@ -234,8 +230,8 @@ def collect_resource_unique_attrs(
 
     def __init__(self):
         super().__init__()
-        self.resources: List[Resource] = []
-        self.unique_attributes: Dict[str, List[List[str]]] = {}
+        self.resources: list[Resource] = []
+        self.unique_attributes: dict[str, list[list[str]]] = {}
         self.lock: Lock = Lock()
 
     def __enter__(self):
@@ -261,8 +257,8 @@ def register_resource_type(self, resource_type: ResourceType):
     def query_resources(
         self,
         search_request: SearchRequest,
-        resource_type_id: Optional[str] = None,
-    ) -> Tuple[int, List[Resource]]:
+        resource_type_id: str | None = None,
+    ) -> tuple[int, list[Resource]]:
         start_index = (search_request.start_index or 1) - 1
 
         tree = None
@@ -304,7 +300,7 @@ def query_resources(
             found_resources = found_resources[: search_request.count]
         return len(found_resources), found_resources
 
-    def _get_resource_idx(self, resource_type_id: str, object_id: str) -> Optional[int]:
+    def _get_resource_idx(self, resource_type_id: str, object_id: str) -> int | None:
         return next(
             (
                 idx
@@ -314,7 +310,7 @@ def _get_resource_idx(self, resource_type_id: str, object_id: str) -> Optional[i
             None,
         )
 
-    def get_resource(self, resource_type_id: str, object_id: str) -> Optional[Resource]:
+    def get_resource(self, resource_type_id: str, object_id: str) -> Resource | None:
         resource_dict_idx = self._get_resource_idx(resource_type_id, object_id)
         if resource_dict_idx is not None:
             return self.resources[resource_dict_idx].model_copy(deep=True)
@@ -333,7 +329,7 @@ def delete_resource(self, resource_type_id: str, object_id: str) -> bool:
 
     def create_resource(
         self, resource_type_id: str, resource: Resource
-    ) -> Optional[Resource]:
+    ) -> Resource | None:
         resource = resource.model_copy(deep=True)
         resource.id = uuid.uuid4().hex
         utcnow = datetime.datetime.now(datetime.UTC)
@@ -372,7 +368,7 @@ def _touch_resource(resource: Resource, last_modified: datetime.datetime):
 
     def update_resource(
         self, resource_type_id: str, resource: Resource
-    ) -> Optional[Resource]:
+    ) -> Resource | None:
         found_res_idx = self._get_resource_idx(resource_type_id, resource.id)
         if found_res_idx is not None:
             updated_resource = self.models_dict[resource_type_id].model_validate(

scim2_server/filter.py

@@ -1,5 +1,4 @@
 from types import NoneType
-from typing import List
 
 from scim2_filter_parser import ast as scim2ast
 from scim2_models import BaseModel
@@ -12,8 +11,8 @@
 
 
 def evaluate_filter(
-    obj: BaseModel | List[BaseModel], tree: scim2ast.AST
-) -> bool | List[bool]:
+    obj: BaseModel | list[BaseModel], tree: scim2ast.AST
+) -> bool | list[bool]:
     """This implementation is limited by the specifics of the
     scim2_filter_parser module.
 
@@ -29,7 +28,7 @@ def evaluate_filter(
         case scim2ast.Filter:
             if tree.namespace is not None:
                 obj = ResolveOperator(tree.namespace.attr_name)(obj).get_values()
-            if isinstance(obj, List):
+            if isinstance(obj, list):
                 return [
                     o
                     for o in obj
@@ -124,5 +123,5 @@ def check_comparable_value(value):
     "Boolean and Binary attributes SHALL cause a failed response (HTTP
     status code 400) with "scimType" of "invalidFilter"."
     """
-    if isinstance(value, (bytes, bool, NoneType)):
+    if isinstance(value, bytes | bool | NoneType):
         raise SCIMException(Error.make_invalid_filter_error())

scim2_server/provider.py

@@ -2,8 +2,6 @@
 import json
 import logging
 import traceback
-from typing import Dict
-from typing import Optional
 from typing import Union
 from urllib.parse import urljoin
 
@@ -118,7 +116,7 @@ def __init__(self, backend: Backend):
     @staticmethod
     def adjust_location(
         request: Request, resource: Resource, cp=False
-    ) -> Optional[Resource]:
+    ) -> Resource | None:
         """Adjusts the "meta.location" attribute of a resource to match the
         hostname the client used to access this server. If a static URL is
         used,
@@ -246,7 +244,7 @@ def call_single_resource(
                     )
 
     @staticmethod
-    def get_attrs_from_request(request: Request) -> Dict:
+    def get_attrs_from_request(request: Request) -> dict:
         """Parses the "attributes" an "excludedAttributes" HTTP request
         parameters."""
         ret = {}
@@ -296,7 +294,7 @@ def build_search_request(self, request: Request) -> SearchRequest:
             search_request.sort_order = SearchRequest.SortOrder.descending
         return search_request
 
-    def query_resource(self, request: Request, resource: Optional[ResourceType]):
+    def query_resource(self, request: Request, resource: ResourceType | None):
         search_request = self.build_search_request(request)
 
         kwargs = {}

tests/conftest.py

@@ -1,6 +1,5 @@
 import importlib
 import json
-from typing import List
 
 import httpx
 import pytest
@@ -21,7 +20,7 @@ def static_data():
     return load_default_schemas(), load_default_resource_types()
 
 
-def load_json_resource(json_name: str) -> List:
+def load_json_resource(json_name: str) -> list:
     fp = importlib.resources.files("tests") / json_name
     with open(fp) as f:
         return json.load(f)

tests/integration/test_basic.py

@@ -1,4 +1,3 @@
-from typing import List
 from typing import Union
 
 from scim2_models import ListResponse
@@ -88,7 +87,7 @@ def test_unique_constraints(self, wsgi):
     def test_sort(self, provider, wsgi):
         TypedListResponse = ListResponse[Union[*provider.backend.get_models()]]
 
-        def assert_sorted(sort_by: str, sorted: List[str], endpoint: str = "/v2/Users"):
+        def assert_sorted(sort_by: str, sorted: list[str], endpoint: str = "/v2/Users"):
             for order_by, inverted in (
                 (None, False),
                 ("ascending", False),

tests/integration/test_scim_provider.py

@@ -545,17 +545,13 @@ def test_resource_search_post(self, wsgi, first_fake_user):
         assert r.status_code == 404
 
     def test_resource_meta_dates(self, wsgi, fake_user_data):
-        @time_machine.travel(
-            datetime.datetime(2024, 3, 14, 6, 00, tzinfo=datetime.timezone.utc)
-        )
+        @time_machine.travel(datetime.datetime(2024, 3, 14, 6, 00, tzinfo=datetime.UTC))
         def create_user():
             r = wsgi.post("/v2/Users", json=fake_user_data[1])
             assert r.status_code == 201
             return r.json()
 
-        @time_machine.travel(
-            datetime.datetime(2024, 3, 16, 8, 30, tzinfo=datetime.timezone.utc)
-        )
+        @time_machine.travel(datetime.datetime(2024, 3, 16, 8, 30, tzinfo=datetime.UTC))
         def update_user(user_id):
             r = wsgi.put(f"/v2/Users/{user_id}", json={"userName": "Foo"})
             assert r.status_code == 200

tests/test_operators.py

@@ -1,7 +1,5 @@
 import base64
 import datetime
-from typing import List
-from typing import Optional
 
 import pytest
 from scim2_models import BaseModel
@@ -280,14 +278,12 @@ def test_add_operator_binary_data(self):
 
     def test_add_operator_datetime(self):
         class Foo(Resource):
-            schemas: List[str] = ["urn:example:2.0:Foo"]
-            dt: Optional[datetime.datetime] = None
+            schemas: list[str] = ["urn:example:2.0:Foo"]
+            dt: datetime.datetime | None = None
 
         f = Foo()
         AddOperator("dt", "2010-01-23T04:56:22Z")(f)
-        assert f.dt == datetime.datetime(
-            2010, 1, 23, 4, 56, 22, tzinfo=datetime.timezone.utc
-        )
+        assert f.dt == datetime.datetime(2010, 1, 23, 4, 56, 22, tzinfo=datetime.UTC)
 
     def test_add_operator_extension_simple(self):
         u = User[EnterpriseUser]()

tests/test_utils.py

@@ -1,6 +1,4 @@
 from typing import Annotated
-from typing import List
-from typing import Optional
 
 import pytest
 from scim2_filter_parser.lexer import SCIMLexer
@@ -358,8 +356,8 @@ def test_dump_extension(self, provider):
 
     def test_merge_resources_immutable(self):
         class Foo(Resource):
-            schemas: List[str] = ["urn:example:2.0:Foo"]
-            immutable_string: Annotated[Optional[str], Mutability.immutable] = None
+            schemas: list[str] = ["urn:example:2.0:Foo"]
+            immutable_string: Annotated[str | None, Mutability.immutable] = None
 
         stored = Foo()
         merge_resources(stored, Foo(immutable_string="ABC"))
@@ -370,9 +368,9 @@ class Foo(Resource):
 
     def test_is_multi_valued(self):
         class Foo(Resource):
-            schemas: List[str] = ["urn:example:2.0:Foo"]
-            some_string: Optional[str] = None
-            multi_valued_string: Optional[List[str]] = None
+            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")

tests/utils.py

@@ -1,9 +1,7 @@
-from typing import Dict
-from typing import Iterable
-from typing import Optional
+from collections.abc import Iterable
 
 
-def compare_dicts(a: Dict, b: Dict, ignore_keys: Optional[Iterable] = None):
+def compare_dicts(a: dict, b: dict, ignore_keys: Iterable | None = None):
     """Asserts that the dictionary a is a subset of b."""
     if ignore_keys is None:
         ignore_keys = set()