chore: update samgis-core, samgis-web; improve imports and create_requirements.sh

app.py

@@ -13,9 +13,9 @@ from fastapi.staticfiles import StaticFiles
 from fastapi.templating import Jinja2Templates
 from pydantic import ValidationError
 from samgis_core.utilities import create_folders_if_not_exists
+from samgis_web.utilities import frontend_builder
 from samgis_core.utilities.session_logger import setup_logging
 from samgis_web.prediction_api.predictors import samexporter_predict
-from samgis_web.utilities.frontend_builder import build_frontend
 from samgis_web.utilities.type_hints import ApiRequestBody
 from starlette.responses import JSONResponse
 
@@ -142,16 +142,17 @@ if bool(write_tmp_on_disk):
         app_logger.error(f"{rerr} while loading the folder write_tmp_on_disk:{write_tmp_on_disk}...")
         raise rerr
 
-
-build_frontend(
+frontend_builder.build_frontend(
     project_root_folder=workdir,
     input_css_path=input_css_path,
     output_dist_folder=static_dist_folder
 )
 app_logger.info("build_frontend ok!")
 
+# eventually needed for tailwindcss output.css
 app.mount("/static", StaticFiles(directory=static_dist_folder, html=True), name="static")
 app.mount(vite_index_url, StaticFiles(directory=static_dist_folder, html=True), name="index")
+app.mount(vite_gradio_url, StaticFiles(directory=static_dist_folder, html=True), name="gradio")
 
 
 @app.get(vite_index_url)
@@ -159,22 +160,29 @@ async def index() -> FileResponse:
     return FileResponse(path=static_dist_folder / "index.html", media_type="text/html")
 
 
+app_logger.info(f"Mounted index on url path {vite_index_url} .")
 app_logger.info(f"There is need to create and mount gradio app interface? {mount_gradio_app}...")
 if mount_gradio_app:
-    import gradio as gr
-    from samgis_web.web.gradio_helpers import get_gradio_interface_geojson
-
-    app_logger.info(f"creating gradio interface...")
-    gr_interface = get_gradio_interface_geojson(
-        infer_samgis_fn,
-        markdown_text,
-        examples_text_list,
-        example_body
-    )
-    app_logger.info(
-        f"gradio interface created, mounting gradio app on url {vite_gradio_url} within FastAPI...")
-    app = gr.mount_gradio_app(app, gr_interface, path=vite_gradio_url)
-    app_logger.info("mounted gradio app within fastapi")
+    try:
+        import gradio as gr
+        from samgis_web.web.gradio_helpers import get_gradio_interface_geojson
+
+        app_logger.info(f"creating gradio interface...")
+        gr_interface = get_gradio_interface_geojson(
+            infer_samgis_fn,
+            markdown_text,
+            examples_text_list,
+            example_body
+        )
+        app_logger.info(f"gradio interface created, mounting gradio app on url path {vite_gradio_url} within FastAPI.")
+        app_logger.debug(f"gr_interface vars:{vars(gr_interface)}.")
+        app = gr.mount_gradio_app(app, gr_interface, path=vite_gradio_url)
+        app = gr.mount_gradio_app(app, gr_interface, path="/gradio")
+        app_logger.info(f"mounted gradio app within fastapi, url path {vite_gradio_url} .")
+    except (ModuleNotFoundError, ImportError) as mnfe:
+        app_logger.error("cannot import gradio, have you installed it if you want to mount a gradio app?")
+        app_logger.error(mnfe)
+        raise mnfe
 
 
 # add the CorrelationIdMiddleware AFTER the @app.middleware("http") decorated function to avoid missing request id

docs/Changelog.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## Version 1.6.7
+
+- Update samgis-core = 3.0.8, samgis-web = 1.0.9
+- move frontend_builder from samgis-web to samgis-core but expose it also within samgis_web.utilities
+- create_requirements.sh: handle case of of missing ./tmp/ folder
+- update docs
+
 ## Version 1.6.6
 
 - Adopt again docker SDK (we'll try Gradio SDK on duplicated HuggingFace space)

poetry.lock

@@ -601,12 +601,13 @@ standard = ["fastapi", "uvicorn[standard] (>=0.15.0)"]
 
 [[package]]
 name = "ffmpy"
-version = "0.3.2"
-description = "A simple Python wrapper for ffmpeg"
+version = "0.4.0"
+description = "A simple Python wrapper for FFmpeg"
 optional = false
-python-versions = "*"
+python-versions = "<4.0.0,>=3.8.1"
 files = [
-    {file = "ffmpy-0.3.2.tar.gz", hash = "sha256:475ebfff1044661b8d969349dbcd2db9bf56d3ee78c0627e324769b49a27a78f"},
+    {file = "ffmpy-0.4.0-py3-none-any.whl", hash = "sha256:39c0f20c5b465e7f8d29a5191f3a7d7675a8c546d9d985de8921151cd9b59e14"},
+    {file = "ffmpy-0.4.0.tar.gz", hash = "sha256:131b57794e802ad555f579007497f7a3d0cab0583d37496c685b8acae4837b1d"},
 ]
 
 [[package]]
@@ -965,13 +966,13 @@ socks = ["socksio (==1.*)"]
 
 [[package]]
 name = "huggingface-hub"
-version = "0.24.3"
+version = "0.24.5"
 description = "Client library to download and publish models, datasets and other repos on the huggingface.co hub"
 optional = false
 python-versions = ">=3.8.0"
 files = [
-    {file = "huggingface_hub-0.24.3-py3-none-any.whl", hash = "sha256:69ecce486dd6cdad69937ba76779e893c224a670a9d947636c1d5cbd049e44d8"},
-    {file = "huggingface_hub-0.24.3.tar.gz", hash = "sha256:bfdc05cc9b64a0e24e8614a44222698799183268f6b68be209aa2df70cff2cde"},
+    {file = "huggingface_hub-0.24.5-py3-none-any.whl", hash = "sha256:d93fb63b1f1a919a22ce91a14518974e81fc4610bf344dfe7572343ce8d3aced"},
+    {file = "huggingface_hub-0.24.5.tar.gz", hash = "sha256:7b45d6744dd53ce9cbf9880957de00e9d10a9ae837f1c9b7255fc8fa4e8264f3"},
 ]
 
 [package.dependencies]
@@ -2541,13 +2542,13 @@ files = [
 
 [[package]]
 name = "samgis-core"
-version = "3.0.6"
+version = "3.0.8"
 description = "SamGIS CORE"
 optional = false
 python-versions = "<3.12,>=3.10"
 files = [
-    {file = "samgis_core-3.0.6-py3-none-any.whl", hash = "sha256:0add7f2afa06a4eeec8c2a4f63cafa7f324717daf5b431630fde7f59b657acb3"},
-    {file = "samgis_core-3.0.6.tar.gz", hash = "sha256:3fccf28f6fc83f29d9e1f7249fe5af8dc42fb87d0ccff28b43a65ef9ba433681"},
+    {file = "samgis_core-3.0.8-py3-none-any.whl", hash = "sha256:eca59e6e54e16b51b69987a94ffd7bda24c1f421d0d472b20cc07d24f2fa0046"},
+    {file = "samgis_core-3.0.8.tar.gz", hash = "sha256:a2934a54b8753e7aa14e0b044b031d186497605d820d0853dd7b2cc95ce4dd09"},
 ]
 
 [package.dependencies]
@@ -2562,13 +2563,13 @@ structlog = ">=24.4.0,<25.0.0"
 
 [[package]]
 name = "samgis-web"
-version = "1.0.8"
+version = "1.0.9"
 description = "SamGIS WEB"
 optional = false
 python-versions = "<3.12,>=3.10"
 files = [
-    {file = "samgis_web-1.0.8-py3-none-any.whl", hash = "sha256:447d718fb10a975c0e9067353fdd4c3621b2f1e1d8f3ffd1592cd9a9a3ae2315"},
-    {file = "samgis_web-1.0.8.tar.gz", hash = "sha256:12020d9564095851cc050f14acfc106a6c8fb1c755869d2db93027848e5d9ef2"},
+    {file = "samgis_web-1.0.9-py3-none-any.whl", hash = "sha256:e1b63ba9c250afe239257410f380f359cc3cc742b0ead431e9585db6eb5fa320"},
+    {file = "samgis_web-1.0.9.tar.gz", hash = "sha256:d1ce20afba30b718c1bcdce03a289703b141dbceaf48bc7ddee4b83972a3af9b"},
 ]
 
 [package.dependencies]
@@ -2576,10 +2577,9 @@ asgi-correlation-id = ">=4.3.1,<5.0.0"
 contextily = ">=1.6.0,<2.0.0"
 fastapi = ">=0.111.1,<0.112.0"
 geopandas = ">=1.0.1,<2.0.0"
-gradio = ">=4.39.0,<5.0.0"
 rasterio = ">=1.3.10,<2.0.0"
 requests = ">=2.32.3,<3.0.0"
-samgis-core = "3.0.6"
+samgis-core = "3.0.8"
 shapely = ">=2.0.5,<3.0.0"
 uvicorn = ">=0.30.1,<0.31.0"
 
@@ -2600,13 +2600,13 @@ doc = ["Sphinx", "sphinx-rtd-theme"]
 
 [[package]]
 name = "setuptools"
-version = "71.1.0"
+version = "72.1.0"
 description = "Easily download, build, install, upgrade, and uninstall Python packages"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "setuptools-71.1.0-py3-none-any.whl", hash = "sha256:33874fdc59b3188304b2e7c80d9029097ea31627180896fb549c578ceb8a0855"},
-    {file = "setuptools-71.1.0.tar.gz", hash = "sha256:032d42ee9fb536e33087fb66cac5f840eb9391ed05637b3f2a76a7c8fb477936"},
+    {file = "setuptools-72.1.0-py3-none-any.whl", hash = "sha256:5a03e1860cf56bb6ef48ce186b0e557fdba433237481a9a625176c2831be15d1"},
+    {file = "setuptools-72.1.0.tar.gz", hash = "sha256:8d243eff56d095e5817f796ede6ae32941278f542e0f941867cc05ae52b162ec"},
 ]
 
 [package.extras]
@@ -3348,4 +3348,4 @@ files = [
 [metadata]
 lock-version = "2.0"
 python-versions = ">=3.10, <3.12"
-content-hash = "3e63d3a7325f81dd7ca8572300f796f1978437a6d9a6639b3104ab10982c0b7b"
+content-hash = "5fd17cc79aeaff12229f2d06f428d184256fa24f67fb70a933c674a470d43d7e"

pyproject.toml

@@ -28,8 +28,14 @@ python-dotenv = "^1.0.1"
 onnxruntime = "^1.18.1"
 rasterio = "^1.3.10"
 requests = "^2.32.3"
-samgis-core = "3.0.6"
-samgis-web = "1.0.8"
+samgis-core = "3.0.8"
+samgis-web = "1.0.9"
+
+[tool.poetry.group.gradio]
+optional = true
+
+[tool.poetry.group.gradio.dependencies]
+gradio = "^4.39.0"
 
 [tool.poetry.group.test]
 optional = true

scripts/create_requirements.sh

@@ -4,6 +4,7 @@ SCRIPT=$(realpath "$0")
 SCRIPT_FOLDER=$(dirname "$SCRIPT")
 ROOT_FOLDER=${SCRIPT_FOLDER}/../
 
+mkdir -p tmp
 rm ./tmp/requirements_tmp.txt || echo "./tmp/requirements_tmp.txt not found!"
 
 echo "start requirements.txt preparation: pip freeze..."