pytrilogy 0.0.3.116__tar.gz → 0.0.3.119__tar.gz

{pytrilogy-0.0.3.116/pytrilogy.egg-info → pytrilogy-0.0.3.119}/PKG-INFO

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

{pytrilogy-0.0.3.116 → pytrilogy-0.0.3.119/pytrilogy.egg-info}/PKG-INFO

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

{pytrilogy-0.0.3.116 → pytrilogy-0.0.3.119}/pytrilogy.egg-info/SOURCES.txt

@@ -168,4 +168,5 @@ trilogy/std/metric.preql
 trilogy/std/money.preql
 trilogy/std/net.preql
 trilogy/std/ranking.preql
-trilogy/std/report.preql
+trilogy/std/report.preql
+trilogy/std/semantic.preql

{pytrilogy-0.0.3.116 → pytrilogy-0.0.3.119}/tests/test_typing.py

@@ -110,9 +110,12 @@ signup_date.year::int::dtypes.year as signup_year_two;"""
 
     assert "dtypes.year" in env.environment.data_types
 
-    assert env.environment.concepts["signup_year_two"].datatype.traits == [
-        "dtypes.year"
-    ]
+    assert set(env.environment.concepts["signup_year_two"].datatype.traits) == set(
+        [
+            "year",
+            "dtypes.year",
+        ]
+    )
 
 
 def test_typing_aggregate():

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

{pytrilogy-0.0.3.116 → pytrilogy-0.0.3.119}/trilogy/core/functions.py

@@ -19,6 +19,7 @@ from trilogy.core.models.author import (
     Concept,
     ConceptRef,
     Conditional,
+    CustomType,
     Function,
     Parenthetical,
     UndefinedConcept,
@@ -40,6 +41,11 @@ from trilogy.core.models.environment import Environment
 GENERIC_ARGS = Concept | ConceptRef | Function | str | int | float | date | datetime
 
 
+CUSTOM_PLACEHOLDER = CustomType(
+    name="__placeholder__", type=DataType.UNKNOWN, drop_on=[], add_on=[]
+)
+
+
 @dataclass
 class FunctionConfig:
     arg_count: int = 1
@@ -99,7 +105,18 @@ def get_attr_datatype(
 
 def get_cast_output_type(
     args: list[Any],
-) -> DataType:
+) -> DataType | TraitDataType:
+    base = arg_to_datatype(args[0])
+    if isinstance(base, TraitDataType):
+        traits = base.traits
+    else:
+        traits = []
+    if isinstance(args[1], TraitDataType):
+        return TraitDataType(
+            type=args[1].type, traits=list(set(traits + args[1].traits))
+        )
+    elif traits:
+        return TraitDataType(type=args[1], traits=traits)
     return args[1]
 
 
@@ -995,6 +1012,19 @@ class FunctionFactory:
             final_output_type = base_output_type
         else:
             raise SyntaxError(f"Could not determine output type for {operator}")
+        if isinstance(final_output_type, TraitDataType) and self.environment:
+            final_output_type = TraitDataType(
+                type=final_output_type.type,
+                traits=[
+                    x
+                    for x in final_output_type.traits
+                    if operator
+                    not in self.environment.data_types.get(
+                        x, CUSTOM_PLACEHOLDER
+                    ).drop_on
+                ],
+            )
+
         if not output_purpose:
             if operator in FunctionClass.AGGREGATE_FUNCTIONS.value:
                 output_purpose = Purpose.METRIC

{pytrilogy-0.0.3.116 → pytrilogy-0.0.3.119}/trilogy/core/models/author.py

@@ -2598,11 +2598,16 @@ class ArgBinding(Namespaced, DataTyped, BaseModel):
 
 class CustomType(BaseModel):
     name: str
-    type: DataType
+    type: DataType | list[DataType]
+    drop_on: list[FunctionType] = Field(default_factory=list)
+    add_on: list[FunctionType] = Field(default_factory=list)
 
     def with_namespace(self, namespace: str) -> "CustomType":
         return CustomType.model_construct(
-            name=address_with_namespace(self.name, namespace), type=self.type
+            name=address_with_namespace(self.name, namespace),
+            type=self.type,
+            drop_on=self.drop_on,
+            add_on=self.add_on,
         )
 
 

{pytrilogy-0.0.3.116 → pytrilogy-0.0.3.119}/trilogy/core/models/core.py

@@ -99,6 +99,7 @@ class DataType(Enum):
 
     # PARSING
     UNKNOWN = "unknown"
+    ANY = "any"
 
     @property
     def data_type(self):
@@ -411,6 +412,12 @@ def merge_datatypes(
 
 def is_compatible_datatype(left, right):
     # for unknown types, we can't make any assumptions
+    if isinstance(left, list):
+        return any(is_compatible_datatype(ltype, right) for ltype in left)
+    if isinstance(right, list):
+        return any(is_compatible_datatype(left, rtype) for rtype in right)
+    if left == DataType.ANY or right == DataType.ANY:
+        return True
     if all(
         isinstance(x, NumericType)
         or x in (DataType.INTEGER, DataType.FLOAT, DataType.NUMERIC)

{pytrilogy-0.0.3.116 → pytrilogy-0.0.3.119}/trilogy/parsing/parse_engine.py

@@ -171,6 +171,16 @@ class FunctionBindingType:
     type: DataType | TraitDataType | None = None
 
 
+@dataclass
+class DropOn:
+    functions: List[FunctionType]
+
+
+@dataclass
+class AddOn:
+    functions: List[FunctionType]
+
+
 with open(join(dirname(__file__), "trilogy.lark"), "r") as f:
     PARSER = Lark(
         f.read(),
@@ -425,6 +435,9 @@ class ParseToObjects(Transformer):
     def IDENTIFIER(self, args) -> str:
         return args.value
 
+    def ORDER_IDENTIFIER(self, args) -> ConceptRef:
+        return self.environment.concepts[args.value.strip()].reference
+
     def WILDCARD_IDENTIFIER(self, args) -> str:
         return args.value
 
@@ -1509,11 +1522,35 @@ class ParseToObjects(Transformer):
     def function(self, meta: Meta, args) -> Function:
         return args[0]
 
+    @v_args(meta=True)
+    def type_drop_clause(self, meta: Meta, args) -> DropOn:
+        return DropOn([FunctionType(x) for x in args])
+
+    @v_args(meta=True)
+    def type_add_clause(self, meta: Meta, args) -> AddOn:
+        return AddOn([FunctionType(x) for x in args])
+
     @v_args(meta=True)
     def type_declaration(self, meta: Meta, args) -> TypeDeclaration:
         key = args[0]
-        datatype = args[1]
-        new = CustomType(name=key, type=datatype)
+        datatype: list[DataType] = [x for x in args[1:] if isinstance(x, DataType)]
+        if len(datatype) == 1:
+            final_datatype: list[DataType] | DataType = datatype[0]
+        else:
+            final_datatype = datatype
+        add_on = None
+        drop_on = None
+        for x in args[1:]:
+            if isinstance(x, AddOn):
+                add_on = x
+            elif isinstance(x, DropOn):
+                drop_on = x
+        new = CustomType(
+            name=key,
+            type=final_datatype,
+            drop_on=drop_on.functions if drop_on else [],
+            add_on=add_on.functions if add_on else [],
+        )
         self.environment.data_types[key] = new
         return TypeDeclaration(type=new)
 
@@ -2346,7 +2383,7 @@ def inject_context_maker(pos: int, text: str, span: int = 40) -> str:
         rcap = ""
         # if it goes beyond the end of text, no ...
         # if it terminates on a space, no need for ...
-        if not after[-1].isspace() and not (end > len(text)):
+        if after and not after[-1].isspace() and not (end > len(text)):
             rcap = "..."
         lcap = ""
         if start > 0 and not before[0].isspace():
@@ -2405,6 +2442,10 @@ def parse_text(
         """Handle UnexpectedToken errors to make friendlier error messages."""
         # Handle ordering direction error
         pos = e.pos_in_stream or 0
+        if e.interactive_parser.lexer_thread.state:
+            last_token = e.interactive_parser.lexer_thread.state.last_token
+        else:
+            last_token = None
         if e.expected == {"ORDERING_DIRECTION"}:
             raise _create_syntax_error(210, pos, text)
 
@@ -2412,19 +2453,22 @@ def parse_text(
         parsed_tokens = (
             [x.value for x in e.token_history if x] if e.token_history else []
         )
+
         if parsed_tokens == ["FROM"]:
             raise _create_syntax_error(101, pos, text)
         # check if they are missing a semicolon
-        try:
-            e.interactive_parser.feed_token(Token("_TERMINATOR", ";"))
-            state = e.interactive_parser.lexer_thread.state
-            if state and state.last_token:
-                new_pos = state.last_token.end_pos or pos
-            else:
-                new_pos = pos
-            raise _create_syntax_error(202, new_pos, text)
-        except UnexpectedToken:
-            pass
+        if last_token and e.token.type == "$END":
+            try:
+
+                e.interactive_parser.feed_token(Token("_TERMINATOR", ";"))
+                state = e.interactive_parser.lexer_thread.state
+                if state and state.last_token:
+                    new_pos = state.last_token.end_pos or pos
+                else:
+                    new_pos = pos
+                raise _create_syntax_error(202, new_pos, text)
+            except UnexpectedToken:
+                pass
         # check if they forgot an as
         try:
             e.interactive_parser.feed_token(Token("AS", "AS"))

{pytrilogy-0.0.3.116 → pytrilogy-0.0.3.119}/trilogy/parsing/trilogy.lark

@@ -109,7 +109,9 @@
     raw_function: "def"  IDENTIFIER  "("  function_binding_list ")" "->" expr
 
     // TYPE blocks
-    type_declaration: "type" IDENTIFIER data_type 
+    type_drop_clause: "DROP"  IDENTIFIER ("|" IDENTIFIER)*
+    //type_add_clause: "ADD" IDENTIFIER ("|" IDENTIFIER)* type_add_clause?
+    type_declaration: "type" IDENTIFIER data_type ("|" data_type)* type_drop_clause? 
 
     // user_id where state = Mexico
     _filter_alt: (IDENTIFIER | literal | "(" expr ")") "?" conditional
@@ -139,7 +141,8 @@
     
     limit: "LIMIT"i /[0-9]+/
 
-    _order_atom: expr ordering
+    ORDER_IDENTIFIER.2: /(?!LIMIT)[a-zA-Z_][a-zA-Z0-9_\.]*\s+/
+    _order_atom: (ORDER_IDENTIFIER ordering) | (expr ordering)
     
     order_list: _order_atom (","  _order_atom)* ","?
     

{pytrilogy-0.0.3.116 → pytrilogy-0.0.3.119}/trilogy/std/ranking.preql

@@ -4,3 +4,4 @@ type score int;
 type position int;
 type index int;
 type grade int;
+type letter_grade string;

pytrilogy-0.0.3.119/trilogy/std/semantic.preql

@@ -0,0 +1,6 @@
+
+
+type identifier any;
+type flag any 
+    drop sum|count|avg|add|subtract|multiply|divide|mod
+;