Renaming Internal Structs

python/datafusion/expr.py

@@ -193,7 +193,7 @@ class Expr:
     :ref:`Expressions` in the online documentation for more information.
     """
 
-    def __init__(self, expr: expr_internal.Expr) -> None:
+    def __init__(self, expr: expr_internal.RawExpr) -> None:
         """This constructor should not be called by the end user."""
         self.expr = expr
 
@@ -383,7 +383,7 @@ def literal(value: Any) -> Expr:
             value = pa.scalar(value, type=pa.string_view())
         if not isinstance(value, pa.Scalar):
             value = pa.scalar(value)
-        return Expr(expr_internal.Expr.literal(value))
+        return Expr(expr_internal.RawExpr.literal(value))
 
     @staticmethod
     def string_literal(value: str) -> Expr:
@@ -398,13 +398,13 @@ def string_literal(value: str) -> Expr:
         """
         if isinstance(value, str):
             value = pa.scalar(value, type=pa.string())
-            return Expr(expr_internal.Expr.literal(value))
+            return Expr(expr_internal.RawExpr.literal(value))
         return Expr.literal(value)
 
     @staticmethod
     def column(value: str) -> Expr:
         """Creates a new expression representing a column."""
-        return Expr(expr_internal.Expr.column(value))
+        return Expr(expr_internal.RawExpr.column(value))
 
     def alias(self, name: str) -> Expr:
         """Assign a name to the expression."""

python/tests/test_wrapper_coverage.py

@@ -36,6 +36,13 @@ def missing_exports(internal_obj, wrapped_obj) -> None:
     for attr in dir(internal_obj):
         if attr in ["_global_ctx"]:
             continue
+
+        # Check if Raw* classes have corresponding wrapper classes
+        elif attr.startswith("Raw"):
+            base_class = attr[3:]  # Remove "Raw" prefix
+            assert hasattr(wrapped_obj, base_class)
+            continue
+
         assert attr in dir(wrapped_obj)
 
         internal_attr = getattr(internal_obj, attr)
@@ -51,6 +58,8 @@ def missing_exports(internal_obj, wrapped_obj) -> None:
         if isinstance(internal_attr, list):
             assert isinstance(wrapped_attr, list)
             for val in internal_attr:
+                if isinstance(val, str) and val.startswith("Raw"):
+                    continue
                 assert val in wrapped_attr
         elif hasattr(internal_attr, "__dict__"):
             missing_exports(internal_attr, wrapped_attr)

src/expr.rs

@@ -101,7 +101,7 @@ pub mod window;
 use sort_expr::{to_sort_expressions, PySortExpr};
 
 /// A PyExpr that can be used on a DataFrame
-#[pyclass(name = "Expr", module = "datafusion.expr", subclass)]
+#[pyclass(name = "RawExpr", module = "datafusion.expr", subclass)]
 #[derive(Debug, Clone)]
 pub struct PyExpr {
     pub expr: Expr,