fix json import

fileservice.py

@@ -1,7 +1,7 @@
 from fastapi import FastAPI, Request, Response
 
 filenames = ["js/poseMaker.js"]
-contents = '\n'.join([open(x).read() for x in filenames])
+contents = '\n'.join([f"<script type='text/javascript' src='{x}'></script>" for x in filenames])
 
 app = FastAPI()
 
@@ -15,13 +15,7 @@ async def insert_js(request: Request, call_next):
         async for chunk in response.body_iterator:
             response_body += chunk.decode()
 
-        some_javascript = f"""
-    <script type="text/javascript" defer>
-{contents}
-    </script>
-        """
-
-        response_body = response_body.replace("</body>", some_javascript + "</body>")
+        response_body = response_body.replace("</body>", contents + "</body>")
 
         del response.headers["content-length"]
 

js/poseMaker.js

@@ -623,6 +623,9 @@ function initializeEditor() {
 
 function importPose(jsonData) {
   if (jsonData != null) {
+    if (Array.isArray(jsonData)) {
+      jsonData = jsonData[0]; // 自分で仕込んだバグ回避
+    }
     newPoseData = makePoseDataFromCandidateAndSubset(jsonData.candidate, jsonData.subset);
   } else {
     newPoseData = makePoseDataFromCandidateAndSubset(sampleCandidateSource, [sampleSubsetElementSource]);

main.py

@@ -1,6 +1,7 @@
 import gradio as gr
 import json as js
 import util
+from fastapi.staticfiles import StaticFiles
 from fileservice import app
 from pose import infer, draw
 
@@ -142,7 +143,7 @@ When using Q, X, C, R, pressing and dont release until the operation is complete
   saveBtn.click(
     fn = None,
     inputs = [], outputs = [json],
-    _js="() => { return [savePose()]; }")
+    _js="() => { return savePose(); }")
   jsonSource.change(
     fn = lambda x: x,
     inputs = [jsonSource], outputs = [json])
@@ -159,4 +160,5 @@ When using Q, X, C, R, pressing and dont release until the operation is complete
   demo.load(fn=None, inputs=[], outputs=[], _js="() => { initializeEditor(); importPose(); return []; }")
 
 print("mount")
+app.mount("/js", StaticFiles(directory="js"), name="js")
 gr.mount_gradio_app(app, demo, path="/")