pytrilogy 0.0.3.84__py3-none-any.whl → 0.0.3.86__py3-none-any.whl

{pytrilogy-0.0.3.84.dist-info → pytrilogy-0.0.3.86.dist-info}/METADATA

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

{pytrilogy-0.0.3.84.dist-info → pytrilogy-0.0.3.86.dist-info}/RECORD

@@ -1,5 +1,5 @@
-pytrilogy-0.0.3.84.dist-info/licenses/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
-trilogy/__init__.py,sha256=b0Bn2iqQWc-ybYMseprmaaiHheIdhoVAhJDfyMQJNkI,303
+pytrilogy-0.0.3.86.dist-info/licenses/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
+trilogy/__init__.py,sha256=5dzQ0vpbEueUVSZmFxf4YBdZiiISnPSLYO_1sIGq8Rs,303
 trilogy/compiler.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/constants.py,sha256=eKb_EJvSqjN9tGbdVEViwdtwwh8fZ3-jpOEDqL71y70,1691
 trilogy/engine.py,sha256=OK2RuqCIUId6yZ5hfF8J1nxGP0AJqHRZiafcowmW0xc,1728
@@ -23,7 +23,7 @@ trilogy/core/optimization.py,sha256=ojpn-p79lr03SSVQbbw74iPCyoYpDYBmj1dbZ3oXCjI,
 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=Xt_TRVl4xHF6fe-KTKPSt4Z8Srmplnv2KQe2grZXX3w,78411
+trilogy/core/models/author.py,sha256=WBrPQh-n7rmKULpJxx0aY1PZAqE2lOKScEttMEuetoc,78263
 trilogy/core/models/build.py,sha256=0TRcL__hvajLcpFwYeLjCV35cow5oVPbJHXA3oO09XA,65931
 trilogy/core/models/build_environment.py,sha256=s_C9xAHuD3yZ26T15pWVBvoqvlp2LdZ8yjsv2_HdXLk,5363
 trilogy/core/models/core.py,sha256=q-8ExAaSB3PoSDX2XOqfZ01HBBvT1pZFs7jGg1vZizc,11096
@@ -41,7 +41,7 @@ trilogy/core/processing/discovery_node_factory.py,sha256=5QVYUsci_h6iYWhS0GCoDow
 trilogy/core/processing/discovery_utility.py,sha256=eY4n7_r6_R-cx_Sm8FiouMXh78v2iO2SGhi0aI5jvDg,4549
 trilogy/core/processing/discovery_validation.py,sha256=eZ4HfHMpqZLI8MGG2jez8arS8THs6ceuVrQFIY6gXrU,5364
 trilogy/core/processing/graph_utils.py,sha256=8QUVrkE9j-9C1AyrCb1nQEh8daCe0u1HuXl-Te85lag,1205
-trilogy/core/processing/utility.py,sha256=I7KgLJc1oLYPZoArMzoYMr-w2y3wv80u2VfVYbBNfkM,22716
+trilogy/core/processing/utility.py,sha256=PGQKZgX58kI3gG4nprY8HRGayc2D8fF5RmbvBhQj8ok,23319
 trilogy/core/processing/node_generators/__init__.py,sha256=iVJ-crowPxYeut-hFjyEjfibKIDq7PfB4LEuDAUCjGY,943
 trilogy/core/processing/node_generators/basic_node.py,sha256=TLZCv4WS196a-0g5xgKuJGthnGP8Ugm46iz85_3NIY4,5626
 trilogy/core/processing/node_generators/common.py,sha256=PdysdroW9DUADP7f5Wv_GKPUyCTROZV1g3L45fawxi8,9443
@@ -82,7 +82,7 @@ trilogy/dialect/bigquery.py,sha256=8xhEu0z_lKANjbvzvBbC7CeKrJf1iP8YyrHqNale-ug,4
 trilogy/dialect/common.py,sha256=tSthIZOXXRPQ4KeMKnDDsH7KlTmf2EVqigVtLyoc4zc,6071
 trilogy/dialect/config.py,sha256=olnyeVU5W5T6b9-dMeNAnvxuPlyc2uefb7FRME094Ec,3834
 trilogy/dialect/dataframe.py,sha256=RUbNgReEa9g3pL6H7fP9lPTrAij5pkqedpZ99D8_5AE,1522
