pytrilogy 0.0.3.35__py3-none-any.whl → 0.0.3.37__py3-none-any.whl

{pytrilogy-0.0.3.35.dist-info → pytrilogy-0.0.3.37.dist-info}/METADATA

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

{pytrilogy-0.0.3.35.dist-info → pytrilogy-0.0.3.37.dist-info}/RECORD

@@ -1,5 +1,5 @@
-pytrilogy-0.0.3.35.dist-info/licenses/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
-trilogy/__init__.py,sha256=XKMFtr6LPZcLEaFqOMZ_Bx_NXbihLoadMcLr5wNv0KM,303
+pytrilogy-0.0.3.37.dist-info/licenses/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
+trilogy/__init__.py,sha256=5M7wcjmeEthyEiIJM3OK2LvRgaZK8UTv_Zcf0SXA8t0,303
 trilogy/compiler.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/constants.py,sha256=5eQxk1A0pv-TQk3CCvgZCFA9_K-6nxrOm7E5Lxd7KIY,1652
 trilogy/engine.py,sha256=OK2RuqCIUId6yZ5hfF8J1nxGP0AJqHRZiafcowmW0xc,1728
@@ -11,19 +11,19 @@ trilogy/utility.py,sha256=euQccZLKoYBz0LNg5tzLlvv2YHvXh9HArnYp1V3uXsM,763
 trilogy/authoring/__init__.py,sha256=v9PRuZs4fTnxhpXAnwTxCDwlLasUax6g2FONidcujR4,2369
 trilogy/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/core/constants.py,sha256=7XaCpZn5mQmjTobbeBn56SzPWq9eMNDfzfsRU-fP0VE,171
-trilogy/core/enums.py,sha256=fWexUZtssfvP5TiD7eQ66Q_tPUCNCCTGNSzLbVXrnqQ,7358
+trilogy/core/enums.py,sha256=JwbWyAHOC2xRTZe2SeEvlIGPvmC1KjcJ4uh1Po5USzQ,7380
 trilogy/core/env_processor.py,sha256=pFsxnluKIusGKx1z7tTnfsd_xZcPy9pZDungkjkyvI0,3170
-trilogy/core/environment_helpers.py,sha256=5ayyhf4CGBlg_LssPu3DbS_H9H1Kq6Qog5TgR8pwyMk,8518
+trilogy/core/environment_helpers.py,sha256=80XJrhSBd3CO7aWUc7r_oxXh6CeiR9cv0zaPyfK_uDM,8540
 trilogy/core/ergonomics.py,sha256=e-7gE29vPLFdg0_A1smQ7eOrUwKl5VYdxRSTddHweRA,1631
 trilogy/core/exceptions.py,sha256=JPYyBcit3T_pRtlHdtKSeVJkIyWUTozW2aaut25A2xI,673
-trilogy/core/functions.py,sha256=YjPbZtfQauY6u7puehFLmPsauB5IuGa5xGETKDAgHrU,27396
+trilogy/core/functions.py,sha256=bgmvWdO9x2fTZ0zjekspUb4YQ4xbVfpKYIE1wu8ftPQ,27567
 trilogy/core/graph_models.py,sha256=z17EoO8oky2QOuO6E2aMWoVNKEVJFhLdsQZOhC4fNLU,2079
 trilogy/core/internal.py,sha256=iicDBlC6nM8d7e7jqzf_ZOmpUsW8yrr2AA8AqEiLx-s,1577
 trilogy/core/optimization.py,sha256=aihzx4-2-mSjx5td1TDTYGvc7e9Zvy-_xEyhPqLS-Ig,8314
 trilogy/core/query_processor.py,sha256=Do8YpdPBdsbKtl9n37hobzk8SORMGqH-e_zNNxd-BE4,19456
 trilogy/core/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/core/models/author.py,sha256=rb-OVaCVBlaE08JhWNFK2sMi9r7yGBT2QK97JE0oKJg,76950
-trilogy/core/models/build.py,sha256=6Mjq4NoBqk5U7IWg8Fbb6AAOdMHazVymfYXOm-wcWv4,59346
+trilogy/core/models/build.py,sha256=PgTLergGdBnq2NTDqoxnGtZctw3LEOmILPzp8ldf9ws,59569
 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
@@ -70,8 +70,8 @@ trilogy/core/statements/build.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hS
 trilogy/core/statements/common.py,sha256=KxEmz2ySySyZ6CTPzn0fJl5NX2KOk1RPyuUSwWhnK1g,759
 trilogy/core/statements/execute.py,sha256=cSlvpHFOqpiZ89pPZ5GDp9Hu6j6uj-5_h21FWm_L-KM,1248
 trilogy/dialect/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-trilogy/dialect/base.py,sha256=lm3rUjmGENoW9wyXAzzJmBohXLVv4sLvvtfB-YCeHPY,41006
