Python Table UDFs

duckdb/functional/__init__.py

@@ -1,17 +1,23 @@
 from _duckdb.functional import (
 	FunctionNullHandling,
 	PythonUDFType,
+	PythonTVFType,
 	SPECIAL,
 	DEFAULT,
 	NATIVE,
-	ARROW
+	ARROW,
+	TUPLES,
+	ARROW_TABLE
 )
 
 __all__ = [
 	"FunctionNullHandling",
 	"PythonUDFType",
+	"PythonTVFType",
 	"SPECIAL",
 	"DEFAULT",
 	"NATIVE",
-	"ARROW"
+	"ARROW",
+	"TUPLES",
+	"ARROW_TABLE"
 ]

scripts/connection_methods.json

@@ -107,6 +107,51 @@
 		],
 		"return": "DuckDBPyConnection"
 	},
+	{
+		"name": "create_table_function",
+		"function": "RegisterTableFunction",
+		"docs": "Register a table valued function via Callable",
+		"args": [
+			{
+				"name": "name",
+				"type": "str"
+			},
+			{
+				"name": "callable",
+				"type": "Callable"
+			}
+		],
+		"kwargs": [
+			{
+				"name": "parameters",
+				"type": "Optional[Any]",
+				"default": "None"
+			},
+			{
+				"name": "schema",
+				"type": "Optional[Any]",
+				"default": "None"
+			},
+			{
+				"name": "type",
+				"type": "Optional[PythonTVFType]",
+				"default": "PythonTVFType.TUPLES"
+			}
+		],
+		"return": "DuckDBPyConnection"
+	},
+	{
+		"name": "unregister_table_function",
+		"function": "UnregisterTableFunction",
+		"docs": "Unregister a table valued function",
+		"args": [
+			{
+				"name": "name",
+				"type": "str"
+			}
+		],
+		"return": "DuckDBPyConnection"
+	},
 	{
 		"name": [
 			"sqltype",

src/duckdb_py/CMakeLists.txt

@@ -28,6 +28,7 @@ add_library(python_src OBJECT
         python_import_cache.cpp
         python_replacement_scan.cpp
         python_udf.cpp
+        python_tvf.cpp
 )
 
 target_link_libraries(python_src PRIVATE _duckdb_dependencies)

src/duckdb_py/functional/functional.cpp

@@ -11,6 +11,11 @@ void DuckDBPyFunctional::Initialize(py::module_ &parent) {
 	    .value("ARROW", duckdb::PythonUDFType::ARROW)
 	    .export_values();
 
+	py::enum_<duckdb::PythonTVFType>(m, "PythonTVFType")
+	    .value("TUPLES", duckdb::PythonTVFType::TUPLES)
+	    .value("ARROW_TABLE", duckdb::PythonTVFType::ARROW_TABLE)
+	    .export_values();
+
 	py::enum_<duckdb::FunctionNullHandling>(m, "FunctionNullHandling")
 	    .value("DEFAULT", duckdb::FunctionNullHandling::DEFAULT_NULL_HANDLING)
 	    .value("SPECIAL", duckdb::FunctionNullHandling::SPECIAL_HANDLING)

src/duckdb_py/include/duckdb_python/pybind11/conversions/python_tvf_type_enum.hpp

@@ -0,0 +1,72 @@
+#pragma once
+
+#include "duckdb/common/common.hpp"
+#include "duckdb/common/exception.hpp"
+#include "duckdb/common/string_util.hpp"
+
+using duckdb::InvalidInputException;
+using duckdb::string;
+using duckdb::StringUtil;
+
+namespace duckdb {
+
+enum class PythonTVFType : uint8_t { TUPLES, ARROW_TABLE };
+
+} // namespace duckdb
+
+using duckdb::PythonTVFType;
+
+namespace py = pybind11;
+
+static PythonTVFType PythonTVFTypeFromString(const string &type) {
+	auto ltype = StringUtil::Lower(type);
+	if (ltype.empty() || ltype == "tuples") {
+		return PythonTVFType::TUPLES;
+	} else if (ltype == "arrow_table") {
+		return PythonTVFType::ARROW_TABLE;
+	} else {
+		throw InvalidInputException("'%s' is not a recognized type for 'tvf_type'", type);
+	}
+}
+
+static PythonTVFType PythonTVFTypeFromInteger(int64_t value) {
+	if (value == 0) {
+		return PythonTVFType::TUPLES;
+	} else if (value == 1) {
+		return PythonTVFType::ARROW_TABLE;
+	} else {
+		throw InvalidInputException("'%d' is not a recognized type for 'tvf_type'", value);
+	}
+}
+
+namespace PYBIND11_NAMESPACE {
+namespace detail {
+
+template <>
+struct type_caster<PythonTVFType> : public type_caster_base<PythonTVFType> {
+	using base = type_caster_base<PythonTVFType>;
+	PythonTVFType tmp;
+
+public:
+	bool load(handle src, bool convert) {
+		if (base::load(src, convert)) {
+			return true;
+		} else if (py::isinstance<py::str>(src)) {
+			tmp = PythonTVFTypeFromString(py::str(src));
+			value = &tmp;
+			return true;
+		} else if (py::isinstance<py::int_>(src)) {
+			tmp = PythonTVFTypeFromInteger(src.cast<int64_t>());
+			value = &tmp;
+			return true;
+		}
+		return false;
+	}
+
+	static handle cast(PythonTVFType src, return_value_policy policy, handle parent) {
+		return base::cast(src, policy, parent);
+	}
+};
+
+} // namespace detail
+} // namespace PYBIND11_NAMESPACE

src/duckdb_py/include/duckdb_python/pyconnection/pyconnection.hpp

@@ -23,6 +23,7 @@
 #include "duckdb/function/scalar_function.hpp"
 #include "duckdb_python/pybind11/conversions/exception_handling_enum.hpp"
 #include "duckdb_python/pybind11/conversions/python_udf_type_enum.hpp"
+#include "duckdb_python/pybind11/conversions/python_tvf_type_enum.hpp"
 #include "duckdb_python/pybind11/conversions/python_csv_line_terminator_enum.hpp"
 #include "duckdb/common/shared_ptr.hpp"
 
@@ -169,6 +170,8 @@ struct DuckDBPyConnection : public enable_shared_from_this<DuckDBPyConnection> {
 	//! MemoryFileSystem used to temporarily store file-like objects for reading
 	shared_ptr<ModifiedMemoryFileSystem> internal_object_filesystem;
 	case_insensitive_map_t<unique_ptr<ExternalDependency>> registered_functions;
+	case_insensitive_map_t<unique_ptr<ExternalDependency>> registered_table_functions;
+
 	case_insensitive_set_t registered_objects;
 
 public:
@@ -232,6 +235,13 @@ struct DuckDBPyConnection : public enable_shared_from_this<DuckDBPyConnection> {
 	                  PythonExceptionHandling exception_handling = PythonExceptionHandling::FORWARD_ERROR,
 	                  bool side_effects = false);
 
+	shared_ptr<DuckDBPyConnection> RegisterTableFunction(const string &name, const py::function &function,
+	                                                     const py::object &parameters = py::none(),
+	                                                     const py::object &schema = py::none(),
+	                                                     PythonTVFType type = PythonTVFType::TUPLES);
+
+	shared_ptr<DuckDBPyConnection> UnregisterTableFunction(const string &name);
+
 	shared_ptr<DuckDBPyConnection> UnregisterUDF(const string &name);
 
 	shared_ptr<DuckDBPyConnection> ExecuteMany(const py::object &query, py::object params = py::list());
@@ -355,6 +365,11 @@ struct DuckDBPyConnection : public enable_shared_from_this<DuckDBPyConnection> {
 	                               const shared_ptr<DuckDBPyType> &return_type, bool vectorized,
 	                               FunctionNullHandling null_handling, PythonExceptionHandling exception_handling,
 	                               bool side_effects);
+
+	duckdb::TableFunction CreateTableFunctionFromCallable(const std::string &name, const py::function &callable,
+	                                                      const py::object &parameters, const py::object &schema,
+	                                                      PythonTVFType type);
+
 	void RegisterArrowObject(const py::object &arrow_object, const string &name);
 	vector<unique_ptr<SQLStatement>> GetStatements(const py::object &query);
 

src/duckdb_py/pyconnection.cpp

@@ -393,7 +393,6 @@ DuckDBPyConnection::RegisterScalarUDF(const string &name, const py::function &ud
 	auto scalar_function = CreateScalarUDF(name, udf, parameters_p, return_type_p, type == PythonUDFType::ARROW,
 	                                       null_handling, exception_handling, side_effects);
 	CreateScalarFunctionInfo info(scalar_function);
-
 	context.RegisterFunction(info);
 
 	auto dependency = make_uniq<ExternalDependency>();
@@ -403,6 +402,57 @@ DuckDBPyConnection::RegisterScalarUDF(const string &name, const py::function &ud
 	return shared_from_this();
 }
 
+shared_ptr<DuckDBPyConnection> DuckDBPyConnection::RegisterTableFunction(const string &name,
+                                                                         const py::function &function,
+                                                                         const py::object &parameters,
+                                                                         const py::object &schema,
+                                                                         PythonTVFType type) {
+
+	auto &connection = con.GetConnection();
+	auto &context = *connection.context;
+
+	if (context.transaction.HasActiveTransaction()) {
+		context.CancelTransaction();
+	}
+
+	if (registered_table_functions.find(name) != registered_table_functions.end()) {
+		throw NotImplementedException("A table function by the name of '%s' is already registered, "
+		                              "please unregister it first",
+		                              name);
+	}
+
+	auto table_function = CreateTableFunctionFromCallable(name, function, parameters, schema, type);
+	CreateTableFunctionInfo info(table_function);
+
+	// re-registration: changing the callable to another
+	info.on_conflict = OnCreateConflict::REPLACE_ON_CONFLICT;
+
+	context.RegisterFunction(info);
+
+	auto dependency = make_uniq<ExternalDependency>();
+	dependency->AddDependency("function", PythonDependencyItem::Create(function));
+	registered_table_functions[name] = std::move(dependency);
+
+	return shared_from_this();
+}
+
+shared_ptr<DuckDBPyConnection> DuckDBPyConnection::UnregisterTableFunction(const string &name) {
+	auto entry = registered_table_functions.find(name);
+	if (entry == registered_table_functions.end()) {
+		throw InvalidInputException(
+		    "No table function by the name of '%s' was found in the list of registered table functions", name);
+	}
+
+	auto &connection = con.GetConnection();
+	auto &context = *connection.context;
+
+	// Remove from our registry.
+	// TODO: Callable still exists in the function catalog, since duckdb doesn't (yet?) support removal
+	registered_table_functions.erase(entry);
+
+	return shared_from_this();
+}
+
 void DuckDBPyConnection::Initialize(py::handle &m) {
 	auto connection_module =
 	    py::class_<DuckDBPyConnection, shared_ptr<DuckDBPyConnection>>(m, "DuckDBPyConnection", py::module_local());
@@ -411,6 +461,14 @@ void DuckDBPyConnection::Initialize(py::handle &m) {
 	    .def("__exit__", &DuckDBPyConnection::Exit, py::arg("exc_type"), py::arg("exc"), py::arg("traceback"));
 	connection_module.def("__del__", &DuckDBPyConnection::Close);
 
+	connection_module.def("create_table_function", &DuckDBPyConnection::RegisterTableFunction,
+	                      "Register a table valued function via Callable", py::arg("name"), py::arg("callable"),
+	                      py::arg("parameters") = py::none(), py::arg("schema") = py::none(),
+	                      py::arg("type") = PythonTVFType::TUPLES);
+
+	connection_module.def("unregister_table_function", &DuckDBPyConnection::UnregisterTableFunction,
+	                      "Unregister a table valued function", py::arg("name"));
+
 	InitializeConnectionMethods(connection_module);
 	connection_module.def_property_readonly("description", &DuckDBPyConnection::GetDescription,
 	                                        "Get result set attributes, mainly column names");
@@ -1575,7 +1633,12 @@ unique_ptr<DuckDBPyRelation> DuckDBPyConnection::RunQuery(const py::object &quer
 		}
 		if (res->type == QueryResultType::STREAM_RESULT) {
 			auto &stream_result = res->Cast<StreamQueryResult>();
-			res = stream_result.Materialize();
+			{
+				// Release the GIL, as Materialize *may* need the GIL (TVFs, for instance)
+				D_ASSERT(py::gil_check());
+				py::gil_scoped_release release;
+				res = stream_result.Materialize();
+			}
 		}
 		auto &materialized_result = res->Cast<MaterializedQueryResult>();
 		relation = make_shared_ptr<MaterializedRelation>(connection.context, materialized_result.TakeCollection(),
@@ -1826,6 +1889,7 @@ void DuckDBPyConnection::Close() {
 	// https://peps.python.org/pep-0249/#Connection.close
 	cursors.ClearCursors();
 	registered_functions.clear();
+	registered_table_functions.clear();
 }
 
 void DuckDBPyConnection::Interrupt() {