From 27ac42f3f0991dbf978bdefb8d87b5b8dcd2462f Mon Sep 17 00:00:00 2001
From: Muspi Merol <wjj123345567@icloud.com>
Date: Tue, 2 Jul 2024 02:42:54 +0800
Subject: [PATCH] chore: refactoring

---
 src/lib/components/ErrorExplainer.svelte      |  2 +-
 .../components/console/HeadlessConsole.svelte |  4 +--
 src/lib/pyodide/explain.ts                    | 18 ------------
 src/lib/pyodide/index.ts                      | 17 ++++++++++-
 src/lib/pyodide/{get-py.ts => start/chat.ts}  | 29 +++++++++----------
 src/lib/pyodide/start/console.ts              | 11 +++++++
 src/lib/pyodide/{ => start}/init.ts           | 19 +++++++-----
 .../{load-sources.py => start/loader.py}      | 13 +++++++--
 .../translate.ts => utils/formatSource.ts}    |  0
 src/python/chat/__init__.py                   |  8 ++++-
 src/python/console/bridge.py                  |  2 --
 src/routes/+page.svelte                       |  2 +-
 12 files changed, 74 insertions(+), 51 deletions(-)
 delete mode 100644 src/lib/pyodide/explain.ts
 rename src/lib/pyodide/{get-py.ts => start/chat.ts} (53%)
 create mode 100644 src/lib/pyodide/start/console.ts
 rename src/lib/pyodide/{ => start}/init.ts (64%)
 rename src/lib/pyodide/{load-sources.py => start/loader.py} (71%)
 rename src/lib/{pyodide/translate.ts => utils/formatSource.ts} (100%)

diff --git a/src/lib/components/ErrorExplainer.svelte b/src/lib/components/ErrorExplainer.svelte
index 8f729d7e..11f2ff21 100644
--- a/src/lib/components/ErrorExplainer.svelte
+++ b/src/lib/components/ErrorExplainer.svelte
@@ -2,7 +2,7 @@
   import Markdown from "./Markdown.svelte";
   import { draggable } from "@neodrag/svelte";
   import { renderMarkdown } from "$lib/markdown";
-  import { explain } from "$lib/pyodide/explain";
+  import { explain } from "$lib/pyodide/start/chat";
   import { onMount } from "svelte";
   import { cubicIn, cubicOut } from "svelte/easing";
   import { scale } from "svelte/transition";
diff --git a/src/lib/components/console/HeadlessConsole.svelte b/src/lib/components/console/HeadlessConsole.svelte
index 6cd7aec2..fffea055 100644
--- a/src/lib/components/console/HeadlessConsole.svelte
+++ b/src/lib/components/console/HeadlessConsole.svelte
@@ -15,7 +15,7 @@
 <script lang="ts">
   import type { ConsoleAPI } from "$py/console/console";
 
-  import { getPy } from "$lib/pyodide";
+  import getPy from "$lib/pyodide";
   import { onDestroy, onMount } from "svelte";
 
   export let ready = false;
