Merge pull request #12 from LD4P/v11-update-pyscript

jermnelson · web-flow · commit 30d92370499f · 2024-12-13T14:56:31.000-08:00
Updates pyscript to 2024.11.1
diff --git a/index.html b/index.html
@@ -2,65 +2,17 @@
 <html>
   <head>
     <title>Sinopia Linked Data - Graph Explorer</title>
-    <link rel="stylesheet" href="https://pyscript.net/latest/pyscript.css" />
+    <link rel="stylesheet" href="https://pyscript.net/releases/2024.11.1/core.css" />
     <link href="static/css/main.css" rel="stylesheet" />
     <link href="static/css/header.css" rel="stylesheet" />
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.8.3/font/bootstrap-icons.css">
     <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-ka7Sk0Gln4gmtz2MlQnikT1wXgYsOg+OMhuP+IlRH9sENBO0LRn5q+8nbTov4+1p" crossorigin="anonymous"></script>
-    <script defer src="https://pyscript.net/latest/pyscript.js"></script>
+    <script type="module" src="https://pyscript.net/releases/2024.11.1/core.js"></script>
     <style>
       strong {
         font-weight: 800;
       }
     </style>
-    <py-config type="toml">
-     packages = ["pandas", "markdown", "Jinja2", "./static/wheels/rdflib-7.1.1-py3-none-any.whl"]
-
-     [[fetch]]
-     from = "src"
-     files = ["helpers.py", "load_rdf.py", "query_rdf.py", "sinopia_api.py", "state.py"]
-
-    </py-config>
-    <py-script>
-      __version__ = "1.0.5"
-      import asyncio
-      import sys
-      import js
-      # Hack to load rdflib
-      # setattr(sys.stderr, 'isatty', lambda : True)
-
-      from pyodide.ffi import create_proxy
- 
-      import helpers
-
-      import rdflib
-
-
-      BIBFRAME = rdflib.Namespace("http://id.loc.gov/ontologies/bibframe/")
-      SINOPIA = rdflib.Namespace("http://sinopia.io/vocabulary/")
-
-      from sinopia_api import show_groups
-      from load_rdf import bibframe_sparql as bf_sparql_widget, build_graph, download_graph
-      from query_rdf import download_query_results, run_query
- 
-
-
-      async def load_content():
-          for element_id in ['intro',
-                             'retrieve-rdf',
-                             'bf-work-instance-item-rdf',
-                             'sparql-summary'
-          ]:
-              await helpers.render_markdown(element_id)
-
-
-      asyncio.ensure_future(load_content())
-      
-      bf_sparql_widget("bf-sparql-query")
-     
-      helpers.set_versions(__version__)
-       
-     </py-script>
   </head>
   <body>
     <div class="editor-navbar">
@@ -116,21 +68,21 @@ <h4>Version <span id="version" ></span></h4>
            <div class="row">
               <div class="col">
                 <div class="form-check">
-                   <input type="radio" py-click="asyncio.ensure_future(show_groups('Development'))" name="sinopia_env" value="Development" class="form-check-input">
+                   <input type="radio" py-click="show_groups" name="sinopia_env" value="Development" class="form-check-input">
                      <label for="https://api.development.sinopia.io/" class="form-check-label">Development</label>
                    </input>
                 </div>
                 <div class="form-check">
-                   <input type="radio" py-click="asyncio.ensure_future(show_groups('Stage'))" value="Stage" name="sinopia_env" class="form-check-input">
+                   <input type="radio" py-click="show_groups" value="Stage" name="sinopia_env" class="form-check-input">
                      <label for="https://api.stage.sinopia.io/" class="form-check-label">Stage</label>
                    </input>
                 </div>
                 <div class="form-check">
-                   <input type="radio" py-click="asyncio.ensure_future(show_groups('Production'))" value="Production" name="sinopia_env" class="form-check-input">
+                   <input type="radio" py-click="show_groups" value="Production" name="sinopia_env" class="form-check-input">
                      <label for="https://api.sinopia.io/" class="form-check-label">Production</label>
                    </input>
                 </div>
-                <button class="btn btn-primary btn-lg" py-click="asyncio.ensure_future(build_graph())">
+                <button class="btn btn-primary btn-lg" py-click="build_graph">
                    <i class="spinner-border d-none" id="graph-loading-status"></i>
                    Build Graph
                 </button>
@@ -220,5 +172,30 @@ <h5 class="modal-title" id="graph-repl-modal-title">Graph Explorer - Python REPL
       </div>
     </div>
 
