scim2-models 0.3.1__tar.gz → 0.3.3__tar.gz

{scim2_models-0.3.1 → scim2_models-0.3.3}/.pre-commit-config.yaml

@@ -1,7 +1,7 @@
 ---
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: 'v0.9.10'
+    rev: 'v0.11.10'
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]

{scim2_models-0.3.1 → scim2_models-0.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scim2-models
-Version: 0.3.1
+Version: 0.3.3
 Summary: SCIM2 models serialization and validation with pydantic
 Project-URL: documentation, https://scim2-models.readthedocs.io
 Project-URL: repository, https://github.com/python-scim/scim2-models

{scim2_models-0.3.1 → scim2_models-0.3.3}/doc/changelog.rst

@@ -1,13 +1,27 @@
 Changelog
 =========
 
+[0.3.3] - 2025-05-21
+--------------------
+
+Fixed
+^^^^^
+- User class typing. :pr:`92`
+
+[0.3.2] - 2025-03-28
+--------------------
+
+Fixed
+^^^^^
+- Pydantic warning.
+
 [0.3.1] - 2025-03-07
 --------------------
 
 Fixed
 ^^^^^
-- Fix :attr:`~SearchRequest.start_index` and :attr:`~SearchRequest.count` limits. :issue:`84`
-- :attr:`~ListResponse.total_resuls` is required.
+- Fix :attr:`~scim2_models.SearchRequest.start_index` and :attr:`~scim2_models.SearchRequest.count` limits. :issue:`84`
+- :attr:`~scim2_models.ListResponse.total_resuls` is required. :issue:`88`
 
 [0.3.0] - 2024-12-11
 --------------------

{scim2_models-0.3.1 → scim2_models-0.3.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "scim2-models"
-version = "0.3.1"
+version = "0.3.3"
 description = "SCIM2 models serialization and validation with pydantic"
 authors = [{name="Yaal Coop", email="contact@yaal.coop"}]
 license = {file = "LICENSE"}

{scim2_models-0.3.1 → scim2_models-0.3.3}/scim2_models/base.py

@@ -649,14 +649,14 @@ class BaseModel(PydanticBaseModel):
         """
         from scim2_models.rfc7643.resource import Resource
 
-        for field_name in self.model_fields:
+        for field_name in self.__class__.model_fields:
             attr_type = self.get_field_root_type(field_name)
             if not is_complex_attribute(attr_type):
                 continue
 
             main_schema = (
                 getattr(self, "_schema", None)
-                or self.model_fields["schemas"].default[0]
+                or self.__class__.model_fields["schemas"].default[0]
             )
 
             separator = ":" if isinstance(self, Resource) else "."
@@ -847,8 +847,10 @@ class BaseModel(PydanticBaseModel):
 
         See :rfc:`RFC7644 §3.10 <7644#section-3.10>`.
         """
-        main_schema = self.model_fields["schemas"].default[0]
-        alias = self.model_fields[field_name].serialization_alias or field_name
+        main_schema = self.__class__.model_fields["schemas"].default[0]
+        alias = (
+            self.__class__.model_fields[field_name].serialization_alias or field_name
+        )
 
         # if alias contains a ':' this is an extension urn
         full_urn = alias if ":" in alias else f"{main_schema}:{alias}"
@@ -865,7 +867,9 @@ class ComplexAttribute(BaseModel):
 
         See :rfc:`RFC7644 §3.10 <7644#section-3.10>`.
         """
-        alias = self.model_fields[field_name].serialization_alias or field_name
+        alias = (
+            self.__class__.model_fields[field_name].serialization_alias or field_name
+        )
         return f"{self._schema}.{alias}"
 
 

{scim2_models-0.3.1 → scim2_models-0.3.3}/scim2_models/rfc7643/schema.py

@@ -3,7 +3,7 @@ from datetime import datetime
 from enum import Enum
 from typing import Annotated
 from typing import Any
-from typing import List  # noqa : UP005
+from typing import List  # noqa : UP005,UP035
 from typing import Literal
 from typing import Optional
 from typing import Union

{scim2_models-0.3.1 → scim2_models-0.3.3}/scim2_models/rfc7643/user.py

@@ -17,6 +17,7 @@ from ..base import Required
 from ..base import Returned
 from ..base import Uniqueness
 from ..utils import Base64Bytes
+from .resource import AnyExtension
 from .resource import Resource
 
 
@@ -213,7 +214,7 @@ class X509Certificate(MultiValuedComplexAttribute):
     """The value of an X.509 certificate."""
 
 
-class User(Resource):
+class User(Resource[AnyExtension]):
     schemas: Annotated[list[str], Required.true] = [
         "urn:ietf:params:scim:schemas:core:2.0:User"
     ]

{scim2_models-0.3.1 → scim2_models-0.3.3}/tests/test_dynamic_resources.py

@@ -2720,7 +2720,7 @@ def test_make_schema_model_from_schema(load_sample):
     assert obj.attributes[0].type == "string"
     assert not obj.attributes[0].multi_valued
     assert obj.attributes[0].description == (
-        "A human-readable name for the Group. " "REQUIRED."
+        "A human-readable name for the Group. REQUIRED."
     )
     assert not obj.attributes[0].required
     assert not obj.attributes[0].case_exact
@@ -2749,7 +2749,7 @@ def test_make_schema_model_from_schema(load_sample):
     assert obj.attributes[1].sub_attributes[1].reference_types == ["User", "Group"]
     assert not obj.attributes[1].sub_attributes[1].multi_valued
     assert obj.attributes[1].sub_attributes[1].description == (
-        "The URI corresponding to a SCIM resource " "that is a member of this Group."
+        "The URI corresponding to a SCIM resource that is a member of this Group."
     )
     assert not obj.attributes[1].sub_attributes[1].required
     assert not obj.attributes[1].sub_attributes[1].case_exact
@@ -2760,7 +2760,7 @@ def test_make_schema_model_from_schema(load_sample):
     assert obj.attributes[1].sub_attributes[2].type == "string"
     assert not obj.attributes[1].sub_attributes[2].multi_valued
     assert obj.attributes[1].sub_attributes[2].description == (
-        "A label indicating the type of resource, " "e.g., 'User' or 'Group'."
+        "A label indicating the type of resource, e.g., 'User' or 'Group'."
     )
     assert not obj.attributes[1].sub_attributes[2].required
     assert not obj.attributes[1].sub_attributes[2].case_exact

{scim2_models-0.3.1 → scim2_models-0.3.3}/tests/test_list_response.py

@@ -40,7 +40,7 @@ def test_enterprise_user(load_sample):
     }
     response = ListResponse[User[EnterpriseUser]].model_validate(payload)
     obj = response.resources[0]
-    assert isinstance(obj, User[EnterpriseUser])
+    assert isinstance(obj, User)
 
 
 def test_group(load_sample):

{scim2_models-0.3.1 → scim2_models-0.3.3}/tests/test_schema.py

@@ -19,7 +19,7 @@ def test_group_schema(load_sample):
     assert obj.attributes[0].type == Attribute.Type.string
     assert not obj.attributes[0].multi_valued
     assert obj.attributes[0].description == (
-        "A human-readable name for the Group. " "REQUIRED."
+        "A human-readable name for the Group. REQUIRED."
     )
     assert not obj.attributes[0].required
     assert not obj.attributes[0].case_exact
@@ -48,7 +48,7 @@ def test_group_schema(load_sample):
     assert obj.attributes[1].sub_attributes[1].reference_types == ["User", "Group"]
     assert not obj.attributes[1].sub_attributes[1].multi_valued
     assert obj.attributes[1].sub_attributes[1].description == (
-        "The URI corresponding to a SCIM resource " "that is a member of this Group."
+        "The URI corresponding to a SCIM resource that is a member of this Group."
     )
     assert not obj.attributes[1].sub_attributes[1].required
     assert not obj.attributes[1].sub_attributes[1].case_exact
@@ -59,7 +59,7 @@ def test_group_schema(load_sample):
     assert obj.attributes[1].sub_attributes[2].type == Attribute.Type.string
     assert not obj.attributes[1].sub_attributes[2].multi_valued
     assert obj.attributes[1].sub_attributes[2].description == (
-        "A label indicating the type of resource, " "e.g., 'User' or 'Group'."
+        "A label indicating the type of resource, e.g., 'User' or 'Group'."
     )
     assert not obj.attributes[1].sub_attributes[2].required
     assert not obj.attributes[1].sub_attributes[2].case_exact