tmp

Author: saulshanabrook

Cargo.lock

@@ -28,6 +28,7 @@ ordered-float = "5"
 uuid = { version = "1.18", features = ["v4"] }
 rayon = "1.11"
 base64 = "0.22.1"
+tempfile = "3.24.0"
 
 # Use patched version of egglog in experimental
 [patch.'https://github.com/egraphs-good/egglog']

Cargo.toml

@@ -81,7 +81,7 @@ def __str__(self) -> str:
 
 class Unit(BuiltinExpr, egg_sort="Unit"):
     """
-    The unit type. This is used to reprsent if a value exists in the e-graph or not.
+    The unit type. This is used to represent if a value exists in the e-graph or not.
     """
 
     def __init__(self) -> None: ...
@@ -288,6 +288,9 @@ def bool_ge(self, other: i64Like) -> Bool: ...
     @method(egg_fn="abs")
     def __abs__(self) -> i64: ...
 
+    @method(egg_fn="vec-range")
+    def range(self) -> Vec[i64]: ...
+
 
 # The types which can be converted into an i64
 i64Like: TypeAlias = i64 | int  # noqa: N816, PYI042
@@ -1024,6 +1027,9 @@ def set(self, index: i64Like, value: T) -> Vec[T]: ...
     @method(egg_fn="vec-union")
     def __or__(self, other: Vec[T]) -> Vec[T]: ...
 
