pytrilogy 0.0.3.30__tar.gz → 0.0.3.32__tar.gz

{pytrilogy-0.0.3.30/pytrilogy.egg-info → pytrilogy-0.0.3.32}/PKG-INFO

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

{pytrilogy-0.0.3.30 → pytrilogy-0.0.3.32/pytrilogy.egg-info}/PKG-INFO

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

{pytrilogy-0.0.3.30 → pytrilogy-0.0.3.32}/pytrilogy.egg-info/SOURCES.txt

@@ -132,5 +132,6 @@ trilogy/scripts/trilogy.py
 trilogy/std/__init__.py
 trilogy/std/dashboard.preql
 trilogy/std/date.preql
+trilogy/std/display.preql
 trilogy/std/geography.preql
 trilogy/std/money.preql

{pytrilogy-0.0.3.30 → pytrilogy-0.0.3.32}/tests/test_environment.py

@@ -13,6 +13,63 @@ from trilogy.core.models.core import DataType
 from trilogy.core.models.environment import Environment, LazyEnvironment
 
 
+def test_concept_rehydration():
+    test = {
+        "name": "order_timestamp.month_start",
+        "datatype": "date",
+        "purpose": "property",
+        "derivation": "root",
+        "granularity": "multi_row",
+        "metadata": {
+            "description": "Auto-derived from a local.order_timestamp. The date truncated to the month.",
+            "line_number": None,
+            "concept_source": "auto_derived",
+        },
+        "lineage": {
+            "operator": "date_truncate",
+            "arg_count": 2,
+            "output_datatype": "date",
+            "output_purpose": "property",
+            "valid_inputs": [
+                ["datetime", "string", "timestamp", "date"],
+                ["date_part"],
+            ],
+            "arguments": [
+                {
+                    "address": "local.order_timestamp",
+                    "datatype": "timestamp",
+                    "metadata": {
+                        "description": None,
+                        "line_number": None,
+                        "concept_source": "manual",
+                    },
+                },
+                "month",
+            ],
+        },
+        "namespace": "local",
+        "keys": ["local.order_timestamp"],
+        "grain": {"components": ["local.order_id"], "where_clause": None},
+        "modifiers": [],
+        "pseudonyms": [],
+    }
+    Concept.model_validate(test)
+    test["lineage"]["arguments"] = [
+        {
+            "address": "local.order_timestamp",
+            "datatype": "timestamp",
+            "metadata": {
+                "description": None,
+                "line_number": None,
+                "concept_source": "manual",
+            },
+        },
+        "monthz",
+    ]
+    with raises(TypeError):
+        Concept.model_validate(test)
+
+
 def test_environment_serialization(test_environment: Environment):
 
     path = test_environment.to_cache()

{pytrilogy-0.0.3.30 → pytrilogy-0.0.3.32}/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.30"
+__version__ = "0.0.3.32"
 
 __all__ = ["parse", "Executor", "Dialects", "Environment", "CONFIG"]

{pytrilogy-0.0.3.30 → pytrilogy-0.0.3.32}/trilogy/core/enums.py

@@ -287,6 +287,8 @@ class ComparisonOperator(Enum):
                 return ComparisonOperator.IS_NOT
             if value == ["in"]:
                 return ComparisonOperator.IN
+        if str(value).lower() != str(value):
+            return ComparisonOperator(str(value).lower())
         return super()._missing_(str(value).lower())
 
 

{pytrilogy-0.0.3.30 → pytrilogy-0.0.3.32}/trilogy/core/environment_helpers.py

@@ -1,5 +1,5 @@
 from trilogy.constants import DEFAULT_NAMESPACE
-from trilogy.core.enums import ConceptSource, FunctionType, Purpose
+from trilogy.core.enums import ConceptSource, DatePart, FunctionType, Purpose
 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
@@ -64,6 +64,30 @@ def generate_date_concepts(concept: Concept, environment: Environment):
         if new_concept.name in environment.concepts:
             continue
         environment.add_concept(new_concept, add_derived=False)
