samgis-lisa-on-zero

Sleeping

App Files Files Community

alessandro trinca tornidor commited on Apr 26

Commit

27d2629

•

1 Parent(s): 872cad3

[feat] permit download of tmp images if WRITE_TMP_ON_DISK env exists

Browse files

Files changed (4) hide show

Dockerfile +5 -1
static/list_files.html +13 -0
static/src/components/PageLayout.vue +1 -1
wrappers/fastapi_wrapper.py +35 -1

Dockerfile CHANGED Viewed

@@ -68,7 +68,8 @@ RUN git clone -n --depth=1 --filter=tree:0 https://huggingface.co/spaces/aletrn/
     git sparse-checkout set --no-cone resources && \
     git checkout
 WORKDIR ${LAMBDA_TASK_ROOT}
-RUN ls -l ${LAMBDA_TASK_ROOT}//*
 FROM pytorch/pytorch:2.2.2-cuda12.1-cudnn8-runtime as runtime
@@ -106,6 +107,8 @@ RUN corepack enable
 COPY ./static /appnode
 WORKDIR /appnode
 # RUN if [ "${DEPENDENCY_GROUP}" = "fastapi" ]; then echo "pnpm store path:" && pnpm store path; fi
 FROM node_fastapi AS node_prod_deps
@@ -151,6 +154,7 @@ RUN ls -lh ${LAMBDA_TASK_ROOT}/machine_learning_models
 COPY --from=builder_global ${LAMBDA_TASK_ROOT}/lisa-on-cuda/resources ${LAMBDA_TASK_ROOT}/resources
 COPY --from=node_prod_deps /appnode/node_modules* ${FASTAPI_STATIC}/node_modules
 COPY --from=node_build /appnode/dist* ${FASTAPI_STATIC}/dist
 # Include global arg in this stage of the build

     git sparse-checkout set --no-cone resources && \
     git checkout
 WORKDIR ${LAMBDA_TASK_ROOT}
+RUN ls -l ${LAMBDA_TASK_ROOT}/*
 FROM pytorch/pytorch:2.2.2-cuda12.1-cudnn8-runtime as runtime
 COPY ./static /appnode
 WORKDIR /appnode
 # RUN if [ "${DEPENDENCY_GROUP}" = "fastapi" ]; then echo "pnpm store path:" && pnpm store path; fi
+RUN ls -l /appnode
+RUN ls -l /appnode/list_files.html
 FROM node_fastapi AS node_prod_deps
 COPY --from=builder_global ${LAMBDA_TASK_ROOT}/lisa-on-cuda/resources ${LAMBDA_TASK_ROOT}/resources
 COPY --from=node_prod_deps /appnode/node_modules* ${FASTAPI_STATIC}/node_modules
 COPY --from=node_build /appnode/dist* ${FASTAPI_STATIC}/dist
+COPY --from=node_build /appnode/list_files.html ${FASTAPI_STATIC}/list_files.html
 # Include global arg in this stage of the build

static/list_files.html ADDED Viewed

	@@ -0,0 +1,13 @@

+<html>
+  <head>
+    <title>Files</title>
+  </head>
+  <body>
+    <h1>Files:</h1>
+    <ul>
+      {% for file in files %}
+      <li><a href="{{file}}">{{file}}</a></li>
+      {% endfor %}
+    </ul>
+  </body>
+</html>

static/src/components/PageLayout.vue CHANGED Viewed

@@ -16,7 +16,7 @@
     <main id="content" class="flex-1 z-1 lg:ml-0 mr-4 overflow-y-auto md:pl-1 lg:h-screen">
       <header class="hidden items-center justify-between h-10 ml-2 landscape:md:flex portrait:sd:flex portrait:md:h-12 bg-gray-200 border-b">
-        <h2 class="hidden sd:text-sm ml-2 md:block md:text-2xl">{{  props.pageTitle }}</h2>
       </header>
       <div class="">

     <main id="content" class="flex-1 z-1 lg:ml-0 mr-4 overflow-y-auto md:pl-1 lg:h-screen">
       <header class="hidden items-center justify-between h-10 ml-2 landscape:md:flex portrait:sd:flex portrait:md:h-12 bg-gray-200 border-b">
+        <h2 class="hidden sd:text-sm ml-2 md:block md:text-2xl">{{ props.pageTitle }}</h2>
       </header>
       <div class="">

wrappers/fastapi_wrapper.py CHANGED Viewed

@@ -1,10 +1,13 @@
 import json
 import uuid
 import uvicorn
 from fastapi import FastAPI, HTTPException, Request, status
 from fastapi.exceptions import RequestValidationError
-from fastapi.responses import FileResponse, JSONResponse
 from fastapi.staticfiles import StaticFiles
 from pydantic import ValidationError
@@ -203,6 +206,37 @@ async def http_exception_handler(request: Request, exc: HTTPException) -> JSONRe
     )
 # important: the index() function and the app.mount MUST be at the end
 # samgis.html
 app.mount("/samgis", StaticFiles(directory=WORKDIR / "static" / "dist", html=True), name="samgis")

 import json
+import os
+import pathlib
 import uuid
+from fastapi.templating import Jinja2Templates
 import uvicorn
 from fastapi import FastAPI, HTTPException, Request, status
 from fastapi.exceptions import RequestValidationError
+from fastapi.responses import FileResponse, HTMLResponse, JSONResponse
 from fastapi.staticfiles import StaticFiles
 from pydantic import ValidationError
     )
+write_tmp_on_disk = os.getenv("WRITE_TMP_ON_DISK", "")
+app_logger.info(f"write_tmp_on_disk:{write_tmp_on_disk}.")
+if bool(write_tmp_on_disk):
+    try:
+        path_write_tmp_on_disk = pathlib.Path(write_tmp_on_disk)
+        try:
+            pathlib.Path.unlink(path_write_tmp_on_disk, missing_ok=True)
+        except PermissionError or OSError as err:
+            app_logger.error(f"{err} while removing old write_tmp_on_disk:{write_tmp_on_disk}.")
+            app_logger.error(f"is file?{path_write_tmp_on_disk.is_file()}.")
+            app_logger.error(f"is symlink?{path_write_tmp_on_disk.is_symlink()}.")
+            app_logger.error(f"is folder?{path_write_tmp_on_disk.is_dir()}.")
+        os.makedirs(write_tmp_on_disk, exist_ok=True)
+        app.mount("/vis_output", StaticFiles(directory=write_tmp_on_disk), name="vis_output")
+    except RuntimeError as rerr:
+        app_logger.error(f"{rerr} while loading the folder write_tmp_on_disk:{write_tmp_on_disk}...")
+        raise rerr
+    templates = Jinja2Templates(directory=WORKDIR / "static")
+    @app.get("/vis_output", response_class=HTMLResponse)
+    def list_files(request: Request):
+        files = os.listdir(write_tmp_on_disk)
+        files_paths = sorted([f"{request.url._url}/{f}" for f in files])
+        print(files_paths)
+        return templates.TemplateResponse(
+            "list_files.html", {"request": request, "files": files_paths}
+        )
 # important: the index() function and the app.mount MUST be at the end
 # samgis.html
 app.mount("/samgis", StaticFiles(directory=WORKDIR / "static" / "dist", html=True), name="samgis")