refactor: use isinstance instead of hasattr

Author: azmeuk

scim2_models/base.py

@@ -368,21 +368,21 @@ def set_complex_attribute_urns(self) -> None:
 
         'attribute_urn' will later be used by 'get_attribute_urn'.
         """
-        from scim2_models.rfc7643.resource import Resource
-
+        from .attributes import ComplexAttribute
         from .attributes import is_complex_attribute
 
         for field_name in self.__class__.model_fields:
             attr_type = self.get_field_root_type(field_name)
             if not attr_type or not is_complex_attribute(attr_type):
                 continue
 
-            main_schema = (
-                getattr(self, "attribute_urn", None)
-                or self.__class__.model_fields["schemas"].default[0]
-            )
+            if isinstance(self, ComplexAttribute):
+                main_schema = self.attribute_urn
+                separator = "."
+            else:
+                main_schema = self.__class__.model_fields["schemas"].default[0]
+                separator = ":"
 
-            separator = ":" if isinstance(self, Resource) else "."
             schema = f"{main_schema}{separator}{field_name}"
 
             if attr_value := getattr(self, field_name):

scim2_models/rfc7643/resource.py

@@ -9,10 +9,6 @@
 from typing import get_args
 from typing import get_origin
 
-if TYPE_CHECKING:
-    from scim2_models.rfc7643.schema import Attribute
-    from scim2_models.rfc7643.schema import Schema
-
 from pydantic import Field
 from pydantic import WrapSerializer
 from pydantic import field_serializer
@@ -30,9 +26,15 @@
 from ..base import BaseModel
 from ..base import BaseModelType
 from ..reference import Reference
+from ..scim_object import SchemaObject
+from ..scim_object import ScimObject
 from ..utils import UNION_TYPES
 from ..utils import normalize_attribute_name
 
+if TYPE_CHECKING:
+    from .schema import Attribute
+    from .schema import Schema
+
 
 class Meta(ComplexAttribute):
     """All "meta" sub-attributes are assigned by the service provider (have a "mutability" of "readOnly"), and all of these sub-attributes have a "returned" characteristic of "default".
@@ -85,7 +87,7 @@ class Meta(ComplexAttribute):
     """
 
 
-class Extension(BaseModel):
+class Extension(SchemaObject):
     @classmethod
     def to_schema(cls) -> "Schema":
         """Build a :class:`~scim2_models.Schema` from the current extension class."""
@@ -145,13 +147,7 @@ def __new__(cls, name: str, bases: tuple, attrs: dict, **kwargs: Any) -> type:
         return klass
 
 
-class Resource(BaseModel, Generic[AnyExtension], metaclass=ResourceMetaclass):
-    schemas: Annotated[list[str], Required.true]
-    """The "schemas" attribute is a REQUIRED attribute and is an array of
-    Strings containing URIs that are used to indicate the namespaces of the
-    SCIM schemas that define the attributes present in the current JSON
-    structure."""
-
+class Resource(ScimObject, Generic[AnyExtension], metaclass=ResourceMetaclass):
     # Common attributes as defined by
     # https://www.rfc-editor.org/rfc/rfc7643#section-3.1
 

scim2_models/rfc7644/message.py

@@ -11,15 +11,13 @@
 
 from ..base import BaseModel
 from ..base import BaseModelType
-from ..base import Required
+from ..scim_object import ScimObject
 from ..utils import UNION_TYPES
 
 
-class Message(BaseModel):
+class Message(ScimObject):
     """SCIM protocol messages as defined by :rfc:`RFC7644 §3.1 <7644#section-3.1>`."""
 
-    schemas: Annotated[list[str], Required.true]
-
 
 def create_schema_discriminator(
     resource_types_schemas: list[str],

scim2_models/scim_object.py

@@ -0,0 +1,17 @@
+"""Base SCIM object classes with schema identification."""
+
+from typing import Annotated
+
+from .annotations import Required
+from .base import BaseModel
+
+
+class SchemaObject(BaseModel):
+    schemas: Annotated[list[str], Required.true]
+    """The "schemas" attribute is a REQUIRED attribute and is an array of
+    Strings containing URIs that are used to indicate the namespaces of the
+    SCIM schemas that define the attributes present in the current JSON
+    structure."""
+
+
+class ScimObject(SchemaObject): ...