pytrilogy 0.0.2.53__py3-none-any.whl → 0.0.2.55__py3-none-any.whl

{pytrilogy-0.0.2.53.dist-info → pytrilogy-0.0.2.55.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pytrilogy
-Version: 0.0.2.53
+Version: 0.0.2.55
 Summary: Declarative, typed query language that compiles to SQL.
 Home-page: 
 Author: 
@@ -34,7 +34,7 @@ Requires-Dist: snowflake-sqlalchemy; extra == "snowflake"
 
 pytrilogy is an experimental implementation of the Trilogy language, a higher-level SQL that replaces tables/joins with a lightweight semantic binding layer.
 
-Trilogy looks like SQL, but simpler. It's a modern SQL refresh targeted at SQL lovers who want reusability and simplicity with the power and iteratability of SQL. It compiles to SQL - making it easy to debug or integrate into existing workflows - and can be run against any supported SQL backend.  
+Trilogy looks like SQL, but simpler. It's a modern SQL refresh targeted at SQL lovers who want more reusability and composability without losing the expressiveness and iterative value of SQL. It compiles to SQL - making it easy to debug or integrate into existing workflows - and can be run against any supported SQL backend.  
 
 > [!TIP]
 > To get an overview of the language and run interactive examples, head to the [documentation](https://trilogydata.dev/).
@@ -193,11 +193,12 @@ address `bigquery-public-data.usa_names.usa_1910_2013`;
 executor = Dialects.BIGQUERY.default_executor(environment=environment)
 
 results = executor.execute_text(
-'''SELECT
-    name,
-    sum(yearly_name_count) -> name_count 
+'''
 WHERE
     name = 'Elvis'
+SELECT
+    name,
+    sum(yearly_name_count) -> name_count 
 ORDER BY
     name_count desc
 LIMIT 10;
@@ -270,9 +271,11 @@ Please open an issue first to discuss what you would like to change, and then cr
 ## Similar in space
 Trilogy combines two aspects; a semantic layer and a query language. Examples of both are linked below:
 
-Python "semantic layers" are tools for defining data access to a warehouse in a more abstract way.
+"semantic layers" are tools for defining an metadata layer above a SQL/warehouse base to enable higher level abstractions.
 
 - [metricsflow](https://github.com/dbt-labs/metricflow)
+- [cube](https://github.com/cube-js/cube)
+- [zillion](https://github.com/totalhack/zillion)
 
 "Better SQL" has been a popular space. We believe Trilogy takes a different approach then the following,
 but all are worth checking out. Please open PRs/comment for anything missed!
@@ -321,11 +324,14 @@ address <table>;
 Primary acces
 
 ```sql
-select
-    <concept>,
-    <concept>+1 -> <alias>
 WHERE
     <concept> = <value>
+select
+    <concept>,
+    <concept>+1 -> <alias>,
+    ...
+HAVING
+    <alias> = <value2>
 ORDER BY
     <concept> asc|desc
 ;
@@ -337,11 +343,13 @@ Reusable virtual set of rows. Useful for windows, filtering.
 
 ```sql
 with <alias> as
-select
-    <concept>,
-    <concept>+1 -> <alias>
 WHERE
     <concept> = <value>
+select
+    <concept>,
+    <concept>+1 -> <alias>,
+    ...
+
 
 select <alias>.<concept>;
 
@@ -357,6 +365,18 @@ persist <alias> as <table_name> from
 <select>;
 ```
 
+#### COPY
+
+Currently supported target types are <CSV>, though backend support may vary.
+
+```sql
+COPY INTO <TARGET_TYPE> '<target_path>' FROM SELECT
+    <concept>, ...
+ORDER BY
+    <concept>, ...
+;
+```
+
 #### SHOW
 
 Return generated SQL without executing.

{pytrilogy-0.0.2.53.dist-info → pytrilogy-0.0.2.55.dist-info}/RECORD

@@ -1,4 +1,4 @@
-trilogy/__init__.py,sha256=Lk4_BtdYZRgbnCEPlrwMwxuAnk38-h_AXRKbFgToSN8,291
+trilogy/__init__.py,sha256=JnykGbcn-V3aG4x6q9pNpBv7a-8Pr93-61ey6CjNHBA,291
 trilogy/compiler.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/constants.py,sha256=qZ1d0hoKPPV2HHCoFwPYTVB7b6bXjpWvXd3lE-zEhy8,1494
 trilogy/engine.py,sha256=yOPnR7XCjWG82Gym_LLZBkYKKJdLCvqdCyt8zguNcnM,1103
@@ -10,13 +10,13 @@ trilogy/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/core/constants.py,sha256=7XaCpZn5mQmjTobbeBn56SzPWq9eMNDfzfsRU-fP0VE,171
 trilogy/core/enums.py,sha256=6pGjEXNJPB1ngbDQRJjxRi4NmKM8NZQ5-iwnZhrdo5U,7281
 trilogy/core/env_processor.py,sha256=Pt4lmJfbShBbeSe5M7_FrTk5krrOziiAA__Slnettvc,2585
-trilogy/core/environment_helpers.py,sha256=CSmQyEXE6EZ4XFYuQQITUHuWXxXGo9AL4UsTnu0404A,7159
+trilogy/core/environment_helpers.py,sha256=GExsRXghccqKOIiEjkCjtDVDz0PNTE5OSRPFelPa5eU,7279
 trilogy/core/ergonomics.py,sha256=ASLDd0RqKWrZiG3XcKHo8nyTjaB_8xfE9t4NZ1UvGpc,1639
 trilogy/core/exceptions.py,sha256=1c1lQCwSw4_5CQS3q7scOkXU8GQvullJXfPHubprl90,617
 trilogy/core/functions.py,sha256=hDlwLxQUskT9iRcIic1lfACQnxMLNM5ASdHRPi0ghyw,10835
 trilogy/core/graph_models.py,sha256=mameUTiuCajtihDw_2-W218xyJlvTusOWrEKP1yAWgk,2003
 trilogy/core/internal.py,sha256=FQWbuETKPfzjALMmdXJwlOMlESfm2Z5gmErSsq3BX9c,1173
-trilogy/core/models.py,sha256=1d9Li5gQymKDl2U9PWweEYctxgxaKORIggsQhUibefM,162044
+trilogy/core/models.py,sha256=J1s7EAbJIoHseoz1D1iP1sAbEDNt66cinS2VE-zLp7g,161242
 trilogy/core/optimization.py,sha256=Jy3tVJNeqhpK6VSyTvgIWKCao6y-VCZ7mYA69MIF6L0,7989
 trilogy/core/query_processor.py,sha256=V-TqybYO0kCY8O7Nk58OBhb7_eRPs_EqAwaQv-EYLSY,18615
 trilogy/core/optimizations/__init__.py,sha256=EBanqTXEzf1ZEYjAneIWoIcxtMDite5-n2dQ5xcfUtg,356
@@ -30,13 +30,13 @@ trilogy/core/processing/graph_utils.py,sha256=stbYnDxnK-1kbo9L4XNU85FQhWCP-oZYO7
 trilogy/core/processing/utility.py,sha256=STqSHP8fWTVmaIUCfHAb9Hke_fzOG2pTbmWIdYS4cvc,18787
 trilogy/core/processing/node_generators/__init__.py,sha256=s_YV1OYc336DuS9591259qjI_K_CtOCuhkf4t2aOgYs,733
 trilogy/core/processing/node_generators/basic_node.py,sha256=dz7i0BSn4qRv6SBIS_JnVAm09-nkNizoAHrznmqnJXY,3074
-trilogy/core/processing/node_generators/common.py,sha256=2TeYHZzUkLbQh0602IWilLd2yyfoorhc1zAkpTluyHU,9033
-trilogy/core/processing/node_generators/filter_node.py,sha256=NAI5gDQap8ygk905lTuPh6UxoWy--PpChEjgSJl5jKA,7567
+trilogy/core/processing/node_generators/common.py,sha256=dHycWu9iiRxH3WIkkyibsnYD5mJfXvdEOhsTvyaO8fg,9128
+trilogy/core/processing/node_generators/filter_node.py,sha256=zDgPfj-LkjkLKasH6Obftw-ojxVQi1d984nvxwTLPEU,7634
 trilogy/core/processing/node_generators/group_node.py,sha256=k57SVWHSVvTqCd47tyLUGCsSZaP7UQqMCJYTSz1S7oQ,5566
 trilogy/core/processing/node_generators/group_to_node.py,sha256=8ToptIWQoJttquEPrRTMvU33jCJQI-VJxVObN8W8QJk,2511
 trilogy/core/processing/node_generators/multiselect_node.py,sha256=se-cHRYRPskxq2Wq9bw5LkUFSCN1rhk8_05-OTezLz0,6421
 trilogy/core/processing/node_generators/node_merge_node.py,sha256=3GzuiTiorFVe9MyLhoz2PDyI0x9XL7bQ8ucEbV54le8,14627
-trilogy/core/processing/node_generators/rowset_node.py,sha256=cLEfhjQPpnxc1_34j_1A7lmsGcbi89F2cMqDYls4Oh0,5199
+trilogy/core/processing/node_generators/rowset_node.py,sha256=ekrXWFu4ga3VR59Ux870w5gSmzFPC9WjIRuyB4yFqag,5138
 trilogy/core/processing/node_generators/select_merge_node.py,sha256=YW0H81IpE9B6f0SK75QH2DVSfr8d3oA9AbbqP44Jhnc,15746
 trilogy/core/processing/node_generators/select_node.py,sha256=bjTylBa-vYbmzpuSpphmIo_Oi78YZpI8ppHnN9KDYDk,1795
 trilogy/core/processing/node_generators/union_node.py,sha256=MfJjF2m0ARl0oUH9QT1awzPv0e3yA3mXK1XqAvUTgKw,2504
@@ -70,18 +70,18 @@ trilogy/hooks/graph_hook.py,sha256=c-vC-IXoJ_jDmKQjxQyIxyXPOuUcLIURB573gCsAfzQ,2
 trilogy/hooks/query_debugger.py,sha256=FoDh2bu2NiwLusVhKa5El_l8EKaqfET7zn55GP0TkOE,4644
 trilogy/metadata/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/parsing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-trilogy/parsing/common.py,sha256=ZVYF8sOzSa1bkUp7y_fwEmRPfsnVJ2kmbUuUg8TpHRY,12062
+trilogy/parsing/common.py,sha256=iPpnSkiKUtoSTsfrMCHZOexu9H6-eIQznbVsKNEPbT8,12032
 trilogy/parsing/config.py,sha256=Z-DaefdKhPDmSXLgg5V4pebhSB0h590vI0_VtHnlukI,111
 trilogy/parsing/exceptions.py,sha256=92E5i2frv5hj9wxObJZsZqj5T6bglvPzvdvco_vW1Zk,38
 trilogy/parsing/helpers.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-trilogy/parsing/parse_engine.py,sha256=GgImj-mtDHOctDQWC1SDuSANPR0S_nXTJOhmOuHyD5g,69332
-trilogy/parsing/render.py,sha256=5daSXbg3_RUQlHYyqqQQxneLc6NJvEKQ8n6Dm_kW75g,16225
+trilogy/parsing/parse_engine.py,sha256=JGL2qm4L14ytkkB4FiwaXvC1EYJSOK9J0eemi6L94Bw,69222
+trilogy/parsing/render.py,sha256=o4C12a407iZvlRGUJDiuJUezrLLo4QEaLtu60ZQX3gk,16942
 trilogy/parsing/trilogy.lark,sha256=EazfEvYPuvkPkNjUnVzFi0uD9baavugbSI8CyfawShk,12573
 trilogy/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/scripts/trilogy.py,sha256=DQDW81E5mDMWFP8oPw8q-IyrR2JGxQSDWgUWe2VTSRQ,3731
-pytrilogy-0.0.2.53.dist-info/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
-pytrilogy-0.0.2.53.dist-info/METADATA,sha256=V5THusUgv5Bloqno7bceW4wdgvzC_qPHOTfAJou6HMQ,8426
-pytrilogy-0.0.2.53.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-pytrilogy-0.0.2.53.dist-info/entry_points.txt,sha256=0petKryjvvtEfTlbZC1AuMFumH_WQ9v8A19LvoS6G6c,54
-pytrilogy-0.0.2.53.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
-pytrilogy-0.0.2.53.dist-info/RECORD,,
+pytrilogy-0.0.2.55.dist-info/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
+pytrilogy-0.0.2.55.dist-info/METADATA,sha256=FFvNA0mm8yeWHphFZm0-LAIoPu_qbPSSYwTzoXVz1yI,8823
+pytrilogy-0.0.2.55.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+pytrilogy-0.0.2.55.dist-info/entry_points.txt,sha256=0petKryjvvtEfTlbZC1AuMFumH_WQ9v8A19LvoS6G6c,54
+pytrilogy-0.0.2.55.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
+pytrilogy-0.0.2.55.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.2.53"
+__version__ = "0.0.2.55"
 
 __all__ = ["parse", "Executor", "Dialects", "Environment", "CONFIG"]

trilogy/core/environment_helpers.py

@@ -50,7 +50,9 @@ def generate_date_concepts(concept: Concept, environment: Environment):
             lineage=const_function,
             grain=const_function.output_grain,
             namespace=namespace,
-            keys=(concept,),
+            keys=set(
+                concept.address,
+            ),
             metadata=Metadata(
                 description=f"Auto-derived. Integer format. The {ftype.value} derived from {concept.name}, {base_description}",
                 line_number=base_line_number,
@@ -99,7 +101,9 @@ def generate_datetime_concepts(concept: Concept, environment: Environment):
             lineage=const_function,
             grain=const_function.output_grain,
             namespace=namespace,
-            keys=(concept,),
+            keys=set(
+                concept.address,
+            ),
             metadata=Metadata(
                 description=f"Auto-derived. Integer format. The {ftype.value} derived from {concept.name}, {base_description}",
                 line_number=base_line_number,
@@ -139,7 +143,9 @@ def generate_key_concepts(concept: Concept, environment: Environment):
             lineage=const_function,
             grain=const_function.output_grain,
             namespace=namespace,
-            keys=(concept,),
+            keys={
+                concept.address,
+            },
             metadata=Metadata(
                 description=f"Auto-derived. Integer format. The {ftype.value} derived from {concept.name}, {base_description}",
                 line_number=base_line_number,

trilogy/core/models.py

@@ -427,12 +427,15 @@ class Concept(Mergeable, Namespaced, SelectContext, BaseModel):
         ]
     ] = None
     namespace: Optional[str] = Field(default=DEFAULT_NAMESPACE, validate_default=True)
-    keys: Optional[Tuple["Concept", ...]] = None
+    keys: Optional[set[str]] = None
     grain: "Grain" = Field(default=None, validate_default=True)  # type: ignore
     modifiers: List[Modifier] = Field(default_factory=list)  # type: ignore
     pseudonyms: set[str] = Field(default_factory=set)
     _address_cache: str | None = None
 
+    def __init__(self, **data):
+        super().__init__(**data)
+
     def duplicate(self) -> Concept:
         return self.model_copy(deep=True)
 
@@ -480,7 +483,7 @@ class Concept(Mergeable, Namespaced, SelectContext, BaseModel):
             grain=self.grain.with_merge(source, target, modifiers),
             namespace=self.namespace,
             keys=(
-                tuple(x.with_merge(source, target, modifiers) for x in self.keys)
+                set(x if x != source.address else target.address for x in self.keys)
                 if self.keys
                 else None
             ),
@@ -488,17 +491,6 @@ class Concept(Mergeable, Namespaced, SelectContext, BaseModel):
             pseudonyms=self.pseudonyms,
         )
 
-    @field_validator("keys", mode="before")
-    @classmethod
-    def keys_validator(cls, v, info: ValidationInfo):
-        if v is None:
-            return v
-        if not isinstance(v, (list, tuple)):
-            raise ValueError(f"Keys must be a list or tuple, got {type(v)}")
-        if isinstance(v, list):
-            return tuple(v)
-        return v
-
     @field_validator("namespace", mode="plain")
     @classmethod
     def namespace_validation(cls, v):
@@ -610,7 +602,7 @@ class Concept(Mergeable, Namespaced, SelectContext, BaseModel):
                 else namespace
             ),
             keys=(
-                tuple([x.with_namespace(namespace) for x in self.keys])
+                set([address_with_namespace(x, namespace) for x in self.keys])
                 if self.keys
                 else None
             ),
@@ -627,25 +619,17 @@ class Concept(Mergeable, Namespaced, SelectContext, BaseModel):
                 local_concepts=local_concepts, grain=grain, environment=environment
             )
         final_grain = self.grain or grain
-        keys = (
-            tuple(
-                [
-                    x.with_select_context(local_concepts, grain, environment)
-                    for x in self.keys
-                ]
-            )
-            if self.keys
-            else None
-        )
+        keys = self.keys if self.keys else None
         if self.is_aggregate and isinstance(new_lineage, Function):
             grain_components = [environment.concepts[c] for c in grain.components]
             new_lineage = AggregateWrapper(function=new_lineage, by=grain_components)
             final_grain = grain
-            keys = tuple(grain_components)
+            keys = set(grain.components)
         elif (
             self.is_aggregate and not keys and isinstance(new_lineage, AggregateWrapper)
         ):
-            keys = tuple(new_lineage.by)
+            keys = set([x.address for x in new_lineage.by])
+
         return self.__class__(
             name=self.name,
             datatype=self.datatype,
@@ -687,13 +671,10 @@ class Concept(Mergeable, Namespaced, SelectContext, BaseModel):
             if self.lineage:
                 for item in self.lineage.arguments:
                     if isinstance(item, Concept):
-                        if item.keys and not all(c in components for c in item.keys):
-                            components += item.sources
-                        else:
-                            components += item.sources
+                        components += [x.address for x in item.sources]
             # TODO: set synonyms
             grain = Grain(
-                components=set([x.address for x in components]),
+                components=set([x for x in components]),
             )  # synonym_set=generate_concept_synonyms(components))
         elif self.purpose == Purpose.METRIC:
             grain = Grain()
@@ -871,7 +852,7 @@ class Concept(Mergeable, Namespaced, SelectContext, BaseModel):
 
 class ConceptRef(BaseModel):
     address: str
-    line_no: int
+    line_no: int | None = None
 
     def hydrate(self, environment: Environment) -> Concept:
         return environment.concepts.__getitem__(self.address, self.line_no)
@@ -1058,13 +1039,19 @@ class EnvironmentConceptDict(dict):
             if DEFAULT_NAMESPACE + "." + key in self:
                 return self.__getitem__(DEFAULT_NAMESPACE + "." + key, line_no)
             if not self.fail_on_missing:
+                if "." in key:
+                    ns, rest = key.rsplit(".", 1)
+                else:
+                    ns = DEFAULT_NAMESPACE
+                    rest = key
                 if key in self.undefined:
                     return self.undefined[key]
                 undefined = UndefinedConcept(
-                    name=key,
+                    name=rest,
                     line_no=line_no,
                     datatype=DataType.UNKNOWN,
                     purpose=Purpose.UNKNOWN,
+                    namespace=ns,
                 )
                 self.undefined[key] = undefined
                 return undefined
@@ -1365,18 +1352,6 @@ class Function(Mergeable, Namespaced, SelectContext, BaseModel):
             base_grain += input.grain
         return base_grain
 
-    @property
-    def output_keys(self) -> list[Concept]:
-        # aggregates have an abstract grain
-        components = []
-        # scalars have implicit grain of all arguments
-        for input in self.concept_arguments:
-            if input.purpose == Purpose.KEY:
-                components.append(input)
-            elif input.keys:
-                components += input.keys
-        return list(set(components))
-
 
 class ConceptTransform(Namespaced, BaseModel):
     function: Function | FilterItem | WindowItem | AggregateWrapper
@@ -3203,7 +3178,9 @@ class UndefinedConcept(Concept, Mergeable, Namespaced):
             rval = local_concepts[self.address]
             rval = rval.with_select_context(local_concepts, grain, environment)
             return rval
-        environment.concepts.raise_undefined(self.address, line_no=self.line_no)
+        if environment.concepts.fail_on_missing:
+            environment.concepts.raise_undefined(self.address, line_no=self.line_no)
+        return self
 
 
 class EnvironmentDatasourceDict(dict):
@@ -3336,10 +3313,16 @@ class Environment(BaseModel):
 
     @classmethod
     def from_file(cls, path: str | Path) -> "Environment":
+        if isinstance(path, str):
+            path = Path(path)
         with open(path, "r") as f:
             read = f.read()
         return Environment(working_path=Path(path).parent).parse(read)[0]
 
+    @classmethod
+    def from_string(cls, input: str) -> "Environment":
+        return Environment().parse(input)[0]
+
     @classmethod
     def from_cache(cls, path) -> Optional["Environment"]:
         with open(path, "r") as f:
@@ -3645,11 +3628,6 @@ class Environment(BaseModel):
                     self.merge_concept(new_concept, current_concept, [])
                 else:
                     self.add_concept(current_concept, meta=meta, _ignore_cache=True)
-
-            # else:
-            #     self.add_concept(
-            #         current_concept, meta=meta, _ignore_cache=True
-            #     )
         if not _ignore_cache:
             self.gen_concept_list_caches()
         return datasource
@@ -4521,13 +4499,11 @@ class RowsetDerivationStatement(HasUUID, Namespaced, BaseModel):
         # remap everything to the properties of the rowset
         for x in output:
             if x.keys:
-                if all([k.address in orig for k in x.keys]):
-                    x.keys = tuple(
-                        [orig[k.address] if k.address in orig else k for k in x.keys]
-                    )
+                if all([k in orig for k in x.keys]):
+                    x.keys = set([orig[k].address if k in orig else k for k in x.keys])
                 else:
                     # TODO: fix this up
-                    x.keys = tuple()
+                    x.keys = set()
         for x in output:
             if all([c in orig for c in x.grain.components]):
                 x.grain = Grain(

trilogy/core/processing/node_generators/common.py

@@ -26,6 +26,7 @@ def resolve_function_parent_concepts(
     if not isinstance(concept.lineage, (Function, AggregateWrapper)):
         raise ValueError(f"Concept {concept} lineage is not function or aggregate")
     if concept.derivation == PurposeLineage.AGGREGATE:
+        base: list[Concept] = []
         if not concept.grain.abstract:
             base = concept.lineage.concept_arguments + [
                 environment.concepts[c] for c in concept.grain.components
@@ -41,7 +42,7 @@ def resolve_function_parent_concepts(
             extra_property_grain = concept.lineage.concept_arguments
         for x in extra_property_grain:
             if isinstance(x, Concept) and x.purpose == Purpose.PROPERTY and x.keys:
-                base += x.keys
+                base += [environment.concepts[c] for c in x.keys]
         return unique(base, "address")
     # TODO: handle basic lineage chains?
     return unique(concept.lineage.concept_arguments, "address")
@@ -81,7 +82,7 @@ def resolve_filter_parent_concepts(
         and direct_parent.purpose == Purpose.PROPERTY
         and direct_parent.keys
     ):
-        base_rows += direct_parent.keys
+        base_rows += [environment.concepts[c] for c in direct_parent.keys]
     if concept.lineage.where.existence_arguments:
         return (
             concept.lineage.content,
@@ -106,7 +107,7 @@ def gen_property_enrichment_node(
     for x in extra_properties:
         if not x.keys:
             raise SyntaxError(f"Property {x.address} missing keys in lookup")
-        keys = "-".join([y.address for y in x.keys])
+        keys = "-".join([y for y in x.keys])
         required_keys[keys].add(x.address)
     final_nodes = []
     for _k, vs in required_keys.items():

trilogy/core/processing/node_generators/filter_node.py

@@ -138,7 +138,7 @@ def gen_filter_node(
         )
         parent.grain = Grain.from_concepts(
             (
-                list(immediate_parent.keys)
+                [environment.concepts[k] for k in immediate_parent.keys]
                 if immediate_parent.keys
                 else [immediate_parent]
             )
@@ -146,7 +146,8 @@ def gen_filter_node(
                 x
                 for x in local_optional
                 if x.address in [y.address for y in parent.output_concepts]
-            ]
+            ],
+            environment=environment,
         )
         parent.rebuild_cache()
         filter_node = parent

trilogy/core/processing/node_generators/rowset_node.py

@@ -97,7 +97,6 @@ def gen_rowset_node(
     possible_joins = concept_to_relevant_joins(
         [x for x in node.output_concepts if x.derivation != PurposeLineage.ROWSET]
     )
-    logger.info({x.address: x.keys for x in possible_joins})
     if not possible_joins:
         logger.info(
             f"{padding(depth)}{LOGGER_PREFIX} no possible joins for rowset node to get {[x.address for x in local_optional]}; have {[x.address for x in node.output_concepts]}"

trilogy/parsing/common.py

@@ -100,7 +100,7 @@ def process_function_args(
 
 def get_purpose_and_keys(
     purpose: Purpose | None, args: Tuple[Concept, ...] | None
-) -> Tuple[Purpose, Tuple[Concept, ...] | None]:
+) -> Tuple[Purpose, set[str] | None]:
     local_purpose = purpose or function_args_to_output_purpose(args)
     if local_purpose in (Purpose.PROPERTY, Purpose.METRIC) and args:
         keys = concept_list_to_keys(args)
@@ -109,14 +109,14 @@ def get_purpose_and_keys(
     return local_purpose, keys
 
 
-def concept_list_to_keys(concepts: Tuple[Concept, ...]) -> Tuple[Concept, ...]:
-    final_keys: List[Concept] = []
+def concept_list_to_keys(concepts: Tuple[Concept, ...]) -> set[str]:
+    final_keys: List[str] = []
     for concept in concepts:
         if concept.keys:
-            final_keys += concept_list_to_keys(concept.keys)
+            final_keys += list(concept.keys)
         elif concept.purpose != Purpose.PROPERTY:
-            final_keys.append(concept)
-    return tuple(unique(final_keys, "address"))
+            final_keys.append(concept.address)
+    return set(final_keys)
 
 
 def constant_to_concept(
@@ -156,7 +156,7 @@ def concepts_to_grain_concepts(
     final: List[Concept] = []
     for sub in pconcepts:
         if sub.purpose in (Purpose.PROPERTY, Purpose.METRIC) and sub.keys:
-            if any([c.address in pconcepts for c in sub.keys]):
+            if any([c in pconcepts for c in sub.keys]):
                 continue
         if sub.purpose in (Purpose.METRIC,):
             if all([c in pconcepts for c in sub.grain.components]):
@@ -191,13 +191,13 @@ def function_to_concept(
         # if the function will create more rows, we don't know what grain this is at
         grain = None
     modifiers = get_upstream_modifiers(pkeys)
-    key_grain = []
+    key_grain: list[str] = []
     for x in pkeys:
         if x.keys:
             key_grain += [*x.keys]
         else:
-            key_grain.append(x)
-    keys = tuple(concepts_to_grain_concepts(key_grain, environment))
+            key_grain.append(x.address)
+    keys = set(key_grain)
     if not pkeys:
         purpose = Purpose.CONSTANT
     else:
@@ -248,7 +248,9 @@ def filter_item_to_concept(
         keys=(
             parent.content.keys
             if parent.content.purpose == Purpose.PROPERTY
-            else (parent.content,)
+            else {
+                parent.content.address,
+            }
         ),
         grain=(
             parent.content.grain
@@ -320,7 +322,7 @@ def agg_wrapper_to_concept(
         lineage=parent,
         grain=Grain.from_concepts(parent.by) if parent.by else Grain(),
         namespace=namespace,
-        keys=tuple(parent.by) if parent.by else keys,
+        keys=set([x.address for x in parent.by]) if parent.by else keys,
         modifiers=modifiers,
     )
     return out

trilogy/parsing/parse_engine.py

@@ -242,9 +242,11 @@ class ParseToObjects(Transformer):
         self.environment: Environment = environment
         self.parse_address: str = parse_address or SELF_LABEL
         self.token_address: Path | str = token_address or SELF_LABEL
-        self.parsed: dict[str, ParseToObjects] = parsed if parsed else {}
-        self.tokens: dict[Path | str, ParseTree] = tokens or {}
-        self.text_lookup: dict[Path | str, str] = text_lookup or {}
+        self.parsed: dict[str, ParseToObjects] = parsed if parsed is not None else {}
+        self.tokens: dict[Path | str, ParseTree] = tokens if tokens is not None else {}
+        self.text_lookup: dict[Path | str, str] = (
+            text_lookup if text_lookup is not None else {}
+        )
         # we do a second pass to pick up circular dependencies
         # after initial parsing
         self.pass_count = 1
@@ -465,7 +467,7 @@ class ParseToObjects(Transformer):
             metadata=metadata,
             grain=Grain(components={x.address for x in parents}),
             namespace=namespace,
-            keys=parents,
+            keys=set([x.address for x in parents]),
             modifiers=modifiers,
         )
         self.environment.add_concept(concept, meta)
@@ -513,7 +515,8 @@ class ParseToObjects(Transformer):
         # <abc.def,zef.gf>.property pattern
         else:
             keys, name = raw_name
-            namespaces = set([x.namespace for x in keys])
+            keys = [x.address for x in keys]
+            namespaces = set([x.rsplit(".", 1)[0] for x in keys])
             if not len(namespaces) == 1:
                 namespace = self.environment.namespace or DEFAULT_NAMESPACE
             else:
@@ -894,31 +897,31 @@ class ParseToObjects(Transformer):
 
         if cache_lookup in self.parsed:
             nparser = self.parsed[cache_lookup]
+            new_env = nparser.environment
         else:
             try:
                 new_env = Environment(
                     working_path=dirname(target),
                 )
                 new_env.concepts.fail_on_missing = False
+                self.parsed[self.parse_address] = self
                 nparser = ParseToObjects(
                     environment=new_env,
                     parse_address=cache_lookup,
                     token_address=token_lookup,
-                    parsed={**self.parsed, **{self.parse_address: self}},
-                    tokens={**self.tokens, **{token_lookup: raw_tokens}},
-                    text_lookup={**self.text_lookup, **{token_lookup: text}},
+                    parsed=self.parsed,
+                    tokens=self.tokens,
+                    text_lookup=self.text_lookup,
                 )
                 nparser.transform(raw_tokens)
                 self.parsed[cache_lookup] = nparser
-                # add the parsed objects of the import in
-                self.parsed = {**self.parsed, **nparser.parsed}
-                self.tokens = {**self.tokens, **nparser.tokens}
-                self.text_lookup = {**self.text_lookup, **nparser.text_lookup}
             except Exception as e:
-                raise ImportError(f"Unable to import file {target}, parsing error: {e}")
+                raise ImportError(
+                    f"Unable to import file {target}, parsing error: {e}"
+                ) from e
 
         imps = ImportStatement(alias=alias, path=Path(args[0]))
-        self.environment.add_import(alias, nparser.environment, imps)
+        self.environment.add_import(alias, new_env, imps)
         return imps
 
     @v_args(meta=True)
@@ -1026,6 +1029,7 @@ class ParseToObjects(Transformer):
                 having = arg
         if not select_items:
             raise ValueError("Malformed select, missing select items")
+
         output = SelectStatement(
             selection=select_items,
             where_clause=where,
@@ -1056,9 +1060,6 @@ class ParseToObjects(Transformer):
                 grain = Grain.from_concepts(
                     output.output_components, where_clause=output.where_clause
                 )
-            print(
-                f"end pass {parse_pass} grain {grain} from {output.output_components}"
-            )
             output.grain = grain
             for item in select_items:
                 # we don't know the grain of an aggregate at assignment time
@@ -2000,8 +2001,10 @@ def unpack_visit_error(e: VisitError):
             raise InvalidSyntaxException(
                 str(e.orig_exc) + " in " + str(e.rule) + f" Line: {e.obj.meta.line}"
             )
-        raise InvalidSyntaxException(str(e.orig_exc))
-    raise e
+        raise InvalidSyntaxException(str(e.orig_exc)).with_traceback(
+            e.orig_exc.__traceback__
+        )
+    raise e.orig_exc
 
 
 def parse_text_raw(text: str, environment: Optional[Environment] = None):

trilogy/parsing/render.py

@@ -18,6 +18,7 @@ from trilogy.core.models import (
     Concept,
     ConceptDeclarationStatement,
     ConceptDerivation,
+    ConceptRef,
     ConceptTransform,
     Conditional,
     CopyStatement,
@@ -98,17 +99,17 @@ class Renderer:
                 if concept.keys:
                     # avoid duplicate declarations
                     # but we need better composite key support
-                    for key in concept.keys[:1]:
-                        properties[key.name].append(concept)
+                    for key in sorted(list(concept.keys))[:1]:
+                        properties[key].append(concept)
                 else:
                     keys.append(concept)
             else:
                 metrics.append(concept)
 
         output_concepts = constants
-        for key in keys:
-            output_concepts += [key]
-            output_concepts += properties.get(key.name, [])
+        for key_concept in keys:
+            output_concepts += [key_concept]
+            output_concepts += properties.get(key_concept.name, [])
         output_concepts += metrics
 
         rendered_concepts = [
@@ -256,8 +257,18 @@ class Renderer:
             namespace = ""
         if not concept.lineage:
             if concept.purpose == Purpose.PROPERTY and concept.keys:
-                keys = ",".join([self.to_string(key) for key in concept.keys])
-                output = f"{concept.purpose.value} <{keys}>.{namespace}{concept.name} {self.to_string(concept.datatype)};"
+                if len(concept.keys) == 1:
+                    output = f"{concept.purpose.value} {self.to_string(ConceptRef(address=list(concept.keys)[0]))}.{namespace}{concept.name} {self.to_string(concept.datatype)};"
+                else:
+                    keys = ",".join(
+                        sorted(
+                            list(
+                                self.to_string(ConceptRef(address=x))
+                                for x in concept.keys
+                            )
+                        )
+                    )
+                    output = f"{concept.purpose.value} <{keys}>.{namespace}{concept.name} {self.to_string(concept.datatype)};"
             else:
                 output = f"{concept.purpose.value} {namespace}{concept.name} {self.to_string(concept.datatype)};"
         else:
@@ -377,8 +388,16 @@ class Renderer:
 
     @to_string.register
     def _(self, arg: "FilterItem"):
+
         return f"filter {self.to_string(arg.content)} where {self.to_string(arg.where)}"
 
+    @to_string.register
+    def _(self, arg: "ConceptRef"):
+        ns, base = arg.address.rsplit(".", 1)
+        if ns == DEFAULT_NAMESPACE:
+            return base
+        return arg.address
+
     @to_string.register
     def _(self, arg: "ImportStatement"):
         path: str = str(arg.path).replace("\\", ".")