pytrilogy 0.0.3.40__tar.gz → 0.0.3.42__tar.gz

{pytrilogy-0.0.3.40/pytrilogy.egg-info → pytrilogy-0.0.3.42}/PKG-INFO

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

{pytrilogy-0.0.3.40 → pytrilogy-0.0.3.42/pytrilogy.egg-info}/PKG-INFO

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

{pytrilogy-0.0.3.40 → pytrilogy-0.0.3.42}/pytrilogy.egg-info/SOURCES.txt

@@ -15,6 +15,7 @@ tests/test_discovery_nodes.py
 tests/test_enums.py
 tests/test_environment.py
 tests/test_executor.py
+tests/test_failure.py
 tests/test_functions.py
 tests/test_imports.py
 tests/test_metadata.py

pytrilogy-0.0.3.42/tests/test_failure.py

@@ -0,0 +1,47 @@
+from pytest import raises
+
+from trilogy import Dialects
+from trilogy.core.exceptions import UnresolvableQueryException
+
+
+def test_cannot_find():
+    x = Dialects.DUCK_DB.default_executor()
+
+    with raises(UnresolvableQueryException):
+        x.generate_sql(
+            """
+    key x int;
+    key y int;
+
+    datasource fun (
+    y: y,
+        )
+    address abc;
+
+
+    select x;
+
+    """
+        )
+
+
+def test_cannot_find_complex():
+    x = Dialects.DUCK_DB.default_executor()
+    with raises(UnresolvableQueryException):
+        x.generate_sql(
+            """
+    key x int;
+    key y int;
+
+    auto sum <- x+y;
+
+    datasource fun (
+    y: y,
+        )
+    address abc;
+
+
+    select sum(y) by x as fun;
+
+    """
+        )

{pytrilogy-0.0.3.40 → pytrilogy-0.0.3.42}/trilogy/__init__.py

@@ -4,6 +4,6 @@ from trilogy.dialect.enums import Dialects
 from trilogy.executor import Executor
 from trilogy.parser import parse
 
-__version__ = "0.0.3.40"
+__version__ = "0.0.3.42"
 
 __all__ = ["parse", "Executor", "Dialects", "Environment", "CONFIG"]

{pytrilogy-0.0.3.40 → pytrilogy-0.0.3.42}/trilogy/core/environment_helpers.py

@@ -1,7 +1,7 @@
 from trilogy.constants import DEFAULT_NAMESPACE
 from trilogy.core.enums import ConceptSource, DatePart, FunctionType, Purpose
 from trilogy.core.functions import AttrAccess
-from trilogy.core.models.author import Concept, Function, Metadata, TraitDataType
+from trilogy.core.models.author import Concept, Function, Grain, Metadata, TraitDataType
 from trilogy.core.models.core import DataType, StructType, arg_to_datatype
 from trilogy.core.models.environment import Environment
 from trilogy.parsing.common import Meta
@@ -182,11 +182,9 @@ def generate_key_concepts(concept: Concept, environment: Environment):
             datatype=DataType.INTEGER,
             purpose=default_type,
             lineage=const_function,
-            grain=concept.grain,
+            grain=Grain(),
             namespace=concept.namespace,
