pytrilogy 0.0.2.49__py3-none-any.whl → 0.0.2.50__py3-none-any.whl

{pytrilogy-0.0.2.49.dist-info → pytrilogy-0.0.2.50.dist-info}/METADATA

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

{pytrilogy-0.0.2.49.dist-info → pytrilogy-0.0.2.50.dist-info}/RECORD

@@ -1,4 +1,4 @@
-trilogy/__init__.py,sha256=hG5X0wOuxbm75ZaOS3dSSefwEZ4P5yCHSSmZ1x9LX4I,291
+trilogy/__init__.py,sha256=IN9QOl63ICFDvmAtr97Xo-KPeIdHaN9JuYuIIsxV0Mk,291
 trilogy/compiler.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/constants.py,sha256=qZ1d0hoKPPV2HHCoFwPYTVB7b6bXjpWvXd3lE-zEhy8,1494
 trilogy/engine.py,sha256=yOPnR7XCjWG82Gym_LLZBkYKKJdLCvqdCyt8zguNcnM,1103
@@ -8,55 +8,55 @@ trilogy/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/utility.py,sha256=eguES83XhmSOAQSBu5xq4aAXimiZFrxcUu81zDL22ug,707
 trilogy/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/core/constants.py,sha256=7XaCpZn5mQmjTobbeBn56SzPWq9eMNDfzfsRU-fP0VE,171
-trilogy/core/enums.py,sha256=iBrgUSGhGX865mV784KIU4qKmg6d7bZV71CgdZh20VI,6944
+trilogy/core/enums.py,sha256=6pGjEXNJPB1ngbDQRJjxRi4NmKM8NZQ5-iwnZhrdo5U,7281
 trilogy/core/env_processor.py,sha256=Pt4lmJfbShBbeSe5M7_FrTk5krrOziiAA__Slnettvc,2585
 trilogy/core/environment_helpers.py,sha256=CSmQyEXE6EZ4XFYuQQITUHuWXxXGo9AL4UsTnu0404A,7159
 trilogy/core/ergonomics.py,sha256=ASLDd0RqKWrZiG3XcKHo8nyTjaB_8xfE9t4NZ1UvGpc,1639
 trilogy/core/exceptions.py,sha256=1c1lQCwSw4_5CQS3q7scOkXU8GQvullJXfPHubprl90,617
-trilogy/core/functions.py,sha256=qpVLwTNU_qHQyIvNish5O2AlbpRMQQOqZWEUiSMnpqE,10721
+trilogy/core/functions.py,sha256=hDlwLxQUskT9iRcIic1lfACQnxMLNM5ASdHRPi0ghyw,10835
 trilogy/core/graph_models.py,sha256=mameUTiuCajtihDw_2-W218xyJlvTusOWrEKP1yAWgk,2003
 trilogy/core/internal.py,sha256=-CykZknaWieFh5begaQJ4EgGP9qJccGg4XXdmBirxEc,1074
-trilogy/core/models.py,sha256=GLy30_Rhvb9Z1atXPlK-sOSeN4lBzBspyMiqti5wS50,166562
+trilogy/core/models.py,sha256=WE75DKSyqx-hFUxIuc4oPlq1VV4eyN-pLeHuKfhlsWc,166832
 trilogy/core/optimization.py,sha256=Jy3tVJNeqhpK6VSyTvgIWKCao6y-VCZ7mYA69MIF6L0,7989
-trilogy/core/query_processor.py,sha256=keXQMpvM-S4rYU1YhzRAkvB1bVlbcX4CKNFafhVRgiI,18635
+trilogy/core/query_processor.py,sha256=V-TqybYO0kCY8O7Nk58OBhb7_eRPs_EqAwaQv-EYLSY,18615
 trilogy/core/optimizations/__init__.py,sha256=EBanqTXEzf1ZEYjAneIWoIcxtMDite5-n2dQ5xcfUtg,356
 trilogy/core/optimizations/base_optimization.py,sha256=P4kF-eCXkBxO-5c6tLHhMZ4ODRH1A04hb_6ovkaVyLw,505
 trilogy/core/optimizations/inline_constant.py,sha256=c-YHOg6eAufL4EaCf4-0PbY_D4skBHW0ldR55_phsMA,1277
 trilogy/core/optimizations/inline_datasource.py,sha256=LsngRKBy-LYcx1sfo1-rnDym_ly73YV9WkEngSjpFx8,3943
 trilogy/core/optimizations/predicate_pushdown.py,sha256=XPWEBv8jXnc0OL2JDPNwFvJ5AtOE7dLzJK0LzdmdZMo,9252
 trilogy/core/processing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-trilogy/core/processing/concept_strategies_v3.py,sha256=0xN1AMBGPKfl2Bbl0zIIGJYcmaNl9PFl2ESzBniVO24,37104
+trilogy/core/processing/concept_strategies_v3.py,sha256=Uxi9OMg52OLrYNW76SAYXIvnI9UFAFauao34ZO7uD3o,37053
 trilogy/core/processing/graph_utils.py,sha256=stbYnDxnK-1kbo9L4XNU85FQhWCP-oZYO7LCXhAdC5M,1198
-trilogy/core/processing/utility.py,sha256=RG0v0hCgyWsxRHzDx2-ME0ENp1LlahLk4zB--Hfrsbc,18717
+trilogy/core/processing/utility.py,sha256=STqSHP8fWTVmaIUCfHAb9Hke_fzOG2pTbmWIdYS4cvc,18787
 trilogy/core/processing/node_generators/__init__.py,sha256=s_YV1OYc336DuS9591259qjI_K_CtOCuhkf4t2aOgYs,733
 trilogy/core/processing/node_generators/basic_node.py,sha256=VqVyb4wXI_B2OmfwtpsypimzcevoPe_pnstlKLU3S5s,2878