-trilogy/dialect/duckdb.py,sha256=uqnZEd1IH4tO8FSbbUXe3Jl9EjoyrDde406k0VDuMXw,5544
+trilogy/dialect/duckdb.py,sha256=JoUvQ19WvgxoaJkGLM7DPXOd1H0394k3vBiblksQzOI,5631
 trilogy/dialect/enums.py,sha256=FRNYQ5-w-B6-X0yXKNU5g9GowsMlERFogTC5u2nxL_s,4740
 trilogy/dialect/postgres.py,sha256=el2PKwfyvWGk5EZtLudqAH5ewLitY1sFHJiocBSyxyM,3393
 trilogy/dialect/presto.py,sha256=yzSF8SZ6o1dizj1UueAa7S3lR0qNYJdSXbF78EHyhY0,3668
@@ -98,21 +98,21 @@ 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=MXG5nzQWd1tVaJddF_NDst96N_ayALQ0EB3JMh8kWaY,78776
+trilogy/parsing/parse_engine.py,sha256=bIrct01a9_BVqyOBge_T3Nbjou3CTapyZufGa7yvzjg,78898
 trilogy/parsing/render.py,sha256=HSNntD82GiiwHT-TWPLXAaIMWLYVV5B5zQEsgwrHIBE,19605
-trilogy/parsing/trilogy.lark,sha256=B7onP5W7ZIW_uKObJ5rL1sQCpnWiMeZ2azQ9j2U2ssE,15368
+trilogy/parsing/trilogy.lark,sha256=PCcvtvjuadYgUx1dBEuEwjdU4Ey69SBPzs10Pg5BzbU,15388
 trilogy/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/scripts/trilogy.py,sha256=1L0XrH4mVHRt1C9T1HnaDv2_kYEfbWTb5_-cBBke79w,3774
 trilogy/std/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/std/date.preql,sha256=HWZm4t4HWyxr5geWRsY05RnHBVDMci8z8YA2cu0-OOw,188
 trilogy/std/display.preql,sha256=nm7lox87Xf6lBvXCVCS6x2HskguMKzndEBucJ5pktzk,175
-trilogy/std/geography.preql,sha256=qLnHmDU5EnvjTbfqZF-NEclSYM5_e9rZra7QjV01rZ4,582
+trilogy/std/geography.preql,sha256=1A9Sq5PPMBnEPPf7f-rPVYxJfsnWpQ8oV_k4Fm3H2dU,675
 trilogy/std/money.preql,sha256=XWwvAV3WxBsHX9zfptoYRnBigcfYwrYtBHXTME0xJuQ,2082
-trilogy/std/net.preql,sha256=7l7MqIjs6TDCpO6dBAoNJU81Ex255jZRK36kBgE1GDs,158
+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.84.dist-info/METADATA,sha256=geu9WBXvLdcteqUAJuFHuDkeyxc8h7l-t9PgRkk7J4o,9589
-pytrilogy-0.0.3.84.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pytrilogy-0.0.3.84.dist-info/entry_points.txt,sha256=ewBPU2vLnVexZVnB-NrVj-p3E-4vukg83Zk8A55Wp2w,56
-pytrilogy-0.0.3.84.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
-pytrilogy-0.0.3.84.dist-info/RECORD,,
+pytrilogy-0.0.3.86.dist-info/METADATA,sha256=flJ_PrQGqM6Q9oa5UxfFX603fEhG40plDOVqE6yiqg8,9589
+pytrilogy-0.0.3.86.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pytrilogy-0.0.3.86.dist-info/entry_points.txt,sha256=ewBPU2vLnVexZVnB-NrVj-p3E-4vukg83Zk8A55Wp2w,56
+pytrilogy-0.0.3.86.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
+pytrilogy-0.0.3.86.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.84"
+__version__ = "0.0.3.86"
 
 __all__ = ["parse", "Executor", "Dialects", "Environment", "CONFIG"]

trilogy/core/models/author.py

