Merge pull request #63 from microsoft/ntoebookAttachments

Fix embedding images in exported notebook

build/clean.ts

@@ -10,6 +10,9 @@ if (fs.existsSync(path.join(__dirname, '..', 'out'))) {
 if (fs.existsSync(path.join(__dirname, '..', 'pyodide'))) {
 	fs.rmSync(path.join(__dirname, '..', 'pyodide'), { recursive: true });
 }
+if (fs.existsSync(path.join(__dirname, '..', 'resources', 'pyodide.zip'))) {
+	fs.rmSync(path.join(__dirname, '..', 'resources', 'pyodide.zip'), { recursive: true });
+}
 if (fs.existsSync(path.join(__dirname, '..', 'temp'))) {
 	fs.rmSync(path.join(__dirname, '..', 'temp'), { recursive: true });
 }

package.json

@@ -6,7 +6,7 @@
     "author": "Microsoft Corporation",
     "homepage": "https://github.com/microsoft/Advanced-Data-Analysis-for-Copilot",
     "icon": "images/icon.png",
-    "version": "0.1.7",
+    "version": "0.1.8",
     "engines": {
         "vscode": "^1.95.0"
     },
@@ -87,6 +87,27 @@
                 "description": "I can help you with data analytics",
                 "sampleRequest": "Help me analyze the csv file",
                 "isSticky": true,
+                "disambiguation": [
+                    {
+                        "category": "analysis",
+                        "description": "Performs analysis on some data provided by user either as a file or content",
+                        "examples": [
+                            "Analyze the contents of sample.csv",
+                            "What is the correlation between house price and income in sample.csv",
+                            "What is the median house price in sample.csv"
+                        ]
+                    },
+                    {
+                        "category": "visualize",
+                        "description": "Display visualizations based on some analysis or data provided by user either as a file or content",
+                        "examples": [
+                            "Visualize the contents of sample.csv",
+                            "Generate a plot of average house prices by state",
+                            "Display the correlation between house price and income in sample.csv",
+                            "Display a chart with the median house price in sample.csv"
+                        ]
+                    }
+                ],
                 "commands": [
                     {
                         "description": "Export the result of the analysis along with the Python code into multiple formats",

src/exportCommand.ts

@@ -6,7 +6,7 @@ import * as fs from 'fs';
 import { EOL } from 'os';
 import { unescape } from 'querystring';
 import { promisify } from 'util';
-import { CancellationToken, ChatContext, ChatRequest, ChatResponseMarkdownPart, ChatResponseStream, ChatResponseTurn, ExtensionContext, l10n, NotebookCellData, NotebookCellKind, NotebookCellOutput, NotebookData, ThemeIcon, window, workspace } from "vscode";
+import { CancellationToken, ChatContext, ChatRequest, ChatResponseMarkdownPart, ChatResponseStream, ChatResponseTurn, ExtensionContext, l10n, NotebookCellData, NotebookCellKind, NotebookCellOutput, NotebookData, ThemeIcon, Uri, window, workspace } from "vscode";
 import { getToolResultValue, isErrorMessageResponse, TsxToolUserMetadata } from "./base";
 import { logger } from "./logger";
 import { uint8ArrayToBase64 } from "./platform/common/string";
@@ -264,7 +264,8 @@ export async function createAttachments(markdown: string): Promise<{ markdown: s
 	const attachments: Record<string, { 'image/png': string }> = {};
 	await Promise.all(images.map(async ({ name, link }) => {
 		try {
-			const bytes = await promisify(fs.readFile)(unescape(link));
+			const file = link.startsWith('file://') ? Uri.parse(link).fsPath : unescape(link);
+			const bytes = await promisify(fs.readFile)(file);
 			const base64 = uint8ArrayToBase64(bytes);
 			name = `${sanitize(name).replace(/ /g, '')}.png`;
 			attachments[name] = { 'image/png': base64 };