acryl-datahub-cloud 0.3.12rc1__py3-none-any.whl → 0.3.12rc3__py3-none-any.whl

acryl_datahub_cloud/{_sdk_extras → sdk}/entities/assertion.py

@@ -15,7 +15,7 @@ from typing_extensions import (
     assert_never,
 )
 
-from acryl_datahub_cloud._sdk_extras.errors import SDKNotYetSupportedError
+from acryl_datahub_cloud.sdk.errors import SDKNotYetSupportedError
 from datahub.emitter.enum_helpers import get_enum_options
 from datahub.emitter.mce_builder import make_ts_millis
 from datahub.errors import SdkUsageError

acryl_datahub_cloud/{_sdk_extras → sdk}/subscription_client.py

@@ -1,12 +1,12 @@
 import logging
 from datetime import datetime, timezone
-from typing import Dict, List, Optional, Tuple, Union
+from typing import Dict, List, Optional, Sequence, Tuple, Union
 
 from typing_extensions import TypeAlias
 
 import datahub.metadata.schema_classes as models
-from acryl_datahub_cloud._sdk_extras.entities.assertion import Assertion
-from acryl_datahub_cloud._sdk_extras.entities.subscription import Subscription
+from acryl_datahub_cloud.sdk.entities.assertion import Assertion
+from acryl_datahub_cloud.sdk.entities.subscription import Subscription
 from datahub.emitter.enum_helpers import get_enum_options
 from datahub.emitter.mce_builder import make_ts_millis
 from datahub.errors import SdkUsageError
@@ -61,7 +61,9 @@ class SubscriptionClient:
         *,
         urn: Union[str, DatasetUrn, AssertionUrn],
         subscriber_urn: SubscriberInputType,
-        entity_change_types: Optional[List[str]] = None,
+        entity_change_types: Optional[
+            Sequence[Union[str, models.EntityChangeTypeClass]]
+        ] = None,
     ) -> None:
         """
         Create a subscription to receive notifications for entity changes.
@@ -163,7 +165,9 @@ class SubscriptionClient:
         self,
         *,
         urn: Union[str, DatasetUrn, AssertionUrn],
-        entity_change_types: Optional[List[models.EntityChangeTypeClass]] = None,
+        entity_change_types: Optional[
+            Sequence[Union[str, models.EntityChangeTypeClass]]
+        ] = None,
         subscriber_urn: Optional[SubscriberInputType] = None,
     ) -> List[Subscription]:
         """
@@ -191,7 +195,9 @@ class SubscriptionClient:
         *,
         urn: Union[str, DatasetUrn, AssertionUrn],
         subscriber_urn: SubscriberInputType,