@@ -637,33 +637,31 @@ class Comparison(ConceptArgs, Mergeable, DataTyped, Namespaced, BaseModel):
 
     @model_validator(mode="after")
     def validate_comparison(self):
+        left_type = arg_to_datatype(self.left)
+        right_type = arg_to_datatype(self.right)
         if self.operator in (ComparisonOperator.IS, ComparisonOperator.IS_NOT):
-            if self.right != MagicConstants.NULL and DataType.BOOL != arg_to_datatype(
-                self.right
-            ):
+            if self.right != MagicConstants.NULL and DataType.BOOL != right_type:
                 raise SyntaxError(
                     f"Cannot use {self.operator.value} with non-null or boolean value {self.right}"
                 )
         elif self.operator in (ComparisonOperator.IN, ComparisonOperator.NOT_IN):
-            right_type = arg_to_datatype(self.right)
+
             if isinstance(right_type, ArrayType) and not is_compatible_datatype(
-                arg_to_datatype(self.left), right_type.value_data_type
+                left_type, right_type.value_data_type
             ):
                 raise SyntaxError(
-                    f"Cannot compare {arg_to_datatype(self.left)} and {right_type} with operator {self.operator} in {str(self)}"
+                    f"Cannot compare {left_type} and {right_type} with operator {self.operator} in {str(self)}"
                 )
             elif isinstance(self.right, Concept) and not is_compatible_datatype(
-                arg_to_datatype(self.left), arg_to_datatype(self.right)
+                left_type, right_type
             ):
                 raise SyntaxError(
-                    f"Cannot compare {arg_to_datatype(self.left)} and {arg_to_datatype(self.right)} with operator {self.operator} in {str(self)}"
+                    f"Cannot compare {left_type.name} and {right_type.name} with operator {self.operator} in {str(self)}"
                 )
         else:
-            if not is_compatible_datatype(
-                arg_to_datatype(self.left), arg_to_datatype(self.right)
-            ):
+            if not is_compatible_datatype(left_type, right_type):
                 raise SyntaxError(
-                    f"Cannot compare {arg_to_datatype(self.left)} and {arg_to_datatype(self.right)} of different types with operator {self.operator} in {str(self)}"
+                    f"Cannot compare {left_type.name} ({self.left}) and {right_type.name} ({self.right}) of different types with operator {self.operator.value} in {str(self)}"
                 )
 
         return self

trilogy/core/processing/utility.py

