pytrilogy 0.0.3.55__tar.gz → 0.0.3.57__tar.gz

{pytrilogy-0.0.3.55/pytrilogy.egg-info → pytrilogy-0.0.3.57}/PKG-INFO

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

{pytrilogy-0.0.3.55 → pytrilogy-0.0.3.57/pytrilogy.egg-info}/PKG-INFO

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

{pytrilogy-0.0.3.55 → pytrilogy-0.0.3.57}/pytrilogy.egg-info/SOURCES.txt

@@ -71,6 +71,10 @@ trilogy/core/optimizations/inline_datasource.py
 trilogy/core/optimizations/predicate_pushdown.py
 trilogy/core/processing/__init__.py
 trilogy/core/processing/concept_strategies_v3.py
+trilogy/core/processing/discovery_loop.py
+trilogy/core/processing/discovery_node_factory.py
+trilogy/core/processing/discovery_utility.py
+trilogy/core/processing/discovery_validation.py
 trilogy/core/processing/graph_utils.py
 trilogy/core/processing/utility.py
 trilogy/core/processing/node_generators/__init__.py
@@ -138,4 +142,5 @@ trilogy/std/date.preql
 trilogy/std/display.preql
 trilogy/std/geography.preql
 trilogy/std/money.preql
+trilogy/std/net.preql
 trilogy/std/report.preql

{pytrilogy-0.0.3.55 → pytrilogy-0.0.3.57}/tests/test_discovery_nodes.py

@@ -51,7 +51,11 @@ def test_group_node_property(test_environment: Environment, test_environment_gra
         for x in group_node.parents[0].output_concepts
         if x not in group_node.parents[0].hidden_concepts
     }
-    assert input_concept_names == {"category_name_length", "category_id"}
+    assert input_concept_names == {
+        "category_name_length",
+        "category_name",
+        "category_id",
+    }
     final = group_node.resolve()
     assert len(final.datasources) == 1
     assert final.datasources[0].group_required is False
@@ -79,7 +83,11 @@ def test_group_node_property_all(test_environment: Environment, test_environment
         for x in group_node.parents[0].output_concepts
         if x not in group_node.parents[0].hidden_concepts
     }
-    assert input_concept_names == {"category_name_length", "category_id"}
+    assert input_concept_names == {
+        "category_name_length",
+        "category_name",
+        "category_id",
+    }
     final = group_node.resolve()
     assert len(final.datasources) == 1
     assert final.datasources[0].group_required is False

{pytrilogy-0.0.3.55 → pytrilogy-0.0.3.57}/tests/test_functions.py

@@ -36,6 +36,23 @@ def test_typing():
     assert x in set([x])
 
 
+def test_negative_float_parsing(test_environment):
+    declarations = """
+
+    const x <- -1.23;
+
+select
+x
+where x >-1.24;
+
+    """
+    env, parsed = parse(declarations, environment=test_environment)
+    select: SelectStatement = parsed[-1]
+
+    for dialect in TEST_DIALECTS:
+        dialect.compile_statement(process_query(test_environment, select, hooks=[]))
+
+
 def test_functions(test_environment):
     declarations = """
 

{pytrilogy-0.0.3.55 → pytrilogy-0.0.3.57}/tests/test_user_functions.py

@@ -208,7 +208,9 @@ auto test <-SUM(CASE WHEN 10 = weekday THEN x ELSE 0 END) +
 def test_user_function_import():
     env = Environment(working_path=Path(__file__).parent)
     x = Dialects.DUCK_DB.default_executor(environment=env)
+    from trilogy.hooks import DebuggingHook
 
+    DebuggingHook()
     results = x.execute_query(
         """
 import test_env_functions as test_env_functions;

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

{pytrilogy-0.0.3.55 → pytrilogy-0.0.3.57}/trilogy/authoring/__init__.py

@@ -43,14 +43,19 @@ from trilogy.core.models.core import (
     MapType,
     StructType,
 )
-from trilogy.core.models.datasource import Datasource, DatasourceMetadata
+from trilogy.core.models.datasource import Address, Datasource, DatasourceMetadata
 from trilogy.core.models.environment import Environment
 from trilogy.core.statements.author import (
     ConceptDeclarationStatement,
     ConceptTransform,
+    CopyStatement,
+    Grain,
+    HasUUID,
+    ImportStatement,
     MultiSelectStatement,
     PersistStatement,
     RawSQLStatement,
+    RowsetDerivationStatement,
     SelectItem,
     SelectStatement,
 )
