pytrilogy 0.0.3.25__py3-none-any.whl → 0.0.3.26__py3-none-any.whl

{pytrilogy-0.0.3.25.dist-info → pytrilogy-0.0.3.26.dist-info}/METADATA

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

{pytrilogy-0.0.3.25.dist-info → pytrilogy-0.0.3.26.dist-info}/RECORD

@@ -1,5 +1,5 @@
-pytrilogy-0.0.3.25.dist-info/licenses/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
-trilogy/__init__.py,sha256=piV4nnwA9-0AitLYz0ClSA6czFL0v_VeaN4NIfqH7xw,303
+pytrilogy-0.0.3.26.dist-info/licenses/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
+trilogy/__init__.py,sha256=jpttmNzh2EbgBflGCJnC8pwUwKWANddEpY_K5_4Hsn0,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,12 +11,12 @@ trilogy/utility.py,sha256=euQccZLKoYBz0LNg5tzLlvv2YHvXh9HArnYp1V3uXsM,763
 trilogy/authoring/__init__.py,sha256=ohkYA3_LGYZh3fwzEYKTN6ofACDI5GYl3VCbGxVvlzY,2233
 trilogy/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/core/constants.py,sha256=7XaCpZn5mQmjTobbeBn56SzPWq9eMNDfzfsRU-fP0VE,171
-trilogy/core/enums.py,sha256=wuW667WD3mhZnXmN2VXzohseHpdlmzrfLvPtQJNdhdw,7165
+trilogy/core/enums.py,sha256=zpXhm8qk6i_ih4O6ro5sPMbIQSQDtzLcBcX5eKWQZU4,7197
 trilogy/core/env_processor.py,sha256=pFsxnluKIusGKx1z7tTnfsd_xZcPy9pZDungkjkyvI0,3170
-trilogy/core/environment_helpers.py,sha256=LjB3UsLyw7TncgS8EiMGtovGU_txyUki_QK94rSsJq0,7631
+trilogy/core/environment_helpers.py,sha256=i0oyxfLjFQW6ZbD6g2wa0DXUoEvd2sHG28TZ1UBs2os,7573
 trilogy/core/ergonomics.py,sha256=e-7gE29vPLFdg0_A1smQ7eOrUwKl5VYdxRSTddHweRA,1631
 trilogy/core/exceptions.py,sha256=JPYyBcit3T_pRtlHdtKSeVJkIyWUTozW2aaut25A2xI,673
-trilogy/core/functions.py,sha256=U-IkBF-HEaGFXF-PgB993CVTnDFE850LHXW-HFfhttc,25391
+trilogy/core/functions.py,sha256=Ke8-d2RtHZszAQdx_6dNyHtELbvMIGZo2CsglxqtvEQ,26890
 trilogy/core/graph_models.py,sha256=z17EoO8oky2QOuO6E2aMWoVNKEVJFhLdsQZOhC4fNLU,2079
 trilogy/core/internal.py,sha256=iicDBlC6nM8d7e7jqzf_ZOmpUsW8yrr2AA8AqEiLx-s,1577
 trilogy/core/optimization.py,sha256=xGO8piVsLrpqrx-Aid_Y56_5slSv4eZmlP64hCHRiEc,7957
@@ -93,11 +93,11 @@ trilogy/parsing/exceptions.py,sha256=92E5i2frv5hj9wxObJZsZqj5T6bglvPzvdvco_vW1Zk
 trilogy/parsing/helpers.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 trilogy/parsing/parse_engine.py,sha256=Ffm3YB2jTPcA81CZTkpQ7iAwD1LP10QQpjoKk9fey4I,61849
 trilogy/parsing/render.py,sha256=o_XuQWhcwx1lD9eGVqkqZEwkmQK0HdmWWokGBtdeH4I,17837
-trilogy/parsing/trilogy.lark,sha256=7libFS5HNiyHJYzr5_lEiY-Lpqit04_PgyIPHMZT7-w,12928
+trilogy/parsing/trilogy.lark,sha256=GYRO0LJYUtzf1__d2b0L2EJzRGfnsI2SaQHzh9RgxnA,12945
 trilogy/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/scripts/trilogy.py,sha256=1L0XrH4mVHRt1C9T1HnaDv2_kYEfbWTb5_-cBBke79w,3774
-pytrilogy-0.0.3.25.dist-info/METADATA,sha256=emvDFD0vE0A1aIYfJZDD1qNZG9QnYUt2XQ7UkYeO49s,9100
-pytrilogy-0.0.3.25.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-pytrilogy-0.0.3.25.dist-info/entry_points.txt,sha256=ewBPU2vLnVexZVnB-NrVj-p3E-4vukg83Zk8A55Wp2w,56
-pytrilogy-0.0.3.25.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
-pytrilogy-0.0.3.25.dist-info/RECORD,,
+pytrilogy-0.0.3.26.dist-info/METADATA,sha256=-Klg8gwJa_TaSlCwqqMiknzDCnTFjv2HMP_iHfgFoOw,9100
+pytrilogy-0.0.3.26.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+pytrilogy-0.0.3.26.dist-info/entry_points.txt,sha256=ewBPU2vLnVexZVnB-NrVj-p3E-4vukg83Zk8A55Wp2w,56
+pytrilogy-0.0.3.26.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
+pytrilogy-0.0.3.26.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.25"
+__version__ = "0.0.3.26"
 
 __all__ = ["parse", "Executor", "Dialects", "Environment", "CONFIG"]

