pytrilogy 0.0.3.46__tar.gz → 0.0.3.48__tar.gz

{pytrilogy-0.0.3.46/pytrilogy.egg-info → pytrilogy-0.0.3.48}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytrilogy
-Version: 0.0.3.46
+Version: 0.0.3.48
 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.46 → pytrilogy-0.0.3.48}/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.46 → pytrilogy-0.0.3.48/pytrilogy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytrilogy
-Version: 0.0.3.46
+Version: 0.0.3.48
 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.46 → pytrilogy-0.0.3.48}/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.46 → pytrilogy-0.0.3.48}/tests/test_functions.py

@@ -123,6 +123,7 @@ def test_date_functions(test_environment):
         year(order_timestamp) -> order_year,
         date_trunc(order_timestamp, month) -> order_month_trunc,
         date_add(order_timestamp, month, 1) -> one_month_post_order,
+        date_sub(order_timestamp, month, 1) -> one_month_pre_order,
         date_trunc(order_timestamp, day) -> order_day_trunc,
         date_trunc(order_timestamp, year) -> order_year_trunc,
         date_trunc(order_timestamp, hour) -> order_hour_trunc,
@@ -212,6 +213,7 @@ def test_math_functions(test_environment):
     property order_sub <- revenue - 2;
     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);
     constant random <- random(1);
     select
         order_id,
@@ -221,6 +223,7 @@ def test_math_functions(test_environment):
         order_sub,
         order_add,
         rounded,
+        rounded_default,
         random,
     ;"""
     env, parsed = parse(declarations, environment=test_environment)

{pytrilogy-0.0.3.46 → pytrilogy-0.0.3.48}/tests/test_parsing_failures.py

@@ -8,7 +8,7 @@ from trilogy.core.models.environment import (
     EnvironmentOptions,
 )
 from trilogy.parsing.parse_engine import (
-    ParseError,
+    NameShadowError,
     parse_text,
 )
 
@@ -77,7 +77,7 @@ SELECT
     1+2->scalar
 ;
 """
-    with raises(ParseError) as e:
+    with raises(NameShadowError) as e:
         env, parsed = parse_text(
             x, parse_config=Parsing(strict_name_shadow_enforcement=True)
         )

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

{pytrilogy-0.0.3.46 → pytrilogy-0.0.3.48}/trilogy/core/environment_helpers.py

@@ -6,23 +6,8 @@ from trilogy.core.models.core import DataType, StructType, arg_to_datatype
 from trilogy.core.models.environment import Environment
 from trilogy.parsing.common import Meta
 
-FUNCTION_DESCRIPTION_MAPS = {
-    FunctionType.DATE: "The date part of a timestamp/date. Integer, 0-31 depending on month.",
-    FunctionType.MONTH: "The month part of a timestamp/date. Integer, 1-12.",
-    FunctionType.YEAR: "The year part of a timestamp/date. Integer.",
-    FunctionType.QUARTER: "The quarter part of a timestamp/date. Integer, 1-4.",
-    FunctionType.DAY_OF_WEEK: "The day of the week part of a timestamp/date. Integer, 0-6.",
-    FunctionType.HOUR: "The hour part of a timestamp. Integer, 0-23.",
-    FunctionType.MINUTE: "The minute part of a timestamp. Integer, 0-59.",
-    FunctionType.SECOND: "The second part of a timestamp. Integer, 0-59.",
-}
-
 
 def generate_date_concepts(concept: Concept, environment: Environment):
-    if concept.metadata and concept.metadata.description:
-        base_description = concept.metadata.description
-    else:
-        base_description = f"a {concept.address}"
     if concept.metadata and concept.metadata.line_number:
         base_line_number = concept.metadata.line_number
     else:
@@ -67,7 +52,6 @@ def generate_date_concepts(concept: Concept, environment: Environment):
                 [concept.address],
             ),
             metadata=Metadata(
-                description=f"Auto-derived from {base_description}. {FUNCTION_DESCRIPTION_MAPS.get(ftype, ftype.value)}",
                 line_number=base_line_number,
                 concept_source=ConceptSource.AUTO_DERIVED,
             ),