-trilogy/core/processing/node_generators/common.py,sha256=kETikLR2fWbrKywPL0TXXj6YY4rpOA8PjsUSyx_mNyE,8907
-trilogy/core/processing/node_generators/filter_node.py,sha256=Br10q3yHtQbA337dR8JwzQMCGqo_H0kjF1vprK7PPns,7610
-trilogy/core/processing/node_generators/group_node.py,sha256=wlj8N4Nd1_8cpmccoe0BocM9jUEYsc-1WEMDCoh1WSw,4876
-trilogy/core/processing/node_generators/group_to_node.py,sha256=RNvDo0x1TNFCDi97IAZ4taLMEe9Wv0XzNtuCCM9vjvw,2537
-trilogy/core/processing/node_generators/multiselect_node.py,sha256=abS8mWWoTxRXYdjKTgRgdfeLiWcJjZ7qgESYwDv5e_o,6510
-trilogy/core/processing/node_generators/node_merge_node.py,sha256=IYDS5DNF-5_dpgwre_n1Kh7RBnt4srzgYkaUahe_K_o,14001
-trilogy/core/processing/node_generators/rowset_node.py,sha256=kM4N8n20U0zGeHgQBfyXC7PP-ABIdWUHc1q1vnWkfOw,5297
-trilogy/core/processing/node_generators/select_merge_node.py,sha256=JFoBKETwhmd2KdmoNq4wT2SOrd3Jh-GGcO5qMiUh8JE,12691
+trilogy/core/processing/node_generators/common.py,sha256=4rFEBWUpZ01WcdQEi_8fa9QbyxHIiQ781W4nuhVLaxc,8881
+trilogy/core/processing/node_generators/filter_node.py,sha256=2ucE8shC3gyKjPilkfkA0FW0ZHhfcGy2wBQfquuHNlM,7548
+trilogy/core/processing/node_generators/group_node.py,sha256=dD2qlFzLRxYni9_1fHbewoe8AzKExyrDJRfeTwy7XQ4,4863
+trilogy/core/processing/node_generators/group_to_node.py,sha256=8ToptIWQoJttquEPrRTMvU33jCJQI-VJxVObN8W8QJk,2511
+trilogy/core/processing/node_generators/multiselect_node.py,sha256=jOaSOX80tprgYAG9XQ8lL93lt8QbdoAgFhTqF6lgdPY,6484
+trilogy/core/processing/node_generators/node_merge_node.py,sha256=p0NrUxXVsQSoFuP2JCmNZg4muaQV7TXwW11ECEe7pjA,13988
+trilogy/core/processing/node_generators/rowset_node.py,sha256=a9FxQb1qobeewrRNd-X_fFJ_aRLP1WcytK5-Bgu6wjs,5284
+trilogy/core/processing/node_generators/select_merge_node.py,sha256=7jp8byYFoeglBinXtQLKrGoJ6VEQPDCR4R7lMbIh634,15288
 trilogy/core/processing/node_generators/select_node.py,sha256=bjTylBa-vYbmzpuSpphmIo_Oi78YZpI8ppHnN9KDYDk,1795
-trilogy/core/processing/node_generators/union_node.py,sha256=MVmLqOZbCEVqZYVZxxWxtDMvyEdSnAg7pU9NzoOXy1I,2517
-trilogy/core/processing/node_generators/unnest_node.py,sha256=MNNjWW7Dp3A_Xv_XGjzdHU1PHQBauZHMBVKRJhqRZJY,2255
-trilogy/core/processing/node_generators/window_node.py,sha256=x4n5NWEouMsOS0V9myyJNmEg2e3kUDPLWXQhq3PyUdY,3510
+trilogy/core/processing/node_generators/union_node.py,sha256=MfJjF2m0ARl0oUH9QT1awzPv0e3yA3mXK1XqAvUTgKw,2504
+trilogy/core/processing/node_generators/unnest_node.py,sha256=8El2B1mzC9vIUSk-m94xHvaJwAf5GtCAGfTxGDSiqmU,2229
+trilogy/core/processing/node_generators/window_node.py,sha256=5htRRxaxw6EnS-2TVoQIiy4bkNSoBefBpj2DVBtBo-w,3484
 trilogy/core/processing/nodes/__init__.py,sha256=WNUmYmZF3uqF2qiJ1L7y0u9qiVD9YnluKds0wA5opJE,4813
-trilogy/core/processing/nodes/base_node.py,sha256=t0SQW6z3OdAMDfyuUUtI8NCbDruJLq2-FgZxPuWZS0Q,16567
-trilogy/core/processing/nodes/filter_node.py,sha256=metDcI7b2QsONOy5l0Mx7by1OhXac0N8yKUDoL_2WWo,2342
-trilogy/core/processing/nodes/group_node.py,sha256=NdIrmBg7DjFy8KwvRoI653cOyAi1xChcWdXZS8tqMW0,7488
-trilogy/core/processing/nodes/merge_node.py,sha256=7lhmTyWLV5e9zT_m_UJnUgXVGBEoyX98lcUABstcf3w,14916
-trilogy/core/processing/nodes/select_node_v2.py,sha256=Xx2zT1RLFJCMmRQ0GaZnrrgRo33aI53Lgw3PqHRSCp4,8284
-trilogy/core/processing/nodes/union_node.py,sha256=WHycDepNr16flkgQdwyZRo1g-kzYKWVUb6CZ7N_U4OA,1402
-trilogy/core/processing/nodes/unnest_node.py,sha256=aR1XKa-bT7f45QYKUOS0EUuc0t4GbvYAEG8ZYFJ67sI,2151
-trilogy/core/processing/nodes/window_node.py,sha256=kXHhOZ9CZ8AQvUbJXCIxUPQ-NF3ooZT7VBgNUyM3VM8,1213
+trilogy/core/processing/nodes/base_node.py,sha256=izspnhnzyGKF1KuUpAQmZByxE85bPrrrUj3Q18EDwxM,16515
+trilogy/core/processing/nodes/filter_node.py,sha256=j7icDAXJ7oFPkHTOQVmm9QbZxrhhYEUGJj2lSiguXKA,2292
+trilogy/core/processing/nodes/group_node.py,sha256=g67rsj5DK9-fna0ppVpfuTkwaQzwhKwAur4HNnpNwgU,7438
+trilogy/core/processing/nodes/merge_node.py,sha256=eiqGEvO8UgN-YJ7mlkNlodR4vAGsUJ7d5y2hytvcgDU,14866
+trilogy/core/processing/nodes/select_node_v2.py,sha256=t3ln9Kxeml8mVTnLgtNPvavb5TLTRtfkJ0nyxh7UYUs,8212
+trilogy/core/processing/nodes/union_node.py,sha256=1QgOWkjJ-ADFdanoRzi0EM5buhuzJbmlda9BAUGp4mM,1352
+trilogy/core/processing/nodes/unnest_node.py,sha256=0TFANwqVPaVpUR6SF5uweGTlXfEnagXRBBZU6dUwtcY,2101
+trilogy/core/processing/nodes/window_node.py,sha256=yYwWuOq1Uwm-xEl8lFH_urm-YXaAGAgNhE20MEoD5QQ,1163
 trilogy/dialect/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-trilogy/dialect/base.py,sha256=KZwtnni34pfghrBH2nBfa8ZDf-BH_cEuQKxBB3JvZWo,38003
+trilogy/dialect/base.py,sha256=DR7cHoL5rbRBnsj6PCq5wK8GHH-l5szpKXUaxMqx1Mw,38568
 trilogy/dialect/bigquery.py,sha256=mKC3zoEU232h9RtIXJjqiZ72lWH8a6S28p6wAZKrAfg,2952
 trilogy/dialect/common.py,sha256=b0E6JqdKaaSzThLiFa9jwUg4YnXahf-3bqmzOn5z-6E,3827
 trilogy/dialect/config.py,sha256=UiBY2tBbNk9owx-zxP_3lN9lErEUXhXIU_bcXA18AvU,2992
-trilogy/dialect/duckdb.py,sha256=qh5XMgtl9LBUZ8DJ65GLui_nk0Iq9n11bbA6Ek9sum0,3419
+trilogy/dialect/duckdb.py,sha256=O-2k0zaJKnr_McdU6iqBHcufCtHwsIKanAnpBD5o33A,3685
 trilogy/dialect/enums.py,sha256=iaghGgOl6zRr4RxRn4TxRnxZU9iSYJG6hN5wqYiBRNQ,3948
 trilogy/dialect/postgres.py,sha256=VH4EB4myjIeZTHeFU6vK00GxY9c53rCBjg2mLbdaCEE,3254
 trilogy/dialect/presto.py,sha256=y2BMOXvpKh1_cXnpGhG0sjhGP-pNVLkf760Hz_pNw_s,3386
