More refactoring (#886)

* Packaged prism.

* More exports, code cleanup to address eslint issues.

* Moved API key checking into openai.

* More util refactoring.

* Updated.

Author: emeryberger

scalene/scalene-gui/openai.js

@@ -1,3 +1,54 @@
+async function tryApi(apiKey) {
+  const response = await fetch("https://api.openai.com/v1/completions", {
+    method: "GET",
+    headers: {
+      "Content-Type": "application/json",
+      Authorization: `Bearer ${apiKey}`,
+    },
+  });
+  return response;
+}
+
+export async function isValidApiKey(apiKey) {
+  const response = await tryApi(apiKey);
+  const data = await response.json();
+  if (
+    data.error &&
+    data.error.code in
+      {
+        invalid_api_key: true,
+        invalid_request_error: true,
+        model_not_found: true,
+        insufficient_quota: true,
+      }
+  ) {
+    return false;
+  } else {
+    return true;
+  }
+}
+
+export function checkApiKey(apiKey) {
+  (async () => {
+    try {
+      window.localStorage.setItem("scalene-api-key", apiKey);
+    } catch {
+      // Do nothing if key not found
+    }
+    // If the API key is empty, clear the status indicator.
+    if (apiKey.length === 0) {
+      document.getElementById("valid-api-key").innerHTML = "";
+      return;
+    }
+    const isValid = await isValidApiKey(apiKey);
+    if (!isValid) {
+      document.getElementById("valid-api-key").innerHTML = "✕";
+    } else {
+      document.getElementById("valid-api-key").innerHTML = "✓";
+    }
+  })();
+}
+
 export async function sendPromptToOpenAI(prompt, apiKey) {
   const endpoint = "https://api.openai.com/v1/chat/completions";
   const model = document.getElementById("language-model-openai").value;

scalene/scalene-gui/scalene-gui-bundle.js

@@ -5,8 +5,9 @@ import vegaEmbed from 'vega-embed';
 import { Prism } from "./prism";
 import Tablesort from "./tablesort";
 import { optimizeCode } from "./optimizations";
-import { memory_consumed_str, time_consumed_str } from "./utils";
+import { unescapeUnicode, countSpaces, memory_consumed_str, time_consumed_str } from "./utils";
 import { makeBar, makeGPUPie, makeMemoryPie, makeMemoryBar, makeSparkline } from "./gui-elements";
+import { isValidApiKey, checkApiKey } from "./openai";
 
 export function vsNavigate(filename, lineno) {
   // If we are in VS Code, clicking on a line number in Scalene's web UI will navigate to that line in the source code.
@@ -32,76 +33,6 @@ const maxLinesPerRegion = 50; // Only show regions that are no more than this ma
 
 let showedExplosion = {}; // Used so we only show one explosion per region.
 
-function unescapeUnicode(s) {
-  return s.replace(/\\u([\dA-F]{4})/gi, function (match, p1) {
-    return String.fromCharCode(parseInt(p1, 16));
-  });
-}
-
-async function tryApi(apiKey) {
-  const response = await fetch("https://api.openai.com/v1/completions", {
-    method: "GET",
-    headers: {
-      "Content-Type": "application/json",
-      Authorization: `Bearer ${apiKey}`,
-    },
-  });
-  return response;
-}
-
-async function isValidApiKey(apiKey) {
-  const response = await tryApi(apiKey);
-  const data = await response.json();
-  if (
-    data.error &&
-    data.error.code in
-      {
-        invalid_api_key: true,
-        invalid_request_error: true,
-        model_not_found: true,
-        insufficient_quota: true,
-      }
-  ) {
-    return false;
-  } else {
-    return true;
-  }
-}
-
-function checkApiKey(apiKey) {
-  (async () => {
-    try {
-      window.localStorage.setItem("scalene-api-key", apiKey);
-    } catch {
-      // Do nothing if key not found
-    }
-    // If the API key is empty, clear the status indicator.
-    if (apiKey.length === 0) {
-      document.getElementById("valid-api-key").innerHTML = "";
-      return;
-    }
-    const isValid = await isValidApiKey(apiKey);
-    if (!isValid) {
-      document.getElementById("valid-api-key").innerHTML = "✕";
-    } else {
-      document.getElementById("valid-api-key").innerHTML = "✓";
-    }
-  })();
-}
-
-function countSpaces(str) {
-  // Use a regular expression to match any whitespace character at the start of the string
-  const match = str.match(/^\s+/);
-
-  // If there was a match, return the length of the match
-  if (match) {
-    return match[0].length;
-  }
-
-  // Otherwise, return 0
-  return 0;
-}
-
 export function proposeOptimizationRegion(filename, file_number, line) {
   proposeOptimization(
     filename,

scalene/scalene-gui/scalene-gui.js

@@ -1,3 +1,24 @@
+export function unescapeUnicode(s) {
+  return s.replace(/\\u([\dA-F]{4})/gi, function (match, p1) {
+    return String.fromCharCode(parseInt(p1, 16));
+  });
+}
+
+
+export function countSpaces(str) {
+  // Use a regular expression to match any whitespace character at the start of the string
+  const match = str.match(/^\s+/);
+
+  // If there was a match, return the length of the match
+  if (match) {
+    return match[0].length;
+  }
+
+  // Otherwise, return 0
+  return 0;
+}
+
+
 export function memory_consumed_str(size_in_mb) {
   // Return a string corresponding to amount of memory consumed.
   let gigabytes = Math.floor(size_in_mb / 1024);