pytrilogy 0.0.3.40__py3-none-any.whl → 0.0.3.42__py3-none-any.whl

{pytrilogy-0.0.3.40.dist-info → pytrilogy-0.0.3.42.dist-info}/METADATA

@@ -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.dist-info → pytrilogy-0.0.3.42.dist-info}/RECORD

@@ -1,5 +1,5 @@
-pytrilogy-0.0.3.40.dist-info/licenses/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
-trilogy/__init__.py,sha256=WMnT9BmyaPDH4Ou8mB78VlxkF9bljCJ8DIckl3wCaXw,303
+pytrilogy-0.0.3.42.dist-info/licenses/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
+trilogy/__init__.py,sha256=6Oo1hj7rRiJ3WTlh1NH1PAfbHWNk1Zgr5f5DpIefPy8,303
 trilogy/compiler.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/constants.py,sha256=5eQxk1A0pv-TQk3CCvgZCFA9_K-6nxrOm7E5Lxd7KIY,1652
 trilogy/engine.py,sha256=OK2RuqCIUId6yZ5hfF8J1nxGP0AJqHRZiafcowmW0xc,1728
@@ -13,7 +13,7 @@ trilogy/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/core/constants.py,sha256=7XaCpZn5mQmjTobbeBn56SzPWq9eMNDfzfsRU-fP0VE,171
 trilogy/core/enums.py,sha256=JwbWyAHOC2xRTZe2SeEvlIGPvmC1KjcJ4uh1Po5USzQ,7380
 trilogy/core/env_processor.py,sha256=pFsxnluKIusGKx1z7tTnfsd_xZcPy9pZDungkjkyvI0,3170
-trilogy/core/environment_helpers.py,sha256=TKx_Q50iczcW1eiFbnJ1zbcyGst-Xw80EcqYwKyEqg8,9742
+trilogy/core/environment_helpers.py,sha256=UWtF5ZQqFyzHdrjUBEd7c2ZfASBhBWFoa9WkUHBbyHI,9700
 trilogy/core/ergonomics.py,sha256=e-7gE29vPLFdg0_A1smQ7eOrUwKl5VYdxRSTddHweRA,1631
 trilogy/core/exceptions.py,sha256=JPYyBcit3T_pRtlHdtKSeVJkIyWUTozW2aaut25A2xI,673
 trilogy/core/functions.py,sha256=4fEOGgXWDvgrJtCg_5m2Y9iWnHfLbvLQ82RkIMl_1K0,27722
@@ -23,7 +23,7 @@ trilogy/core/optimization.py,sha256=aihzx4-2-mSjx5td1TDTYGvc7e9Zvy-_xEyhPqLS-Ig,
 trilogy/core/query_processor.py,sha256=Vl-u0F0rbqI2liv82yJgiZCB255Kx_KiuzZVHL6aeTM,19459
 trilogy/core/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/core/models/author.py,sha256=hS1caD8y7XWRBlHfwgZOrBcz3TisDPba8joFaiEXxX0,77072
-trilogy/core/models/build.py,sha256=flDLLFCR0XJ0fpUhkGg-bpDOkH915tDdXaKmrAzNIcg,61828
+trilogy/core/models/build.py,sha256=NdDRcgvNoa2CHoXcPvWAUkCA2TRUKYm0zIl5NBx0sfo,61796
 trilogy/core/models/build_environment.py,sha256=s_C9xAHuD3yZ26T15pWVBvoqvlp2LdZ8yjsv2_HdXLk,5363
 trilogy/core/models/core.py,sha256=wx6hJcFECMG-Ij972ADNkr-3nFXkYESr82ObPiC46_U,10875
 trilogy/core/models/datasource.py,sha256=6RjJUd2u4nYmEwFBpJlM9LbHVYDv8iHJxqiBMZqUrwI,9422
@@ -35,7 +35,7 @@ trilogy/core/optimizations/inline_constant.py,sha256=lvNTIXaLNkw3HseJyXyDNk5R52d
 trilogy/core/optimizations/inline_datasource.py,sha256=AHuTGh2x0GQ8usOe0NiFncfTFQ_KogdgDl4uucmhIbI,4241
 trilogy/core/optimizations/predicate_pushdown.py,sha256=g4AYE8Aw_iMlAh68TjNXGP754NTurrDduFECkUjoBnc,9399
 trilogy/core/processing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-trilogy/core/processing/concept_strategies_v3.py,sha256=reXqgktFKy5qhm4k6abrs4J16Sovxd4naHrsEcNarEk,43957
+trilogy/core/processing/concept_strategies_v3.py,sha256=dx6w7euQOozoNv-ugrFOHZcCSEkpG8yhK44QH5-yGt4,44046
 trilogy/core/processing/graph_utils.py,sha256=8QUVrkE9j-9C1AyrCb1nQEh8daCe0u1HuXl-Te85lag,1205
 trilogy/core/processing/utility.py,sha256=rfzdgl-vWkCyhLzXNNuWgPLK59eiYypQb6TdZKymUqk,21469
 trilogy/core/processing/node_generators/__init__.py,sha256=o8rOFHPSo-s_59hREwXMW6gjUJCsiXumdbJNozHUf-Y,800
