pytrilogy 0.0.3.109__tar.gz → 0.0.3.111__tar.gz

{pytrilogy-0.0.3.109/pytrilogy.egg-info → pytrilogy-0.0.3.111}/PKG-INFO

@@ -1,16 +1,14 @@
 Metadata-Version: 2.4
 Name: pytrilogy
-Version: 0.0.3.109
+Version: 0.0.3.111
 Summary: Declarative, typed query language that compiles to SQL.
-Home-page: 
-Author: 
-Author-email: preql-community@gmail.com
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE.md
 Requires-Dist: lark
@@ -30,14 +28,7 @@ Provides-Extra: snowflake
 Requires-Dist: snowflake-sqlalchemy; extra == "snowflake"
 Provides-Extra: ai
 Requires-Dist: httpx; extra == "ai"
-Dynamic: author-email
-Dynamic: classifier
-Dynamic: description
-Dynamic: description-content-type
 Dynamic: license-file
-Dynamic: provides-extra
-Dynamic: requires-dist
-Dynamic: summary
 
 # Trilogy
 **SQL with superpowers for analytics**

pytrilogy-0.0.3.111/pyproject.toml

@@ -0,0 +1,49 @@
+[tool.pytest.ini_options]
+markers = [
+    "adventureworks",
+    "adventureworks_execution",
+]
+log_cli_level="INFO"
+
+[tool.ruff]
+# Allow lines to be as long as 200 characters.
+line-length = 200
+lint.extend-select = ["I"]
+
+[project]
+name = "pytrilogy"
+description = "Declarative, typed query language that compiles to SQL."
+dynamic = ["version", "dependencies"]
+readme = {file = "README.md", content-type = "text/markdown"}
+classifiers = [
+    "Programming Language :: Python",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+]
+
+[project.scripts]
+trilogy = "trilogy.scripts.trilogy:cli"
+
+[project.optional-dependencies]
+postgres = ["psycopg2-binary"]
+bigquery = ["sqlalchemy-bigquery"]
+snowflake = ["snowflake-sqlalchemy"]
+ai = ["httpx"]
+
+[tool.setuptools.dynamic]
+version = {attr = "trilogy.__version__"}
+dependencies = {file = ["requirements.txt"]}
+
+[tool.setuptools]
+packages = {find = {exclude = ["dist", "build", "*.tests", "*.tests.*", "tests.*", "tests", "docs", ".github", "examples"]}}
+
+[tool.setuptools.package-data]
+"*" = ["*.tf", "*.jinja", "py.typed", "*.lark", "*.preql"]
+
+[build-system]
+requires = ["setuptools>=61.0", "wheel"]
+build-backend = "setuptools.build_meta"

{pytrilogy-0.0.3.109 → pytrilogy-0.0.3.111/pytrilogy.egg-info}/PKG-INFO

@@ -1,16 +1,14 @@
 Metadata-Version: 2.4
 Name: pytrilogy
-Version: 0.0.3.109
+Version: 0.0.3.111
 Summary: Declarative, typed query language that compiles to SQL.
-Home-page: 
-Author: 
-Author-email: preql-community@gmail.com
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE.md
 Requires-Dist: lark
@@ -30,14 +28,7 @@ Provides-Extra: snowflake
 Requires-Dist: snowflake-sqlalchemy; extra == "snowflake"
 Provides-Extra: ai
 Requires-Dist: httpx; extra == "ai"
-Dynamic: author-email
-Dynamic: classifier
-Dynamic: description
-Dynamic: description-content-type
 Dynamic: license-file
-Dynamic: provides-extra
-Dynamic: requires-dist
-Dynamic: summary
 
 # Trilogy
 **SQL with superpowers for analytics**

{pytrilogy-0.0.3.109 → pytrilogy-0.0.3.111}/pytrilogy.egg-info/SOURCES.txt

@@ -1,7 +1,7 @@
 LICENSE.md
 README.md
 pyproject.toml
-setup.py
+requirements.txt
 pytrilogy.egg-info/PKG-INFO
 pytrilogy.egg-info/SOURCES.txt
 pytrilogy.egg-info/dependency_links.txt

