acryl-datahub-cloud 0.3.8.1rc2__tar.gz → 0.3.8.2__tar.gz

{acryl_datahub_cloud-0.3.8.1rc2 → acryl_datahub_cloud-0.3.8.2}/PKG-INFO

@@ -1,90 +1,90 @@
 Metadata-Version: 2.2
 Name: acryl-datahub-cloud
-Version: 0.3.8.1rc2
+Version: 0.3.8.2
 Requires-Dist: avro-gen3==0.7.16
 Requires-Dist: acryl-datahub
 Provides-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"
 Requires-Dist: duckdb; extra == "datahub-lineage-features"
 Requires-Dist: pyarrow; extra == "datahub-lineage-features"
-Requires-Dist: pydantic<2; extra == "datahub-lineage-features"
+Requires-Dist: opensearch-py==2.4.2; extra == "datahub-lineage-features"
 Provides-Extra: datahub-reporting-forms
+Requires-Dist: termcolor==2.5.0; extra == "datahub-reporting-forms"
 Requires-Dist: pandas; extra == "datahub-reporting-forms"
+Requires-Dist: boto3; extra == "datahub-reporting-forms"
+Requires-Dist: pydantic<2; extra == "datahub-reporting-forms"
 Requires-Dist: duckdb; extra == "datahub-reporting-forms"
 Requires-Dist: pyarrow; extra == "datahub-reporting-forms"
-Requires-Dist: termcolor==2.5.0; extra == "datahub-reporting-forms"
-Requires-Dist: pydantic<2; extra == "datahub-reporting-forms"
-Requires-Dist: boto3; extra == "datahub-reporting-forms"
 Provides-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: boto3; extra == "datahub-reporting-extract-graph"
+Requires-Dist: pydantic<2; extra == "datahub-reporting-extract-graph"
 Requires-Dist: duckdb; extra == "datahub-reporting-extract-graph"
 Requires-Dist: pyarrow; extra == "datahub-reporting-extract-graph"
-Requires-Dist: pydantic<2; extra == "datahub-reporting-extract-graph"
-Requires-Dist: boto3; extra == "datahub-reporting-extract-graph"
+Requires-Dist: opensearch-py==2.4.2; extra == "datahub-reporting-extract-graph"
 Provides-Extra: datahub-reporting-extract-sql
 Requires-Dist: pandas; extra == "datahub-reporting-extract-sql"
+Requires-Dist: boto3; extra == "datahub-reporting-extract-sql"
+Requires-Dist: pydantic<2; extra == "datahub-reporting-extract-sql"
 Requires-Dist: duckdb; extra == "datahub-reporting-extract-sql"
 Requires-Dist: pyarrow; extra == "datahub-reporting-extract-sql"
-Requires-Dist: pydantic<2; extra == "datahub-reporting-extract-sql"
-Requires-Dist: boto3; extra == "datahub-reporting-extract-sql"
 Provides-Extra: datahub-usage-reporting
+Requires-Dist: duckdb; extra == "datahub-usage-reporting"
+Requires-Dist: polars==1.23.0; extra == "datahub-usage-reporting"
+Requires-Dist: pydantic<2; extra == "datahub-usage-reporting"
 Requires-Dist: pyarrow<=18.0.0; 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: pydantic<2; extra == "datahub-usage-reporting"
-Requires-Dist: elasticsearch==7.13.4; extra == "datahub-usage-reporting"
-Requires-Dist: pandas; extra == "datahub-usage-reporting"
 Requires-Dist: opensearch-py==2.4.2; extra == "datahub-usage-reporting"
-Requires-Dist: duckdb; extra == "datahub-usage-reporting"
-Requires-Dist: polars==1.19.0; extra == "datahub-usage-reporting"
+Requires-Dist: elasticsearch==7.13.4; extra == "datahub-usage-reporting"
 Requires-Dist: scipy<=1.14.1; extra == "datahub-usage-reporting"
+Requires-Dist: pyarrow; extra == "datahub-usage-reporting"
 Requires-Dist: boto3; extra == "datahub-usage-reporting"
