Merge remote-tracking branch 'origin' into sammy/native-iter-dir

Eventual-Inc · Sep 14, 2023 · 8f58e37 · 8f58e37
2 parents c9ca714 + d93dbf7
commit 8f58e37
Show file tree

Hide file tree

Showing 22 changed files with 734 additions and 93 deletions.
diff --git a/daft/__init__.py b/daft/__init__.py
@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 import os
-from typing import TYPE_CHECKING
 
 from daft.logging import setup_logger
 
@@ -46,11 +45,6 @@ def get_build_type() -> str:
 
 __version__ = get_version()
 
-if TYPE_CHECKING:
-    # Placeholder for type checking for Rust module
-    class daft:
-        pass
-
 
 ###
 # Initialize analytics

diff --git a/daft/context.py b/daft/context.py
@@ -109,7 +109,10 @@ def logical_plan_builder_class(self) -> type[LogicalPlanBuilder]:
         from daft.logical.logical_plan import PyLogicalPlanBuilder
         from daft.logical.rust_logical_plan import RustLogicalPlanBuilder
 
-        return RustLogicalPlanBuilder if self.use_rust_planner else PyLogicalPlanBuilder
+        if self.use_rust_planner:
+            return RustLogicalPlanBuilder
+        else:
+            return PyLogicalPlanBuilder
 
 
 _DaftContext = DaftContext()