pytrilogy 0.0.3.95__tar.gz → 0.0.3.97__tar.gz

{pytrilogy-0.0.3.95/pytrilogy.egg-info → pytrilogy-0.0.3.97}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytrilogy
-Version: 0.0.3.95
+Version: 0.0.3.97
 Summary: Declarative, typed query language that compiles to SQL.
 Home-page: 
 Author: 
@@ -136,11 +136,11 @@ Versus SQL, Trilogy aims to:
 
 | Backend | Status | Notes |
 |---------|--------|-------|
-| **BigQuery** | ✅ Core | Full support |
-| **DuckDB** | ✅ Core | Full support |
-| **Snowflake** | ✅ Core | Full support |
-| **SQL Server** | ⚠️ Experimental | Limited testing |
-| **Presto** | ⚠️ Experimental | Limited testing |
+| **BigQuery** | Core | Full support |
+| **DuckDB** | Core | Full support |
+| **Snowflake** | Core | Full support |
+| **SQL Server** | Experimental | Limited testing |
+| **Presto** | Experimental | Limited testing |
 
 ## Examples
 
@@ -311,7 +311,44 @@ trilogy fmt <path to trilogy file>
 - [Public model repository](https://github.com/trilogydata/trilogy-public-models) - Great place for modeling examples
 - [Full documentation](https://trilogydata.dev/)
 
-## Syntax Reference
+## Python API Integration
+
+### Root Imports
+
+Are stable and should be sufficient for executing code from Trilogy as text.
+
+```python
+from pytrilogy import Executor, Dialect
+```
+
+### Authoring Imports
+
+Are also stable, and should be used for cases which programatically generate Trilogy statements without a base text format 
+or need to process/transform parsed code in more complicated ways.
+
+```python
+from pytrilogy.authoring import Concept, Function, ...
+```
+
+### Other Imports
+
+Are likely to be unstable. Open an issue if you need to take dependencies on other modules outside those two paths. 
+
+## MCP/Server
+
+Trilogy is straightforward to run as a server/MCP server; the former to generate SQL on demand and integrate into other tools, and MCP
+for full interactive query loops.
+
+This makes it easy to integrate Trilogy into existing tools or workflows.
+
+You can see examples of both use cases in the trilogy-studio codebase [here](https://github.com/trilogy-data/trilogy-studio-core)
+and install and run an MCP server directly with that codebase.
+
+If you're interested in a more fleshed out standalone server or MCP server, please open an issue and we'll prioritize it!
+
+## Trilogy Syntax Reference 
+
+Not exhaustive - see [documentation](https://trilogydata.dev/) for more details.
 
 ### Import
 ```sql

{pytrilogy-0.0.3.95 → pytrilogy-0.0.3.97}/README.md

@@ -98,11 +98,11 @@ Versus SQL, Trilogy aims to:
 
 | Backend | Status | Notes |
 |---------|--------|-------|
-| **BigQuery** | ✅ Core | Full support |
-| **DuckDB** | ✅ Core | Full support |
-| **Snowflake** | ✅ Core | Full support |
-| **SQL Server** | ⚠️ Experimental | Limited testing |
-| **Presto** | ⚠️ Experimental | Limited testing |
+| **BigQuery** | Core | Full support |
+| **DuckDB** | Core | Full support |
+| **Snowflake** | Core | Full support |
+| **SQL Server** | Experimental | Limited testing |
+| **Presto** | Experimental | Limited testing |
 
 ## Examples
 
@@ -273,7 +273,44 @@ trilogy fmt <path to trilogy file>
 - [Public model repository](https://github.com/trilogydata/trilogy-public-models) - Great place for modeling examples
 - [Full documentation](https://trilogydata.dev/)
 
-## Syntax Reference
+## Python API Integration
+
+### Root Imports
+
+Are stable and should be sufficient for executing code from Trilogy as text.
+
+```python
+from pytrilogy import Executor, Dialect
+```
+
+### Authoring Imports
+
+Are also stable, and should be used for cases which programatically generate Trilogy statements without a base text format 
+or need to process/transform parsed code in more complicated ways.
+
+```python
+from pytrilogy.authoring import Concept, Function, ...
+```
+
+### Other Imports
+
+Are likely to be unstable. Open an issue if you need to take dependencies on other modules outside those two paths. 
+
+## MCP/Server
+
+Trilogy is straightforward to run as a server/MCP server; the former to generate SQL on demand and integrate into other tools, and MCP
+for full interactive query loops.
+
+This makes it easy to integrate Trilogy into existing tools or workflows.
+
+You can see examples of both use cases in the trilogy-studio codebase [here](https://github.com/trilogy-data/trilogy-studio-core)
+and install and run an MCP server directly with that codebase.
+
+If you're interested in a more fleshed out standalone server or MCP server, please open an issue and we'll prioritize it!
+
+## Trilogy Syntax Reference 
+
+Not exhaustive - see [documentation](https://trilogydata.dev/) for more details.
 
 ### Import
 ```sql

{pytrilogy-0.0.3.95 → pytrilogy-0.0.3.97/pytrilogy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytrilogy
-Version: 0.0.3.95
+Version: 0.0.3.97
 Summary: Declarative, typed query language that compiles to SQL.
 Home-page: 
 Author: 
@@ -136,11 +136,11 @@ Versus SQL, Trilogy aims to:
 
 | Backend | Status | Notes |
 |---------|--------|-------|
-| **BigQuery** | ✅ Core | Full support |
-| **DuckDB** | ✅ Core | Full support |
-| **Snowflake** | ✅ Core | Full support |
-| **SQL Server** | ⚠️ Experimental | Limited testing |
-| **Presto** | ⚠️ Experimental | Limited testing |
+| **BigQuery** | Core | Full support |
+| **DuckDB** | Core | Full support |
+| **Snowflake** | Core | Full support |
+| **SQL Server** | Experimental | Limited testing |
+| **Presto** | Experimental | Limited testing |
 
 ## Examples
 
@@ -311,7 +311,44 @@ trilogy fmt <path to trilogy file>
 - [Public model repository](https://github.com/trilogydata/trilogy-public-models) - Great place for modeling examples
 - [Full documentation](https://trilogydata.dev/)
 
-## Syntax Reference
+## Python API Integration
+
+### Root Imports
+
+Are stable and should be sufficient for executing code from Trilogy as text.
+
+```python
+from pytrilogy import Executor, Dialect
+```
+
+### Authoring Imports
+
+Are also stable, and should be used for cases which programatically generate Trilogy statements without a base text format 
+or need to process/transform parsed code in more complicated ways.
+
+```python
+from pytrilogy.authoring import Concept, Function, ...
+```
+
+### Other Imports
+
+Are likely to be unstable. Open an issue if you need to take dependencies on other modules outside those two paths. 
+
+## MCP/Server
+
+Trilogy is straightforward to run as a server/MCP server; the former to generate SQL on demand and integrate into other tools, and MCP
+for full interactive query loops.
+
+This makes it easy to integrate Trilogy into existing tools or workflows.
+
+You can see examples of both use cases in the trilogy-studio codebase [here](https://github.com/trilogy-data/trilogy-studio-core)
+and install and run an MCP server directly with that codebase.
+
+If you're interested in a more fleshed out standalone server or MCP server, please open an issue and we'll prioritize it!
+
+## Trilogy Syntax Reference 
+
+Not exhaustive - see [documentation](https://trilogydata.dev/) for more details.
 
 ### Import
 ```sql

{pytrilogy-0.0.3.95 → pytrilogy-0.0.3.97}/pytrilogy.egg-info/SOURCES.txt

@@ -36,7 +36,6 @@ tests/test_undefined_concept.py
 tests/test_user_functions.py
 tests/test_where_clause.py
 trilogy/__init__.py
-trilogy/compiler.py
 trilogy/constants.py
 trilogy/engine.py
 trilogy/executor.py
@@ -117,6 +116,7 @@ trilogy/core/validation/common.py
 trilogy/core/validation/concept.py
 trilogy/core/validation/datasource.py
 trilogy/core/validation/environment.py
+trilogy/core/validation/fix.py
 trilogy/dialect/__init__.py
 trilogy/dialect/base.py
 trilogy/dialect/bigquery.py
@@ -125,6 +125,7 @@ trilogy/dialect/config.py
 trilogy/dialect/dataframe.py
 trilogy/dialect/duckdb.py
 trilogy/dialect/enums.py
+trilogy/dialect/metadata.py
 trilogy/dialect/postgres.py
 trilogy/dialect/presto.py
 trilogy/dialect/snowflake.py

{pytrilogy-0.0.3.95 → pytrilogy-0.0.3.97}/tests/test_executor.py

@@ -2,7 +2,7 @@ from pathlib import Path
 
 from trilogy import Dialects, parse
 from trilogy.core.models.environment import Environment
-from trilogy.executor import MockResult, MockResultRow
+from trilogy.dialect.metadata import MockResult, MockResultRow
 
 
 def test_file_parsing():

{pytrilogy-0.0.3.95 → pytrilogy-0.0.3.97}/tests/test_parsing.py

@@ -321,6 +321,55 @@ def test_the_comments():
     assert rendered == "null"
 
 
+def test_the_comment_multiline():
+    env, parsed = parse_text(
+        """const
+         # comment here?
+           order_id <- 4;  # this is the order id
+        # order ids are important
+           
+           SELECT 
+        # TOOD - add in more columns?
+        order_id  
+        WHERE 
+        # order_id should not be null
+        order_id
+        # in this comp
+          is not 
+        null; # nulls are the worst
+        
+        """
+    )
+    parsed[-1]
+    assert env.concepts["order_id"].metadata.description is not None
+    assert " this is the order id" in env.concepts["order_id"].metadata.description
+    assert " order ids are important" in env.concepts["order_id"].metadata.description
+
+
+def test_the_comment_multiline_enter():
+    # we should not associate it as a description if there is a newline
+    env, parsed = parse_text(
+        """const
+         # comment here?
+           order_id <- 4;  
+        # this is the order id
+        # order ids are important
+           
+           SELECT 
+        # TOOD - add in more columns?
+        order_id  
+        WHERE 
+        # order_id should not be null
+        order_id
+        # in this comp
+          is not 
+        null; # nulls are the worst
+        
+        """
+    )
+    assert env.concepts["order_id"].metadata.description is None
+
+
 def test_purpose_nesting():
     env, parsed = parse_text(
         """key year int;

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

{pytrilogy-0.0.3.95 → pytrilogy-0.0.3.97}/trilogy/authoring/__init__.py

@@ -60,68 +60,82 @@ from trilogy.core.statements.author import (
     RowsetDerivationStatement,
     SelectItem,
     SelectStatement,
+    ShowCategory,
+    ShowStatement,
+    ValidateStatement,
 )
 from trilogy.parsing.common import arbitrary_to_concept, arg_to_datatype
 
 __all__ = [
-    "Concept",
-    "Function",
-    "WhereClause",
-    "Comparison",
-    "FilterItem",
-    "CaseWhen",
-    "CaseElse",
-    "AggregateWrapper",
-    "WindowItem",
-    "WindowOrder",
-    "WindowType",
-    "WindowItemOrder",
-    "WindowItemOver",
-    "DataType",
-    "StructType",
-    "ArrayType",
-    "NumericType",
-    "Grain",
-    "RowsetDerivationStatement",
-    "MapType",
-    "ListWrapper",
+    # trilogy.constants
+    "DEFAULT_NAMESPACE",
+    # trilogy.core.enums
+    "BooleanOperator",
+    "ComparisonOperator",
+    "FunctionClass",
     "FunctionType",
+    "InfiniteFunctionArgs",
+    "Ordering",
+    "Purpose",
+    # trilogy.core.functions
     "FunctionFactory",
-    "ConceptDeclarationStatement",
-    "ConceptTransform",
-    "SelectItem",
-    "SelectStatement",
-    "Environment",
+    # trilogy.core.models.author
+    "AggregateWrapper",
+    "CaseElse",
+    "CaseWhen",
+    "Comparison",
+    "Concept",
     "ConceptRef",
+    "Conditional",
+    "FilterItem",
+    "Function",
+    "FunctionCallWrapper",
     "HavingClause",
     "MagicConstants",
     "Metadata",
+    "MultiSelectLineage",
     "OrderBy",
     "OrderItem",
     "Parenthetical",
+    "RowsetItem",
     "SubselectComparison",
-    "Conditional",
-    "BooleanOperator",
-    "ComparisonOperator",
-    "FunctionClass",
-    "FunctionType",
-    "InfiniteFunctionArgs",
-    "Ordering",
-    "Purpose",
-    "DEFAULT_NAMESPACE",
-    "arbitrary_to_concept",
-    "arg_to_datatype",
-    "MultiSelectStatement",
-    "PersistStatement",
-    "RawSQLStatement",
+    "WhereClause",
+    "WindowItem",
+    "WindowItemOrder",
+    "WindowItemOver",
+    "WindowOrder",
+    "WindowType",
+    # trilogy.core.models.core
+    "ArrayType",
+    "DataType",
+    "ListWrapper",
+    "MapType",
+    "NumericType",
+    "StructType",
+    "TraitDataType",
+    # trilogy.core.models.datasource
+    "Address",
     "Datasource",
     "DatasourceMetadata",
-    "MultiSelectLineage",
-    "RowsetItem",
-    "FunctionCallWrapper",
+    # trilogy.core.models.environment
+    "Environment",
+    # trilogy.core.statements.author
+    "ConceptDeclarationStatement",
+    "ConceptTransform",
     "CopyStatement",
+    "Grain",
     "HasUUID",
     "ImportStatement",
-    "Address",
-    "TraitDataType",
+    "MultiSelectStatement",
+    "PersistStatement",
+    "RawSQLStatement",
+    "RowsetDerivationStatement",
+    "SelectItem",
+    "SelectStatement",
+    "ShowCategory",
+    "ShowStatement",
+    "ValidateStatement",
+    # trilogy.parsing.common
+    "arbitrary_to_concept",
+    "arg_to_datatype",
 ]

{pytrilogy-0.0.3.95 → pytrilogy-0.0.3.97}/trilogy/constants.py

@@ -16,6 +16,7 @@ ENV_CACHE_NAME = ".preql_cache.json"
 
 class MagicConstants(Enum):
     NULL = "null"
+    LINE_SEPARATOR = "\n"
 
 
 NULL_VALUE = MagicConstants.NULL

{pytrilogy-0.0.3.95 → pytrilogy-0.0.3.97}/trilogy/core/enums.py

@@ -82,6 +82,15 @@ class Modifier(Enum):
             return Modifier.NULLABLE
         return super()._missing_(value=strval.capitalize())
 
+    def __lt__(self, other):
+        order = [
+            Modifier.HIDDEN,
+            Modifier.PARTIAL,
+            Modifier.NULLABLE,
+            Modifier.OPTIONAL,
+        ]
+        return order.index(self) < order.index(other)
+
 
 class JoinType(Enum):
     INNER = "inner"

pytrilogy-0.0.3.97/trilogy/core/exceptions.py

@@ -0,0 +1,105 @@
+from dataclasses import dataclass
+from typing import Any, List, Sequence
+
+from trilogy.core.enums import Modifier
+from trilogy.core.models.core import (
+    ArrayType,
+    DataType,
+    MapType,
+    NumericType,
+    StructType,
+    TraitDataType,
+)
+
+
+class UndefinedConceptException(Exception):
+    def __init__(self, message, suggestions: List[str]):
+        super().__init__(self, message)
+        self.message = message
+        self.suggestions = suggestions
+
+
+class FrozenEnvironmentException(Exception):
+    pass
+
+
+class InvalidSyntaxException(Exception):
+    pass
+
+
+class UnresolvableQueryException(Exception):
+    pass
+
+
+class NoDatasourceException(UnresolvableQueryException):
+    pass
+
+
+class ModelValidationError(Exception):
+    def __init__(
+        self,
+        message,
+        children: Sequence["ModelValidationError"] | None = None,
+        **kwargs,
+    ):
+        super().__init__(self, message, **kwargs)
+        self.message = message
+        self.children = children
+
+
+class DatasourceModelValidationError(ModelValidationError):
+    pass
+
+
+class DatasourceGrainValidationError(DatasourceModelValidationError):
+    pass
+
+
+@dataclass
+class DatasourceColumnBindingData:
+    address: str
+    value: Any
+    value_type: (
+        DataType | ArrayType | StructType | MapType | NumericType | TraitDataType
+    )
+    value_modifiers: List[Modifier]
+    actual_type: (
+        DataType | ArrayType | StructType | MapType | NumericType | TraitDataType
+    )
+    actual_modifiers: List[Modifier]
+
+    def format_failure(self):
+        return f"Concept {self.address} value '{self.value}' with type {self.value_modifiers} does not conform to expected type {str(self.actual_type)} with modifiers {self.actual_modifiers}"
+
+    def is_modifier_issue(self) -> bool:
+        return len(self.value_modifiers) > 0 and any(
+            [x not in self.actual_modifiers for x in self.value_modifiers]
+        )
+
+    def is_type_issue(self) -> bool:
+        return self.value_type != self.actual_type
+
+
+class DatasourceColumnBindingError(DatasourceModelValidationError):
+    def __init__(
+        self,
+        address: str,
+        errors: list[DatasourceColumnBindingData],
+        message: str | None = None,
+    ):
+        if not message:
+            message = f"Datasource {address} failed validation. Found rows that do not conform to types: {[failure.format_failure() for failure in errors]}"
+        super().__init__(message)
+        self.errors = errors
+        self.dataset_address = address
+
+
+class ConceptModelValidationError(ModelValidationError):
+    pass
+
+
+class AmbiguousRelationshipResolutionException(UnresolvableQueryException):
+    def __init__(self, message, parents: List[set[str]]):
+        super().__init__(self, message)
+        self.message = message
+        self.parents = parents

{pytrilogy-0.0.3.95 → pytrilogy-0.0.3.97}/trilogy/core/graph_models.py

@@ -64,13 +64,13 @@ def datasource_to_node(input: BuildDatasource) -> str:
 
 
 class ReferenceGraph(nx.DiGraph):
-    def __init__(self, *args, **kwargs):
+    def __init__(self, *args, **kwargs) -> None:
         super().__init__(*args, **kwargs)
         self.concepts: dict[str, BuildConcept] = {}
         self.datasources: dict[str, BuildDatasource] = {}
         self.pseudonyms: set[tuple[str, str]] = set()
 
-    def copy(self):
+    def copy(self) -> "ReferenceGraph":
         g = ReferenceGraph()
         g.concepts = self.concepts.copy()
         g.datasources = self.datasources.copy()
@@ -83,7 +83,7 @@ class ReferenceGraph(nx.DiGraph):
         # g.add_edges_from(self.edges(data=True))
         return g
 
-    def remove_node(self, n):
+    def remove_node(self, n) -> None:
         if n in self.concepts:
             del self.concepts[n]
         if n in self.datasources:
@@ -98,7 +98,7 @@ class ReferenceGraph(nx.DiGraph):
             self.datasources[node_name] = attr["datasource"]
         super().add_node(node_name, **attr)
 
-    def add_datasource_node(self, node_name, datasource):
+    def add_datasource_node(self, node_name, datasource) -> None:
         self.datasources[node_name] = datasource
         super().add_node(node_name, datasource=datasource)
 

{pytrilogy-0.0.3.95 → pytrilogy-0.0.3.97}/trilogy/core/statements/execute.py

@@ -88,6 +88,8 @@ class ProcessedShowStatement:
             BuildConcept,
             BuildDatasource,
             ProcessedQuery,
+            ProcessedQueryPersist,
+            ProcessedCopyStatement,
             ProcessedValidateStatement,
             ProcessedStaticValueOutput,
         ]