feat: Update based on polars py-1.32.0

R/000-wrappers.R

@@ -309,6 +309,99 @@ NULL
   .savvy_wrap_PlRWhen(.Call(savvy_when__impl, `condition`))
 }
 
+### wrapper functions for PlRCategories
+
+`PlRCategories_cat_to_str` <- function(self) {
+  function(`cat`) {
+    .Call(savvy_PlRCategories_cat_to_str__impl, `self`, `cat`)
+  }
+}
+
+`PlRCategories_eq` <- function(self) {
+  function(`other`) {
+    `other` <- .savvy_extract_ptr(`other`, "PlRCategories")
+    .Call(savvy_PlRCategories_eq__impl, `self`, `other`)
+  }
+}
+
+`PlRCategories_get_cat` <- function(self) {
+  function(`s`) {
+    .Call(savvy_PlRCategories_get_cat__impl, `self`, `s`)
+  }
+}
+
+`PlRCategories_hash` <- function(self) {
+  function() {
+    .Call(savvy_PlRCategories_hash__impl, `self`)
+  }
+}
+
+`PlRCategories_is_global` <- function(self) {
+  function() {
+    .Call(savvy_PlRCategories_is_global__impl, `self`)
+  }
+}
+
+`PlRCategories_name` <- function(self) {
+  function() {
+    .Call(savvy_PlRCategories_name__impl, `self`)
+  }
+}
+
+`PlRCategories_namespace` <- function(self) {
+  function() {
+    .Call(savvy_PlRCategories_namespace__impl, `self`)
+  }
+}
+
+`PlRCategories_physical` <- function(self) {
+  function() {
+    .Call(savvy_PlRCategories_physical__impl, `self`)
+  }
+}
+
+`.savvy_wrap_PlRCategories` <- function(ptr) {
+  e <- new.env(parent = emptyenv())
+  e$.ptr <- ptr
+  e$`cat_to_str` <- `PlRCategories_cat_to_str`(ptr)
+  e$`eq` <- `PlRCategories_eq`(ptr)
+  e$`get_cat` <- `PlRCategories_get_cat`(ptr)
+  e$`hash` <- `PlRCategories_hash`(ptr)
+  e$`is_global` <- `PlRCategories_is_global`(ptr)
+  e$`name` <- `PlRCategories_name`(ptr)
+  e$`namespace` <- `PlRCategories_namespace`(ptr)
+  e$`physical` <- `PlRCategories_physical`(ptr)
+
+  class(e) <- c("PlRCategories", "savvy_polars__sealed")
+  e
+}
+
+
+
+`PlRCategories` <- new.env(parent = emptyenv())
+
+### associated functions for PlRCategories
+
+`PlRCategories`$`global_categories` <- function() {
+  .savvy_wrap_PlRCategories(.Call(savvy_PlRCategories_global_categories__impl))
+}
+
+`PlRCategories`$`init` <- function(`name`, `namespace`, `physical`) {
+  .savvy_wrap_PlRCategories(.Call(savvy_PlRCategories_init__impl, `name`, `namespace`, `physical`))
+}
+
+`PlRCategories`$`random` <- function(`namespace`, `physical`) {
+  .savvy_wrap_PlRCategories(.Call(savvy_PlRCategories_random__impl, `namespace`, `physical`))
+}
+
+
+class(`PlRCategories`) <- c("PlRCategories__bundle", "savvy_polars__sealed")
+
+#' @export
+`print.PlRCategories__bundle` <- function(x, ...) {
+  cat('PlRCategories\n')
+}
+
 ### wrapper functions for PlRChainedThen
 
 `PlRChainedThen_otherwise` <- function(self) {
@@ -559,8 +652,8 @@ class(`PlRChainedWhen`) <- c("PlRChainedWhen__bundle", "savvy_polars__sealed")
 }
 
 `PlRDataFrame_to_dummies` <- function(self) {
-  function(`drop_first`, `columns` = NULL, `separator` = NULL) {
-    .savvy_wrap_PlRDataFrame(.Call(savvy_PlRDataFrame_to_dummies__impl, `self`, `drop_first`, `columns`, `separator`))
+  function(`drop_first`, `drop_nulls`, `columns` = NULL, `separator` = NULL) {
+    .savvy_wrap_PlRDataFrame(.Call(savvy_PlRDataFrame_to_dummies__impl, `self`, `drop_first`, `drop_nulls`, `columns`, `separator`))
   }
 }
 
@@ -752,8 +845,9 @@ class(`PlRDataFrame`) <- c("PlRDataFrame__bundle", "savvy_polars__sealed")
   .savvy_wrap_PlRDataType(.Call(savvy_PlRDataType_new_array__impl, `inner`, `shape`))
 }
 