{pytrilogy-0.0.3.109 → pytrilogy-0.0.3.111}/pytrilogy.egg-info/top_level.txt

@@ -1 +1,2 @@
+docker
 trilogy

pytrilogy-0.0.3.111/requirements.txt

@@ -0,0 +1,10 @@
+lark
+jinja2
+sqlalchemy<2.0.0
+networkx
+pyodbc
+pydantic
+#https://github.com/Mause/duckdb_engine/issues/1338 - remove as soon as fixed
+duckdb<1.4.0
+duckdb-engine
+click

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

{pytrilogy-0.0.3.109 → pytrilogy-0.0.3.111}/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.109 → pytrilogy-0.0.3.111}/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.109 → pytrilogy-0.0.3.111}/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.109 → pytrilogy-0.0.3.111}/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.109 → pytrilogy-0.0.3.111}/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.109 → pytrilogy-0.0.3.111}/trilogy/dialect/base.py

@@ -17,6 +17,7 @@ from trilogy.core.enums import (
     DatePart,
     FunctionType,
     GroupMode,
+    Modifier,
     Ordering,
     ShowCategory,
     UnnestMode,
@@ -89,6 +90,14 @@ from trilogy.core.utility import safe_quote
 from trilogy.dialect.common import render_join, render_unnest
 from trilogy.hooks.base_hook import BaseHook
 
+
+def null_wrapper(lval: str, rval: str, modifiers: list[Modifier]) -> str:
+
+    if Modifier.NULLABLE in modifiers:
+        return f"({lval} = {rval} or ({lval} is null and {rval} is null))"
+    return f"{lval} = {rval}"
+
+
 LOGGER_PREFIX = "[RENDERING]"
 
 WINDOW_ITEMS = (BuildWindowItem,)
@@ -353,6 +362,7 @@ class BaseDialect:
     UNNEST_MODE = UnnestMode.CROSS_APPLY
     GROUP_MODE = GroupMode.AUTO
     EXPLAIN_KEYWORD = "EXPLAIN"
+    NULL_WRAPPER = staticmethod(null_wrapper)
 
     def __init__(self, rendering: Rendering | None = None):
         self.rendering = rendering or CONFIG.rendering
@@ -964,6 +974,7 @@ class BaseDialect:
                             cte,
                             use_map=self.used_map,
                             unnest_mode=self.UNNEST_MODE,
+                            null_wrapper=self.NULL_WRAPPER,
                         )
                         for join in final_joins
                     ]

{pytrilogy-0.0.3.109 → pytrilogy-0.0.3.111}/trilogy/dialect/common.py

@@ -18,13 +18,6 @@ from trilogy.core.models.execute import (
 )
 
 
-def null_wrapper(lval: str, rval: str, modifiers: list[Modifier]) -> str:
-
-    if Modifier.NULLABLE in modifiers:
-        return f"({lval} = {rval} or ({lval} is null and {rval} is null))"
-    return f"{lval} = {rval}"
-
-
 def render_unnest(
     unnest_mode: UnnestMode,
     quote_character: str,
@@ -88,6 +81,7 @@ def render_join(
     ],
     cte: CTE,
     use_map: dict[str, set[str]],
+    null_wrapper: Callable[[str, str, list[Modifier]], str],
     unnest_mode: UnnestMode = UnnestMode.CROSS_APPLY,
 ) -> str | None:
     # {% for key in join.joinkeys %}{{ key.inner }} = {{ key.outer}}{% endfor %}
@@ -135,9 +129,10 @@ def render_join(
                         join.inlined_ctes,
                         use_map=use_map,
                     ),
-                    modifiers=pair.modifiers
+                    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.109 → pytrilogy-0.0.3.111}/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.109 → pytrilogy-0.0.3.111}/trilogy/dialect/duckdb.py

@@ -3,7 +3,7 @@ from typing import Any, Callable, Mapping
 
 from jinja2 import Template
 
