mirror of
https://github.com/pyscript/pyscript.git
synced 2025-12-20 02:37:41 -05:00
c75f885cb4
This PR is the first step to improve and rationalize the life-cycle of a pyscript app along the lines of what I described in #763 . It is not a complete solution, more PRs will follow. Highlights: - py-config is no longer a web component: the old code relied on PyConfig.connectedCallback to do some logic, but then if no <py-config> tag was present, we had to introduce a dummy one with the sole goal of activating the callback. Now the logic is much more linear. - the new pyconfig.ts only contains the code which is needed to parse the config; I also moved some relevant code from utils.ts because it didn't really belong to it - the old PyConfig class did much more than dealing with the config: in particular, it contained the code to initialize the env and the runtime. Now this logic has been moved directly into main.ts, inside the new PyScriptApp class. I plan to refactor the initialization code in further PRs - the current code relies too much on global state and global variables, they are everywhere. This PR is a first step to solve the problem by introducing a PyScriptApp class, which will hold all the mutable state of the page. Currently only config is stored there, but eventually I will migrate more state to it, until we will have only one global singleton, globalApp - thanks to what I described above, I could kill the appConfig svelte store: one less store to kill :).
134 lines
3.9 KiB
Python
134 lines
3.9 KiB
Python
import os
|
|
import tarfile
|
|
import tempfile
|
|
|
|
import pytest
|
|
import requests
|
|
|
|
from .support import JsError, PyScriptTest
|
|
|
|
URL = "https://github.com/pyodide/pyodide/releases/download/0.20.0/pyodide-build-0.20.0.tar.bz2"
|
|
TAR_NAME = "pyodide-build-0.20.0.tar.bz2"
|
|
|
|
|
|
@pytest.fixture
|
|
def tar_location(request):
|
|
val = request.config.cache.get("pyodide-0.20-tar", None)
|
|
if val is None:
|
|
response = requests.get(URL, stream=True)
|
|
TMP_DIR = tempfile.mkdtemp()
|
|
TMP_TAR_LOCATION = os.path.join(TMP_DIR, TAR_NAME)
|
|
with open(TMP_TAR_LOCATION, "wb") as f:
|
|
f.write(response.raw.read())
|
|
val = TMP_TAR_LOCATION
|
|
request.config.cache.set("pyodide-0.20-tar", val)
|
|
return val
|
|
|
|
|
|
def unzip(location, extract_to="."):
|
|
file = tarfile.open(name=location, mode="r:bz2")
|
|
file.extractall(path=extract_to)
|
|
|
|
|
|
class TestConfig(PyScriptTest):
|
|
def test_py_config_inline(self):
|
|
self.pyscript_run(
|
|
"""
|
|
<py-config type="toml">
|
|
name = "foobar"
|
|
</py-config>
|
|
|
|
<py-script>
|
|
import js
|
|
config = js.pyscript_get_config()
|
|
js.console.log("config name:", config.name)
|
|
</py-script>
|
|
"""
|
|
)
|
|
assert self.console.log.lines[-1] == "config name: foobar"
|
|
|
|
def test_py_config_external(self):
|
|
pyconfig_toml = """
|
|
name = "app with external config"
|
|
"""
|
|
self.writefile("pyconfig.toml", pyconfig_toml)
|
|
self.pyscript_run(
|
|
"""
|
|
<py-config src="pyconfig.toml" type="toml">
|
|
</py-config>
|
|
|
|
<py-script>
|
|
import js
|
|
config = js.pyscript_get_config()
|
|
js.console.log("config name:", config.name)
|
|
</py-script>
|
|
"""
|
|
)
|
|
assert self.console.log.lines[-1] == "config name: app with external config"
|
|
|
|
# The default pyodide version is 0.21.2 as of writing
|
|
# this test which is newer than the one we are loading below
|
|
# (after downloading locally) -- which is 0.20.0
|
|
|
|
# The test checks if loading a different runtime is possible
|
|
# and that too from a locally downloaded file without needing
|
|
# the use of explicit `indexURL` calculation.
|
|
def test_runtime_config(self, tar_location):
|
|
unzip(
|
|
location=tar_location,
|
|
extract_to=self.tmpdir,
|
|
)
|
|
|
|
self.pyscript_run(
|
|
snippet="""
|
|
<py-script>
|
|
import sys, js
|
|
pyodide_version = sys.modules["pyodide"].__version__
|
|
js.console.log("version", pyodide_version)
|
|
pyodide_version
|
|
</py-script>
|
|
""",
|
|
extra_head="""
|
|
<py-config type="json">
|
|
{
|
|
"runtimes": [{
|
|
"src": "/pyodide/pyodide.js",
|
|
"name": "pyodide-0.20.0",
|
|
"lang": "python"
|
|
}]
|
|
}
|
|
</py-config>
|
|
""",
|
|
)
|
|
|
|
assert self.console.log.lines == [self.PY_COMPLETE, "version 0.20.0"]
|
|
version = self.page.locator("py-script").inner_text()
|
|
assert version == "0.20.0"
|
|
|
|
def test_invalid_json_config(self):
|
|
with pytest.raises(JsError) as exc:
|
|
self.pyscript_run(
|
|
snippet="",
|
|
extra_head="""
|
|
<py-config type="json">
|
|
[[
|
|
</py-config>
|
|
""",
|
|
)
|
|
|
|
msg = str(exc.value)
|
|
assert "SyntaxError" in msg
|
|
|
|
def test_invalid_toml_config(self):
|
|
with pytest.raises(JsError) as exc:
|
|
self.pyscript_run(
|
|
snippet="",
|
|
extra_head="""
|
|
<py-config>
|
|
[[
|
|
</py-config>
|
|
""",
|
|
)
|
|
msg = str(exc)
|
|
assert "<ExceptionInfo JsError" in msg
|