format_tuple to db/utils.py

blendsql/db/utils.py

@@ -47,6 +47,10 @@ def escape(s):
     return single_quote_escape(double_quote_escape(s))
 
 
+def format_tuple(value: tuple):
+    return "(" + ",".join(repr(v) for v in value) + ")"
+
+
 def select_all_from_table_query(tablename: str) -> str:
     return f'SELECT * FROM "{double_quote_escape(tablename)}";'
 

blendsql/ingredients/ingredient.py

@@ -18,7 +18,7 @@
     IngredientType,
 )
 from ..db import Database
-from ..db.utils import select_all_from_table_query
+from ..db.utils import select_all_from_table_query, format_tuple
 from .utils import unpack_options
 from .few_shot import Example
 from .utils import partialclass
@@ -543,7 +543,7 @@ def run(self, model: Model, context: pd.DataFrame, **kwargs) -> str:
     '''
 
     ingredient_type: str = IngredientType.QA.value
-    allowed_output_types: Tuple[Type] = (Union[str, int, float],)
+    allowed_output_types: Tuple[Type] = (Union[str, int, float, tuple],)
 
     def __call__(
         self,
@@ -588,7 +588,11 @@ def __call__(
         self.num_values_passed += len(subtable) if subtable is not None else 0
         kwargs[IngredientKwarg.CONTEXT] = subtable
         kwargs[IngredientKwarg.QUESTION] = question
-        response: Union[str, int, float] = self._run(*args, **self.__dict__ | kwargs)
+        response: Union[str, int, float, tuple] = self._run(
+            *args, **self.__dict__ | kwargs
+        )
+        if isinstance(response, tuple):
+            response = format_tuple(response)
         return response
 
     @abstractmethod