pytrilogy 0.0.3.61__py3-none-any.whl → 0.0.3.63__py3-none-any.whl

{pytrilogy-0.0.3.61.dist-info → pytrilogy-0.0.3.63.dist-info}/METADATA

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

{pytrilogy-0.0.3.61.dist-info → pytrilogy-0.0.3.63.dist-info}/RECORD

@@ -1,5 +1,5 @@
-pytrilogy-0.0.3.61.dist-info/licenses/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
-trilogy/__init__.py,sha256=6pE1HEb6lBSW2ODExpQU2E4nDuvhlPqat8goqgVFph4,303
+pytrilogy-0.0.3.63.dist-info/licenses/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
+trilogy/__init__.py,sha256=xI7eP5BeauF-VTS4qQZOvUQEsrA4bRoiDjyUkW0jbZk,303
 trilogy/compiler.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/constants.py,sha256=lv_aJWP6dn6e2aF4BAE72jbnNtceFddfqtiDSsvzno0,1692
 trilogy/engine.py,sha256=OK2RuqCIUId6yZ5hfF8J1nxGP0AJqHRZiafcowmW0xc,1728
@@ -43,7 +43,7 @@ trilogy/core/processing/discovery_validation.py,sha256=Ek9jviFgimLMUMYLXBChUQmOD
 trilogy/core/processing/graph_utils.py,sha256=8QUVrkE9j-9C1AyrCb1nQEh8daCe0u1HuXl-Te85lag,1205
 trilogy/core/processing/utility.py,sha256=mrfR9pgek-xjxoDQSlvPqOW9dpmREjgzqn4AGoqpGeM,22774
 trilogy/core/processing/node_generators/__init__.py,sha256=w8TQQgNhyAra6JQHdg1_Ags4BGyxjXYruu6UeC5yOkI,873
-trilogy/core/processing/node_generators/basic_node.py,sha256=8NtHZ99mJhJwDIib3xlcrn7oWmE42HHKuBpnwXIzpyo,4861
+trilogy/core/processing/node_generators/basic_node.py,sha256=luN8LftafZepoFgDRv4gmvEGFlOI2j0icJ5fz4UT7uo,5165
 trilogy/core/processing/node_generators/common.py,sha256=PdysdroW9DUADP7f5Wv_GKPUyCTROZV1g3L45fawxi8,9443
 trilogy/core/processing/node_generators/filter_node.py,sha256=0hdfiS2I-Jvr6P-il3jnAJK-g-DMG7_cFbZGCnLnJAo,10032
 trilogy/core/processing/node_generators/group_node.py,sha256=nIfiMrJQEksUfqAeeA3X5PS1343y4lmPTipYuCa-rvs,6141
@@ -54,7 +54,7 @@ trilogy/core/processing/node_generators/recursive_node.py,sha256=l5zdh0dURKwmAy8
 trilogy/core/processing/node_generators/rowset_node.py,sha256=2BiSsegbRF9csJ_Xl8P_CxIm4dAAb7dF29u6v_Odr-A,6709
 trilogy/core/processing/node_generators/select_merge_node.py,sha256=lxXhMhDKGbu67QFNbbAT-BO8gbWppIvjn_hAXpLEPe0,19953
 trilogy/core/processing/node_generators/select_node.py,sha256=3dvw0d53eUtCRCUPN6J48I3qBEX1Wha7saQ_ndPu6_I,1777
-trilogy/core/processing/node_generators/synonym_node.py,sha256=BNfdwTunCerIzm7YLISI_XcfxxUzWLrZrRvZvayScSk,2257
+trilogy/core/processing/node_generators/synonym_node.py,sha256=QNAMUknGPKRXkh5M_cQrff3b5B68KNcLxt1WHs8wBy4,3496
 trilogy/core/processing/node_generators/union_node.py,sha256=VNo6Oey4p8etU9xrOh2oTT2lIOTvY6PULUPRvVa2uxU,2877
 trilogy/core/processing/node_generators/unnest_node.py,sha256=ueOQtoTf2iJHO09RzWHDFQ5iKZq2fVhGf2KAF2U2kU8,2677
 trilogy/core/processing/node_generators/window_node.py,sha256=GP3Hvkbb0TDA6ef7W7bmvQEHVH-NRIfBT_0W4fcH3g4,6529
