pytrilogy 0.0.3.88__py3-none-any.whl → 0.0.3.89__py3-none-any.whl

{pytrilogy-0.0.3.88.dist-info → pytrilogy-0.0.3.89.dist-info}/METADATA

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

{pytrilogy-0.0.3.88.dist-info → pytrilogy-0.0.3.89.dist-info}/RECORD

@@ -1,5 +1,5 @@
-pytrilogy-0.0.3.88.dist-info/licenses/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
-trilogy/__init__.py,sha256=cl4nRewdhba3xQodaj4EqSuH_HCoF56PNkWEO79F_VY,303
+pytrilogy-0.0.3.89.dist-info/licenses/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
+trilogy/__init__.py,sha256=4z9yJ2J3LXCYhlRTHXCrS6JqfhW_hJ2IO2zM6sLdcV4,303
 trilogy/compiler.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/constants.py,sha256=eKb_EJvSqjN9tGbdVEViwdtwwh8fZ3-jpOEDqL71y70,1691
 trilogy/engine.py,sha256=OK2RuqCIUId6yZ5hfF8J1nxGP0AJqHRZiafcowmW0xc,1728
@@ -16,17 +16,17 @@ trilogy/core/env_processor.py,sha256=pFsxnluKIusGKx1z7tTnfsd_xZcPy9pZDungkjkyvI0
 trilogy/core/environment_helpers.py,sha256=VvPIiFemqaLLpIpLIqprfu63K7muZ1YzNg7UZIUph8w,8267
 trilogy/core/ergonomics.py,sha256=e-7gE29vPLFdg0_A1smQ7eOrUwKl5VYdxRSTddHweRA,1631
 trilogy/core/exceptions.py,sha256=jYEduuMehcMkmCpf-OC_taELPZm7qNfeSNzIWkDYScs,707
-trilogy/core/functions.py,sha256=piMv91RiW1OAgDS5W8HIiO6fGleiNXIFW0YnNZgYOWU,32943
+trilogy/core/functions.py,sha256=hnfcNjAD-XQ572vEwuUEAdBf8zKFWYwPeHIpESjUpZs,32928
 trilogy/core/graph_models.py,sha256=BYhJzHKSgnZHVLJs1CfsgrxTPHqKqPNeA64RlozGY0A,3498
 trilogy/core/internal.py,sha256=wFx4e1I0mtx159YFShSXeUBSQ82NINtAbOI-92RX4i8,2151
 trilogy/core/optimization.py,sha256=ojpn-p79lr03SSVQbbw74iPCyoYpDYBmj1dbZ3oXCjI,8860
 trilogy/core/query_processor.py,sha256=5aFgv-2LVM1Uku9cR_tFuTRDwyLnxc95bCMAHeFy2AY,20332
 trilogy/core/utility.py,sha256=3VC13uSQWcZNghgt7Ot0ZTeEmNqs__cx122abVq9qhM,410
 trilogy/core/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-trilogy/core/models/author.py,sha256=5o0x9d3U_J2b8GPdJnMsMruC2P-xiI55lZKWUwRIeGU,78936
+trilogy/core/models/author.py,sha256=wG91OmLZmKXI6K9Kv6VVcpD4l3kzu8kh_miNpGKWCmw,79978
 trilogy/core/models/build.py,sha256=CyrSo4xgU-uDKW3xUVYs5cTk3Z3Z2BMWdGQNHnHZOqU,66127
 trilogy/core/models/build_environment.py,sha256=s_C9xAHuD3yZ26T15pWVBvoqvlp2LdZ8yjsv2_HdXLk,5363
-trilogy/core/models/core.py,sha256=eSzrrscwTrlO_PIn9_UxKSPBgKgR9-xp90LY1e0lhN0,11538
+trilogy/core/models/core.py,sha256=6pWIL0FPMXECwaEwigNuYkN60YlaspSg7JbBnXx1gw0,12038
 trilogy/core/models/datasource.py,sha256=wogTevZ-9CyUW2a8gjzqMCieircxi-J5lkI7EOAZnck,9596
 trilogy/core/models/environment.py,sha256=0IHSCFf5e5b4LPQN3vmjumtfM1iD1tN4WMoUr0UqxZI,27855
 trilogy/core/models/execute.py,sha256=sVWhjwWull-T6pUJizhrYVGCWHY3eZivVN6KNlhcHig,41839