@@ -27,7 +27,7 @@
   let loading = 0;
 
   onMount(async () => {
-    const py = await getPy();
+    const py = await getPy({ console: true });
     pyConsole = (py.pyimport("console.console")).ConsoleAPI();
     complete = pyConsole.complete;
 
diff --git a/src/lib/pyodide/explain.ts b/src/lib/pyodide/explain.ts
deleted file mode 100644
index 3861c913..00000000
--- a/src/lib/pyodide/explain.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { getPy } from ".";
-import chat from "../../python/chat";
-import { getSetupModule } from "./init";
-import { cacheSingleton } from "$lib/utils/cache";
-
-export const loadChat = cacheSingleton(async () => {
-  const py = await getPy();
-  const setupModule = await getSetupModule();
-  setupModule(py.toPy(chat), "chat");
-  await py.pyimport("chat").asynchronous_bootstrap() as Promise<void>;
-});
-
-export async function* explain(traceback: string, code: string): AsyncGenerator<string> {
-  const py = await getPy();
-  await loadChat();
-  const explain = py.pyimport("chat.explain").explain;
-  yield * explain(traceback, code);
-}
diff --git a/src/lib/pyodide/index.ts b/src/lib/pyodide/index.ts
index afa89f3a..4274c562 100644
--- a/src/lib/pyodide/index.ts
+++ b/src/lib/pyodide/index.ts
@@ -1 +1,16 @@
-export { getPy } from "./get-py";
+import { getPyodide } from "./start/init";
+
+export default async function getPy(feature: { console?: boolean; chat?: boolean }) {
+  const { console = false, chat = false } = feature;
+
+  if (console) {
+    const { loadConsole } = await import("./start/console");
+    await loadConsole();
+  }
+  if (chat) {
+    const { loadChat } = await import("./start/chat");
+    await loadChat();
+  }
+
+  return await getPyodide();
+}
diff --git a/src/lib/pyodide/get-py.ts b/src/lib/pyodide/start/chat.ts
similarity index 53%
rename from src/lib/pyodide/get-py.ts
rename to src/lib/pyodide/start/chat.ts
index 9dd46117..ebd7aa40 100644
--- a/src/lib/pyodide/get-py.ts
+++ b/src/lib/pyodide/start/chat.ts
@@ -1,10 +1,8 @@
 import type { ClientOptions } from "openai";
 
-import console from "../../python/console";
-import { loadChat } from "./explain";
-import { getAtomicPy as getAtomicPyodide, getSetupModule } from "./init";
+import chat from "../../../python/chat";
+import { getPyodide, setupModule } from "./init";
 import * as env from "$env/static/public";
-import { pyodideReady } from "$lib/stores";
 import { cacheSingleton } from "$lib/utils/cache";
 import { OpenAI } from "openai";
 import * as version from "openai/version";
@@ -19,17 +17,16 @@ class PatchedOpenAI extends OpenAI {
   }
 }
 
-export const getPy = cacheSingleton(async () => {
-  const py = await getAtomicPyodide();
-  const setupModule = await getSetupModule();
-
+export const loadChat = cacheSingleton(async () => {
+  const py = await getPyodide();
   py.registerJsModule("openai", { OpenAI: PatchedOpenAI, version, __all__: [] });
-
-  setupModule(py.toPy(console), "console");
-
-  pyodideReady.set(true);
-
-  loadChat();
-
-  return py;
+  await setupModule(chat, "chat");
+  await py.pyimport("chat.install_requirements");
 });
+
+export async function* explain(traceback: string, code: string): AsyncGenerator<string> {
+  const py = await getPyodide();
+  await loadChat();
+  const explain = py.pyimport("chat.explain").explain;
+  yield * explain(traceback, code);
+}
diff --git a/src/lib/pyodide/start/console.ts b/src/lib/pyodide/start/console.ts
new file mode 100644
index 00000000..afd51b89
--- /dev/null
+++ b/src/lib/pyodide/start/console.ts
@@ -0,0 +1,11 @@
+import console from "../../../python/console";
+import { getPyodide, setupModule } from "./init";
+import { pyodideReady } from "$lib/stores";
+import { cacheSingleton } from "$lib/utils/cache";
+
+export const loadConsole = cacheSingleton(async () => {
+  const py = await getPyodide();
+  await setupModule(console, "console");
+  pyodideReady.set(true);
+  return py;
+});
diff --git a/src/lib/pyodide/init.ts b/src/lib/pyodide/start/init.ts
similarity index 64%
rename from src/lib/pyodide/init.ts
rename to src/lib/pyodide/start/init.ts
index 44537c25..39cdb2d9 100644
--- a/src/lib/pyodide/init.ts
+++ b/src/lib/pyodide/start/init.ts
@@ -1,7 +1,7 @@
 import type { PyProxy } from "pyodide/ffi";
 
-import patches from "../../python/patches";
-import source from "./load-sources.py?raw";
+import patches from "../../../python/patches";
+import loader from "./loader.py?raw";
 import { dev } from "$app/environment";
 import * as env from "$env/static/public";
 import { cacheSingleton } from "$lib/utils/cache";
@@ -18,7 +18,7 @@ else if (dev)
 else
   indexURL = env.PUBLIC_PYODIDE_INDEX_URL ?? "/pyodide/";
 
-export const getMinimalPyodide = cacheSingleton(withToast({ loading: "loading pyodide runtime" })(async () => {
+const getMinimalPyodide = cacheSingleton(withToast({ loading: "loading pyodide runtime" })(async () => {
   const { loadPyodide } = await import("pyodide");
   const py = await loadPyodide({ indexURL, env: getEnv(), packages: ["micropip"], args: dev ? [] : ["-O"] });
   py.globals.set("with_toast", withToast);
@@ -26,15 +26,20 @@ export const getMinimalPyodide = cacheSingleton(withToast({ loading: "loading py
   return py;
 }));
 
-export const getSetupModule = cacheSingleton(async () => {
+const getSetupModule = cacheSingleton(async () => {
   const py = await getMinimalPyodide();
-  return py.runPython(source) as (sources: Record<string, string>, moduleName: string) => PyProxy;
+  return py.runPython(loader) as (sources: Record<string, string>, moduleName: string) => PyProxy;
 });
 
-export const getAtomicPy = cacheSingleton(async () => {
+export async function setupModule(sources: Record<string, string>, moduleName: string) {
   const setupModule = await getSetupModule();
   const py = await getMinimalPyodide();
-  setupModule(py.toPy(patches), "patches");
+  setupModule(py.toPy(sources), moduleName);
+}
+
+export const getPyodide = cacheSingleton(async () => {
+  const py = await getMinimalPyodide();
+  await setupModule(patches, "patches");
   py.pyimport("patches.patches");
   return py;
 });
diff --git a/src/lib/pyodide/load-sources.py b/src/lib/pyodide/start/loader.py
similarity index 71%
rename from src/lib/pyodide/load-sources.py
rename to src/lib/pyodide/start/loader.py
index 30beb4a9..60ed1a77 100644
--- a/src/lib/pyodide/load-sources.py
+++ b/src/lib/pyodide/start/loader.py
@@ -2,21 +2,30 @@
 from sys import modules
 from sys import path as sys_path
 
-root = Path("/runtime_sources/python")
+from js import console
+
+root = Path("/runtime_sources/")
 
 sys_path.insert(0, root.as_posix())
 
 
 def setup_module(sources: dict[str, str], module_name: str):
+    console.groupCollapsed(module_name)
+
     for path, source in sources.items():
         file = root / module_name / path
-        print(file)
         if not file.parent.is_dir():
             file.parent.mkdir(parents=True)
         file.write_text(source, "utf-8")
 
+        console.groupCollapsed(path)
+        console.log(source)
+        console.groupEnd()
+
         if __debug__ and (name := path.replace("/", ".")) in modules:
             del modules[name]  # reload module at dev time
 
+    console.groupEnd()
+
 
 setup_module
diff --git a/src/lib/pyodide/translate.ts b/src/lib/utils/formatSource.ts
similarity index 100%
rename from src/lib/pyodide/translate.ts
rename to src/lib/utils/formatSource.ts
diff --git a/src/python/chat/__init__.py b/src/python/chat/__init__.py
index 6cfbd192..a2d7329f 100644
--- a/src/python/chat/__init__.py
+++ b/src/python/chat/__init__.py
@@ -1,4 +1,10 @@
-async def asynchronous_bootstrap():
+from asyncio import ensure_future
+from operator import call
+
+
+@ensure_future
+@call
+async def install_requirements():
     from micropip import install
 
     await install(["promplate==0.3.4.8", "promplate-pyodide==0.0.3.3"])
diff --git a/src/python/console/bridge.py b/src/python/console/bridge.py
index 9eea4834..d8d62b7e 100644
--- a/src/python/console/bridge.py
+++ b/src/python/console/bridge.py
@@ -23,6 +23,4 @@ def js_api(func):
     def wrapper(*args, **kwargs):
         return _to_js(func(*map(_to_py, args), **{k: _to_py(v) for k, v in kwargs.items()}))
 
-    setattr(wrapper, "_is_js_api", True)
-
     return wrapper
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index 9d1e7c96..5421abfc 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -7,8 +7,8 @@
   import HeadlessConsole from "$lib/components/console/HeadlessConsole.svelte";
   import ConsolePrompt from "$lib/components/ConsolePrompt.svelte";
   import Modal from "$lib/components/Modal.svelte";
-  import { patchSource, reformatInputSource } from "$lib/pyodide/translate";
   import { pyodideReady } from "$lib/stores";
+  import { patchSource, reformatInputSource } from "$lib/utils/formatSource";
   import { afterUpdate, beforeUpdate, onMount } from "svelte";
   import { cubicIn, cubicOut } from "svelte/easing";
   import { scale } from "svelte/transition";