@@ -95,7 +79,7 @@ def generate_date_concepts(concept: Concept, environment: Environment):
                 [concept.address],
             ),
             metadata=Metadata(
-                description=f"Auto-derived from {base_description}. The date truncated to the {grain.value}.",
+                # description=f"Auto-derived from {base_description}. The date truncated to the {grain.value}.",
                 line_number=base_line_number,
                 concept_source=ConceptSource.AUTO_DERIVED,
             ),
@@ -105,10 +89,6 @@ def generate_date_concepts(concept: Concept, environment: Environment):
 
 
 def generate_datetime_concepts(concept: Concept, environment: Environment):
-    if concept.metadata and concept.metadata.description:
-        base_description = concept.metadata.description
-    else:
-        base_description = concept.address
     if concept.metadata and concept.metadata.line_number:
         base_line_number = concept.metadata.line_number
     else:
@@ -146,7 +126,6 @@ def generate_datetime_concepts(concept: Concept, environment: Environment):
                 [concept.address],
             ),
             metadata=Metadata(
-                description=f"Auto-derived from {base_description}. {FUNCTION_DESCRIPTION_MAPS.get(ftype, ftype.value)}",
                 line_number=base_line_number,
                 concept_source=ConceptSource.AUTO_DERIVED,
             ),
@@ -157,10 +136,6 @@ def generate_datetime_concepts(concept: Concept, environment: Environment):
 
 
 def generate_key_concepts(concept: Concept, environment: Environment):
-    if concept.metadata and concept.metadata.description:
-        base_description = concept.metadata.description
-    else:
-        base_description = f"a {concept.datatype.value}"
     if concept.metadata and concept.metadata.line_number:
         base_line_number = concept.metadata.line_number
     else:
@@ -186,7 +161,7 @@ def generate_key_concepts(concept: Concept, environment: Environment):
             namespace=concept.namespace,
             keys=set(),
             metadata=Metadata(
-                description=f"Auto-derived integer. The {ftype.value} of {concept.address}, {base_description}",
+                # description=f"Auto-derived integer. The {ftype.value} of {concept.address}, {base_description}",
                 line_number=base_line_number,
                 concept_source=ConceptSource.AUTO_DERIVED,
             ),

{pytrilogy-0.0.3.46 → pytrilogy-0.0.3.48}/trilogy/core/models/author.py

@@ -445,13 +445,16 @@ class Grain(Namespaced, BaseModel):
         concepts: Iterable[Concept | ConceptRef | str],
         environment: Environment | None = None,
         where_clause: WhereClause | None = None,
+        local_concepts: dict[str, Concept] | None = None,
     ) -> Grain:
         from trilogy.parsing.common import concepts_to_grain_concepts
 
         x = Grain.model_construct(
             components={
                 c.address
-                for c in concepts_to_grain_concepts(concepts, environment=environment)
+                for c in concepts_to_grain_concepts(
+                    concepts, environment=environment, local_concepts=local_concepts
+                )
             },
             where_clause=where_clause,
         )

{pytrilogy-0.0.3.46 → pytrilogy-0.0.3.48}/trilogy/core/models/build.py

@@ -126,9 +126,14 @@ def concept_is_relevant(
 
         return False
     if concept.purpose in (Purpose.PROPERTY, Purpose.METRIC) and concept.keys:
-        if any([c in others for c in concept.keys]):
-
+        if all([c in others for c in concept.keys]):
             return False
+    if (
+        concept.purpose == Purpose.KEY
+        and concept.keys
+        and all([c in others for c in concept.keys])
+    ):
+        return False
     if concept.purpose in (Purpose.METRIC,):
         if all([c in others for c in concept.grain.components]):
             return False
@@ -242,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
@@ -1458,11 +1474,35 @@ class Factory:
             {} if local_concepts is None else local_concepts
         )
 
