pytrilogy 0.0.3.3__tar.gz → 0.0.3.4__tar.gz

{pytrilogy-0.0.3.3/pytrilogy.egg-info → pytrilogy-0.0.3.4}/PKG-INFO

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

{pytrilogy-0.0.3.3 → pytrilogy-0.0.3.4/pytrilogy.egg-info}/PKG-INFO

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

{pytrilogy-0.0.3.3 → pytrilogy-0.0.3.4}/pytrilogy.egg-info/SOURCES.txt

@@ -37,6 +37,7 @@ trilogy/executor.py
 trilogy/parser.py
 trilogy/py.typed
 trilogy/utility.py
+trilogy/authoring/__init__.py
 trilogy/core/__init__.py
 trilogy/core/constants.py
 trilogy/core/enums.py

{pytrilogy-0.0.3.3 → pytrilogy-0.0.3.4}/tests/test_datatypes.py

@@ -9,7 +9,7 @@ from trilogy.parsing.parse_engine import (
 
 def test_numeric():
     env, _ = parse_text(
-        "const order_id numeric(12,2); const rounded <- cast(order_id as numeric(15,2));"
+        "const order_id numeric(12,2); auto rounded <- cast(order_id as numeric(15,2));"
     )
     assert env.concepts["order_id"].datatype == NumericType(precision=12, scale=2)
 

{pytrilogy-0.0.3.3 → pytrilogy-0.0.3.4}/tests/test_parsing.py

@@ -323,7 +323,7 @@ def test_circular_aliasing():
 property composite_id.first <- split(composite_id, '-')[1];
 property composite_id.second <- split(composite_id, '-')[2];
 
-key composite_id_alt <- concat(first, '-', second);
+auto composite_id_alt <- concat(first, '-', second);
 
 merge composite_id_alt into composite_id;
 
@@ -367,7 +367,7 @@ def test_circular_aliasing_inverse():
 property composite_id.first <- split(composite_id, '-')[1];
 property composite_id.second <- split(composite_id, '-')[2];
 
-key composite_id_alt <- concat(first, '-', second);
+auto composite_id_alt <- concat(first, '-', second);
 
 merge composite_id_alt into composite_id;
 

{pytrilogy-0.0.3.3 → pytrilogy-0.0.3.4}/tests/test_where_clause.py

@@ -89,7 +89,7 @@ select
 
 def test_select_where_attribute_v2(test_environment):
     declarations = """
-key special_category <- filter category_id where like(category_name, '%special%') is True;
+auto special_category <- filter category_id where like(category_name, '%special%') is True;
 
 select
     order_id,

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

pytrilogy-0.0.3.4/trilogy/authoring/__init__.py

@@ -0,0 +1,90 @@
+from trilogy.constants import DEFAULT_NAMESPACE
+from trilogy.core.enums import (
+    BooleanOperator,
+    ComparisonOperator,
+    FunctionClass,
+    FunctionType,
+    InfiniteFunctionArgs,
+    Ordering,
+    Purpose,
+)
+from trilogy.core.functions import FunctionFactory
+from trilogy.core.models.author import (
+    AggregateWrapper,
+    CaseElse,
+    CaseWhen,
+    Comparison,
+    Concept,
+    ConceptRef,
+    Conditional,
+    FilterItem,
+    Function,
+    HavingClause,
+    MagicConstants,
+    Metadata,
+    OrderBy,
+    OrderItem,
+    Parenthetical,
+    SubselectComparison,
+    WhereClause,
+    WindowItem,
+    WindowItemOrder,
+    WindowItemOver,
+    WindowOrder,
+    WindowType,
+)
+from trilogy.core.models.core import DataType, ListType, ListWrapper, StructType
+from trilogy.core.models.environment import Environment
+from trilogy.core.statements.author import (
+    ConceptDeclarationStatement,
+    ConceptTransform,
+    SelectItem,
+    SelectStatement,
+)
+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",
+    "ListType",
+    "ListWrapper",
+    "FunctionType",
+    "FunctionFactory",
+    "ConceptDeclarationStatement",
+    "ConceptTransform",
+    "SelectItem",
+    "SelectStatement",
+    "Environment",
+    "ConceptRef",
+    "HavingClause",
+    "MagicConstants",
+    "Metadata",
+    "OrderBy",
+    "OrderItem",
+    "Parenthetical",
+    "SubselectComparison",
+    "Conditional",
+    "BooleanOperator",
+    "ComparisonOperator",
+    "FunctionClass",
+    "FunctionType",
+    "InfiniteFunctionArgs",
+    "Ordering",
+    "Purpose",
+    "DEFAULT_NAMESPACE",
+    "arbitrary_to_concept",
+    "arg_to_datatype",
+]

{pytrilogy-0.0.3.3 → pytrilogy-0.0.3.4}/trilogy/parsing/common.py

@@ -152,7 +152,6 @@ def constant_to_concept(
     parent: ListWrapper | MapWrapper | list | int | float | str,
     name: str,
     namespace: str,
-    purpose: Purpose | None = None,
     metadata: Metadata | None = None,
 ) -> Concept:
     const_function: Function = Function(
@@ -340,7 +339,6 @@ def filter_item_to_concept(
     name: str,
     namespace: str,
     environment: Environment,
-    purpose: Purpose | None = None,
     metadata: Metadata | None = None,
 ) -> Concept:
     fmetadata = metadata or Metadata()
@@ -377,14 +375,13 @@ def window_item_to_concept(
     name: str,
     namespace: str,
     environment: Environment,
-    purpose: Purpose | None = None,
     metadata: Metadata | None = None,
 ) -> Concept:
     fmetadata = metadata or Metadata()
     bcontent = environment.concepts[parent.content.address]
     if isinstance(bcontent, UndefinedConcept):
         return UndefinedConcept(address=f"{namespace}.{name}", metadata=fmetadata)
-    local_purpose, keys = get_purpose_and_keys(purpose, (bcontent,), environment)
+    local_purpose, keys = get_purpose_and_keys(None, (bcontent,), environment)
 
     if parent.order_by:
         grain_components = parent.over + [bcontent.output]
@@ -568,7 +565,6 @@ def arbitrary_to_concept(
     namespace: str | None = None,
     name: str | None = None,
     metadata: Metadata | None = None,
-    purpose: Purpose | None = None,
 ) -> Concept:
     namespace = namespace or environment.namespace
     if isinstance(parent, AggregateWrapper):
@@ -585,7 +581,6 @@ def arbitrary_to_concept(
             name,
             namespace,
             environment=environment,
-            purpose=purpose,
             metadata=metadata,
         )
     elif isinstance(parent, FilterItem):
@@ -596,7 +591,6 @@ def arbitrary_to_concept(
             name,
             namespace,
             environment=environment,
-            purpose=purpose,
             metadata=metadata,
         )
     elif isinstance(parent, Function):
@@ -612,8 +606,8 @@ def arbitrary_to_concept(
     elif isinstance(parent, ListWrapper):
         if not name:
             name = f"{VIRTUAL_CONCEPT_PREFIX}_{string_to_hash(str(parent))}"
-        return constant_to_concept(parent, name, namespace, purpose, metadata)
+        return constant_to_concept(parent, name, namespace, metadata)
     else:
         if not name:
             name = f"{VIRTUAL_CONCEPT_PREFIX}_{string_to_hash(str(parent))}"
-        return constant_to_concept(parent, name, namespace, purpose, metadata)
+        return constant_to_concept(parent, name, namespace, metadata)

{pytrilogy-0.0.3.3 → pytrilogy-0.0.3.4}/trilogy/parsing/parse_engine.py

@@ -508,8 +508,6 @@ class ParseToObjects(Transformer):
         else:
             metadata = None
         purpose = args[0]
-        if purpose == Purpose.AUTO:
-            purpose = None
         raw_name = args[1]
         # abc.def.property pattern
         if isinstance(raw_name, str):
@@ -538,10 +536,14 @@ class ParseToObjects(Transformer):
                 name=name,
                 namespace=namespace,
                 environment=self.environment,
-                purpose=purpose,
                 metadata=metadata,
             )
 
+            if purpose and purpose != Purpose.AUTO and concept.purpose != purpose:
+                raise SyntaxError(
+                    f'Concept {name} purpose {concept.purpose} does not match declared purpose {purpose}. Suggest defaulting to "auto"'
+                )
+
             if concept.metadata:
                 concept.metadata.line_number = meta.line
             self.environment.add_concept(concept, meta=meta)
@@ -552,7 +554,6 @@ class ParseToObjects(Transformer):
                 source_value,
                 name=name,
                 namespace=namespace,
-                purpose=purpose,
                 metadata=metadata,
             )
             if concept.metadata:
@@ -577,15 +578,6 @@ class ParseToObjects(Transformer):
             namespace=self.environment.namespace or DEFAULT_NAMESPACE,
         )
 
-        # clean up current definitions
-        # to_delete = set()
-        # if output.name in self.environment.named_statements:
-        #     for k, v in self.environment.concepts.items():
-        #         if v.derivation == Derivation.ROWSET and v.lineage.rowset.name == name:
-        #             to_delete.add(k)
-        # for k in to_delete:
-        #     self.environment.concepts.pop(k)
-
         for new_concept in rowset_to_concepts(output, self.environment):
             if new_concept.metadata:
                 new_concept.metadata.line_number = meta.line