acryl-datahub-cloud 0.3.12rc7__py3-none-any.whl → 0.3.12rc9__py3-none-any.whl

acryl_datahub_cloud/_codegen_config.json

@@ -1,6 +1,6 @@
 {
   "name": "acryl-datahub-cloud",
-  "version": "0.3.12rc7",
+  "version": "0.3.12rc9",
   "install_requires": [
     "avro-gen3==0.7.16",
     "acryl-datahub"

acryl_datahub_cloud/datahub_forms_notifications/forms_notifications_source.py

@@ -119,10 +119,16 @@ class DataHubFormsNotificationsSource(Source):
         for urn, form in self.get_forms():
             if not self.is_form_complete(urn, form.type):
                 assignees = self.get_form_assignees(urn, form)
-                self.process_notify_on_publish(assignees, form.name, urn)
+                self.process_notify_on_publish(
+                    assignees, form.name, urn, form.description
+                )
 
     def process_notify_on_publish(
-        self, form_assignees: List[str], form_name: str, form_urn: str
+        self,
+        form_assignees: List[str],
+        form_name: str,
+        form_urn: str,
+        form_details: str | None,
     ) -> None:
         """
         Take in form assignees, find the ones who haven't been notified on publish, and build a notification for them.
@@ -139,12 +145,16 @@ class DataHubFormsNotificationsSource(Source):
             self.report.notifications_sent += recipient_count
             self.report.forms_count += 1
 
+            parameters = [{"key": "formName", "value": form_name}]
+            if form_details is not None:
+                parameters.append({"key": "formDetails", "value": form_details})
+
             response = self.execute_graphql_with_retry(
                 GRAPHQL_SEND_FORM_NOTIFICATION_REQUEST,
                 variables={
                     "input": {
                         "type": "BROADCAST_COMPLIANCE_FORM_PUBLISH",
-                        "parameters": [{"key": "formName", "value": form_name}],
+                        "parameters": parameters,
                         "recipients": self.recipient_builder.convert_recipients_to_json_objects(
                             recipients
                         ),

acryl_datahub_cloud/datahub_reporting/datahub_form_reporting.py

@@ -10,7 +10,7 @@ from pydantic import BaseModel
 from acryl_datahub_cloud.elasticsearch.graph_service import BaseModelRow
 from datahub.emitter.mcp import MetadataChangeProposalWrapper
 from datahub.ingestion.graph.client import DataHubGraph
-from datahub.ingestion.graph.filters import RawSearchFilterRule
+from datahub.ingestion.graph.filters import RawSearchFilter
 from datahub.metadata.schema_classes import (
     DomainPropertiesClass,
     FormAssociationClass,
@@ -149,7 +149,7 @@ class DataHubFormReportingData(FormData):
             )
         )
 
-    def get_form_existence_or_filters(self) -> List[RawSearchFilterRule]:
+    def get_form_existence_or_filters(self) -> RawSearchFilter:
         """
         Datasets must either have completedForms or incompleteForms assigned to
         them
@@ -157,25 +157,41 @@ class DataHubFormReportingData(FormData):
         if self.allowed_forms:
             return [
                 {
-                    "field": "completedForms",
-                    "condition": "EQUAL",
-                    "values": self.allowed_forms,
+                    "and": [
+                        {
+                            "field": "completedForms",
+                            "condition": "EQUAL",
+                            "values": self.allowed_forms,
+                        }
+                    ]
                 },
                 {
-                    "field": "incompleteForms",
-                    "condition": "EQUAL",
-                    "values": self.allowed_forms,
+                    "and": [
+                        {
+                            "field": "incompleteForms",
+                            "condition": "EQUAL",
+                            "values": self.allowed_forms,
+                        }
+                    ]
                 },
             ]
         else:
             return [
                 {
-                    "field": "completedForms",
-                    "condition": "EXISTS",
+                    "and": [
+                        {
+                            "field": "completedForms",
+                            "condition": "EXISTS",
+                        }
+                    ]
                 },
                 {
-                    "field": "incompleteForms",
-                    "condition": "EXISTS",
+                    "and": [
+                        {
+                            "field": "incompleteForms",
+                            "condition": "EXISTS",
+                        }
+                    ]
                 },
             ]
 
@@ -293,7 +309,7 @@ class DataHubFormReportingData(FormData):
         extra_fields = [f for f in self.DataHubDatasetSearchRow.__fields__]
         # TODO: Replace with the new search/filter SDK.
         result = self.graph.get_results_by_filter(
-            extra_or_filters=[{"and": self.get_form_existence_or_filters()}],
+            extra_or_filters=self.get_form_existence_or_filters(),
             extra_source_fields=extra_fields,
             skip_cache=True,
         )