@@ -98,7 +98,7 @@ trilogy/parsing/common.py,sha256=yV1AckK0h8u1OFeGQBTMu-wuW5m63c5CcZuPicsTH_w,306
 trilogy/parsing/config.py,sha256=Z-DaefdKhPDmSXLgg5V4pebhSB0h590vI0_VtHnlukI,111
 trilogy/parsing/exceptions.py,sha256=Xwwsv2C9kSNv2q-HrrKC1f60JNHShXcCMzstTSEbiCw,154
 trilogy/parsing/helpers.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-trilogy/parsing/parse_engine.py,sha256=snT7m7LWrOHcSZlqdJ5HXWmH1wMMPDaqrsf6AQsMx70,79800
+trilogy/parsing/parse_engine.py,sha256=LOvhHZ92s6Tw_spQK8ev4BdVUrzT2QnvzVhkIVHBe_8,79800
 trilogy/parsing/render.py,sha256=HSNntD82GiiwHT-TWPLXAaIMWLYVV5B5zQEsgwrHIBE,19605
 trilogy/parsing/trilogy.lark,sha256=ySzMMLxyPjn74MjFHZxXPTW-jHW68KLPJpiszPvZaO0,15780
 trilogy/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -111,8 +111,8 @@ trilogy/std/money.preql,sha256=XWwvAV3WxBsHX9zfptoYRnBigcfYwrYtBHXTME0xJuQ,2082
 trilogy/std/net.preql,sha256=WZCuvH87_rZntZiuGJMmBDMVKkdhTtxeHOkrXNwJ1EE,416
 trilogy/std/ranking.preql,sha256=LDoZrYyz4g3xsII9XwXfmstZD-_92i1Eox1UqkBIfi8,83
 trilogy/std/report.preql,sha256=LbV-XlHdfw0jgnQ8pV7acG95xrd1-p65fVpiIc-S7W4,202
-pytrilogy-0.0.3.88.dist-info/METADATA,sha256=MJ92RHQZuHjfV6eUuy9Z_F7U3BBt4ilDIzrfkS_kzSg,9589
-pytrilogy-0.0.3.88.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pytrilogy-0.0.3.88.dist-info/entry_points.txt,sha256=ewBPU2vLnVexZVnB-NrVj-p3E-4vukg83Zk8A55Wp2w,56
-pytrilogy-0.0.3.88.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
-pytrilogy-0.0.3.88.dist-info/RECORD,,
+pytrilogy-0.0.3.89.dist-info/METADATA,sha256=i-vj95n5yQ7Bn7RqoD6rSWVUF1mtHv9tzaFH0h8TBvk,9589
+pytrilogy-0.0.3.89.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pytrilogy-0.0.3.89.dist-info/entry_points.txt,sha256=ewBPU2vLnVexZVnB-NrVj-p3E-4vukg83Zk8A55Wp2w,56
+pytrilogy-0.0.3.89.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
+pytrilogy-0.0.3.89.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.3.88"
+__version__ = "0.0.3.89"
 
 __all__ = ["parse", "Executor", "Dialects", "Environment", "CONFIG"]

trilogy/core/functions.py

