Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(ingest): add Looks subtype + stop reemitting browsePathV2 #9978

Merged
merged 1 commit into from
Mar 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions metadata-ingestion/src/datahub/ingestion/api/source.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
auto_materialize_referenced_tags,
auto_status_aspect,
auto_workunit_reporter,
re_emit_browse_path_v2,
)
from datahub.ingestion.api.workunit import MetadataWorkUnit
from datahub.metadata.com.linkedin.pegasus2avro.mxe import MetadataChangeEvent
Expand Down Expand Up @@ -297,7 +296,7 @@ def _get_browse_path_processor(self, dry_run: bool) -> MetadataWorkUnitProcessor
drop_dirs=[s for s in browse_path_drop_dirs if s is not None],
dry_run=dry_run,
)
return lambda stream: re_emit_browse_path_v2(browse_path_processor(stream))
return lambda stream: browse_path_processor(stream)


class TestableSource(Source):
Expand Down
15 changes: 0 additions & 15 deletions metadata-ingestion/src/datahub/ingestion/api/source_helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -197,21 +197,6 @@ def auto_lowercase_urns(
yield wu


def re_emit_browse_path_v2(
stream: Iterable[MetadataWorkUnit],
) -> Iterable[MetadataWorkUnit]:
"""Re-emit browse paths v2 aspects, to avoid race condition where server overwrites with default."""
browse_path_v2_workunits = []

for wu in stream:
yield wu
if wu.is_primary_source and wu.get_aspect_of_type(BrowsePathsV2Class):
browse_path_v2_workunits.append(wu)

for wu in browse_path_v2_workunits:
yield wu


def auto_browse_path_v2(
stream: Iterable[MetadataWorkUnit],
*,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,6 @@ class BIContainerSubTypes(str, Enum):
class BIAssetSubTypes(str, Enum):
# Generic SubTypes
REPORT = "Report"

# Looker
LOOKER_LOOK = "Look"
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
)
from datahub.ingestion.api.source_helpers import auto_workunit
from datahub.ingestion.api.workunit import MetadataWorkUnit
from datahub.ingestion.source.common.subtypes import BIAssetSubTypes
from datahub.ingestion.source.looker import looker_usage
from datahub.ingestion.source.looker.looker_common import (
InputFieldElement,
Expand Down Expand Up @@ -89,6 +90,7 @@
OwnerClass,
OwnershipClass,
OwnershipTypeClass,
SubTypesClass,
)
from datahub.utilities.advanced_thread_executor import BackpressureAwareExecutor

Expand Down Expand Up @@ -624,7 +626,11 @@ def _make_chart_metadata_events(
chart_mce = MetadataChangeEvent(proposedSnapshot=chart_snapshot)

proposals: List[Union[MetadataChangeEvent, MetadataChangeProposalWrapper]] = [
chart_mce
chart_mce,
MetadataChangeProposalWrapper(
entityUrn=chart_urn,
aspect=SubTypesClass(typeNames=[BIAssetSubTypes.LOOKER_LOOK]),
),
]

# If extracting embeds is enabled, produce an MCP for embed URL.
Expand Down
93 changes: 0 additions & 93 deletions metadata-ingestion/tests/integration/looker/expected_output.json

This file was deleted.

Loading
Loading