trilogy/core/enums.py

@@ -298,6 +298,7 @@ class DatePart(Enum):
     HOUR = "hour"
     MINUTE = "minute"
     SECOND = "second"
+    DAY_OF_WEEK = "day_of_week"
 
     @classmethod
     def _missing_(cls, value):

trilogy/core/environment_helpers.py

@@ -1,6 +1,6 @@
 from trilogy.constants import DEFAULT_NAMESPACE
 from trilogy.core.enums import ConceptSource, FunctionType, Purpose
-from trilogy.core.functions import AttrAccess
+from trilogy.core.functions import AttrAccess, FunctionFactory
 from trilogy.core.models.author import Concept, Function, Metadata
 from trilogy.core.models.core import DataType, StructType, arg_to_datatype
 from trilogy.core.models.environment import Environment
@@ -19,6 +19,7 @@ FUNCTION_DESCRIPTION_MAPS = {
 
 
 def generate_date_concepts(concept: Concept, environment: Environment):
+    factory = FunctionFactory(environment=environment)
     if concept.metadata and concept.metadata.description:
         base_description = concept.metadata.description
     else:
@@ -40,17 +41,15 @@ def generate_date_concepts(concept: Concept, environment: Environment):
             if concept.purpose == Purpose.CONSTANT
             else Purpose.PROPERTY
         )
