pytrilogy 0.0.3.57__tar.gz → 0.0.3.61__tar.gz

{pytrilogy-0.0.3.57/pytrilogy.egg-info → pytrilogy-0.0.3.61}/PKG-INFO

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

{pytrilogy-0.0.3.57 → pytrilogy-0.0.3.61/pytrilogy.egg-info}/PKG-INFO

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

{pytrilogy-0.0.3.57 → pytrilogy-0.0.3.61}/pytrilogy.egg-info/SOURCES.txt

@@ -143,4 +143,5 @@ trilogy/std/display.preql
 trilogy/std/geography.preql
 trilogy/std/money.preql
 trilogy/std/net.preql
+trilogy/std/ranking.preql
 trilogy/std/report.preql

{pytrilogy-0.0.3.57 → pytrilogy-0.0.3.61}/tests/test_imports.py

@@ -52,3 +52,23 @@ def test_import_concept_resolution():
     materialized = basic.materialize_for_select()
     assert "one.two.import_key" in materialized.materialized_concepts
     assert "two.two.import_key" in materialized.materialized_concepts
+
+
+def test_import_basics():
+    basic = Environment(working_path=Path(__file__).parent)
+
+    basic.parse(
+        """
+import test_env;
+
+key id2 int;
+
+
+""",
+    )
+
+    assert len(basic.imports["local"]) == 1, basic.imports
+    importz = basic.imports["local"][0]
+    assert importz.path == Path("test_env")
+    expected = Path(__file__).parent / "test_env.preql"
+    assert importz.input_path == expected

{pytrilogy-0.0.3.57 → pytrilogy-0.0.3.61}/tests/test_models.py

@@ -2,7 +2,7 @@ from copy import deepcopy
 
 from pytest import raises
 
