pytrilogy 0.0.2.39__py3-none-any.whl → 0.0.2.40__py3-none-any.whl

{pytrilogy-0.0.2.39.dist-info → pytrilogy-0.0.2.40.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pytrilogy
-Version: 0.0.2.39
+Version: 0.0.2.40
 Summary: Declarative, typed query language that compiles to SQL.
 Home-page: 
 Author: 
@@ -21,10 +21,10 @@ Requires-Dist: pyodbc
 Requires-Dist: pydantic
 Requires-Dist: duckdb-engine
 Requires-Dist: click
-Provides-Extra: bigquery
-Requires-Dist: sqlalchemy-bigquery; extra == "bigquery"
 Provides-Extra: postgres
 Requires-Dist: psycopg2-binary; extra == "postgres"
+Provides-Extra: bigquery
+Requires-Dist: sqlalchemy-bigquery; extra == "bigquery"
 Provides-Extra: snowflake
 Requires-Dist: snowflake-sqlalchemy; extra == "snowflake"
 

{pytrilogy-0.0.2.39.dist-info → pytrilogy-0.0.2.40.dist-info}/RECORD

@@ -1,4 +1,4 @@
-trilogy/__init__.py,sha256=yX0F1t4N_maMFKbruOAtDv1ZZx40t3DP_jLMW2X1-tA,291
+trilogy/__init__.py,sha256=2E7nMoyCbDG8XWcPC2wKkOfnlTRrPzFPzBTUxxpk8U4,291
 trilogy/compiler.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/constants.py,sha256=UPymm94T2c6a55XdDaXw0aleTe1pOJ6lf6gOWLKZyKg,1430
 trilogy/engine.py,sha256=R5ubIxYyrxRExz07aZCUfrTsoXCHQ8DKFTDsobXdWdA,1102
@@ -16,7 +16,7 @@ trilogy/core/exceptions.py,sha256=NvV_4qLOgKXbpotgRf7c8BANDEvHxlqRPaA53IThQ2o,56
 trilogy/core/functions.py,sha256=IhVpt3n6wEanKHnGu3oA2w6-hKIlxWpEyz7fHN66mpo,10720
 trilogy/core/graph_models.py,sha256=mameUTiuCajtihDw_2-W218xyJlvTusOWrEKP1yAWgk,2003
 trilogy/core/internal.py,sha256=jNGFHKENnbMiMCtAgsnLZYVSENDK4b5ALecXFZpTDzQ,1075
-trilogy/core/models.py,sha256=hNW55X6rqDoe7tm9DM61zqEvleAjcVktTTmYyEHYZdU,163003
+trilogy/core/models.py,sha256=S_Qq1HpDDTFI1JRrr9Ky-2K2VusiUkpe7rfq44CclBQ,163041
 trilogy/core/optimization.py,sha256=VFSvJLNoCCOraip-PZUKeE4qrlxtXARjQUzJZiW-yRk,7325
 trilogy/core/query_processor.py,sha256=mbcZlgjChrRjDHkdmMbKe-T70UpbBkJhS09MyU5a6UY,17785
 trilogy/core/optimizations/__init__.py,sha256=bWQecbeiwiDx9LJnLsa7dkWxdbl2wcnkcTN69JyP8iI,356
@@ -50,7 +50,7 @@ trilogy/core/processing/nodes/select_node_v2.py,sha256=7WoFxeGEAzhpS4y4Zw2nH2tt7
 trilogy/core/processing/nodes/unnest_node.py,sha256=mAmFluzm2yeeiQ6NfIB7BU_8atRGh-UJfPf9ROwbhr8,2152
 trilogy/core/processing/nodes/window_node.py,sha256=ro0QfMFi4ZmIn5Q4D0M_vJWfnHH_C0MN7XkVkx8Gygg,1214
 trilogy/dialect/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-trilogy/dialect/base.py,sha256=wkK8NESHfko7bUavaMFvJHzaGNoHd3r03j-kfIyD4bY,34626
+trilogy/dialect/base.py,sha256=ubBrXe-Pb-9LjG1bCvZW7U3M0Nor4R1Ulgu1u6YcULY,34606
 trilogy/dialect/bigquery.py,sha256=15KJ-cOpBlk9O7FPviPgmg8xIydJeKx7WfmL3SSsPE8,2953
 trilogy/dialect/common.py,sha256=eqJi_Si1iyb2sV0siTf8g8JOHueWu6RkdtQZtutKazk,3826
 trilogy/dialect/config.py,sha256=tLVEMctaTDhUgARKXUNfHUcIolGaALkQ0RavUvXAY4w,2994
@@ -70,14 +70,14 @@ trilogy/parsing/common.py,sha256=_GW9LU6_4RuUgcdcr8EE1ybCRd-7cz3idZtjHZ66pYA,101
 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=NMBFZ3EPUYEsPhBFrUAxs8qEEKV7Naiz8e0sUvB_M7k,65252
-trilogy/parsing/render.py,sha256=FWKk2xEA0gWwE4WFHLo4Q9mGPcujT1aPHRxmqnGGQ8A,15714
+trilogy/parsing/parse_engine.py,sha256=KMeHQf8iW-UKd4JstGgcoo6O3OZ14MaQW50g1PMjEEQ,65256
+trilogy/parsing/render.py,sha256=-qqpXQg4yHcv284Vosjnsc_vrPveH6oaYbeCd3ZSvs0,15682
 trilogy/parsing/trilogy.lark,sha256=YOgt-rE_0ZHRex_fTeqZiHvu5a4BX5UBOUu1LAVCyug,12391
 trilogy/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/scripts/trilogy.py,sha256=PHxvv6f2ODv0esyyhWxlARgra8dVhqQhYl0lTrSyVNo,3729
-pytrilogy-0.0.2.39.dist-info/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
-pytrilogy-0.0.2.39.dist-info/METADATA,sha256=fxJFY0sR884pHmLQY7SL1LFG3BmXLZ3xCTOzTm4-nOg,8424
-pytrilogy-0.0.2.39.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
-pytrilogy-0.0.2.39.dist-info/entry_points.txt,sha256=0petKryjvvtEfTlbZC1AuMFumH_WQ9v8A19LvoS6G6c,54
-pytrilogy-0.0.2.39.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
-pytrilogy-0.0.2.39.dist-info/RECORD,,
+pytrilogy-0.0.2.40.dist-info/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
+pytrilogy-0.0.2.40.dist-info/METADATA,sha256=xgH5_k_JkGbPM1lpHQYkEQvbPizwXPjnZduBAZUrdzs,8424
+pytrilogy-0.0.2.40.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+pytrilogy-0.0.2.40.dist-info/entry_points.txt,sha256=0petKryjvvtEfTlbZC1AuMFumH_WQ9v8A19LvoS6G6c,54
+pytrilogy-0.0.2.40.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
+pytrilogy-0.0.2.40.dist-info/RECORD,,

{pytrilogy-0.0.2.39.dist-info → pytrilogy-0.0.2.40.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.5.0)
+Generator: setuptools (75.6.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

trilogy/__init__.py

@@ -4,6 +4,6 @@ from trilogy.executor import Executor
 from trilogy.parser import parse
 from trilogy.constants import CONFIG
 
-__version__ = "0.0.2.39"
+__version__ = "0.0.2.40"
 
 __all__ = ["parse", "Executor", "Dialects", "Environment", "CONFIG"]

trilogy/core/models.py

@@ -448,8 +448,8 @@ class Concept(Mergeable, Namespaced, SelectContext, BaseModel):
     ] = None
     namespace: Optional[str] = Field(default=DEFAULT_NAMESPACE, validate_default=True)
     keys: Optional[Tuple["Concept", ...]] = None
-    grain: "Grain" = Field(default=None, validate_default=True)
-    modifiers: Optional[List[Modifier]] = Field(default_factory=list)
+    grain: "Grain" = Field(default=None, validate_default=True)  # type: ignore
+    modifiers: List[Modifier] = Field(default_factory=list)  # type: ignore
     pseudonyms: set[str] = Field(default_factory=set)
     _address_cache: str | None = None
 
@@ -3372,7 +3372,7 @@ class Environment(BaseModel):
     functions: Dict[str, Function] = Field(default_factory=dict)
     data_types: Dict[str, DataType] = Field(default_factory=dict)
     imports: Dict[str, list[ImportStatement]] = Field(
-        default_factory=lambda: defaultdict(list)
+        default_factory=lambda: defaultdict(list)  # type: ignore
     )
     namespace: str = DEFAULT_NAMESPACE
     working_path: str | Path = Field(default_factory=lambda: os.getcwd())

trilogy/dialect/base.py

@@ -138,10 +138,10 @@ FUNCTION_MAP = {
     FunctionType.STRUCT: lambda x: f"{{{', '.join(struct_arg(x))}}}",
     FunctionType.ARRAY: lambda x: f"[{', '.join(x)}]",
     # math
-    FunctionType.ADD: lambda x: f"{x[0]} + {x[1]}",
-    FunctionType.SUBTRACT: lambda x: f"{x[0]} - {x[1]}",
-    FunctionType.DIVIDE: lambda x: f"{x[0]} / {x[1]}",
-    FunctionType.MULTIPLY: lambda x: f"{x[0]} * {x[1]}",
+    FunctionType.ADD: lambda x: " + ".join(x),
+    FunctionType.SUBTRACT: lambda x: " - ".join(x),
+    FunctionType.DIVIDE: lambda x: " / ".join(x),
+    FunctionType.MULTIPLY: lambda x: " * ".join(x),
     FunctionType.ROUND: lambda x: f"round({x[0]},{x[1]})",
     FunctionType.MOD: lambda x: f"({x[0]} % {x[1]})",
     # aggregate types

trilogy/parsing/parse_engine.py

@@ -1777,7 +1777,7 @@ class ParseToObjects(Transformer):
             output_datatype=output_datatype,
             output_purpose=function_args_to_output_purpose(args),
             valid_inputs={DataType.INTEGER, DataType.FLOAT, DataType.NUMBER},
-            arg_count=2,
+            arg_count=-1,
         )
 
     @v_args(meta=True)
@@ -1790,7 +1790,7 @@ class ParseToObjects(Transformer):
             output_datatype=output_datatype,
             output_purpose=function_args_to_output_purpose(args),
             valid_inputs={DataType.INTEGER, DataType.FLOAT, DataType.NUMBER},
-            arg_count=2,
+            arg_count=-1,
         )
 
     @v_args(meta=True)
