pytrilogy 0.0.3.34__tar.gz → 0.0.3.36__tar.gz

{pytrilogy-0.0.3.34/pytrilogy.egg-info → pytrilogy-0.0.3.36}/PKG-INFO

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

{pytrilogy-0.0.3.34 → pytrilogy-0.0.3.36/pytrilogy.egg-info}/PKG-INFO

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

{pytrilogy-0.0.3.34 → pytrilogy-0.0.3.36}/pytrilogy.egg-info/SOURCES.txt

@@ -130,8 +130,8 @@ trilogy/parsing/trilogy.lark
 trilogy/scripts/__init__.py
 trilogy/scripts/trilogy.py
 trilogy/std/__init__.py
-trilogy/std/dashboard.preql
 trilogy/std/date.preql
 trilogy/std/display.preql
 trilogy/std/geography.preql
-trilogy/std/money.preql
+trilogy/std/money.preql
+trilogy/std/report.preql

{pytrilogy-0.0.3.34 → pytrilogy-0.0.3.36}/tests/test_derived_concepts.py

@@ -11,6 +11,14 @@ def test_derivations(test_environment):
     )
 
 
+def test_hour_derivation(test_environment):
+    hour_derived = test_environment.concepts["order_timestamp.hour"]
+    assert "hour" in hour_derived.datatype.traits, hour_derived
+
+    year_derived = test_environment.concepts["order_timestamp.year"]
+    assert "year" in year_derived.datatype.traits, year_derived
+
+
 def test_filtering_where_on_derived_aggregate(test_environment):
     exception = False
     try:

{pytrilogy-0.0.3.34 → pytrilogy-0.0.3.36}/tests/test_metadata.py

@@ -14,16 +14,16 @@ property user_id.display_name string metadata(description="The display name");""
     assert env.concepts["display_name"].metadata.description == "The display name"
 
 
-def test_import_metadata():
-    env = Environment(working_path=Path(__file__).parent)
-    env, _ = parse(
-        """import test_env as env; # Dragon metrics
-        import test_env as env2;""",
-        environment=env,
-    )
-
-    assert "Dragon metrics" in env.concepts["env.id"].metadata.description
-
-    env2 = env.concepts["env2.id"]
-    assert env2.namespace == "env2"
-    assert env.concepts["env2.id"].metadata.description is None
+# def test_import_metadata():
+#     env = Environment(working_path=Path(__file__).parent)
+#     env, _ = parse(
+#         """import test_env as env; # Dragon metrics
+#         import test_env as env2;""",
+#         environment=env,
+#     )
+
+#     assert "Dragon metrics" in env.concepts["env.id"].metadata.description
+
+#     env2 = env.concepts["env2.id"]
+#     assert env2.namespace == "env2"
+#     assert env.concepts["env2.id"].metadata.description is None

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

{pytrilogy-0.0.3.34 → pytrilogy-0.0.3.36}/trilogy/core/environment_helpers.py