+    @method(egg_fn="unstable-vec-map", reverse_args=True)
+    def map(self, fn: Callable[[T], V]) -> Vec[V]: ...
+
 
 for sequence_type in (list, tuple):
     converter(
@@ -1036,87 +1042,6 @@ def __or__(self, other: Vec[T]) -> Vec[T]: ...
 
 VecLike: TypeAlias = Vec[T] | tuple[TO, ...] | list[TO]
 
-v = Vec(i64(10))
-v.append([i64(10)])
-
-
-class PyObject(BuiltinExpr, egg_sort="PyObject"):
-    @method(preserve=True)
-    @deprecated("use .value")
-    def eval(self) -> object:
-        return self.value
-
-    @method(preserve=True)  # type: ignore[prop-decorator]
-    @property
-    def value(self) -> object:
-        expr = cast("RuntimeExpr", self).__egg_typed_expr__.expr
-        if not isinstance(expr, PyObjectDecl):
-            raise ExprValueError(self, "PyObject(x)")
-        return cloudpickle.loads(expr.pickled)
-
-    __match_args__ = ("value",)
-
-    def __init__(self, value: object) -> None: ...
-
-    @method(egg_fn="py-call")
-    def __call__(self, *args: object) -> PyObject: ...
-
-    @method(egg_fn="py-call-extended")
-    def call_extended(self, args: PyObject, kwargs: PyObject) -> PyObject:
-        """
-        Call the PyObject with the given args and kwargs PyObjects.
-        """
-
-    @method(egg_fn="py-from-string")
-    @classmethod
-    def from_string(cls, s: StringLike) -> PyObject: ...
-
-    @method(egg_fn="py-to-string")
-    def to_string(self) -> String: ...
-
-    @method(egg_fn="py-to-bool")
-    def to_bool(self) -> Bool: ...
-
-    @method(egg_fn="py-dict-update")
-    def dict_update(self, *keys_and_values: object) -> PyObject: ...
-
-    @method(egg_fn="py-from-int")
-    @classmethod
-    def from_int(cls, i: i64Like) -> PyObject: ...
-
-    @method(egg_fn="py-dict")
-    @classmethod
-    def dict(cls, *keys_and_values: object) -> PyObject: ...
-
-
-converter(object, PyObject, PyObject)
-
-
-@function(builtin=True, egg_fn="py-eval")
-def py_eval(code: StringLike, globals: object = PyObject.dict(), locals: object = PyObject.dict()) -> PyObject: ...
-
-
-class PyObjectFunction(Protocol):
-    def __call__(self, *__args: PyObject) -> PyObject: ...
-
-
-@deprecated("use PyObject(fn) directly")
-def py_eval_fn(fn: Callable) -> PyObjectFunction:
-    """
-    Takes a python callable and maps it to a callable which takes and returns PyObjects.
-
-    It translates it to a call which uses `py_eval` to call the function, passing in the
-    args as locals, and using the globals from function.
-    """
-    return PyObject(fn)
-
-
-@function(builtin=True, egg_fn="py-exec")
-def py_exec(code: StringLike, globals: object = PyObject.dict(), locals: object = PyObject.dict()) -> PyObject:
-    """
-    Copies the locals, execs the Python code, and returns the locals with any updates.
-    """
-
 
 TS = TypeVarTuple("TS")
 
@@ -1167,9 +1092,9 @@ def __call__(self, *args: *TS) -> T: ...
 
 
 # Method Type is for builtins like __getitem__
-converter(MethodType, UnstableFn, lambda m: UnstableFn[*get_type_args()](m.__func__, m.__self__))
-converter(RuntimeFunction, UnstableFn, lambda rf: UnstableFn[*get_type_args()](rf))
-converter(partial, UnstableFn, lambda p: UnstableFn[*get_type_args()](p.func, *p.args))
+converter(MethodType, UnstableFn, lambda m: UnstableFn[*get_type_args()](m.__func__, m.__self__))  # type: ignore[operator, misc]
+converter(RuntimeFunction, UnstableFn, lambda rf: UnstableFn[*get_type_args()](rf))  # type: ignore[operator, misc]
+converter(partial, UnstableFn, lambda p: UnstableFn[*get_type_args()](p.func, *p.args))  # type: ignore[operator, misc]
 
 
 def _convert_function(fn: FunctionType) -> UnstableFn:
@@ -1207,5 +1132,83 @@ def _convert_function(fn: FunctionType) -> UnstableFn:
 converter(FunctionType, UnstableFn, _convert_function)
 
 
+class PyObject(BuiltinExpr, egg_sort="PyObject"):
+    @method(preserve=True)
+    @deprecated("use .value")
+    def eval(self) -> object:
+        return self.value
+
+    @method(preserve=True)  # type: ignore[prop-decorator]
+    @property
+    def value(self) -> object:
+        expr = cast("RuntimeExpr", self).__egg_typed_expr__.expr
+        if not isinstance(expr, PyObjectDecl):
+            raise ExprValueError(self, "PyObject(x)")
+        return cloudpickle.loads(expr.pickled)
+
+    __match_args__ = ("value",)
+
+    def __init__(self, value: object) -> None: ...
+
+    @method(egg_fn="py-call")
+    def __call__(self, *args: object) -> PyObject: ...
+
+    @method(egg_fn="py-call-extended")
+    def call_extended(self, args: PyObject, kwargs: PyObject) -> PyObject:
+        """
+        Call the PyObject with the given args and kwargs PyObjects.
+        """
+
+    @method(egg_fn="py-from-string")
+    @classmethod
+    def from_string(cls, s: StringLike) -> PyObject: ...
+
+    @method(egg_fn="py-to-string")
+    def to_string(self) -> String: ...
+
+    @method(egg_fn="py-to-bool")
+    def to_bool(self) -> Bool: ...
+
+    @method(egg_fn="py-dict-update")
+    def dict_update(self, *keys_and_values: object) -> PyObject: ...
+
+    @method(egg_fn="py-from-int")
+    @classmethod
+    def from_int(cls, i: i64Like) -> PyObject: ...
+
+    @method(egg_fn="py-dict")
+    @classmethod
+    def dict(cls, *keys_and_values: object) -> PyObject: ...
+
+
+converter(object, PyObject, PyObject)
+
+
+@function(builtin=True, egg_fn="py-eval")
+def py_eval(code: StringLike, globals: object = PyObject.dict(), locals: object = PyObject.dict()) -> PyObject: ...
+
+
+class PyObjectFunction(Protocol):
+    def __call__(self, *__args: PyObject) -> PyObject: ...
+
+
+@deprecated("use PyObject(fn) directly")
+def py_eval_fn(fn: Callable) -> PyObjectFunction:
+    """
+    Takes a python callable and maps it to a callable which takes and returns PyObjects.
+
+    It translates it to a call which uses `py_eval` to call the function, passing in the
+    args as locals, and using the globals from function.
+    """
+    return PyObject(fn)
+
+
+@function(builtin=True, egg_fn="py-exec")
+def py_exec(code: StringLike, globals: object = PyObject.dict(), locals: object = PyObject.dict()) -> PyObject:
+    """
+    Copies the locals, execs the Python code, and returns the locals with any updates.
+    """
+
+
 Container: TypeAlias = Map | Set | MultiSet | Vec | UnstableFn
 Primitive: TypeAlias = String | Bool | i64 | f64 | Rational | BigInt | BigRat | PyObject | Unit

python/egglog/builtins.py

@@ -24,7 +24,7 @@
 _CONVERSION_DECLS = Declarations.create()
 # Defer a list of declerations to be added to the global declerations, so that we can not trigger them procesing
 # until we need them
-_TO_PROCESS_DECLS: list[DeclerationsLike] = []
+_TO_PROCESS_DECLS: list[DeclarationsLike] = []
 
 
 def retrieve_conversion_decls() -> Declarations:

python/egglog/conversion.py

@@ -50,9 +50,9 @@
     "ConstructorDecl",
     "Declarations",
     "Declarations",
-    "DeclerationsLike",
+    "DeclarationsLike",
     "DefaultRewriteDecl",
-    "DelayedDeclerations",
+    "DelayedDeclarations",
     "DummyDecl",
     "EqDecl",
     "ExprActionDecl",
@@ -63,7 +63,7 @@
     "FunctionRef",
     "FunctionSignature",
     "GetCostDecl",
-    "HasDeclerations",
+    "HasDeclarations",
     "Ident",
     "InitRef",
     "JustTypeRef",
@@ -101,12 +101,12 @@
     "ValueDecl",
     "collect_unbound_vars",
     "replace_typed_expr",
-    "upcast_declerations",
+    "upcast_declarations",
 ]
 
 
 @dataclass(match_args=False)
