mirror of
https://github.com/ae-utbm/sith.git
synced 2025-03-09 23:07:11 +00:00
Compile openapi client in background when django runserver is reloading
This commit is contained in:
parent
222ff762da
commit
2b12d04e4c
@ -7,6 +7,7 @@
|
|||||||
"compile": "vite build --mode production",
|
"compile": "vite build --mode production",
|
||||||
"compile-dev": "vite build --mode development",
|
"compile-dev": "vite build --mode development",
|
||||||
"serve": "vite build --mode development --watch --minify false",
|
"serve": "vite build --mode development --watch --minify false",
|
||||||
|
"openapi": "openapi-ts",
|
||||||
"analyse-dev": "vite-bundle-visualizer --mode development",
|
"analyse-dev": "vite-bundle-visualizer --mode development",
|
||||||
"analyse-prod": "vite-bundle-visualizer --mode production",
|
"analyse-prod": "vite-bundle-visualizer --mode production",
|
||||||
"check": "biome check --write"
|
"check": "biome check --write"
|
||||||
|
@ -50,7 +50,13 @@ class Command(CollectStatic):
|
|||||||
return Path(location)
|
return Path(location)
|
||||||
|
|
||||||
Scss.compile(self.collect_scss())
|
Scss.compile(self.collect_scss())
|
||||||
OpenApi.compile() # This needs to be prior to javascript bundling
|
openapi = OpenApi.compile() # This needs to be prior to javascript bundling
|
||||||
|
if openapi is not None:
|
||||||
|
_ = openapi.wait()
|
||||||
|
if openapi.returncode:
|
||||||
|
raise RuntimeError(
|
||||||
|
f"Openapi generation failed with returncode {openapi.returncode}"
|
||||||
|
)
|
||||||
JSBundler.compile()
|
JSBundler.compile()
|
||||||
|
|
||||||
collected = super().collect()
|
collected = super().collect()
|
||||||
|
@ -15,11 +15,18 @@ class Command(Runserver):
|
|||||||
"""Light wrapper around default runserver that integrates javascirpt auto bundling."""
|
"""Light wrapper around default runserver that integrates javascirpt auto bundling."""
|
||||||
|
|
||||||
def run(self, **options):
|
def run(self, **options):
|
||||||
OpenApi.compile()
|
is_django_reload = os.environ.get(DJANGO_AUTORELOAD_ENV) is not None
|
||||||
if (
|
|
||||||
os.environ.get(DJANGO_AUTORELOAD_ENV) is None
|
proc = OpenApi.compile()
|
||||||
and settings.PROCFILE_STATIC is not None
|
# Ensure that the first runserver launch creates openapi files
|
||||||
):
|
# before the bundler starts so that it detects them
|
||||||
|
# When django is reloaded, we can keep this process in background
|
||||||
|
# to reduce reload time
|
||||||
|
if proc is not None and not is_django_reload:
|
||||||
|
_ = proc.wait()
|
||||||
|
|
||||||
|
if not is_django_reload and settings.PROCFILE_STATIC is not None:
|
||||||
start_composer(settings.PROCFILE_STATIC)
|
start_composer(settings.PROCFILE_STATIC)
|
||||||
_ = atexit.register(stop_composer, procfile=settings.PROCFILE_STATIC)
|
_ = atexit.register(stop_composer, procfile=settings.PROCFILE_STATIC)
|
||||||
|
|
||||||
super().run(**options)
|
super().run(**options)
|
||||||
|
@ -95,7 +95,7 @@ class JSBundler:
|
|||||||
def compile():
|
def compile():
|
||||||
"""Bundle js files with the javascript bundler for production."""
|
"""Bundle js files with the javascript bundler for production."""
|
||||||
process = subprocess.Popen(["npm", "run", "compile"])
|
process = subprocess.Popen(["npm", "run", "compile"])
|
||||||
process.wait()
|
_ = process.wait()
|
||||||
if process.returncode:
|
if process.returncode:
|
||||||
raise RuntimeError(f"Bundler failed with returncode {process.returncode}")
|
raise RuntimeError(f"Bundler failed with returncode {process.returncode}")
|
||||||
|
|
||||||
@ -163,7 +163,7 @@ class OpenApi:
|
|||||||
OPENAPI_DIR = GENERATED_ROOT / "openapi"
|
OPENAPI_DIR = GENERATED_ROOT / "openapi"
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def compile(cls):
|
def compile(cls) -> subprocess.Popen[bytes] | None:
|
||||||
"""Compile a TS client for the sith API. Only generates it if it changed."""
|
"""Compile a TS client for the sith API. Only generates it if it changed."""
|
||||||
logging.getLogger("django").info("Compiling open api typescript client")
|
logging.getLogger("django").info("Compiling open api typescript client")
|
||||||
out = cls.OPENAPI_DIR / "schema.json"
|
out = cls.OPENAPI_DIR / "schema.json"
|
||||||
@ -191,4 +191,4 @@ class OpenApi:
|
|||||||
with open(out, "w") as f:
|
with open(out, "w") as f:
|
||||||
_ = f.write(schema)
|
_ = f.write(schema)
|
||||||
|
|
||||||
subprocess.run(["npx", "openapi-ts"], check=True)
|
return subprocess.Popen(["npm", "run", "openapi"])
|
||||||
|
Loading…
x
Reference in New Issue
Block a user