pytrilogy 0.0.3.98__tar.gz → 0.0.3.99__tar.gz

{pytrilogy-0.0.3.98/pytrilogy.egg-info → pytrilogy-0.0.3.99}/PKG-INFO

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

{pytrilogy-0.0.3.98 → pytrilogy-0.0.3.99/pytrilogy.egg-info}/PKG-INFO

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

{pytrilogy-0.0.3.98 → pytrilogy-0.0.3.99}/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.98"
+__version__ = "0.0.3.99"
 
 __all__ = ["parse", "Executor", "Dialects", "Environment", "CONFIG"]

{pytrilogy-0.0.3.98 → pytrilogy-0.0.3.99}/trilogy/core/processing/node_generators/node_merge_node.py

@@ -5,7 +5,7 @@ import networkx as nx
 from networkx.algorithms import approximation as ax
 
 from trilogy.constants import logger
-from trilogy.core.enums import Derivation
+from trilogy.core.enums import Derivation, FunctionType
 from trilogy.core.exceptions import AmbiguousRelationshipResolutionException
 from trilogy.core.graph_models import (
     ReferenceGraph,
@@ -15,6 +15,7 @@ from trilogy.core.graph_models import (
 from trilogy.core.models.build import (
     BuildConcept,
     BuildConditional,
+    BuildFunction,
     BuildGrain,
     BuildWhereClause,
 )
@@ -145,6 +146,7 @@ def reinject_common_join_keys_v2(
 
     ds_graph = prune_and_merge(final, is_ds_node)
     injected = False
+
     for datasource in ds_graph.nodes:
         node1 = G.datasources[datasource]
         neighbors = nx.all_neighbors(ds_graph, datasource)
@@ -159,7 +161,7 @@ def reinject_common_join_keys_v2(
             reduced = BuildGrain.from_concepts(concrete_concepts).components
             existing_addresses = set()
             for concrete in concrete_concepts:
-                logger.info(
+                logger.debug(
                     f"looking at column {concrete.address} with pseudonyms {concrete.pseudonyms}"
                 )
                 cnode = concept_to_node(concrete.with_default_grain())
@@ -171,14 +173,16 @@ def reinject_common_join_keys_v2(
                     continue
                 if concrete.address not in reduced:
                     continue
+                if concrete.address in existing_addresses:
+                    continue
                 # skip anything that is already in the graph pseudonyms
                 if any(x in concrete.pseudonyms for x in existing_addresses):
                     continue
                 cnode = concept_to_node(concrete.with_default_grain())
                 final.add_edge(datasource, cnode)
                 final.add_edge(neighbor, cnode)
-                logger.info(
-                    f"{LOGGER_PREFIX} reinjecting common join key {cnode} between {datasource} and {neighbor}"
+                logger.debug(
+                    f"{LOGGER_PREFIX} reinjecting common join key {cnode} to list {nodelist} between {datasource} and {neighbor}, existing {existing_addresses}"
                 )
                 injected = True
     return injected
@@ -193,6 +197,26 @@ def determine_induced_minimal_nodes(
     synonyms: set[str] = set(),
 ) -> nx.DiGraph | None:
     H: nx.Graph = nx.to_undirected(G).copy()
+
+    # Add weights to edges based on target node's derivation type
+    for edge in G.edges():
+        _, target = edge
+        target_lookup = G.concepts.get(target)
+
+        weight = 1  # default weight
+        # If either node is BASIC, set higher weight
+        if target_lookup and target_lookup.derivation == Derivation.BASIC:
+            if (
+                isinstance(target_lookup.lineage, BuildFunction)
+                and target_lookup.lineage.operator == FunctionType.ATTR_ACCESS
+            ):
+                weight = 1
+            else:
+                # raise SyntaxError(target_lookup.lineage.operator)
+                weight = 50
+
+        H.edges[edge]["weight"] = weight
+
     nodes_to_remove = []
     for node, lookup in G.concepts.items():
         # inclusion of aggregates can create ambiguous node relation chains
@@ -217,27 +241,29 @@ def determine_induced_minimal_nodes(
 
     zero_out = list(x for x in H.nodes if G.out_degree(x) == 0 and x not in nodelist)
     while zero_out:
-        # logger.debug(f"Removing zero out nodes {zero_out} from graph")
+        logger.debug(f"Removing zero out nodes {zero_out} from graph")
         H.remove_nodes_from(zero_out)
         zero_out = list(
             x for x in H.nodes if G.out_degree(x) == 0 and x not in nodelist
         )
     try:
-        paths = nx.multi_source_dijkstra_path(H, nodelist)
-        # logger.debug(f"Paths found for {nodelist}")
-    except nx.exception.NodeNotFound:
-        # logger.debug(f"Unable to find paths for {nodelist}- {str(e)}")
+        # Use weight attribute for Dijkstra pathfinding
+        paths = nx.multi_source_dijkstra_path(H, nodelist, weight="weight")
+        # logger.debug(f"Paths found for {nodelist} {paths}")
+    except nx.exception.NodeNotFound as e:
+        logger.debug(f"Unable to find paths for {nodelist}- {str(e)}")
         return None
     path_removals = list(x for x in H.nodes if x not in paths)
     if path_removals:
         # logger.debug(f"Removing paths {path_removals} from graph")
         H.remove_nodes_from(path_removals)
     # logger.debug(f"Graph after path removal {H.nodes}")
-    sG: nx.Graph = ax.steinertree.steiner_tree(H, nodelist).copy()
+    sG: nx.Graph = ax.steinertree.steiner_tree(H, nodelist, weight="weight").copy()
     if not sG.nodes:
         logger.debug(f"No Steiner tree found for nodes {nodelist}")
         return None
-    # logger.debug(f"Steiner tree found for nodes {nodelist} {sG.nodes}")
+
+    logger.debug(f"Steiner tree found for nodes {nodelist} {sG.nodes}")
     final: nx.DiGraph = nx.subgraph(G, sG.nodes).copy()
 
     for edge in G.edges:
@@ -273,6 +299,7 @@ def determine_induced_minimal_nodes(
         logger.debug(
             f"Skipping graph for initial list {nodelist} as missing nodes {missing} from final graph {final.nodes}"
         )
+
         return None
     logger.debug(f"Found final graph {final.nodes}")
     return final

{pytrilogy-0.0.3.98 → pytrilogy-0.0.3.99}/trilogy/executor.py

@@ -204,6 +204,15 @@ class Executor(object):
         output.append(compiled_sql)
         return output
 
+    @generate_sql.register
+    def _(self, command: ProcessedShowStatement) -> List[str]:
+        output = []
+        for statement in command.output_values:
+            if isinstance(statement, (ProcessedQuery, ProcessedQueryPersist)):
+                compiled_sql = self.generator.compile_statement(statement)
+                output.append(compiled_sql)
+        return output
+
     @generate_sql.register  # type: ignore
     def _(self, command: MultiSelectStatement) -> List[str]:
         output = []

{pytrilogy-0.0.3.98 → pytrilogy-0.0.3.99}/trilogy/parsing/parse_engine.py

@@ -2295,7 +2295,9 @@ def parse_text(
             raise _create_syntax_error(210, pos, text)
 
         # Handle FROM token error
-        parsed_tokens = [x.value for x in e.token_history if x] if e.token_history else []
+        parsed_tokens = (
+            [x.value for x in e.token_history if x] if e.token_history else []
+        )
         if parsed_tokens == ["FROM"]:
             raise _create_syntax_error(101, pos, text)