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

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

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

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

@@ -1,4 +1,4 @@
-trilogy/__init__.py,sha256=F1hQYehWwEuev0zPVTmKj-ENkrhagGQG70hi2iXj5jE,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
@@ -16,7 +16,7 @@ trilogy/core/exceptions.py,sha256=1c1lQCwSw4_5CQS3q7scOkXU8GQvullJXfPHubprl90,61
 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=mXB65Ii_kfz0_wVJHdUGw23knYElXn0zzYr8NFMSHT0,161110
+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
@@ -75,13 +75,13 @@ 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=JGL2qm4L14ytkkB4FiwaXvC1EYJSOK9J0eemi6L94Bw,69222
-trilogy/parsing/render.py,sha256=zxZ_QLrPdWJ_tk62KdEBHMVb-_8mAMrV1cgFYz9Yws4,16258
+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.54.dist-info/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
-pytrilogy-0.0.2.54.dist-info/METADATA,sha256=wVMXlxDoGXLRBKmhd-Kh1d75iBITfsJXH6mDHDLqGiA,8823
-pytrilogy-0.0.2.54.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-pytrilogy-0.0.2.54.dist-info/entry_points.txt,sha256=0petKryjvvtEfTlbZC1AuMFumH_WQ9v8A19LvoS6G6c,54
-pytrilogy-0.0.2.54.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
-pytrilogy-0.0.2.54.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.54"
+__version__ = "0.0.2.55"
 
 __all__ = ["parse", "Executor", "Dialects", "Environment", "CONFIG"]

trilogy/core/models.py

@@ -852,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)
@@ -3319,6 +3319,10 @@ class Environment(BaseModel):
             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:

trilogy/parsing/render.py

@@ -18,6 +18,7 @@ from trilogy.core.models import (
     Concept,
     ConceptDeclarationStatement,
     ConceptDerivation,
+    ConceptRef,
     ConceptTransform,
     Conditional,
     CopyStatement,
@@ -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("\\", ".")