+    def instantiate_concept(
+        self,
+        arg: (
+            AggregateWrapper
+            | FunctionCallWrapper
+            | WindowItem
+            | FilterItem
+            | Function
+            | ListWrapper[Any]
+            | MapWrapper[Any, Any]
+            | int
+            | float
+            | str
+        ),
+    ) -> tuple[Concept, BuildConcept]:
+        from trilogy.parsing.common import arbitrary_to_concept
+
+        new = arbitrary_to_concept(
+            arg,
+            environment=self.environment,
+        )
+        built = self.build(new)
+        self.local_concepts[new.address] = built
+        return new, built
+
     @singledispatchmethod
     def build(self, base):
         raise NotImplementedError("Cannot build {}".format(type(base)))
 
-    @build.register
     @build.register
     def _(
         self,
@@ -1496,31 +1536,6 @@ class Factory:
     ):
         return base
 
-    def instantiate_concept(
-        self,
-        arg: (
-            AggregateWrapper
-            | FunctionCallWrapper
-            | WindowItem
-            | FilterItem
-            | Function
-            | ListWrapper[Any]
-            | MapWrapper[Any, Any]
-            | int
-            | float
-            | str
-        ),
-    ) -> tuple[Concept, BuildConcept]:
-        from trilogy.parsing.common import arbitrary_to_concept
-
-        new = arbitrary_to_concept(
-            arg,
-            environment=self.environment,
-        )
-        built = self.build(new)
-        self.local_concepts[new.address] = built
-        return new, built
-
     @build.register
     def _(self, base: None) -> None:
         return base
@@ -1574,7 +1589,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,
@@ -1611,6 +1626,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(
@@ -1626,6 +1643,7 @@ class Factory:
             derivation, final_grain, build_lineage
         )
         is_aggregate = Concept.calculate_is_aggregate(build_lineage)
+
         rval = BuildConcept.model_construct(
             name=base.name,
             datatype=base.datatype,
@@ -1646,7 +1664,6 @@ class Factory:
 
     @build.register
     def _(self, base: AggregateWrapper) -> BuildAggregateWrapper:
-
         if not base.by:
             by = [
                 self.build(self.environment.concepts[c]) for c in self.grain.components
@@ -1734,8 +1751,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,
         )
 
@@ -1763,8 +1780,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,
         )
 
@@ -2011,3 +2028,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.46 → pytrilogy-0.0.3.48}/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"
 
 

{pytrilogy-0.0.3.46 → pytrilogy-0.0.3.48}/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.46 → pytrilogy-0.0.3.48}/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.46 → pytrilogy-0.0.3.48}/trilogy/core/processing/node_generators/group_node.py

@@ -1,6 +1,7 @@
 from typing import List
 
 from trilogy.constants import logger
+from trilogy.core.internal import ALL_ROWS_CONCEPT
 from trilogy.core.models.build import (
     BuildAggregateWrapper,
     BuildConcept,
@@ -92,7 +93,9 @@ def gen_group_node(
         logger.info(
             f"{padding(depth)}{LOGGER_PREFIX} fetching group node parents {LooseBuildConceptList(concepts=parent_concepts)}"
         )
-        parent_concepts = unique(parent_concepts, "address")
+        parent_concepts = unique(
+            [x for x in parent_concepts if not x.name == ALL_ROWS_CONCEPT], "address"
+        )
         parent = source_concepts(
             mandatory_list=parent_concepts,
             environment=environment,

{pytrilogy-0.0.3.46 → pytrilogy-0.0.3.48}/trilogy/core/processing/nodes/__init__.py

@@ -1,6 +1,7 @@
 from pydantic import BaseModel, ConfigDict, Field
 
 from trilogy.core.exceptions import UnresolvableQueryException
+from trilogy.core.models.author import Concept
 from trilogy.core.models.build import BuildConcept, BuildWhereClause
 from trilogy.core.models.build_environment import BuildEnvironment
 from trilogy.core.models.environment import Environment
@@ -17,6 +18,7 @@ from .window_node import WindowNode
 
 class History(BaseModel):
     base_environment: Environment
+    local_base_concepts: dict[str, Concept] = Field(default_factory=dict)
     history: dict[str, StrategyNode | None] = Field(default_factory=dict)
     select_history: dict[str, StrategyNode | None] = Field(default_factory=dict)
     started: dict[str, int] = Field(default_factory=dict)