pytrilogy 0.0.3.47__tar.gz → 0.0.3.51__tar.gz

{pytrilogy-0.0.3.47/pytrilogy.egg-info → pytrilogy-0.0.3.51}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytrilogy
-Version: 0.0.3.47
+Version: 0.0.3.51
 Summary: Declarative, typed query language that compiles to SQL.
 Home-page: 
 Author: 
@@ -53,7 +53,7 @@ Installation: `pip install pytrilogy`
 
 You can read more about the project [here](https://trilogydata.dev/) and try out an interactive demo [here](https://trilogydata.dev/demo/). 
 
-Trilogy:
+Trilogy looks like SQL:
 ```sql
 WHERE 
     name like '%lvis%'
@@ -65,7 +65,7 @@ ORDER BY
 LIMIT 10;
 ```
 ## Goals
-vs SQL, the goals are:
+And aims to:
 
 Preserve:
 - Correctness
@@ -85,6 +85,7 @@ Maintain:
 Save the following code in a file named `hello.preql`
 
 ```python
+# semantic model is abstract from data
 key sentence_id int;
 property sentence_id.word_one string; # comments after a definition 
 property sentence_id.word_two string; # are syntactic sugar for adding
@@ -92,7 +93,8 @@ property sentence_id.word_three string; # a description to it
 
 # comments in other places are just comments
 
-# define our datasources as queries in duckdb
+# define our datasource to bind the model to data
+# testing using query fixtures is a common pattern
 datasource word_one(
     sentence: sentence_id,
     word:word_one
@@ -126,25 +128,20 @@ union all
 select 2 as sentence, '!'
 ''';
 
+def concat_with_space(x,y) -> x || ' ' || y;
+
 # an actual select statement
 # joins are automatically resolved between the 3 sources
 with sentences as
-select sentence_id, word_one || ' ' || word_two ||  word_three as text;
+select sentence_id, @concat_with_space(word_one, word_two) || word_three as text;
 
-SELECT
-    --sentences.sentence_id,
-    sentences.text
 WHERE 
-    sentences.sentence_id = 1
-;
-
+    sentences.sentence_id in (1,2)
 SELECT
-    --sentences.sentence_id,
     sentences.text
-WHERE 
-    sentences.sentence_id = 2
 ;
-# semicolon termination for all statements
+
+
 
 ```
 

{pytrilogy-0.0.3.47 → pytrilogy-0.0.3.51}/README.md

@@ -15,7 +15,7 @@ Installation: `pip install pytrilogy`
 
 You can read more about the project [here](https://trilogydata.dev/) and try out an interactive demo [here](https://trilogydata.dev/demo/). 
 
-Trilogy:
+Trilogy looks like SQL:
 ```sql
 WHERE 
     name like '%lvis%'
@@ -27,7 +27,7 @@ ORDER BY
 LIMIT 10;
 ```
 ## Goals
-vs SQL, the goals are:
+And aims to:
 
 Preserve:
 - Correctness
@@ -47,6 +47,7 @@ Maintain:
 Save the following code in a file named `hello.preql`
 
 ```python
+# semantic model is abstract from data
 key sentence_id int;
 property sentence_id.word_one string; # comments after a definition 
 property sentence_id.word_two string; # are syntactic sugar for adding
@@ -54,7 +55,8 @@ property sentence_id.word_three string; # a description to it
 
 # comments in other places are just comments
 
-# define our datasources as queries in duckdb
+# define our datasource to bind the model to data
+# testing using query fixtures is a common pattern
 datasource word_one(
     sentence: sentence_id,
     word:word_one
@@ -88,25 +90,20 @@ union all
 select 2 as sentence, '!'
 ''';
 
+def concat_with_space(x,y) -> x || ' ' || y;
+
 # an actual select statement
 # joins are automatically resolved between the 3 sources
 with sentences as
-select sentence_id, word_one || ' ' || word_two ||  word_three as text;
+select sentence_id, @concat_with_space(word_one, word_two) || word_three as text;
 
-SELECT
-    --sentences.sentence_id,
-    sentences.text
 WHERE 
-    sentences.sentence_id = 1
-;
-
+    sentences.sentence_id in (1,2)
 SELECT
-    --sentences.sentence_id,
     sentences.text
-WHERE 
-    sentences.sentence_id = 2
 ;
-# semicolon termination for all statements
+
+
 
 ```
 

{pytrilogy-0.0.3.47 → pytrilogy-0.0.3.51/pytrilogy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytrilogy
-Version: 0.0.3.47
+Version: 0.0.3.51
 Summary: Declarative, typed query language that compiles to SQL.
 Home-page: 
 Author: 
@@ -53,7 +53,7 @@ Installation: `pip install pytrilogy`
 
 You can read more about the project [here](https://trilogydata.dev/) and try out an interactive demo [here](https://trilogydata.dev/demo/). 
 
-Trilogy:
+Trilogy looks like SQL:
 ```sql
 WHERE 
     name like '%lvis%'
@@ -65,7 +65,7 @@ ORDER BY
 LIMIT 10;
 ```
 ## Goals
-vs SQL, the goals are:
+And aims to:
 
 Preserve:
 - Correctness
@@ -85,6 +85,7 @@ Maintain:
 Save the following code in a file named `hello.preql`
 
 ```python
+# semantic model is abstract from data
 key sentence_id int;
 property sentence_id.word_one string; # comments after a definition 
 property sentence_id.word_two string; # are syntactic sugar for adding
@@ -92,7 +93,8 @@ property sentence_id.word_three string; # a description to it
 
 # comments in other places are just comments
 
-# define our datasources as queries in duckdb
+# define our datasource to bind the model to data
+# testing using query fixtures is a common pattern
 datasource word_one(
     sentence: sentence_id,
     word:word_one
@@ -126,25 +128,20 @@ union all
 select 2 as sentence, '!'
 ''';
 
+def concat_with_space(x,y) -> x || ' ' || y;
+
 # an actual select statement
 # joins are automatically resolved between the 3 sources
 with sentences as
-select sentence_id, word_one || ' ' || word_two ||  word_three as text;
+select sentence_id, @concat_with_space(word_one, word_two) || word_three as text;
 
-SELECT
-    --sentences.sentence_id,
-    sentences.text
 WHERE 
-    sentences.sentence_id = 1
-;
-
+    sentences.sentence_id in (1,2)
 SELECT
-    --sentences.sentence_id,
     sentences.text
-WHERE 
-    sentences.sentence_id = 2
 ;
-# semicolon termination for all statements
+
+
 
 ```
 

{pytrilogy-0.0.3.47 → pytrilogy-0.0.3.51}/pytrilogy.egg-info/SOURCES.txt

@@ -66,7 +66,6 @@ trilogy/core/models/environment.py
 trilogy/core/models/execute.py
 trilogy/core/optimizations/__init__.py
 trilogy/core/optimizations/base_optimization.py
-trilogy/core/optimizations/inline_constant.py
 trilogy/core/optimizations/inline_datasource.py
 trilogy/core/optimizations/predicate_pushdown.py
 trilogy/core/processing/__init__.py

{pytrilogy-0.0.3.47 → pytrilogy-0.0.3.51}/tests/test_functions.py

@@ -214,6 +214,8 @@ def test_math_functions(test_environment):
     property order_id.order_nested <- revenue * 2/2;
     property order_id.rounded <- round(revenue + 2.01,2);
     property order_id.rounded_default <- round(revenue + 2.01);
+    property order_id.floor <- floor(revenue + 2.01);
+    property order_id.ceil <- ceil(revenue + 2.01);
     constant random <- random(1);
     select
         order_id,
@@ -224,6 +226,8 @@ def test_math_functions(test_environment):
         order_add,
         rounded,
         rounded_default,
+        floor,
+        ceil,
         random,
     ;"""
     env, parsed = parse(declarations, environment=test_environment)

{pytrilogy-0.0.3.47 → pytrilogy-0.0.3.51}/tests/test_parse_engine.py

@@ -2,7 +2,12 @@ from pytest import raises
 
 from trilogy.core.exceptions import UndefinedConceptException
 from trilogy.core.models.environment import Environment
-from trilogy.parsing.parse_engine import PARSER, ParseToObjects, unpack_visit_error
+from trilogy.parsing.parse_engine import (
+    PARSER,
+    InvalidSyntaxException,
+    ParseToObjects,
+    unpack_visit_error,
+)
 
 TEXT = """
 const a <- 1;
@@ -29,3 +34,20 @@ def test_parser():
         with raises(UndefinedConceptException):
             unpack_visit_error(e)
     assert failed
+
+
+TEXT2 = """
+const a <- 1;
+
+select
+    a,
+FROM a
+;
+"""
+
+
+def test_from_error():
+    env = Environment()
+
+    with raises(InvalidSyntaxException):
+        env.parse(TEXT2)

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

{pytrilogy-0.0.3.47 → pytrilogy-0.0.3.51}/trilogy/core/enums.py

@@ -131,6 +131,7 @@ class FunctionType(Enum):
     CONSTANT = "constant"
     COALESCE = "coalesce"
     IS_NULL = "isnull"
+    NULLIF = "nullif"
     BOOL = "bool"
 
     # COMPLEX
@@ -156,6 +157,8 @@ class FunctionType(Enum):
     ABS = "abs"
     SQRT = "sqrt"
     RANDOM = "random"
+    FLOOR = "floor"
+    CEIL = "ceil"
 
     # Aggregates
     ## group is not a real aggregate - it just means group by this + some other set of fields

{pytrilogy-0.0.3.47 → pytrilogy-0.0.3.51}/trilogy/core/functions.py

@@ -279,6 +279,12 @@ FUNCTION_REGISTRY: dict[FunctionType, FunctionConfig] = {
         output_purpose=Purpose.PROPERTY,
         arg_count=1,
     ),
+    FunctionType.NULLIF: FunctionConfig(
+        valid_inputs={*DataType},
+        output_purpose=Purpose.PROPERTY,
+        output_type_function=lambda args: get_output_type_at_index(args, 0),
+        arg_count=2,
+    ),
     FunctionType.COALESCE: FunctionConfig(
         valid_inputs={*DataType},
         output_purpose=Purpose.PROPERTY,
@@ -637,6 +643,22 @@ FUNCTION_REGISTRY: dict[FunctionType, FunctionConfig] = {
         output_type_function=lambda args: get_output_type_at_index(args, 0),
         arg_count=2,
     ),
+    FunctionType.FLOOR: FunctionConfig(
+        valid_inputs=[
+            {DataType.INTEGER, DataType.FLOAT, DataType.NUMBER, DataType.NUMERIC},
+        ],
+        output_purpose=Purpose.PROPERTY,
+        output_type=DataType.INTEGER,
+        arg_count=1,
+    ),
+    FunctionType.CEIL: FunctionConfig(
+        valid_inputs=[
+            {DataType.INTEGER, DataType.FLOAT, DataType.NUMBER, DataType.NUMERIC},
+        ],
+        output_purpose=Purpose.PROPERTY,
+        output_type=DataType.INTEGER,
+        arg_count=1,
+    ),
     FunctionType.CUSTOM: FunctionConfig(
         output_purpose=Purpose.PROPERTY,
         arg_count=InfiniteFunctionArgs,

{pytrilogy-0.0.3.47 → pytrilogy-0.0.3.51}/trilogy/core/models/author.py

@@ -1945,11 +1945,15 @@ class FilterItem(DataTyped, Namespaced, ConceptArgs, BaseModel):
 
     @property
     def output_datatype(self):
-        return self.content.datatype
+        return arg_to_datatype(self.content)
 
     @property
     def concept_arguments(self):
-        return [self.content] + self.where.concept_arguments
+        if isinstance(self.content, ConceptRef):
+            return [self.content] + self.where.concept_arguments
+        elif isinstance(self.content, ConceptArgs):
+            return self.content.concept_arguments + self.where.concept_arguments
+        return self.where.concept_arguments
 
 
 class RowsetLineage(Namespaced, Mergeable, BaseModel):

{pytrilogy-0.0.3.47 → pytrilogy-0.0.3.51}/trilogy/core/models/build.py

@@ -247,6 +247,17 @@ def get_concept_arguments(expr) -> List["BuildConcept"]:
     return output
 
 
+class BuildParamaterizedConceptReference(BaseModel):
+    concept: BuildConcept
+
+    def __str__(self):
+        return f":{self.concept.address}"
+
+    @property
+    def safe_address(self) -> str:
+        return self.concept.safe_address
+
+
 class BuildGrain(BaseModel):
     components: set[str] = Field(default_factory=set)
     where_clause: Optional[BuildWhereClause] = None
@@ -1162,7 +1173,7 @@ class BuildAggregateWrapper(BuildConceptArgs, DataTyped, BaseModel):
 
 
 class BuildFilterItem(BuildConceptArgs, BaseModel):
-    content: BuildConcept
+    content: "BuildExpr"
     where: BuildWhereClause
 
     def __str__(self):
@@ -1170,15 +1181,27 @@ class BuildFilterItem(BuildConceptArgs, BaseModel):
 
     @property
     def output_datatype(self):
-        return self.content.datatype
+        return arg_to_datatype(self.content)
 
     @property
     def output_purpose(self):
         return self.content.purpose
 
+    @property
+    def content_concept_arguments(self):
+        if isinstance(self.content, BuildConcept):
+            return [self.content]
+        elif isinstance(self.content, BuildConceptArgs):
+            return self.content.concept_arguments
+        return []
+
     @property
     def concept_arguments(self):
-        return [self.content] + self.where.concept_arguments
+        if isinstance(self.content, BuildConcept):
+            return [self.content] + self.where.concept_arguments
+        elif isinstance(self.content, BuildConceptArgs):
+            return self.content.concept_arguments + self.where.concept_arguments
+        return self.where.concept_arguments
 
 
 class BuildRowsetLineage(BuildConceptArgs, BaseModel):
@@ -1578,7 +1601,7 @@ class Factory:
 
         new = BuildFunction.model_construct(
             operator=base.operator,
-            arguments=[self.build(c) for c in raw_args],
+            arguments=[self.handle_constant(self.build(c)) for c in raw_args],
             output_datatype=base.output_datatype,
             output_purpose=base.output_purpose,
             valid_inputs=base.valid_inputs,
@@ -1615,6 +1638,8 @@ class Factory:
 
     @build.register
     def _(self, base: Concept) -> BuildConcept:
+
+        # TODO: if we are using parameters, wrap it in a new model and use that in rendering
         if base.address in self.local_concepts:
             return self.local_concepts[base.address]
         new_lineage, final_grain, _ = base.get_select_grain_and_keys(
@@ -1738,8 +1763,8 @@ class Factory:
     @build.register
     def _(self, base: Conditional) -> BuildConditional:
         return BuildConditional.model_construct(
-            left=(self.build(base.left)),
-            right=(self.build(base.right)),
+            left=self.handle_constant(self.build(base.left)),
+            right=self.handle_constant(self.build(base.right)),
             operator=base.operator,
         )
 
@@ -1767,8 +1792,8 @@ class Factory:
             right_c, _ = self.instantiate_concept(right)
             right = right_c  # type: ignore
         return BuildComparison.model_construct(
-            left=(self.build(left)),
-            right=(self.build(right)),
+            left=self.handle_constant(self.build(left)),
+            right=self.handle_constant(self.build(right)),
             operator=base.operator,
         )
 
@@ -2015,3 +2040,12 @@ class Factory:
                 factory.build(base.non_partial_for) if base.non_partial_for else None
             ),
         )
+
+    def handle_constant(self, base):
+        if (
+            isinstance(base, BuildConcept)
+            and isinstance(base.lineage, BuildFunction)
+            and base.lineage.operator == FunctionType.CONSTANT
+        ):
+            return BuildParamaterizedConceptReference(concept=base)
+        return base

{pytrilogy-0.0.3.47 → pytrilogy-0.0.3.51}/trilogy/core/models/execute.py

@@ -24,6 +24,7 @@ from trilogy.core.models.build import (
     BuildFunction,
     BuildGrain,
     BuildOrderBy,
+    BuildParamaterizedConceptReference,
     BuildParenthetical,
     BuildRowsetItem,
     LooseBuildConceptList,
@@ -447,7 +448,7 @@ class CTEConceptPair(ConceptPair):
 
 
 class InstantiatedUnnestJoin(BaseModel):
-    concept_to_unnest: BuildConcept
+    object_to_unnest: BuildConcept | BuildParamaterizedConceptReference | BuildFunction
     alias: str = "unnest"
 
 
@@ -694,7 +695,7 @@ class QueryDatasource(BaseModel):
                 "can only merge two datasources if the force_group flag is the same"
             )
         logger.debug(
-            f"{LOGGER_PREFIX} merging {self.name} with"
+            f"[Query Datasource] merging {self.name} with"
             f" {[c.address for c in self.output_concepts]} concepts and"
             f" {other.name} with {[c.address for c in other.output_concepts]} concepts"
         )
@@ -758,7 +759,9 @@ class QueryDatasource(BaseModel):
             hidden_concepts=hidden,
             ordering=self.ordering,
         )
-
+        logger.debug(
+            f"[Query Datasource] merged with {[c.address for c in qds.output_concepts]} concepts"
+        )
         return qds
 
     @property

{pytrilogy-0.0.3.47 → pytrilogy-0.0.3.51}/trilogy/core/optimization.py

@@ -5,7 +5,6 @@ from trilogy.core.models.build import (
 )
 from trilogy.core.models.execute import CTE, UnionCTE
 from trilogy.core.optimizations import (
-    InlineConstant,
     InlineDatasource,
     OptimizationRule,
     PredicatePushdown,
@@ -206,8 +205,6 @@ def optimize_ctes(
         REGISTERED_RULES.append(PredicatePushdown())
     if CONFIG.optimizations.predicate_pushdown:
         REGISTERED_RULES.append(PredicatePushdownRemove())
-    if CONFIG.optimizations.constant_inlining:
-        REGISTERED_RULES.append(InlineConstant())
     for rule in REGISTERED_RULES:
         loops = 0
         complete = False

{pytrilogy-0.0.3.47 → pytrilogy-0.0.3.51}/trilogy/core/optimizations/__init__.py

@@ -1,11 +1,9 @@
 from .base_optimization import OptimizationRule
-from .inline_constant import InlineConstant
 from .inline_datasource import InlineDatasource
 from .predicate_pushdown import PredicatePushdown, PredicatePushdownRemove
 
 __all__ = [
     "OptimizationRule",
-    "InlineConstant",
     "InlineDatasource",
     "PredicatePushdown",
     "PredicatePushdownRemove",

{pytrilogy-0.0.3.47 → pytrilogy-0.0.3.51}/trilogy/core/processing/concept_strategies_v3.py

@@ -319,7 +319,7 @@ def generate_node(
         ]
 
         logger.info(
-            f"{depth_to_prefix(depth)}{LOGGER_PREFIX} for {concept.address}, generating aggregate node with {[x.address for x in agg_optional]}"
+            f"{depth_to_prefix(depth)}{LOGGER_PREFIX} for {concept.address}, generating aggregate node with {[x for x in agg_optional]}"
         )
         return gen_group_node(
             concept,

{pytrilogy-0.0.3.47 → pytrilogy-0.0.3.51}/trilogy/core/processing/node_generators/common.py

@@ -67,14 +67,14 @@ def resolve_condition_parent_concepts(
 def resolve_filter_parent_concepts(
     concept: BuildConcept,
     environment: BuildEnvironment,
-) -> Tuple[BuildConcept, List[BuildConcept], List[Tuple[BuildConcept, ...]]]:
+) -> Tuple[List[BuildConcept], List[Tuple[BuildConcept, ...]]]:
     if not isinstance(concept.lineage, (BuildFilterItem,)):
         raise ValueError(
             f"Concept {concept} lineage is not filter item, is {type(concept.lineage)}"
         )
     direct_parent = concept.lineage.content
     base_existence = []
-    base_rows = [direct_parent]
+    base_rows = [direct_parent] if isinstance(direct_parent, BuildConcept) else []
     condition_rows, condition_existence = resolve_condition_parent_concepts(
         concept.lineage.where
     )
@@ -90,11 +90,10 @@ def resolve_filter_parent_concepts(
 
     if concept.lineage.where.existence_arguments:
         return (
-            concept.lineage.content,
             unique(base_rows, "address"),
             base_existence,
         )
-    return concept.lineage.content, unique(base_rows, "address"), []
+    return unique(base_rows, "address"), []
 
 
 def gen_property_enrichment_node(