-            keys={
-                concept.address,
-            },
+            keys=set(),
             metadata=Metadata(
                 description=f"Auto-derived integer. The {ftype.value} of {concept.address}, {base_description}",
                 line_number=base_line_number,

{pytrilogy-0.0.3.40 → pytrilogy-0.0.3.42}/trilogy/core/models/build.py

@@ -1541,18 +1541,14 @@ class Factory:
                     else:
                         # constants, etc, can be ignored for group
                         continue
-                group_base = group_base.model_copy(
-                    deep=True,
-                    update={
-                        "lineage": AggregateWrapper(
-                            function=group_base.lineage.function,
-                            by=final_args,
-                        )
-                    },
-                )
-                group_base = group_base.with_grain(
-                    Grain.from_concepts(final_args, environment=self.environment)
+                group_base = arbitrary_to_concept(
+                    AggregateWrapper(
+                        function=group_base.lineage.function,
+                        by=final_args,
+                    ),
+                    environment=self.environment,
                 )
+
                 rval = self.build(group_base)
                 return BuildFunction.model_construct(
                     operator=base.operator,
@@ -1650,21 +1646,20 @@ class Factory:
             ]
         else:
             by = [self.build(x) for x in base.by]
+
         parent = self.build(base.function)
         return BuildAggregateWrapper.model_construct(function=parent, by=by)
 
     @build.register
     def _(self, base: ColumnAssignment) -> BuildColumnAssignment:
-
+        fetched = self.environment.concepts[base.concept.address]
         return BuildColumnAssignment.model_construct(
             alias=(
                 self.build(base.alias)
                 if isinstance(base.alias, Function)
                 else base.alias
             ),
-            concept=self.build(
-                self.environment.concepts[base.concept.address].with_grain(self.grain)
-            ),
+            concept=self.build(fetched.with_grain(self.grain)),
             modifiers=base.modifiers,
         )
 
@@ -1683,7 +1678,9 @@ class Factory:
         from trilogy.parsing.common import arbitrary_to_concept
 
         bexpr: Any
-        if isinstance(base.expr, AggregateWrapper):
+        if isinstance(base.expr, (AggregateWrapper, WindowItem, FilterItem)) or (
+            isinstance(base.expr, Function) and base.expr.operator == FunctionType.GROUP
+        ):
             bexpr = arbitrary_to_concept(
                 base.expr,
                 environment=self.environment,
@@ -1697,6 +1694,7 @@ class Factory:
 
     @build.register
     def _(self, base: WhereClause) -> BuildWhereClause:
+
         return BuildWhereClause.model_construct(
             conditional=self.build(base.conditional)
         )
@@ -1756,14 +1754,14 @@ class Factory:
         from trilogy.parsing.common import arbitrary_to_concept
 
         left = base.left
-        if isinstance(left, AggregateWrapper):
+        if isinstance(left, (AggregateWrapper, WindowItem, FilterItem)):
             left_c = arbitrary_to_concept(
                 left,
                 environment=self.environment,
             )
             left = left_c  # type: ignore
         right = base.right
-        if isinstance(right, AggregateWrapper):
+        if isinstance(right, (AggregateWrapper, WindowItem, FilterItem)):
             right_c = arbitrary_to_concept(
                 right,
                 environment=self.environment,

{pytrilogy-0.0.3.40 → pytrilogy-0.0.3.42}/trilogy/core/processing/concept_strategies_v3.py

@@ -5,6 +5,7 @@ from typing import List, Optional, Protocol, Union
 from trilogy.constants import logger
 from trilogy.core.enums import Derivation, FunctionType, Granularity
 from trilogy.core.env_processor import generate_graph
+from trilogy.core.exceptions import UnresolvableQueryException
 from trilogy.core.graph_models import ReferenceGraph
 from trilogy.core.models.author import (
     UndefinedConcept,
@@ -1120,8 +1121,8 @@ def source_query_concepts(
         error_strings = [
             f"{c.address}<{c.purpose}>{c.derivation}>" for c in output_concepts
         ]
-        raise ValueError(
-            f"Could not resolve connections between {error_strings} from environment graph."
+        raise UnresolvableQueryException(
+            f"Could not resolve connections for query with output {error_strings} from current model."
         )
     final = [x for x in root.output_concepts if x.address not in root.hidden_concepts]
     logger.info(

{pytrilogy-0.0.3.40 → pytrilogy-0.0.3.42}/trilogy/core/processing/node_generators/group_to_node.py

@@ -31,9 +31,9 @@ def gen_group_to_node(
         raise SyntaxError(
             f"Group to should have function lineage, is {type(concept.lineage)}"
         )
-    group_arg = concept.lineage.arguments[0]
 
     parent_concepts: List[BuildConcept] = concept.lineage.concept_arguments
+    root = parent_concepts[0]
     logger.info(
         f"{padding(depth)}{LOGGER_PREFIX} group by node has required parents {[x.address for x in parent_concepts]}"
     )
@@ -47,7 +47,7 @@ def gen_group_to_node(
             conditions=conditions,
         )
     ]
-
+    outputs = parent_concepts + [concept]
     group_node = GroupNode(
         output_concepts=parent_concepts + [concept],
         input_concepts=parent_concepts,
@@ -56,17 +56,30 @@ def gen_group_to_node(
         depth=depth,
         preexisting_conditions=conditions.conditional if conditions else None,
         hidden_concepts=set(
-            [group_arg.address]
-            if isinstance(group_arg, BuildConcept)
-            and group_arg.address not in local_optional
-            else []
+            [
+                x.address
+                for x in outputs
+                if x.address not in local_optional
+                and x.address != concept.address
+                and x.address != root.address
+            ]
         ),
     )
 
     # early exit if no optional
-    if not local_optional:
+    missing_local_option: list[BuildConcept] = [
+        x for x in local_optional if x not in group_node.output_concepts
+    ]
+    if not missing_local_option:
+        logger.info(
+            f"{padding(depth)}{LOGGER_PREFIX} no missing local optional required, returning group node only."
+        )
         return group_node
 
+    logger.info(
+        f"{padding(depth)}{LOGGER_PREFIX} group by node is missing required optional {[x.address for x in missing_local_option]}"
+    )
+
     # the keys we group by
     # are what we can use for enrichment
     enrich_node = source_concepts(  # this fetches the parent + join keys
@@ -83,7 +96,9 @@ def gen_group_to_node(
             f"{padding(depth)}{LOGGER_PREFIX} group by node enrich node, returning group node only."
         )
         return group_node
-
+    logger.info(
+        f"{padding(depth)}{LOGGER_PREFIX} returning group to node with enrichment."
+    )
     return MergeNode(
         input_concepts=[concept]
         + local_optional

{pytrilogy-0.0.3.40 → pytrilogy-0.0.3.42}/trilogy/parsing/common.py

@@ -771,7 +771,13 @@ def arbitrary_to_concept(
         )
     elif isinstance(parent, Function):
         if not name:
-            name = f"{VIRTUAL_CONCEPT_PREFIX}_func_{parent.operator.value}_{string_to_hash(str(parent))}"
+            if parent.operator == FunctionType.GROUP:
+                name = (
+                    f"{VIRTUAL_CONCEPT_PREFIX}_group_to_{string_to_hash(str(parent))}"
+                )
+            else:
+                name = f"{VIRTUAL_CONCEPT_PREFIX}_func_{parent.operator.value}_{string_to_hash(str(parent))}"
+
         if parent.operator == FunctionType.GROUP:
             return group_function_to_concept(
                 parent,

{pytrilogy-0.0.3.40 → pytrilogy-0.0.3.42}/trilogy/parsing/parse_engine.py

@@ -590,6 +590,7 @@ class ParseToObjects(Transformer):
             keys=set([x.address for x in parents]),
             modifiers=modifiers,
         )
+
         self.environment.add_concept(concept, meta)
         return concept
 
@@ -1367,23 +1368,7 @@ class ParseToObjects(Transformer):
     def comparison(self, args) -> Comparison:
         if args[1] == ComparisonOperator.IN:
             raise SyntaxError
-        # if isinstance(args[0], AggregateWrapper):
-        #     left_c = arbitrary_to_concept(
-        #         args[0],
-        #         environment=self.environment,
-        #     )
-        #     self.environment.add_concept(left_c)
-        #     left = left_c.reference
-        # else:
         left = args[0]
-        # if isinstance(args[2], AggregateWrapper):
-        #     right_c = arbitrary_to_concept(
-        #         args[2],
-        #         environment=self.environment,
-        #     )
-        #     self.environment.add_concept(right_c)
-        #     right = right_c.reference
-        # else:
         right = args[2]
         return Comparison(left=left, right=right, operator=args[1])