refactor: rename modules rfc7643 in resources and rfc7644 in messages

Author: azmeuk

doc/tutorial.rst

@@ -204,9 +204,9 @@ If a response resource type cannot be found, a ``pydantic.ValidationError`` will
     >>> response = ListResponse[Union[User, Group]].model_validate(payload)
     >>> user, group = response.resources
     >>> type(user)
-    <class 'scim2_models.rfc7643.user.User'>
+    <class 'scim2_models.resources.user.User'>
     >>> type(group)
-    <class 'scim2_models.rfc7643.group.Group'>
+    <class 'scim2_models.resources.group.Group'>
 
 
 Schema extensions

scim2_models/__init__.py

@@ -7,50 +7,50 @@
 from .attributes import MultiValuedComplexAttribute
 from .base import BaseModel
 from .context import Context
+from .messages.bulk import BulkOperation
+from .messages.bulk import BulkRequest
+from .messages.bulk import BulkResponse
+from .messages.error import Error
+from .messages.list_response import ListResponse
+from .messages.message import Message
+from .messages.patch_op import PatchOp
+from .messages.patch_op import PatchOperation
+from .messages.search_request import SearchRequest
 from .reference import ExternalReference
 from .reference import Reference
 from .reference import URIReference
-from .rfc7643.enterprise_user import EnterpriseUser
-from .rfc7643.enterprise_user import Manager
-from .rfc7643.group import Group
-from .rfc7643.group import GroupMember
-from .rfc7643.resource import AnyExtension
-from .rfc7643.resource import AnyResource
-from .rfc7643.resource import Extension
-from .rfc7643.resource import Meta
-from .rfc7643.resource import Resource
-from .rfc7643.resource_type import ResourceType
-from .rfc7643.resource_type import SchemaExtension
-from .rfc7643.schema import Attribute
-from .rfc7643.schema import Schema
-from .rfc7643.service_provider_config import AuthenticationScheme
-from .rfc7643.service_provider_config import Bulk
-from .rfc7643.service_provider_config import ChangePassword
-from .rfc7643.service_provider_config import ETag
-from .rfc7643.service_provider_config import Filter
-from .rfc7643.service_provider_config import Patch
-from .rfc7643.service_provider_config import ServiceProviderConfig
-from .rfc7643.service_provider_config import Sort
-from .rfc7643.user import Address
-from .rfc7643.user import Email
-from .rfc7643.user import Entitlement
-from .rfc7643.user import GroupMembership
-from .rfc7643.user import Im
-from .rfc7643.user import Name
-from .rfc7643.user import PhoneNumber
-from .rfc7643.user import Photo
-from .rfc7643.user import Role
-from .rfc7643.user import User
-from .rfc7643.user import X509Certificate
-from .rfc7644.bulk import BulkOperation
-from .rfc7644.bulk import BulkRequest
-from .rfc7644.bulk import BulkResponse
-from .rfc7644.error import Error
-from .rfc7644.list_response import ListResponse
-from .rfc7644.message import Message
-from .rfc7644.patch_op import PatchOp
-from .rfc7644.patch_op import PatchOperation
-from .rfc7644.search_request import SearchRequest
+from .resources.enterprise_user import EnterpriseUser
+from .resources.enterprise_user import Manager
+from .resources.group import Group
+from .resources.group import GroupMember
+from .resources.resource import AnyExtension
+from .resources.resource import AnyResource
+from .resources.resource import Extension
+from .resources.resource import Meta
+from .resources.resource import Resource
+from .resources.resource_type import ResourceType
+from .resources.resource_type import SchemaExtension
+from .resources.schema import Attribute
+from .resources.schema import Schema
+from .resources.service_provider_config import AuthenticationScheme
+from .resources.service_provider_config import Bulk
+from .resources.service_provider_config import ChangePassword
+from .resources.service_provider_config import ETag
+from .resources.service_provider_config import Filter
+from .resources.service_provider_config import Patch
+from .resources.service_provider_config import ServiceProviderConfig
+from .resources.service_provider_config import Sort
+from .resources.user import Address
+from .resources.user import Email
+from .resources.user import Entitlement
+from .resources.user import GroupMembership
+from .resources.user import Im
+from .resources.user import Name
+from .resources.user import PhoneNumber
+from .resources.user import Photo
+from .resources.user import Role
+from .resources.user import User
+from .resources.user import X509Certificate
 
 __all__ = [
     "Address",

scim2_models/base.py

@@ -273,7 +273,7 @@ def check_replacement_request_mutability(
         cls, value: Any, handler: ValidatorFunctionWrapHandler, info: ValidationInfo
     ) -> Self:
         """Check if 'immutable' attributes have been mutated in replacement requests."""
-        from scim2_models.rfc7643.resource import Resource
+        from scim2_models.resources.resource import Resource
 
         obj = handler(value)
         assert isinstance(obj, cls)
@@ -462,7 +462,7 @@ def get_attribute_urn(self, field_name: str) -> str:
 
         See :rfc:`RFC7644 §3.10 <7644#section-3.10>`.
         """
-        from scim2_models.rfc7643.resource import Extension
+        from scim2_models.resources.resource import Extension
 
         main_schema = self.__class__.model_fields["schemas"].default[0]
         field = self.__class__.model_fields[field_name]

scim2_models/rfc7643/__init__.py renamed to scim2_models/messages/__init__.py

@@ -12,7 +12,7 @@
 
 from ..annotations import Required
 from ..context import Context
-from ..rfc7643.resource import AnyResource
+from ..resources.resource import AnyResource
 from .message import GenericMessageMetaclass
 from .message import Message
 

scim2_models/rfc7644/bulk.py renamed to scim2_models/messages/bulk.py

@@ -10,7 +10,7 @@
 from pydantic import Tag
 from pydantic._internal._model_construction import ModelMetaclass
 
-from scim2_models.rfc7643.resource import Resource
+from scim2_models.resources.resource import Resource
 
 from ..base import BaseModel
 from ..scim_object import ScimObject

scim2_models/rfc7644/error.py renamed to scim2_models/messages/error.py

@@ -17,7 +17,7 @@
 from ..attributes import ComplexAttribute
 from ..base import BaseModel
 from ..context import Context
-from ..rfc7643.resource import Resource
+from ..resources.resource import Resource
 from ..urn import resolve_path_to_target
 from ..utils import extract_field_name
 from ..utils import find_field_name