pytrilogy 0.0.3.65__tar.gz → 0.0.3.66__tar.gz

{pytrilogy-0.0.3.65/pytrilogy.egg-info → pytrilogy-0.0.3.66}/PKG-INFO

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

{pytrilogy-0.0.3.65 → pytrilogy-0.0.3.66/pytrilogy.egg-info}/PKG-INFO

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

{pytrilogy-0.0.3.65 → pytrilogy-0.0.3.66}/tests/test_parsing.py

@@ -2,7 +2,7 @@ from trilogy import Dialects
 from trilogy.constants import MagicConstants
 from trilogy.core.enums import BooleanOperator, ComparisonOperator, Purpose
 from trilogy.core.functions import argument_to_purpose, function_args_to_output_purpose
-from trilogy.core.models.author import Comparison
+from trilogy.core.models.author import Comparison, Conditional, SubselectComparison
 from trilogy.core.models.core import (
     DataType,
     TupleWrapper,
@@ -16,6 +16,7 @@ from trilogy.core.models.environment import (
 from trilogy.core.statements.author import SelectStatement, ShowStatement
 from trilogy.core.statements.execute import ProcessedQuery
 from trilogy.dialect.base import BaseDialect
+from trilogy.parsing.common import atom_is_relevant
 from trilogy.parsing.parse_engine import (
     arg_to_datatype,
     parse_text,
@@ -685,3 +686,45 @@ select x % 10 -> x_mod_10;
             
 """
     )
+
+
+def test_is_atom():
+    env = Environment()
+
+    env.parse(
+        """
+key x int;
+auto x_sum <- sum(x);
+"""
+    )
+
+    assert not atom_is_relevant(
+        Comparison(left=env.concepts["x_sum"], right=0, operator=ComparisonOperator.GT),
+        [env.concepts["x"]],
+        env,
+    )
+    assert atom_is_relevant(
+        Comparison(left=env.concepts["x"], right=0, operator=ComparisonOperator.GT),
+        [env.concepts["x_sum"]],
+        env,
+    )
+
+    assert not atom_is_relevant(
+        Conditional(left=env.concepts["x_sum"], right=0, operator=BooleanOperator.AND),
+        [env.concepts["x"]],
+        env,
+    )
+    assert atom_is_relevant(
+        Conditional(left=env.concepts["x"], right=0, operator=BooleanOperator.AND),
+        [env.concepts["x_sum"]],
+        env,
+    )
+    assert not atom_is_relevant(
+        SubselectComparison(
+            left=env.concepts["x_sum"],
+            right=env.concepts["x"],
+            operator=ComparisonOperator.IN,
+        ),
+        [env.concepts["x_sum"]],
+        env,
+    )

{pytrilogy-0.0.3.65 → pytrilogy-0.0.3.66}/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.65"
+__version__ = "0.0.3.66"
 
 __all__ = ["parse", "Executor", "Dialects", "Environment", "CONFIG"]

{pytrilogy-0.0.3.65 → pytrilogy-0.0.3.66}/trilogy/core/models/author.py

@@ -271,6 +271,20 @@ class Conditional(Mergeable, ConceptArgs, Namespaced, DataTyped, BaseModel):
     right: Expr
     operator: BooleanOperator
 
+    @field_validator("left", mode="before")
+    @classmethod
+    def left_validator(cls, v, info: ValidationInfo):
+        if isinstance(v, Concept):
+            return v.reference
+        return v
+
+    @field_validator("right", mode="before")
+    @classmethod
+    def right_validator(cls, v, info: ValidationInfo):
+        if isinstance(v, Concept):
+            return v.reference
+        return v
+
     def __add__(self, other) -> "Conditional":
         if other is None:
             return self
@@ -346,7 +360,6 @@ class Conditional(Mergeable, ConceptArgs, Namespaced, DataTyped, BaseModel):
 
     @property
     def concept_arguments(self) -> Sequence[ConceptRef]:
-        """Return concepts directly referenced in where clause"""
         output = []
         output += get_concept_arguments(self.left)
         output += get_concept_arguments(self.right)
@@ -575,11 +588,11 @@ class Comparison(ConceptArgs, Mergeable, DataTyped, Namespaced, BaseModel):
         date,
         Function,
         ConceptRef,
-        "Conditional",
+        Conditional,
         DataType,
-        "Comparison",
+        Comparison,
         FunctionCallWrapper,
-        "Parenthetical",
+        Parenthetical,
         MagicConstants,
         WindowItem,
         AggregateWrapper,

{pytrilogy-0.0.3.65 → pytrilogy-0.0.3.66}/trilogy/core/models/build.py

@@ -1631,7 +1631,10 @@ class Factory:
 
     @build.register
     def _(self, base: CaseElse) -> BuildCaseElse:
-        return BuildCaseElse.model_construct(expr=self.build(base.expr))
+        expr: Concept | FuncArgs = base.expr
+        if isinstance(expr, (AggregateWrapper, FilterItem, WindowItem)):
+            expr, _ = self.instantiate_concept(expr)
+        return BuildCaseElse.model_construct(expr=self.build(expr))
 
     @build.register
     def _(self, base: Concept) -> BuildConcept:

{pytrilogy-0.0.3.65 → pytrilogy-0.0.3.66}/trilogy/core/query_processor.py

@@ -395,6 +395,9 @@ def get_query_node(
     if not statement.output_components:
         raise ValueError(f"Statement has no output components {statement}")
     history = history or History(base_environment=environment)
+    print(
+        f"{LOGGER_PREFIX} building query node for {statement.output_components} grain {statement.grain}"
+    )
     build_statement: BuildSelectLineage | BuildMultiSelectLineage = Factory(
         environment=environment,
     ).build(statement)

{pytrilogy-0.0.3.65 → pytrilogy-0.0.3.66}/trilogy/parsing/common.py

@@ -23,9 +23,13 @@ from trilogy.core.models.author import (
     AggregateWrapper,
     AlignClause,
     AlignItem,
+    CaseElse,
+    CaseWhen,
+    Comparison,
     Concept,
     ConceptArgs,
     ConceptRef,
+    Conditional,
     FilterItem,
     Function,
     FunctionCallWrapper,
@@ -38,6 +42,7 @@ from trilogy.core.models.author import (
     Parenthetical,
     RowsetItem,
     RowsetLineage,
+    SubselectComparison,
     TraitDataType,
     UndefinedConcept,
     WhereClause,
@@ -198,6 +203,7 @@ def atom_is_relevant(
     others: list[Concept | ConceptRef],
     environment: Environment | None = None,
 ):
+
     if isinstance(atom, (ConceptRef, Concept)):
         # when we are looking at atoms, if there is a concept that is in others
         # return directly
@@ -210,9 +216,10 @@ def atom_is_relevant(
     elif isinstance(atom, AggregateWrapper):
         return any(atom_is_relevant(x, others, environment) for x in atom.by)
 
-    if isinstance(atom, Function):
+    elif isinstance(atom, Function):
         relevant = False
         for arg in atom.arguments:
+
             relevant = relevant or atom_is_relevant(arg, others, environment)
         return relevant
     elif isinstance(atom, FunctionCallWrapper):
@@ -220,8 +227,27 @@ def atom_is_relevant(
             [atom_is_relevant(atom.content, others, environment)]
             + [atom_is_relevant(x, others, environment) for x in atom.args]
         )
+    elif isinstance(atom, CaseWhen):
+        rval = atom_is_relevant(atom.expr, others, environment) or atom_is_relevant(
+            atom.comparison, others, environment
+        )
+        return rval
+    elif isinstance(atom, CaseElse):
+
+        rval = atom_is_relevant(atom.expr, others, environment)
+        return rval
+    elif isinstance(atom, SubselectComparison):
+        return atom_is_relevant(atom.left, others, environment)
+    elif isinstance(atom, Comparison):
+        return atom_is_relevant(atom.left, others, environment) or atom_is_relevant(
+            atom.right, others, environment
+        )
+    elif isinstance(atom, Conditional):
+        return atom_is_relevant(atom.left, others, environment) or atom_is_relevant(
+            atom.right, others, environment
+        )
     elif isinstance(atom, ConceptArgs):
-        # use atom is relevant here to trigger the early exit behavior for concpets in set
+        # use atom is relevant here to trigger the early exit behavior for concepts in set
         return any(
             [atom_is_relevant(x, others, environment) for x in atom.concept_arguments]
         )
@@ -233,7 +259,6 @@ def concept_is_relevant(
     others: list[Concept | ConceptRef],
     environment: Environment | None = None,
 ) -> bool:
-
     if isinstance(concept, UndefinedConcept):
         return False
     if concept.datatype == DataType.UNKNOWN:

pytrilogy-0.0.3.66/trilogy/std/display.preql

@@ -0,0 +1,6 @@
+
+
+type percent float; # Percentage value
+
+def calc_percent(a, b, digits=-1) -> case when digits =-1 then (a/b):: float::percent
+else round((a/b):: float::percent, digits) end;

pytrilogy-0.0.3.65/trilogy/std/display.preql

@@ -1,3 +0,0 @@
-
-
-type percent float; # Percentage value