@@ -110,8 +110,8 @@ trilogy/std/money.preql,sha256=XWwvAV3WxBsHX9zfptoYRnBigcfYwrYtBHXTME0xJuQ,2082
 trilogy/std/net.preql,sha256=-bMV6dyofskl4Kvows-iQ4JCxjVUwsZOeWCy8JO5Ftw,135
 trilogy/std/ranking.preql,sha256=LDoZrYyz4g3xsII9XwXfmstZD-_92i1Eox1UqkBIfi8,83
 trilogy/std/report.preql,sha256=LbV-XlHdfw0jgnQ8pV7acG95xrd1-p65fVpiIc-S7W4,202
-pytrilogy-0.0.3.61.dist-info/METADATA,sha256=rXq2NHO2bCO_JhPw5mu8Xj2lEOHcnX73fENl0m7-P2s,9095
-pytrilogy-0.0.3.61.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pytrilogy-0.0.3.61.dist-info/entry_points.txt,sha256=ewBPU2vLnVexZVnB-NrVj-p3E-4vukg83Zk8A55Wp2w,56
-pytrilogy-0.0.3.61.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
-pytrilogy-0.0.3.61.dist-info/RECORD,,
+pytrilogy-0.0.3.63.dist-info/METADATA,sha256=_iY3_JWL-W2VdevN6O37KO4VTlRsftF8w2n3Qqk9fxw,9095
+pytrilogy-0.0.3.63.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pytrilogy-0.0.3.63.dist-info/entry_points.txt,sha256=ewBPU2vLnVexZVnB-NrVj-p3E-4vukg83Zk8A55Wp2w,56
+pytrilogy-0.0.3.63.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
+pytrilogy-0.0.3.63.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.61"
+__version__ = "0.0.3.63"
 
 __all__ = ["parse", "Executor", "Dialects", "Environment", "CONFIG"]

trilogy/core/processing/node_generators/basic_node.py

@@ -52,6 +52,9 @@ def gen_basic_node(
     synonyms: list[BuildConcept] = []
     ignored_optional: set[str] = set()
     assert isinstance(concept.lineage, BuildFunction)
+    # when we are getting an attribute, if there is anything else
+    # that is an attribute of the same struct in local optional
+    # select that value for discovery as well
     if concept.lineage.operator == FunctionType.ATTR_ACCESS:
         logger.info(
             f"{depth_prefix}{LOGGER_PREFIX} checking for synonyms for attribute access"
@@ -62,7 +65,10 @@ def gen_basic_node(
                 # gate to ensure we don't match to multiple synonyms
                 if found:
                     continue
-                s_concept = environment.alias_origin_lookup[z]
+                if z in environment.concepts:
+                    s_concept = environment.concepts[z]
+                else:
+                    s_concept = environment.alias_origin_lookup[z]
                 if is_equivalent_basic_function_lineage(concept, s_concept):
                     found = True
                     synonyms.append(s_concept)

trilogy/core/processing/node_generators/synonym_node.py

@@ -43,16 +43,45 @@ def gen_synonym_node(
             elif y in environment.concepts:
                 synonyms[x.address].append(environment.concepts[y])
                 synonym_count += 1
+    for address in synonyms:
+        synonyms[address].sort(key=lambda obj: obj.address)
     if synonym_count == 0:
         return None
 
     logger.info(f"{local_prefix} Generating Synonym Node with {len(synonyms)} synonyms")
+    sorted_keys = sorted(synonyms.keys())
+    combinations_list = list(itertools.product(*(synonyms[obj] for obj in sorted_keys)))
 
-    combinations = itertools.product(*(synonyms[obj] for obj in synonyms.keys()))
-    for combo in combinations:
+    def similarity_sort_key(combo):
+        addresses = [x.address for x in combo]
+
+        # Calculate similarity score - count how many pairs share prefixes
+        similarity_score = 0
+        for i in range(len(addresses)):
+            for j in range(i + 1, len(addresses)):
+                # Find common prefix length
+                addr1_parts = addresses[i].split(".")
+                addr2_parts = addresses[j].split(".")
+                common_prefix_len = 0
+                for k in range(min(len(addr1_parts), len(addr2_parts))):
+                    if addr1_parts[k] == addr2_parts[k]:
+                        common_prefix_len += 1
+                    else:
+                        break
+                similarity_score += common_prefix_len
+
+        # Sort by similarity (descending), then by addresses (ascending) for ties
+        return (-similarity_score, addresses)
+
+    combinations_list.sort(key=similarity_sort_key)
+    logger.info(combinations_list)
+    for combo in combinations_list:
         fingerprint = tuple([x.address for x in combo])
         if fingerprint == base_fingerprint:
             continue
+        logger.info(
+            f"{local_prefix} checking combination {fingerprint} with {len(combo)} concepts"
+        )
         attempt: StrategyNode | None = source_concepts(
             combo,
             history=history,