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.

Sign up for GitHub

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

Jump to bottom

chore: Add repr function to BadgeMetadata #397

Merged
merged 6 commits into from
Nov 2, 2020
Merged

chore: Add repr function to BadgeMetadata #397

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
427148b
Add repr function for BadgeMetadata
dikshathakur3119 Oct 30, 2020
f860447
remove badge instance from repr function
dikshathakur3119 Oct 30, 2020
225a67e
bump version
dikshathakur3119 Oct 30, 2020
b36622f
Delete db,, schema from BadgeMetadata
dikshathakur3119 Oct 30, 2020
8380eb8
Remove cluster
dikshathakur3119 Nov 2, 2020
357a2a5
fix lint
dikshathakur3119 Nov 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions databuilder/models/badge.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,12 @@ class BadgeMetadata(Neo4jCsvSerializable):
INVERSE_BADGE_RELATION_TYPE = 'BADGE_FOR'

def __init__(self,
db_name: str,
schema: str,
start_label: str, # Table, Dashboard, Column
start_key: str,
badges: List[Badge],
cluster: str = 'gold', # is this what we want as default for badges..?
):
self.badges = badges

self.db = db_name.lower()
self.schema = schema.lower()
self.cluster = cluster.lower()

table_key_pattern = re.compile('[a-z]+://[a-zA-Z0-9_.-]+.[a-zA-Z0-9_.-]+/[a-zA-Z0-9_.-]+')
Expand All @@ -65,6 +60,11 @@ def __init__(self,
self._node_iter = iter(self.create_nodes())
self._relation_iter = iter(self.create_relation())

def __repr__(self) -> str:
return 'BadgeMetadata({!r}, {!r}, {!r})'.format(self.cluster,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is cluster being used anywhere?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no it is not but I did not remove it thinking if we want different badge for different clusters. I can remove it though since w e are not storing this info anywhere

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think we need it given the start_key uri should include cluster field (db://cluster.schema/table?) even if we have different clusters, the uri will be different?

self.start_label,
self.start_key)

def create_next_node(self) -> Optional[Dict[str, Any]]:
# return the string representation of the data
try:
Expand Down
8 changes: 2 additions & 6 deletions databuilder/models/table_metadata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,9 +378,7 @@ def _create_next_node(self) -> Iterator[Any]: # noqa: C901
yield col.description.get_node_dict(node_key)

if col.badges:
badge_metadata = BadgeMetadata(db_name=self._get_database_key(),
schema=self._get_schema_key(),
start_label=ColumnMetadata.COLUMN_NODE_LABEL,
badge_metadata = BadgeMetadata(start_label=ColumnMetadata.COLUMN_NODE_LABEL,
start_key=self._get_col_key(col),
badges=col.badges,
cluster=self._get_cluster_key())
Expand Down Expand Up @@ -457,9 +455,7 @@ def _create_next_relation(self) -> Iterator[Any]:
self._get_col_key(col),
self._get_col_description_key(col, col.description))
if col.badges:
badge_metadata = BadgeMetadata(db_name=self._get_database_key(),
schema=self._get_schema_key(),
start_label=ColumnMetadata.COLUMN_NODE_LABEL,
badge_metadata = BadgeMetadata(start_label=ColumnMetadata.COLUMN_NODE_LABEL,
start_key=self._get_col_key(col),
badges=col.badges,
cluster=self._get_cluster_key())
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from setuptools import setup, find_packages


__version__ = '4.0.1'
__version__ = '4.0.2'


requirements = [
Expand Down
4 changes: 1 addition & 3 deletions tests/unit/models/test_badge.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@
class TestBadge(unittest.TestCase):
def setUp(self) -> None:
super(TestBadge, self).setUp()
self.badge_metada = BadgeMetadata(db_name='hive',
schema=SCHEMA,
start_label='Column',
self.badge_metada = BadgeMetadata(start_label='Column',
start_key='hive://default.base/test/ds',
cluster=CLUSTER,
badges=[badge1, badge2])
Expand Down