scim2-models 0.5.1__py3-none-any.whl → 0.5.2__py3-none-any.whl

scim2_models/base.py

@@ -29,12 +29,21 @@ from scim2_models.utils import _normalize_attribute_name
 from scim2_models.utils import _to_camel
 
 
-def _contains_attribute_or_subattributes(
-    attribute_urns: list[str], attribute_urn: str
-) -> bool:
-    return attribute_urn in attribute_urns or any(
-        item.startswith(f"{attribute_urn}.") or item.startswith(f"{attribute_urn}:")
-        for item in attribute_urns
+def _is_attribute_requested(requested_urns: list[str], current_urn: str) -> bool:
+    """Check if an attribute should be included based on the requested URNs.
+
+    Returns True if:
+    - The current attribute is explicitly requested
+    - A sub-attribute of the current attribute is requested
+    - The current attribute is a sub-attribute of a requested attribute
+    """
+    return (
+        current_urn in requested_urns
+        or any(
+            item.startswith(f"{current_urn}.") or item.startswith(f"{current_urn}:")
+            for item in requested_urns
+        )
+        or any(current_urn.startswith(f"{item}.") for item in requested_urns)
     )
 
 
@@ -478,9 +487,7 @@ class BaseModel(PydanticBaseModel):
         if returnability == Returned.default and (
             (
                 included_urns
-                and not _contains_attribute_or_subattributes(
-                    included_urns, attribute_urn
-                )
+                and not _is_attribute_requested(included_urns, attribute_urn)
             )
             or attribute_urn in excluded_urns
         ):

{scim2_models-0.5.1.dist-info → scim2_models-0.5.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: scim2-models
-Version: 0.5.1
+Version: 0.5.2
 Summary: SCIM2 models serialization and validation with pydantic
 Keywords: scim,scim2,provisioning,pydantic,rfc7643,rfc7644
 Author: Yaal Coop

{scim2_models-0.5.1.dist-info → scim2_models-0.5.2.dist-info}/RECORD

@@ -1,7 +1,7 @@
 scim2_models/__init__.py,sha256=IACL_c94UhKq0ZEXOb3LMZgeEQMfQhdOVpWGDnHSpXo,3201
 scim2_models/annotations.py,sha256=oRjlKL1fqrYfa9UtaMdxF5fOT8CUUN3m-rdzvf7aiSA,3304
 scim2_models/attributes.py,sha256=bgYWgNUAuLuzLL7JzVU71-Y8404rQc2NiTgq2OtdMNM,1713
-scim2_models/base.py,sha256=RqRo5ju18Dbt-MB84KOtr3E_CZj9er-B7qDn12zKyyA,20400
+scim2_models/base.py,sha256=0rTuItV2CPw1YNyhOfiwrNMrWRyg_FEHUdsJqvvT6eU,20727
 scim2_models/constants.py,sha256=9egq8JW0dFAqPng85CiHoH5T6pRtYL87-gC0C-IMGsk,573
 scim2_models/context.py,sha256=RjgMIvWPr8f41qbVL1sjaDnm9GRKyrCrgfC4npwwcMg,9149
 scim2_models/messages/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -24,6 +24,6 @@ scim2_models/resources/user.py,sha256=9VkMmKNTLC5D4tIUtg-Avlr_AD5mZMli4vdnO9FNMy
 scim2_models/scim_object.py,sha256=4L10EKkrdaOCRf-J2P1P7yQaXYTztBhxH9rPQB-Bnnk,2367
 scim2_models/urn.py,sha256=E2YY8Lx_yuhLXtdqU9rNOXcb_-9rnndAXd35ie_mQSA,4061
 scim2_models/utils.py,sha256=YX_aQCLZY--s5isPEQT_iJygka1IKvP-F6Hly5fqjBI,5888
-scim2_models-0.5.1.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
-scim2_models-0.5.1.dist-info/METADATA,sha256=Y8-2HrRdIixXK9IqBK-6WhR8dPvG22O7HhMPDswVvYE,16485
-scim2_models-0.5.1.dist-info/RECORD,,
+scim2_models-0.5.2.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
+scim2_models-0.5.2.dist-info/METADATA,sha256=yESisSCt8u_HQj01ib0E2adgqMebJy2LwnS8jzTbpnU,16485
+scim2_models-0.5.2.dist-info/RECORD,,