-        entity_change_types: Optional[List[models.EntityChangeTypeClass]] = None,
+        entity_change_types: Optional[
+            List[Union[str, models.EntityChangeTypeClass]]
+        ] = None,
     ) -> None:
         """
         Remove subscriptions for entity change notifications.
@@ -212,6 +218,12 @@ class SubscriptionClient:
           (prevents assertion-level subscription from silently upgrading to dataset-level)
         - Deletes entire subscription if no change types remain
 
+        **Warning behavior:**
+        - If entity_change_types is explicitly provided:
+          * Warns about change types that don't exist in the subscription
+          * For assertions: warns about change types that don't include the assertion in their filter
+        - If entity_change_types is None (using defaults), no warnings are logged
+
         Args:
             urn: URN (string or URN object) of the dataset or assertion to unsubscribe from.
             subscriber_urn: User or group URN to unsubscribe.
@@ -225,9 +237,8 @@ class SubscriptionClient:
 
         Raises:
             SdkUsageError: If URN format is invalid, entity not found, or empty change types list.
-            SdkUsageError: For assertion unsubscription - if assertion not included in specified
-                          change types, or if not assertion-related change types (ASSERTION_PASSED, ASSERTION_FAILED,
-                          ASSERTION_ERROR) are provided.
+            SdkUsageError: For assertion unsubscription - if not assertion-related change types
+                          (ASSERTION_PASSED, ASSERTION_FAILED, ASSERTION_ERROR) are provided.
 
         Note:
             This method is experimental and may change in future versions.
@@ -237,22 +248,16 @@ class SubscriptionClient:
         # Parse URN string if needed
         parsed_urn = self._maybe_parse_urn(urn)
 
-        # For assertion case, fail as requested
-        if isinstance(parsed_urn, AssertionUrn):
-            raise SdkUsageError(
-                "Assertion unsubscription is not yet implemented. Only dataset unsubscription is currently supported."
-            )
-
         dataset_urn: DatasetUrn
         assertion_urn: Optional[AssertionUrn]
         dataset_urn, assertion_urn = (
             (parsed_urn, None)
             if isinstance(parsed_urn, DatasetUrn)
-            else self._fetch_dataset_from_assertion(parsed_urn)  # type: ignore[arg-type]  # TODO: Remove when assertion unsubscribe is implemented
+            else self._fetch_dataset_from_assertion(parsed_urn)
         )
 
         logger.info(
-            f"Unsubscribing from dataset={dataset_urn} for subscriber={subscriber_urn} with change types: {entity_change_types}"
+            f"Unsubscribing from dataset={dataset_urn}{f' assertion={assertion_urn}' if assertion_urn else ''} for subscriber={subscriber_urn} with change types: {entity_change_types}"
         )
 
         # Find existing subscription
@@ -284,9 +289,7 @@ class SubscriptionClient:
         # Get the change types to remove (validated input or defaults)
         change_types_to_remove = self._get_entity_change_types(
             assertion_scope=assertion_urn is not None,
-            entity_change_types=[str(ect) for ect in entity_change_types]
-            if entity_change_types
-            else None,
+            entity_change_types=entity_change_types,
         )
 
         # Remove the specified change types
@@ -294,8 +297,13 @@ class SubscriptionClient:
             raise SdkUsageError(
                 f"Subscription {subscription_entity.urn} has no change types to remove"
             )
+        # Determine if we should warn about missing items (only when user explicitly provided change types)
+        warn_if_missing = entity_change_types is not None
         updated_change_types = self._remove_change_types(
-            subscription_entity.info.entityChangeTypes, change_types_to_remove
+            subscription_entity.info.entityChangeTypes,
+            change_types_to_remove,
+            assertion_urn_to_remove=assertion_urn,
+            warn_if_missing=warn_if_missing,
         )
 
         # If no change types remain, delete the subscription
@@ -315,7 +323,9 @@ class SubscriptionClient:
     def _get_entity_change_types(
         self,
         assertion_scope: bool,
-        entity_change_types: Optional[List[str]] = None,
+        entity_change_types: Optional[
+            Sequence[Union[str, models.EntityChangeTypeClass]]
+        ] = None,
     ) -> List[str]:
         """Get entity change types with validation and defaults.
 
@@ -337,10 +347,13 @@ class SubscriptionClient:
             if len(entity_change_types) == 0:
                 raise SdkUsageError("Entity change types cannot be an empty list.")
 
+            # Convert all entity change types to strings
+            entity_change_type_strs = [str(ect) for ect in entity_change_types]
+
             all_options = get_enum_options(models.EntityChangeTypeClass)
-            if any([ect not in all_options for ect in entity_change_types]):
+            if any([ect not in all_options for ect in entity_change_type_strs]):
                 raise SdkUsageError(
-                    f"Invalid entity change types provided: {entity_change_types}. "
+                    f"Invalid entity change types provided: {entity_change_type_strs}. "
                     f"Valid options are: {all_options}"
                 )
 
@@ -348,7 +361,7 @@ class SubscriptionClient:
             if assertion_scope:
                 invalid_types = [
                     ect
-                    for ect in entity_change_types
+                    for ect in entity_change_type_strs
                     if ect not in ASSERTION_RELATED_ENTITY_CHANGE_TYPES
                 ]
                 if invalid_types:
