Notebook support

.devcontainer/devcontainer.json

@@ -19,6 +19,7 @@
     },
     "features": {
         "ghcr.io/devcontainers/features/docker-in-docker:2": {},
-        "ghcr.io/devcontainers/features/azure-cli:1.2.5": {}
+        "ghcr.io/devcontainers/features/azure-cli:1.2.5": {},
+        "ghcr.io/devcontainers/features/python:1.6.1": {}
     }
 }

demo/web-app-basic-linux/summary_and_diagrams.md

@@ -11,3 +11,16 @@ stateDiagram
     [*] --> AppServicePlan
     AppServicePlan --> WebApp
 ```
+
+```js title="foo.genai.js"
+$`Write a one sentence poem.`
+```
+
+```md title="output"
+Beneath the silver moon's soft glow, the silent lake whispers secrets to the night.
+```
+
+
+```js
+$`Write another poem`
+```

packages/core/src/ast.ts

@@ -78,10 +78,6 @@ export class Fragment {
         Object.assign(this, init)
         if (!this.fullId) this.fullId = this.id
     }
-
-    get project() {
-        return this.file.project
-    }
 }
 
 export function templateGroup(template: PromptScript) {

packages/core/src/chat.ts

@@ -14,7 +14,6 @@ import {
     renderFencedVariables,
 } from "./fence"
 import { validateFencesWithSchema, validateJSONWithSchema } from "./schema"
-import dedent from "ts-dedent"
 import {
     CHAT_CACHE,
     DEFAULT_MODEL,
@@ -28,6 +27,7 @@ import { fenceMD } from "./markdown"
 import { YAMLStringify } from "./yaml"
 import { estimateChatTokens } from "./tokens"
 import { createChatTurnGenerationContext } from "./runpromptcontext"
+import { dedent } from "./indent"
 
 export type ChatCompletionTool = OpenAI.Chat.Completions.ChatCompletionTool
 

packages/core/src/constants.ts

@@ -163,6 +163,8 @@ export const XLSX_MIME_TYPE =
 export const JSON_MIME_TYPE = "application/json"
 export const JSON_SCHEMA_MIME_TYPE = "application/schema+json"
 export const JAVASCRIPT_MIME_TYPE = "application/javascript"
+export const MARKDOWN_MIME_TYPE = "text/markdown"
+export const YAML_MIME_TYPE = "application/yaml"
 
 export const JSON_META_SCHEMA_URI =
     "https://json-schema.org/draft/2020-12/schema"

packages/core/src/indent.ts

@@ -0,0 +1,10 @@
+import tsDedent from "ts-dedent"
+
+export function indent(text: string, indentation: string) {
+    return text
+        ?.split(/\r?\n/g)
+        .map((line) => indentation + line)
+        .join("\n")
+}
+
+export const dedent = tsDedent

packages/core/src/index.ts

@@ -63,4 +63,5 @@ export * from "./parameters"
 export * from "./scripts"
 export * from "./math"
 export * from "./fence"
-export * from "./ollama"
+export * from "./ollama"
+export * from "./indent"

packages/core/src/markdown.ts

@@ -18,3 +18,11 @@ export function fenceMD(t: string, contentType?: string) {
 export function link(text: string, href: string) {
     return href ? `[${text}](${href})` : text
 }
+
+export function details(summary: string, body: string) {
+    return `\n<details><summary>${summary}</summary>
+
+${body}
+
+</summary></details>\n`
+}

packages/core/src/promptdom.ts

@@ -9,7 +9,6 @@ import { YAMLStringify } from "./yaml"
 import { MARKDOWN_PROMPT_FENCE, PROMPT_FENCE } from "./constants"
 import { fenceMD } from "./markdown"
 import { parseModelIdentifier } from "./models"
-import dedent from "ts-dedent"
 import {
     ChatCompletionAssistantMessageParam,
     ChatCompletionMessageParam,
@@ -18,6 +17,7 @@ import {
 import { errorMessage } from "./error"
 import { tidyData } from "./tidy"
 import { inspect } from "./logging"
+import { dedent } from "./indent"
 
 export interface PromptNode extends ContextExpansionOptions {
     type?:

packages/sample/genaisrc/pr-review-commit.genai.js

@@ -1,5 +1,6 @@
 script({
     model: "openai:gpt-4-32k",
+    temperature: 0,
     files: [],
     title: "pull request commit review",
     system: [
@@ -32,11 +33,14 @@ Provide feedback to the author using annotations.
 
 Think step by step and for each annotation explain your result.
 
+## Guidelines
+
 - Assume the TypeScript code is type correct. do NOT report issues that the TypeScript type checker would find.
 - report 3 most serious errors only, ignore notes and warnings
 - only report issues you are absolutely certain about
 - do NOT repeat the same issue multiple times
 - do NOT report common convention issues
+- do NOT report deleted code since you cannot review the entire codebase
 - use a friendly tone
 - use emojis
 - do NOT cross-reference annotations, assume they are all independent

packages/sample/src/jupytest.ipynb

@@ -0,0 +1,38 @@
+{
+ "cells": [
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [
+    {
+     "ename": "",
+     "evalue": "",
+     "output_type": "error",
+     "traceback": [
+      "\u001b[1;31mRunning cells with 'Python 3.11.2' requires the ipykernel package.\n",
+      "\u001b[1;31mRun the following command to install 'ipykernel' into the Python environment. \n",
+      "\u001b[1;31mCommand: '/bin/python3 -m pip install ipykernel -U --user --force-reinstall'"
+     ]
+    }
+   ],
+   "source": [
+    "x = 1\n",
+    "\n"
+   ]
+  }
+ ],
+ "metadata": {
+  "kernelspec": {
+   "display_name": "Python 3",
+   "language": "python",
+   "name": "python3"
+  },
+  "language_info": {
+   "name": "python",
+   "version": "3.11.2"
+  }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 2
+}

packages/sample/src/node.nnb

@@ -0,0 +1,41 @@
+{
+    "cells": [
+        {
+            "language": "typescript",
+            "source": [
+                "var x = 2\ny =1"
+            ],
+            "outputs": [
+                {
+                    "items": [
+                        {
+                            "mime": "text/plain",
+                            "value": [
+                                "\u001b[33m1\u001b[39m"
+                            ]
+                        }
+                    ]
+                }
+            ]
+        },
+        {
+            "language": "typescript",
+            "source": [
+                "// <reference path=\"../genaisrc/genaiscript.d.ts\" />\nconsole.log({ x,y})\n"
+            ],
+            "outputs": [
+                {
+                    "items": [
+                        {
+                            "mime": "application/vnd.code.notebook.stdout",
+                            "value": [
+                                "{ x: 2, y: 1 }",
+                                ""
+                            ]
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}

packages/vscode/package.json

@@ -41,7 +41,8 @@
     },
     "activationEvents": [
         "workspaceContains:**/*.gpspec.md",
-        "workspaceContains:**/*.genai.js"
+        "workspaceContains:**/*.genai.js",
+        "onNotebook:genaiscript"
     ],
     "main": "./built/extension.js",
     "bugs": {
@@ -56,6 +57,18 @@
         "./icon-dark.svg"
     ],
     "contributes": {
+        "notebooks": [
+            {
+                "type": "genaiscript",
+                "displayName": "GenAIScript Markdown Notebook",
+                "priority": "option",
+                "selector": [
+                    {
+                        "filenamePattern": "*.{md,mdx,markdown}"
+                    }
+                ]
+            }
+        ],
         "markdown.previewStyles": [
             "./markdown.css"
         ],

packages/vscode/src/extension.ts

@@ -11,6 +11,7 @@ import { activateOpenAIRequestTreeDataProvider } from "./openairequesttree"
 import { activateAIRequestTreeDataProvider } from "./airequesttree"
 import { activateTestController } from "./testcontroller"
 import { activateModelCompletionProvider } from "./modelcompletionprovider"
+import { activateNotebook } from "./notebook"
 
 export async function activate(context: ExtensionContext) {
     const state = new ExtensionState(context)
@@ -22,6 +23,7 @@ export async function activate(context: ExtensionContext) {
     activateOpenAIRequestTreeDataProvider(state)
     activateStatusBar(state)
     activateModelCompletionProvider(state)
+    activateNotebook(state)
     // activateChatParticipant(state)
 
     context.subscriptions.push(