yujunjun/OpenMetadata
1
0
Fork 0
mirror of https://github.com/open-metadata/OpenMetadata.git synced 2025-08-13 19:46:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Mapper Parser issue (#9865)

Browse Source
This commit is contained in:
Ayush Shah 2023-01-24 11:21:50 +05:30 committed by GitHub
parent 3f5277ede9
commit d15d96ef1a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
ingestion/src/metadata/ingestion/sink/elasticsearch.py
View File

@ -569,9 +569,12 @@ class ElasticsearchSink(Sink[Entity]):
return topic_doc return topic_doc
def _create_dashboard_es_doc(self, dashboard: Dashboard): def _create_dashboard_es_doc(self, dashboard: Dashboard):
display_name = (
dashboard.displayName if dashboard.displayName else dashboard.name.__root__
)
suggest = [ suggest = [
{"input": [dashboard.fullyQualifiedName.__root__], "weight": 10}, {"input": [dashboard.fullyQualifiedName.__root__], "weight": 10},
{"input": [dashboard.displayName], "weight": 5}, {"input": [display_name], "weight": 5},
] ]
service_suggest = [] service_suggest = []
chart_suggest = [] chart_suggest = []
@ -588,16 +591,15 @@ class ElasticsearchSink(Sink[Entity]):
tags.append(dashboard_tag) tags.append(dashboard_tag)
for chart in dashboard.charts: for chart in dashboard.charts:
chart_suggest.append({"input": [chart.displayName], "weight": 5}) chart_display_name = chart.displayName if chart.displayName else chart.name
chart_suggest.append({"input": [chart_display_name], "weight": 5})
service_suggest.append({"input": [dashboard.service.name], "weight": 5}) service_suggest.append({"input": [dashboard.service.name], "weight": 5})
dashboard_doc = DashboardESDocument( dashboard_doc = DashboardESDocument(
id=str(dashboard.id.__root__), id=str(dashboard.id.__root__),
name=dashboard.displayName name=display_name,
if dashboard.displayName displayName=display_name,
else dashboard.name.__root__,
displayName=dashboard.displayName if dashboard.displayName else "",
description=dashboard.description.__root__ if dashboard.description else "", description=dashboard.description.__root__ if dashboard.description else "",
fullyQualifiedName=dashboard.fullyQualifiedName.__root__, fullyQualifiedName=dashboard.fullyQualifiedName.__root__,
version=dashboard.version.__root__, version=dashboard.version.__root__,
@ -622,9 +624,12 @@ class ElasticsearchSink(Sink[Entity]):
return dashboard_doc return dashboard_doc
def _create_pipeline_es_doc(self, pipeline: Pipeline): def _create_pipeline_es_doc(self, pipeline: Pipeline):
display_name = (
pipeline.displayName if pipeline.displayName else pipeline.name.__root__
)
suggest = [ suggest = [
{"input": [pipeline.fullyQualifiedName.__root__], "weight": 10}, {"input": [pipeline.fullyQualifiedName.__root__], "weight": 10},
{"input": [pipeline.displayName], "weight": 5}, {"input": [display_name], "weight": 5},
] ]
service_suggest = [] service_suggest = []
task_suggest = [] task_suggest = []
@ -649,9 +654,7 @@ class ElasticsearchSink(Sink[Entity]):
pipeline_doc = PipelineESDocument( pipeline_doc = PipelineESDocument(
id=str(pipeline.id.__root__), id=str(pipeline.id.__root__),
name=pipeline.name.__root__, name=pipeline.name.__root__,
displayName=pipeline.displayName displayName=display_name,
if pipeline.displayName
else pipeline.name.__root__,
description=pipeline.description.__root__ if pipeline.description else "", description=pipeline.description.__root__ if pipeline.description else "",
fullyQualifiedName=pipeline.fullyQualifiedName.__root__, fullyQualifiedName=pipeline.fullyQualifiedName.__root__,
version=pipeline.version.__root__, version=pipeline.version.__root__,
@ -675,7 +678,10 @@ class ElasticsearchSink(Sink[Entity]):
return pipeline_doc return pipeline_doc
def _create_ml_model_es_doc(self, ml_model: MlModel): def _create_ml_model_es_doc(self, ml_model: MlModel):
suggest = [{"input": [ml_model.displayName], "weight": 10}] display_name = (
ml_model.displayName if ml_model.displayName else ml_model.name.__root__
)
suggest = [{"input": [display_name], "weight": 10}]
tags = [] tags = []
ml_model_followers = [] ml_model_followers = []
if ml_model.followers: if ml_model.followers:
@ -706,9 +712,7 @@ class ElasticsearchSink(Sink[Entity]):
ml_model_doc = MlModelESDocument( ml_model_doc = MlModelESDocument(
id=str(ml_model.id.__root__), id=str(ml_model.id.__root__),
name=ml_model.name.__root__, name=ml_model.name.__root__,
displayName=ml_model.displayName displayName=display_name,
if ml_model.displayName
else ml_model.name.__root__,
description=ml_model.description.__root__ if ml_model.description else "", description=ml_model.description.__root__ if ml_model.description else "",
fullyQualifiedName=ml_model.fullyQualifiedName.__root__, fullyQualifiedName=ml_model.fullyQualifiedName.__root__,
version=ml_model.version.__root__, version=ml_model.version.__root__,
@ -743,7 +747,7 @@ class ElasticsearchSink(Sink[Entity]):
user_doc = UserESDocument( user_doc = UserESDocument(
id=str(user.id.__root__), id=str(user.id.__root__),
name=user.name.__root__, name=user.name.__root__,
displayName=user.displayName if user.displayName else user.name.__root__, displayName=display_name,
description=user.description.__root__ if user.description else "", description=user.description.__root__ if user.description else "",
fullyQualifiedName=user.fullyQualifiedName.__root__, fullyQualifiedName=user.fullyQualifiedName.__root__,
version=user.version.__root__, version=user.version.__root__,
@ -762,14 +766,15 @@ class ElasticsearchSink(Sink[Entity]):
return user_doc return user_doc
def _create_team_es_doc(self, team: Team): def _create_team_es_doc(self, team: Team):
display_name = team.displayName if team.displayName else team.name.__root__
suggest = [ suggest = [
{"input": [team.displayName], "weight": 5}, {"input": [display_name], "weight": 5},
{"input": [team.name], "weight": 10}, {"input": [team.name], "weight": 10},
] ]
team_doc = TeamESDocument( team_doc = TeamESDocument(
id=str(team.id.__root__), id=str(team.id.__root__),
name=team.name.__root__, name=team.name.__root__,
displayName=team.displayName if team.displayName else team.name.__root__, displayName=display_name,
description=team.description.__root__ if team.description else "", description=team.description.__root__ if team.description else "",
teamType=team.teamType.name, teamType=team.teamType.name,
fullyQualifiedName=team.fullyQualifiedName.__root__, fullyQualifiedName=team.fullyQualifiedName.__root__,
@ -788,16 +793,19 @@ class ElasticsearchSink(Sink[Entity]):
return team_doc return team_doc
def _create_glossary_term_es_doc(self, glossary_term: GlossaryTerm): def _create_glossary_term_es_doc(self, glossary_term: GlossaryTerm):
display_name = (
glossary_term.displayName
if glossary_term.displayName
else glossary_term.name.__root__
)
suggest = [ suggest = [
{"input": [glossary_term.displayName], "weight": 5}, {"input": [display_name], "weight": 5},
{"input": [glossary_term.name], "weight": 10}, {"input": [glossary_term.name], "weight": 10},
] ]
glossary_term_doc = GlossaryTermESDocument( glossary_term_doc = GlossaryTermESDocument(
id=str(glossary_term.id.__root__), id=str(glossary_term.id.__root__),
name=str(glossary_term.name.__root__), name=str(glossary_term.name.__root__),
displayName=glossary_term.displayName displayName=display_name,
if glossary_term.displayName
else glossary_term.name.__root__,
description=glossary_term.description.__root__ description=glossary_term.description.__root__
if glossary_term.description if glossary_term.description
else "", else "",