wip

xlwings · Nov 13, 2024 · 908ef1d · 908ef1d
1 parent 72c0c73
commit 908ef1d
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 6 deletions.
diff --git a/app/static/pyscript.json b/app/static/pyscript.json
@@ -1,7 +1,7 @@
 {
   "packages": ["xlwings", "sqlite3", "pydantic", "numpy", "pandas", "matplotlib"],
   "files": {
-    "/static/custom_functions.py": "./custom_functions.py",
-    "/static/custom_scripts.py": "./custom_scripts.py"
+    "/static/python/custom_functions.py": "./custom_functions.py",
+    "/static/python/custom_scripts.py": "./custom_scripts.py"
   }
 }
diff --git a/app/static/custom_functions.py → app/static/python/custom_functions.py b/app/static/custom_functions.py → app/static/python/custom_functions.py
diff --git a/app/static/custom_scripts.py → app/static/python/custom_scripts.py b/app/static/custom_scripts.py → app/static/python/custom_scripts.py
diff --git a/app/static/main.py → app/static/python/main.py b/app/static/main.py → app/static/python/main.py
@@ -5,12 +5,12 @@
 - Check out https://docs.pyscript.net/2024.5.2/user-guide/workers/
 
 TODO:
-- create wasm folder under static
 - support sheet buttons
 - make current_user optional
 - look into toJS vs json (func vs script)
 - run 10000 custom functions
 - remove CDNs
+- automatic pyscript.json config?
 - ObjectConverter
 """
 
@@ -23,7 +23,7 @@
 import custom_scripts
 import xlwings as xw  # noqa: E402
 from pydantic import BaseModel
-from pyscript import window  # noqa: E402
+from pyscript import window  # type: ignore # noqa: E402
 from xlwings.server import (
     custom_functions_call as xlwings_custom_functions_call,
     custom_scripts_call as xlwings_custom_scripts_call,

diff --git a/app/templates/examples/hello_world/taskpane_hello.html b/app/templates/examples/hello_world/taskpane_hello.html
@@ -4,8 +4,7 @@
   <div class="container-fluid pt-3 ps-3">
     <h1>Example Task Pane</h1>
     {# PyScript Test #}
-    <script type="py" src="/static/main.py" config="/static/pyscript.json"></script>
-    <script type="py" src="/static/custom_functions.py" config="/static/pyscript.json"></script>
+    <script type="py" src="/static/python/main.py" config="/static/pyscript.json"></script>
     <button type="button" name="test" class="btn btn-primary btn-sm" py-click="test">PyScript Test</button>
     <button xw-click="test" xw-config='{"exclude": "MySheet"}' class="btn btn-primary btn-sm" type="button">
       WASM