@@ -47,7 +47,7 @@ def generate_date_concepts(concept: Concept, environment: Environment):
         )
         new_concept = Concept(
             name=f"{concept.name}.{fname}",
-            datatype=DataType.INTEGER,
+            datatype=function.output_datatype,
             purpose=default_type,
             lineage=function,
             grain=concept.grain,
@@ -119,7 +119,7 @@ def generate_datetime_concepts(concept: Concept, environment: Environment):
         )
         new_concept = Concept(
             name=f"{concept.name}.{fname}",
-            datatype=DataType.INTEGER,
+            datatype=const_function.output_datatype,
             purpose=default_type,
             lineage=const_function,
             grain=concept.grain,

{pytrilogy-0.0.3.34 → pytrilogy-0.0.3.36}/trilogy/core/functions.py

@@ -111,11 +111,14 @@ def validate_case_output(
         if output_datatype != DataType.NULL:
             datatypes.add(output_datatype.data_type)
         mapz[str(arg.expr)] = output_datatype
-    if not len(datatypes) == 1:
+    known = [x for x in datatypes if x != DataType.UNKNOWN]
+    if len(known) == 0:
+        return DataType.UNKNOWN
+    if not len(known) == 1:
         raise SyntaxError(
             f"All case expressions must have the same output datatype, got {datatypes} from {mapz}"
         )
-    return datatypes.pop()
+    return known.pop()
 
 
 def create_struct_output(
@@ -672,12 +675,22 @@ FUNCTION_REGISTRY: dict[FunctionType, FunctionConfig] = {
         arg_count=1,
     ),
     FunctionType.SUM: FunctionConfig(
-        valid_inputs={DataType.INTEGER, DataType.FLOAT, DataType.NUMBER},
+        valid_inputs={
+            DataType.INTEGER,
+            DataType.FLOAT,
+            DataType.NUMBER,
+            DataType.NUMERIC,
+        },
         output_purpose=Purpose.METRIC,
         arg_count=1,
     ),
     FunctionType.AVG: FunctionConfig(
-        valid_inputs={DataType.INTEGER, DataType.FLOAT, DataType.NUMBER},
+        valid_inputs={
+            DataType.INTEGER,
+            DataType.FLOAT,
+            DataType.NUMBER,
+            DataType.NUMERIC,
+        },
         output_purpose=Purpose.METRIC,
         arg_count=1,
     ),

{pytrilogy-0.0.3.34 → pytrilogy-0.0.3.36}/trilogy/core/models/author.py

@@ -107,6 +107,10 @@ class ConceptRef(Addressable, Namespaced, DataTyped, Mergeable, BaseModel):
     ) = DataType.UNKNOWN
     metadata: Optional["Metadata"] = None
 
+    @property
+    def reference(self):
+        return self
+
     @property
     def line_no(self) -> int | None:
         if self.metadata:
@@ -1426,7 +1430,7 @@ def get_basic_type(
     return type
 
 
-class CaseWhen(Namespaced, ConceptArgs, Mergeable, BaseModel):
+class CaseWhen(Namespaced, DataTyped, ConceptArgs, Mergeable, BaseModel):
     comparison: Conditional | SubselectComparison | Comparison
     expr: "Expr"
 
@@ -1436,6 +1440,10 @@ class CaseWhen(Namespaced, ConceptArgs, Mergeable, BaseModel):
             return v.reference
         return v
 
+    @property
+    def output_datatype(self):
+        return arg_to_datatype(self.expr)
+
     def __str__(self):
         return self.__repr__()
 
@@ -1488,7 +1496,7 @@ class CaseWhen(Namespaced, ConceptArgs, Mergeable, BaseModel):
         )
 
 
-class CaseElse(Namespaced, ConceptArgs, Mergeable, BaseModel):
+class CaseElse(Namespaced, ConceptArgs, DataTyped, Mergeable, BaseModel):
     expr: "Expr"
     # this ensures that it's easily differentiable from CaseWhen
     discriminant: ComparisonOperator = ComparisonOperator.ELSE
@@ -1499,6 +1507,10 @@ class CaseElse(Namespaced, ConceptArgs, Mergeable, BaseModel):
     def __repr__(self):
         return f"ELSE {str(self.expr)}"
 
+    @property
+    def output_datatype(self):
+        return arg_to_datatype(self.expr)
+
     @field_validator("expr", mode="before")
     def enforce_expr(cls, v):
         if isinstance(v, Concept):
@@ -1837,7 +1849,7 @@ class FunctionCallWrapper(
 
 class AggregateWrapper(Mergeable, DataTyped, ConceptArgs, Namespaced, BaseModel):
     function: Function
-    by: List[ConceptRef] = Field(default_factory=list)
+    by: List[ConceptRef | Concept] = Field(default_factory=list)
 
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
@@ -1863,7 +1875,7 @@ class AggregateWrapper(Mergeable, DataTyped, ConceptArgs, Namespaced, BaseModel)
 
     @property
     def concept_arguments(self) -> List[ConceptRef]:
-        return self.function.concept_arguments + self.by
+        return self.function.concept_arguments + [x.reference for x in self.by]
 
     @property
     def output_datatype(self):
@@ -2392,4 +2404,8 @@ FuncArgs = (
     | NumericType
     | list
     | ListWrapper[Any]
+    | TupleWrapper[Any]
+    | Comparison
+    | Conditional
+    | MagicConstants
 )

{pytrilogy-0.0.3.34 → pytrilogy-0.0.3.36}/trilogy/core/models/build.py

@@ -1538,9 +1538,23 @@ class Factory:
 
     @build.register
     def _(self, base: CaseWhen) -> BuildCaseWhen:
+        from trilogy.parsing.common import arbitrary_to_concept
+
+        comparison = base.comparison
+        if isinstance(comparison, (AggregateWrapper, FilterItem, WindowItem)):
+            comparison = arbitrary_to_concept(
+                comparison,
+                environment=self.environment,
+            )
+        expr: Concept | FuncArgs = base.expr
+        if isinstance(expr, (AggregateWrapper, FilterItem, WindowItem)):
+            expr = arbitrary_to_concept(
+                expr,
+                environment=self.environment,
+            )
         return BuildCaseWhen.model_construct(
-            comparison=self.build(base.comparison),
-            expr=(self.build(base.expr)),
+            comparison=self.build(comparison),
+            expr=self.build(expr),
         )
 
     @build.register
@@ -1647,10 +1661,27 @@ class Factory:
     @build.register
     def _(self, base: WindowItem) -> BuildWindowItem:
         # to do proper discovery, we need to inject virtual intermediate ocncepts
+        from trilogy.parsing.common import arbitrary_to_concept
+
+        content: Concept | FuncArgs = base.content
+        if isinstance(content, (AggregateWrapper, FilterItem, WindowItem)):
+            content = arbitrary_to_concept(
+                content,
+                environment=self.environment,
+            )
+        final_by = []
+        for x in base.order_by:
+            if (
+                isinstance(x.expr, AggregateWrapper)
+                and not x.expr.by
+                and isinstance(content, (ConceptRef, Concept))
+            ):
+                x.expr.by = [content]
+            final_by.append(x)
         return BuildWindowItem.model_construct(
             type=base.type,
-            content=self.build(base.content),
-            order_by=[self.build(x) for x in base.order_by],
+            content=self.build(content),
+            order_by=[self.build(x) for x in final_by],
             over=[self.build(x) for x in base.over],
             index=base.index,
         )

{pytrilogy-0.0.3.34 → pytrilogy-0.0.3.36}/trilogy/core/statements/author.py

@@ -135,7 +135,6 @@ class SelectStatement(HasUUID, SelectTypeMixin, BaseModel):
         )
 
         output.grain = output.calculate_grain(environment)
-
         for x in selection:
             if x.is_undefined and environment.concepts.fail_on_missing:
                 environment.concepts.raise_undefined(

{pytrilogy-0.0.3.34 → pytrilogy-0.0.3.36}/trilogy/parsing/common.py

@@ -270,7 +270,7 @@ def _get_relevant_parent_concepts(arg) -> tuple[list[ConceptRef], bool]:
     elif isinstance(arg, AggregateWrapper) and not arg.by:
         return [], True
     elif isinstance(arg, AggregateWrapper) and arg.by:
-        return arg.by, True
+        return [x.reference for x in arg.by], True
     elif isinstance(arg, FunctionCallWrapper):
         return get_relevant_parent_concepts(arg.content)
     return get_concept_arguments(arg), False

{pytrilogy-0.0.3.34 → pytrilogy-0.0.3.36}/trilogy/parsing/parse_engine.py

@@ -368,18 +368,21 @@ class ParseToObjects(Transformer):
                     output.concept.metadata.description
                     or args[1].text.split("#")[1].strip()
                 )
-        if isinstance(output, ImportStatement):
-            if len(args) > 1 and isinstance(args[1], Comment):
-                comment = args[1].text.split("#")[1].strip()
-                namespace = output.alias
-                for _, v in self.environment.concepts.items():
-                    if v.namespace == namespace:
-                        if v.metadata.description:
-                            v.metadata.description = (
-                                f"{comment}: {v.metadata.description}"
-                            )
-                        else:
-                            v.metadata.description = comment
+        # this is a bad plan for now;
+        # because a comment after an import statement is very common
+        # and it's not intuitive that it modifies the import description
+        # if isinstance(output, ImportStatement):
+        #     if len(args) > 1 and isinstance(args[1], Comment):
+        #         comment = args[1].text.split("#")[1].strip()
+        #         namespace = output.alias
+        #         for _, v in self.environment.concepts.items():
+        #             if v.namespace == namespace:
+        #                 if v.metadata.description:
+        #                     v.metadata.description = (
+        #                         f"{comment}: {v.metadata.description}"
+        #                     )
+        #                 else:
+        #                     v.metadata.description = comment
 
         return args[0]
 

pytrilogy-0.0.3.36/trilogy/std/report.preql

@@ -0,0 +1,5 @@
+
+
+
+def top_x_by_metric(val, metric, x=10, default='other') -> case when rank val by metric desc <x+1 then val else default end; # Get the top X of a value by a certain metric, bucket the rest in other
+

pytrilogy-0.0.3.34/trilogy/std/dashboard.preql

@@ -1,5 +0,0 @@
-
-
-
-# def top_x_by_metric(val, metric, x=10) -> case when rank val by metric order by metric desc <x then val else 'Other' end;
-