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

use uv, fix some deprecation warning #160

Merged
merged 1 commit into from
Jan 29, 2025
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
2 changes: 1 addition & 1 deletion datahub-actions/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ task installDevTest(type: Exec, dependsOn: [installDev]) {
outputs.dir("${venv_name}")
outputs.file("${venv_name}/.build_install_dev_test_sentinel")
commandLine 'bash', '-x', '-c',
"${venv_name}/bin/pip install -e .[dev,integration-tests] && touch ${venv_name}/.build_install_dev_test_sentinel"
"source ${venv_name}/bin/activate && ${venv_name}/bin/uv pip install -e .[dev,integration-tests] && touch ${venv_name}/.build_install_dev_test_sentinel"
}

def testFile = hasProperty('testFile') ? testFile : 'unknown'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ class DocPropagationConfig(PropagationConfig):


def get_field_path(schema_field_urn: str) -> str:
urn = Urn.create_from_string(schema_field_urn)
urn = Urn.from_string(schema_field_urn)
return urn.get_entity_id()[1]


Expand Down Expand Up @@ -698,7 +698,7 @@ def _propagate_to_downstreams(
x for x in downstreams if guess_entity_type(x) == "schemaField"
}
for field in downstream_fields:
schema_field_urn = Urn.create_from_string(field)
schema_field_urn = Urn.from_string(field)
parent_urn = schema_field_urn.get_entity_id()[0]
field_path = schema_field_urn.get_entity_id()[1]