+    for grain in [DatePart.MONTH, DatePart.YEAR]:
+        function = factory.create_function(
+            operator=FunctionType.DATE_TRUNCATE,
+            args=[concept, grain],
+        )
+        new_concept = Concept(
+            name=f"{concept.name}.{grain.value}_start",
+            datatype=DataType.DATE,
+            purpose=Purpose.PROPERTY,
+            lineage=function,
+            grain=concept.grain,
+            namespace=concept.namespace,
+            keys=set(
+                [concept.address],
+            ),
+            metadata=Metadata(
+                description=f"Auto-derived from {base_description}. The date truncated to the {grain.value}.",
+                line_number=base_line_number,
+                concept_source=ConceptSource.AUTO_DERIVED,
+            ),
+        )
+        if new_concept.name in environment.concepts:
+            continue
+        environment.add_concept(new_concept, add_derived=False)
 
 
 def generate_datetime_concepts(concept: Concept, environment: Environment):

{pytrilogy-0.0.3.30 → pytrilogy-0.0.3.32}/trilogy/core/models/author.py

@@ -1658,8 +1658,13 @@ class Function(DataTyped, ConceptArgs, Mergeable, Namespaced, BaseModel):
                     # attempt to exit early to avoid checking all types
                     break
                 elif isinstance(arg, ptype):
+                    if isinstance(arg, str) and DataType.DATE_PART in valid_inputs[idx]:
+                        if arg not in [x.value for x in DatePart]:
+                            pass
+                        else:
+                            break
                     raise TypeError(
-                        f"Invalid {dtype} constant passed into {operator_name} {arg}, expecting one of {valid_inputs[idx]}"
+                        f'Invalid {dtype} constant passed into {operator_name} "{arg}", expecting one of {valid_inputs[idx]}'
                     )
         return v
 
@@ -2362,6 +2367,7 @@ FuncArgs = (
     | FilterItem
     | int
     | float
+    | DatePart
     | str
     | date
     | datetime
@@ -2371,7 +2377,6 @@ FuncArgs = (
     | ListType
     | MapType
     | NumericType
-    | DatePart
     | list
     | ListWrapper[Any]
 )

{pytrilogy-0.0.3.30 → pytrilogy-0.0.3.32}/trilogy/core/models/environment.py

@@ -250,7 +250,7 @@ class Environment(BaseModel):
             imports=dict(self.imports),
             namespace=self.namespace,
             working_path=self.working_path,
-            environment_config=self.config,
+            environment_config=self.config.model_copy(deep=True),
             version=self.version,
             cte_name_map=dict(self.cte_name_map),
             materialized_concepts=set(self.materialized_concepts),

{pytrilogy-0.0.3.30 → pytrilogy-0.0.3.32}/trilogy/dialect/duckdb.py

@@ -27,6 +27,7 @@ FUNCTION_MAP = {
     FunctionType.INDEX_ACCESS: lambda args: (f"{args[0]}[{args[1]}]"),
     # datetime is aliased
     FunctionType.CURRENT_DATETIME: lambda x: "cast(get_current_timestamp() as datetime)",
+    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_PART: lambda x: f"date_part('{x[1]}', {x[0]})",

{pytrilogy-0.0.3.30 → pytrilogy-0.0.3.32}/trilogy/parsing/parse_engine.py

@@ -961,7 +961,7 @@ class ParseToObjects(Transformer):
             lookup = address
             if lookup not in self.environment.config.import_resolver.content:
                 raise ImportError(
-                    f"Unable to import file {lookup}, not found in imsport resolver"
+                    f"Unable to import file {lookup}, not resolvable from provided source files."
                 )
             text = self.environment.config.import_resolver.content[lookup]
         else:

pytrilogy-0.0.3.32/trilogy/std/display.preql

@@ -0,0 +1,3 @@
+
+
+type percent float; # Percentage value