-trilogy/dialect/bigquery.py,sha256=PkjFcNGZHYOe655PmJhb8a0afdFULuovqP0qQVO8m0I,2953
+trilogy/dialect/base.py,sha256=zeuSrurbKxM22uAZBLd6__a6a27bl8zUFk3zqTV8GO0,41361
+trilogy/dialect/bigquery.py,sha256=j5PQvwMUMcLHaxZgbqe6P-v-pwhHDQ38z8uK6ecxzR0,3359
 trilogy/dialect/common.py,sha256=XjHkP8Dqezjkd2JU5xoAlMRS_6HNyXQCF4CykLK3C8o,5011
 trilogy/dialect/config.py,sha256=olnyeVU5W5T6b9-dMeNAnvxuPlyc2uefb7FRME094Ec,3834
 trilogy/dialect/dataframe.py,sha256=RUbNgReEa9g3pL6H7fP9lPTrAij5pkqedpZ99D8_5AE,1522
@@ -91,9 +91,9 @@ trilogy/parsing/common.py,sha256=0fRM9_9k3Y24oanSTgHHjVI6LSTAaxTvkaq5ESVWR5o,235
 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=2zUqtpEyTaxNUz4L3IkA9RKHEFif7VDjxF0Y7sFigts,63506
+trilogy/parsing/parse_engine.py,sha256=Ol4nGl-TnOshE9Gjbo_tis-l-x9a-6c11ZrJ3RuYjBc,63873
 trilogy/parsing/render.py,sha256=hI4y-xjXrEXvHslY2l2TQ8ic0zAOpN41ADH37J2_FZY,19047
-trilogy/parsing/trilogy.lark,sha256=ErSKUy2sqpmc3OnflRbQnzTeE81y3ISfUJBD_wvypFM,13159
+trilogy/parsing/trilogy.lark,sha256=VqGM8rS157hVZpOqA-1aHsrb0jS-iVlTvqrCbPyqMSY,13276
 trilogy/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/scripts/trilogy.py,sha256=1L0XrH4mVHRt1C9T1HnaDv2_kYEfbWTb5_-cBBke79w,3774
 trilogy/std/__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.35.dist-info/METADATA,sha256=0nFaVh5d7D6qAUyxTGqdKlRI93zNMvCtVM-9OVb5ACo,9100
-pytrilogy-0.0.3.35.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-pytrilogy-0.0.3.35.dist-info/entry_points.txt,sha256=ewBPU2vLnVexZVnB-NrVj-p3E-4vukg83Zk8A55Wp2w,56
-pytrilogy-0.0.3.35.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
-pytrilogy-0.0.3.35.dist-info/RECORD,,
+pytrilogy-0.0.3.37.dist-info/METADATA,sha256=QJwr5jfw6iF9Njsd4mSH9WwvcLR9YykKvzlf9OmWuLg,9100
+pytrilogy-0.0.3.37.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
+pytrilogy-0.0.3.37.dist-info/entry_points.txt,sha256=ewBPU2vLnVexZVnB-NrVj-p3E-4vukg83Zk8A55Wp2w,56
+pytrilogy-0.0.3.37.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
+pytrilogy-0.0.3.37.dist-info/RECORD,,

