move tablevalue to nodes

Author: willow-ahrens

src/finchlite/finch_logic/__init__.py

@@ -16,6 +16,8 @@
     Reorder,
     Subquery,
     Table,
+    TableValue,
+    TableValueFType,
     Value,
 )
 
@@ -37,5 +39,7 @@
     "Reorder",
     "Subquery",
     "Table",
+    "TableValue",
+    "TableValueFType",
     "Value",
 ]

src/finchlite/finch_logic/interpreter.py

@@ -1,7 +1,4 @@
-from collections.abc import Iterable
-from dataclasses import dataclass
 from itertools import product
-from typing import Any
 
 import numpy as np
 
@@ -19,20 +16,11 @@
     Reorder,
     Subquery,
     Table,
+    TableValue,
     Value,
 )
 
 
-@dataclass(eq=True, frozen=True)
-class TableValue:
-    tns: Any
-    idxs: Iterable[Any]
-
-    def __post_init__(self):
-        if isinstance(self.tns, TableValue):
-            raise ValueError("The tensor (tns) cannot be a TableValue")
-
-
 class FinchLogicInterpreter:
     def __init__(self, *, make_tensor=np.full, verbose=False):
         self.verbose = verbose

src/finchlite/finch_logic/nodes.py

@@ -4,10 +4,38 @@
 from dataclasses import asdict, dataclass
 from typing import Any, Generic, Self, TypeVar
 
-from ..symbolic import Context, NamedTerm, Term, TermTree, literal_repr
+from ..symbolic import (
+    Context,
+    FType,
+    FTyped,
+    NamedTerm,
+    Term,
+    TermTree,
+    ftype,
+    literal_repr,
+)
 from ..util import qual_str
 
 
+@dataclass(eq=True, frozen=True)
+class TableValueFType(FType):
+    tns_ftype: Any
+    idxs: tuple[Field, ...] = ()
+
+
+@dataclass(eq=True, frozen=True)
+class TableValue(FTyped):
+    tns: Any
+    idxs: tuple[Field]
+
+    def ftype(self):
+        return TableValueFType(ftype(self.tns), self.idxs)
+
+    def __post_init__(self):
+        if isinstance(self.tns, TableValue):
+            raise ValueError("The tensor (tns) cannot be a TableValue")
+
+
 @dataclass(eq=True, frozen=True)
 class LogicNode(Term, ABC):
     """