Spaces:

CompChemCurtin
/

cek

Running

App Files Files Community

praiteri commited on Feb 20, 2025

Commit

9012508

1 Parent(s): 31fd788

repo update from private

Browse files

Files changed (3) hide show

marimo/app.py +34 -29
marimo/crystal_violet.py +1 -1
marimo/index.html +28 -10

marimo/app.py CHANGED Viewed

@@ -1,8 +1,10 @@
 from typing import Annotated, Callable, Coroutine
-from fastapi.responses import HTMLResponse, RedirectResponse
 import marimo
 from fastapi import FastAPI, Form, Request, Response
 import os
 # Create a FastAPI app
 app = FastAPI()
@@ -22,6 +24,35 @@ marimo_server = (
     .with_app(path="/surface", root="./surface_adsorption.py")
 )
 # Mount the marimo server at the root
 # This will handle all the routes defined in the marimo server
 app.mount("", marimo_server.build())
@@ -29,31 +60,5 @@ app.mount("", marimo_server.build())
 # Run the server
 if __name__ == "__main__":
     import uvicorn
-    uvicorn.run(app, host="0.0.0.0", port=8000)
-#from typing import Annotated, Callable, Coroutine
-#from fastapi.responses import HTMLResponse, RedirectResponse
-#import marimo
-#from fastapi import FastAPI, Form, Request, Response
-#
-#
-## Create a marimo asgi app
-#server = (
-#    marimo.create_asgi_app()
-#    .with_app(path="", root="./index.py")
-#    .with_app(path="/bc", root="./bomb_calorimetry.py")
-#    .with_app(path="/cv", root="./crystal_violet.py")
-#    .with_app(path="/stats", root="./statistics_lab.py")
-#    .with_app(path="/surface", root="./surface_adsorption.py")
-#)
-#
-## Create a FastAPI app
-#app = FastAPI()
-#
-#app.mount("/", server.build())
-#
-## Run the server
-#if __name__ == "__main__":
-#    import uvicorn
-#
-#    uvicorn.run(app, host="0.0.0.0", port=8000)

 from typing import Annotated, Callable, Coroutine
+from fastapi.responses import HTMLResponse, RedirectResponse, FileResponse
 import marimo
 from fastapi import FastAPI, Form, Request, Response
 import os
+from pathlib import Path
 # Create a FastAPI app
 app = FastAPI()
     .with_app(path="/surface", root="./surface_adsorption.py")
 )
+# Create a route to download a file
+@app.get("/download-pdf/{pdf_name}")
+async def download_pdf(pdf_name: str):
+    # Assuming PDFs are stored in a 'pdfs' directory
+    pdf_path = f"../pdfs/{pdf_name}"
+    if os.path.exists(pdf_path):
+        return FileResponse(
+            pdf_path,
+            media_type='application/pdf',
+            filename=pdf_name
+        )
+    return {"error": f"PDF not found [../pdfs/{pdf_name}]"}, 404
+# Create a route to display a pdf
+@app.get("/pdf/direct/{pdf_name}")
+async def get_pdf_direct(pdf_name: str):
+    pdf_path = Path(f"../pdfs/{pdf_name}")
+    if not pdf_path.exists():
+        raise HTTPException(status_code=404, detail=f"PDF not found {pdf_path}")
+    return FileResponse(
+        path=pdf_path,
+        media_type="application/pdf",
+        filename=pdf_name + ".pdf"
+    )
 # Mount the marimo server at the root
 # This will handle all the routes defined in the marimo server
 app.mount("", marimo_server.build())
 # Run the server
 if __name__ == "__main__":
     import uvicorn
+    uvicorn.run(app, host="0.0.0.0", port=2718)

marimo/crystal_violet.py CHANGED Viewed

