-
Notifications
You must be signed in to change notification settings - Fork 209
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Add description to schema * Update * Update
- Loading branch information
1 parent
cb6dc2e
commit 975a59a
Showing
11 changed files
with
241 additions
and
16 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,58 @@ | ||
from typing import Dict, Any, Union, Iterator # noqa: F401 | ||
|
||
from databuilder.models.neo4j_csv_serde import ( | ||
Neo4jCsvSerializable, NODE_LABEL, NODE_KEY) | ||
from databuilder.models.schema.schema_constant import SCHEMA_NODE_LABEL, SCHEMA_NAME_ATTR | ||
from databuilder.models.table_metadata import DescriptionMetadata | ||
|
||
|
||
class SchemaModel(Neo4jCsvSerializable): | ||
|
||
def __init__(self, | ||
schema_key, | ||
schema, | ||
description=None, | ||
description_source=None, | ||
**kwargs): | ||
self._schema_key = schema_key | ||
self._schema = schema | ||
self._description = DescriptionMetadata.create_description_metadata(text=description, | ||
source=description_source) \ | ||
if description else None | ||
self._node_iterator = self._create_node_iterator() | ||
self._relation_iterator = self._create_relation_iterator() | ||
|
||
def create_next_node(self): | ||
# type: () -> Union[Dict[str, Any], None] | ||
try: | ||
return next(self._node_iterator) | ||
except StopIteration: | ||
return None | ||
|
||
def _create_node_iterator(self): | ||
# type: () -> Iterator[[Dict[str, Any]]] | ||
yield { | ||
NODE_LABEL: SCHEMA_NODE_LABEL, | ||
NODE_KEY: self._schema_key, | ||
SCHEMA_NAME_ATTR: self._schema, | ||
} | ||
|
||
if self._description: | ||
yield self._description.get_node_dict(self._get_description_node_key()) | ||
|
||
def create_next_relation(self): | ||
# type: () -> Union[Dict[str, Any], None] | ||
try: | ||
return next(self._relation_iterator) | ||
except StopIteration: | ||
return None | ||
|
||
def _get_description_node_key(self): | ||
return '{}/{}'.format(self._schema_key, self._description.get_description_id()) | ||
|
||
def _create_relation_iterator(self): | ||
# type: () -> Iterator[[Dict[str, Any]]] | ||
if self._description: | ||
yield self._description.get_relation(start_node=SCHEMA_NODE_LABEL, | ||
start_key=self._schema_key, | ||
end_key=self._get_description_node_key()) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
SCHEMA_NODE_LABEL = 'Schema' | ||
|
||
SCHEMA_NAME_ATTR = 'name' | ||
|
||
SCHEMA_RELATION_TYPE = 'SCHEMA' | ||
SCHEMA_REVERSE_RELATION_TYPE = 'SCHEMA_OF' | ||
|
||
DATABASE_SCHEMA_KEY_FORMAT = '{db}://{cluster}.{schema}' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,82 @@ | ||
import unittest | ||
|
||
from databuilder.models.schema.schema import SchemaModel | ||
|
||
|
||
class TestSchemaDescription(unittest.TestCase): | ||
|
||
def test_create_nodes(self): | ||
# type: () -> None | ||
|
||
schema = SchemaModel(schema_key='db://cluster.schema', | ||
schema='schema_name', | ||
description='foo') | ||
|
||
self.assertDictEqual(schema.create_next_node(), | ||
{'name': 'schema_name', 'KEY': 'db://cluster.schema', 'LABEL': 'Schema'}) | ||
self.assertDictEqual(schema.create_next_node(), | ||
{'description_source': 'description', 'description': 'foo', | ||
'KEY': 'db://cluster.schema/_description', 'LABEL': 'Description'}) | ||
self.assertIsNone(schema.create_next_node()) | ||
|
||
def test_create_nodes_no_description(self): | ||
# type: () -> None | ||
|
||
schema = SchemaModel(schema_key='db://cluster.schema', | ||
schema='schema_name') | ||
|
||
self.assertDictEqual(schema.create_next_node(), | ||
{'name': 'schema_name', 'KEY': 'db://cluster.schema', 'LABEL': 'Schema'}) | ||
self.assertIsNone(schema.create_next_node()) | ||
|
||
def test_create_nodes_programmatic_description(self): | ||
# type: () -> None | ||
|
||
schema = SchemaModel(schema_key='db://cluster.schema', | ||
schema='schema_name', | ||
description='foo', | ||
description_source='bar') | ||
|
||
self.assertDictEqual(schema.create_next_node(), | ||
{'name': 'schema_name', 'KEY': 'db://cluster.schema', 'LABEL': 'Schema'}) | ||
self.assertDictEqual(schema.create_next_node(), | ||
{'description_source': 'bar', 'description': 'foo', | ||
'KEY': 'db://cluster.schema/_bar_description', 'LABEL': 'Programmatic_Description'}) | ||
self.assertIsNone(schema.create_next_node()) | ||
|
||
def test_create_relation(self): | ||
# type: () -> None | ||
schema = SchemaModel(schema_key='db://cluster.schema', | ||
schema='schema_name', | ||
description='foo') | ||
|
||
actual = schema.create_next_relation() | ||
expected = {'END_KEY': 'db://cluster.schema/_description', 'START_LABEL': 'Schema', 'END_LABEL': 'Description', | ||
'START_KEY': 'db://cluster.schema', 'TYPE': 'DESCRIPTION', 'REVERSE_TYPE': 'DESCRIPTION_OF'} | ||
|
||
self.assertEqual(expected, actual) | ||
self.assertIsNone(schema.create_next_relation()) | ||
|
||
def test_create_relation_no_description(self): | ||
# type: () -> None | ||
schema = SchemaModel(schema_key='db://cluster.schema', | ||
schema='schema_name') | ||
|
||
self.assertIsNone(schema.create_next_relation()) | ||
|
||
def test_create_relation_programmatic_description(self): | ||
# type: () -> None | ||
schema = SchemaModel(schema_key='db://cluster.schema', | ||
schema='schema_name', | ||
description='foo', | ||
description_source='bar') | ||
|
||
actual = schema.create_next_relation() | ||
expected = { | ||
'END_KEY': 'db://cluster.schema/_bar_description', 'START_LABEL': 'Schema', | ||
'END_LABEL': 'Programmatic_Description', 'START_KEY': 'db://cluster.schema', 'TYPE': 'DESCRIPTION', | ||
'REVERSE_TYPE': 'DESCRIPTION_OF' | ||
} | ||
|
||
self.assertEqual(expected, actual) | ||
self.assertIsNone(schema.create_next_relation()) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,54 @@ | ||
import unittest | ||
|
||
from mock import MagicMock | ||
from pyhocon import ConfigFactory | ||
|
||
from databuilder.transformer.base_transformer import ChainedTransformer | ||
|
||
|
||
class TestChainedTransformer(unittest.TestCase): | ||
|
||
def test_init_not_called(self): | ||
# type: () -> None | ||
|
||
mock_transformer1 = MagicMock() | ||
mock_transformer2 = MagicMock() | ||
chained_transformer = ChainedTransformer(transformers=[mock_transformer1, mock_transformer2]) | ||
|
||
config = ConfigFactory.from_dict({}) | ||
chained_transformer.init(conf=config) | ||
|
||
chained_transformer.transform( | ||
{ | ||
'foo': 'bar' | ||
} | ||
) | ||
|
||
mock_transformer1.init.assert_not_called() | ||
mock_transformer1.transform.assert_called_once() | ||
mock_transformer2.init.assert_not_called() | ||
mock_transformer2.transform.assert_called_once() | ||
|
||
def test_init_called(self): | ||
# type: () -> None | ||
|
||
mock_transformer1 = MagicMock() | ||
mock_transformer1.get_scope.return_value = 'foo' | ||
mock_transformer2 = MagicMock() | ||
mock_transformer2.get_scope.return_value = 'bar' | ||
chained_transformer = ChainedTransformer(transformers=[mock_transformer1, mock_transformer2], | ||
is_init_transformers=True) | ||
|
||
config = ConfigFactory.from_dict({}) | ||
chained_transformer.init(conf=config) | ||
|
||
chained_transformer.transform( | ||
{ | ||
'foo': 'bar' | ||
} | ||
) | ||
|
||
mock_transformer1.init.assert_called_once() | ||
mock_transformer1.transform.assert_called_once() | ||
mock_transformer2.init.assert_called_once() | ||
mock_transformer2.transform.assert_called_once() |