pytrilogy 0.0.2.23__tar.gz → 0.0.2.26__tar.gz

{pytrilogy-0.0.2.23/pytrilogy.egg-info → pytrilogy-0.0.2.26}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pytrilogy
-Version: 0.0.2.23
+Version: 0.0.2.26
 Summary: Declarative, typed query language that compiles to SQL.
 Home-page: 
 Author: 

{pytrilogy-0.0.2.23 → pytrilogy-0.0.2.26/pytrilogy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pytrilogy
-Version: 0.0.2.23
+Version: 0.0.2.26
 Summary: Declarative, typed query language that compiles to SQL.
 Home-page: 
 Author: 

{pytrilogy-0.0.2.23 → pytrilogy-0.0.2.26}/tests/test_models.py

@@ -11,7 +11,7 @@ from trilogy.core.models import (
     BaseJoin,
     Comparison,
     Join,
-    JoinKey,
+    CTEConceptPair,
     Concept,
     AggregateWrapper,
     RowsetItem,
@@ -190,31 +190,13 @@ def test_base_join(test_environment: Environment):
         right_datasource=test_environment.datasources["products"],
         concepts=[
             test_environment.concepts["product_id"],
-            test_environment.concepts["category_name"],
+            # test_environment.concepts["category_name"],
         ],
         join_type=JoinType.RIGHT_OUTER,
-        filter_to_mutual=True,
     )
 
     assert x.concepts == [test_environment.concepts["product_id"]]
 
-    exc3: SyntaxError | None = None
-    try:
-        x = BaseJoin(
-            left_datasource=test_environment.datasources["revenue"],
-            right_datasource=test_environment.datasources["category"],
-            concepts=[
-                test_environment.concepts["product_id"],
-                test_environment.concepts["category_name"],
-            ],
-            join_type=JoinType.RIGHT_OUTER,
-            filter_to_mutual=True,
-        )
-    except Exception as exc4:
-        exc3 = exc4
-        pass
-    assert isinstance(exc3, SyntaxError)
-
 
 def test_comparison():
     try:
@@ -264,13 +246,16 @@ def test_join(test_environment: Environment):
     test = Join(
         left_cte=a,
         right_cte=b,
-        joinkeys=[JoinKey(concept=x) for x in outputs],
+        joinkey_pairs=[
+            CTEConceptPair(left=x, right=x, existing_datasource=a.source, cte=a)
+            for x in outputs
+        ],
         jointype=JoinType.RIGHT_OUTER,
     )
 
     assert (
         str(test)
-        == "right outer JOIN test and testb on local.product_id<local.product_id>,local.category_id<local.category_id>"
+        == "right outer join testb on test.local.product_id=local.product_id,test.local.category_id=local.category_id"
     ), str(test)
 
 

{pytrilogy-0.0.2.23 → pytrilogy-0.0.2.26}/trilogy/__init__.py

@@ -4,6 +4,6 @@ from trilogy.executor import Executor
 from trilogy.parser import parse
 from trilogy.constants import CONFIG
 
-__version__ = "0.0.2.23"
+__version__ = "0.0.2.26"
 
 __all__ = ["parse", "Executor", "Dialects", "Environment", "CONFIG"]

{pytrilogy-0.0.2.23 → pytrilogy-0.0.2.26}/trilogy/constants.py

@@ -7,7 +7,7 @@ logger = getLogger("trilogy")
 
 DEFAULT_NAMESPACE = "local"
 
-VIRTUAL_CONCEPT_PREFIX = "_virtual"
+VIRTUAL_CONCEPT_PREFIX = "_virt"
 
 ENV_CACHE_NAME = ".preql_cache.json"
 

{pytrilogy-0.0.2.23 → pytrilogy-0.0.2.26}/trilogy/core/env_processor.py

@@ -6,17 +6,20 @@ from trilogy.core.graph_models import (
 from trilogy.core.models import Environment, Concept, Datasource
 
 
-def add_concept(concept: Concept, g: ReferenceGraph):
+def add_concept(
+    concept: Concept, g: ReferenceGraph, concept_mapping: dict[str, Concept]
+):
     g.add_node(concept)
     # if we have sources, recursively add them
     node_name = concept_to_node(concept)
     if concept.concept_arguments:
         for source in concept.concept_arguments:
             generic = source.with_default_grain()
-            add_concept(generic, g)
+            add_concept(generic, g, concept_mapping)
 
             g.add_edge(generic, node_name)
-    for _, pseudonym in concept.pseudonyms.items():
+    for ps_address in concept.pseudonyms:
+        pseudonym = concept_mapping[ps_address]
         pseudonym = pseudonym.with_default_grain()
         pseudonym_node = concept_to_node(pseudonym)
         if (pseudonym_node, node_name) in g.edges and (
@@ -28,7 +31,7 @@ def add_concept(concept: Concept, g: ReferenceGraph):
             continue
         g.add_edge(pseudonym_node, node_name, pseudonym=True)
         g.add_edge(node_name, pseudonym_node, pseudonym=True)
-        add_concept(pseudonym, g)
+        add_concept(pseudonym, g, concept_mapping)
 
 
 def generate_adhoc_graph(
@@ -37,10 +40,11 @@ def generate_adhoc_graph(
     restrict_to_listed: bool = False,
 ) -> ReferenceGraph:
     g = ReferenceGraph()
+    concept_mapping = {x.address: x for x in concepts}
 
     # add all parsed concepts
     for concept in concepts:
-        add_concept(concept, g)
+        add_concept(concept, g, concept_mapping)
 
     for dataset in datasources:
         node = datasource_to_node(dataset)
@@ -66,5 +70,7 @@ def generate_graph(
 ) -> ReferenceGraph:
 
     return generate_adhoc_graph(
-        list(environment.concepts.values()), list(environment.datasources.values())
+        list(environment.concepts.values())
+        + list(environment.alias_origin_lookup.values()),
+        list(environment.datasources.values()),
     )

{pytrilogy-0.0.2.23 → pytrilogy-0.0.2.26}/trilogy/core/environment_helpers.py

@@ -191,4 +191,3 @@ def generate_related_concepts(
             environment.add_concept(auto, meta=meta)
             if isinstance(value, Concept):
                 environment.merge_concept(auto, value, modifiers=[])
-                assert value.pseudonyms is not None