+Requires-Dist: pandas; extra == "datahub-usage-reporting"
+Requires-Dist: numpy<2; extra == "datahub-usage-reporting"
 Provides-Extra: datahub-metadata-sharing
 Requires-Dist: tenacity; extra == "datahub-metadata-sharing"
 Provides-Extra: acryl-cs-issues
-Requires-Dist: jinja2; extra == "acryl-cs-issues"
-Requires-Dist: zenpy; extra == "acryl-cs-issues"
-Requires-Dist: slack-sdk; extra == "acryl-cs-issues"
 Requires-Dist: openai; extra == "acryl-cs-issues"
+Requires-Dist: slack-sdk; extra == "acryl-cs-issues"
+Requires-Dist: zenpy; extra == "acryl-cs-issues"
+Requires-Dist: jinja2; extra == "acryl-cs-issues"
 Provides-Extra: all
-Requires-Dist: pyarrow<=18.0.0; extra == "all"
-Requires-Dist: pyarrow; extra == "all"
-Requires-Dist: jinja2; extra == "all"
+Requires-Dist: tenacity; extra == "all"
 Requires-Dist: openai; extra == "all"
-Requires-Dist: numpy<2; extra == "all"
+Requires-Dist: polars==1.23.0; extra == "all"
 Requires-Dist: pydantic<2; extra == "all"
-Requires-Dist: opensearch-py==2.4.2; extra == "all"
-Requires-Dist: duckdb; extra == "all"
-Requires-Dist: polars==1.19.0; extra == "all"
-Requires-Dist: boto3; extra == "all"
-Requires-Dist: zenpy; extra == "all"
+Requires-Dist: pyarrow<=18.0.0; extra == "all"
 Requires-Dist: termcolor==2.5.0; extra == "all"
-Requires-Dist: elasticsearch==7.13.4; extra == "all"
-Requires-Dist: tenacity; extra == "all"
-Requires-Dist: pandas; extra == "all"
 Requires-Dist: slack-sdk; extra == "all"
+Requires-Dist: opensearch-py==2.4.2; extra == "all"
 Requires-Dist: scipy<=1.14.1; extra == "all"
+Requires-Dist: boto3; extra == "all"
+Requires-Dist: pyarrow; extra == "all"
+Requires-Dist: pandas; extra == "all"
+Requires-Dist: jinja2; extra == "all"
+Requires-Dist: elasticsearch==7.13.4; extra == "all"
+Requires-Dist: zenpy; extra == "all"
+Requires-Dist: duckdb; extra == "all"
+Requires-Dist: numpy<2; extra == "all"
 Provides-Extra: dev
-Requires-Dist: pyarrow<=18.0.0; extra == "dev"
-Requires-Dist: zenpy; extra == "dev"
-Requires-Dist: pyarrow; extra == "dev"
+Requires-Dist: tenacity; extra == "dev"
+Requires-Dist: duckdb; extra == "dev"
+Requires-Dist: openai; extra == "dev"
+Requires-Dist: polars==1.23.0; extra == "dev"
 Requires-Dist: jinja2; extra == "dev"
-Requires-Dist: termcolor==2.5.0; extra == "dev"
-Requires-Dist: numpy<2; extra == "dev"
 Requires-Dist: pydantic<2; extra == "dev"
+Requires-Dist: pyarrow<=18.0.0; extra == "dev"
+Requires-Dist: termcolor==2.5.0; extra == "dev"
 Requires-Dist: slack-sdk; extra == "dev"
-Requires-Dist: elasticsearch==7.13.4; extra == "dev"
-Requires-Dist: acryl-datahub[dev]; extra == "dev"
-Requires-Dist: openai; extra == "dev"
-Requires-Dist: tenacity; extra == "dev"
-Requires-Dist: pandas; extra == "dev"
 Requires-Dist: opensearch-py==2.4.2; extra == "dev"
-Requires-Dist: duckdb; extra == "dev"
-Requires-Dist: polars==1.19.0; extra == "dev"
+Requires-Dist: elasticsearch==7.13.4; extra == "dev"
 Requires-Dist: scipy<=1.14.1; extra == "dev"
+Requires-Dist: zenpy; extra == "dev"
+Requires-Dist: pyarrow; extra == "dev"
 Requires-Dist: boto3; extra == "dev"