@@ -1803,7 +1803,7 @@ class ParseToObjects(Transformer):
             output_datatype=output_datatype,
             output_purpose=function_args_to_output_purpose(args),
             valid_inputs={DataType.INTEGER, DataType.FLOAT, DataType.NUMBER},
-            arg_count=2,
+            arg_count=-1,
         )
 
     @v_args(meta=True)
@@ -1817,7 +1817,7 @@ class ParseToObjects(Transformer):
             output_datatype=DataType.FLOAT,  # division always returns a float
             output_purpose=function_args_to_output_purpose(args),
             valid_inputs={DataType.INTEGER, DataType.FLOAT, DataType.NUMBER},
-            arg_count=2,
+            arg_count=-1,
         )
 
     @v_args(meta=True)

trilogy/parsing/render.py

@@ -395,13 +395,13 @@ class Renderer:
         args = [self.to_string(c) for c in arg.arguments]
 
         if arg.operator == FunctionType.SUBTRACT:
-            return f"{args[0]} - {args[1]}"
+            return " - ".join(args)
         if arg.operator == FunctionType.ADD:
-            return f"{args[0]} + {args[1]}"
+            return " + ".join(args)
         if arg.operator == FunctionType.MULTIPLY:
-            return f"{args[0]} * {args[1]}"
+            return " * ".join(args)
         if arg.operator == FunctionType.DIVIDE:
-            return f"{args[0]} / {args[1]}"
+            return " / ".join(args)
         if arg.operator == FunctionType.MOD:
             return f"{args[0]} % {args[1]}"