{pytrilogy-0.0.3.35.dist-info → pytrilogy-0.0.3.37.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.1.0)
+Generator: setuptools (79.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.35"
+__version__ = "0.0.3.37"
 
 __all__ = ["parse", "Executor", "Dialects", "Environment", "CONFIG"]

trilogy/core/enums.py

@@ -155,6 +155,7 @@ class FunctionType(Enum):
     ROUND = "round"
     ABS = "abs"
     SQRT = "sqrt"
+    RANDOM = "random"
 
     # Aggregates
     ## group is not a real aggregate - it just means group by this + some other set of fields

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,

trilogy/core/functions.py

@@ -620,6 +620,12 @@ FUNCTION_REGISTRY: dict[FunctionType, FunctionConfig] = {
         output_type=DataType.INTEGER,
         arg_count=1,
     ),
+    FunctionType.RANDOM: FunctionConfig(
+        valid_inputs=[],
+        output_purpose=Purpose.PROPERTY,
+        output_type=DataType.FLOAT,
+        arg_count=1,
+    ),
     FunctionType.ROUND: FunctionConfig(
         valid_inputs=[
             {DataType.INTEGER, DataType.FLOAT, DataType.NUMBER, DataType.NUMERIC},

trilogy/core/models/build.py

@@ -1929,6 +1929,18 @@ class Factory:
     def _(self, base: TraitDataType):
         return base
 
+    @build.register
+    def _(self, base: ListType):
+        return base
+
+    @build.register
+    def _(self, base: StructType):
+        return base
+
+    @build.register
+    def _(self, base: MapType):
+        return base
+
     @build.register
     def _(self, base: Datasource):
         local_cache: dict[str, BuildConcept] = {}

trilogy/dialect/base.py

@@ -132,6 +132,11 @@ DATATYPE_MAP: dict[DataType, str] = {
     DataType.MAP: "map",
     DataType.DATE: "date",
     DataType.DATETIME: "datetime",
+    DataType.LIST: "list",
+}
+
+COMPLEX_DATATYPE_MAP = {
+    DataType.LIST: lambda x: f"{x}[]",
 }
 
 
@@ -172,6 +177,7 @@ FUNCTION_MAP = {
     FunctionType.ROUND: lambda x: f"round({x[0]},{x[1]})",
     FunctionType.MOD: lambda x: f"({x[0]} % {x[1]})",
     FunctionType.SQRT: lambda x: f"sqrt({x[0]})",
+    FunctionType.RANDOM: lambda x: "random()",
     # aggregate types
     FunctionType.COUNT_DISTINCT: lambda x: f"count(distinct {x[0]})",
     FunctionType.COUNT: lambda x: f"count({x[0]})",
@@ -283,6 +289,7 @@ class BaseDialect:
     QUOTE_CHARACTER = "`"
     SQL_TEMPLATE = GENERIC_SQL_TEMPLATE
     DATATYPE_MAP = DATATYPE_MAP
+    COMPLEX_DATATYPE_MAP = COMPLEX_DATATYPE_MAP
     UNNEST_MODE = UnnestMode.CROSS_APPLY
 
     def __init__(self, rendering: Rendering | None = None):
@@ -682,6 +689,8 @@ class BaseDialect:
             return self.FUNCTION_MAP[FunctionType.DATETIME_LITERAL](e)
         elif isinstance(e, TraitDataType):
             return self.render_expr(e.type, cte=cte, cte_map=cte_map)
+        elif isinstance(e, ListType):
+            return f"{self.COMPLEX_DATATYPE_MAP[DataType.LIST](self.render_expr(e.value_data_type, cte=cte, cte_map=cte_map))}"
         else:
             raise ValueError(f"Unable to render type {type(e)} {e}")
 

trilogy/dialect/bigquery.py

@@ -3,6 +3,9 @@ from typing import Any, Callable, Mapping
 from jinja2 import Template
 
 from trilogy.core.enums import FunctionType, UnnestMode, WindowType
+from trilogy.core.models.core import (
+    DataType,
+)
 from trilogy.dialect.base import BaseDialect
 
 WINDOW_FUNCTION_MAP: Mapping[WindowType, Callable[[Any, Any, Any], str]] = {}
@@ -36,6 +39,19 @@ FUNCTION_GRAIN_MATCH_MAP = {
     FunctionType.AVG: lambda args: f"{args[0]}",
 }
 
+DATATYPE_MAP: dict[DataType, str] = {
+    DataType.STRING: "STRING",
+    DataType.INTEGER: "INT64",
+    DataType.FLOAT: "FLOAT64",
+    DataType.BOOL: "BOOL",
+    DataType.NUMERIC: "NUMERIC",
+    DataType.MAP: "MAP",
+    DataType.DATE: "DATE",
+    DataType.DATETIME: "DATETIME",
+    DataType.TIMESTAMP: "TIMESTAMP",
+}
+
+
 BQ_SQL_TEMPLATE = Template(
     """{%- if output %}
 CREATE OR REPLACE TABLE {{ output.address.location }} AS
@@ -80,3 +96,4 @@ class BigqueryDialect(BaseDialect):
     QUOTE_CHARACTER = "`"
     SQL_TEMPLATE = BQ_SQL_TEMPLATE
     UNNEST_MODE = UnnestMode.CROSS_JOIN
+    DATATYPE_MAP = DATATYPE_MAP

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]
 
@@ -1762,6 +1765,10 @@ class ParseToObjects(Transformer):
     def fsqrt(self, meta: Meta, args) -> Function:
         return self.function_factory.create_function(args, FunctionType.SQRT, meta)
 
+    @v_args(meta=True)
+    def frandom(self, meta: Meta, args) -> Function:
+        return self.function_factory.create_function(args, FunctionType.RANDOM, meta)
+
     @v_args(meta=True)
     def fround(self, meta, args) -> Function:
         return self.function_factory.create_function(args, FunctionType.ROUND, meta)

trilogy/parsing/trilogy.lark

@@ -196,9 +196,12 @@
     fmod: ( "mod"i "(" expr "," (int_lit | concept_lit ) ")") | ( expr "%" (int_lit | concept_lit ) )
     fround: "round"i "(" expr "," expr ")"
     fabs: "abs"i "(" expr ")"
-    fsqrt: "sqrt"i "(" expr ")"
+    _SQRT.1: "sqrt("
+    fsqrt:  _SQRT expr ")"
+    _RANDOM.1: "random("i
+    frandom: _RANDOM expr ")"
         
-    _math_functions: fmul | fdiv | fadd | fsub | fround | fmod | fabs | fsqrt
+    _math_functions: fmul | fdiv | fadd | fsub | fround | fmod | fabs | fsqrt | frandom
     
     //generic
     _fcast_primary: "cast"i "(" expr "as"i data_type ")"
@@ -354,7 +357,7 @@
 
     struct_type: "struct"i "<" ((data_type | IDENTIFIER) ",")* (data_type | IDENTIFIER) ","? ">" 
 
-    list_type: "list"i "<" data_type ">"
+    list_type: ("list"i "<" data_type ">" ) | ("array"i "<" data_type ">" )
 
     numeric_type: "numeric"i "(" int_lit "," int_lit ")"