@@ -64,22 +64,22 @@ trilogy/dialect/snowflake.py,sha256=wmao9p26jX5yIX5SC8sRAZTXkPGTvq6ixO693QTfhz8,
 trilogy/dialect/sql_server.py,sha256=7iFpo2xztQ4ZJVwJ5n8kntWreymRzz035iClGZp3Nyc,3117
 trilogy/hooks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/hooks/base_hook.py,sha256=gD6_sjzTzchpLIn3CvJzkM9IvaWNfQUra3yDh9-s8qQ,1125
-trilogy/hooks/graph_hook.py,sha256=wljLY-Ac22vgn7PlsVlRy9HswrapRvVzHrFMlD8qhOY,2468
+trilogy/hooks/graph_hook.py,sha256=6YAHlVnak03JtWEox2oAroMdRdN7ETUN7SqwQXhdTdE,2870
 trilogy/hooks/query_debugger.py,sha256=FoDh2bu2NiwLusVhKa5El_l8EKaqfET7zn55GP0TkOE,4644
 trilogy/metadata/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/parsing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-trilogy/parsing/common.py,sha256=haPZbJrola5Fvwp940A-MJ1o-EhGXKsRFa-Y2e7OsjU,10370
+trilogy/parsing/common.py,sha256=Cm8GPznLphvc44K9EVpo_iVBRtWuH0zFMa8ekYfmVBg,10887
 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=CrXaK3KDsMt7C6qYIGy5lH4p3-dQNqRn-34VbI8XRRw,67200
+trilogy/parsing/parse_engine.py,sha256=BLO79wqweLptVq66VKAHjF68ggE_gd4XFtsWv9HTtGU,68671
 trilogy/parsing/render.py,sha256=Dr0QKIaAUi9uxfZZJVNV-todKoTA-tsWXNXPJ4Ohjn0,15650
-trilogy/parsing/trilogy.lark,sha256=d_d3H8ExBcrVffPLq1TgTcEyWDppPJO2zB6cC6mdq9I,12489
+trilogy/parsing/trilogy.lark,sha256=EazfEvYPuvkPkNjUnVzFi0uD9baavugbSI8CyfawShk,12573
 trilogy/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/scripts/trilogy.py,sha256=DQDW81E5mDMWFP8oPw8q-IyrR2JGxQSDWgUWe2VTSRQ,3731
-pytrilogy-0.0.2.49.dist-info/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
-pytrilogy-0.0.2.49.dist-info/METADATA,sha256=dI1KF17Tz1MjU5LMQwL9wLiQwzI3pUNc469_XthJuTQ,8426
-pytrilogy-0.0.2.49.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-pytrilogy-0.0.2.49.dist-info/entry_points.txt,sha256=0petKryjvvtEfTlbZC1AuMFumH_WQ9v8A19LvoS6G6c,54
-pytrilogy-0.0.2.49.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
-pytrilogy-0.0.2.49.dist-info/RECORD,,
+pytrilogy-0.0.2.50.dist-info/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
+pytrilogy-0.0.2.50.dist-info/METADATA,sha256=uqgnhuCqk3kTbmMRDbHps-acUl4qTZoGJUMDLhALK4w,8426
+pytrilogy-0.0.2.50.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+pytrilogy-0.0.2.50.dist-info/entry_points.txt,sha256=0petKryjvvtEfTlbZC1AuMFumH_WQ9v8A19LvoS6G6c,54
+pytrilogy-0.0.2.50.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
+pytrilogy-0.0.2.50.dist-info/RECORD,,

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.2.49"
+__version__ = "0.0.2.50"
 
 __all__ = ["parse", "Executor", "Dialects", "Environment", "CONFIG"]

trilogy/core/enums.py

@@ -120,6 +120,8 @@ class FunctionType(Enum):
 
     ALIAS = "alias"
 
+    PARENTHETICAL = "parenthetical"
+
     # Generic
     CASE = "case"
     CAST = "cast"
@@ -135,6 +137,8 @@ class FunctionType(Enum):
     ATTR_ACCESS = "attr_access"
     STRUCT = "struct"
     ARRAY = "array"
+    DATE_LITERAL = "date_literal"
+    DATETIME_LITERAL = "datetime_literal"
 
     # TEXT AND MAYBE MORE
     SPLIT = "split"
@@ -260,6 +264,13 @@ class ComparisonOperator(Enum):
     CONTAINS = "contains"
     ELSE = "else"
 
+    def __eq__(self, other):
+        if isinstance(other, str):
+            return self.value == other
+        if not isinstance(other, ComparisonOperator):
+            return False
+        return self.value == other.value
+
     @classmethod
     def _missing_(cls, value):
         if not isinstance(value, list) and " " in str(value):

trilogy/core/functions.py

@@ -1,3 +1,4 @@
+from datetime import date, datetime
 from typing import Optional
 
 from trilogy.constants import MagicConstants
@@ -17,6 +18,8 @@ from trilogy.core.models import (
     arg_to_datatype,
 )
 