+ <!-- Load modal -->
+ <div class="modal fade" tabindex="-1" id="splashModal">
+  <div class="modal-dialog modal-fullscreen-sm-down">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title">Graph Explorer Initialization</h5>
+        <button type="button" id="splashModalCloseBtn" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+      </div>
+      <div class="modal-body">
+        Loading...
+        <div class="spinner-border text-secondary" role="status">
+          <span class="visually-hidden">Loading...</span>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+
+    <script>
+      document.addEventListener('DOMContentLoaded', function () {
+        var myModal = new bootstrap.Modal('#splashModal', {});
+        myModal.show();
+    });
+   </script>
+    <script type="py" src="./main.py" config="./pyconfig.json"></script>
   </body>
 </html>
diff --git a/main.py b/main.py
@@ -0,0 +1,38 @@
+__version__ = "1.1.0"
+import asyncio
+import sys
+import js
+
+
+from pyodide.ffi import create_proxy
+
+import helpers
+
+import rdflib
+
+BIBFRAME = rdflib.Namespace("http://id.loc.gov/ontologies/bibframe/")
+SINOPIA = rdflib.Namespace("http://sinopia.io/vocabulary/")
+
+from sinopia_api import show_groups
+from load_rdf import bibframe_sparql as bf_sparql_widget, build_graph, download_graph
+from query_rdf import download_query_results, run_query
+
+
+async def load_content():
+    for element_id in [
+        "intro",
+        "retrieve-rdf",
+        "bf-work-instance-item-rdf",
+        "sparql-summary",
+    ]:
+        await helpers.render_markdown(element_id)
+
+
+asyncio.ensure_future(load_content())
+
+bf_sparql_widget("bf-sparql-query")
+
+helpers.set_versions(__version__)
+
+splash_modal_close_btn = js.document.getElementById("splashModalCloseBtn")
+splash_modal_close_btn.click()
diff --git a/pyconfig.json b/pyconfig.json
@@ -0,0 +1,17 @@
+{
+  "packages": [
+    "pandas",
+    "markdown",
+    "Jinja2",
+    "pyparsing",
+    "./static/wheels/isodate-0.6.1-py2.py3-none-any.whl",
+    "./static/wheels/rdflib-7.1.1-py3-none-any.whl"
+  ],
+  "files": {
+    "./src/helpers.py": "./helpers.py",
+    "./src/load_rdf.py": "./load_rdf.py",
+    "./src/query_rdf.py": "./query_rdf.py",
+    "./src/sinopia_api.py": "./sinopia_api.py",
+    "./src/state.py": "./state.py"
+  }
+}
diff --git a/src/load_rdf.py b/src/load_rdf.py
@@ -24,7 +24,7 @@ async def _get_all_graph(api_url: str, limit: int = 250) -> None:
     while loading_resources:
         result = await pyfetch(next_url)
         payload = await result.json()
-        for i,row in enumerate(payload["data"]):
+        for i, row in enumerate(payload["data"]):
             if not "data" in row:
                 js.console.log(f"No data for {i}")
                 continue
@@ -49,7 +49,7 @@ async def _get_group_graph(group: str, api_url: str, limit: int = 2_500) -> None
     initial_url = f"{api_url}resource?limit={limit}&group={group}&start={start}"
     initial_result = await pyfetch(initial_url)
     group_payload = await initial_result.json()
-    for i,row in enumerate(group_payload["data"]):
+    for i, row in enumerate(group_payload["data"]):
         if not "data" in row:
             js.console.log(f"No RDF found for {row.get('uri', 'bad url')}")
             continue
@@ -65,7 +65,7 @@ async def _get_group_graph(group: str, api_url: str, limit: int = 2_500) -> None
     return SINOPIA_GRAPH
 
 
-async def build_graph() -> rdflib.Graph:
+async def build_graph(*args) -> rdflib.Graph:
     groups_selected = js.document.getElementById("env-groups")
     individual_resources = js.document.getElementById("resource-urls")
     sinopia_env_radio = js.document.getElementsByName("sinopia_env")
@@ -134,18 +134,22 @@ async def build_graph() -> rdflib.Graph:
       Download Graph
     </button>
     <ul class="dropdown-menu" aria-labelledby="rdf-download-file">