@@ -43,7 +43,7 @@ trilogy/core/processing/node_generators/basic_node.py,sha256=UVsXMn6jTjm_ofVFt21
 trilogy/core/processing/node_generators/common.py,sha256=ZsDzThjm_mAtdQpKAg8QIJiPVZ4KuUkKyilj4eOhSDs,9439
 trilogy/core/processing/node_generators/filter_node.py,sha256=lT167yBgy3P9sDBM1Cjj0PKSXro8dvGtBmc8nwsUjig,8366
 trilogy/core/processing/node_generators/group_node.py,sha256=kO-ersxIL04rZwX5-vFIFQQnp357PFo_7ZKXoGq3wyc,5989
-trilogy/core/processing/node_generators/group_to_node.py,sha256=v2Xl5VjNO2hKJAdmqCbmAOqaRPvxRUbtfhhQXFMifWk,3197
+trilogy/core/processing/node_generators/group_to_node.py,sha256=jKcNCDOY6fNblrdZwaRU0sbUSr9H0moQbAxrGgX6iGA,3832
 trilogy/core/processing/node_generators/multiselect_node.py,sha256=GWV5yLmKTe1yyPhN60RG1Rnrn4ktfn9lYYXi_FVU4UI,7061
 trilogy/core/processing/node_generators/node_merge_node.py,sha256=sv55oynfqgpHEpo1OEtVDri-5fywzPhDlR85qaWikvY,16195
 trilogy/core/processing/node_generators/rowset_node.py,sha256=YmBs6ZQ7azLXRFEmeoecpGjK4pMHsUCovuBxfb3UKZI,6848
@@ -87,11 +87,11 @@ trilogy/hooks/graph_hook.py,sha256=c-vC-IXoJ_jDmKQjxQyIxyXPOuUcLIURB573gCsAfzQ,2
 trilogy/hooks/query_debugger.py,sha256=1npRjww94sPV5RRBBlLqMJRaFkH9vhEY6o828MeoEcw,5583
 trilogy/metadata/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/parsing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-trilogy/parsing/common.py,sha256=yZJ0b77viQktG5vi4CS8kz9KXj2K3nAb17bkDrw4-WI,26204
+trilogy/parsing/common.py,sha256=2KwR86ZNH04tcs500l02jLPkFaStEYc9wtR1NVO6cYo,26411
 trilogy/parsing/config.py,sha256=Z-DaefdKhPDmSXLgg5V4pebhSB0h590vI0_VtHnlukI,111
 trilogy/parsing/exceptions.py,sha256=92E5i2frv5hj9wxObJZsZqj5T6bglvPzvdvco_vW1Zk,38
 trilogy/parsing/helpers.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-trilogy/parsing/parse_engine.py,sha256=Tagt3zPBViM-GZYuqHb1SnbEIwa8fx12kF07JMgmyV4,65312
+trilogy/parsing/parse_engine.py,sha256=GTraw3-Dbdo36yhprizifZY-wbm_ub8ktI1nMEziee0,64723
 trilogy/parsing/render.py,sha256=hI4y-xjXrEXvHslY2l2TQ8ic0zAOpN41ADH37J2_FZY,19047
 trilogy/parsing/trilogy.lark,sha256=2Noe58vGYteilKd6w-np3fb4lzWI-G9Gt0AMyOMVw3k,13735
 trilogy/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -102,8 +102,8 @@ trilogy/std/display.preql,sha256=2BbhvqR4rcltyAbOXAUo7SZ_yGFYZgFnurglHMbjW2g,40
 trilogy/std/geography.preql,sha256=-fqAGnBL6tR-UtT8DbSek3iMFg66ECR_B_41pODxv-k,504
 trilogy/std/money.preql,sha256=ZHW-csTX-kYbOLmKSO-TcGGgQ-_DMrUXy0BjfuJSFxM,80
 trilogy/std/report.preql,sha256=LbV-XlHdfw0jgnQ8pV7acG95xrd1-p65fVpiIc-S7W4,202
-pytrilogy-0.0.3.40.dist-info/METADATA,sha256=3YTyHMFdCeINuBajgMlyAwdYl8-U0Eg0T98UsdorQ8A,9100
-pytrilogy-0.0.3.40.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
-pytrilogy-0.0.3.40.dist-info/entry_points.txt,sha256=ewBPU2vLnVexZVnB-NrVj-p3E-4vukg83Zk8A55Wp2w,56
-pytrilogy-0.0.3.40.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
-pytrilogy-0.0.3.40.dist-info/RECORD,,
+pytrilogy-0.0.3.42.dist-info/METADATA,sha256=L_128KNMAQLKLe33FsvUWvD5NRHCKqzkvmHT1Xx6o4c,9100
+pytrilogy-0.0.3.42.dist-info/WHEEL,sha256=ck4Vq1_RXyvS4Jt6SI0Vz6fyVs4GWg7AINwpsaGEgPE,91
+pytrilogy-0.0.3.42.dist-info/entry_points.txt,sha256=ewBPU2vLnVexZVnB-NrVj-p3E-4vukg83Zk8A55Wp2w,56
+pytrilogy-0.0.3.42.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
+pytrilogy-0.0.3.42.dist-info/RECORD,,

{pytrilogy-0.0.3.40.dist-info → pytrilogy-0.0.3.42.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (79.0.1)
+Generator: setuptools (80.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

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"]

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,

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,

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(

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

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,

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])