pytrilogy 0.0.2.58__py3-none-any.whl → 0.0.3.0__py3-none-any.whl

trilogy/core/graph_models.py

@@ -1,15 +1,15 @@
 import networkx as nx
 
-from trilogy.core.models import Concept, Datasource
+from trilogy.core.models.build import BuildConcept, BuildDatasource
 
 
-def concept_to_node(input: Concept) -> str:
+def concept_to_node(input: BuildConcept) -> str:
     # if input.purpose == Purpose.METRIC:
     #     return f"c~{input.namespace}.{input.name}@{input.grain}"
-    return f"c~{input.address}@{input.grain}"
+    return f"c~{input.address}@{input.grain.without_condition()}"
 
 
-def datasource_to_node(input: Datasource) -> str:
+def datasource_to_node(input: BuildDatasource) -> str:
     # if isinstance(input, JoinedDataSource):
     #     return "ds~join~" + ",".join(
     #         [datasource_to_node(sub) for sub in input.datasources]
@@ -22,12 +22,12 @@ class ReferenceGraph(nx.DiGraph):
         super().__init__(*args, **kwargs)
 
     def add_node(self, node_for_adding, **attr):
-        if isinstance(node_for_adding, Concept):
+        if isinstance(node_for_adding, BuildConcept):
             node_name = concept_to_node(node_for_adding)
             attr["type"] = "concept"
             attr["concept"] = node_for_adding
             attr["grain"] = node_for_adding.grain
-        elif isinstance(node_for_adding, Datasource):
+        elif isinstance(node_for_adding, BuildDatasource):
             node_name = datasource_to_node(node_for_adding)
             attr["type"] = "datasource"
             attr["ds"] = node_for_adding
@@ -37,19 +37,19 @@ class ReferenceGraph(nx.DiGraph):
         super().add_node(node_name, **attr)
 
     def add_edge(self, u_of_edge, v_of_edge, **attr):
-        if isinstance(u_of_edge, Concept):
+        if isinstance(u_of_edge, BuildConcept):
             orig = u_of_edge
             u_of_edge = concept_to_node(u_of_edge)
             if u_of_edge not in self.nodes:
                 self.add_node(orig)
-        elif isinstance(u_of_edge, Datasource):
+        elif isinstance(u_of_edge, BuildDatasource):
             u_of_edge = datasource_to_node(u_of_edge)
 
-        if isinstance(v_of_edge, Concept):
+        if isinstance(v_of_edge, BuildConcept):
             orig = v_of_edge
             v_of_edge = concept_to_node(v_of_edge)
             if v_of_edge not in self.nodes:
                 self.add_node(orig)
-        elif isinstance(v_of_edge, Datasource):
+        elif isinstance(v_of_edge, BuildDatasource):
             v_of_edge = datasource_to_node(v_of_edge)
         super().add_edge(u_of_edge, v_of_edge, **attr)

trilogy/core/internal.py

@@ -1,6 +1,7 @@
 from trilogy.core.constants import ALL_ROWS_CONCEPT, INTERNAL_NAMESPACE
-from trilogy.core.enums import FunctionType, Purpose
-from trilogy.core.models import Concept, DataType, Function, Grain
+from trilogy.core.enums import Derivation, FunctionType, Granularity, Purpose
+from trilogy.core.models.author import Concept, Function, Grain
+from trilogy.core.models.core import DataType
 
 DEFAULT_CONCEPTS = {
     ALL_ROWS_CONCEPT: Concept(
@@ -15,6 +16,8 @@ DEFAULT_CONCEPTS = {
             output_datatype=DataType.INTEGER,
             output_purpose=Purpose.CONSTANT,
         ),
+        granularity=Granularity.SINGLE_ROW,
+        derivation=Derivation.CONSTANT,
     ),
     "concept_name": Concept(
         name="concept_name",
@@ -22,6 +25,8 @@ DEFAULT_CONCEPTS = {
         datatype=DataType.STRING,
         purpose=Purpose.KEY,
         grain=Grain(),
+        granularity=Granularity.SINGLE_ROW,
+        derivation=Derivation.CONSTANT,
     ),
     "datasource": Concept(
         name="datasource",
@@ -29,6 +34,8 @@ DEFAULT_CONCEPTS = {
         datatype=DataType.STRING,
         purpose=Purpose.KEY,
         grain=Grain(),
+        granularity=Granularity.SINGLE_ROW,
+        derivation=Derivation.CONSTANT,
     ),
     "query_text": Concept(
         name="query_text",
@@ -36,5 +43,7 @@ DEFAULT_CONCEPTS = {
         datatype=DataType.STRING,
         purpose=Purpose.KEY,
         grain=Grain(),
+        granularity=Granularity.SINGLE_ROW,
+        derivation=Derivation.CONSTANT,
     ),
 }