@@ -161,6 +161,9 @@ def resolve_join_order_v2(
                 left_is_partial = any(
                     key in partials.get(left_candidate, []) for key in common
                 )
+                left_is_nullable = any(
+                    key in nullables.get(left_candidate, []) for key in common
+                )
                 right_is_partial = any(key in partials.get(right, []) for key in common)
                 # we don't care if left is nullable for join type (just keys), but if we did
                 # left_is_nullable = any(
@@ -169,21 +172,29 @@ def resolve_join_order_v2(
                 right_is_nullable = any(
                     key in nullables.get(right, []) for key in common
                 )
-                if left_is_partial or right_is_nullable:
+                if left_is_nullable and right_is_nullable:
+                    join_type = JoinType.FULL
+                elif left_is_partial and right_is_partial:
+                    join_type = JoinType.FULL
+                elif left_is_partial:
                     join_type = JoinType.FULL
-                elif right_is_partial:
+                elif right_is_nullable:
+                    join_type = JoinType.RIGHT_OUTER
+                elif right_is_partial or left_is_nullable:
                     join_type = JoinType.LEFT_OUTER
                 # we can't inner join if the left was an outer join
                 else:
                     join_type = JoinType.INNER
+
                 join_types.add(join_type)
                 joinkeys[left_candidate] = common
-
             final_join_type = JoinType.INNER
-            if any([x == JoinType.LEFT_OUTER for x in join_types]):
-                final_join_type = JoinType.LEFT_OUTER
-            elif any([x == JoinType.FULL for x in join_types]):
+            if any([x == JoinType.FULL for x in join_types]):
                 final_join_type = JoinType.FULL
+            elif any([x == JoinType.LEFT_OUTER for x in join_types]):
+                final_join_type = JoinType.LEFT_OUTER
+            elif any([x == JoinType.RIGHT_OUTER for x in join_types]):
+                final_join_type = JoinType.RIGHT_OUTER
             output.append(
                 JoinOrderOutput(
                     # left=left_candidate,
@@ -608,13 +619,12 @@ def find_nullable_concepts(
         local_nullable = [
             x for x in datasources if k in [v.address for v in x.nullable_concepts]
         ]
-        if all(
-            [
-                k in [v.address for v in x.nullable_concepts]
-                for x in datasources
-                if k in [z.address for z in x.output_concepts]
-            ]
-        ):
+        nullable_matches = [
+            k in [v.address for v in x.nullable_concepts]
+            for x in datasources
+            if k in [z.address for z in x.output_concepts]
+        ]
+        if all(nullable_matches) and len(nullable_matches) > 0:
             final_nullable.add(k)
         all_ds = set([ds for ds in local_nullable]).union(nullable_datasources)
         if nullable_datasources:

trilogy/dialect/duckdb.py

@@ -76,6 +76,7 @@ FUNCTION_MAP = {
     FunctionType.DATE: lambda x: f"cast({x[0]} as date)",
     FunctionType.DATE_TRUNCATE: lambda x: f"date_trunc('{x[1]}', {x[0]})",
     FunctionType.DATE_ADD: lambda x: f"date_add({x[0]}, {x[2]} * INTERVAL 1 {x[1]})",
+    FunctionType.DATE_SUB: lambda x: f"date_add({x[0]}, -{x[2]} * INTERVAL 1 {x[1]})",
     FunctionType.DATE_PART: lambda x: f"date_part('{x[1]}', {x[0]})",
     FunctionType.DATE_DIFF: lambda x: f"date_diff('{x[2]}', {x[0]}, {x[1]})",
     FunctionType.CONCAT: lambda x: f"({' || '.join(x)})",

trilogy/parsing/parse_engine.py

@@ -683,7 +683,9 @@ class ParseToObjects(Transformer):
             )
             # 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 (
+            if purpose == Purpose.KEY and concept.purpose != Purpose.KEY:
+                concept.purpose = Purpose.KEY
+            elif (
                 purpose
                 and purpose != Purpose.AUTO
                 and concept.purpose != purpose

trilogy/parsing/trilogy.lark

@@ -367,7 +367,7 @@
     fyear: _YEAR expr ")"
     
     DATE_PART: "DAY"i | "WEEK"i | "MONTH"i | "QUARTER"i | "YEAR"i | "MINUTE"i | "HOUR"i | "SECOND"i | "DAY_OF_WEEK"i
-    _DATE_TRUNC.1: "date_trunc("i
+    _DATE_TRUNC.1: "date_trunc("i | "date_truncate("i
     fdate_trunc: _DATE_TRUNC expr "," DATE_PART ")"
     _DATE_PART.1: "date_part("i
     fdate_part: _DATE_PART expr "," DATE_PART ")"

trilogy/std/geography.preql

@@ -9,10 +9,11 @@ type us_zip_code string; # US ZIP code
 ## generic types
 type latitude float; # Latitude in degrees
 type longitude float; # Longitude in degrees
-type lat_long string; # Latitude and longitude in degrees
+type lat_long string; # Latitude and longitude in degrees, as a coordinate pair
 
 type city string; # City name
-type country string; # Country name
+type country string; # Full Country Name
+type country_code string; # ISO-3166 Country code - ex US, CA, GB
 type timezone string; # Timezone name
 type region string; # Region name
 

trilogy/std/net.preql

@@ -1,9 +1,14 @@
 
+## network types
+type url string; # URL string
+type url_image string; # URL of an image
+type domain string; # Domain name
+type ip_net_mask string; # IP network mask
+type ipv6_address string; # IPv6 address
+type ipv4_address string; # IPv4 address
 
-type url string;
-type domain string;
-type ip_net_mask string;
-type ipv6_address string;
-type ipv4_address string;
-type suffix string;
-type url_image string;
+## communication types
+type email_address string; # Email address, including @
+
+## shared types
+type suffix string; # A file suffix or extension, like .txt, .jpg, etc.