return image if include_imgs even if text/plain is present

Author: johnowhitaker

execnb/shell.py

@@ -159,11 +159,12 @@ def render_output(out):
             if d := _g('application/javascript'): return f'<script>{d}</script>'
             if d := _g('text/markdown'): return markdown(d, renderer=renderer)
             if d := _g('text/latex'): return f'<div class="math">${d}$</div>'
-            if d := _g('text/plain'): return _pre(d)
-            if d := _g('image/svg+xml'): return d
             if include_imgs:
                 if d := _g('image/jpeg'): return f'<img src="data:image/jpeg;base64,{d}"/>'
                 if d := _g('image/png'): return f'<img src="data:image/png;base64,{d}"/>'
+            if d := _g('text/plain'): return _pre(d)
+            if d := _g('image/svg+xml'): return d
+            
         return ''
 
     return '\n'.join(map(render_output, outputs))

nbs/02_shell.ipynb

@@ -892,11 +892,12 @@
     "            if d := _g('application/javascript'): return f'<script>{d}</script>'\n",
     "            if d := _g('text/markdown'): return markdown(d, renderer=renderer)\n",
     "            if d := _g('text/latex'): return f'<div class=\"math\">${d}$</div>'\n",
-    "            if d := _g('text/plain'): return _pre(d)\n",
-    "            if d := _g('image/svg+xml'): return d\n",
     "            if include_imgs:\n",
     "                if d := _g('image/jpeg'): return f'<img src=\"data:image/jpeg;base64,{d}\"/>'\n",
     "                if d := _g('image/png'): return f'<img src=\"data:image/png;base64,{d}\"/>'\n",
+    "            if d := _g('text/plain'): return _pre(d)\n",
+    "            if d := _g('image/svg+xml'): return d\n",
+    "            \n",
     "        return ''\n",
     "    \n",
     "    return '\\n'.join(map(render_output, outputs))"