pytrilogy 0.0.3.71__tar.gz → 0.0.3.73__tar.gz

{pytrilogy-0.0.3.71/pytrilogy.egg-info → pytrilogy-0.0.3.73}/PKG-INFO

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

{pytrilogy-0.0.3.71 → pytrilogy-0.0.3.73/pytrilogy.egg-info}/PKG-INFO

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

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

{pytrilogy-0.0.3.71 → pytrilogy-0.0.3.73}/trilogy/constants.py

@@ -37,7 +37,7 @@ class Comments:
     show: bool = False
     basic: bool = True
     joins: bool = True
-    nullable: bool = False
+    nullable: bool = True
     partial: bool = True
 
 

{pytrilogy-0.0.3.71 → pytrilogy-0.0.3.73}/trilogy/core/enums.py

@@ -134,6 +134,7 @@ class FunctionType(Enum):
     CAST = "cast"
     CONCAT = "concat"
     CONSTANT = "constant"
+    TYPED_CONSTANT = "typed_constant"
     COALESCE = "coalesce"
     IS_NULL = "isnull"
     NULLIF = "nullif"

{pytrilogy-0.0.3.71 → pytrilogy-0.0.3.73}/trilogy/core/functions.py

@@ -704,6 +704,11 @@ FUNCTION_REGISTRY: dict[FunctionType, FunctionConfig] = {
         output_purpose=Purpose.CONSTANT,
         arg_count=1,
     ),
+    FunctionType.TYPED_CONSTANT: FunctionConfig(
+        output_purpose=Purpose.CONSTANT,
+        output_type_function=get_cast_output_type,
+        arg_count=2,
+    ),
     FunctionType.IS_NULL: FunctionConfig(
         output_purpose=Purpose.PROPERTY,
         output_type=DataType.BOOL,

{pytrilogy-0.0.3.71 → pytrilogy-0.0.3.73}/trilogy/core/models/build.py

@@ -1486,6 +1486,17 @@ def get_canonical_pseudonyms(environment: Environment) -> dict[str, set[str]]:
     return roots
 
 
+def requires_concept_nesting(
+    expr,
+) -> AggregateWrapper | WindowItem | FilterItem | Function | None:
+    if isinstance(expr, (AggregateWrapper, WindowItem, FilterItem)):
+        return expr
+    if isinstance(expr, Function) and expr.operator == FunctionType.GROUP:
+        # group by requires nesting
+        return expr
+    return None
+
+
 class Factory:
 
     def __init__(
@@ -1509,11 +1520,12 @@ class Factory:
             | WindowItem
             | FilterItem
             | Function
-            | ListWrapper[Any]
-            | MapWrapper[Any, Any]
+            | ListWrapper
+            | MapWrapper
             | int
             | float
             | str
+            | date
         ),
     ) -> tuple[Concept, BuildConcept]:
         from trilogy.parsing.common import arbitrary_to_concept
@@ -1572,7 +1584,8 @@ class Factory:
 
         raw_args: list[Concept | FuncArgs] = []
         for arg in base.arguments:
-            # to do proper discovery, we need to inject virtual intermediate ocncepts
+            # to do proper discovery, we need to inject virtual intermediate concepts
+            # we don't use requires_concept_nesting here by design
             if isinstance(arg, (AggregateWrapper, FilterItem, WindowItem)):
                 narg, _ = self.instantiate_concept(arg)
                 raw_args.append(narg)
@@ -1640,11 +1653,10 @@ class Factory:
     def _(self, base: CaseWhen) -> BuildCaseWhen:
 
         comparison = base.comparison
-        if isinstance(comparison, (AggregateWrapper, FilterItem, WindowItem)):
-            comparison, _ = self.instantiate_concept(comparison)
         expr: Concept | FuncArgs = base.expr
