Improves data frame handling

R/knitr-engine.R

@@ -676,8 +676,25 @@ eng_python_autoprint <- function(captured, options) {
 
   } else if (inherits(value, "pandas.core.frame.DataFrame")) {
 
-    return(captured)
+    # this comes from https://github.com/yihui/knitr/blob/7bc8b393e261c88f299bccc7eee40b4e952ebd57/R/output.R#L197
+    isQuarto <- !is.null(knitr::opts_knit$get('quarto.version'))
+    renderDF <- getOption("reticulate.engine.render_df", default = TRUE)
+
+    # Quarto documents running Python with the Jupyter engine return richly rendered
+    # data.frames and we want keep the same behavior for documents rendered with
+    # the knitr engine
+    if (isQuarto && renderDF) {
+      return(eng_python_generic_autoprint(captured, value))
+    }
 
+    # we respect the Rmarkdown `df_print` option that allows to control how
+    # to display data.frames in the document. In the case it's not the default,
+    # we cast into an R data.frame and let knitr handle the rendering.
+    if (knitr::opts_knit$get("rmarkdown.df_print") != "default" && renderDF) {
+      return(knitr::knit_print(py_to_r(value), options = options))
+    }
+
+    return(captured)
   } else if (isHtml && py_has_method(value, "_repr_html_")) {
 
     py_capture_output({
@@ -730,7 +747,13 @@ eng_python_autoprint <- function(captured, options) {
 
     return("")
 
-  } else if (py_has_method(value, "_repr_markdown_")) {
+  } else {
+    return(eng_python_generic_autoprint(captured, value))
+  }
+}
+
+eng_python_generic_autoprint <- function(captured, value) {
+  if (py_has_method(value, "_repr_markdown_")) {
 
     data <- as_r_value(value$`_repr_markdown_`())
     .engine_context$pending_plots$push(knitr::asis_output(data))
@@ -748,5 +771,4 @@ eng_python_autoprint <- function(captured, options) {
     return(captured)
 
   }
-
 }

tests/testthat/resources/pandas-autoprint.Rmd

@@ -0,0 +1,8 @@
+---
+title: "Python Multiple Print & Comments"
+---
+
+```{python}
+r.mtcars
+```
+

tests/testthat/test-python-knitr-engine.R

@@ -99,3 +99,25 @@ test_that("Output streams are remaped when kniting", {
 
   expect_snapshot_file(test_path("resources", "knitr-print2.md"))
 })
+
+test_that("correctly handles `df_print` for pandas data frames", {
+
+  skip_on_cran()
+  skip_if_not_installed("rmarkdown")
+  local_edition(3)
+
+  owd <- setwd(test_path("resources"))
+  on.exit({setwd(owd)}, add = TRUE)
+  for (df_print in c("paged", "default", "kable")) {
+    out_file <- paste0(df_print, ".html")
+    rmarkdown::render(
+      "pandas-autoprint.Rmd",
+      quiet = TRUE,
+      output_file = out_file,
+      output_format = rmarkdown::html_document(
+        df_print = df_print
+      ))
+    expect_snapshot_file(out_file)
+  }
+
+})