Stuff

README.md

@@ -43,14 +43,13 @@ Write Python endpoints in [SvelteKit](https://kit.svelte.dev/) using [Modal](htt
  - Create `sveltekit_modal_config.py`. The option `stub_asgi` is passed to [Modal](https://modal.com/docs/reference/modal.Stub#asgi). This is where you can define GPU acceleration, secrets, and an Image for pip installs, etc. Explore their [docs](https://modal.com/docs/guide)!
     ```python
     import modal
-    import sveltekit_modal
-
-    config: sveltekit_modal.Config = {
-      'name': 'sveltekit-example',
-      'log': False,
-      'stub_asgi': {
-          'image': modal.Image.debian_slim()
-      }
+
+    config = {
+        'name': 'sveltekit-example',
+        'log': False,
+        'stub_asgi': {
+            'image': modal.Image.debian_slim()
+        }
     }
     ```
   - Update `.gitignore`, add `!.env.production`.

src/bin.mjs

@@ -17,7 +17,7 @@ switch (cmd) {
 
         cd(path.join('.', 'node_modules', 'sveltekit-modal', 'esm/src/vite'))
 
-        const deploy_log = await $`python3 sveltekit_modal_deploy.py`;
+        const deploy_log = await $`python3 -m sveltekit_modal.deploy`;
         const modal_route_match = deploy_log.stdout.match(/https:\/\/.*?\.modal\.run/)?.toString();
 
         cd(path.join('..', '..', '..', '../../..'))

src/vite/mod.ts

@@ -1,5 +1,5 @@
 import { loadEnv, type Plugin } from 'vite'
-import { type ProcessPromise, $ as run$, cd as cd$, fs, path, globby, chalk } from "zx";
+import { type ProcessPromise, $ as run$, cd as cd$, chalk } from "zx";
 import globsync from "rollup-plugin-globsync";
 
 const get_pyServerEndpointAsString = (modal_url: URL) => `
@@ -42,6 +42,8 @@ export async function sveltekit_modal(): Promise<Plugin[]> {
             '!./node_modules/sveltekit-modal/esm/src/vite/sveltekit_modal/app.py',
             '!./node_modules/sveltekit-modal/esm/src/vite/sveltekit_modal/config.py',
             '!./node_modules/sveltekit-modal/esm/src/vite/sveltekit_modal/pyproject.toml',
+            '!./node_modules/sveltekit-modal/esm/src/vite/sveltekit_modal/deploy.py',
+            '!./node_modules/sveltekit-modal/esm/src/vite/sveltekit_modal/server.py',
         ]
     });
 
@@ -52,20 +54,12 @@ export async function sveltekit_modal(): Promise<Plugin[]> {
             await kill_all_process();
         },
         async configureServer({ config }) {
-            const packagelocation = path.join(config.root, 'node_modules', 'sveltekit-modal', 'esm/src/vite');
-
-            await fs.copy('sveltekit_modal_config.py', path.join(packagelocation, '/sveltekit_modal/sveltekit_modal_config.py'));
-
-            for (const file of await globby('src/routes/**/*.py')) {
-                await fs.copy(file, path.join(packagelocation, '/sveltekit_modal/', file));
-            }
-
             run$.verbose = false;
             run$.env.PYTHONDONTWRITEBYTECODE = '1';
 
             cd$(packagelocation)
 
-            const local_process: ProcessPromise = run$`python3 sveltekit_modal_serve.py`;
+            const local_process: ProcessPromise = run$`python3 -m sveltekit_modal.serve`;
             child_processes.push(local_process);
 
             cd$(config.root)

src/vite/sveltekit_modal/serve.py

@@ -1,5 +1,11 @@
 import sys
-from .app import stub
+import traceback
+
+from synchronicity import Interface
+from modal.cli.app import _show_stub_ref_failure_help
+from modal_utils.async_utils import synchronizer
+from modal_utils.package_utils import NoSuchStub, import_stub, parse_stub_ref
+
 from .sveltekit_modal_config import config
 
 from watchfiles import DefaultFilter
@@ -39,4 +45,16 @@ def flush(self):
 
 
 if __name__ == '__main__':
-    stub.serve(stdout=Logger(sys.stdout), show_progress=True)
+    parsed_stub_ref = parse_stub_ref('sveltekit_modal.app')
+    try:
+        stub = import_stub(parsed_stub_ref)
+    except NoSuchStub:
+        _show_stub_ref_failure_help(parsed_stub_ref)
+        sys.exit(1)
+    except Exception:
+        traceback.print_exc()
+        sys.exit(1)
+
+    _stub = synchronizer._translate_in(stub)
+    blocking_stub = synchronizer._translate_out(_stub, Interface.BLOCKING)
+    blocking_stub.serve(stdout=Logger(sys.stdout), show_progress=True)