@@ -16,7 +16,7 @@ def _():
 def _(mo):
     mo.md(
         """
-        # Crystdal Violet Lab
         This notebook mimics a kinetics laboratory experiment, where a UV-Vis spectrophotometer is used to measure the absorbance as the reaction between crystal violet and hydroxide proceeds.
         The absorbance versus time data can then be used to determine the rate of the reaction with respect to both crystal violet and hydroxide ions.

 def _(mo):
     mo.md(
         """
+        # Crystal Violet Lab
         This notebook mimics a kinetics laboratory experiment, where a UV-Vis spectrophotometer is used to measure the absorbance as the reaction between crystal violet and hydroxide proceeds.
         The absorbance versus time data can then be used to determine the rate of the reaction with respect to both crystal violet and hydroxide ions.

marimo/index.html CHANGED Viewed

@@ -88,27 +88,45 @@
 <body>
     <h1>Chemical Energetics and Kinetics Virtual Notebook</h1>
-    <h2>Labs</h2>
     <div class="lab-grid">
         <a href="/stats" class="lab-card">
-            <h3>Statistics</h3>
-            <p>Basic statistical concepts and Python introduction</p>
         </a>
         <a href="/bc" class="lab-card">
-            <h3>Bomb Calorimetry</h3>
-            <p>Thermodynamics and heat measurements</p>
         </a>
         <a href="/cv" class="lab-card">
-            <h3>Crystal Violet</h3>
-            <p>Chemical kinetics and reaction rates</p>
         </a>
         <a href="/surface" class="lab-card">
-            <h3>Surface Adsorption</h3>
-            <p>Equilibrium and surface chemistry</p>
         </a>
     </div>
-    <h2><strong>Check the unit outline for when the reports are due</strong></h2>
     <p>This web page and those linked below have been created with Python using Jupyter Notebooks and will be used to develop important skills in data analysis, data processing, and computing using simulated experimental results and computational chemistry software.</p>

 <body>
     <h1>Chemical Energetics and Kinetics Virtual Notebook</h1>
+    <!-- <h2>Labs</h2> -->
     <div class="lab-grid">
         <a href="/stats" class="lab-card">
+            <h3 style="text-align: center">Statistics Lab</h3>
+            <p style="text-align: center">Basic statistical concepts and Python introduction<br>(Week 2)</p>
         </a>
         <a href="/bc" class="lab-card">
+            <h3 style="text-align: center">Bomb Calorimetry Lab</h3>
+            <p style="text-align: center">Thermodynamics and heat measurements<br>(Week 4)</p>
         </a>
         <a href="/cv" class="lab-card">
+            <h3 style="text-align: center">Crystal Violet Lab</h3>
+            <p style="text-align: center">Chemical kinetics and reaction rates<br>(Week 8)</p>
         </a>
         <a href="/surface" class="lab-card">
+            <h3 style="text-align: center">Surface Adsorption Lab</h3>
+            <p style="text-align: center">Equilibrium and surface chemistry<br>(Week 10)</p>
+        </a>
+        <a href="/download-pdf/LabManualCHEM2000-1.pdf" class="lab-card">
+            <h3 style="text-align: center">Lab Manual<br>(Download PDF)</h3>
+            <p style="text-align: center">Version 1 - 20/02/2025</p>
+        </a>
+        <a href="/download-pdf/NotesOfStatistics-1.pdf" class="lab-card">
+            <h3 style="text-align: center">Notes of Statistics<br>(Download PDF)</h3>
+            <p style="text-align: center">Version 1 - 20/02/2025</p>
         </a>
     </div>
+    <!--
+    <embed
+        src="/pdf/direct/calendar.pdf"
+        type="application/pdf"
+        width="100%"
+        height="600px"
+    />
+    -->
+    <h2 style="text-align: center"><strong>Check the unit outline for when the reports are due</strong></h2>
     <p>This web page and those linked below have been created with Python using Jupyter Notebooks and will be used to develop important skills in data analysis, data processing, and computing using simulated experimental results and computational chemistry software.</p>