-        <li><a py-click="asyncio.ensure_future(download_graph('ttl'))" class="dropdown-item" href="#">Turtle (.ttl)</a></li>
-        <li><a class="dropdown-item" py-click="asyncio.ensure_future(download_graph('xml'))" href="#">XML (.rdf)</a></li>
-        <li><a class="dropdown-item" py-click="asyncio.ensure_future(download_graph('json-ld'))" href="#">JSON-LD (.json)</a></li>
-         <li><a class="dropdown-item" py-click="asyncio.ensure_future(download_graph('nt'))" href="#">N3 (.nt)</a></li>
+        <li><a py-click="download_graph" data-serialization="ttl" class="dropdown-item" href="#">Turtle (.ttl)</a></li>
+        <li><a class="dropdown-item" py-click="download_graph" data-serialization="xml" href="#">XML (.rdf)</a></li>
+        <li><a class="dropdown-item" py-click="download_graph" data-serialization="json-ld" href="#">JSON-LD (.json)</a></li>
+         <li><a class="dropdown-item" py-click="download_graph" data-serialization="nt" href="#">N3 (.nt)</a></li>
     </ul>
   </div>
 </div>
 """
 )
 
 
-async def download_graph(serialization: str):
+async def download_graph(event):
+    anchor = event.target
+    serialization = anchor.getAttribute("data-serialization")
+
+    js.console.log(f"In graph, {serialization}")
     if len(SINOPIA_GRAPH) < 1:
         js.alert("Empty graph cannot be download")
         return
@@ -223,7 +227,7 @@ def bibframe(element_id: str, urls: list):
     </textarea>
   </div>
   <div class="mb-3">
-    <button class="btn btn-primary" py-click="asyncio.ensure_future(run_query())">Run query</button>
+    <button class="btn btn-primary" py-click="run_query">Run query</button>
   </div>
 </div>"""
 )
@@ -232,5 +236,4 @@ def bibframe(element_id: str, urls: list):
 def bibframe_sparql(element_id: str):
     wrapper_div = js.document.getElementById(element_id)
     all_namespaces = NAMESPACES + [("rdf", rdflib.RDF), ("rdfs", rdflib.RDFS)]
-    js.console.log(f"All namespaces {all_namespaces}")
     wrapper_div.innerHTML = sparql_template.render(namespaces=all_namespaces)
diff --git a/src/query_rdf.py b/src/query_rdf.py
@@ -23,8 +23,8 @@
       Download Results
     </button>
     <ul class="dropdown-menu" aria-labelledby="rdf-download-file">
-        <li><a py-click="asyncio.ensure_future(download_query_results('csv'))" class="dropdown-item" href="#">CSV (.csv)</a></li>
-        <li><a class="dropdown-item" py-click="asyncio.ensure_future(download_query_results('json'))" href="#">JSON (.json)</a></li>
+        <li><a py-click="download_query_results" data-serialization='csv' class="dropdown-item" href="#">CSV (.csv)</a></li>
+        <li><a class="dropdown-item" py-click="download_query_results" data-serialization='json' href="#">JSON (.json)</a></li>
     </ul>
   </div>
 </div>
@@ -50,13 +50,14 @@
 )
 
 
-async def download_query_results(serialization: str):
+async def download_query_results(event):
+    serialization = event.target.getAttribute("data-serialization")
     js.console.log(f"Download query results {serialization} {len(RESULTS_DF)}")
     mime_type, content = None, None
     match serialization:
         case "csv":
             mime_type = "text/csv"
-            contents = RESULTS_DF.to_csv()
+            contents = RESULTS_DF.to_csv(index=False)
 
         case "json":
             mime_type = "application/json"
@@ -74,17 +75,17 @@ async def download_query_results(serialization: str):
     js.document.body.removeChild(anchor)
 
 
-async def run_query():
+async def run_query(*args):
     global RESULTS_DF
     query_element = js.document.getElementById("bf-sparql-queries")
     sparql_query = query_element.value
     output_element = js.document.getElementById("bf-sparql-results")
-    output_element.innerHTML = ""
+    output_element.content = ""
     try:
         query = SINOPIA_GRAPH.query(sparql_query)
         RESULTS_DF = pd.DataFrame(query.bindings)
         output_element.innerHTML = query_results_template.render(
             count=f"{len(query.bindings):,}", vars=query.vars, results=query.bindings
         )
     except Exception as e:
-        output_element.innerHTML = f"""<h2>Query Error</h2><p>{e}</p>"""
+        output_element.content = f"""<h2>Query Error</h2><p>{e}</p>"""
diff --git a/src/sinopia_api.py b/src/sinopia_api.py
@@ -53,6 +53,7 @@ async def _on_load_groups(event):
 
 
 def _environment_checkbox(env):
+
     div = js.document.createElement("div")
     div.classList.add("form-check")
     ident = env[1]
@@ -83,7 +84,11 @@ def _group_select(options: list = []):
     return wrapper_div
 
 
-async def show_groups(env):
+async def show_groups(*args):
+    current_radio_btn = args[0].target
+    env = current_radio_btn.value
+
+    js.console.log(f"Env is {current_radio_btn.value}")
     api_url = environments.get(env)
     if api_url is None:
         return
@@ -93,7 +98,7 @@ async def show_groups(env):
     groups_url = f"{api_url}groups/"
     get_result = await pyfetch(groups_url)
     result = await get_result.json()
-    #data = json.loads(result.getvalue())["data"]
+    # data = json.loads(result.getvalue())["data"]
     data = result["data"]
     groups = [("All", "all")]
     for row in data:
diff --git a/static/wheels/isodate-0.6.1-py2.py3-none-any.whl b/static/wheels/isodate-0.6.1-py2.py3-none-any.whl
