pytrilogy 0.0.2.38__tar.gz → 0.0.2.40__tar.gz

{pytrilogy-0.0.2.38/pytrilogy.egg-info → pytrilogy-0.0.2.40}/PKG-INFO

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

{pytrilogy-0.0.2.38 → pytrilogy-0.0.2.40/pytrilogy.egg-info}/PKG-INFO

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

{pytrilogy-0.0.2.38 → pytrilogy-0.0.2.40}/trilogy/__init__.py

@@ -4,6 +4,6 @@ from trilogy.executor import Executor
 from trilogy.parser import parse
 from trilogy.constants import CONFIG
 
-__version__ = "0.0.2.38"
+__version__ = "0.0.2.40"
 
 __all__ = ["parse", "Executor", "Dialects", "Environment", "CONFIG"]

{pytrilogy-0.0.2.38 → pytrilogy-0.0.2.40}/trilogy/core/models.py

@@ -448,8 +448,8 @@ class Concept(Mergeable, Namespaced, SelectContext, BaseModel):
     ] = None
     namespace: Optional[str] = Field(default=DEFAULT_NAMESPACE, validate_default=True)
     keys: Optional[Tuple["Concept", ...]] = None
-    grain: "Grain" = Field(default=None, validate_default=True)
-    modifiers: Optional[List[Modifier]] = Field(default_factory=list)
+    grain: "Grain" = Field(default=None, validate_default=True)  # type: ignore
+    modifiers: List[Modifier] = Field(default_factory=list)  # type: ignore
     pseudonyms: set[str] = Field(default_factory=set)
     _address_cache: str | None = None
 
@@ -3372,7 +3372,7 @@ class Environment(BaseModel):
     functions: Dict[str, Function] = Field(default_factory=dict)
     data_types: Dict[str, DataType] = Field(default_factory=dict)
     imports: Dict[str, list[ImportStatement]] = Field(
-        default_factory=lambda: defaultdict(list)
+        default_factory=lambda: defaultdict(list)  # type: ignore
     )
     namespace: str = DEFAULT_NAMESPACE
     working_path: str | Path = Field(default_factory=lambda: os.getcwd())
@@ -3385,7 +3385,7 @@ class Environment(BaseModel):
 
     def __init__(self, **data):
         super().__init__(**data)
-        self.concepts["_env_working_path"] = Concept(
+        concept = Concept(
             name="_env_working_path",
             namespace=self.namespace,
             lineage=Function(
@@ -3397,6 +3397,7 @@ class Environment(BaseModel):
             datatype=DataType.STRING,
             purpose=Purpose.CONSTANT,
         )
+        self.add_concept(concept)
 
     @classmethod
     def from_file(cls, path: str | Path) -> "Environment":

{pytrilogy-0.0.2.38 → pytrilogy-0.0.2.40}/trilogy/dialect/base.py

@@ -138,10 +138,10 @@ FUNCTION_MAP = {
     FunctionType.STRUCT: lambda x: f"{{{', '.join(struct_arg(x))}}}",
     FunctionType.ARRAY: lambda x: f"[{', '.join(x)}]",
     # math
-    FunctionType.ADD: lambda x: f"{x[0]} + {x[1]}",
-    FunctionType.SUBTRACT: lambda x: f"{x[0]} - {x[1]}",
-    FunctionType.DIVIDE: lambda x: f"{x[0]} / {x[1]}",
-    FunctionType.MULTIPLY: lambda x: f"{x[0]} * {x[1]}",
+    FunctionType.ADD: lambda x: " + ".join(x),
+    FunctionType.SUBTRACT: lambda x: " - ".join(x),
+    FunctionType.DIVIDE: lambda x: " / ".join(x),
+    FunctionType.MULTIPLY: lambda x: " * ".join(x),
     FunctionType.ROUND: lambda x: f"round({x[0]},{x[1]})",
     FunctionType.MOD: lambda x: f"({x[0]} % {x[1]})",
     # aggregate types

{pytrilogy-0.0.2.38 → pytrilogy-0.0.2.40}/trilogy/parsing/parse_engine.py

@@ -1777,7 +1777,7 @@ class ParseToObjects(Transformer):
             output_datatype=output_datatype,
             output_purpose=function_args_to_output_purpose(args),
             valid_inputs={DataType.INTEGER, DataType.FLOAT, DataType.NUMBER},
-            arg_count=2,
+            arg_count=-1,
         )
 
     @v_args(meta=True)
@@ -1790,7 +1790,7 @@ class ParseToObjects(Transformer):
             output_datatype=output_datatype,
             output_purpose=function_args_to_output_purpose(args),
             valid_inputs={DataType.INTEGER, DataType.FLOAT, DataType.NUMBER},
-            arg_count=2,
+            arg_count=-1,
         )
 
     @v_args(meta=True)
@@ -1803,7 +1803,7 @@ class ParseToObjects(Transformer):
             output_datatype=output_datatype,
             output_purpose=function_args_to_output_purpose(args),
             valid_inputs={DataType.INTEGER, DataType.FLOAT, DataType.NUMBER},
-            arg_count=2,
+            arg_count=-1,
         )
 
     @v_args(meta=True)
@@ -1817,7 +1817,7 @@ class ParseToObjects(Transformer):
             output_datatype=DataType.FLOAT,  # division always returns a float
             output_purpose=function_args_to_output_purpose(args),
             valid_inputs={DataType.INTEGER, DataType.FLOAT, DataType.NUMBER},
-            arg_count=2,
+            arg_count=-1,
         )
 
     @v_args(meta=True)

{pytrilogy-0.0.2.38 → pytrilogy-0.0.2.40}/trilogy/parsing/render.py

@@ -395,13 +395,13 @@ class Renderer:
         args = [self.to_string(c) for c in arg.arguments]
 
         if arg.operator == FunctionType.SUBTRACT:
-            return f"{args[0]} - {args[1]}"
+            return " - ".join(args)
         if arg.operator == FunctionType.ADD:
-            return f"{args[0]} + {args[1]}"
+            return " + ".join(args)
         if arg.operator == FunctionType.MULTIPLY:
-            return f"{args[0]} * {args[1]}"
+            return " * ".join(args)
         if arg.operator == FunctionType.DIVIDE:
-            return f"{args[0]} / {args[1]}"
+            return " / ".join(args)
         if arg.operator == FunctionType.MOD:
             return f"{args[0]} % {args[1]}"