Replaced dict typehint by Expression in operators

src/monggregate/operators/accumulators/avg.py

@@ -71,6 +71,7 @@
 
 
 from typing import Any
+from monggregate.base import Expression
 from monggregate.operators.accumulators.accumulator import Accumulator
 
 class Average(Accumulator):
@@ -105,7 +106,7 @@ class Average(Accumulator):
     operand : Any
 
     @property
-    def expression(self) -> dict:
+    def expression(self) -> Expression:
 
         return self.express({
             "$avg" : self.operand

src/monggregate/operators/accumulators/count.py

@@ -44,7 +44,7 @@
 
 """
 
-
+from monggregate.base import Expression
 from monggregate.operators.accumulators.accumulator import Accumulator
 
 class Count(Accumulator):
@@ -70,7 +70,7 @@ class Count(Accumulator):
 
 
     @property
-    def expression(self) -> dict:
+    def expression(self) -> Expression:
 
         return self.express({
             "$count" : {}

src/monggregate/operators/accumulators/first.py

@@ -60,6 +60,7 @@
 
 
 from typing import Any
+from monggregate.base import Expression
 from monggregate.operators.accumulators.accumulator import Accumulator
 
 class First(Accumulator):
@@ -92,7 +93,7 @@ class First(Accumulator):
 
 
     @property
-    def expression(self) -> dict:
+    def expression(self) -> Expression:
 
         return self.express({
             "$first" : self.operand

src/monggregate/operators/accumulators/last.py

@@ -52,6 +52,7 @@
 
 
 from typing import Any
+from monggregate.base import Expression
 from monggregate.operators.accumulators.accumulator import Accumulator
 
 class Last(Accumulator):
@@ -85,7 +86,7 @@ class Last(Accumulator):
 
 
     @property
-    def expression(self) -> dict:
+    def expression(self) -> Expression:
 
         return self.express({
             "$last" : self.operand

src/monggregate/operators/accumulators/max.py

@@ -77,6 +77,7 @@
 
 
 from typing import Any
+from monggregate.base import Expression
 from monggregate.operators.accumulators.accumulator import Accumulator
 
 class Max(Accumulator):
@@ -114,7 +115,7 @@ class Max(Accumulator):
 
 
     @property
-    def expression(self) -> dict:
+    def expression(self) -> Expression:
 
         return self.express({
             "$max" : self.operand

src/monggregate/operators/accumulators/min.py

@@ -77,6 +77,7 @@
 """
 
 from typing import Any
+from monggregate.base import Expression
 from monggregate.operators.accumulators.accumulator import Accumulator
 
 class Min(Accumulator):
@@ -114,7 +115,7 @@ class Min(Accumulator):
 
 
     @property
-    def expression(self) -> dict:
+    def expression(self) -> Expression:
 
         return self.express({
             "$min" : self.operand

src/monggregate/operators/accumulators/push.py

@@ -29,6 +29,7 @@
 """
 
 from typing import Any
+from monggregate.base import Expression
 from monggregate.operators.accumulators.accumulator import Accumulator
 
 class Push(Accumulator):
@@ -57,7 +58,7 @@ class Push(Accumulator):
 
 
     @property
-    def expression(self) -> dict:
+    def expression(self) -> Expression:
 
         return self.express({
             "$push" : self.operand

src/monggregate/operators/accumulators/sum.py

@@ -86,6 +86,7 @@
 """
 
 from typing import Any
+from monggregate.base import Expression
 from monggregate.operators.accumulators.accumulator import Accumulator
 
 class Sum(Accumulator):
@@ -123,7 +124,7 @@ class Sum(Accumulator):
 
 
     @property
-    def expression(self) -> dict:
+    def expression(self) -> Expression:
 
         return self.express({
             "$sum" : self.operand

src/monggregate/operators/arithmetic/add.py

@@ -21,6 +21,7 @@
 """
 
 from typing import Any
+from monggregate.base import Expression
 from monggregate.operators.arithmetic.arithmetic import ArithmeticOperator
 
 class Add(ArithmeticOperator):
@@ -53,7 +54,7 @@ class Add(ArithmeticOperator):
     operands : list[Any]
 
     @property
-    def expression(self) -> dict:
+    def expression(self) -> Expression:
         return self.express({
             "$add" : self.operands
         })

src/monggregate/operators/arithmetic/divide.py

@@ -23,6 +23,7 @@
 """
 
 from typing import Any
+from monggregate.base import Expression
 from monggregate.operators.arithmetic.arithmetic import ArithmeticOperator
 
 class Divide(ArithmeticOperator):
@@ -57,7 +58,7 @@ class Divide(ArithmeticOperator):
     denominator : Any
 
     @property
-    def expression(self) -> dict:
+    def expression(self) -> Expression:
         return self.express({
             "$divide" : [self.numerator, self.denominator]
         })

src/monggregate/operators/arithmetic/multiply.py

@@ -22,6 +22,7 @@
 """
 
 from typing import Any
+from monggregate.base import Expression
 from monggregate.operators.arithmetic.arithmetic import ArithmeticOperator
 
 class Multiply(ArithmeticOperator):
@@ -52,7 +53,7 @@ class Multiply(ArithmeticOperator):
     operands : list[Any]
 
     @property
-    def expression(self) -> dict:
+    def expression(self) -> Expression:
         return self.express({
             "$multiply" : self.operands
         })

src/monggregate/operators/arithmetic/pow.py

@@ -40,6 +40,7 @@
 """
 
 from typing import Any
+from monggregate.base import Expression
 from monggregate.operators.arithmetic.arithmetic import ArithmeticOperator
 
 class Pow(ArithmeticOperator):
@@ -73,7 +74,7 @@ class Pow(ArithmeticOperator):
     exponent : Any
 
     @property
-    def expression(self) -> dict:
+    def expression(self) -> Expression:
         return self.express({
             "$pow" : [self.number, self.exponent]
         })

src/monggregate/operators/arithmetic/subtract.py

@@ -37,6 +37,7 @@
 """
 
 from typing import Any
+from monggregate.base import Expression
 from monggregate.operators.arithmetic.arithmetic import ArithmeticOperator
 
 class Subtract(ArithmeticOperator):
@@ -73,7 +74,7 @@ class Subtract(ArithmeticOperator):
     right: Any
 
     @property
-    def expression(self) -> dict:
+    def expression(self) -> Expression:
         return self.express({
             "$substract" : [self.left, self.right]
         })

src/monggregate/operators/array/array_to_object.py

@@ -49,6 +49,7 @@
 """
 
 from typing import Any
+from monggregate.base import Expression
 from monggregate.operators.array.array import ArrayOperator
 
 class ArrayToObject(ArrayOperator):
@@ -92,7 +93,7 @@ class ArrayToObject(ArrayOperator):
 
 
     @property
-    def expression(self) -> dict:
+    def expression(self) -> Expression:
         return self.express({
             "$arrayToObject" : self.operand
         })

src/monggregate/operators/array/filter.py

@@ -43,7 +43,7 @@
 """
 
 from typing import Any
-from monggregate.base import pyd
+from monggregate.base import pyd, Expression
 from monggregate.operators.array.array import ArrayOperator
 
 class Filter(ArrayOperator):
@@ -110,7 +110,7 @@ class Filter(ArrayOperator):
     limit : int | None = pyd.Field(None, ge=1) # NOTE : limit can actually be an expression but constraints are  invalid with any type
 
     @property
-    def expression(self) -> dict:
+    def expression(self) -> Expression:
         return self.express({
             "$filter":{
                "input" : self.operand,

src/monggregate/operators/array/first.py

@@ -98,6 +98,7 @@
 """
 
 from typing import Any
+from monggregate.base import Expression
 from monggregate.operators.array.array import ArrayOnlyOperator
 
 class First(ArrayOnlyOperator):
@@ -116,7 +117,7 @@ class First(ArrayOnlyOperator):
     """
 
     @property
-    def expression(self) -> dict:
+    def expression(self) -> Expression:
         return self.express({
             "$first":self.operand
         })

src/monggregate/operators/array/in_.py

@@ -31,6 +31,7 @@
 """
 
 from typing import Any
+from monggregate.base import Expression
 from monggregate.operators.array.array import ArrayOperator
 
 class In(ArrayOperator):
@@ -65,7 +66,7 @@ class In(ArrayOperator):
 
 
     @property
-    def expression(self) -> dict:
+    def expression(self) -> Expression:
         return self.express({
             "$in":[self.left, self.right]
         })

src/monggregate/operators/array/is_array.py

@@ -26,6 +26,7 @@
 """
 
 from typing import Any
+from monggregate.base import Expression
 from monggregate.operators.array.array import ArrayOnlyOperator
 
 class IsArray(ArrayOnlyOperator):
@@ -47,7 +48,7 @@ class IsArray(ArrayOnlyOperator):
     """
 
     @property
-    def expression(self) -> dict:
+    def expression(self) -> Expression:
         return self.express({
             "$isArray":self.operand
         })

src/monggregate/operators/array/last.py

@@ -102,6 +102,7 @@
 """
 
 from typing import Any
+from monggregate.base import Expression
 from monggregate.operators.array.array import ArrayOnlyOperator
 
 class Last(ArrayOnlyOperator):
@@ -126,7 +127,7 @@ class Last(ArrayOnlyOperator):
     """
 
     @property
-    def expression(self) -> dict:
+    def expression(self) -> Expression:
         return self.express({
             "$last":self.operand
         })

src/monggregate/operators/array/max_n.py

@@ -45,7 +45,7 @@
 """
 
 from typing import Any
-from monggregate.base import pyd
+from monggregate.base import pyd, Expression
 from monggregate.operators.array.array import ArrayOperator
 
 class MaxN(ArrayOperator):
@@ -70,7 +70,7 @@ class MaxN(ArrayOperator):
     limit : Any = pyd.Field(1, alias="n")
 
     @property
-    def expression(self) -> dict:
+    def expression(self) -> Expression:
         return self.express({
             "$maxN" : {
                 "n" : self.limit,

src/monggregate/operators/array/min_n.py

@@ -45,7 +45,7 @@
 """
 
 from typing import Any
-from monggregate.base import pyd
+from monggregate.base import pyd, Expression
 from monggregate.operators.array.array import ArrayOperator
 
 class MinN(ArrayOperator):
@@ -69,7 +69,7 @@ class MinN(ArrayOperator):
     limit : Any = pyd.Field(1, alias="n")
 
     @property
-    def expression(self) -> dict:
+    def expression(self) -> Expression:
         return self.express({
             "$minN" : {
                 "n" : self.limit,

src/monggregate/operators/array/size.py

@@ -28,6 +28,7 @@
 """
 
 from typing import Any
+from monggregate.base import Expression
 from monggregate.operators.array.array import ArrayOnlyOperator
 
 class Size(ArrayOnlyOperator):
@@ -54,7 +55,7 @@ class Size(ArrayOnlyOperator):
     """
 
     @property
-    def expression(self) -> dict:
+    def expression(self) -> Expression:
         return self.express({
             "$size":self.operand
         })

src/monggregate/operators/array/sort_array.py

@@ -83,7 +83,7 @@
 
 from typing import Any, Literal
 
-from monggregate.base import pyd
+from monggregate.base import pyd, Expression
 from monggregate.operators.array.array import ArrayOperator
 
 class SortArray(ArrayOperator):
@@ -123,7 +123,7 @@ class SortArray(ArrayOperator):
     by : dict[str, Literal[1, -1]] = pyd.Field(1, alias="sort_by")
 
     @property
-    def expression(self) -> dict:
+    def expression(self) -> Expression:
         return self.express({
             "$sortArray":{
                 "input" : self.operand,