correct check for shiny server python

Author: jjallaire

src/command/preview/cmd.ts

@@ -50,6 +50,7 @@ import { Format } from "../../config/types.ts";
 import { isServerShiny, isServerShinyPython } from "../../core/render.ts";
 import { previewShiny } from "./preview-shiny.ts";
 import { serve } from "../serve/serve.ts";
+import { fileExecutionEngine } from "../../execute/engine.ts";
 
 export const previewCommand = new Command()
   .name("preview")
@@ -280,7 +281,8 @@ export const previewCommand = new Command()
         const renderFormat = (await renderFormats(file, format, project))
           ?.[format] as Format | undefined;
         if (renderFormat && isServerShiny(renderFormat)) {
-          if (isServerShinyPython(renderFormat)) {
+          const engine = fileExecutionEngine(file, flags);
+          if (isServerShinyPython(renderFormat, engine?.name)) {
             const result = await previewShiny({
               input: file,
               render: !!options.render,

src/core/render.ts

@@ -30,7 +30,10 @@ export function isServerShiny(format?: Format) {
   return server?.["type"] === "shiny";
 }
 
-export function isServerShinyPython(format?: Format, engine?: string) {
+export function isServerShinyPython(
+  format: Format,
+  engine: string | undefined,
+) {
   return isServerShiny(format) && engine === kJupyterEngine;
 }
 

src/execute/jupyter/jupyter.ts

@@ -100,7 +100,11 @@ import {
   markdownFromJupyterPercentScript,
 } from "./percent.ts";
 import { execProcess } from "../../core/process.ts";
-import { inputFilesDir, isServerShinyPython } from "../../core/render.ts";
+import {
+  inputFilesDir,
+  isServerShiny,
+  isServerShinyPython,
+} from "../../core/render.ts";
 import { jupyterCapabilities } from "../../core/jupyter/capabilities.ts";
 
 export const jupyterEngine: ExecutionEngine = {
@@ -512,19 +516,20 @@ export const jupyterEngine: ExecutionEngine = {
 
   postRender: async (files: RenderResultFile[], _context?: ProjectContext) => {
     // discover non _files dir resources for server: shiny and ammend app.py with them
-    files.filter((file) => isServerShinyPython(file.format)).forEach((file) => {
-      const [dir, stem] = dirAndStem(file.input);
-      const filesDir = join(dir, inputFilesDir(file.input));
-      const extraResources = file.resourceFiles
-        .filter((resource) => !resource.startsWith(filesDir))
-        .map((resource) => relative(dir, resource));
-      const appScript = join(dir, `${stem}-app.py`);
-      if (existsSync(appScript)) {
-        // TODO: extraResoures is an array of relative paths to resources
-        // that are NOT in the _files dir. these should be injected into
-        // the appropriate place in appScript
-      }
-    });
+    files.filter((file) => isServerShiny(file.format))
+      .forEach((file) => {
+        const [dir, stem] = dirAndStem(file.input);
+        const filesDir = join(dir, inputFilesDir(file.input));
+        const extraResources = file.resourceFiles
+          .filter((resource) => !resource.startsWith(filesDir))
+          .map((resource) => relative(dir, resource));
+        const appScript = join(dir, `${stem}-app.py`);
+        if (existsSync(appScript)) {
+          // TODO: extraResoures is an array of relative paths to resources
+          // that are NOT in the _files dir. these should be injected into
+          // the appropriate place in appScript
+        }
+      });
   },
 
   postprocess: (options: PostProcessOptions) => {