Merge pull request #5 from sg-dev/compiler

Compiler refactor

examples/pd_dataframe_demo_config.yaml

@@ -14,4 +14,9 @@ ENTITY("Person"):
         - FirstName = Person.FirstName
         - LastName = Person.LastName
     RELATION(person, "likes", MATCH("Species", Name=Person.FavoriteFlower)):
-        - Since = "4ever"
+        - Since = "4ever"
+
+ENTITY("TMP"):
+    NODE("tmp") t:
+        + ID = TMP.ID
+        - date = DATE(TMP.date, "%d.%m.%Y")

rel2graph/__init__.py

@@ -10,4 +10,5 @@
                             register_wrapper
                             )
 from .core.factories.matcher import Matcher
-from .core.graph_elements import Attribute
+from .core.graph_elements import Attribute
+from .core.schema_compiler import SchemaConfigException

rel2graph/core/converter.py

@@ -21,7 +21,7 @@
 from .factories.registrar import register_factory
 from .graph_elements import NodeMatcher, Graph, Subgraph
 from .factories.matcher import Matcher
-from .config_parser import parse
+from .schema_compiler import compile_schema
 import threading
 import time
 
@@ -303,7 +303,7 @@ def __init__(self, config_filename: str, iterator: ResourceIterator, graph: Grap
         self._num_workers = num_workers
 
         # Parse the schema and compile it into factories
-        self._factories = parse(config_filename)
+        self._factories = compile_schema(config_filename)
 
         # register the node matcher -> TODO: maybe find a better solution than global variable. Problem is inclusion in compiler. Would also fix the singleton issue.
         Matcher.graph_matcher = NodeMatcher(graph)
@@ -346,7 +346,7 @@ def reload_config(self, config_filename: str) -> None:
         Args:
             config_filename: Path of the schema config file.
         """
-        self._factories = parse(config_filename)
+        self._factories = compile_schema(config_filename)
         if self._worker_pool is not None:
             self._worker_pool.config.factories = self._factories
 

rel2graph/core/factories/matcher.py

@@ -26,7 +26,7 @@ def __init__(self, node_id: str = None, *conditions: 'AttributeFactory') -> None
         Based on if an attribute_key is set, a condition is interpreted as 
         label or as attribute condition. If conditions are set, the matcher will query the graph
         for nodes matching all labels and all attribute conditions.
-
+    
         Args:
             node_id: String that represents a unique node. The matcher will assume that the
                      searched node can be found in resources.supplies[node_id] upon calling