@@ -73,6 +78,8 @@ __all__ = [
     "DataType",
     "StructType",
     "ListType",
+    "Grain",
+    "RowsetDerivationStatement",
     "MapType",
     "ListWrapper",
     "FunctionType",
@@ -109,4 +116,8 @@ __all__ = [
     "MultiSelectLineage",
     "RowsetItem",
     "FunctionCallWrapper",
+    "CopyStatement",
+    "HasUUID",
+    "ImportStatement",
+    "Address",
 ]

{pytrilogy-0.0.3.55 → pytrilogy-0.0.3.57}/trilogy/core/enums.py

@@ -42,6 +42,7 @@ class Purpose(Enum):
 
 class Derivation(Enum):
     BASIC = "basic"
+    GROUP_TO = "group_to"
     WINDOW = "window"
     AGGREGATE = "aggregate"
     FILTER = "filter"

{pytrilogy-0.0.3.55 → pytrilogy-0.0.3.57}/trilogy/core/models/author.py

@@ -1176,6 +1176,12 @@ class Concept(Addressable, DataTyped, ConceptArgs, Mergeable, Namespaced, BaseMo
             and lineage.operator == FunctionType.UNION
         ):
             return Derivation.UNION
+        elif (
+            lineage
+            and isinstance(lineage, (BuildFunction, Function))
+            and lineage.operator == FunctionType.GROUP
+        ):
+            return Derivation.GROUP_TO
         elif (
             lineage
             and isinstance(lineage, (BuildFunction, Function))
@@ -1195,10 +1201,6 @@ class Concept(Addressable, DataTyped, ConceptArgs, Mergeable, Namespaced, BaseMo
             return Derivation.CONSTANT
         return Derivation.ROOT
 
-    # @property
-    # def derivation(self) -> Derivation:
-    #     return self.calculate_derivation(self.lineage, self.purpose)
-
     @classmethod
     def calculate_granularity(cls, derivation: Derivation, grain: Grain, lineage):
         from trilogy.core.models.build import BuildFunction

{pytrilogy-0.0.3.55 → pytrilogy-0.0.3.57}/trilogy/core/models/execute.py

@@ -658,18 +658,21 @@ class QueryDatasource(BaseModel):
     @classmethod
     def validate_source_map(cls, v: dict, info: ValidationInfo):
         values = info.data
+        hidden_concepts = values.get("hidden_concepts", set())
         for key in ("input_concepts", "output_concepts"):
             if not values.get(key):
                 continue
             concept: BuildConcept
             for concept in values[key]:
+                if concept.address in hidden_concepts:
+                    continue
                 if (
                     concept.address not in v
                     and not any(x in v for x in concept.pseudonyms)
                     and CONFIG.validate_missing
                 ):
                     raise SyntaxError(
-                        f"On query datasource missing source map for {concept.address} on {key} with pseudonyms {concept.pseudonyms}, have {v}"
+                        f"On query datasource from {values} missing source map entry (map: {v}) for {concept.address} on {key} with pseudonyms {concept.pseudonyms}, have {v}"
                     )
         return v
 

{pytrilogy-0.0.3.55 → pytrilogy-0.0.3.57}/trilogy/core/optimization.py

@@ -141,9 +141,7 @@ def is_direct_return_eligible(cte: CTE | UnionCTE) -> CTE | UnionCTE | None:
     if not output_addresses.issubset(parent_output_addresses):
         return None
     if not direct_parent.grain == cte.grain:
-        logger.info("grain mismatch, cannot early exit")
-        logger.info(direct_parent.grain)
-        logger.info(cte.grain)
+        logger.info("[Direct Return] grain mismatch, cannot early exit")
         return None
 
     assert isinstance(cte, CTE)
@@ -236,6 +234,8 @@ def optimize_ctes(
             complete = not actions_taken
             loops += 1
             input = reorder_ctes(filter_irrelevant_ctes(input, root_cte))
-        logger.info(f"finished checking for {type(rule).__name__} in {loops} loops")
+        logger.info(
+            f"[Optimization] Finished checking for {type(rule).__name__} after {loops} loop(s)"
+        )
 
     return reorder_ctes(filter_irrelevant_ctes(input, root_cte))