-from trilogy import parse
+from trilogy import Dialects, parse
 from trilogy.core.enums import (
     BooleanOperator,
     ComparisonOperator,
@@ -360,3 +360,81 @@ def test_parenthetical(test_environment: Environment):
 
     merged = x + x
     assert isinstance(merged, Conditional)
+
+
+def test_datasource_grain_application():
+    env, statements = parse(
+        """
+key x string;
+property x.part_1 string;
+property x.part_2 string;
+auto _x <- concat(x.part_1, '.', x.part_2);
+
+merge _x into x;
+
+datasource xes (
+    x:x,
+    )
+grain (x)
+address x_table;
+
+datasource parts (
+    part_1: part_1,
+    part_2:part_2,
+    concat(x.part_1, '.', x.part_2): x
+    )
+grain (part_1, part_2)
+address parts;
+
+
+
+"""
+    )
+
+    test_grain = Grain.from_concepts(
+        concepts=["x", "part_1", "part_2"], environment=env
+    )
+    assert test_grain.components == {
+        "local.x",
+    }
+
+
+def test_datasource_merge_generation():
+    env, statements = parse(
+        """
+key x string;
+property x.part_1 string;
+property x.part_2 string;
+auto _x <- concat(part_1, '.', part_2);
+
+merge _x into x;
+
+datasource xes (
+    x:x,
+    )
+grain (x)
+address x_table;
+
+datasource parts (
+    part_1: part_1,
+    part_2:part_2,
+    concat(part_1, '.', part_2): x
+    )
+grain (part_1, part_2)
+address parts;
+
+
+select x,
+    part_1,
+    part_2
+;
+
+
+"""
+    )
+
+    q = Dialects.DUCK_DB.default_executor(environment=env).generate_sql(statements[-1])[
+        0
+    ]
+
+    assert "JOIN" not in q, q

{pytrilogy-0.0.3.57 → pytrilogy-0.0.3.61}/tests/test_parsing.py

@@ -426,6 +426,19 @@ property id.labels map<string, int>;
     assert env.concepts["labels"].datatype.value_type == DataType.INTEGER
 
 
+def test_map_concept_definition():
+    env, parsed = parse_text(
+        """
+key id int;
+property id.label string;
+key map_store map<id, string>;
+
+"""
+    )
+    assert env.concepts["map_store"].datatype.key_data_type == DataType.INTEGER
+    assert env.concepts["map_store"].datatype.value_data_type == DataType.STRING
+
+
 def test_map_string_access():
     env, parsed = parse_text(
         """

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

{pytrilogy-0.0.3.57 → pytrilogy-0.0.3.61}/trilogy/core/constants.py

@@ -2,3 +2,4 @@ CONSTANT_DATASET: str = "preql_internal_constant_dataset"
 ALL_ROWS_CONCEPT = "all_rows"
 INTERNAL_NAMESPACE = "__preql_internal"
 PERSISTED_CONCEPT_PREFIX = "__pre_persist"
+UNNEST_NAME = "_unnest_alias"

{pytrilogy-0.0.3.57 → pytrilogy-0.0.3.61}/trilogy/core/enums.py

@@ -7,7 +7,9 @@ class UnnestMode(Enum):
     DIRECT = "direct"
     CROSS_APPLY = "cross_apply"
     CROSS_JOIN = "cross_join"
+    CROSS_JOIN_UNNEST = "cross_join_unnest"
     CROSS_JOIN_ALIAS = "cross_join_alias"
+    PRESTO = "presto"
     SNOWFLAKE = "snowflake"
 
 

{pytrilogy-0.0.3.57 → pytrilogy-0.0.3.61}/trilogy/core/models/build.py

@@ -131,7 +131,7 @@ def concept_is_relevant(
     if (
         concept.purpose == Purpose.KEY
         and concept.keys
-        and all([c in others for c in concept.keys])
+        and all([c in others and c != concept.address for c in concept.keys])
     ):
         return False
     if concept.purpose in (Purpose.METRIC,):

{pytrilogy-0.0.3.57 → pytrilogy-0.0.3.61}/trilogy/core/models/core.py

@@ -175,13 +175,17 @@ class ListType(BaseModel):
 
 
 class MapType(BaseModel):
-    key_type: DataType
+    key_type: TYPEDEF_TYPES
     value_type: TYPEDEF_TYPES
 
     @field_validator("value_type", mode="plain")
     def validate_type(cls, v):
         return v
 
+    @field_validator("key_type", mode="plain")
+    def validate_key_type(cls, v):
+        return v
+
     @property
     def data_type(self):
         return DataType.MAP

{pytrilogy-0.0.3.57 → pytrilogy-0.0.3.61}/trilogy/core/models/environment.py

@@ -58,7 +58,9 @@ if TYPE_CHECKING:
 class Import:
     alias: str
     path: Path
-    input_path: str | None = None
+    input_path: Path | None = (
+        None  # filepath where the text came from (path is the import path, but may be resolved from a dictionary for some resolvers)
+    )
 
 
 class BaseImportResolver(BaseModel):

{pytrilogy-0.0.3.57 → pytrilogy-0.0.3.61}/trilogy/core/optimization.py

@@ -52,7 +52,7 @@ def reorder_ctes(
             return input
         return [mapping[x] for x in topological_order]
     except nx.NetworkXUnfeasible as e:
-        print(
+        logger.error(
             "The graph is not a DAG (contains cycles) and cannot be topologically sorted."
         )
         raise e

{pytrilogy-0.0.3.57 → pytrilogy-0.0.3.61}/trilogy/core/processing/discovery_node_factory.py

@@ -373,7 +373,7 @@ class RootNodeHandler:
     ) -> Optional[StrategyNode]:
         logger.info(
             f"{depth_to_prefix(self.ctx.depth)}{LOGGER_PREFIX} "
-            f"Could not resolve root concepts, checking for synonyms"
+            f"Could not resolve root concepts, checking for synonyms for {root_targets}"
         )
 
         if not self.ctx.history.check_started(

{pytrilogy-0.0.3.57 → pytrilogy-0.0.3.61}/trilogy/core/processing/node_generators/basic_node.py

@@ -21,6 +21,8 @@ def is_equivalent_basic_function_lineage(
         y.lineage, BuildFunction
     ):
         return False
+    if x.lineage.operator == y.lineage.operator == FunctionType.ATTR_ACCESS:
+        return x.lineage.concept_arguments == y.lineage.concept_arguments
     if x.lineage.operator == y.lineage.operator:
         return True
     if (
@@ -55,9 +57,14 @@ def gen_basic_node(
             f"{depth_prefix}{LOGGER_PREFIX} checking for synonyms for attribute access"
         )
         for x in local_optional:
+            found = False
             for z in x.pseudonyms:
+                # gate to ensure we don't match to multiple synonyms
+                if found:
+                    continue
                 s_concept = environment.alias_origin_lookup[z]
                 if is_equivalent_basic_function_lineage(concept, s_concept):
+                    found = True
                     synonyms.append(s_concept)
                     ignored_optional.add(x.address)
     equivalent_optional = [
@@ -72,7 +79,11 @@ def gen_basic_node(
             f"{depth_prefix}{LOGGER_PREFIX} basic node for {concept} has equivalent optional {[x.address for x in equivalent_optional]}"
         )
     for eo in equivalent_optional:
-        parent_concepts += resolve_function_parent_concepts(eo, environment=environment)
+        new_parents = resolve_function_parent_concepts(eo, environment=environment)
+        logger.info(
+            f"{depth_prefix}{LOGGER_PREFIX} equivalent optional {eo.address} has parents {[x.address for x in new_parents]}"
+        )
+        parent_concepts += new_parents
     non_equivalent_optional = [
         x
         for x in local_optional

{pytrilogy-0.0.3.57 → pytrilogy-0.0.3.61}/trilogy/core/processing/node_generators/node_merge_node.py

@@ -88,7 +88,10 @@ def determine_induced_minimal_nodes(
     for node in G.nodes:
         if concepts.get(node):
             lookup: BuildConcept = concepts[node]
-            if lookup.derivation in (Derivation.CONSTANT,):
+            # inclusion of aggregates can create ambiguous node relation chains
+            # there may be a better way to handle this
+            # can be revisited if we need to connect a derived synonym based on an aggregate
+            if lookup.derivation in (Derivation.CONSTANT, Derivation.AGGREGATE):
                 nodes_to_remove.append(node)
             # purge a node if we're already looking for all it's parents
             if filter_downstream and lookup.derivation not in (Derivation.ROOT,):
@@ -112,6 +115,7 @@ def determine_induced_minimal_nodes(
         return None
     H.remove_nodes_from(list(x for x in H.nodes if x not in paths))
     sG: nx.Graph = ax.steinertree.steiner_tree(H, nodelist).copy()
+    logger.debug("Steiner tree found for nodes %s", nodelist)
     final: nx.DiGraph = nx.subgraph(G, sG.nodes).copy()
 
     for edge in G.edges:
@@ -228,11 +232,14 @@ def resolve_weak_components(
     # to ensure there are not ambiguous discovery paths
     # (if we did not care about raising ambiguity errors, we could just use the first one)
     count = 0
-    node_list = [
-        concept_to_node(c.with_default_grain())
-        for c in all_concepts
-        if "__preql_internal" not in c.address
-    ]
+    node_list = sorted(
+        [
+            concept_to_node(c.with_default_grain())
+            for c in all_concepts
+            if "__preql_internal" not in c.address
+        ]
+    )
+    logger.debug(f"Resolving weak components for {node_list} in {search_graph.nodes}")
     synonyms: set[str] = set()
     for x in all_concepts:
         synonyms = synonyms.union(x.pseudonyms)
@@ -354,7 +361,7 @@ def subgraphs_to_merge_node(
         parents.append(parent)
     input_c = []
     for x in parents:
-        for y in x.output_concepts:
+        for y in x.usable_outputs:
             input_c.append(y)
     if len(parents) == 1 and enable_early_exit:
         logger.info(
@@ -392,6 +399,7 @@ def gen_merge_node(
         )
     else:
         all_search_concepts = all_concepts
+    all_search_concepts = sorted(all_search_concepts, key=lambda x: x.address)
     for filter_downstream in [True, False]:
         weak_resolve = resolve_weak_components(
             all_search_concepts,

{pytrilogy-0.0.3.57 → pytrilogy-0.0.3.61}/trilogy/core/processing/node_generators/synonym_node.py

@@ -64,6 +64,5 @@ def gen_synonym_node(
         )
         if attempt:
             logger.info(f"{local_prefix} found inputs with {combo}")
-            print(attempt.output_concepts)
             return attempt
     return None

{pytrilogy-0.0.3.57 → pytrilogy-0.0.3.61}/trilogy/core/processing/node_generators/unnest_node.py

@@ -31,7 +31,7 @@ def gen_unnest_node(
     ]
     all_parents = arguments + non_equivalent_optional
     logger.info(
-        f"{depth_prefix}{LOGGER_PREFIX} unnest node for {concept} with lineage {concept.lineage} has parents {all_parents} and equivalent optional {equivalent_optional}"
+        f"{depth_prefix}{LOGGER_PREFIX} unnest node for {concept} with lineage {concept.lineage} has parents + optional {all_parents} and equivalent optional {equivalent_optional}"
     )
     if arguments or local_optional:
         parent = source_concepts(

{pytrilogy-0.0.3.57 → pytrilogy-0.0.3.61}/trilogy/dialect/base.py

@@ -10,6 +10,7 @@ from trilogy.constants import (
     Rendering,
     logger,
 )
+from trilogy.core.constants import UNNEST_NAME
 from trilogy.core.enums import (
     DatePart,
     FunctionType,
@@ -756,6 +757,16 @@ class BaseDialect:
                 f"{self.QUOTE_CHARACTER}{c.safe_address}{self.QUOTE_CHARACTER}"
                 for c in cte.join_derived_concepts
             ]
+        elif self.UNNEST_MODE in (UnnestMode.CROSS_JOIN_UNNEST, UnnestMode.PRESTO):
+            select_columns = [
+                self.render_concept_sql(c, cte)
+                for c in cte.output_columns
+                if c.address not in [y.address for y in cte.join_derived_concepts]
+                and c.address not in cte.hidden_concepts
+            ] + [
+                f"{UNNEST_NAME} as {self.QUOTE_CHARACTER}{c.safe_address}{self.QUOTE_CHARACTER}"
+                for c in cte.join_derived_concepts
+            ]
         else:
             # otherwse, assume we are unnesting directly in the select
             select_columns = [
@@ -770,11 +781,20 @@ class BaseDialect:
             if len(cte.joins) > 0:
                 if cte.join_derived_concepts and self.UNNEST_MODE in (
                     UnnestMode.CROSS_JOIN_ALIAS,
+                    # UnnestMode.CROSS_JOIN_UNNEST,
                     UnnestMode.CROSS_JOIN,
                     UnnestMode.CROSS_APPLY,
                 ):
 
                     source = f"{render_unnest(self.UNNEST_MODE, self.QUOTE_CHARACTER, cte.join_derived_concepts[0], self.render_expr, cte)}"
+                elif cte.join_derived_concepts and self.UNNEST_MODE in (
+                    UnnestMode.CROSS_JOIN_UNNEST,
+                ):
+                    source = f"{self.render_expr(cte.join_derived_concepts[0], cte)} as {self.QUOTE_CHARACTER}{UNNEST_NAME}{self.QUOTE_CHARACTER}"
+                elif cte.join_derived_concepts and self.UNNEST_MODE in (
+                    UnnestMode.PRESTO,
+                ):
+                    source = f"{self.render_expr(cte.join_derived_concepts[0], cte)} as t({self.QUOTE_CHARACTER}{UNNEST_NAME}{self.QUOTE_CHARACTER})"
                 elif (
                     cte.join_derived_concepts
                     and self.UNNEST_MODE == UnnestMode.SNOWFLAKE

{pytrilogy-0.0.3.57 → pytrilogy-0.0.3.61}/trilogy/dialect/bigquery.py

@@ -22,7 +22,7 @@ FUNCTION_MAP = {
     FunctionType.MINUTE: lambda x: f"EXTRACT(MINUTE from {x[0]})",
     FunctionType.SECOND: lambda x: f"EXTRACT(SECOND from {x[0]})",
     FunctionType.HOUR: lambda x: f"EXTRACT(HOUR from {x[0]})",
-    FunctionType.DAY_OF_WEEK: lambda x: f"EXTRACT(DAYOFWEEK from {x[0]})",
+    FunctionType.DAY_OF_WEEK: lambda x: f"EXTRACT(DAYOFWEEK from {x[0]})-1",  # BigQuery's DAYOFWEEK returns 1 for Sunday
     FunctionType.DAY: lambda x: f"EXTRACT(DAY from {x[0]})",
     FunctionType.YEAR: lambda x: f"EXTRACT(YEAR from {x[0]})",
     FunctionType.MONTH: lambda x: f"EXTRACT(MONTH from {x[0]})",
@@ -97,5 +97,5 @@ class BigqueryDialect(BaseDialect):
     }
     QUOTE_CHARACTER = "`"
     SQL_TEMPLATE = BQ_SQL_TEMPLATE
-    UNNEST_MODE = UnnestMode.CROSS_JOIN
+    UNNEST_MODE = UnnestMode.CROSS_JOIN_UNNEST
     DATATYPE_MAP = DATATYPE_MAP

{pytrilogy-0.0.3.57 → pytrilogy-0.0.3.61}/trilogy/dialect/common.py

@@ -1,5 +1,6 @@
 from typing import Callable
 
+from trilogy.core.constants import UNNEST_NAME
 from trilogy.core.enums import Modifier, UnnestMode
 from trilogy.core.models.build import (
     BuildComparison,
@@ -34,11 +35,15 @@ def render_unnest(
     cte: CTE,
 ):
     if not isinstance(concept, (BuildConcept, BuildParamaterizedConceptReference)):
-        address = "anon_function"
+        address = UNNEST_NAME
     else:
         address = concept.safe_address
     if unnest_mode == UnnestMode.CROSS_JOIN:
         return f"{render_func(concept, cte)} as {quote_character}{address}{quote_character}"
+    elif unnest_mode == UnnestMode.CROSS_JOIN_UNNEST:
+        return f"unnest({render_func(concept, cte)}) as {quote_character}{address}{quote_character}"
+    elif unnest_mode == UnnestMode.PRESTO:
+        return f"unnest({render_func(concept, cte)}) as t({quote_character}{UNNEST_NAME}{quote_character})"
     elif unnest_mode == UnnestMode.CROSS_JOIN_ALIAS:
         return f"{render_func(concept, cte)} as unnest_wrapper ({quote_character}{address}{quote_character})"
     elif unnest_mode == UnnestMode.SNOWFLAKE:
@@ -95,9 +100,12 @@ def render_join(
             return None
         if not cte:
             raise ValueError("must provide a cte to build an unnest joins")
-        if unnest_mode == UnnestMode.CROSS_JOIN:
-            return f"CROSS JOIN {render_unnest(unnest_mode, quote_character, join.object_to_unnest, render_expr_func, cte)}"
-        if unnest_mode == UnnestMode.CROSS_JOIN_ALIAS:
+        if unnest_mode in (
+            UnnestMode.CROSS_JOIN,
+            UnnestMode.CROSS_JOIN_UNNEST,
+            UnnestMode.CROSS_JOIN_ALIAS,
+            UnnestMode.PRESTO,
+        ):
             return f"CROSS JOIN {render_unnest(unnest_mode, quote_character, join.object_to_unnest, render_expr_func, cte)}"
         if unnest_mode == UnnestMode.SNOWFLAKE:
             return f"LEFT JOIN LATERAL {render_unnest(unnest_mode, quote_character, join.object_to_unnest, render_expr_func, cte)}"

{pytrilogy-0.0.3.57 → pytrilogy-0.0.3.61}/trilogy/dialect/presto.py

@@ -33,6 +33,8 @@ FUNCTION_MAP = {
     FunctionType.CURRENT_DATE: lambda x: "CURRENT_DATE",
     FunctionType.CURRENT_DATETIME: lambda x: "CURRENT_TIMESTAMP",
     FunctionType.ARRAY: lambda x: f"ARRAY[{', '.join(x)}]",
+    # regex
+    FunctionType.REGEXP_CONTAINS: lambda x: f"REGEXP_LIKE({x[0]}, {x[1]})",
 }
 
 FUNCTION_GRAIN_MATCH_MAP = {
@@ -85,8 +87,12 @@ class PrestoDialect(BaseDialect):
     }
     QUOTE_CHARACTER = '"'
     SQL_TEMPLATE = SQL_TEMPLATE
-    DATATYPE_MAP = {**BaseDialect.DATATYPE_MAP, DataType.NUMERIC: "DECIMAL"}
-    UNNEST_MODE = UnnestMode.CROSS_JOIN_ALIAS
+    DATATYPE_MAP = {
+        **BaseDialect.DATATYPE_MAP,
+        DataType.NUMERIC: "DECIMAL",
+        DataType.STRING: "VARCHAR",
+    }
+    UNNEST_MODE = UnnestMode.PRESTO
 
 
 class TrinoDialect(PrestoDialect):

{pytrilogy-0.0.3.57 → pytrilogy-0.0.3.61}/trilogy/parsing/common.py

@@ -38,6 +38,7 @@ from trilogy.core.models.author import (
     Parenthetical,
     RowsetItem,
     RowsetLineage,
+    TraitDataType,
     UndefinedConcept,
     WhereClause,
     WindowItem,
@@ -608,6 +609,9 @@ def window_item_to_concept(
                 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
     else:
@@ -617,19 +621,20 @@ def window_item_to_concept(
     modifiers = get_upstream_modifiers(bcontent.concept_arguments, environment)
     datatype = parent.content.datatype
     if parent.type in (
-        WindowType.RANK,
+        # WindowType.RANK,
         WindowType.ROW_NUMBER,
         WindowType.COUNT,
         WindowType.COUNT_DISTINCT,
     ):
         datatype = DataType.INTEGER
+    if parent.type == WindowType.RANK:
+        datatype = TraitDataType(type=DataType.INTEGER, traits=["rank"])
     return Concept(
         name=name,
         datatype=datatype,
         purpose=local_purpose,
         lineage=parent,
         metadata=fmetadata,
-        # filters are implicitly at the grain of the base item
         grain=final_grain,
         namespace=namespace,
         keys=keys,

{pytrilogy-0.0.3.57 → pytrilogy-0.0.3.61}/trilogy/parsing/parse_engine.py

@@ -460,13 +460,22 @@ class ParseToObjects(Transformer):
         )
 
     def list_type(self, args) -> ListType:
-        return ListType(type=args[0])
+        content = args[0]
+        if isinstance(content, str):
+            content = self.environment.concepts[content]
+        return ListType(type=content)
 
     def numeric_type(self, args) -> NumericType:
         return NumericType(precision=args[0], scale=args[1])
 
     def map_type(self, args) -> MapType:
-        return MapType(key_type=args[0], value_type=args[1])
+        key = args[0]
+        value = args[1]
+        if isinstance(key, str):
+            key = self.environment.concepts[key]
+        elif isinstance(value, str):
+            value = self.environment.concepts[value]
+        return MapType(key_type=key, value_type=value)
 
     @v_args(meta=True)
     def data_type(
@@ -842,6 +851,17 @@ class ParseToObjects(Transformer):
                     continue
 
                 key_inputs = grain.components
+                eligible = True
+                for key in key_inputs:
+                    # never overwrite a key with a dependency on a property
+                    # for example - binding a datasource with a grain of <x>.fun should
+                    # never override the grain of x to <fun>
+                    if column.concept.address in (
+                        self.environment.concepts[key].keys or set()
+                    ):
+                        eligible = False
+                if not eligible:
+                    continue
                 keys = [self.environment.concepts[grain] for grain in key_inputs]
                 # target_c.purpose = Purpose.PROPERTY
                 target_c.keys = set([x.address for x in keys])
@@ -1030,6 +1050,9 @@ class ParseToObjects(Transformer):
 
     def import_statement(self, args: list[str]) -> ImportStatement:
         start = datetime.now()
+        is_file_resolver = isinstance(
+            self.environment.config.import_resolver, FileSystemImportResolver
+        )
         if len(args) == 2:
             alias = args[-1]
             cache_key = args[-1]
@@ -1043,9 +1066,7 @@ class ParseToObjects(Transformer):
             is_stdlib = True
             target = join(STDLIB_ROOT, *path) + ".preql"
             token_lookup: Path | str = Path(target)
-        elif isinstance(
-            self.environment.config.import_resolver, FileSystemImportResolver
-        ):
+        elif is_file_resolver:
             target = join(self.environment.working_path, *path) + ".preql"
             # tokens + text are cached by path
             token_lookup = Path(target)
@@ -1125,7 +1146,13 @@ class ParseToObjects(Transformer):
         imps = ImportStatement(alias=alias, input_path=input_path, path=parsed_path)
 
         self.environment.add_import(
-            alias, new_env, Import(alias=alias, path=parsed_path)
+            alias,
+            new_env,
+            Import(
+                alias=alias,
+                path=parsed_path,
+                input_path=Path(target) if is_file_resolver else None,
+            ),
         )
         end = datetime.now()
         perf_logger.debug(
@@ -1677,6 +1704,7 @@ class ParseToObjects(Transformer):
 
     @v_args(meta=True)
     def unnest(self, meta, args):
+
         return self.function_factory.create_function(args, FunctionType.UNNEST, meta)
 
     @v_args(meta=True)

{pytrilogy-0.0.3.57 → pytrilogy-0.0.3.61}/trilogy/parsing/render.py

@@ -31,6 +31,7 @@ from trilogy.core.models.core import (
     DataType,
     ListType,
     ListWrapper,
+    MapWrapper,
     NumericType,
     TraitDataType,
     TupleWrapper,
@@ -250,6 +251,17 @@ class Renderer:
     def _(self, arg: TupleWrapper):
         return "(" + ", ".join([self.to_string(x) for x in arg]) + ")"
 
+    @to_string.register
+    def _(self, arg: MapWrapper):
+        def process_key_value(key, value):
+            return f"{self.to_string(key)}: {self.to_string(value)}"
+
+        return (
+            "{"
+            + ", ".join([process_key_value(key, value) for key, value in arg.items()])
+            + "}"
+        )
+
     @to_string.register
     def _(self, arg: DatePart):
         return arg.value

{pytrilogy-0.0.3.57 → pytrilogy-0.0.3.61}/trilogy/parsing/trilogy.lark

@@ -402,11 +402,11 @@
 
     struct_type: "struct"i "<" ((data_type | IDENTIFIER) ",")* (data_type | IDENTIFIER) ","? ">" 
 
-    list_type: ("list"i "<" data_type ">" ) | ("array"i "<" data_type ">" )
+    list_type: ("list"i | "array"i) "<" (data_type | IDENTIFIER) ">" 
 
     numeric_type: "numeric"i "(" int_lit "," int_lit ")"
 
-    map_type: "map"i "<" data_type "," data_type ">"
+    map_type: "map"i "<" (data_type | IDENTIFIER) "," (data_type | IDENTIFIER) ">"
 
     !data_type:  ("string"i | "number"i | "numeric"i | "map"i | "list"i | "array"i | "any"i | "int"i | "bigint"i | "date"i | "datetime"i | "timestamp"i | "float"i | "bool"i | numeric_type | map_type | struct_type | list_type) ("::" IDENTIFIER)?
     

{pytrilogy-0.0.3.57 → pytrilogy-0.0.3.61}/trilogy/std/date.preql

@@ -2,9 +2,12 @@
 
 type year int;
 type month int;
+type month_name string;
 type week int;
 type day int;
 type hour int;
 type minute int;
 type second int;
-type day_of_week int;
+type day_of_week int;
+type day_of_week_name string;
+

pytrilogy-0.0.3.61/trilogy/std/ranking.preql

@@ -0,0 +1,6 @@
+
+type rank int;
+type score int;
+type position int;
+type index int;
+type grade int;