+Requires-Dist: pandas; extra == "dev"
+Requires-Dist: numpy<2; extra == "dev"
+Requires-Dist: acryl-datahub[dev]; extra == "dev"
 Dynamic: provides-extra
 Dynamic: requires-dist

{acryl_datahub_cloud-0.3.8.1rc2 → acryl_datahub_cloud-0.3.8.2}/setup.py

@@ -24,7 +24,7 @@ plugins = {
     | aws_common
     | {
         "opensearch-py==2.4.2",
-        "polars==1.19.0",
+        "polars==1.23.0",
         "elasticsearch==7.13.4",
         "numpy<2",
         "scipy<=1.14.1",
@@ -72,6 +72,7 @@ setup(
                 "datahub-usage-reporting = acryl_datahub_cloud.datahub_usage_reporting.usage_feature_reporter:DataHubUsageFeatureReportingSource",
                 "datahub-metadata-sharing = acryl_datahub_cloud.datahub_metadata_sharing.metadata_sharing_source:DataHubMetadataSharingSource",
                 "acryl-cs-issues = acryl_datahub_cloud.acryl_cs_issues.source:AcrylCSIssuesSource",
+                "datahub-restore = acryl_datahub_cloud.datahub_restore.source:DataHubRestoreSource",
             ],
         },
         "include_package_data": True,

{acryl_datahub_cloud-0.3.8.1rc2 → acryl_datahub_cloud-0.3.8.2}/src/acryl_datahub_cloud/_codegen_config.json

@@ -1,6 +1,6 @@
 {
   "name": "acryl-datahub-cloud",
-  "version": "0.3.8.1rc2",
+  "version": "0.3.8.2",
   "install_requires": [
     "avro-gen3==0.7.16",
     "acryl-datahub"

{acryl_datahub_cloud-0.3.8.1rc2 → acryl_datahub_cloud-0.3.8.2}/src/acryl_datahub_cloud/datahub_reporting/datahub_form_reporting.py

@@ -315,6 +315,11 @@ class DataHubFormReportingData(FormData):
                     if p in form_prompts
                 ]:
                     for owner in assignees:
+                        if form_id not in form_assigned_dates:
+                            logger.warning(
+                                f"Form {form_id} not found in form_assigned_dates"
+                            )
+                            continue
                         yield FormReportingRow(
                             form_urn=form_id,
                             form_assigned_date=form_assigned_dates[form_id],
@@ -344,6 +349,11 @@ class DataHubFormReportingData(FormData):
                     if p in form_prompts
                 ]:
                     for owner in assignees:
+                        if form_id not in form_assigned_dates:
+                            logger.warning(
+                                f"Form {form_id} not found in form_assigned_dates"
+                            )
+                            continue
                         yield FormReportingRow(
                             form_urn=form_id,
                             form_assigned_date=form_assigned_dates[form_id],
@@ -403,7 +413,9 @@ class DataHubFormReportingData(FormData):
                     for p in search_row.completedFormsIncompletePromptIds
                     for p in form_prompts
                 ]:
-                    logger.warning("Unexpected incomplete prompt in completed form")
+                    logger.warning(
+                        f"Unexpected incomplete prompt {prompt_id} in completed form {form_id}"
+                    )
                     for owner in assignees:
                         yield FormReportingRow(
                             form_urn=form_id,
@@ -438,6 +450,11 @@ class DataHubFormReportingData(FormData):
                     if p in form_prompts
                 ]:
                     for owner in assignees:
+                        if form_id not in form_assigned_dates:
+                            logger.warning(
+                                f"Form {form_id} not found in form_assigned_dates"
+                            )
+                            continue
                         yield FormReportingRow(
                             form_urn=form_id,
                             form_assigned_date=form_assigned_dates[form_id],

acryl_datahub_cloud-0.3.8.2/src/acryl_datahub_cloud/datahub_restore/do_restore.py

@@ -0,0 +1,85 @@
+from typing import Any, Dict, Optional, Union
+
+from datahub.ingestion.graph.client import DataHubGraph
+
+
+def _parse_response(response: Dict) -> Dict:
+    value_str = response["value"].strip("{}")
+
+    args_part = value_str.split(", result=")[0].replace("args=", "")
+    result_part = value_str.split(", result=")[1]
+
+    parsed = {"args": _parse_args(args_part), "result": _parse_result(result_part)}
+    return parsed
+
+
+def _parse_dict(content: str) -> Dict:
+    content = content.strip("()").strip()
+    items = [item.strip() for item in content.split(", ")]
+
+    pairs = []
+    for item in items:
+        if "=" in item:
+            k, v = item.split("=", 1)
+            pairs.append((k.strip(), v.strip()))
+
+    return {k: _convert_value(v) for k, v in pairs}
+
+
+def _parse_args(args_str: str) -> Dict:
+    content = args_str.replace("RestoreIndicesArgs(", "").replace(")", "").strip()
+    return _parse_dict(content)
+
+
+def _parse_result(result_str: str) -> Dict:
+    content = result_str.replace("RestoreIndicesResult(", "").replace(")", "").strip()
+    return _parse_dict(content)
+
+
+def _convert_value(v: str) -> Any:
+    if v == "null":
+        return None
+    elif v.isdigit():
+        return int(v)
+    elif v == "[]":
+        return []
+    elif v == "":
+        return ""
+    elif v == "false":
+        return False
+    elif v == "true":
+        return True
+    elif v.startswith("urn:"):
+        return v
+    return v
+
+
+def restore_indices(
+    graph: DataHubGraph,
+    start: int,
+    batch_size: int,
+    limit: int,
+    urn: Optional[str] = None,
+    urn_like: Optional[str] = None,
+    aspect: Optional[str] = None,
+) -> Dict:
+    if urn is None and urn_like is None:
+        raise RuntimeError("Either urn or urn_like must be present")
+
+    url = f"{graph.config.server}/operations?action=restoreIndices"
+    payload_dict: Dict[str, Union[str, int]] = {
+        "start": start,
+        "batchSize": batch_size,
+        "limit": limit,
+    }
+    if urn_like is not None:
+        payload_dict["urnLike"] = urn_like
+    if urn is not None:
+        payload_dict["urn"] = urn
+    if aspect is not None:
+        payload_dict["aspect"] = aspect
+    response = graph._post_generic(
+        url=url,
+        payload_dict=payload_dict,
+    )
+    return _parse_response(response)

acryl_datahub_cloud-0.3.8.2/src/acryl_datahub_cloud/datahub_restore/source.py

@@ -0,0 +1,139 @@
+import logging
+import time
+from functools import partial
+from typing import Any, Dict, Iterable, List, Optional
+
+from pydantic import Field, root_validator
+
+from acryl_datahub_cloud.datahub_restore.do_restore import restore_indices
+from datahub.configuration.common import ConfigModel
+from datahub.ingestion.api.common import PipelineContext
+from datahub.ingestion.api.decorators import (
+    SupportStatus,
+    config_class,
+    platform_name,
+    support_status,
+)
+from datahub.ingestion.api.source import MetadataWorkUnitProcessor, SourceReport
+from datahub.ingestion.api.source_helpers import auto_workunit_reporter
+from datahub.ingestion.api.workunit import MetadataWorkUnit
+from datahub.ingestion.source.state.stateful_ingestion_base import (
+    StatefulIngestionConfigBase,
+    StatefulIngestionReport,
+    StatefulIngestionSourceBase,
+)
+
+logger = logging.getLogger(__name__)
+
+
+class DataHubRestoreIndicesReport(StatefulIngestionReport):
+    calls_made: int = 0
+    aspect_check_ms: int = 0
+    create_record_ms: int = 0
+    time_get_rows_ms: int = 0
+    time_sql_query_ms: int = 0
+    rows_migrated: int = 0
+    send_message_ms: int = 0
+    time_urn_ms: int = 0
+    default_aspects_created: int = 0
+    ignored: int = 0
+    last_aspect: str = ""
+    last_urn: str = ""
+    time_entity_registry_check_ms: int = 0
+
+
+class DataHubRestoreIndicesConfig(ConfigModel, StatefulIngestionConfigBase):
+    urn: Optional[str] = Field(
+        None,
+        description="The urn of the entity to restore indices for. If not provided, urn_like must be provided.",
+    )
+    urn_like: Optional[str] = Field(
+        None,
+        description="The urn_like of the entity to restore indices for. If not provided, urn must be provided.",
+    )
+    start: int = Field(
+        0,
+        description="Same as restore indices endpoint.",
+    )
+    batch_size: int = Field(
+        1,
+        description="Same as restore indices endpoint.",
+    )
+    aspect: Optional[str] = Field(
+        None,
+        description="Same as restore indices endpoint.",
+    )
+
+    @root_validator(pre=True)
+    def extract_assertion_info(cls, values: Dict[str, Any]) -> Dict[str, Any]:
+        if values.get("urn") is None and values.get("urn_like") is None:
+            raise ValueError("Either urn or urn_like must be provided.")
+        if values.get("urn") is not None and values.get("urn_like") is not None:
+            raise ValueError("Only one of urn or urn_like must be provided.")
+        return values
+
+
+@platform_name(id="datahub", platform_name="datahub")
+@config_class(DataHubRestoreIndicesConfig)
+@support_status(SupportStatus.INCUBATING)
+class DataHubRestoreSource(StatefulIngestionSourceBase):
+    def __init__(self, ctx: PipelineContext, config: DataHubRestoreIndicesConfig):
+        super().__init__(config=config, ctx=ctx)
+        self.report: DataHubRestoreIndicesReport = DataHubRestoreIndicesReport()
+        self.report.event_not_produced_warn = False
+        self.config = config
+        self.graph = ctx.require_graph("The DataHubRestore Source")
+        self.last_print_time = 0.0
+
+    def get_report(self) -> SourceReport:
+        return self.report
+
+    def get_workunit_processors(self) -> List[Optional[MetadataWorkUnitProcessor]]:
+        """A list of functions that transforms the workunits produced by this source.
+        Run in order, first in list is applied first. Be careful with order when overriding.
+        """
+
+        return [
+            partial(auto_workunit_reporter, self.get_report()),
+        ]
+
+    def _print_report(self) -> None:
+        time_taken = round(time.time() - self.last_print_time, 1)
+        if time_taken > 60:
+            self.last_print_time = time.time()
+            logger.info(f"\n{self.report.as_string()}")
+
+    def get_workunits_internal(self) -> Iterable[MetadataWorkUnit]:
+        start = self.config.start
+        while True:
+            self.report.calls_made += 1
+            response = restore_indices(
+                graph=self.graph,
+                start=start,
+                batch_size=self.config.batch_size,
+                limit=self.config.batch_size,
+                urn=self.config.urn,
+                urn_like=self.config.urn_like,
+                aspect=self.config.aspect,
+            )
+            result = response["result"]
+            self.report.aspect_check_ms += result["aspectCheckMs"]
+            self.report.create_record_ms += result["createRecordMs"]
+            self.report.rows_migrated += result["rowsMigrated"]
+            self.report.send_message_ms += result["sendMessageMs"]
+            self.report.time_get_rows_ms += result["timeGetRowMs"]
+            self.report.time_sql_query_ms += result["timeSqlQueryMs"]
+            self.report.time_urn_ms += result["timeUrnMs"]
+            self.report.default_aspects_created += result["defaultAspectsCreated"]
+            self.report.ignored += result["ignored"]
+            self.report.time_entity_registry_check_ms += result[
+                "timeEntityRegistryCheckMs"
+            ]
+            self.report.last_aspect = result["lastAspect"]
+            self.report.last_urn = result["lastUrn"]
+            self._print_report()
+            if result["rowsMigrated"] == self.config.batch_size:
+                start += self.config.batch_size
+            else:
+                break
+        yield from []

{acryl_datahub_cloud-0.3.8.1rc2 → acryl_datahub_cloud-0.3.8.2}/src/acryl_datahub_cloud/datahub_usage_reporting/query_builder.py

@@ -13,6 +13,7 @@ class QueryBuilder:
                     "removed",
                     "siblings",
                     "typeNames",
+                    "combinedSearchRankingMultiplier",
                 ]
             },
         }