Expand Down Expand Up @@ -774,7 +774,7 @@ def _propagate_to_upstreams(
# upstream field
if len(upstream_fields) == 1:
for field in upstream_fields:
schema_field_urn = Urn.create_from_string(field)
schema_field_urn = Urn.from_string(field)
parent_urn = schema_field_urn.get_entity_id()[0]
field_path = schema_field_urn.get_entity_id()[1]

Expand Down Expand Up @@ -838,7 +838,7 @@ def _propagate_to_siblings(
guess_entity_type(entity_urn) == "schemaField"
and guess_entity_type(sibling) == "schemaField"
):
parent_urn = Urn.create_from_string(sibling).get_entity_id()[0]
parent_urn = Urn.from_string(sibling).get_entity_id()[0]
self._stats.increment_assets_impacted(sibling)
maybe_mcp = self.modify_docs_on_columns(
self.ctx.graph,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -261,8 +261,8 @@ def get_unique_siblings(graph: AcrylDataHubGraph, entity_urn: str) -> list[str]:
"""

if guess_entity_type(entity_urn) == "schemaField":
parent_urn = Urn.create_from_string(entity_urn).get_entity_id()[0]
entity_field_path = Urn.create_from_string(entity_urn).get_entity_id()[1]
parent_urn = Urn.from_string(entity_urn).get_entity_id()[0]
entity_field_path = Urn.from_string(entity_urn).get_entity_id()[1]
# Does my parent have siblings?
siblings: Optional[models.SiblingsClass] = graph.graph.get_aspect(
parent_urn,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ def __init__(self, config: SnowflakeConfig):

@staticmethod
def get_term_name_from_id(term_urn: str, graph: AcrylDataHubGraph) -> str:
term_id = Urn.create_from_string(term_urn).get_entity_id_as_string()
term_id = Urn.from_string(term_urn).get_entity_id_as_string()
if term_id.count("-") == 4:
# needs resolution
term_info = graph.graph.get_aspect(term_urn, GlossaryTermInfoClass)
Expand All @@ -43,7 +43,7 @@ def get_term_name_from_id(term_urn: str, graph: AcrylDataHubGraph) -> str:
term_name = term_info.name
parent = term_info.parentNode
while parent:
parent_id = Urn.create_from_string(parent).get_entity_id_as_string()
parent_id = Urn.from_string(parent).get_entity_id_as_string()
node_info = graph.graph.get_aspect(parent, GlossaryNodeInfoClass)
assert node_info
if parent_id.count("-") == 4:
Expand All @@ -61,7 +61,7 @@ def get_term_name_from_id(term_urn: str, graph: AcrylDataHubGraph) -> str:

@staticmethod
def get_label_urn_to_tag(label_urn: str, graph: AcrylDataHubGraph) -> str:
label_urn_parsed = Urn.create_from_string(label_urn)
label_urn_parsed = Urn.from_string(label_urn)
if label_urn_parsed.get_type() == "tag":
return label_urn_parsed.get_entity_id_as_string()
elif label_urn_parsed.get_type() == "glossaryTerm":
Expand Down
26 changes: 13 additions & 13 deletions datahub-actions/src/datahub_actions/utils/name_resolver.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ def get_entity_name(
def get_specialized_type(
self, entity_urn: Urn, datahub_graph: Optional[DataHubGraph]
) -> str:
entity_type = entity_urn.get_type()
entity_type = entity_urn.entity_type
entity_type = {"schemaField": "column"}.get(
entity_urn.get_type(), entity_urn.get_type()
entity_urn.entity_type, entity_urn.entity_type
)

if datahub_graph:
Expand All @@ -70,15 +70,15 @@ class DataFlowNameResolver(DefaultNameResolver):
def get_entity_name(
self, entity_urn: Urn, datahub_graph: Optional[DataHubGraph]
) -> str:
dataflow_urn = DataFlowUrn.create_from_string(str(entity_urn))
dataflow_urn = DataFlowUrn.from_string(str(entity_urn))
dataflow_name = dataflow_urn.get_flow_id()
return dataflow_name

def get_specialized_type(
self, entity_urn: Urn, datahub_graph: Optional[DataHubGraph]
) -> str:
"""We prefix the type of the dataset with the platform it is part of"""
dataflow_urn = DataFlowUrn.create_from_string(str(entity_urn))
dataflow_urn = DataFlowUrn.from_string(str(entity_urn))
dataflow_orch = dataflow_urn.get_orchestrator_name()
return f"{dataflow_orch} DAG"

Expand All @@ -87,15 +87,15 @@ class DataJobNameResolver(DefaultNameResolver):
def get_entity_name(
self, entity_urn: Urn, datahub_graph: Optional[DataHubGraph]
) -> str:
datajob_urn = DataJobUrn.create_from_string(str(entity_urn))
datajob_urn = DataJobUrn.from_string(str(entity_urn))
datajob_name = datajob_urn.get_job_id()
return datajob_name

def get_specialized_type(
self, entity_urn: Urn, datahub_graph: Optional[DataHubGraph]
) -> str:
"""We prefix the type of the datajob with the platform it is part of"""
datajob_urn = DataJobUrn.create_from_string(str(entity_urn))
datajob_urn = DataJobUrn.from_string(str(entity_urn))
dataflow_urn = datajob_urn.get_data_flow_urn()
dataflow_orch = dataflow_urn.get_orchestrator_name()
return f"{dataflow_orch} Task"
Expand All @@ -105,8 +105,8 @@ class DatasetNameResolver(DefaultNameResolver):
def get_entity_name(
self, entity_urn: Urn, datahub_graph: Optional[DataHubGraph]
) -> str:
dataset_urn = DatasetUrn.create_from_string(str(entity_urn))
dataset_name = dataset_urn.get_dataset_name()
dataset_urn = DatasetUrn.from_string(str(entity_urn))
dataset_name = dataset_urn.name
if datahub_graph:
properties: Optional[DatasetPropertiesClass] = datahub_graph.get_aspect(
entity_urn=str(entity_urn), aspect_type=DatasetPropertiesClass
Expand All @@ -120,7 +120,7 @@ def get_specialized_type(
self, entity_urn: Urn, datahub_graph: Optional[DataHubGraph]
) -> str:
"""We prefix the type of the dataset with the platform it is part of"""
dataset_urn = DatasetUrn.create_from_string(str(entity_urn))
dataset_urn = DatasetUrn.from_string(str(entity_urn))
dataset_platform = dataset_urn.get_data_platform_urn().get_entity_id_as_string()
specialized_type = super().get_specialized_type(entity_urn, datahub_graph)
return f"{dataset_platform} {specialized_type}"
Expand All @@ -131,7 +131,7 @@ def get_entity_name(
self, entity_urn: Urn, datahub_graph: Optional[DataHubGraph]
) -> str:
return DatasetUrn.get_simple_field_path_from_v2_field_path(
entity_urn.get_entity_id()[1]
entity_urn.entity_ids[1]
)

def get_specialized_type(
Expand Down Expand Up @@ -255,7 +255,7 @@ def __init__(self):
self.default_resolver = DefaultNameResolver()

def get_resolver(self, entity_urn: Urn) -> NameResolver:
return self.registry.get(entity_urn.get_type(), self.default_resolver)
return self.registry.get(entity_urn.entity_type, self.default_resolver)


_name_resolver_registry = NameResolverRegistry()
Expand All @@ -264,7 +264,7 @@ def get_resolver(self, entity_urn: Urn) -> NameResolver:
def get_entity_name_from_urn(
entity_urn_str: str, datahub_graph: Optional[DataHubGraph]
) -> str:
entity_urn = Urn.create_from_string(entity_urn_str)
entity_urn = Urn.from_string(entity_urn_str)
return _name_resolver_registry.get_resolver(entity_urn).get_entity_name(
entity_urn, datahub_graph
)
Expand All @@ -273,7 +273,7 @@ def get_entity_name_from_urn(
def get_entity_qualifier_from_urn(
entity_urn_str: str, datahub_graph: Optional[DataHubGraph]
) -> str:
entity_urn = Urn.create_from_string(entity_urn_str)
entity_urn = Urn.from_string(entity_urn_str)
return _name_resolver_registry.get_resolver(entity_urn).get_specialized_type(
entity_urn, datahub_graph
)
4 changes: 2 additions & 2 deletions datahub-actions/src/datahub_actions/utils/social_util.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,8 @@ def get_message_from_entity_change_event(
entity_name = get_entity_name_from_urn(event.entityUrn, datahub_graph)
# special handling for entity type schemaField
if event.entityType == "schemaField":
schema_field_urn = Urn.create_from_string(event.entityUrn)
parent_entity_urn = Urn.create_from_string(schema_field_urn.get_entity_id()[0])
schema_field_urn = Urn.from_string(event.entityUrn)
parent_entity_urn = Urn.from_string(schema_field_urn.get_entity_id()[0])
parent_entity_name = get_entity_name_from_urn(
str(parent_entity_urn), datahub_graph
)
Expand Down
Loading