pytrilogy 0.0.3.110__tar.gz → 0.0.3.112__tar.gz

{pytrilogy-0.0.3.110/pytrilogy.egg-info → pytrilogy-0.0.3.112}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytrilogy
-Version: 0.0.3.110
+Version: 0.0.3.112
 Summary: Declarative, typed query language that compiles to SQL.
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3

{pytrilogy-0.0.3.110 → pytrilogy-0.0.3.112/pytrilogy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytrilogy
-Version: 0.0.3.110
+Version: 0.0.3.112
 Summary: Declarative, typed query language that compiles to SQL.
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3

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

{pytrilogy-0.0.3.110 → pytrilogy-0.0.3.112}/trilogy/core/models/execute.py

@@ -500,6 +500,7 @@ class BaseJoin(BaseModel):
     concepts: Optional[List[BuildConcept]] = None
     left_datasource: Optional[Union[BuildDatasource, "QueryDatasource"]] = None
     concept_pairs: list[ConceptPair] | None = None
+    modifiers: List[Modifier] = Field(default_factory=list)
 
     @model_validator(mode="after")
     def validate_join(self) -> "BaseJoin":
@@ -1103,6 +1104,7 @@ class Join(BaseModel):
     inlined_ctes: set[str] = Field(default_factory=set)
     quote: str | None = None
     condition: BuildConditional | BuildComparison | BuildParenthetical | None = None
+    modifiers: List[Modifier] = Field(default_factory=list)
 
     def inline_cte(self, cte: CTE):
         self.inlined_ctes.add(cte.name)

{pytrilogy-0.0.3.110 → pytrilogy-0.0.3.112}/trilogy/core/processing/discovery_utility.py

@@ -1,7 +1,7 @@
 from typing import List
 
 from trilogy.constants import logger
-from trilogy.core.enums import Derivation, Purpose
+from trilogy.core.enums import Derivation, Purpose, SourceType
 from trilogy.core.models.build import (
     BuildConcept,
     BuildDatasource,
@@ -200,8 +200,10 @@ def group_if_required_v2(
             root.set_output_concepts(targets, rebuild=False, change_visibility=False)
             root.rebuild_cache()
             return root
+        elif isinstance(root, GroupNode) and root.source_type == SourceType.BASIC:
+            # we need to group this one more time
+            pass
         elif isinstance(root, GroupNode):
-
             if set(x.address for x in final) != set(
                 x.address for x in root.output_concepts
             ):

{pytrilogy-0.0.3.110 → pytrilogy-0.0.3.112}/trilogy/core/processing/node_generators/basic_node.py

@@ -138,7 +138,9 @@ def gen_basic_node(
         for s in parent_node.output_concepts
         if any(s.address in y.pseudonyms for y in targets)
     ] + targets
-    parent_node.set_output_concepts(targets)
+    hidden = [x for x in parent_node.output_concepts if x.address not in targets]
+    parent_node.hide_output_concepts(hidden)
+    parent_node.source_type = SourceType.BASIC
 
     logger.info(
         f"{depth_prefix}{LOGGER_PREFIX} Returning basic select for {concept}: input: {[x.address for x in parent_node.input_concepts]} output {[x.address for x in parent_node.output_concepts]} hidden {[x for x in parent_node.hidden_concepts]}"

{pytrilogy-0.0.3.110 → pytrilogy-0.0.3.112}/trilogy/core/processing/node_generators/multiselect_node.py

@@ -3,7 +3,7 @@ from itertools import combinations
 from typing import List
 
 from trilogy.constants import logger
-from trilogy.core.enums import JoinType, Purpose
+from trilogy.core.enums import JoinType, Modifier, Purpose
 from trilogy.core.models.build import (
     BuildConcept,
     BuildGrain,
@@ -47,6 +47,7 @@ def extra_align_joins(
                 right_node=right,
                 concepts=matched_concepts,
                 join_type=JoinType.FULL,
+                modifiers=[Modifier.NULLABLE],
             )
         )
     return resolve_join_order(output)

{pytrilogy-0.0.3.110 → pytrilogy-0.0.3.112}/trilogy/core/processing/nodes/base_node.py

@@ -1,11 +1,12 @@
 from collections import defaultdict
-from dataclasses import dataclass
+from dataclasses import dataclass, field
 from typing import List, Optional
 
 from trilogy.core.enums import (
     BooleanOperator,
     Derivation,
     JoinType,
+    Modifier,
     SourceType,
 )
 from trilogy.core.models.build import (
@@ -436,6 +437,7 @@ class NodeJoin:
     join_type: JoinType
     filter_to_mutual: bool = False
     concept_pairs: list[ConceptPair] | None = None
+    modifiers: List[Modifier] = field(default_factory=list)
 
     def __post_init__(self):
         if self.left_node == self.right_node:

{pytrilogy-0.0.3.110 → pytrilogy-0.0.3.112}/trilogy/core/processing/nodes/merge_node.py

@@ -169,6 +169,7 @@ class MergeNode(StrategyNode):
                     join_type=join.join_type,
                     concepts=join.concepts,
                     concept_pairs=join.concept_pairs,
+                    modifiers=join.modifiers,
                 )
             )
         return joins

{pytrilogy-0.0.3.110 → pytrilogy-0.0.3.112}/trilogy/core/query_processor.py

@@ -122,6 +122,7 @@ def base_join_to_join(
         right_cte=right_cte,
         jointype=base_join.join_type,
         joinkey_pairs=final_pairs,
+        modifiers=base_join.modifiers,
     )
 
 

{pytrilogy-0.0.3.110 → pytrilogy-0.0.3.112}/trilogy/dialect/common.py

@@ -131,7 +131,8 @@ def render_join(
                     ),
                     pair.modifiers
                     + (pair.left.modifiers or [])
-                    + (pair.right.modifiers or []),
+                    + (pair.right.modifiers or [])
+                    + (join.modifiers or []),
                 )
                 for pair in join.joinkey_pairs
             ]

{pytrilogy-0.0.3.110 → pytrilogy-0.0.3.112}/trilogy/dialect/dataframe.py

@@ -45,3 +45,6 @@ class DataframeConnectionWrapper(ExecutionEngine):
 
     def connect(self) -> Any:
         return self.engine.connect()
+
+    def dispose(self, close=True):
+        return super().dispose(close)

{pytrilogy-0.0.3.110 → pytrilogy-0.0.3.112}/trilogy/engine.py

@@ -33,6 +33,9 @@ class EngineConnection(Protocol):
     def rollback(self):
         raise NotImplementedError()
 
+    def close(self) -> None:
+        return
+
 
 class ExecutionEngine(Protocol):
     pass
@@ -43,6 +46,9 @@ class ExecutionEngine(Protocol):
     def setup(self, env: Environment, connection):
         pass
 
+    def dispose(self, close: bool = True):
+        pass
+
 
 ### Begin default SQLAlchemy implementation
 class SqlAlchemyResult:

{pytrilogy-0.0.3.110 → pytrilogy-0.0.3.112}/trilogy/executor.py

@@ -47,7 +47,7 @@ from trilogy.dialect.metadata import (
     handle_processed_validate_statement,
     handle_show_statement_outputs,
 )
-from trilogy.engine import ExecutionEngine, ResultProtocol
+from trilogy.engine import EngineConnection, ExecutionEngine, ResultProtocol
 from trilogy.hooks.base_hook import BaseHook
 from trilogy.parser import parse_text
 from trilogy.render import get_dialect_generator
@@ -69,11 +69,24 @@ class Executor(object):
         self.logger = logger
         self.hooks = hooks
         self.generator = get_dialect_generator(self.dialect, rendering)
-        self.connection = self.engine.connect()
+        self.connection = self.connect()
         # TODO: make generic
         if self.dialect == Dialects.DATAFRAME:
             self.engine.setup(self.environment, self.connection)
 
+    def connect(self) -> EngineConnection:
+        self.connection = self.engine.connect()
+        self.connected = True
+        return self.connection
+
+    def close(self):
+        self.engine.dispose(close=True)
+        if self.dialect == Dialects.DUCK_DB:
+            import gc
+
+            gc.collect()
+        self.connected = False
+
     def execute_statement(
         self,
         statement: PROCESSED_STATEMENT_TYPES,
@@ -244,7 +257,9 @@ class Executor(object):
         """generate SQL for execution"""
         _, parsed = parse_text(command, self.environment)
         generatable = [
-            x for x in parsed if isinstance(x, (SelectStatement, PersistStatement))
+            x
+            for x in parsed
+            if isinstance(x, (SelectStatement, PersistStatement, MultiSelectStatement))
         ]
         sql = self.generator.generate_queries(
             self.environment, generatable, hooks=self.hooks
@@ -419,6 +434,9 @@ class Executor(object):
     def execute_text(
         self, command: str, non_interactive: bool = False
     ) -> List[ResultProtocol]:
+        if not self.connected:
+            self.connect()
+
         """Run a trilogy query expressed as text."""
         output: list[ResultProtocol] = []
         # connection = self.engine.connect()