-from trilogy.core.enums import FunctionType, UnnestMode, WindowType
+from trilogy.core.enums import FunctionType, Modifier, UnnestMode, WindowType
 from trilogy.core.models.core import DataType
 from trilogy.dialect.base import BaseDialect
 
@@ -12,6 +12,17 @@ WINDOW_FUNCTION_MAP: Mapping[WindowType, Callable[[Any, Any, Any], str]] = {}
 SENTINAL_AUTO_CAPTURE_GROUP_VALUE = "-1"
 
 
+def null_wrapper(
+    lval: str,
+    rval: str,
+    modifiers: list[Modifier],
+) -> str:
+
+    if Modifier.NULLABLE in modifiers:
+        return f"{lval} is not distinct from {rval}"
+    return f"{lval} = {rval}"
+
+
 def generate_regex_extract(x: list[str]) -> str:
     if str(x[2]) == SENTINAL_AUTO_CAPTURE_GROUP_VALUE:
         regex = re.compile(x[1])
@@ -151,3 +162,4 @@ class DuckDBDialect(BaseDialect):
     QUOTE_CHARACTER = '"'
     SQL_TEMPLATE = DUCKDB_TEMPLATE
     UNNEST_MODE = UnnestMode.DIRECT
+    NULL_WRAPPER = staticmethod(null_wrapper)

{pytrilogy-0.0.3.109 → pytrilogy-0.0.3.111}/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.109 → pytrilogy-0.0.3.111}/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,27 @@ 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 duckdb
+
+            duckdb.default_connection().close()
+            import gc
+
+            gc.collect()
+        self.connected = False
+
     def execute_statement(
         self,
         statement: PROCESSED_STATEMENT_TYPES,
@@ -244,7 +260,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 +437,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()

pytrilogy-0.0.3.109/pyproject.toml

@@ -1,11 +0,0 @@
-[tool.pytest.ini_options]
-markers = [
-    "adventureworks",
-    "adventureworks_execution",
-]
-log_cli_level="INFO"
-
-[tool.ruff]
-# Allow lines to be as long as 200 characters.
-line-length = 200
-lint.extend-select = ["I"]

pytrilogy-0.0.3.109/setup.py

@@ -1,63 +0,0 @@
-# type: ignore
-import ast
-import re
-
-import setuptools
-
-_version_re = re.compile(r"__version__\s+=\s+(.*)")
-with open("trilogy/__init__.py", "rb") as f:
-    _match = _version_re.search(f.read().decode("utf-8"))
-    if _match is None:
-        print("No version found")
-        raise SystemExit(1)
-    version = str(ast.literal_eval(_match.group(1)))
-
-
-with open("requirements.txt", "r") as f:
-    install_requires = [line.strip().replace("==", ">=") for line in f.readlines()]
-
-setuptools.setup(
-    name="pytrilogy",
-    version=version,
-    url="",
-    author="",
-    author_email="preql-community@gmail.com",
-    description="Declarative, typed query language that compiles to SQL.",
-    long_description=open("README.md").read(),
-    long_description_content_type="text/markdown",
-    packages=setuptools.find_packages(
-        exclude=[
-            "dist",
-            "build",
-            "*.tests",
-            "*.tests.*",
-            "tests.*",
-            "tests",
-            "docs",
-            ".github",
-            "",
-            "examples",
-        ]
-    ),
-    package_data={
-        "": ["*.tf", "*.jinja", "py.typed", "*.lark", "*.preql"],
-    },
-    install_requires=install_requires,
-    extras_require={
-        "postgres": ["psycopg2-binary"],
-        "bigquery": ["sqlalchemy-bigquery"],
-        "snowflake": ["snowflake-sqlalchemy"],
-        "ai": ["httpx"],
-    },
-    entry_points={
-        "console_scripts": ["trilogy=trilogy.scripts.trilogy:cli"],
-    },
-    classifiers=[
-        "Programming Language :: Python",
-        "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.9",
-        "Programming Language :: Python :: 3.10",
-        "Programming Language :: Python :: 3.11",
-        "Programming Language :: Python :: 3.12",
-    ],
-)