continue fixing up

rapidsai · Aug 4, 2024 · d91d59a · d91d59a
1 parent 4f1868b
commit d91d59a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/python/cudf_polars/cudf_polars/dsl/expr.py b/python/cudf_polars/cudf_polars/dsl/expr.py
@@ -743,6 +743,10 @@ def _validate_input(self):
             format, strict, exact, cache = self.options
             if cache:
                 raise NotImplementedError("Strptime cache is a CPU feature")
+            if format is None:
+                raise NotImplementedError("Strptime format is required")
+            if not exact:
+                raise NotImplementedError("Strptime does not support exact=False")
 
     def do_evaluate(
         self,
@@ -836,11 +840,6 @@ def do_evaluate(
             format, strict, exact, cache = self.options
             col = self.children[0].evaluate(df, context=context, mapping=mapping)
 
-            if format is None:
-                raise NotImplementedError("Strptime requires a format string")
-
-            if not exact:
-                raise NotImplementedError("Strptime does not support exact=False")
             not_timestamps = plc.unary.unary_operation(
                 plc.strings.convert.convert_datetime.is_timestamp(
                     col.obj, format.encode()

diff --git a/python/cudf_polars/tests/expressions/test_stringfunction.py b/python/cudf_polars/tests/expressions/test_stringfunction.py
@@ -169,13 +169,17 @@ def to_datetime_data():
 
 @pytest.mark.parametrize("cache", [True, False], ids=lambda cache: f"cache={cache}")
 @pytest.mark.parametrize("strict", [True, False], ids=lambda strict: f"strict={strict}")
-def test_to_datetime(to_datetime_data, cache, strict):
+@pytest.mark.parametrize("exact", [True, False], ids=lambda exact: f"exact={exact}")
+@pytest.mark.parametrize(
+    "format", ["%Y-%m-%d", None], ids=lambda format: f"format={format}"
+)
+def test_to_datetime(to_datetime_data, cache, strict, format, exact):
     query = to_datetime_data.select(
         pl.col("a").str.strptime(
-            pl.Datetime("ns"), format="%Y-%m-%d", cache=cache, strict=strict
+            pl.Datetime("ns"), format=format, cache=cache, strict=strict, exact=exact
         )
     )
-    if cache:
+    if cache or format is None or not exact:
         assert_ir_translation_raises(query, NotImplementedError)
         return
     else: