@myst-theme/site 0.1.36 → 0.1.37

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@myst-theme/site",
-  "version": "0.1.36",
+  "version": "0.1.37",
   "main": "./src/index.ts",
   "types": "./src/index.ts",
   "files": [
@@ -16,20 +16,21 @@
   "dependencies": {
     "@headlessui/react": "^1.7.13",
     "@heroicons/react": "^2.0.14",
-    "@myst-theme/diagrams": "^0.1.36",
-    "@myst-theme/frontmatter": "^0.1.36",
-    "@myst-theme/jupyter": "^0.1.36",
-    "@myst-theme/providers": "^0.1.36",
+    "@myst-theme/diagrams": "^0.1.37",
+    "@myst-theme/frontmatter": "^0.1.37",
+    "@myst-theme/jupyter": "^0.1.37",
+    "@myst-theme/providers": "^0.1.37",
     "classnames": "^2.3.2",
     "lodash.throttle": "^4.1.1",
     "myst-common": "^0.0.16",
-    "myst-config": "^0.0.12",
-    "myst-demo": "^0.1.36",
-    "myst-to-react": "^0.1.36",
+    "myst-config": "^0.0.14",
+    "myst-demo": "^0.1.37",
+    "myst-to-react": "^0.1.37",
     "nbtx": "^0.2.3",
     "node-cache": "^5.1.2",
     "node-fetch": "^2.6.7",
-    "unist-util-select": "^4.0.1"
+    "unist-util-select": "^4.0.1",
+    "thebe-react": "^0.0.7"
   },
   "peerDependencies": {
     "@remix-run/node": "^1.12.0",

package/src/components/ComputeControls.tsx

@@ -0,0 +1,124 @@
+import { Spinner } from './Spinner';
+import PlayCircleIcon from '@heroicons/react/24/outline/PlayCircleIcon';
+import ArrowPathIcon from '@heroicons/react/24/outline/ArrowPathIcon';
+import MinusCircleIcon from '@heroicons/react/24/outline/MinusCircleIcon';
+import ArrowTopRightOnSquareIcon from '@heroicons/react/24/outline/ArrowTopRightOnSquareIcon';
+import classNames from 'classnames';
+import type { NotebookExecuteOptions } from 'thebe-react';
+import { useThebeServer } from 'thebe-react';
+import type { IThebeCellExecuteReturn } from 'thebe-core';
+import { useMDASTNotebook, useNotebookCellExecution } from '@myst-theme/jupyter';
+
+export function Run({
+  ready,
+  executing,
+  disabled,
+  execute,
+}: {
+  ready: boolean;
+  executing: boolean;
+  disabled?: boolean;
+  execute: (
+    options?: NotebookExecuteOptions | undefined,
+  ) => Promise<(IThebeCellExecuteReturn | null)[]>;
+}) {
+  return (
+    <div className="flex relative text-sm">
+      <button
+        className={classNames(
+          'cursor-pointer text-gray-700 active:text-green-700 hover:opacity-100',
+          {
+            'opacity-10 hover:opacity-10': executing,
+            'opacity-60': !executing,
+          },
+        )}
+        disabled={disabled || !ready || executing}
+        onClick={() => execute()}
+      >
+        <PlayCircleIcon className="h-6 w-6 inline-block align-top" title="run all cells" />
+      </button>
+      {executing && (
+        <span className="absolute top-0 left-0 z-10 w-[22px] h-[22px] opacity-100">
+          <Spinner size={24} />
+        </span>
+      )}
+    </div>
+  );
+}
+
+export function Clear({
+  ready,
+  executing,
+  disabled,
+  clear,
+}: {
+  ready: boolean;
+  executing: boolean;
+  disabled?: boolean;
+  clear: () => void;
+}) {
+  return (
+    <button
+      className="flex cursor-pointer text-gray-700 active:text-green-700 opacity-60 hover:opacity-100"
+      disabled={disabled || !ready || executing}
+      onClick={() => clear()}
+    >
+      <MinusCircleIcon className="h-6 w-6 inline-block align-top" title="clear all outputs" />
+    </button>
+  );
+}
+
+export function RunCell({ id }: { id: string }) {
+  const exec = useNotebookCellExecution(id);
+  if (!exec?.ready) return null;
+  const { ready, executing, notebookIsExecuting, execute } = exec;
+  return (
+    <Run ready={ready} executing={executing} disabled={notebookIsExecuting} execute={execute} />
+  );
+}
+
+export function ClearCell({ id }: { id: string }) {
+  const exec = useNotebookCellExecution(id);
+  if (!exec?.ready) return null;
+  const { ready, executing, notebookIsExecuting, clear } = exec;
+  return <Clear ready={ready} executing={executing} disabled={notebookIsExecuting} clear={clear} />;
+}
+
+export function NotebookRunAll() {
+  const { ready: serverReady, server } = useThebeServer();
+  const exec = useMDASTNotebook();
+
+  if (!exec?.ready) return null;
+  const { ready, executing, executeAll, restart, clear } = exec;
+
+  const clickLaunchInJupyter = () => {
+    if (!serverReady || !server?.settings) return;
+    window.open(server.settings.baseUrl, '_blank');
+  };
+
+  return (
+    <div className="flex">
+      <div className="group flex relative space-x-1">
+        <Run ready={ready} executing={executing} execute={executeAll} />
+        <button
+          className="flex items-center cursor-pointer text-gray-700 active:text-green-700 opacity-60 hover:opacity-100"
+          disabled={!ready || executing}
+          onClick={() => restart()}
+        >
+          <ArrowPathIcon className="h-6 w-6" title="restart kernel" />
+        </button>
+        <Clear ready={ready} executing={executing} clear={clear} />
+        <button
+          className="flex items-center cursor-pointer text-gray-700 active:text-green-700 opacity-60 hover:opacity-100"
+          disabled={!ready}
+          onClick={clickLaunchInJupyter}
+        >
+          <ArrowTopRightOnSquareIcon
+            className="h-6 w-6 inline-block align-top"
+            title="launch in juptyer"
+          />
+        </button>
+      </div>
+    </div>
+  );
+}

package/src/components/ContentBlocks.tsx

@@ -1,9 +1,28 @@
 import { useParse, DEFAULT_RENDERERS } from 'myst-to-react';
-import type { Parent } from 'myst-spec';
+import type { GenericParent, SourceFileKind } from 'myst-common';
 import { useNodeRenderers } from '@myst-theme/providers';
 import classNames from 'classnames';
+import { ClearCell, RunCell } from './ComputeControls';
 
-function Block({ id, node, className }: { id: string; node: Parent; className?: string }) {
+function isACodeCell(node: GenericParent) {
+  return (
+    node.type === 'block' &&
+    node.children.length === 2 &&
+    node.children[0].type === 'code' &&
+    node.children[1].type === 'output'
+  );
+}
+
+function Block({
+  id,
+  node,
+  className,
+}: {
+  id: string;
+  pageKind: SourceFileKind;
+  node: GenericParent;
+  className?: string;
+}) {
   const renderers = useNodeRenderers() ?? DEFAULT_RENDERERS;
   const children = useParse(node, renderers);
   const subGrid = 'article-grid article-subgrid-gap col-screen';
@@ -13,23 +32,40 @@ function Block({ id, node, className }: { id: string; node: Parent; className?:
     (dataClassName && dataClassName.includes('col-')) || (className && className.includes('col-'));
   return (
     <div
+      key={id}
       id={id}
-      className={classNames(className, dataClassName, {
+      className={classNames('relative group/block', className, dataClassName, {
         [subGrid]: !noSubGrid,
       })}
     >
       {children}
+      {isACodeCell(node) && (
+        <div className="hidden group-hover/block:flex md:flex-col absolute -top-[28px] md:top-0 right-0 md:-right-[28px] mt-8">
+          <RunCell id={id} />
+          <ClearCell id={id} />
+        </div>
+      )}
     </div>
   );
 }
 
-export function ContentBlocks({ mdast, className }: { mdast: Parent; className?: string }) {
-  const blocks = mdast.children as Parent[];
+export function ContentBlocks({
+  name,
+  pageKind,
+  mdast,
+  className,
+}: {
+  name: string;
+  pageKind: SourceFileKind;
+  mdast: GenericParent;
+  className?: string;
+}) {
+  const blocks = mdast.children as GenericParent[];
   return (
     <>
-      {blocks.map((node, index) => {
-        return <Block key={(node as any).key} id={`${index}`} node={node} className={className} />;
-      })}
+      {blocks.map((node) => (
+        <Block key={node.key} id={node.key} pageKind={pageKind} node={node} className={className} />
+      ))}
     </>
   );
 }

package/src/components/EnableCompute.tsx

@@ -0,0 +1,64 @@
+import { useThebeCore, useThebeServer, useThebeSession } from 'thebe-react';
+import PowerIcon from '@heroicons/react/24/outline/PowerIcon';
+import { useHasNotebookProvider } from '@myst-theme/jupyter';
+import { useNavigation } from '@remix-run/react';
+import { useEffect, useState } from 'react';
+
+export function EnableCompute({
+  canCompute,
+  children,
+}: React.PropsWithChildren<{ canCompute: boolean }>) {
+  const { load, loading, core } = useThebeCore();
+  const { connect, connecting, ready: serverReady, error: serverError } = useThebeServer();
+  const {
+    start,
+    starting,
+    shutdown,
+    session,
+    ready: sessionReady,
+    error: sessionError,
+  } = useThebeSession();
+  const hasNotebookProvider = useHasNotebookProvider();
+  const navigation = useNavigation();
+  const [enabling, setEnabling] = useState(false);
+  const [enabled, setEnabled] = useState(false);
+  const busy = enabling || loading || connecting || starting;
+
+  useEffect(() => {
+    if (!enabling) return;
+    if (!core) return load();
+    if (!serverReady) return connect();
+    if (!sessionReady) start();
+    if (sessionReady) {
+      setEnabled(true);
+      setEnabling(false);
+    }
+  }, [enabling, core, serverReady, sessionReady]);
+
+  if (!canCompute || !hasNotebookProvider) return null;
+  let classes = 'flex text-center mr-1 cursor-pointer rounded-full';
+  const idleClasses = 'text-blue-700 hover:opacity-100 opacity-60';
+  const busyClasses = 'bg-yellow-700 text-yellow-700 opacity-100 font-semibold';
+  const readyClasses = 'bg-green-700 text-green-700 opacity-100 font-semibold';
+  const errorClasses = 'bg-red-700 text-red-700 opacity-100';
+
+  if (busy) classes += busyClasses;
+  else if (serverReady && sessionReady) classes += readyClasses;
+  else if (serverError || sessionError) classes += errorClasses;
+  else classes += idleClasses;
+
+  useEffect(() => {
+    if (navigation.state === 'loading') {
+      shutdown();
+    }
+  }, [shutdown, navigation]);
+
+  return (
+    <div className="flex mx-1 items-center">
+      <button className={classes} onClick={() => setEnabling(true)} disabled={enabling || enabled}>
+        <PowerIcon className="h-6 w-6 mx-1 inline-block align-top" title="enable compute" />
+      </button>
+      {enabled && <>{children}</>}
+    </div>
+  );
+}

package/src/components/FooterLinksBlock.tsx

@@ -4,6 +4,7 @@ import ArrowLeftIcon from '@heroicons/react/24/outline/ArrowLeftIcon';
 import ArrowRightIcon from '@heroicons/react/24/outline/ArrowRightIcon';
 import type { FooterLinks, NavigationLink } from '../types';
 import { useUrlbase, withUrlbase } from '@myst-theme/providers';
+import { useEffect, useState } from 'react';
 
 const FooterLink = ({ title, url, group, right }: NavigationLink & { right?: boolean }) => {
   const urlbase = useUrlbase();

package/src/components/Spinner.tsx

@@ -0,0 +1,23 @@
+export function Spinner({ size }: { size: number }) {
+  return (
+    <div role="status">
+      <svg
+        aria-hidden="true"
+        className={`w-[${size}px] h-[${size}px] mr-2 text-gray-200 animate-spin dark:text-gray-600 fill-green-600`}
+        viewBox="0 0 100 101"
+        fill="none"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z"
+          fill="currentColor"
+        />
+        <path
+          d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z"
+          fill="currentFill"
+        />
+      </svg>
+      <span className="sr-only">Loading...</span>
+    </div>
+  );
+}

package/src/pages/Article.tsx

@@ -1,26 +1,54 @@
-import { ReferencesProvider } from '@myst-theme/providers';
+import React from 'react';
+import { ReferencesProvider, useComputeOptions } from '@myst-theme/providers';
 import { FrontmatterBlock } from '@myst-theme/frontmatter';
 import { Bibliography, ContentBlocks, FooterLinksBlock } from '../components';
 import { ErrorDocumentNotFound } from './ErrorDocumentNotFound';
 import { ErrorProjectNotFound } from './ErrorProjectNotFound';
 import type { PageLoader } from '../types';
+import { ThebeSessionProvider } from 'thebe-react';
+import type { GenericParent } from 'myst-common';
+import { SourceFileKind } from 'myst-common';
+import { EnableCompute } from '../components/EnableCompute';
+import { NotebookRunAll } from '../components/ComputeControls';
+import { NotebookProvider, BinderBadge } from '@myst-theme/jupyter';
 
-export function ArticlePage({ article }: { article: PageLoader }) {
-  const { hide_title_block, hide_footer_links } = (article.frontmatter as any)?.design ?? {};
+export const ArticlePage = React.memo(function ({ article }: { article: PageLoader }) {
+  const computeOptions = useComputeOptions();
+  const canCompute = computeOptions.canCompute && (article.frontmatter as any)?.thebe !== false;
+  const { hide_title_block, hide_footer_links, binder } =
+    (article.frontmatter as any)?.design ?? {};
+  const isJupyter = article?.kind && article.kind === SourceFileKind.Notebook;
   return (
     <ReferencesProvider
       references={{ ...article.references, article: article.mdast }}
       frontmatter={article.frontmatter}
     >
-      {!hide_title_block && (
-        <FrontmatterBlock kind={article.kind} frontmatter={article.frontmatter} />
-      )}
-      <ContentBlocks mdast={article.mdast} />
-      <Bibliography />
-      {!hide_footer_links && <FooterLinksBlock links={article.footer} />}
+      <ThebeSessionProvider start={false} name={article.slug}>
+        {!hide_title_block && (
+          <FrontmatterBlock kind={article.kind} frontmatter={article.frontmatter} />
+        )}
+        <NotebookProvider siteConfig={false} page={article}>
+          <div className="flex items-center">
+            <div className="flex-grow"></div>
+            {binder && <BinderBadge binder={binder} />}
+            {canCompute && isJupyter && (
+              <EnableCompute canCompute={true} key={article.slug}>
+                <NotebookRunAll />
+              </EnableCompute>
+            )}
+          </div>
+          <ContentBlocks
+            name={article.slug}
+            pageKind={article.kind}
+            mdast={article.mdast as GenericParent}
+          />
+          <Bibliography />
+          {!hide_footer_links && <FooterLinksBlock links={article.footer} />}
+        </NotebookProvider>
+      </ThebeSessionProvider>
     </ReferencesProvider>
   );
-}
+});
 
 export function ProjectPageCatchBoundary() {
   return <ErrorProjectNotFound />;

package/src/pages/Root.tsx

@@ -16,6 +16,8 @@ import { ContentReload, renderers } from '../components';
 import { Analytics } from '../seo';
 import { ErrorSiteNotFound } from './ErrorSiteNotFound';
 import classNames from 'classnames';
+import { ThebeCoreProvider } from 'thebe-react';
+import { ConfiguredThebeServerProvider } from '@myst-theme/jupyter';
 
 export function Document({
   children,
@@ -47,7 +49,11 @@ export function Document({
       </head>
       <body className="m-0 transition-colors duration-500 bg-white dark:bg-stone-900">
         <ThemeProvider theme={theme} renderers={renderers} Link={RemixLink as any}>
-          <SiteProvider config={config}>{children}</SiteProvider>
+          <ThebeCoreProvider>
+            <SiteProvider config={config}>
+              <ConfiguredThebeServerProvider>{children}</ConfiguredThebeServerProvider>
+            </SiteProvider>
+          </ThebeCoreProvider>
         </ThemeProvider>
         <ScrollRestoration />
         <Scripts />