Renaming Internal Structs

python/datafusion/expr.py

@@ -102,6 +102,7 @@
 
 __all__ = [
     "Expr",
+    "RawExpr",
     "Column",
     "Literal",
     "BinaryExpr",
@@ -193,10 +194,15 @@ 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
 
+    @property 
+    def raw_expr(self) -> expr_internal.RawExpr:
+        """Returns the underlying RawExpr instance."""
+        return self.expr
+
     def to_variant(self) -> Any:
         """Convert this expression into a python object if possible."""
         return self.expr.to_variant()
@@ -383,7 +389,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 +404,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

@@ -34,9 +34,15 @@ def missing_exports(internal_obj, wrapped_obj) -> None:
         return
 
     for attr in dir(internal_obj):
-        if attr in ["_global_ctx"]:
+        # Skip internal context and RawExpr (which is handled by Expr class)
+        if attr in ["_global_ctx", "RawExpr"]:
+            continue
+
+        # Check if RawExpr functionality is covered by Expr class
+        if attr == "RawExpr" and hasattr(wrapped_obj, "Expr"):
+            expr_class = getattr(wrapped_obj, "Expr")
+            assert hasattr(expr_class, "raw_expr"), "Expr class must provide raw_expr property"
             continue
-        assert attr in dir(wrapped_obj)
 
         internal_attr = getattr(internal_obj, attr)
         wrapped_attr = getattr(wrapped_obj, 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,