-class DelayedDeclerations:
+class DelayedDeclarations:
     __egg_decls_thunk__: Callable[[], Declarations] = field(repr=False)
 
     @property
@@ -122,20 +122,20 @@ def __egg_decls__(self) -> Declarations:
 
 
 @runtime_checkable
-class HasDeclerations(Protocol):
+class HasDeclarations(Protocol):
     @property
     def __egg_decls__(self) -> Declarations: ...
 
 
-DeclerationsLike: TypeAlias = Union[HasDeclerations, None, "Declarations"]
+DeclarationsLike: TypeAlias = Union[HasDeclarations, None, "Declarations"]
 
 
-def upcast_declerations(declerations_like: Iterable[DeclerationsLike]) -> list[Declarations]:
+def upcast_declarations(declarations_like: Iterable[DeclarationsLike]) -> list[Declarations]:
     d = []
-    for l in declerations_like:
+    for l in declarations_like:
         if l is None:
             continue
-        if isinstance(l, HasDeclerations):
+        if isinstance(l, HasDeclarations):
             d.append(l.__egg_decls__)
         elif isinstance(l, Declarations):
             d.append(l)
@@ -179,8 +179,8 @@ def default_ruleset(self) -> RulesetDecl:
         return ruleset
 
     @classmethod
-    def create(cls, *others: DeclerationsLike) -> Declarations:
-        others = upcast_declerations(others)
+    def create(cls, *others: DeclarationsLike) -> Declarations:
+        others = upcast_declarations(others)
         if not others:
             return Declarations()
         first, *rest = others
@@ -195,26 +195,26 @@ def copy(self) -> Declarations:
         self.update_other(new)
         return new
 
-    def update(self, *others: DeclerationsLike) -> None:
+    def update(self, *others: DeclarationsLike) -> None:
         for other in others:
             self |= other
 
-    def __or__(self, other: DeclerationsLike) -> Declarations:
+    def __or__(self, other: DeclarationsLike) -> Declarations:
         result = self.copy()
         result |= other
         return result
 
-    def __ior__(self, other: DeclerationsLike) -> Self:
+    def __ior__(self, other: DeclarationsLike) -> Self:
         if other is None:
             return self
-        if isinstance(other, HasDeclerations):
+        if isinstance(other, HasDeclarations):
             other = other.__egg_decls__
         other.update_other(self)
         return self
 
     def update_other(self, other: Declarations) -> None:
         """
-        Updates the other decl with these values in palce.
+        Updates the other decl with these values in place.
         """
         other._functions |= self._functions
         other._classes |= self._classes
@@ -325,7 +325,7 @@ class ClassDecl:
     builtin: bool = False
     init: ConstructorDecl | FunctionDecl | None = None
     class_methods: dict[str, FunctionDecl | ConstructorDecl] = field(default_factory=dict)
-    # These have to be seperate from class_methods so that printing them can be done easily
+    # These have to be separate from class_methods so that printing them can be done easily
     class_variables: dict[str, ConstantDecl] = field(default_factory=dict)
     methods: dict[str, FunctionDecl | ConstructorDecl] = field(default_factory=dict)
     properties: dict[str, FunctionDecl | ConstructorDecl] = field(default_factory=dict)