feat(catalog): Cutover deprecated APIs to use session, catalog, table abstractions [3/3]

Cargo.toml

@@ -12,7 +12,6 @@ common-tracing = {path = "src/common/tracing", default-features = false}
 common-version = {path = "src/common/version", default-features = false}
 daft-algebra = {path = "src/daft-algebra", default-features = false}
 daft-catalog = {path = "src/daft-catalog", default-features = false}
-daft-catalog-python-catalog = {path = "src/daft-catalog/python-catalog", optional = true}
 daft-compression = {path = "src/daft-compression", default-features = false}
 daft-connect = {path = "src/daft-connect", optional = true}
 daft-context = {path = "src/daft-context", default-features = false}
@@ -50,15 +49,17 @@ sysinfo = {workspace = true}
 [features]
 # maturin will turn this on
 python = [
+  "dep:pyo3",
+  "dep:pyo3-log",
   "common-daft-config/python",
   "common-display/python",
   "common-partitioning/python",
   "common-resource-request/python",
   "common-file-formats/python",
   "common-scan-info/python",
   "common-system-info/python",
-  "daft-catalog-python-catalog/python",
   "daft-catalog/python",
+  "daft-connect/python",
   "daft-context/python",
   "daft-core/python",
   "daft-csv/python",
@@ -80,11 +81,7 @@ python = [
   "daft-session/python",
   "daft-stats/python",
   "daft-recordbatch/python",
-  "daft-writers/python",
-  "dep:daft-connect",
-  "daft-connect/python",
-  "dep:pyo3",
-  "dep:pyo3-log"
+  "daft-writers/python"
 ]
 
 [lib]

daft/__init__.py

@@ -58,8 +58,9 @@
 ###
 
 from daft.catalog import (
+    Catalog,
     Identifier,
-    read_table,
+    Table,
     register_table,
 )
 from daft.context import set_execution_config, set_planning_config, execution_config_ctx, planning_config_ctx
@@ -90,14 +91,35 @@
     read_lance,
 )
 from daft.series import Series
-from daft.session import Session, current_session, set_session
+from daft.session import (
+    Session,
+    attach_catalog,
+    attach_table,
+    detach_catalog,
+    detach_table,
+    create_temp_table,
+    current_catalog,
+    current_namespace,
+    current_session,
+    get_catalog,
+    get_table,
+    has_catalog,
+    has_table,
+    list_catalogs,
+    list_tables,
+    read_table,
+    set_catalog,
+    set_namespace,
+    set_session,
+)
 from daft.sql import sql, sql_expr
 from daft.udf import udf
 from daft.viz import register_viz_hook
 
 to_struct = Expression.to_struct
 
 __all__ = [
+    "Catalog",
     "DataCatalogTable",
     "DataCatalogType",
     "DataFrame",
@@ -110,10 +132,18 @@
     "Schema",
     "Series",
     "Session",
+    "Table",
     "TimeUnit",
+    "attach_catalog",
+    "attach_table",
     "coalesce",
     "col",
+    "create_temp_table",
+    "current_catalog",
+    "current_namespace",
     "current_session",
+    "detach_catalog",
+    "detach_table",
     "execution_config_ctx",
     "from_arrow",
     "from_dask_dataframe",
@@ -122,8 +152,14 @@
     "from_pydict",
     "from_pylist",
     "from_ray_dataset",
+    "get_catalog",
+    "get_table",
+    "has_catalog",
+    "has_table",
     "interval",
     "list_",
+    "list_catalogs",
+    "list_tables",
     "lit",
     "planning_config_ctx",
     "read_csv",
@@ -138,7 +174,9 @@
     "refresh_logger",
     "register_table",
     "register_viz_hook",
+    "set_catalog",
     "set_execution_config",
+    "set_namespace",
     "set_planning_config",
     "set_session",
     "sql",

daft/catalog/__iceberg.py

@@ -38,10 +38,10 @@
     # get_*
     ###
 
-    def get_table(self, name: str | Identifier) -> IcebergTable:
-        if isinstance(name, Identifier):
-            name = tuple(name)  # type: ignore
-        return IcebergTable(self._inner.load_table(name))
+    def get_table(self, ident: Identifier | str) -> IcebergTable:
+        if isinstance(ident, Identifier):
+            ident = tuple(ident)  # type: ignore
+        return IcebergTable._from_obj(self._inner.load_table(ident))
 
     ###
     # list_*