-        const_function: Function = Function(
+        function = factory.create_function(
             operator=ftype,
-            output_datatype=DataType.INTEGER,
-            output_purpose=default_type,
-            arguments=[concept],
+            args=[concept],
         )
         new_concept = Concept(
             name=f"{concept.name}.{fname}",
             datatype=DataType.INTEGER,
             purpose=default_type,
-            lineage=const_function,
+            lineage=function,
             grain=concept.grain,
             namespace=concept.namespace,
             keys=set(
@@ -68,6 +67,7 @@ def generate_date_concepts(concept: Concept, environment: Environment):
 
 
 def generate_datetime_concepts(concept: Concept, environment: Environment):
+    factory = FunctionFactory(environment=environment)
     if concept.metadata and concept.metadata.description:
         base_description = concept.metadata.description
     else:
@@ -88,11 +88,10 @@ def generate_datetime_concepts(concept: Concept, environment: Environment):
             if concept.purpose == Purpose.CONSTANT
             else Purpose.PROPERTY
         )
-        const_function: Function = Function(
+
+        const_function = factory.create_function(
             operator=ftype,
-            output_datatype=DataType.INTEGER,
-            output_purpose=default_type,
-            arguments=[concept],
+            args=[concept],
         )
         new_concept = Concept(
             name=f"{concept.name}.{fname}",

trilogy/core/functions.py

@@ -43,7 +43,9 @@ class FunctionConfig:
     arg_count: int = 1
     valid_inputs: set[DataType] | list[set[DataType]] | None = None
     output_purpose: Purpose | None = None
-    output_type: DataType | ListType | MapType | StructType | NumericType | None = None
+    output_type: (
+        DataType | ListType | MapType | StructType | NumericType | TraitDataType | None
+    ) = None
     output_type_function: Optional[Callable] = None
 
 
@@ -124,6 +126,30 @@ def create_struct_output(
     return StructType(fields=types, fields_map=zipped)
 
 
+def get_date_part_output(args: list[Any]):
+    target = args[1]
+    if target == DatePart.YEAR:
+        return TraitDataType(type=DataType.INTEGER, traits=["year"])
+    elif target == DatePart.MONTH:
+        return TraitDataType(type=DataType.INTEGER, traits=["month"])
+    elif target == DatePart.DAY:
+        return TraitDataType(type=DataType.INTEGER, traits=["day"])
+    elif target == DatePart.HOUR:
+        return TraitDataType(type=DataType.INTEGER, traits=["hour"])
+    elif target == DatePart.MINUTE:
+        return TraitDataType(type=DataType.INTEGER, traits=["minute"])
+    elif target == DatePart.SECOND:
+        return TraitDataType(type=DataType.INTEGER, traits=["second"])
+    elif target == DatePart.WEEK:
+        return TraitDataType(type=DataType.INTEGER, traits=["week"])
+    elif target == DatePart.QUARTER:
+        return TraitDataType(type=DataType.INTEGER, traits=["quarter"])
+    elif target == DatePart.DAY_OF_WEEK:
+        return TraitDataType(type=DataType.INTEGER, traits=["day_of_week"])
+    else:
+        raise InvalidSyntaxException(f"Date part not supported for {target}")
+
+
 def get_date_trunc_output(
     args: list[Any],
 ):
@@ -360,7 +386,7 @@ FUNCTION_REGISTRY: dict[FunctionType, FunctionConfig] = {
             {DataType.DATE_PART},
         ],
         output_purpose=Purpose.PROPERTY,
-        output_type=DataType.INTEGER,
+        output_type_function=get_date_part_output,
         arg_count=2,
     ),
     FunctionType.DATE_ADD: FunctionConfig(
@@ -443,7 +469,7 @@ FUNCTION_REGISTRY: dict[FunctionType, FunctionConfig] = {
             DataType.STRING,
         },
         output_purpose=Purpose.PROPERTY,
-        output_type=DataType.INTEGER,
+        output_type=TraitDataType(type=DataType.INTEGER, traits=["second"]),
         arg_count=1,
     ),
     FunctionType.MINUTE: FunctionConfig(
@@ -454,7 +480,7 @@ FUNCTION_REGISTRY: dict[FunctionType, FunctionConfig] = {
             DataType.STRING,
         },
         output_purpose=Purpose.PROPERTY,
-        output_type=DataType.INTEGER,
+        output_type=TraitDataType(type=DataType.INTEGER, traits=["minute"]),
         arg_count=1,
     ),
     FunctionType.HOUR: FunctionConfig(
@@ -465,7 +491,7 @@ FUNCTION_REGISTRY: dict[FunctionType, FunctionConfig] = {
             DataType.STRING,
         },
         output_purpose=Purpose.PROPERTY,
-        output_type=DataType.INTEGER,
+        output_type=TraitDataType(type=DataType.INTEGER, traits=["hour"]),
         arg_count=1,
     ),
     FunctionType.DAY: FunctionConfig(
@@ -476,7 +502,7 @@ FUNCTION_REGISTRY: dict[FunctionType, FunctionConfig] = {
             DataType.STRING,
         },
         output_purpose=Purpose.PROPERTY,
-        output_type=DataType.INTEGER,
+        output_type=TraitDataType(type=DataType.INTEGER, traits=["day"]),
         arg_count=1,
     ),
     FunctionType.WEEK: FunctionConfig(
@@ -487,7 +513,7 @@ FUNCTION_REGISTRY: dict[FunctionType, FunctionConfig] = {
             DataType.STRING,
         },
         output_purpose=Purpose.PROPERTY,
-        output_type=DataType.INTEGER,
+        output_type=TraitDataType(type=DataType.INTEGER, traits=["week"]),
         arg_count=1,
     ),
     FunctionType.MONTH: FunctionConfig(
@@ -498,7 +524,7 @@ FUNCTION_REGISTRY: dict[FunctionType, FunctionConfig] = {
             DataType.STRING,
         },
         output_purpose=Purpose.PROPERTY,
-        output_type=DataType.INTEGER,
+        output_type=TraitDataType(type=DataType.INTEGER, traits=["month"]),
         arg_count=1,
     ),
     FunctionType.QUARTER: FunctionConfig(
@@ -509,7 +535,7 @@ FUNCTION_REGISTRY: dict[FunctionType, FunctionConfig] = {
             DataType.STRING,
         },
         output_purpose=Purpose.PROPERTY,
-        output_type=DataType.INTEGER,
+        output_type=TraitDataType(type=DataType.INTEGER, traits=["quarter"]),
         arg_count=1,
     ),
     FunctionType.YEAR: FunctionConfig(
@@ -520,7 +546,7 @@ FUNCTION_REGISTRY: dict[FunctionType, FunctionConfig] = {
             DataType.STRING,
         },
         output_purpose=Purpose.PROPERTY,
-        output_type=DataType.INTEGER,
+        output_type=TraitDataType(type=DataType.INTEGER, traits=["year"]),
         arg_count=1,
     ),
     FunctionType.DAY_OF_WEEK: FunctionConfig(
@@ -531,7 +557,7 @@ FUNCTION_REGISTRY: dict[FunctionType, FunctionConfig] = {
             DataType.STRING,
         },
         output_purpose=Purpose.PROPERTY,
-        output_type=DataType.INTEGER,
+        output_type=TraitDataType(type=DataType.INTEGER, traits=["day_of_week"]),
         arg_count=1,
     ),
     FunctionType.ADD: FunctionConfig(

trilogy/parsing/trilogy.lark

@@ -287,7 +287,7 @@
     _YEAR.1: "year("i
     fyear: _YEAR expr ")"
     
-    DATE_PART: "DAY"i | "WEEK"i | "MONTH"i | "QUARTER"i | "YEAR"i | "MINUTE"i | "HOUR"i | "SECOND"i
+    DATE_PART: "DAY"i | "WEEK"i | "MONTH"i | "QUARTER"i | "YEAR"i | "MINUTE"i | "HOUR"i | "SECOND"i | "DAY_OF_WEEK"i
     _DATE_TRUNC.1: "date_trunc("i
     fdate_trunc: _DATE_TRUNC expr "," DATE_PART ")"
     _DATE_PART.1: "date_part("i