@@ -92,7 +92,7 @@ def get_attr_datatype(
     lookup = args[1]
     datatype = arg_to_datatype(arg)
     if isinstance(datatype, StructType):
-        return arg_to_datatype(datatype.fields_map[lookup])
+        return datatype.field_types[lookup]
     return datatype
 
 
@@ -935,6 +935,7 @@ class FunctionFactory:
                 output_purpose = Purpose.METRIC
             else:
                 output_purpose = Purpose.PROPERTY
+
         return Function(
             operator=operator,
             arguments=full_args,  # type: ignore

trilogy/core/models/author.py

@@ -172,11 +172,16 @@ class ConceptRef(Addressable, Namespaced, DataTyped, Mergeable, BaseModel):
         for candidate in candidates:
             if not candidate.startswith(f"{source}."):
                 continue
+            attribute = self.address.rsplit(".", 1)[1]
+            dtype = arg_to_datatype(target)
+            if not isinstance(dtype, StructType):
+                continue
+            output_type = dtype.field_types.get(attribute, DataType.UNKNOWN)
             return Function(
                 arguments=[target, self.address.rsplit(".", 1)[1]],
                 operator=FunctionType.ATTR_ACCESS,
                 arg_count=2,
-                output_datatype=arg_to_datatype(target),
+                output_datatype=output_type,
                 output_purpose=Purpose.PROPERTY,
             )
         return self
@@ -1637,6 +1642,9 @@ class Function(DataTyped, ConceptArgs, Mergeable, Namespaced, BaseModel):
     ] = None
     arguments: Sequence[FuncArgs]
 
+    class Config:
+        frozen = True
+
     def __repr__(self):
         return f'{self.operator.value}({",".join([str(a) for a in self.arguments])})'
 
@@ -1647,6 +1655,16 @@ class Function(DataTyped, ConceptArgs, Mergeable, Namespaced, BaseModel):
     def datatype(self):
         return self.output_datatype
 
+    @field_validator("output_datatype")
+    @classmethod
+    def parse_output_datatype(cls, v, info: ValidationInfo):
+        values = info.data
+        if values.get("operator") == FunctionType.ATTR_ACCESS:
+            print(v)
+            if isinstance(v, StructType):
+                raise SyntaxError
+        return v
+
     @field_validator("arguments", mode="before")
     @classmethod
     def parse_arguments(cls, v, info: ValidationInfo):
@@ -1745,8 +1763,16 @@ class Function(DataTyped, ConceptArgs, Mergeable, Namespaced, BaseModel):
         ]
         if self.output_datatype == DataType.UNKNOWN:
             new_output = merge_datatypes([arg_to_datatype(x) for x in nargs])
+
+            if self.operator == FunctionType.ATTR_ACCESS:
+                if isinstance(new_output, StructType):
+                    new_output = new_output.field_types[str(nargs[1])]
         else:
             new_output = self.output_datatype
+        # this is not ideal - see hacky logic for datatypes above
+        # we need to figure out how to patch properly
+        # should use function factory, but does not have environment access
+        # probably move all datatype resolution to build?
         return Function.model_construct(
             operator=self.operator,
             arguments=nargs,

trilogy/core/models/core.py

@@ -244,6 +244,19 @@ class StructType(BaseModel):
     def value(self):
         return self.data_type.value
 
+    @property
+    def field_types(self) -> Dict[str, CONCRETE_TYPES]:
+        out: Dict[str, CONCRETE_TYPES] = {}
+        keys = list(self.fields_map.keys())
+        for idx, field in enumerate(self.fields):
+            if isinstance(field, StructComponent):
+                out[field.name] = arg_to_datatype(field.type)
+            elif isinstance(field, DataTyped):
+                out[keys[idx]] = field.output_datatype
+            else:
+                out[keys[idx]] = field
+        return out
+
     def __hash__(self):
         return hash(str(self))
 

trilogy/parsing/parse_engine.py

@@ -701,6 +701,7 @@ class ParseToObjects(Transformer):
                 environment=self.environment,
                 metadata=metadata,
             )
+
             # let constant purposes exist to support round-tripping
             # as a build concept may end up with a constant based on constant inlining happening recursively
             if purpose == Purpose.KEY and concept.purpose != Purpose.KEY:
@@ -922,7 +923,6 @@ class ParseToObjects(Transformer):
             name=output,
             metadata=metadata,
         )
-
         return ConceptTransform(function=transformation, output=concept)
 
     @v_args(meta=True)