omlish 0.0.0.dev119__tar.gz → 0.0.0.dev120__tar.gz

{omlish-0.0.0.dev119/omlish.egg-info → omlish-0.0.0.dev120}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omlish
-Version: 0.0.0.dev119
+Version: 0.0.0.dev120
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev119 → omlish-0.0.0.dev120}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev119'
-__revision__ = 'abf03cc06fe1610ddf750a1392aa9c9de00acfd3'
+__version__ = '0.0.0.dev120'
+__revision__ = 'aada6beb1d685cb095429e9c588d266b8a83aa23'
 
 
 #

{omlish-0.0.0.dev119 → omlish-0.0.0.dev120}/omlish/specs/jmespath/__init__.py

@@ -1,6 +1,10 @@
 """
 TODO:
- - @omlish-lite
+ - @omlish-lite ?
+ - 'recipes'
+ - abstract runtime
+  - https://github.com/wrmsr/omnibus/blob/c2ff67b6c5c80aa03fe27a9b6f36212f3212c7ca/omnibus/jmespath/eval.py#L64
+ - pytest-ify
 
 Applied:
  https://github.com/jmespath-community/python-jmespath/compare/bbe7300c60056f52413603cf3e2bcd0b6afeda3d...aef45e9d665de662eee31b06aeb8261e2bc8b90a

{omlish-0.0.0.dev119 → omlish-0.0.0.dev120}/omlish/specs/jmespath/ast.py

@@ -20,9 +20,15 @@ class LeafNode(Node, lang.Abstract):
         return []
 
 
+UnaryArithmeticOperator: ta.TypeAlias = ta.Literal[
+    'plus',
+    'minus',
+]
+
+
 @dc.dataclass(frozen=True)
 class ArithmeticUnary(Node, lang.Final):
-    operator: str
+    operator: UnaryArithmeticOperator
     expression: Node
 
     @property
@@ -30,9 +36,19 @@ class ArithmeticUnary(Node, lang.Final):
         return [self.expression]
 
 
+ArithmeticOperator: ta.TypeAlias = ta.Literal[
+    'div',
+    'divide',
+    'minus',
+    'modulo',
+    'multiply',
+    'plus',
+]
+
+
 @dc.dataclass(frozen=True)
 class Arithmetic(Node, lang.Final):
-    operator: str
+    operator: ArithmeticOperator
     left: Node
     right: Node
 
@@ -51,9 +67,19 @@ class Assign(Node, lang.Final):
         return [self.expr]
 
 
+ComparatorName: ta.TypeAlias = ta.Literal[
+    'eq',
+    'ne',
+    'lt',
+    'gt',
+    'lte',
+    'gte',
+]
+
+
 @dc.dataclass(frozen=True)
 class Comparator(Node, lang.Final):
-    name: str
+    name: ComparatorName
     first: Node
     second: Node
 

{omlish-0.0.0.dev119 → omlish-0.0.0.dev120}/omlish/specs/jmespath/functions.py

@@ -638,6 +638,14 @@ class ObjectFunctions(FunctionsClass):
     def _func_values(self, arg):
         return list(arg.values())
 
+    @signature({'types': ['expref']}, {'types': ['object']})
+    def _func_filter_keys(self, expref, arg):
+        return {k: v for k, v in arg.items() if expref.visit(expref.expression, k)}
+
+    @signature({'types': ['expref']}, {'types': ['object']})
+    def _func_filter_values(self, expref, arg):
+        return {k: v for k, v in arg.items() if expref.visit(expref.expression, v)}
+
 
 class KeyedFunctions(FunctionsClass):
     def _create_key_func(self, expref, allowed_types, function_name):

{omlish-0.0.0.dev119 → omlish-0.0.0.dev120}/omlish/specs/jmespath/parser.py

@@ -27,9 +27,11 @@ import typing as ta
 from ... import check
 from .ast import AndExpression
 from .ast import Arithmetic
+from .ast import ArithmeticOperator
 from .ast import ArithmeticUnary
 from .ast import Assign
 from .ast import Comparator
+from .ast import ComparatorName
 from .ast import CurrentNode
 from .ast import Expref
 from .ast import Field
@@ -52,6 +54,7 @@ from .ast import Projection
 from .ast import RootNode
 from .ast import Slice
 from .ast import Subexpression
+from .ast import UnaryArithmeticOperator
 from .ast import ValueProjection
 from .ast import VariableRef
 from .exceptions import IncompleteExpressionError
@@ -491,15 +494,15 @@ class Parser:
 
     def _parse_comparator(self, left: Node, comparator: str) -> Node:
         right = self._expression(self.BINDING_POWER[comparator])
-        return Comparator(comparator, left, right)
+        return Comparator(ta.cast(ComparatorName, comparator), left, right)
 
     def _parse_arithmetic_unary(self, token: Token) -> Node:
         expression = self._expression(self.BINDING_POWER[token['type']])
-        return ArithmeticUnary(token['type'], expression)
+        return ArithmeticUnary(ta.cast(UnaryArithmeticOperator, token['type']), expression)
 
     def _parse_arithmetic(self, left: Node, operator: str) -> Node:
         right = self._expression(self.BINDING_POWER[operator])
-        return Arithmetic(operator, left, right)
+        return Arithmetic(ta.cast(ArithmeticOperator, operator), left, right)
 
     def _parse_multi_select_list(self) -> Node:
         expressions: list[Node] = []

{omlish-0.0.0.dev119 → omlish-0.0.0.dev120}/omlish/specs/jmespath/visitor.py

@@ -6,9 +6,11 @@ from ... import check
 from ... import lang
 from .ast import AndExpression
 from .ast import Arithmetic
+from .ast import ArithmeticOperator
 from .ast import ArithmeticUnary
 from .ast import Assign
 from .ast import Comparator
+from .ast import ComparatorName
 from .ast import CurrentNode
 from .ast import Expref
 from .ast import Field
@@ -31,6 +33,7 @@ from .ast import Projection
 from .ast import RootNode
 from .ast import Slice
 from .ast import Subexpression
+from .ast import UnaryArithmeticOperator
 from .ast import ValueProjection
 from .ast import VariableRef
 from .exceptions import UndefinedVariableError
@@ -164,7 +167,7 @@ class _Expression:
 
 
 class TreeInterpreter(Visitor):
-    COMPARATOR_FUNC: ta.Mapping[str, ta.Callable] = {
+    _COMPARATOR_FUNC: ta.Mapping[ComparatorName, ta.Callable] = {
         'eq': _equals,
         'ne': lambda x, y: not _equals(x, y),
         'lt': operator.lt,
@@ -173,17 +176,12 @@ class TreeInterpreter(Visitor):
         'gte': operator.ge,
     }
 
-    _EQUALITY_OPS: ta.AbstractSet[str] = {
+    _EQUALITY_OPS: ta.AbstractSet[ComparatorName] = {
         'eq',
         'ne',
     }
 
-    _ARITHMETIC_UNARY_FUNC: ta.Mapping[str, ta.Callable] = {
-        'minus': operator.neg,
-        'plus': lambda x: x,
-    }
-
-    _ARITHMETIC_FUNC: ta.Mapping[str, ta.Callable] = {
+    _ARITHMETIC_FUNC: ta.Mapping[ArithmeticOperator, ta.Callable] = {
         'div': operator.floordiv,
         'divide': operator.truediv,
         'minus': operator.sub,
@@ -192,6 +190,11 @@ class TreeInterpreter(Visitor):
         'plus': operator.add,
     }
 
+    _ARITHMETIC_UNARY_FUNC: ta.Mapping[UnaryArithmeticOperator, ta.Callable] = {
+        'minus': operator.neg,
+        'plus': lambda x: x,
+    }
+
     def __init__(self, options: Options | None = None) -> None:
         super().__init__()
 
@@ -235,7 +238,7 @@ class TreeInterpreter(Visitor):
 
     def visit_comparator(self, node: Comparator, value: ta.Any) -> ta.Any:
         # Common case: comparator is == or !=
-        comparator_func = self.COMPARATOR_FUNC[node.name]
+        comparator_func = self._COMPARATOR_FUNC[node.name]
         if node.name in self._EQUALITY_OPS:
             return comparator_func(
                 self.visit(node.first, value),

{omlish-0.0.0.dev119 → omlish-0.0.0.dev120/omlish.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omlish
-Version: 0.0.0.dev119
+Version: 0.0.0.dev120
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev119 → omlish-0.0.0.dev120}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = {text = 'BSD-3-Clause'}
 requires-python = '>=3.12'
-version = '0.0.0.dev119'
+version = '0.0.0.dev120'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',