pytrilogy 0.0.3.61__tar.gz → 0.0.3.63__tar.gz

{pytrilogy-0.0.3.61/pytrilogy.egg-info → pytrilogy-0.0.3.63}/PKG-INFO

@@ -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 → pytrilogy-0.0.3.63/pytrilogy.egg-info}/PKG-INFO

@@ -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 → pytrilogy-0.0.3.63}/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"]

{pytrilogy-0.0.3.61 → pytrilogy-0.0.3.63}/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)

{pytrilogy-0.0.3.61 → pytrilogy-0.0.3.63}/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,