pytrilogy 0.0.3.111__py3-none-any.whl → 0.0.3.113__py3-none-any.whl

{pytrilogy-0.0.3.111.dist-info → pytrilogy-0.0.3.113.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytrilogy
-Version: 0.0.3.111
+Version: 0.0.3.113
 Summary: Declarative, typed query language that compiles to SQL.
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
@@ -51,61 +51,41 @@ The Trilogy language is an experiment in better SQL for analytics - a streamline
 
 Trilogy is especially powerful for data consumption, providing a rich metadata layer that makes creating, interpreting, and visualizing queries easy and expressive.
 
+
+We recommend starting with the studio to explore Trilogy. For integration, `pytrilogy` can be run locally to parse and execute trilogy model [.preql] files using the `trilogy` CLI tool, or can be run in python by importing the `trilogy` package.
+
+
 ## Quick Start
 
 > [!TIP]
 > **Try it now:** [Open-source studio](https://trilogydata.dev/trilogy-studio-core/) | [Interactive demo](https://trilogydata.dev/demo/) | [Documentation](https://trilogydata.dev/)
 
-**Install locally:**
+**Install**
 ```bash
 pip install pytrilogy
 ```
 
-**Your first query:**
+**Save in hello.preql**
 ```sql
-# Save as hello.preql
-import names;
-
-const top_names <- ['Elvis', 'Elvira', 'Elrond', 'Sam'];
+const prime <- unnest([2, 3, 5, 7, 11, 13, 17, 19, 23, 29]);
 
-def initcap(word) -> upper(substring(word, 1, 1)) || substring(word, 2, len(word));
+def cube_plus_one(x) -> (x * x * x + 1);
 
 WHERE 
-    @initcap(name) in top_names
+    prime_cubed_plus_one % 7 = 0
 SELECT
-    name,
-    sum(births) as name_count
+    prime,
+    @cube_plus_one(prime) as prime_cubed_plus_one
 ORDER BY
-    name_count desc
+    prime asc
 LIMIT 10;
 ```
 
-**Run it:**
+**Run it in DuckDB**
 ```bash
 trilogy run hello.preql duckdb
 ```
 
-We recommend starting with the studio to explore Trilogy. For integration, `pytrilogy` can be run locally to parse and execute trilogy model [.preql] files using the `trilogy` CLI tool, or can be run in python by importing the `trilogy` package.
-
-## Trilogy Looks Like SQL
-
-```sql
-import names;
-
-const top_names <- ['Elvis', 'Elvira', 'Elrond', 'Sam'];
-
-def initcap(word) -> upper(substring(word, 1, 1)) || substring(word, 2, len(word));
-
-WHERE 
-    @initcap(name) in top_names
-SELECT
-    name,
-    sum(births) as name_count
-ORDER BY
-    name_count desc
-LIMIT 10;
-```
-
 ## Trilogy is Easy to Write
 For humans *and* AI. Enjoy flexible, one-shot query generation without any DB access or security risks. 
 

{pytrilogy-0.0.3.111.dist-info → pytrilogy-0.0.3.113.dist-info}/RECORD

@@ -1,8 +1,8 @@
-pytrilogy-0.0.3.111.dist-info/licenses/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
-trilogy/__init__.py,sha256=t3BBsjUY17XlIDGxHsMUFEuSMUyVnnWEzcU49iVEQNE,304
+pytrilogy-0.0.3.113.dist-info/licenses/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
+trilogy/__init__.py,sha256=lAuWMqhwvK53mopDwiFjvqXcgCmF97vD3MVcY8Npwq4,304
 trilogy/constants.py,sha256=g_zkVCNjGop6coZ1kM8eXXAzCnUN22ldx3TYFz0E9sc,1747
 trilogy/engine.py,sha256=v4TpNktM4zZ9OX7jZH2nde4dpX5uAH2U23ELfULTCSg,2280
-trilogy/executor.py,sha256=f7ry_mtWMgwnPKV0MJszPqhNueOIrF4atfEigPlm9Dk,17959
+trilogy/executor.py,sha256=q3EsAjzgxNxPn-yTHD_FTFzm7bJ2mlf9CrJEjyt6-pE,17884
 trilogy/parser.py,sha256=o4cfk3j3yhUFoiDKq9ZX_GjBF3dKhDjXEwb63rcBkBM,293
 trilogy/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/render.py,sha256=qQWwduymauOlB517UtM-VGbVe8Cswa4UJub5aGbSO6c,1512
@@ -23,24 +23,24 @@ trilogy/ai/providers/utils.py,sha256=yttP6y2E_XzdytBCwhaKekfXfxM6gE6MRce4AtyLL60
 trilogy/authoring/__init__.py,sha256=TABMOETSMERrWuyDLR0nK4ISlqR0yaqeXrmuOdrSvAY,3060
 trilogy/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/core/constants.py,sha256=nizWYDCJQ1bigQMtkNIEMNTcN0NoEAXiIHLzpelxQ24,201
-trilogy/core/enums.py,sha256=H8I2Dz4POHZ4ixYCGzNs4c3KDqxLQklGLVfmje1DSMo,8877
+trilogy/core/enums.py,sha256=B0EbyjIBFl5SaP0J3lHIqudgy16fXCf9rlr16yxk6kk,8933
 trilogy/core/env_processor.py,sha256=H-rr2ALj31l5oh3FqeI47Qju6OOfiXBacXNJGNZ92zQ,4521
 trilogy/core/environment_helpers.py,sha256=TRlqVctqIRBxzfjRBmpQsAVoiCcsEKBhG1B6PUE0l1M,12743
 trilogy/core/ergonomics.py,sha256=e-7gE29vPLFdg0_A1smQ7eOrUwKl5VYdxRSTddHweRA,1631
 trilogy/core/exceptions.py,sha256=axkVXYJYQXCCwMHwlyDA232g4tCOwdCZUt7eHeUMDMg,2829
-trilogy/core/functions.py,sha256=sdV6Z3NUVfwL1d18eNcaAXllVNqzLez23McsJ6xIp7M,33182
+trilogy/core/functions.py,sha256=966xC6ypgzWwCs4BvORFwzWEMJoVlqvH2biipkIYl4E,34005
 trilogy/core/graph_models.py,sha256=4EWFTHGfYd72zvS2HYoV6hm7nMC_VEd7vWr6txY-ig0,3400
 trilogy/core/internal.py,sha256=r9QagDB2GvpqlyD_I7VrsfbVfIk5mnok2znEbv72Aa4,2681
 trilogy/core/optimization.py,sha256=Km0ITEx9n6Iv5ReX6tm4uXO5uniSv_ooahycNNiET3g,9212
 trilogy/core/query_processor.py,sha256=rMrtLSQxVm7yeyh0nWjDNI9nnu4Xi0NgHvBJ14gvu4I,20384
 trilogy/core/utility.py,sha256=3VC13uSQWcZNghgt7Ot0ZTeEmNqs__cx122abVq9qhM,410
 trilogy/core/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-trilogy/core/models/author.py,sha256=3I7PFpJgoQT9RPOT3DfiqAjEtkcQPJnScs60I2UoyWo,81461
+trilogy/core/models/author.py,sha256=YXom_XC-wdcZmJ2PexWCrJ2Slr3FnrxA__X4ayc_A8w,81792
 trilogy/core/models/build.py,sha256=iqk_-3plxX1BdxvUCTebqE9F3x62f40neKGf6Ld4VVU,70858
 trilogy/core/models/build_environment.py,sha256=mpx7MKGc60fnZLVdeLi2YSREy7eQbQYycCrP4zF-rHU,5258
 trilogy/core/models/core.py,sha256=iT9WdZoiXeglmUHWn6bZyXCTBpkApTGPKtNm_Mhbu_g,12987
 trilogy/core/models/datasource.py,sha256=wogTevZ-9CyUW2a8gjzqMCieircxi-J5lkI7EOAZnck,9596
-trilogy/core/models/environment.py,sha256=hwTIRnJgaHUdCYof7U5A9NPitGZ2s9yxqiW5O2SaJ9Y,28759
+trilogy/core/models/environment.py,sha256=do1Xvr9oyjDj0knAxgIqexSbt0HMrHbLJNyl9utkSvs,28760
 trilogy/core/models/execute.py,sha256=3fgEdho2e7S0outq91cCzb9jFwz6L1hTbsTrJwGvIFs,42311
 trilogy/core/optimizations/__init__.py,sha256=yspWc25M5SgAuvXYoSt5J8atyPbDlOfsKjIo5yGD9s4,368
 trilogy/core/optimizations/base_optimization.py,sha256=gzDOKImoFn36k7XBD3ysEYDnbnb6vdVIztUfFQZsGnM,513
@@ -50,12 +50,12 @@ trilogy/core/optimizations/predicate_pushdown.py,sha256=5ubatgq1IwWQ4L2FDt4--y16
 trilogy/core/processing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/core/processing/concept_strategies_v3.py,sha256=-iC2CLALmSrOglMKZM4TslVncyOrJbUH0V_COmbqHIw,22681
 trilogy/core/processing/discovery_node_factory.py,sha256=p23jiiHyhrW-Q8ndbnRlqMHJKT8ZqPOA89SzE4xaFFo,15445
-trilogy/core/processing/discovery_utility.py,sha256=KTWArF3zK2P2UfZxY1Y_L0-4SCx0UZlfp-VcjpSkhMI,13191
+trilogy/core/processing/discovery_utility.py,sha256=BfzeliD0CQ3x3MRLpw3msibGc7rOPh8aH_gbfuchAIs,13352
 trilogy/core/processing/discovery_validation.py,sha256=eZ4HfHMpqZLI8MGG2jez8arS8THs6ceuVrQFIY6gXrU,5364
 trilogy/core/processing/graph_utils.py,sha256=8QUVrkE9j-9C1AyrCb1nQEh8daCe0u1HuXl-Te85lag,1205
 trilogy/core/processing/utility.py,sha256=ESs6pKqVP2c9eMdfB2JNjw7D7YnoezVwbLFx1D6OUYA,26088
 trilogy/core/processing/node_generators/__init__.py,sha256=iVJ-crowPxYeut-hFjyEjfibKIDq7PfB4LEuDAUCjGY,943
-trilogy/core/processing/node_generators/basic_node.py,sha256=74LoVZXLinRvSzk2LmI1kwza96TnuH3ELoYRIbHB29A,5578
+trilogy/core/processing/node_generators/basic_node.py,sha256=rv53il-W633by0plvbN5qaqznJfl60yPinLZGBAC_MI,5707
 trilogy/core/processing/node_generators/common.py,sha256=xF32Kf6B08dZgKs2SOow1HomptSiSC057GCUCHFlS5s,9464
 trilogy/core/processing/node_generators/constant_node.py,sha256=LfpDq2WrBRZ3tGsLxw77LuigKfhbteWWh9L8BGdMGwk,1146
 trilogy/core/processing/node_generators/filter_node.py,sha256=cJ5od1fAfvalaUDO2O4Y6Yrr2RukOCqey7f3zrKSBbI,10808
@@ -84,7 +84,7 @@ trilogy/core/processing/nodes/union_node.py,sha256=hLAXXVWqEgMWi7dlgSHfCF59fon64
 trilogy/core/processing/nodes/unnest_node.py,sha256=oLKMMNMx6PLDPlt2V5neFMFrFWxET8r6XZElAhSNkO0,2181
 trilogy/core/processing/nodes/window_node.py,sha256=JXJ0iVRlSEM2IBr1TANym2RaUf_p5E_l2sNykRzXWDo,1710
 trilogy/core/statements/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-trilogy/core/statements/author.py,sha256=VFzylve72fw0tqMSP5Yiwp8--_r92b9zzX1XAdxuTYQ,15963
+trilogy/core/statements/author.py,sha256=w_d55It4zs8qBMyEGxRyUjgMX0U3AQojG_GJ587UgrM,16414
 trilogy/core/statements/build.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/core/statements/common.py,sha256=VnVLULQg1TJLNUFzJaROT1tsf2ewk3IpuhvZaP36R6A,535
 trilogy/core/statements/execute.py,sha256=kiwJcVeMa4wZR-xLfM2oYOJ9DeyJkP8An38WFyJxktM,2413
@@ -95,12 +95,12 @@ trilogy/core/validation/datasource.py,sha256=nJeEFyb6iMBwlEVdYVy1vLzAbdRZwOsUjGx
 trilogy/core/validation/environment.py,sha256=ymvhQyt7jLK641JAAIQkqjQaAmr9C5022ILzYvDgPP0,2835
 trilogy/core/validation/fix.py,sha256=Z818UFNLxndMTLiyhB3doLxIfnOZ-16QGvVFWuD7UsA,3750
 trilogy/dialect/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-trilogy/dialect/base.py,sha256=Qk4HkjKlnAnhcZwwLte9Arb_1pVnBmkgRlwRFX1A_GQ,50680
+trilogy/dialect/base.py,sha256=B_zjQ6HyOQEW0iRGgGBjhqJ1Xr-KODk1fUBZDAWfE54,50798
 trilogy/dialect/bigquery.py,sha256=XS3hpybeowgfrOrkycAigAF3NX2YUzTzfgE6f__2fT4,4316
 trilogy/dialect/common.py,sha256=I5Ku_TR5MwJTB3ZhcQenrtvXhH2RvTQ8wQe9w5lfkfA,5708
 trilogy/dialect/config.py,sha256=olnyeVU5W5T6b9-dMeNAnvxuPlyc2uefb7FRME094Ec,3834
 trilogy/dialect/dataframe.py,sha256=nDTHMSd7GiGjEhjAobrZND0w4zjr-vgOalM2Cdxjets,1596
-trilogy/dialect/duckdb.py,sha256=cRPyqnuMgjhZVaW9BYA360p-5OXle_1Xt65Yy0Vzbr4,5901
+trilogy/dialect/duckdb.py,sha256=Z_mxrfQXS3KP8PEbkKsCLolyjJgPEM-aBkVCdWiLph0,6312
 trilogy/dialect/enums.py,sha256=FRNYQ5-w-B6-X0yXKNU5g9GowsMlERFogTC5u2nxL_s,4740
 trilogy/dialect/metadata.py,sha256=p_V-MYPQ2iR6fcTjagnptCIWtsZe4fTfoS_iXpavPzY,7098
 trilogy/dialect/postgres.py,sha256=el2PKwfyvWGk5EZtLudqAH5ewLitY1sFHJiocBSyxyM,3393
@@ -113,13 +113,13 @@ trilogy/hooks/graph_hook.py,sha256=5BfR7Dt0bgEsCLgwjowgCsVkboGYfVJGOz8g9mqpnos,4
 trilogy/hooks/query_debugger.py,sha256=1npRjww94sPV5RRBBlLqMJRaFkH9vhEY6o828MeoEcw,5583
 trilogy/metadata/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/parsing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-trilogy/parsing/common.py,sha256=NJLm31J3W9BLWq1ClhNvYE43jrF950698KJ3o0UfSCo,31340
+trilogy/parsing/common.py,sha256=alayr5yy6MZOLTnw8CKLtxU2drtzbq4bKteQWfTw9QU,32281
 trilogy/parsing/config.py,sha256=Z-DaefdKhPDmSXLgg5V4pebhSB0h590vI0_VtHnlukI,111
 trilogy/parsing/exceptions.py,sha256=Xwwsv2C9kSNv2q-HrrKC1f60JNHShXcCMzstTSEbiCw,154
 trilogy/parsing/helpers.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-trilogy/parsing/parse_engine.py,sha256=T-3Q4UH256IB6cfX85crScZwZ6gAwslgv0fy3WKBdjc,81930
+trilogy/parsing/parse_engine.py,sha256=p758ukVifI_ygWp-1vJIy3X5NZVmwpNbbxVDfbkkTbU,82253
 trilogy/parsing/render.py,sha256=FhSU3-bMA0YM3oEn6nfpfjbM74nvH2r1TtFgbWNzOsM,24204
-trilogy/parsing/trilogy.lark,sha256=6eBDD6d4D9N1Nnn4CtmaoB-NpOpjHrEn5oi0JykAlbE,16509
+trilogy/parsing/trilogy.lark,sha256=EN0Nrwz8cagzt69O85VSteW-k30lj8U5bRtXetM0JiU,16671
 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
@@ -132,8 +132,8 @@ trilogy/std/money.preql,sha256=XWwvAV3WxBsHX9zfptoYRnBigcfYwrYtBHXTME0xJuQ,2082
 trilogy/std/net.preql,sha256=WZCuvH87_rZntZiuGJMmBDMVKkdhTtxeHOkrXNwJ1EE,416
 trilogy/std/ranking.preql,sha256=LDoZrYyz4g3xsII9XwXfmstZD-_92i1Eox1UqkBIfi8,83
 trilogy/std/report.preql,sha256=LbV-XlHdfw0jgnQ8pV7acG95xrd1-p65fVpiIc-S7W4,202
-pytrilogy-0.0.3.111.dist-info/METADATA,sha256=QagDSTPXJqU3Xa3OBJANdEauKslRIGUCczAVvV9HNcU,13289
-pytrilogy-0.0.3.111.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pytrilogy-0.0.3.111.dist-info/entry_points.txt,sha256=ewBPU2vLnVexZVnB-NrVj-p3E-4vukg83Zk8A55Wp2w,56
-pytrilogy-0.0.3.111.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
-pytrilogy-0.0.3.111.dist-info/RECORD,,
+pytrilogy-0.0.3.113.dist-info/METADATA,sha256=4Ix5np1ZL_PCT0B6i4e8mazXdFNvRkpHznssca1beeI,12911
+pytrilogy-0.0.3.113.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pytrilogy-0.0.3.113.dist-info/entry_points.txt,sha256=ewBPU2vLnVexZVnB-NrVj-p3E-4vukg83Zk8A55Wp2w,56
+pytrilogy-0.0.3.113.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
+pytrilogy-0.0.3.113.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.3.111"
+__version__ = "0.0.3.113"
 
 __all__ = ["parse", "Executor", "Dialects", "Environment", "CONFIG"]

trilogy/core/enums.py

@@ -236,6 +236,8 @@ class FunctionType(Enum):
     MONTH = "month"
     QUARTER = "quarter"
     YEAR = "year"
+    MONTH_NAME = "month_name"
+    DAY_NAME = "day_name"
 
     DATE_PART = "date_part"
     DATE_TRUNCATE = "date_truncate"

trilogy/core/functions.py

@@ -175,6 +175,10 @@ def get_date_trunc_output(
         return DataType.DATETIME
     elif target == DatePart.SECOND:
         return DataType.DATETIME
+    elif target == DatePart.WEEK:
+        return DataType.DATE
+    elif target == DatePart.QUARTER:
+        return DataType.DATE
     else:
         raise InvalidSyntaxException(f"Date truncation not supported for {target}")
 
@@ -640,6 +644,17 @@ FUNCTION_REGISTRY: dict[FunctionType, FunctionConfig] = {
         output_type=TraitDataType(type=DataType.INTEGER, traits=["day"]),
         arg_count=1,
     ),
+    FunctionType.DAY_NAME: FunctionConfig(
+        valid_inputs={
+            DataType.DATE,
+            DataType.TIMESTAMP,
+            DataType.DATETIME,
+            # DataType.STRING,
+        },
+        output_purpose=Purpose.PROPERTY,
+        output_type=TraitDataType(type=DataType.STRING, traits=["day_name"]),
+        arg_count=1,
+    ),
     FunctionType.WEEK: FunctionConfig(
         valid_inputs={
             DataType.DATE,
@@ -662,6 +677,17 @@ FUNCTION_REGISTRY: dict[FunctionType, FunctionConfig] = {
         output_type=TraitDataType(type=DataType.INTEGER, traits=["month"]),
         arg_count=1,
     ),
+    FunctionType.MONTH_NAME: FunctionConfig(
+        valid_inputs={
+            DataType.DATE,
+            DataType.TIMESTAMP,
+            DataType.DATETIME,
+            # DataType.STRING,
+        },
+        output_purpose=Purpose.PROPERTY,
+        output_type=TraitDataType(type=DataType.STRING, traits=["month_name"]),
+        arg_count=1,
+    ),
     FunctionType.QUARTER: FunctionConfig(
         valid_inputs={
             DataType.DATE,

trilogy/core/models/author.py

@@ -461,6 +461,11 @@ class WhereClause(Mergeable, ConceptArgs, Namespaced, BaseModel):
             conditional=self.conditional.with_namespace(namespace)
         )
 
+    def with_reference_replacement(self, source, target):
+        return self.__class__.model_construct(
+            conditional=self.conditional.with_reference_replacement(source, target)
+        )
+
 
 class HavingClause(WhereClause):
     pass
@@ -1212,6 +1217,8 @@ class Concept(Addressable, DataTyped, ConceptArgs, Mergeable, Namespaced, BaseMo
             return Derivation.FILTER
         elif lineage and isinstance(lineage, (BuildAggregateWrapper, AggregateWrapper)):
             return Derivation.AGGREGATE
+        # elif lineage and isinstance(lineage, (BuildParenthetical, Parenthetical)):
+        #     return Derivation.PARENTHETICAL
         elif lineage and isinstance(lineage, (BuildRowsetItem, RowsetItem)):
             return Derivation.ROWSET
         elif lineage and isinstance(

trilogy/core/models/environment.py

@@ -563,6 +563,7 @@ class Environment(BaseModel):
             existing = self.validate_concept(concept, meta=meta)
             if existing:
                 concept = existing
+
         self.concepts[concept.address] = concept
 
         from trilogy.core.environment_helpers import generate_related_concepts

trilogy/core/processing/discovery_utility.py

@@ -1,7 +1,7 @@
 from typing import List
 
 from trilogy.constants import logger
-from trilogy.core.enums import Derivation, Purpose
+from trilogy.core.enums import Derivation, Purpose, SourceType
 from trilogy.core.models.build import (
     BuildConcept,
     BuildDatasource,
@@ -200,8 +200,10 @@ def group_if_required_v2(
             root.set_output_concepts(targets, rebuild=False, change_visibility=False)
             root.rebuild_cache()
             return root
+        elif isinstance(root, GroupNode) and root.source_type == SourceType.BASIC:
+            # we need to group this one more time
+            pass
         elif isinstance(root, GroupNode):
-
             if set(x.address for x in final) != set(
                 x.address for x in root.output_concepts
             ):

trilogy/core/processing/node_generators/basic_node.py

@@ -138,7 +138,9 @@ def gen_basic_node(
         for s in parent_node.output_concepts
         if any(s.address in y.pseudonyms for y in targets)
     ] + targets
-    parent_node.set_output_concepts(targets)
+    hidden = [x for x in parent_node.output_concepts if x.address not in targets]
+    parent_node.hide_output_concepts(hidden)
+    parent_node.source_type = SourceType.BASIC
 
     logger.info(
         f"{depth_prefix}{LOGGER_PREFIX} Returning basic select for {concept}: input: {[x.address for x in parent_node.input_concepts]} output {[x.address for x in parent_node.output_concepts]} hidden {[x for x in parent_node.hidden_concepts]}"

trilogy/core/statements/author.py

@@ -31,6 +31,7 @@ from trilogy.core.models.author import (
     Metadata,
     MultiSelectLineage,
     OrderBy,
+    Parenthetical,
     SelectLineage,
     UndefinedConcept,
     WhereClause,
@@ -48,7 +49,12 @@ from trilogy.utility import unique
 
 class ConceptTransform(BaseModel):
     function: (
-        Function | FilterItem | WindowItem | AggregateWrapper | FunctionCallWrapper
+        Function
+        | FilterItem
+        | WindowItem
+        | AggregateWrapper
+        | FunctionCallWrapper
+        | Parenthetical
     )
     output: Concept  # this has to be a full concept, as it may not exist in environment
     modifiers: List[Modifier] = Field(default_factory=list)
@@ -190,9 +196,17 @@ class SelectStatement(HasUUID, SelectTypeMixin, BaseModel):
         if self.where_clause:
             for x in self.where_clause.concept_arguments:
                 if isinstance(x, UndefinedConcept):
-                    environment.concepts.raise_undefined(
-                        x.address, x.metadata.line_number if x.metadata else None
-                    )
+                    validate = environment.concepts.get(x.address)
+                    if validate:
+                        self.where_clause = (
+                            self.where_clause.with_reference_replacement(
+                                x.address, validate.reference
+                            )
+                        )
+                    else:
+                        environment.concepts.raise_undefined(
+                            x.address, x.metadata.line_number if x.metadata else None
+                        )
         all_in_output = [x for x in self.output_components]
         if self.where_clause:
             for cref in self.where_clause.concept_arguments:

trilogy/dialect/base.py

@@ -263,9 +263,11 @@ FUNCTION_MAP = {
     FunctionType.MINUTE: lambda x: f"minute({x[0]})",
     FunctionType.HOUR: lambda x: f"hour({x[0]})",
     FunctionType.DAY: lambda x: f"day({x[0]})",
+    FunctionType.DAY_NAME: lambda x: f"dayname({x[0]})",
     FunctionType.DAY_OF_WEEK: lambda x: f"day_of_week({x[0]})",
     FunctionType.WEEK: lambda x: f"week({x[0]})",
     FunctionType.MONTH: lambda x: f"month({x[0]})",
+    FunctionType.MONTH_NAME: lambda x: f"monthname({x[0]})",
     FunctionType.QUARTER: lambda x: f"quarter({x[0]})",
     FunctionType.YEAR: lambda x: f"year({x[0]})",
     # string types

trilogy/dialect/duckdb.py

@@ -57,6 +57,15 @@ def render_log(args):
         raise ValueError("log function requires 1 or 2 arguments")
 
 
+def map_date_part_specifier(specifier: str) -> str:
+    """Map date part specifiers to DuckDB-compatible names"""
+    mapping = {
+        "day_of_week": "dow",
+        # Add other mappings if needed
+    }
+    return mapping.get(specifier, specifier)
+
+
 FUNCTION_MAP = {
     FunctionType.COUNT: lambda args: f"count({args[0]})",
     FunctionType.SUM: lambda args: f"sum({args[0]})",
@@ -84,11 +93,13 @@ FUNCTION_MAP = {
     FunctionType.ARRAY_AGG: lambda args: f"array_agg({args[0]})",
     # datetime is aliased
     FunctionType.CURRENT_DATETIME: lambda x: "cast(get_current_timestamp() as datetime)",
+    FunctionType.DATETIME: lambda x: f"cast({x[0]} as datetime)",
+    FunctionType.TIMESTAMP: lambda x: f"cast({x[0]} as timestamp)",
     FunctionType.DATE: lambda x: f"cast({x[0]} as date)",
     FunctionType.DATE_TRUNCATE: lambda x: f"date_trunc('{x[1]}', {x[0]})",
     FunctionType.DATE_ADD: lambda x: f"date_add({x[0]}, {x[2]} * INTERVAL 1 {x[1]})",
     FunctionType.DATE_SUB: lambda x: f"date_add({x[0]}, -{x[2]} * INTERVAL 1 {x[1]})",
-    FunctionType.DATE_PART: lambda x: f"date_part('{x[1]}', {x[0]})",
+    FunctionType.DATE_PART: lambda x: f"date_part('{map_date_part_specifier(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}'",

trilogy/executor.py

@@ -82,9 +82,6 @@ class Executor(object):
     def close(self):
         self.engine.dispose(close=True)
         if self.dialect == Dialects.DUCK_DB:
-            import duckdb
-
-            duckdb.default_connection().close()
             import gc
 
             gc.collect()

trilogy/parsing/common.py

@@ -55,6 +55,21 @@ from trilogy.core.models.environment import Environment
 from trilogy.core.statements.author import RowsetDerivationStatement, SelectStatement
 from trilogy.utility import string_to_hash, unique
 
+ARBITRARY_INPUTS = (
+    AggregateWrapper
+    | FunctionCallWrapper
+    | WindowItem
+    | FilterItem
+    | Function
+    | Parenthetical
+    | ListWrapper
+    | MapWrapper
+    | int
+    | float
+    | str
+    | date
+)
+
 
 def process_function_arg(
     arg,
@@ -625,7 +640,7 @@ def window_item_to_concept(
     fmetadata = metadata or Metadata()
     if not isinstance(parent.content, ConceptRef):
         raise NotImplementedError(
-            f"Window function wiht non ref content {parent.content} not yet supported"
+            f"Window function with non ref content {parent.content} not yet supported"
         )
     bcontent = environment.concepts[parent.content.address]
     if isinstance(bcontent, UndefinedConcept):
@@ -844,6 +859,7 @@ def generate_concept_name(
         | Function
         | ListWrapper
         | MapWrapper
+        | Parenthetical
         | int
         | float
         | str
@@ -865,24 +881,36 @@ def generate_concept_name(
             return f"{VIRTUAL_CONCEPT_PREFIX}_group_to_{string_to_hash(str(parent))}"
         else:
             return f"{VIRTUAL_CONCEPT_PREFIX}_func_{parent.operator.value}_{string_to_hash(str(parent))}"
+    elif isinstance(parent, Parenthetical):
+        return f"{VIRTUAL_CONCEPT_PREFIX}_paren_{string_to_hash(str(parent))}"
+    elif isinstance(parent, FunctionCallWrapper):
+        return f"{VIRTUAL_CONCEPT_PREFIX}_{parent.name}_{string_to_hash(str(parent))}"
     else:  # ListWrapper, MapWrapper, or primitive types
         return f"{VIRTUAL_CONCEPT_PREFIX}_{string_to_hash(str(parent))}"
 
 
+def parenthetical_to_concept(
+    parent: Parenthetical,
+    name: str,
+    namespace: str,
+    environment: Environment,
+    metadata: Metadata | None = None,
+) -> Concept:
+    if isinstance(
+        parent.content,
+        ARBITRARY_INPUTS,
+    ):
+
+        return arbitrary_to_concept(
+            parent.content, environment, namespace, name, metadata
+        )
+    raise NotImplementedError(
+        f"Parenthetical with non-supported content {parent.content} ({type(parent.content)}) not yet supported"
+    )
+
+
 def arbitrary_to_concept(
-    parent: (
-        AggregateWrapper
-        | FunctionCallWrapper
-        | WindowItem
-        | FilterItem
-        | Function
-        | ListWrapper
-        | MapWrapper
-        | int
-        | float
-        | str
-        | date
-    ),
+    parent: ARBITRARY_INPUTS,
     environment: Environment,
     namespace: str | None = None,
     name: str | None = None,
@@ -938,5 +966,7 @@ def arbitrary_to_concept(
         )
     elif isinstance(parent, ListWrapper):
         return constant_to_concept(parent, name, namespace, metadata)
+    elif isinstance(parent, Parenthetical):
+        return parenthetical_to_concept(parent, name, namespace, environment, metadata)
     else:
         return constant_to_concept(parent, name, namespace, metadata)

trilogy/parsing/parse_engine.py

@@ -223,7 +223,14 @@ def expr_to_boolean(
 def unwrap_transformation(
     input: Expr,
     environment: Environment,
-) -> Function | FilterItem | WindowItem | AggregateWrapper | FunctionCallWrapper:
+) -> (
+    Function
+    | FilterItem
+    | WindowItem
+    | AggregateWrapper
+    | FunctionCallWrapper
+    | Parenthetical
+):
     if isinstance(input, Function):
         return input
     elif isinstance(input, AggregateWrapper):
@@ -243,7 +250,7 @@ def unwrap_transformation(
     elif isinstance(input, FunctionCallWrapper):
         return input
     elif isinstance(input, Parenthetical):
-        return unwrap_transformation(input.content, environment)
+        return input
     else:
         return Function.model_construct(
             operator=FunctionType.CONSTANT,
@@ -779,7 +786,6 @@ class ParseToObjects(Transformer):
         lookup, namespace, name, parent = parse_concept_reference(
             name, self.environment
         )
-
         concept = Concept(
             name=name,
             datatype=arg_to_datatype(constant),
@@ -1953,6 +1959,10 @@ class ParseToObjects(Transformer):
     def fday(self, meta, args):
         return self.function_factory.create_function(args, FunctionType.DAY, meta)
 
+    @v_args(meta=True)
+    def fday_name(self, meta, args):
+        return self.function_factory.create_function(args, FunctionType.DAY_NAME, meta)
+
     @v_args(meta=True)
     def fday_of_week(self, meta, args):
         return self.function_factory.create_function(
@@ -1967,6 +1977,12 @@ class ParseToObjects(Transformer):
     def fmonth(self, meta, args):
         return self.function_factory.create_function(args, FunctionType.MONTH, meta)
 
+    @v_args(meta=True)
+    def fmonth_name(self, meta, args):
+        return self.function_factory.create_function(
+            args, FunctionType.MONTH_NAME, meta
+        )
+
     @v_args(meta=True)
     def fquarter(self, meta, args):
         return self.function_factory.create_function(args, FunctionType.QUARTER, meta)

trilogy/parsing/trilogy.lark

@@ -379,12 +379,16 @@
     fhour: _HOUR expr ")"
     _DAY.1: "day("i
     fday:  _DAY expr ")"
+    _DAY_NAME.1: "day_name("i
+    fday_name:  _DAY_NAME expr ")"
     _DAY_OF_WEEK.1: "day_of_week("i
     fday_of_week:  _DAY_OF_WEEK expr ")"
     _WEEK.1: "week("i
     fweek: _WEEK expr ")"
     _MONTH.1: "month("i
     fmonth: _MONTH expr ")"
+    _MONTH_NAME.1: "month_name("i
+    fmonth_name: _MONTH_NAME expr ")"
     _QUARTER.1: "quarter("i
     fquarter: _QUARTER expr ")"
     _YEAR.1: "year("i
@@ -402,7 +406,7 @@
     _DATE_DIFF.1: "date_diff("i
     fdate_diff: _DATE_DIFF expr "," expr "," DATE_PART ")"
     
-    _date_functions: fdate | fdate_add | fdate_sub | fdate_diff | fdatetime | ftimestamp | fsecond | fminute | fhour | fday | fday_of_week | fweek | fmonth | fquarter | fyear | fdate_part | fdate_trunc
+    _date_functions: fdate | fdate_add | fdate_sub | fdate_diff | fdatetime | ftimestamp | fsecond | fminute | fhour | fday |fday_name | fday_of_week | fweek | fmonth | fmonth_name | fquarter | fyear | fdate_part | fdate_trunc
     
     _static_functions:  _string_functions | _math_functions | _array_functions | _map_functions