-`PlRDataType`$`new_categorical` <- function(`ordering`) {
-  .savvy_wrap_PlRDataType(.Call(savvy_PlRDataType_new_categorical__impl, `ordering`))
+`PlRDataType`$`new_categorical` <- function(`categories`) {
+  `categories` <- .savvy_extract_ptr(`categories`, "PlRCategories")
+  .savvy_wrap_PlRDataType(.Call(savvy_PlRDataType_new_categorical__impl, `categories`))
 }
 
 `PlRDataType`$`new_datetime` <- function(`time_unit`, `time_zone` = NULL) {
@@ -769,6 +863,7 @@ class(`PlRDataFrame`) <- c("PlRDataFrame__bundle", "savvy_polars__sealed")
 }
 
 `PlRDataType`$`new_enum` <- function(`categories`) {
+  `categories` <- .savvy_extract_ptr(`categories`, "PlRSeries")
   .savvy_wrap_PlRDataType(.Call(savvy_PlRDataType_new_enum__impl, `categories`))
 }
 
@@ -2975,9 +3070,10 @@ class(`PlRDataType`) <- c("PlRDataType__bundle", "savvy_polars__sealed")
 }
 
 `PlRExpr_str_to_integer` <- function(self) {
-  function(`base`, `strict`) {
+  function(`base`, `strict`, `dtype` = NULL) {
     `base` <- .savvy_extract_ptr(`base`, "PlRExpr")
-    .savvy_wrap_PlRExpr(.Call(savvy_PlRExpr_str_to_integer__impl, `self`, `base`, `strict`))
+    `dtype` <- .savvy_extract_ptr(`dtype`, "PlRDataType")
+    .savvy_wrap_PlRExpr(.Call(savvy_PlRExpr_str_to_integer__impl, `self`, `base`, `strict`, `dtype`))
   }
 }
 

R/datatypes-classes.R

@@ -172,12 +172,30 @@ pl__Duration <- function(time_unit = c("us", "ns", "ms")) {
 }
 
 #' @rdname polars_dtype
-#' @param ordering One of `"physical"` (default) or `"lexical"`.
-#' Ordering by order of appearance (`"physical"`) or string value (`"lexical"`).
-pl__Categorical <- function(ordering = c("physical", "lexical")) {
+#' @param ordering `r lifecycle::badge("deprecated")`
+#'   One of `"lexical"` or `"physical"`.
+#'   This argument is deprecated and ignored.
+#'   Always behaves as if `"lexical"` was passed.
+pl__Categorical <- function(ordering = NULL) {
   wrap({
-    ordering <- arg_match0(ordering, c("physical", "lexical"))
-    PlRDataType$new_categorical(ordering)
+    categories <- if (is_character(ordering)) {
+      ordering <- arg_match0(ordering, c("lexical", "physical"))
+      deprecate_warn(
+        format_warning(
+          sprintf(
+            "Specifying %s is deprecated.",
+            format_arg("ordering")
+          )
+        )
+      )
+      # TODO: should return `Categories()`
+      NULL
+    } else {
+      # Hidden pattern, Categories object is passed
+      ordering
+    }
+
+    PlRDataType$new_categorical(categories)
   })
 }
 

R/expr-string.R

@@ -1025,10 +1025,10 @@ expr_str_slice <- function(offset, length = NULL) {
 #' df$with_columns(
 #'   parsed = pl$col("hex")$str$to_integer(base = 16, strict = TRUE)
 #' )
-expr_str_to_integer <- function(..., base = 10L, strict = TRUE) {
+expr_str_to_integer <- function(..., base = 10L, dtype = pl$Int64, strict = TRUE) {
   wrap({
     check_dots_empty0(...)
-    self$`_rexpr`$str_to_integer(as_polars_expr(base)$`_rexpr`, strict)
+    self$`_rexpr`$str_to_integer(as_polars_expr(base)$`_rexpr`, strict, dtype$`_dt`)
   })
 }
 

src/init.c

@@ -264,6 +264,61 @@ SEXP savvy_when__impl(SEXP c_arg__condition) {
     return handle_result(res);
 }
 
+SEXP savvy_PlRCategories_cat_to_str__impl(SEXP self__, SEXP c_arg__cat) {
+    SEXP res = savvy_PlRCategories_cat_to_str__ffi(self__, c_arg__cat);
+    return handle_result(res);
+}
+
+SEXP savvy_PlRCategories_eq__impl(SEXP self__, SEXP c_arg__other) {
+    SEXP res = savvy_PlRCategories_eq__ffi(self__, c_arg__other);
+    return handle_result(res);
+}
+
+SEXP savvy_PlRCategories_get_cat__impl(SEXP self__, SEXP c_arg__s) {
+    SEXP res = savvy_PlRCategories_get_cat__ffi(self__, c_arg__s);
+    return handle_result(res);
+}
+
+SEXP savvy_PlRCategories_global_categories__impl(void) {
+    SEXP res = savvy_PlRCategories_global_categories__ffi();
+    return handle_result(res);
+}
+
+SEXP savvy_PlRCategories_hash__impl(SEXP self__) {
+    SEXP res = savvy_PlRCategories_hash__ffi(self__);
+    return handle_result(res);
+}
+
+SEXP savvy_PlRCategories_init__impl(SEXP c_arg__name, SEXP c_arg__namespace, SEXP c_arg__physical) {
+    SEXP res = savvy_PlRCategories_init__ffi(c_arg__name, c_arg__namespace, c_arg__physical);
+    return handle_result(res);
+}
+
+SEXP savvy_PlRCategories_is_global__impl(SEXP self__) {
+    SEXP res = savvy_PlRCategories_is_global__ffi(self__);
+    return handle_result(res);
+}
+
+SEXP savvy_PlRCategories_name__impl(SEXP self__) {
+    SEXP res = savvy_PlRCategories_name__ffi(self__);
+    return handle_result(res);
+}
+
+SEXP savvy_PlRCategories_namespace__impl(SEXP self__) {
+    SEXP res = savvy_PlRCategories_namespace__ffi(self__);
+    return handle_result(res);
+}
+
+SEXP savvy_PlRCategories_physical__impl(SEXP self__) {
+    SEXP res = savvy_PlRCategories_physical__ffi(self__);
+    return handle_result(res);
+}
+
+SEXP savvy_PlRCategories_random__impl(SEXP c_arg__namespace, SEXP c_arg__physical) {
+    SEXP res = savvy_PlRCategories_random__ffi(c_arg__namespace, c_arg__physical);
+    return handle_result(res);
+}
+
 SEXP savvy_PlRChainedThen_otherwise__impl(SEXP self__, SEXP c_arg__statement) {
     SEXP res = savvy_PlRChainedThen_otherwise__ffi(self__, c_arg__statement);
     return handle_result(res);
@@ -434,8 +489,8 @@ SEXP savvy_PlRDataFrame_tail__impl(SEXP self__, SEXP c_arg__n) {
     return handle_result(res);
 }
 
-SEXP savvy_PlRDataFrame_to_dummies__impl(SEXP self__, SEXP c_arg__drop_first, SEXP c_arg__columns, SEXP c_arg__separator) {
-    SEXP res = savvy_PlRDataFrame_to_dummies__ffi(self__, c_arg__drop_first, c_arg__columns, c_arg__separator);
+SEXP savvy_PlRDataFrame_to_dummies__impl(SEXP self__, SEXP c_arg__drop_first, SEXP c_arg__drop_nulls, SEXP c_arg__columns, SEXP c_arg__separator) {
+    SEXP res = savvy_PlRDataFrame_to_dummies__ffi(self__, c_arg__drop_first, c_arg__drop_nulls, c_arg__columns, c_arg__separator);
     return handle_result(res);
 }
 
@@ -519,8 +574,8 @@ SEXP savvy_PlRDataType_new_array__impl(SEXP c_arg__inner, SEXP c_arg__shape) {
     return handle_result(res);
 }
 
-SEXP savvy_PlRDataType_new_categorical__impl(SEXP c_arg__ordering) {
-    SEXP res = savvy_PlRDataType_new_categorical__ffi(c_arg__ordering);
+SEXP savvy_PlRDataType_new_categorical__impl(SEXP c_arg__categories) {
+    SEXP res = savvy_PlRDataType_new_categorical__ffi(c_arg__categories);
     return handle_result(res);
 }
 
@@ -2279,8 +2334,8 @@ SEXP savvy_PlRExpr_str_to_decimal__impl(SEXP self__, SEXP c_arg__infer_len) {
     return handle_result(res);
 }
 
-SEXP savvy_PlRExpr_str_to_integer__impl(SEXP self__, SEXP c_arg__base, SEXP c_arg__strict) {
-    SEXP res = savvy_PlRExpr_str_to_integer__ffi(self__, c_arg__base, c_arg__strict);
+SEXP savvy_PlRExpr_str_to_integer__impl(SEXP self__, SEXP c_arg__base, SEXP c_arg__strict, SEXP c_arg__dtype) {
+    SEXP res = savvy_PlRExpr_str_to_integer__ffi(self__, c_arg__base, c_arg__strict, c_arg__dtype);
     return handle_result(res);
 }
 
@@ -3067,6 +3122,17 @@ static const R_CallMethodDef CallEntries[] = {
     {"savvy_time_range__impl", (DL_FUNC) &savvy_time_range__impl, 4},
     {"savvy_time_ranges__impl", (DL_FUNC) &savvy_time_ranges__impl, 4},
     {"savvy_when__impl", (DL_FUNC) &savvy_when__impl, 1},
+    {"savvy_PlRCategories_cat_to_str__impl", (DL_FUNC) &savvy_PlRCategories_cat_to_str__impl, 2},
+    {"savvy_PlRCategories_eq__impl", (DL_FUNC) &savvy_PlRCategories_eq__impl, 2},
+    {"savvy_PlRCategories_get_cat__impl", (DL_FUNC) &savvy_PlRCategories_get_cat__impl, 2},
+    {"savvy_PlRCategories_global_categories__impl", (DL_FUNC) &savvy_PlRCategories_global_categories__impl, 0},
+    {"savvy_PlRCategories_hash__impl", (DL_FUNC) &savvy_PlRCategories_hash__impl, 1},
+    {"savvy_PlRCategories_init__impl", (DL_FUNC) &savvy_PlRCategories_init__impl, 3},
+    {"savvy_PlRCategories_is_global__impl", (DL_FUNC) &savvy_PlRCategories_is_global__impl, 1},
+    {"savvy_PlRCategories_name__impl", (DL_FUNC) &savvy_PlRCategories_name__impl, 1},
+    {"savvy_PlRCategories_namespace__impl", (DL_FUNC) &savvy_PlRCategories_namespace__impl, 1},
+    {"savvy_PlRCategories_physical__impl", (DL_FUNC) &savvy_PlRCategories_physical__impl, 1},
+    {"savvy_PlRCategories_random__impl", (DL_FUNC) &savvy_PlRCategories_random__impl, 2},
     {"savvy_PlRChainedThen_otherwise__impl", (DL_FUNC) &savvy_PlRChainedThen_otherwise__impl, 2},
     {"savvy_PlRChainedThen_when__impl", (DL_FUNC) &savvy_PlRChainedThen_when__impl, 2},
     {"savvy_PlRChainedWhen_then__impl", (DL_FUNC) &savvy_PlRChainedWhen_then__impl, 2},
@@ -3101,7 +3167,7 @@ static const R_CallMethodDef CallEntries[] = {
     {"savvy_PlRDataFrame_shape__impl", (DL_FUNC) &savvy_PlRDataFrame_shape__impl, 1},
     {"savvy_PlRDataFrame_slice__impl", (DL_FUNC) &savvy_PlRDataFrame_slice__impl, 3},
     {"savvy_PlRDataFrame_tail__impl", (DL_FUNC) &savvy_PlRDataFrame_tail__impl, 2},
-    {"savvy_PlRDataFrame_to_dummies__impl", (DL_FUNC) &savvy_PlRDataFrame_to_dummies__impl, 4},
+    {"savvy_PlRDataFrame_to_dummies__impl", (DL_FUNC) &savvy_PlRDataFrame_to_dummies__impl, 5},
     {"savvy_PlRDataFrame_to_series__impl", (DL_FUNC) &savvy_PlRDataFrame_to_series__impl, 2},
     {"savvy_PlRDataFrame_to_struct__impl", (DL_FUNC) &savvy_PlRDataFrame_to_struct__impl, 2},
     {"savvy_PlRDataFrame_transpose__impl", (DL_FUNC) &savvy_PlRDataFrame_transpose__impl, 3},
@@ -3470,7 +3536,7 @@ static const R_CallMethodDef CallEntries[] = {
     {"savvy_PlRExpr_str_to_date__impl", (DL_FUNC) &savvy_PlRExpr_str_to_date__impl, 5},
     {"savvy_PlRExpr_str_to_datetime__impl", (DL_FUNC) &savvy_PlRExpr_str_to_datetime__impl, 8},
     {"savvy_PlRExpr_str_to_decimal__impl", (DL_FUNC) &savvy_PlRExpr_str_to_decimal__impl, 2},
-    {"savvy_PlRExpr_str_to_integer__impl", (DL_FUNC) &savvy_PlRExpr_str_to_integer__impl, 3},
+    {"savvy_PlRExpr_str_to_integer__impl", (DL_FUNC) &savvy_PlRExpr_str_to_integer__impl, 4},
     {"savvy_PlRExpr_str_to_lowercase__impl", (DL_FUNC) &savvy_PlRExpr_str_to_lowercase__impl, 1},
     {"savvy_PlRExpr_str_to_time__impl", (DL_FUNC) &savvy_PlRExpr_str_to_time__impl, 4},
     {"savvy_PlRExpr_str_to_titlecase__impl", (DL_FUNC) &savvy_PlRExpr_str_to_titlecase__impl, 1},