Update egglog dep and visualizer

Author: saulshanabrook

Cargo.lock

@@ -16,25 +16,27 @@ num-rational = "*"
 # egglog = { git = "https://github.com/egraphs-good/egglog.git", branch = "main", default-features = false }
 # egglog-bridge = { git = "https://github.com/egraphs-good/egglog.git", branch = "main" }
 # egglog-core-relations = { git = "https://github.com/egraphs-good/egglog.git", branch = "main" }
-egglog = { git = "https://github.com/saulshanabrook/egg-smol.git", branch = "clone-cost", default-features = false }
-egglog-bridge = { git = "https://github.com/saulshanabrook/egg-smol.git", branch = "clone-cost" }
-egglog-core-relations = { git = "https://github.com/saulshanabrook/egg-smol.git", branch = "clone-cost" }
-egglog-experimental = { git = "https://github.com/egraphs-good/egglog-experimental", branch = "cli", default-features = false }
-egraph-serialize = { version = "0.2", features = ["serde", "graphviz"] }
+egglog = { git = "https://github.com/saulshanabrook/egg-smol.git", branch = "let-bindings-again", default-features = false }
+egglog-bridge = { git = "https://github.com/saulshanabrook/egg-smol.git", branch = "let-bindings-again" }
+egglog-core-relations = { git = "https://github.com/saulshanabrook/egg-smol.git", branch = "let-bindings-again" }
+egglog-experimental = { git = "https://github.com/egraphs-good/egglog-experimental", branch = "update-egglog", default-features = false }
+egglog-ast = { git = "https://github.com/saulshanabrook/egg-smol.git", branch = "let-bindings-again" }
+egraph-serialize = { version = "0.3", features = ["serde", "graphviz"] }
 serde_json = "1"
 pyo3-log = "0.13"
 log = "0.4"
 lalrpop-util = { version = "0.22", features = ["lexer"] }
-ordered-float = "3.7"
+ordered-float = "5"
 uuid = { version = "1.18", features = ["v4"] }
 rayon = "1.11"
 
 # Use patched version of egglog in experimental
 [patch.'https://github.com/egraphs-good/egglog']
 # egglog = { git = "https://github.com/egraphs-good//egglog.git", branch = "main" }
-egglog = { git = "https://github.com/saulshanabrook/egg-smol.git", branch = "clone-cost" }
-egglog-bridge = { git = "https://github.com/saulshanabrook/egg-smol.git", branch = "clone-cost" }
-egglog-core-relations = { git = "https://github.com/saulshanabrook/egg-smol.git", branch = "clone-cost" }
+egglog = { git = "https://github.com/saulshanabrook/egg-smol.git", branch = "let-bindings-again" }
+egglog-bridge = { git = "https://github.com/saulshanabrook/egg-smol.git", branch = "let-bindings-again" }
+egglog-core-relations = { git = "https://github.com/saulshanabrook/egg-smol.git", branch = "let-bindings-again" }
+egglog-ast = { git = "https://github.com/saulshanabrook/egg-smol.git", branch = "let-bindings-again" }
 # egglog = { path = "../egg-smol" }
 # egglog = { git = "https://github.com/egraphs-good//egglog.git", rev = "5542549" }
 

Cargo.toml

@@ -357,11 +357,14 @@ _Action: TypeAlias = Let | Set | Change | Union | Panic | Expr_
 
 @final
 class Variant:
-    def __init__(self, span: _Span, name: str, types: list[str], cost: int | None = None) -> None: ...
+    def __init__(
+        self, span: _Span, name: str, types: list[str], cost: int | None = None, unextractable: bool = False
+    ) -> None: ...
     span: _Span
     name: str
     types: list[str]
     cost: int | None
+    unextractable: bool
 
 @final
 class Schema:
@@ -374,7 +377,9 @@ class Rule:
     span: _Span
     head: list[_Action]
     body: list[_Fact]
-    def __init__(self, span: _Span, head: list[_Action], body: list[_Fact]) -> None: ...
+    name: str
+    ruleset: str
+    def __init__(self, span: _Span, head: list[_Action], body: list[_Fact], name: str, ruleset: str) -> None: ...
 
 @final
 class Rewrite:
@@ -586,10 +591,8 @@ class AddRuleset:
 
 @final
 class RuleCommand:
-    name: str
-    ruleset: str
     rule: Rule
-    def __init__(self, name: str, ruleset: str, rule: Rule) -> None: ...
+    def __init__(self, rule: Rule) -> None: ...
 
 @final
 class RewriteCommand:

python/egglog/bindings.pyi

@@ -279,12 +279,15 @@ def command_to_egg(self, cmd: CommandDecl, ruleset: Ident) -> bindings._Command
                     else bindings.BiRewriteCommand(str(ruleset), rewrite)
                 )
             case RuleDecl(head, body, name):
-                rule = bindings.Rule(
-                    span(),
-                    [self.action_to_egg(a) for a in head],
-                    [self.fact_to_egg(f) for f in body],
+                return bindings.RuleCommand(
+                    bindings.Rule(
+                        span(),
+                        [self.action_to_egg(a) for a in head],
+                        [self.fact_to_egg(f) for f in body],
+                        name or "",
+                        str(ruleset),
+                    )
                 )
-                return bindings.RuleCommand(name or "", str(ruleset), rule)
             # TODO: Replace with just constants value and looking at REF of function
             case DefaultRewriteDecl(ref, expr, subsume):
                 sig = self.__egg_decls__.get_callable_decl(ref).signature