+GENERIC_ARGS = Concept | Function | str | int | float | date | datetime
+
 
 def create_function_derived_concept(
     name: str,
@@ -262,7 +265,7 @@ def get_attr_datatype(
     return arg.datatype
 
 
-def AttrAccess(args: list[Concept]):
+def AttrAccess(args: list[GENERIC_ARGS]):
     return Function(
         operator=FunctionType.ATTR_ACCESS,
         arguments=args,

trilogy/core/models.py

@@ -5,6 +5,7 @@ import hashlib
 import os
 from abc import ABC
 from collections import UserDict, UserList, defaultdict
+from datetime import date, datetime
 from enum import Enum
 from functools import cached_property
 from pathlib import Path
@@ -1264,6 +1265,8 @@ class Function(Mergeable, Namespaced, SelectContext, BaseModel):
             int,
             float,
             str,
+            date,
+            datetime,
             MapWrapper[Any, Any],
             DataType,
             ListType,
@@ -3868,6 +3871,8 @@ class Comparison(
         float,
         list,
         bool,
+        datetime,
+        date,
         Function,
         Concept,
         "Conditional",
@@ -3884,6 +3889,8 @@ class Comparison(
         float,
         list,
         bool,
+        date,
+        datetime,
         Concept,
         Function,
         "Conditional",
@@ -5008,5 +5015,9 @@ def arg_to_datatype(arg) -> DataType | ListType | StructType | MapType | Numeric
         return ListType(type=wrapper.type)
     elif isinstance(arg, MapWrapper):
         return MapType(key_type=arg.key_type, value_type=arg.value_type)
+    elif isinstance(arg, datetime):
+        return DataType.DATETIME
+    elif isinstance(arg, date):
+        return DataType.DATE
     else:
         raise ValueError(f"Cannot parse arg datatype for arg of raw type {type(arg)}")

trilogy/core/processing/concept_strategies_v3.py

@@ -359,7 +359,6 @@ def generate_node(
             input_concepts=[],
             output_concepts=constant_targets,
             environment=environment,
-            g=g,
             parents=[],
             depth=depth + 1,
         )
@@ -906,7 +905,6 @@ def _search_concepts(
                 input_concepts=non_virtual,
                 output_concepts=non_virtual,
                 environment=environment,
-                g=g,
                 parents=stack,
                 depth=depth,
             )
@@ -987,7 +985,6 @@ def source_query_concepts(
             x for x in root.output_concepts if x.address not in root.hidden_concepts
         ],
         environment=environment,
-        g=g,
         parents=[root],
         partial_concepts=root.partial_concepts,
     )

trilogy/core/processing/node_generators/common.py

@@ -130,7 +130,6 @@ def gen_property_enrichment_node(
         ),
         output_concepts=base_node.output_concepts + extra_properties,
         environment=environment,
-        g=g,
         parents=[
             base_node,
         ]
@@ -209,7 +208,6 @@ def gen_enrichment_node(
         input_concepts=unique(join_keys + extra_required + non_hidden, "address"),
         output_concepts=unique(join_keys + extra_required + non_hidden, "address"),
         environment=environment,
-        g=g,
         parents=[enrich_node, base_node],
         force_group=False,
         preexisting_conditions=conditions.conditional if conditions else None,

trilogy/core/processing/node_generators/filter_node.py

@@ -117,7 +117,6 @@ def gen_filter_node(
                 input_concepts=row_parent.output_concepts,
                 output_concepts=[concept] + row_parent.output_concepts,
                 environment=row_parent.environment,
-                g=row_parent.g,
                 parents=[row_parent],
                 depth=row_parent.depth,
                 partial_concepts=row_parent.partial_concepts,
@@ -161,7 +160,6 @@ def gen_filter_node(
             ),
             output_concepts=[concept, immediate_parent] + parent_row_concepts,
             environment=environment,
-            g=g,
             parents=core_parents,
             grain=Grain(
                 components=[immediate_parent] + parent_row_concepts,
@@ -202,7 +200,6 @@ def gen_filter_node(
         ]
         + local_optional,
         environment=environment,
-        g=g,
         parents=[
             # this node fetches only what we need to filter
             filter_node,

trilogy/core/processing/node_generators/group_node.py

@@ -100,7 +100,6 @@ def gen_group_node(
         output_concepts=output_concepts,
         input_concepts=parent_concepts,
         environment=environment,
-        g=g,
         parents=parents,
         depth=depth,
         preexisting_conditions=conditions.conditional if conditions else None,

trilogy/core/processing/node_generators/group_to_node.py

@@ -45,7 +45,6 @@ def gen_group_to_node(
         output_concepts=parent_concepts + [concept],
         input_concepts=parent_concepts,
         environment=environment,
-        g=g,
         parents=parents,
         depth=depth,
     )
@@ -76,7 +75,6 @@ def gen_group_to_node(
         + [x for x in parent_concepts if x.address != concept.address],
         output_concepts=[concept] + local_optional,
         environment=environment,
-        g=g,
         parents=[
             # this node gets the group
             group_node,

trilogy/core/processing/node_generators/multiselect_node.py

@@ -108,7 +108,6 @@ def gen_multiselect_node(
         input_concepts=[x for y in base_parents for x in y.output_concepts],
         output_concepts=[x for y in base_parents for x in y.output_concepts],
         environment=environment,
-        g=g,
         depth=depth,
         parents=base_parents,
         node_joins=node_joins,
@@ -178,7 +177,6 @@ def gen_multiselect_node(
         input_concepts=enrich_node.output_concepts + node.output_concepts,
         output_concepts=node.output_concepts + local_optional,
         environment=environment,
-        g=g,
         depth=depth,
         parents=[
             # this node gets the multiselect

trilogy/core/processing/node_generators/node_merge_node.py

@@ -333,7 +333,6 @@ def subgraphs_to_merge_node(
         input_concepts=unique(input_c, "address"),
         output_concepts=[x for x in all_concepts],
         environment=environment,
-        g=g,
         parents=parents,
         depth=depth,
         # conditions=conditions,

trilogy/core/processing/node_generators/rowset_node.py

@@ -140,7 +140,6 @@ def gen_rowset_node(
         input_concepts=non_hidden + non_hidden_enrich,
         output_concepts=non_hidden + local_optional,
         environment=environment,
-        g=g,
         depth=depth,
         parents=[
             node,

trilogy/core/processing/node_generators/select_merge_node.py

@@ -13,6 +13,9 @@ from trilogy.core.models import (
     LooseConceptList,
     WhereClause,
 )
+from trilogy.core.processing.node_generators.select_helpers.datasource_injection import (
+    get_union_sources,
+)
 from trilogy.core.processing.nodes import (
     ConstantNode,
     GroupNode,
@@ -35,38 +38,66 @@ def extract_address(node: str):
 def get_graph_partial_nodes(
     g: nx.DiGraph, conditions: WhereClause | None
 ) -> dict[str, list[str]]:
-    datasources: dict[str, Datasource] = nx.get_node_attributes(g, "datasource")
+    datasources: dict[str, Datasource | list[Datasource]] = nx.get_node_attributes(
+        g, "datasource"
+    )
     partial: dict[str, list[str]] = {}
     for node in g.nodes:
         if node in datasources:
             ds = datasources[node]
-            partial[node] = [concept_to_node(c) for c in ds.partial_concepts]
-            if ds.non_partial_for and conditions == ds.non_partial_for:
+            if not isinstance(ds, list):
+                if ds.non_partial_for and conditions == ds.non_partial_for:
+                    partial[node] = []
+                    continue
+                partial[node] = [concept_to_node(c) for c in ds.partial_concepts]
+                ds = [ds]
+            # assume union sources have no partial
+            else:
                 partial[node] = []
 
     return partial
 
 
 def get_graph_grain_length(g: nx.DiGraph) -> dict[str, int]:
-    datasources: dict[str, Datasource] = nx.get_node_attributes(g, "datasource")
-    partial: dict[str, int] = {}
+    datasources: dict[str, Datasource | list[Datasource]] = nx.get_node_attributes(
+        g, "datasource"
+    )
+    grain_length: dict[str, int] = {}
     for node in g.nodes:
         if node in datasources:
-            partial[node] = len(datasources[node].grain.components)
-    return partial
+            lookup = datasources[node]
+            if not isinstance(lookup, list):
+                lookup = [lookup]
+            assert isinstance(lookup, list)
+            grain_length[node] = sum(len(x.grain.components) for x in lookup)
+    return grain_length
 
 
 def create_pruned_concept_graph(
     g: nx.DiGraph,
     all_concepts: List[Concept],
+    datasources: list[Datasource],
     accept_partial: bool = False,
     conditions: WhereClause | None = None,
 ) -> nx.DiGraph:
     orig_g = g
     g = g.copy()
+
+    union_options = get_union_sources(datasources, all_concepts)
+    for ds_list in union_options:
+        node_address = "ds~" + "-".join([x.name for x in ds_list])
+        common: set[Concept] = set.intersection(
+            *[set(x.output_concepts) for x in ds_list]
+        )
+        g.add_node(node_address, datasource=ds_list)
+        for c in common:
+            g.add_edge(node_address, concept_to_node(c))
+
     target_addresses = set([c.address for c in all_concepts])
     concepts: dict[str, Concept] = nx.get_node_attributes(orig_g, "concept")
-    datasources: dict[str, Datasource] = nx.get_node_attributes(orig_g, "datasource")
+    datasource_map: dict[str, Datasource | list[Datasource]] = nx.get_node_attributes(
+        orig_g, "datasource"
+    )
     relevant_concepts_pre = {
         n: x.address
         for n in g.nodes()
@@ -81,13 +112,13 @@ def create_pruned_concept_graph(
         to_remove = []
         for edge in g.edges:
             if (
-                edge[0] in datasources
+                edge[0] in datasource_map
                 and (pnodes := partial.get(edge[0], []))
                 and edge[1] in pnodes
             ):
                 to_remove.append(edge)
             if (
-                edge[1] in datasources
+                edge[1] in datasource_map
                 and (pnodes := partial.get(edge[1], []))
                 and edge[0] in pnodes
             ):
@@ -136,7 +167,9 @@ def create_pruned_concept_graph(
     for edge in orig_g.edges():
         if edge[0] in relevant and edge[1] in relevant:
             g.add_edge(edge[0], edge[1])
-
+    # if we have no ds nodes at all, for non constant, we can't find it
+    if not any([n.startswith("ds~") for n in g.nodes]):
+        return None
     return g
 
 
@@ -190,6 +223,54 @@ def resolve_subgraphs(
     return pruned_subgraphs
 
 
+def create_datasource_node(
+    datasource: Datasource,
+    all_concepts: List[Concept],
+    accept_partial: bool,
+    environment: Environment,
+    depth: int,
+    conditions: WhereClause | None = None,
+) -> tuple[StrategyNode, bool]:
+    target_grain = Grain(components=all_concepts)
+    force_group = False
+    if not datasource.grain.issubset(target_grain):
+        force_group = True
+    partial_concepts = [
+        c.concept
+        for c in datasource.columns
+        if not c.is_complete and c.concept.address in all_concepts
+    ]
+    partial_lcl = LooseConceptList(concepts=partial_concepts)
+    nullable_concepts = [
+        c.concept
+        for c in datasource.columns
+        if c.is_nullable and c.concept.address in all_concepts
+    ]
+    nullable_lcl = LooseConceptList(concepts=nullable_concepts)
+    partial_is_full = conditions and (conditions == datasource.non_partial_for)
+    return (
+        SelectNode(
+            input_concepts=[c.concept for c in datasource.columns],
+            output_concepts=all_concepts,
+            environment=environment,
+            parents=[],
+            depth=depth,
+            partial_concepts=(
+                [] if partial_is_full else [c for c in all_concepts if c in partial_lcl]
+            ),
+            nullable_concepts=[c for c in all_concepts if c in nullable_lcl],
+            accept_partial=accept_partial,
+            datasource=datasource,
+            grain=Grain(components=all_concepts),
+            conditions=datasource.where.conditional if datasource.where else None,
+            preexisting_conditions=(
+                conditions.conditional if partial_is_full and conditions else None
+            ),
+        ),
+        force_group,
+    )
+
+
 def create_select_node(
     ds_name: str,
     subgraph: list[str],
@@ -199,12 +280,11 @@ def create_select_node(
     depth: int,
     conditions: WhereClause | None = None,
 ) -> StrategyNode:
-    ds_name = ds_name.split("~")[1]
+
     all_concepts = [
         environment.concepts[extract_address(c)] for c in subgraph if c.startswith("c~")
     ]
 
-    all_lcl = LooseConceptList(concepts=all_concepts)
     if all([c.derivation == PurposeLineage.CONSTANT for c in all_concepts]):
         logger.info(
             f"{padding(depth)}{LOGGER_PREFIX} All concepts {[x.address for x in all_concepts]} are constants, returning constant node"
@@ -213,7 +293,6 @@ def create_select_node(
             output_concepts=all_concepts,
             input_concepts=[],
             environment=environment,
-            g=g,
             parents=[],
             depth=depth,
             # no partial for constants
@@ -221,41 +300,44 @@ def create_select_node(
             force_group=False,
         )
 
-    datasource = environment.datasources[ds_name]
-    target_grain = Grain(components=all_concepts)
-    force_group = False
-    if not datasource.grain.issubset(target_grain):
-        force_group = True
-    partial_concepts = [
-        c.concept
-        for c in datasource.columns
-        if not c.is_complete and c.concept in all_lcl
-    ]
-    partial_lcl = LooseConceptList(concepts=partial_concepts)
-    nullable_concepts = [
-        c.concept for c in datasource.columns if c.is_nullable and c.concept in all_lcl
-    ]
-    nullable_lcl = LooseConceptList(concepts=nullable_concepts)
-    partial_is_full = conditions and (conditions == datasource.non_partial_for)
-    bcandidate: StrategyNode = SelectNode(
-        input_concepts=[c.concept for c in datasource.columns],
-        output_concepts=all_concepts,
-        environment=environment,
-        g=g,
-        parents=[],
-        depth=depth,
-        partial_concepts=(
-            [] if partial_is_full else [c for c in all_concepts if c in partial_lcl]
-        ),
-        nullable_concepts=[c for c in all_concepts if c in nullable_lcl],
-        accept_partial=accept_partial,
-        datasource=datasource,
-        grain=Grain(components=all_concepts),
-        conditions=datasource.where.conditional if datasource.where else None,
-        preexisting_conditions=(
-            conditions.conditional if partial_is_full and conditions else None
-        ),
-    )
+    datasource: dict[str, Datasource | list[Datasource]] = nx.get_node_attributes(
+        g, "datasource"
+    )[ds_name]
+    if isinstance(datasource, Datasource):
+        bcandidate, force_group = create_datasource_node(
+            datasource,
+            all_concepts,
+            accept_partial,
+            environment,
+            depth,
+            conditions=conditions,
+        )
+
+    elif isinstance(datasource, list):
+        from trilogy.core.processing.nodes.union_node import UnionNode
+
+        force_group = False
+        parents = []
+        for x in datasource:
+            subnode, fg = create_datasource_node(
+                x,
+                all_concepts,
+                accept_partial,
+                environment,
+                depth,
+                conditions=conditions,
+            )
+            parents.append(subnode)
+            force_group = force_group or fg
+        bcandidate = UnionNode(
+            output_concepts=all_concepts,
+            input_concepts=all_concepts,
+            environment=environment,
+            parents=parents,
+            depth=depth,
+        )
+    else:
+        raise ValueError(f"Unknown datasource type {datasource}")
 
     # we need to nest the group node one further
     if force_group is True:
@@ -263,14 +345,11 @@ def create_select_node(
             output_concepts=all_concepts,
             input_concepts=all_concepts,
             environment=environment,
-            g=g,
             parents=[bcandidate],
             depth=depth,
             partial_concepts=bcandidate.partial_concepts,
             nullable_concepts=bcandidate.nullable_concepts,
-            preexisting_conditions=(
-                conditions.conditional if partial_is_full and conditions else None
-            ),
+            preexisting_conditions=bcandidate.preexisting_conditions,
         )
     else:
         candidate = bcandidate
@@ -292,7 +371,6 @@ def gen_select_merge_node(
             output_concepts=constants,
             input_concepts=[],
             environment=environment,
-            g=g,
             parents=[],
             depth=depth,
             partial_concepts=[],
@@ -300,7 +378,11 @@ def gen_select_merge_node(
         )
     for attempt in [False, True]:
         pruned_concept_graph = create_pruned_concept_graph(
-            g, non_constant, attempt, conditions
+            g,
+            non_constant,
+            accept_partial=attempt,
+            conditions=conditions,
+            datasources=list(environment.datasources.values()),
         )
         if pruned_concept_graph:
             logger.info(
@@ -321,7 +403,7 @@ def gen_select_merge_node(
         create_select_node(
             k,
             subgraph,
-            g=g,
+            g=pruned_concept_graph,
             accept_partial=accept_partial,
             environment=environment,
             depth=depth,
@@ -338,7 +420,6 @@ def gen_select_merge_node(
                 output_concepts=constants,
                 input_concepts=[],
                 environment=environment,
-                g=g,
                 parents=[],
                 depth=depth,
                 partial_concepts=[],
@@ -361,7 +442,6 @@ def gen_select_merge_node(
         output_concepts=all_concepts,
         input_concepts=non_constant,
         environment=environment,
-        g=g,
         depth=depth,
         parents=parents,
         preexisting_conditions=preexisting_conditions,
@@ -372,7 +452,6 @@ def gen_select_merge_node(
             output_concepts=all_concepts,
             input_concepts=all_concepts,
             environment=environment,
-            g=g,
             parents=[base],
             depth=depth,
             preexisting_conditions=preexisting_conditions,

trilogy/core/processing/node_generators/union_node.py

@@ -70,6 +70,5 @@ def gen_union_node(
         input_concepts=[concept] + local_optional,
         output_concepts=[concept] + local_optional,
         environment=environment,
-        g=g,
         parents=parents,
     )

trilogy/core/processing/node_generators/unnest_node.py

@@ -46,7 +46,6 @@ def gen_unnest_node(
         input_concepts=arguments + non_equivalent_optional,
         output_concepts=[concept] + local_optional,
         environment=environment,
-        g=g,
         parents=([parent] if (arguments or local_optional) else []),
     )
     # we need to sometimes nest an unnest node,
@@ -56,7 +55,6 @@ def gen_unnest_node(
         input_concepts=base.output_concepts,
         output_concepts=base.output_concepts,
         environment=environment,
-        g=g,
         parents=[base],
         preexisting_conditions=conditions.conditional if conditions else None,
     )

trilogy/core/processing/node_generators/window_node.py

@@ -86,7 +86,6 @@ def gen_window_node(
         input_concepts=parent_concepts + targets + non_equivalent_optional,
         output_concepts=[concept] + parent_concepts + local_optional,
         environment=environment,
-        g=g,
         parents=[
             parent_node,
         ],
@@ -98,7 +97,6 @@ def gen_window_node(
         input_concepts=[concept] + local_optional,
         output_concepts=[concept] + local_optional,
         environment=environment,
-        g=g,
         parents=[_window_node],
         preexisting_conditions=conditions.conditional if conditions else None,
     )

trilogy/core/processing/nodes/base_node.py

@@ -156,7 +156,6 @@ class StrategyNode:
         input_concepts: List[Concept],
         output_concepts: List[Concept],
         environment: Environment,
-        g,
         whole_grain: bool = False,
         parents: List["StrategyNode"] | None = None,
         partial_concepts: List[Concept] | None = None,
@@ -178,7 +177,6 @@ class StrategyNode:
         self.output_lcl = LooseConceptList(concepts=self.output_concepts)
 
         self.environment = environment
-        self.g = g
         self.whole_grain = whole_grain
         self.parents = parents or []
         self.resolution_cache: Optional[QueryDatasource] = None
@@ -399,7 +397,6 @@ class StrategyNode:
             input_concepts=list(self.input_concepts),
             output_concepts=list(self.output_concepts),
             environment=self.environment,
-            g=self.g,
             whole_grain=self.whole_grain,
             parents=list(self.parents),
             partial_concepts=list(self.partial_concepts),

trilogy/core/processing/nodes/filter_node.py

@@ -27,7 +27,6 @@ class FilterNode(StrategyNode):
         input_concepts: List[Concept],
         output_concepts: List[Concept],
         environment,
-        g,
         whole_grain: bool = False,
         parents: List["StrategyNode"] | None = None,
         depth: int = 0,
@@ -41,7 +40,6 @@ class FilterNode(StrategyNode):
         super().__init__(
             output_concepts=output_concepts,
             environment=environment,
-            g=g,
             whole_grain=whole_grain,
             parents=parents,
             depth=depth,
@@ -59,7 +57,6 @@ class FilterNode(StrategyNode):
             input_concepts=list(self.input_concepts),
             output_concepts=list(self.output_concepts),
             environment=self.environment,
-            g=self.g,
             whole_grain=self.whole_grain,
             parents=self.parents,
             depth=self.depth,

trilogy/core/processing/nodes/group_node.py

@@ -32,7 +32,6 @@ class GroupNode(StrategyNode):
         output_concepts: List[Concept],
         input_concepts: List[Concept],
         environment: Environment,
-        g,
         whole_grain: bool = False,
         parents: List["StrategyNode"] | None = None,
         depth: int = 0,
@@ -48,7 +47,6 @@ class GroupNode(StrategyNode):
             input_concepts=input_concepts,
             output_concepts=output_concepts,
             environment=environment,
-            g=g,
             whole_grain=whole_grain,
             parents=parents,
             depth=depth,
@@ -178,7 +176,6 @@ class GroupNode(StrategyNode):
             input_concepts=list(self.input_concepts),
             output_concepts=list(self.output_concepts),
             environment=self.environment,
-            g=self.g,
             whole_grain=self.whole_grain,
             parents=self.parents,
             depth=self.depth,

trilogy/core/processing/nodes/merge_node.py

@@ -103,7 +103,6 @@ class MergeNode(StrategyNode):
         input_concepts: List[Concept],
         output_concepts: List[Concept],
         environment,
-        g,
         whole_grain: bool = False,
         parents: List["StrategyNode"] | None = None,
         node_joins: List[NodeJoin] | None = None,
@@ -124,7 +123,6 @@ class MergeNode(StrategyNode):
             input_concepts=input_concepts,
             output_concepts=output_concepts,
             environment=environment,
-            g=g,
             whole_grain=whole_grain,
             parents=parents,
             depth=depth,
@@ -364,7 +362,6 @@ class MergeNode(StrategyNode):
             input_concepts=list(self.input_concepts),
             output_concepts=list(self.output_concepts),
             environment=self.environment,
-            g=self.g,
             whole_grain=self.whole_grain,
             parents=self.parents,
             depth=self.depth,

trilogy/core/processing/nodes/select_node_v2.py

@@ -34,7 +34,6 @@ class SelectNode(StrategyNode):
         input_concepts: List[Concept],
         output_concepts: List[Concept],
         environment: Environment,
-        g,
         datasource: Datasource | None = None,
         whole_grain: bool = False,
         parents: List["StrategyNode"] | None = None,
@@ -52,7 +51,6 @@ class SelectNode(StrategyNode):
             input_concepts=input_concepts,
             output_concepts=output_concepts,
             environment=environment,
-            g=g,
             whole_grain=whole_grain,
             parents=parents,
             depth=depth,
@@ -197,7 +195,6 @@ class SelectNode(StrategyNode):
             input_concepts=list(self.input_concepts),
             output_concepts=list(self.output_concepts),
             environment=self.environment,
-            g=self.g,
             datasource=self.datasource,
             depth=self.depth,
             parents=self.parents,
@@ -221,7 +218,6 @@ class ConstantNode(SelectNode):
             input_concepts=list(self.input_concepts),
             output_concepts=list(self.output_concepts),
             environment=self.environment,
-            g=self.g,
             datasource=self.datasource,
             depth=self.depth,
             partial_concepts=list(self.partial_concepts),

trilogy/core/processing/nodes/union_node.py

@@ -18,7 +18,6 @@ class UnionNode(StrategyNode):
         input_concepts: List[Concept],
         output_concepts: List[Concept],
         environment,
-        g,
         whole_grain: bool = False,
         parents: List["StrategyNode"] | None = None,
         depth: int = 0,
@@ -27,7 +26,6 @@ class UnionNode(StrategyNode):
             input_concepts=input_concepts,
             output_concepts=output_concepts,
             environment=environment,
-            g=g,
             whole_grain=whole_grain,
             parents=parents,
             depth=depth,
@@ -43,7 +41,6 @@ class UnionNode(StrategyNode):
             input_concepts=list(self.input_concepts),
             output_concepts=list(self.output_concepts),
             environment=self.environment,
-            g=self.g,
             whole_grain=self.whole_grain,
             parents=self.parents,
             depth=self.depth,

trilogy/core/processing/nodes/unnest_node.py

@@ -23,7 +23,6 @@ class UnnestNode(StrategyNode):
         input_concepts: List[Concept],
         output_concepts: List[Concept],
         environment,
-        g,
         whole_grain: bool = False,
         parents: List["StrategyNode"] | None = None,
         depth: int = 0,
@@ -32,7 +31,6 @@ class UnnestNode(StrategyNode):
             input_concepts=input_concepts,
             output_concepts=output_concepts,
             environment=environment,
-            g=g,
             whole_grain=whole_grain,
             parents=parents,
             depth=depth,
@@ -62,7 +60,6 @@ class UnnestNode(StrategyNode):
             input_concepts=list(self.input_concepts),
             output_concepts=list(self.output_concepts),
             environment=self.environment,
-            g=self.g,
             whole_grain=self.whole_grain,
             parents=self.parents,
             depth=self.depth,

trilogy/core/processing/nodes/window_node.py

@@ -12,7 +12,6 @@ class WindowNode(StrategyNode):
         input_concepts: List[Concept],
         output_concepts: List[Concept],
         environment,
-        g,
         whole_grain: bool = False,
         parents: List["StrategyNode"] | None = None,
         depth: int = 0,
@@ -21,7 +20,6 @@ class WindowNode(StrategyNode):
             input_concepts=input_concepts,
             output_concepts=output_concepts,
             environment=environment,
-            g=g,
             whole_grain=whole_grain,
             parents=parents,
             depth=depth,
@@ -36,7 +34,6 @@ class WindowNode(StrategyNode):
             input_concepts=list(self.input_concepts),
             output_concepts=list(self.output_concepts),
             environment=self.environment,
-            g=self.g,
             whole_grain=self.whole_grain,
             parents=self.parents,
             depth=self.depth,

trilogy/core/processing/utility.py

@@ -1,4 +1,5 @@
 from dataclasses import dataclass
+from datetime import date, datetime
 from enum import Enum
 from logging import Logger
 from typing import Any, Dict, List, Set, Tuple
@@ -380,6 +381,8 @@ def is_scalar_condition(
         int
         | str
         | float
+        | date
+        | datetime
         | list[Any]
         | WindowItem
         | FilterItem

trilogy/core/query_processor.py

@@ -391,7 +391,6 @@ def get_query_node(
             input_concepts=ds.output_concepts,
             parents=[ds],
             environment=ds.environment,
-            g=ds.g,
             partial_concepts=ds.partial_concepts,
             conditions=final,
         )

trilogy/dialect/base.py

@@ -1,3 +1,4 @@
+from datetime import date, datetime
 from typing import Any, Callable, Dict, List, Optional, Sequence, Union
 
 from jinja2 import Template
@@ -102,13 +103,15 @@ WINDOW_FUNCTION_MAP = {
     WindowType.AVG: window_factory("avg", include_concept=True),
 }
 
-DATATYPE_MAP = {
+DATATYPE_MAP: dict[DataType, str] = {
     DataType.STRING: "string",
     DataType.INTEGER: "int",
     DataType.FLOAT: "float",
     DataType.BOOL: "bool",
     DataType.NUMERIC: "numeric",
     DataType.MAP: "map",
+    DataType.DATE: "date",
+    DataType.DATETIME: "datetime",
 }
 
 
@@ -131,6 +134,7 @@ FUNCTION_MAP = {
     FunctionType.SPLIT: lambda x: f"split({x[0]}, {x[1]})",
     FunctionType.IS_NULL: lambda x: f"isnull({x[0]})",
     FunctionType.BOOL: lambda x: f"CASE WHEN {x[0]} THEN TRUE ELSE FALSE END",
+    FunctionType.PARENTHETICAL: lambda x: f"({x[0]})",
     # Complex
     FunctionType.INDEX_ACCESS: lambda x: f"{x[0]}[{x[1]}]",
     FunctionType.MAP_ACCESS: lambda x: f"{x[0]}[{x[1]}][1]",
@@ -138,6 +142,8 @@ FUNCTION_MAP = {
     FunctionType.ATTR_ACCESS: lambda x: f"""{x[0]}.{x[1].replace("'", "")}""",
     FunctionType.STRUCT: lambda x: f"{{{', '.join(struct_arg(x))}}}",
     FunctionType.ARRAY: lambda x: f"[{', '.join(x)}]",
+    FunctionType.DATE_LITERAL: lambda x: f"date '{x}'",
+    FunctionType.DATETIME_LITERAL: lambda x: f"datetime '{x}'",
     # math
     FunctionType.ADD: lambda x: " + ".join(x),
     FunctionType.SUBTRACT: lambda x: " - ".join(x),
@@ -454,6 +460,8 @@ class BaseDialect:
             list,
             bool,
             float,
+            date,
+            datetime,
             DataType,
             Function,
             Parenthetical,
@@ -612,7 +620,7 @@ class BaseDialect:
         elif isinstance(e, list):
             return f"{self.FUNCTION_MAP[FunctionType.ARRAY]([self.render_expr(x, cte=cte, cte_map=cte_map, raise_invalid=raise_invalid) for x in e])}"
         elif isinstance(e, DataType):
-            return str(e.value)
+            return self.DATATYPE_MAP.get(e, e.value)
         elif isinstance(e, DatePart):
             return str(e.value)
         elif isinstance(e, NumericType):
@@ -620,6 +628,10 @@ class BaseDialect:
         elif isinstance(e, MagicConstants):
             if e == MagicConstants.NULL:
                 return "null"
+        elif isinstance(e, date):
+            return self.FUNCTION_MAP[FunctionType.DATE_LITERAL](e)
+        elif isinstance(e, datetime):
+            return self.FUNCTION_MAP[FunctionType.DATETIME_LITERAL](e)
         else:
             raise ValueError(f"Unable to render type {type(e)} {e}")
 

trilogy/dialect/duckdb.py

@@ -3,6 +3,7 @@ from typing import Any, Callable, Mapping
 from jinja2 import Template
 
 from trilogy.core.enums import FunctionType, UnnestMode, WindowType
+from trilogy.core.models import DataType
 from trilogy.dialect.base import BaseDialect
 
 WINDOW_FUNCTION_MAP: Mapping[WindowType, Callable[[Any, Any, Any], str]] = {}
@@ -30,6 +31,8 @@ FUNCTION_MAP = {
     FunctionType.DATE_PART: lambda x: f"date_part('{x[1]}', {x[0]})",
     FunctionType.DATE_DIFF: lambda x: f"date_diff('{x[2]}', {x[0]}, {x[1]})",
     FunctionType.CONCAT: lambda x: f"({' || '.join(x)})",
+    FunctionType.DATE_LITERAL: lambda x: f"date '{x}'",
+    FunctionType.DATETIME_LITERAL: lambda x: f"datetime '{x}'",
 }
 
 # if an aggregate function is called on a source that is at the same grain as the aggregate
@@ -44,6 +47,9 @@ FUNCTION_GRAIN_MATCH_MAP = {
     FunctionType.MIN: lambda args: f"{args[0]}",
 }
 
+DATATYPE_MAP: dict[DataType, str] = {}
+
+
 DUCKDB_TEMPLATE = Template(
     """{%- if output %}
 CREATE OR REPLACE TABLE {{ output.address.location }} AS
@@ -84,6 +90,7 @@ class DuckDBDialect(BaseDialect):
         **BaseDialect.FUNCTION_GRAIN_MATCH_MAP,
         **FUNCTION_GRAIN_MATCH_MAP,
     }
+    DATATYPE_MAP = {**BaseDialect.DATATYPE_MAP, **DATATYPE_MAP}
     QUOTE_CHARACTER = '"'
     SQL_TEMPLATE = DUCKDB_TEMPLATE
     UNNEST_MODE = UnnestMode.DIRECT

trilogy/hooks/graph_hook.py

@@ -1,7 +1,19 @@
+import sys
+from os import environ
+
 import networkx as nx
 
 from trilogy.hooks.base_hook import BaseHook
 
+if not environ.get("TCL_LIBRARY"):
+    minor = sys.version_info.minor
+    if minor == 13:
+        environ["TCL_LIBRARY"] = r"C:\Program Files\Python313\tcl\tcl8.6"
+    elif minor == 12:
+        environ["TCL_LIBRARY"] = r"C:\Program Files\Python312\tcl\tcl8.6"
+    else:
+        pass
+
 
 class GraphHook(BaseHook):
     def __init__(self):
@@ -11,6 +23,8 @@ class GraphHook(BaseHook):
         except ImportError:
             raise ImportError("GraphHook requires matplotlib and scipy to be installed")
 
+        # https://github.com/python/cpython/issues/125235#issuecomment-2412948604
+
     def query_graph_built(
         self,
         graph: nx.DiGraph,

trilogy/parsing/common.py

@@ -1,3 +1,4 @@
+from datetime import date, datetime
 from typing import List, Tuple
 
 from trilogy.constants import (
@@ -37,14 +38,22 @@ def process_function_args(
     args,
     meta: Meta | None,
     environment: Environment,
-):
-    final: List[Concept | Function] = []
+) -> List[Concept | Function | str | int | float | date | datetime]:
+    final: List[Concept | Function | str | int | float | date | datetime] = []
     for arg in args:
         # if a function has an anonymous function argument
         # create an implicit concept
-        while isinstance(arg, Parenthetical):
-            arg = arg.content
-        if isinstance(arg, Function):
+        if isinstance(arg, Parenthetical):
+            processed = process_function_args([arg.content], meta, environment)
+            final.append(
+                Function(
+                    operator=FunctionType.PARENTHETICAL,
+                    arguments=processed,
+                    output_datatype=arg_to_datatype(processed[0]),
+                    output_purpose=function_args_to_output_purpose(processed),
+                )
+            )
+        elif isinstance(arg, Function):
             # if it's not an aggregate function, we can skip the virtual concepts
             # to simplify anonymous function handling
             if (

trilogy/parsing/parse_engine.py

@@ -1,4 +1,5 @@
 from dataclasses import dataclass
+from datetime import date, datetime
 from os.path import dirname, join
 from pathlib import Path
 from re import IGNORECASE
@@ -669,6 +670,12 @@ class ParseToObjects(Transformer):
         )
         for column in columns:
             column.concept = column.concept.with_grain(datasource.grain)
+        if datasource.where:
+            for x in datasource.where.concept_arguments:
+                if x.address not in datasource.output_concepts:
+                    raise ValueError(
+                        f"Datasource {name} where condition depends on concept {x.address} that does not exist on the datasource, line {meta.line}."
+                    )
         self.environment.add_datasource(datasource, meta=meta)
         return datasource
 
@@ -1783,6 +1790,30 @@ class ParseToObjects(Transformer):
     @v_args(meta=True)
     def fcast(self, meta, args) -> Function:
         args = process_function_args(args, meta=meta, environment=self.environment)
+        if isinstance(args[0], str):
+            processed: date | datetime | int | float | bool | str
+            if args[1] == DataType.DATE:
+                processed = date.fromisoformat(args[0])
+            elif args[1] == DataType.DATETIME:
+                processed = datetime.fromisoformat(args[0])
+            elif args[1] == DataType.TIMESTAMP:
+                processed = datetime.fromisoformat(args[0])
+            elif args[1] == DataType.INTEGER:
+                processed = int(args[0])
+            elif args[1] == DataType.FLOAT:
+                processed = float(args[0])
+            elif args[1] == DataType.BOOL:
+                processed = args[0].capitalize() == "True"
+            elif args[1] == DataType.STRING:
+                processed = args[0]
+            else:
+                raise SyntaxError(f"Invalid cast type {args[1]}")
+            return Function(
+                operator=FunctionType.CONSTANT,
+                output_datatype=args[1],
+                output_purpose=Purpose.CONSTANT,
+                arguments=[processed],
+            )
         output_datatype = args[1]
         return Function(
             operator=FunctionType.CAST,

trilogy/parsing/trilogy.lark

@@ -193,7 +193,9 @@
     _math_functions: fmul | fdiv | fadd | fsub | fround | fmod | fabs
     
     //generic
-    fcast: "cast"i "(" expr "as"i data_type ")"
+    _fcast_primary: "cast"i "(" expr "as"i data_type ")"
+    _fcast_alt: expr "::" data_type
+    fcast: _fcast_primary | _fcast_alt
     concat: ("concat"i "(" (expr ",")* expr ")") | (expr "||" expr)
     fcoalesce: "coalesce"i "(" (expr ",")* expr ")"
     fcase_when: "WHEN"i conditional "THEN"i expr