@@ -358,7 +371,7 @@ class SubscriptionClient:
                         f"Valid types: {list(ASSERTION_RELATED_ENTITY_CHANGE_TYPES)}"
                     )
 
-            return entity_change_types
+            return entity_change_type_strs
 
         # If no specific change types are provided, return defaults based on scope
         if assertion_scope:
@@ -474,20 +487,93 @@ class SubscriptionClient:
 
         return existing_filter
 
+    def _remove_change_types_filter(
+        self,
+        entity_change_type: str,
+        existing_filter: Optional[models.EntityChangeDetailsFilterClass],
+        assertion_urn_to_remove: Optional[AssertionUrn] = None,
+        warn_if_missing: bool = True,
+    ) -> Optional[models.EntityChangeDetailsFilterClass]:
+        """Remove assertion URN from existing filter.
+
+        Args:
+            entity_change_type: The entity change type, used only for better logging messages
+            existing_filter: Existing filter from the subscription
+            assertion_urn_to_remove: Assertion URN to remove from the filter
+            warn_if_missing: Whether to log warning if assertion is not found in filter
+
+        Returns:
+            Updated filter with assertion URN removed, or None if no assertions remain
+            (indicating the entire change type should be removed).
+        """
+        if not existing_filter:
+            # No filter means dataset-level subscription, assertion is not included
+            if assertion_urn_to_remove and warn_if_missing:
+                logger.warning(
+                    f"Assertion {assertion_urn_to_remove.urn()} is not included in entity change type '{entity_change_type}' and will be ignored"
+                )
+            return existing_filter
+
+        if not assertion_urn_to_remove:
+            # If no assertion URN to remove, just return the existing filter
+            return existing_filter
+
+        if (
+            existing_filter.includeAssertions is None
+            or len(existing_filter.includeAssertions) == 0
+        ):
+            # Empty includeAssertions means dataset-level subscription, assertion is not included
+            if warn_if_missing:
+                logger.warning(
+                    f"Assertion {assertion_urn_to_remove.urn()} is not included in entity change type '{entity_change_type}' and will be ignored"
+                )
+            return existing_filter
+
+        assertion_urn_str = assertion_urn_to_remove.urn()
+        if assertion_urn_str not in existing_filter.includeAssertions:
+            # Assertion not found in filter
+            if warn_if_missing:
+                logger.warning(
+                    f"Assertion {assertion_urn_str} is not included in entity change type '{entity_change_type}' and will be ignored"
+                )
+            return existing_filter
+
+        # Remove the assertion from the list
+        updated_assertions = [
+            urn for urn in existing_filter.includeAssertions if urn != assertion_urn_str
+        ]
+
+        if not updated_assertions:
+            # No assertions remain, return None to indicate change type should be removed
+            return None
+
+        # Return updated filter with remaining assertions
+        existing_filter.includeAssertions = updated_assertions
+        return existing_filter
+
     def _remove_change_types(
         self,
         existing_change_types: List[models.EntityChangeDetailsClass],
         change_types_to_remove: List[str],
+        assertion_urn_to_remove: Optional[AssertionUrn] = None,
+        warn_if_missing: bool = True,
     ) -> List[models.EntityChangeDetailsClass]:
         """Remove specified change types from subscription, returning a new list.
 
+        For dataset unsubscription, removes entire change types.
+        For assertion unsubscription, removes assertion from change type filters,
+        and removes entire change type if no assertions remain.
+
         Args:
             existing_change_types: Current entity change types from the subscription.
                                   Never None since this method is only called for existing subscriptions.
             change_types_to_remove: List of change type strings to remove (must not be empty)
+            assertion_urn_to_remove: Optional assertion URN to remove from filters.
+                                   If None, performs dataset-level removal (removes entire change types).
+            warn_if_missing: Whether to log warnings about missing change types or assertions.
 
         Returns:
-            New list of EntityChangeDetailsClass with specified change types removed
+            New list of EntityChangeDetailsClass with specified change types or assertions removed
 
         Note:
             This method does not modify existing_change_types in-place; it returns a new list.
@@ -508,16 +594,43 @@ class SubscriptionClient:
         nonexistent_change_types = (
             change_types_to_remove_set - existing_change_types_set
         )
-        if nonexistent_change_types:
+        if nonexistent_change_types and warn_if_missing:
             logger.warning(
                 f"The following change types do not exist in the subscription and will be ignored: {sorted(nonexistent_change_types)}"
             )
 
-        return [
-            ect
-            for ect in existing_change_types
-            if str(ect.entityChangeType) not in change_types_to_remove_set
-        ]
+        if assertion_urn_to_remove is None:
+            # Dataset-level removal: remove entire change types
+            return [
+                ect
+                for ect in existing_change_types
+                if str(ect.entityChangeType) not in change_types_to_remove_set
+            ]
+        else:
+            # Assertion-level removal: remove assertion from filters
+            result = []
+            for ect in existing_change_types:
+                if str(ect.entityChangeType) not in change_types_to_remove_set:
+                    # Keep change types not being removed
+                    result.append(ect)
+                else:
+                    # Remove assertion from this change type's filter
+                    updated_filter = self._remove_change_types_filter(
+                        entity_change_type=str(ect.entityChangeType),
+                        existing_filter=ect.filter,
+                        assertion_urn_to_remove=assertion_urn_to_remove,
+                        warn_if_missing=warn_if_missing,
+                    )
+                    if updated_filter is not None:
+                        # Keep change type with updated filter
+                        result.append(
+                            models.EntityChangeDetailsClass(
+                                entityChangeType=ect.entityChangeType,
+                                filter=updated_filter,
+                            )
+                        )
+                    # If updated_filter is None, the change type is removed entirely
+            return result
 
     def _maybe_parse_urn(
         self, urn: Union[str, DatasetUrn, AssertionUrn]

{acryl_datahub_cloud-0.3.12rc1.dist-info → acryl_datahub_cloud-0.3.12rc3.dist-info}/METADATA

@@ -1,92 +1,97 @@
 Metadata-Version: 2.4
 Name: acryl-datahub-cloud
-Version: 0.3.12rc1
+Version: 0.3.12rc3
 Requires-Dist: avro-gen3==0.7.16
 Requires-Dist: acryl-datahub
+Requires-Dist: croniter
+Requires-Dist: pytz
+Requires-Dist: types-croniter
 Provides-Extra: datahub-lineage-features
 Requires-Dist: duckdb; extra == "datahub-lineage-features"
-Requires-Dist: opensearch-py==2.4.2; extra == "datahub-lineage-features"
-Requires-Dist: pandas; extra == "datahub-lineage-features"
 Requires-Dist: pyarrow; extra == "datahub-lineage-features"
+Requires-Dist: pandas; extra == "datahub-lineage-features"
+Requires-Dist: opensearch-py==2.4.2; extra == "datahub-lineage-features"
 Requires-Dist: pydantic<2; extra == "datahub-lineage-features"
 Provides-Extra: datahub-reporting-forms
-Requires-Dist: duckdb; extra == "datahub-reporting-forms"
 Requires-Dist: boto3; extra == "datahub-reporting-forms"
-Requires-Dist: pandas; extra == "datahub-reporting-forms"
+Requires-Dist: duckdb; extra == "datahub-reporting-forms"
+Requires-Dist: termcolor==2.5.0; extra == "datahub-reporting-forms"
 Requires-Dist: pyarrow; extra == "datahub-reporting-forms"
+Requires-Dist: pandas; extra == "datahub-reporting-forms"
 Requires-Dist: pydantic<2; extra == "datahub-reporting-forms"
-Requires-Dist: termcolor==2.5.0; extra == "datahub-reporting-forms"
 Provides-Extra: datahub-reporting-extract-graph
-Requires-Dist: duckdb; extra == "datahub-reporting-extract-graph"
-Requires-Dist: opensearch-py==2.4.2; extra == "datahub-reporting-extract-graph"
 Requires-Dist: boto3; extra == "datahub-reporting-extract-graph"
-Requires-Dist: pandas; extra == "datahub-reporting-extract-graph"
+Requires-Dist: duckdb; extra == "datahub-reporting-extract-graph"
 Requires-Dist: pyarrow; extra == "datahub-reporting-extract-graph"
+Requires-Dist: pandas; extra == "datahub-reporting-extract-graph"
+Requires-Dist: opensearch-py==2.4.2; extra == "datahub-reporting-extract-graph"
 Requires-Dist: pydantic<2; extra == "datahub-reporting-extract-graph"
 Provides-Extra: datahub-reporting-extract-sql
-Requires-Dist: duckdb; extra == "datahub-reporting-extract-sql"
 Requires-Dist: boto3; extra == "datahub-reporting-extract-sql"
-Requires-Dist: pandas; extra == "datahub-reporting-extract-sql"
+Requires-Dist: duckdb; extra == "datahub-reporting-extract-sql"
 Requires-Dist: pyarrow; extra == "datahub-reporting-extract-sql"
+Requires-Dist: pandas; extra == "datahub-reporting-extract-sql"
 Requires-Dist: pydantic<2; extra == "datahub-reporting-extract-sql"
 Provides-Extra: datahub-usage-reporting
-Requires-Dist: numpy<2; extra == "datahub-usage-reporting"
-Requires-Dist: scipy<=1.14.1; extra == "datahub-usage-reporting"
-Requires-Dist: pandas; extra == "datahub-usage-reporting"
+Requires-Dist: polars==1.30.0; extra == "datahub-usage-reporting"
+Requires-Dist: duckdb; extra == "datahub-usage-reporting"
+Requires-Dist: termcolor==2.5.0; extra == "datahub-usage-reporting"
 Requires-Dist: opensearch-py==2.4.2; extra == "datahub-usage-reporting"
+Requires-Dist: pandas; extra == "datahub-usage-reporting"
+Requires-Dist: scipy<=1.14.1; extra == "datahub-usage-reporting"
 Requires-Dist: pydantic<2; extra == "datahub-usage-reporting"
-Requires-Dist: elasticsearch==7.13.4; extra == "datahub-usage-reporting"
-Requires-Dist: duckdb; extra == "datahub-usage-reporting"
-Requires-Dist: polars==1.23.0; extra == "datahub-usage-reporting"
-Requires-Dist: pyarrow<=18.0.0; extra == "datahub-usage-reporting"
 Requires-Dist: boto3; extra == "datahub-usage-reporting"
 Requires-Dist: pyarrow; extra == "datahub-usage-reporting"
-Requires-Dist: termcolor==2.5.0; extra == "datahub-usage-reporting"
+Requires-Dist: numpy<2; extra == "datahub-usage-reporting"
+Requires-Dist: pyarrow<=18.0.0; extra == "datahub-usage-reporting"
+Requires-Dist: elasticsearch==7.13.4; extra == "datahub-usage-reporting"
 Provides-Extra: datahub-metadata-sharing
 Requires-Dist: tenacity; extra == "datahub-metadata-sharing"
 Provides-Extra: datahub-action-request-owner
 Requires-Dist: tenacity; extra == "datahub-action-request-owner"
 Provides-Extra: acryl-cs-issues
-Requires-Dist: slack-sdk; extra == "acryl-cs-issues"
-Requires-Dist: openai; extra == "acryl-cs-issues"
 Requires-Dist: zenpy; extra == "acryl-cs-issues"
 Requires-Dist: jinja2; extra == "acryl-cs-issues"
+Requires-Dist: openai; extra == "acryl-cs-issues"
+Requires-Dist: slack-sdk; extra == "acryl-cs-issues"
+Provides-Extra: datahub-forms-notifications
+Requires-Dist: tenacity; extra == "datahub-forms-notifications"
 Provides-Extra: all
-Requires-Dist: scipy<=1.14.1; extra == "all"
-Requires-Dist: tenacity; extra == "all"
-Requires-Dist: jinja2; extra == "all"
-Requires-Dist: pandas; extra == "all"
-Requires-Dist: elasticsearch==7.13.4; extra == "all"
 Requires-Dist: duckdb; extra == "all"
+Requires-Dist: opensearch-py==2.4.2; extra == "all"
+Requires-Dist: scipy<=1.14.1; extra == "all"
+Requires-Dist: pydantic<2; extra == "all"
 Requires-Dist: openai; extra == "all"
-Requires-Dist: pyarrow<=18.0.0; extra == "all"
+Requires-Dist: jinja2; extra == "all"
 Requires-Dist: pyarrow; extra == "all"
+Requires-Dist: elasticsearch==7.13.4; extra == "all"
+Requires-Dist: tenacity; extra == "all"
+Requires-Dist: polars==1.30.0; extra == "all"
 Requires-Dist: termcolor==2.5.0; extra == "all"
-Requires-Dist: numpy<2; extra == "all"
-Requires-Dist: opensearch-py==2.4.2; extra == "all"
-Requires-Dist: pydantic<2; extra == "all"
-Requires-Dist: zenpy; extra == "all"
-Requires-Dist: polars==1.23.0; extra == "all"
 Requires-Dist: slack-sdk; extra == "all"
+Requires-Dist: pandas; extra == "all"
+Requires-Dist: zenpy; extra == "all"
 Requires-Dist: boto3; extra == "all"
+Requires-Dist: numpy<2; extra == "all"
+Requires-Dist: pyarrow<=18.0.0; extra == "all"
 Provides-Extra: dev
-Requires-Dist: numpy<2; extra == "dev"
-Requires-Dist: scipy<=1.14.1; extra == "dev"
 Requires-Dist: tenacity; extra == "dev"
-Requires-Dist: jinja2; extra == "dev"
-Requires-Dist: pandas; extra == "dev"
+Requires-Dist: polars==1.30.0; extra == "dev"
+Requires-Dist: duckdb; extra == "dev"
+Requires-Dist: termcolor==2.5.0; extra == "dev"
 Requires-Dist: opensearch-py==2.4.2; extra == "dev"
-Requires-Dist: pydantic<2; extra == "dev"
-Requires-Dist: elasticsearch==7.13.4; extra == "dev"
+Requires-Dist: pandas; extra == "dev"
+Requires-Dist: scipy<=1.14.1; extra == "dev"
 Requires-Dist: zenpy; extra == "dev"
-Requires-Dist: duckdb; extra == "dev"
-Requires-Dist: polars==1.23.0; extra == "dev"
-Requires-Dist: slack-sdk; extra == "dev"
+Requires-Dist: pydantic<2; extra == "dev"
 Requires-Dist: openai; extra == "dev"
-Requires-Dist: pyarrow<=18.0.0; extra == "dev"
+Requires-Dist: slack-sdk; extra == "dev"
 Requires-Dist: boto3; extra == "dev"
+Requires-Dist: jinja2; extra == "dev"
 Requires-Dist: acryl-datahub[dev]; extra == "dev"
 Requires-Dist: pyarrow; extra == "dev"
-Requires-Dist: termcolor==2.5.0; extra == "dev"
+Requires-Dist: numpy<2; extra == "dev"
+Requires-Dist: pyarrow<=18.0.0; extra == "dev"
+Requires-Dist: elasticsearch==7.13.4; extra == "dev"
 Dynamic: provides-extra
 Dynamic: requires-dist