-        if isinstance(expr, (AggregateWrapper, FilterItem, WindowItem)):
-            expr, _ = self.instantiate_concept(expr)
+        validation = requires_concept_nesting(expr)
+        if validation:
+            expr, _ = self.instantiate_concept(validation)
         return BuildCaseWhen.model_construct(
             comparison=self.build(comparison),
             expr=self.build(expr),
@@ -1653,8 +1665,9 @@ class Factory:
     @build.register
     def _(self, base: CaseElse) -> BuildCaseElse:
         expr: Concept | FuncArgs = base.expr
-        if isinstance(expr, (AggregateWrapper, FilterItem, WindowItem)):
-            expr, _ = self.instantiate_concept(expr)
+        validation = requires_concept_nesting(expr)
+        if validation:
+            expr, _ = self.instantiate_concept(validation)
         return BuildCaseElse.model_construct(expr=self.build(expr))
 
     @build.register
@@ -1753,10 +1766,9 @@ class Factory:
     def _(self, base: OrderItem) -> BuildOrderItem:
 
         bexpr: Any
-        if isinstance(base.expr, (AggregateWrapper, WindowItem, FilterItem)) or (
-            isinstance(base.expr, Function) and base.expr.operator == FunctionType.GROUP
-        ):
-            bexpr, _ = self.instantiate_concept(base.expr)
+        validation = requires_concept_nesting(base.expr)
+        if validation:
+            bexpr, _ = self.instantiate_concept(validation)
         else:
             bexpr = base.expr
         return BuildOrderItem.model_construct(
@@ -1781,8 +1793,9 @@ class Factory:
     def _(self, base: WindowItem) -> BuildWindowItem:
 
         content: Concept | FuncArgs = base.content
-        if isinstance(content, (AggregateWrapper, FilterItem, WindowItem)):
-            content, _ = self.instantiate_concept(content)
+        validation = requires_concept_nesting(base.content)
+        if validation:
+            content, _ = self.instantiate_concept(validation)
         final_by = []
         for x in base.order_by:
             if (
@@ -1811,6 +1824,7 @@ class Factory:
     @build.register
     def _(self, base: SubselectComparison) -> BuildSubselectComparison:
         right: Any = base.right
+        # this has specialized logic - include all Functions
         if isinstance(base.right, (AggregateWrapper, WindowItem, FilterItem, Function)):
             right_c, _ = self.instantiate_concept(base.right)
             right = right_c
@@ -1824,12 +1838,14 @@ class Factory:
     def _(self, base: Comparison) -> BuildComparison:
 
         left = base.left
-        if isinstance(left, (AggregateWrapper, WindowItem, FilterItem)):
-            left_c, _ = self.instantiate_concept(left)
+        validation = requires_concept_nesting(base.left)
+        if validation:
+            left_c, _ = self.instantiate_concept(validation)
             left = left_c  # type: ignore
         right = base.right
-        if isinstance(right, (AggregateWrapper, WindowItem, FilterItem)):
-            right_c, _ = self.instantiate_concept(right)
+        validation = requires_concept_nesting(base.right)
+        if validation:
+            right_c, _ = self.instantiate_concept(validation)
             right = right_c  # type: ignore
         return BuildComparison.model_construct(
             left=self.handle_constant(self.build(left)),

{pytrilogy-0.0.3.71 → pytrilogy-0.0.3.73}/trilogy/core/models/execute.py

@@ -501,7 +501,6 @@ class BaseJoin(BaseModel):
                 f"Cannot join a dataself to itself, joining {self.left_datasource} and"
                 f" {self.right_datasource}"
             )
-
         # Early returns maintained as in original code
         if self.concept_pairs or self.concepts == []:
             return self

{pytrilogy-0.0.3.71 → pytrilogy-0.0.3.73}/trilogy/core/processing/node_generators/window_node.py

@@ -39,6 +39,7 @@ def resolve_window_parent_concepts(
             base += item.concept_arguments
     if concept.grain:
         for gitem in concept.grain.components:
+            logger.info(f"{LOGGER_PREFIX} appending grain item {gitem} to base")
             base.append(environment.concepts[gitem])
     return concept.lineage.content, unique(base, "address")
 
@@ -55,7 +56,7 @@ def gen_window_node(
 ) -> StrategyNode | None:
     base, parent_concepts = resolve_window_parent_concepts(concept, environment)
     logger.info(
-        f"{padding(depth)}{LOGGER_PREFIX} generating window node for {concept} with parents {parent_concepts} and optional {local_optional}"
+        f"{padding(depth)}{LOGGER_PREFIX} generating window node for {concept} with parents {[x.address for x in parent_concepts]} and optional {local_optional}"
     )
     equivalent_optional = [
         x
@@ -68,6 +69,8 @@ def gen_window_node(
     # append in keys to get the right grain
     if concept.keys:
         for item in concept.keys:
+            if item in targets:
+                continue
             logger.info(
                 f"{padding(depth)}{LOGGER_PREFIX} appending search for key {item}"
             )

{pytrilogy-0.0.3.71 → pytrilogy-0.0.3.73}/trilogy/core/processing/utility.py

@@ -13,6 +13,7 @@ from trilogy.core.enums import (
     FunctionClass,
     Granularity,
     JoinType,
+    Modifier,
     Purpose,
 )
 from trilogy.core.models.build import (
@@ -355,6 +356,20 @@ def reduce_concept_pairs(input: list[ConceptPair]) -> list[ConceptPair]:
     return final
 
 
+def get_modifiers(
+    concept: str,
+    join: JoinOrderOutput,
+    ds_node_map: dict[str, QueryDatasource | BuildDatasource],
+):
+    base = []
+
+    if join.right and concept in ds_node_map[join.right].nullable_concepts:
+        base.append(Modifier.NULLABLE)
+    if join.left and concept in ds_node_map[join.left].nullable_concepts:
+        base.append(Modifier.NULLABLE)
+    return list(set(base))
+
+
 def get_node_joins(
     datasources: List[QueryDatasource | BuildDatasource],
     environment: BuildEnvironment,
@@ -400,6 +415,9 @@ def get_node_joins(
                             concept_map[concept], ds_node_map[j.right]
                         ),
                         existing_datasource=ds_node_map[k],
+                        modifiers=get_modifiers(
+                            concept_map[concept].address, j, ds_node_map
+                        ),
                     )
                     for k, v in j.keys.items()
                     for concept in v

{pytrilogy-0.0.3.71 → pytrilogy-0.0.3.73}/trilogy/dialect/base.py

@@ -163,6 +163,7 @@ FUNCTION_MAP = {
     FunctionType.ALIAS: lambda x: f"{x[0]}",
     FunctionType.GROUP: lambda x: f"{x[0]}",
     FunctionType.CONSTANT: lambda x: f"{x[0]}",
+    FunctionType.TYPED_CONSTANT: lambda x: f"{x[0]}",
     FunctionType.COALESCE: lambda x: f"coalesce({','.join(x)})",
     FunctionType.NULLIF: lambda x: f"nullif({x[0]},{x[1]})",
     FunctionType.CAST: lambda x: f"cast({x[0]} as {x[1]})",

{pytrilogy-0.0.3.71 → pytrilogy-0.0.3.73}/trilogy/dialect/bigquery.py

@@ -43,7 +43,8 @@ FUNCTION_MAP = {
 
 FUNCTION_GRAIN_MATCH_MAP = {
     **FUNCTION_MAP,
-    FunctionType.COUNT: lambda args: "1",
+    FunctionType.COUNT_DISTINCT: lambda args: f"CASE WHEN{args[0]} IS NOT NULL THEN 1 ELSE 0 END",
+    FunctionType.COUNT: lambda args: f"CASE WHEN {args[0]} IS NOT NULL THEN 1 ELSE 0 END",
     FunctionType.SUM: lambda args: f"{args[0]}",
     FunctionType.AVG: lambda args: f"{args[0]}",
 }

{pytrilogy-0.0.3.71 → pytrilogy-0.0.3.73}/trilogy/dialect/common.py

@@ -20,6 +20,7 @@ from trilogy.core.models.execute import (
 
 
 def null_wrapper(lval: str, rval: str, modifiers: list[Modifier]) -> str:
+
     if Modifier.NULLABLE in modifiers:
         return f"({lval} = {rval} or ({lval} is null and {rval} is null))"
     return f"{lval} = {rval}"

{pytrilogy-0.0.3.71 → pytrilogy-0.0.3.73}/trilogy/dialect/postgres.py

@@ -37,7 +37,8 @@ FUNCTION_MAP = {
 
 FUNCTION_GRAIN_MATCH_MAP = {
     **FUNCTION_MAP,
-    FunctionType.COUNT: lambda args: f"{args[0]}",
+    FunctionType.COUNT_DISTINCT: lambda args: f"CASE WHEN{args[0]} IS NOT NULL THEN 1 ELSE 0 END",
+    FunctionType.COUNT: lambda args: f"CASE WHEN {args[0]} IS NOT NULL THEN 1 ELSE 0 END",
     FunctionType.SUM: lambda args: f"{args[0]}",
     FunctionType.AVG: lambda args: f"{args[0]}",
 }

{pytrilogy-0.0.3.71 → pytrilogy-0.0.3.73}/trilogy/dialect/presto.py

@@ -39,7 +39,8 @@ FUNCTION_MAP = {
 
 FUNCTION_GRAIN_MATCH_MAP = {
     **FUNCTION_MAP,
-    FunctionType.COUNT: lambda args: f"{args[0]}",
+    FunctionType.COUNT_DISTINCT: lambda args: f"CASE WHEN{args[0]} IS NOT NULL THEN 1 ELSE 0 END",
+    FunctionType.COUNT: lambda args: f"CASE WHEN {args[0]} IS NOT NULL THEN 1 ELSE 0 END",
     FunctionType.SUM: lambda args: f"{args[0]}",
     FunctionType.AVG: lambda args: f"{args[0]}",
 }

{pytrilogy-0.0.3.71 → pytrilogy-0.0.3.73}/trilogy/dialect/snowflake.py

@@ -36,7 +36,8 @@ FUNCTION_MAP = {
 
 FUNCTION_GRAIN_MATCH_MAP = {
     **FUNCTION_MAP,
-    FunctionType.COUNT: lambda args: f"{args[0]}",
+    FunctionType.COUNT_DISTINCT: lambda args: f"CASE WHEN{args[0]} IS NOT NULL THEN 1 ELSE 0 END",
+    FunctionType.COUNT: lambda args: f"CASE WHEN {args[0]} IS NOT NULL THEN 1 ELSE 0 END",
     FunctionType.SUM: lambda args: f"{args[0]}",
     FunctionType.AVG: lambda args: f"{args[0]}",
 }

{pytrilogy-0.0.3.71 → pytrilogy-0.0.3.73}/trilogy/dialect/sql_server.py

@@ -31,7 +31,8 @@ FUNCTION_MAP = {
 # we may return a static value
 FUNCTION_GRAIN_MATCH_MAP = {
     **FUNCTION_MAP,
-    FunctionType.COUNT: lambda args: "1",
+    FunctionType.COUNT_DISTINCT: lambda args: f"CASE WHEN{args[0]} IS NOT NULL THEN 1 ELSE 0 END",
+    FunctionType.COUNT: lambda args: f"CASE WHEN {args[0]} IS NOT NULL THEN 1 ELSE 0 END",
     FunctionType.SUM: lambda args: f"{args[0]}",
     FunctionType.AVG: lambda args: f"{args[0]}",
 }

{pytrilogy-0.0.3.71 → pytrilogy-0.0.3.73}/trilogy/parsing/common.py

@@ -173,7 +173,9 @@ def concept_list_to_keys(
 
 
 def constant_to_concept(
-    parent: ListWrapper | TupleWrapper | MapWrapper | int | float | str,
+    parent: (
+        ListWrapper | TupleWrapper | MapWrapper | int | float | str | date | datetime
+    ),
     name: str,
     namespace: str,
     metadata: Metadata | None = None,
@@ -368,9 +370,9 @@ def _get_relevant_parent_concepts(arg) -> tuple[list[ConceptRef], bool]:
     return get_concept_arguments(arg), False
 
 
-def get_relevant_parent_concepts(arg):
-    results = _get_relevant_parent_concepts(arg)
-    return results
+def get_relevant_parent_concepts(arg) -> tuple[list[ConceptRef], bool]:
+    concepts, status = _get_relevant_parent_concepts(arg)
+    return unique(concepts, "address"), status
 
 
 def group_function_to_concept(
@@ -626,20 +628,11 @@ def window_item_to_concept(
 
     # when including the order by in discovery grain
     if parent.order_by:
+
         grain_components = parent.over + [bcontent.output]
         for item in parent.order_by:
-            # confirm that it's not just an aggregate at the grain of the stuff we're already keying of of
-            # in which case we can ignore contributions
-            if (
-                isinstance(item.expr, AggregateWrapper)
-                and set([x.address for x in item.expr.by]) == keys
-            ):
-                continue
-            elif isinstance(item.expr, AggregateWrapper):
-
-                grain_components += item.expr.by
-            else:
-                grain_components += item.concept_arguments
+            relevant, _ = get_relevant_parent_concepts(item.expr)
+            grain_components += relevant
     else:
         grain_components = parent.over + [bcontent.output]
 
@@ -842,6 +835,7 @@ def arbitrary_to_concept(
         | int
         | float
         | str
+        | date
     ),
     environment: Environment,
     namespace: str | None = None,

{pytrilogy-0.0.3.71 → pytrilogy-0.0.3.73}/trilogy/parsing/parse_engine.py

@@ -640,6 +640,7 @@ class ParseToObjects(Transformer):
 
     @v_args(meta=True)
     def concept_derivation(self, meta: Meta, args) -> ConceptDerivationStatement:
+
         if len(args) > 3:
             metadata = args[3]
         else:
@@ -733,6 +734,7 @@ class ParseToObjects(Transformer):
 
     @v_args(meta=True)
     def constant_derivation(self, meta: Meta, args) -> Concept:
+
         if len(args) > 3:
             metadata = args[3]
         else:
@@ -1405,6 +1407,7 @@ class ParseToObjects(Transformer):
     def string_lit(self, args) -> str:
         if not args:
             return ""
+
         return args[0]
 
     @v_args(meta=True)
@@ -1890,7 +1893,9 @@ class ParseToObjects(Transformer):
 
     def internal_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])
@@ -1908,6 +1913,10 @@ class ParseToObjects(Transformer):
                 processed = args[0]
             else:
                 raise SyntaxError(f"Invalid cast type {args[1]}")
+            if isinstance(args[1], TraitDataType):
+                return self.function_factory.create_function(
+                    [processed, args[1]], FunctionType.TYPED_CONSTANT, meta
+                )
             return self.function_factory.create_function(
                 [processed], FunctionType.CONSTANT, meta
             )

{pytrilogy-0.0.3.71 → pytrilogy-0.0.3.73}/trilogy/std/net.preql

@@ -5,4 +5,5 @@ type domain string;
 type ip_net_mask string;
 type ipv6_address string;
 type ipv4_address string;
-type suffix string;
+type suffix string;
+type url_image string;