[refactor] rename samgis module tosamgis_lisa_on_cuda, bump to version 1.3.0, update samgis and lisa_on_cuda dependencies

.coveragerc

@@ -1,5 +1,5 @@
 [run]
-source = samgis
+source = samgis_lisa_on_cuda
 omit = ./venv/*,__version__.py,*tests*,*apps.py,*manage.py,*__init__.py,*migrations*,*asgi*,*wsgi*,*admin.py,*urls.py,./tests/*
 
 [report]

.idea/.gitignore

@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml

.idea/misc.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Black">
+    <option name="sdkName" value="Poetry (samgis-lisa-on-cuda)" />
+  </component>
+  <component name="ProjectRootManager" version="2" project-jdk-name="Poetry (samgis-lisa-on-cuda)" project-jdk-type="Python SDK" />
+</project>

Dockerfile

@@ -152,7 +152,7 @@ ENV IS_AWS_LAMBDA=""
 # Set working directory to function root directory
 WORKDIR ${LAMBDA_TASK_ROOT}
 
-COPY samgis ${LAMBDA_TASK_ROOT}/samgis
+COPY samgis_lisa_on_cuda ${LAMBDA_TASK_ROOT}/samgis_lisa_on_cuda
 COPY wrappers ${LAMBDA_TASK_ROOT}/wrappers
 
 RUN ls -l /usr/bin/which
@@ -173,7 +173,7 @@ RUN python -c "import onnxruntime"
 RUN python -c "import rasterio"
 RUN python -c "import uvicorn"
 RUN df -h
-RUN ls -l ${LAMBDA_TASK_ROOT}/samgis/
+RUN ls -l ${LAMBDA_TASK_ROOT}/samgis_lisa_on_cuda/
 RUN ls -l ${LAMBDA_TASK_ROOT}/wrappers/
 RUN echo "LAMBDA_TASK_ROOT /static/:"
 RUN ls -l ${LAMBDA_TASK_ROOT}/static/ || true

README.md

@@ -14,7 +14,7 @@ from https://huggingface.co/aletrn/sam-quantized (copy them within the folder `/
 
 ## SamGIS - HuggingFace version
 
-The SamGIS HuggingSpace url is https://huggingface.co/spaces/aletrn/samgis.
+The SamGIS HuggingSpace url is https://huggingface.co/spaces/aletrn/samgis-lisa-on-cuda.
 Build the docker image this way:
 
 ```bash
@@ -51,41 +51,7 @@ URL=http://localhost:7860/infer_samgis
 curl -d@./events/payload_point_eolie.json -H 'accept: application/json' ${URL}
 ```
 
-or better visiting the swagger page on http://localhost:7860/docs 
-
-
-## SamGIS - lambda AWS version
-
-Build the docker image this way:
-
-```bash
-# clean any old active containers
-docker stop $(docker ps -a -q); docker rm $(docker ps -a -q)
-
-# build the base docker image with the docker aws repository tag
-docker build . -f dockerfiles/dockerfile-samgis-base --build-arg DEPENDENCY_GROUP=aws_lambda \
-  --tag example-docker-namespace/samgis-base-aws-lambda --progress=plain
-
-# build the final docker image
-docker build . -f dockerfiles/dockerfile-lambda-fastsam-api --tag example-docker-namespace/lambda-fastsam-api --progress=plain
-```
-
-Run the container (keep it on background) and show logs
-
-```bash
-docker run  -d --name lambda-fastsam-api -p 8080:8080 lambda-fastsam-api; docker logs -f lambda-fastsam-api
-```
-
-Test it with curl using a json payload:
-
-```bash
-URL=http://localhost:8080/2015-03-31/functions/function/invocations
-curl -d@./events/payload_point_eolie.json -H 'accept: application/json' ${URL}
-```
-
-### Publish the aws lambda docker image
-Login on aws ECR with the correct aws profile (change the example `example-docker-namespace/` repository url with the one from
-the [ECR push command instructions page](https://eu-west-1.console.aws.amazon.com/ecr/repositories/)).
+or better visiting the swagger page on http://localhost:7860/docs
 
 ### Dependencies installation and local tests
 The docker build process needs only the base dependency group plus the `aws_lambda` or `fastapi` optional one.
@@ -96,7 +62,7 @@ Install also the `test` and/or `docs` groups if needed.
 Tests are defined in the `tests` folder in this project. Use PIP to install the test dependencies and run tests.
 
 ```bash
-python -m pytest --cov=samgis --cov-report=term-missing && coverage html
+python -m pytest --cov=samgis_lisa_on_cuda --cov-report=term-missing && coverage html
 ```
 
 ### How to update the static documentation with sphinx

dockerfiles/dockerfile-fastapi-fastsam-api

@@ -1 +0,0 @@
-Dockerfile

dockerfiles/dockerfile-lambda-fastsam-api

@@ -1,36 +0,0 @@
-FROM localhost/samgis-base-aws-lambda:latest
-
-# Include global arg in this stage of the build
-ARG LAMBDA_TASK_ROOT="/var/task"
-ARG PYTHONPATH="${LAMBDA_TASK_ROOT}:${PYTHONPATH}:/usr/local/lib/python3/dist-packages"
-ENV VIRTUAL_ENV=${LAMBDA_TASK_ROOT}/.venv \
-    PATH="${LAMBDA_TASK_ROOT}/.venv/bin:$PATH"
-ENV IS_AWS_LAMBDA="True"
-
-# Set working directory to function root directory
-WORKDIR ${LAMBDA_TASK_ROOT}
-COPY ./samgis ${LAMBDA_TASK_ROOT}/samgis
-COPY ./wrappers ${LAMBDA_TASK_ROOT}/wrappers
-
-RUN ls -l /usr/bin/which
-RUN /usr/bin/which python
-RUN python -v
-RUN echo "PYTHONPATH: ${PYTHONPATH}."
-RUN echo "PATH: ${PATH}."
-RUN echo "LAMBDA_TASK_ROOT: ${LAMBDA_TASK_ROOT}."
-RUN ls -l ${LAMBDA_TASK_ROOT}
-RUN ls -ld ${LAMBDA_TASK_ROOT}
-RUN ls -l ${LAMBDA_TASK_ROOT}/machine_learning_models
-RUN python -c "import sys; print(sys.path)"
-RUN python -c "import awslambdaric"
-RUN python -c "import cv2"
-RUN python -c "import geopandas"
-RUN python -c "import onnxruntime"
-RUN python -c "import rasterio"
-RUN df -h
-RUN ls -l /lambda-entrypoint.sh
-RUN ls -l ${LAMBDA_TASK_ROOT}/samgis/
-RUN ls -l ${LAMBDA_TASK_ROOT}/wrappers/
-
-ENTRYPOINT  ["/lambda-entrypoint.sh"]
-CMD [ "wrappers.lambda_wrapper.lambda_handler" ]

dockerfiles/dockerfile-lisa-predictions

@@ -10,7 +10,7 @@ ENV IS_AWS_LAMBDA=""
 # Set working directory to function root directory
 WORKDIR ${LAMBDA_TASK_ROOT}
 
-COPY samgis ${LAMBDA_TASK_ROOT}/samgis
+COPY samgis_lisa_on_cuda ${LAMBDA_TASK_ROOT}/samgis_lisa_on_cuda
 COPY wrappers ${LAMBDA_TASK_ROOT}/wrappers
 
 RUN ls -l /usr/bin/which
@@ -31,7 +31,7 @@ RUN python -c "import onnxruntime"
 RUN python -c "import rasterio"
 RUN python -c "import uvicorn"
 RUN df -h
-RUN ls -l ${LAMBDA_TASK_ROOT}/samgis/
+RUN ls -l ${LAMBDA_TASK_ROOT}/samgis_lisa_on_cuda/
 RUN ls -l ${LAMBDA_TASK_ROOT}/wrappers/
 RUN ls -l ${FASTAPI_STATIC}/
 RUN ls -l ${FASTAPI_STATIC}/dist

docs/modules.rst

@@ -1,7 +1,7 @@
-samgis
-======
+samgis_lisa_on_cuda
+===================
 
 .. toctree::
    :maxdepth: 4
 
-   samgis
+   samgis_lisa_on_cuda

docs/samgis.prediction_api.rst

@@ -1,21 +0,0 @@
-samgis.prediction\_api package
-==============================
-
-Submodules
-----------
-
-samgis.prediction\_api.predictors module
-----------------------------------------
-
-.. automodule:: samgis.prediction_api.predictors
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-Module contents
----------------
-
-.. automodule:: samgis.prediction_api
-   :members:
-   :undoc-members:
-   :show-inheritance:

docs/samgis.utilities.rst

@@ -1,29 +0,0 @@
-samgis.utilities package
-========================
-
-Submodules
-----------
-
-samgis.utilities.constants module
----------------------------------
-
-.. automodule:: samgis.utilities.constants
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-samgis.utilities.type\_hints module
------------------------------------
-
-.. automodule:: samgis.utilities.type_hints
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-Module contents
----------------
-
-.. automodule:: samgis.utilities
-   :members:
-   :undoc-members:
-   :show-inheritance:

docs/{samgis.io.rst → samgis_lisa_on_cuda.io.rst}

@@ -1,45 +1,45 @@
-samgis.io package
-=================
+samgis\_lisa\_on\_cuda.io package
+=================================
 
 Submodules
 ----------
 
-samgis.io.coordinates\_pixel\_conversion module
------------------------------------------------
+samgis\_lisa\_on\_cuda.io.coordinates\_pixel\_conversion module
+---------------------------------------------------------------
 
-.. automodule:: samgis.io.coordinates_pixel_conversion
+.. automodule:: samgis_lisa_on_cuda.io.coordinates_pixel_conversion
    :members:
    :undoc-members:
    :show-inheritance:
 
-samgis.io.geo\_helpers module
------------------------------
+samgis\_lisa\_on\_cuda.io.geo\_helpers module
+---------------------------------------------
 
-.. automodule:: samgis.io.geo_helpers
+.. automodule:: samgis_lisa_on_cuda.io.geo_helpers
    :members:
    :undoc-members:
    :show-inheritance:
 
-samgis.io.raster\_helpers module
---------------------------------
+samgis\_lisa\_on\_cuda.io.raster\_helpers module
+------------------------------------------------
 
-.. automodule:: samgis.io.raster_helpers
+.. automodule:: samgis_lisa_on_cuda.io.raster_helpers
    :members:
    :undoc-members:
    :show-inheritance:
 
-samgis.io.tms2geotiff module
-----------------------------
+samgis\_lisa\_on\_cuda.io.tms2geotiff module
+--------------------------------------------
 
-.. automodule:: samgis.io.tms2geotiff
+.. automodule:: samgis_lisa_on_cuda.io.tms2geotiff
    :members:
    :undoc-members:
    :show-inheritance:
 
-samgis.io.wrappers\_helpers module
-----------------------------------
+samgis\_lisa\_on\_cuda.io.wrappers\_helpers module
+--------------------------------------------------
 
-.. automodule:: samgis.io.wrappers_helpers
+.. automodule:: samgis_lisa_on_cuda.io.wrappers_helpers
    :members:
    :undoc-members:
    :show-inheritance:
@@ -47,7 +47,7 @@ samgis.io.wrappers\_helpers module
 Module contents
 ---------------
 
-.. automodule:: samgis.io
+.. automodule:: samgis_lisa_on_cuda.io
    :members:
    :undoc-members:
    :show-inheritance:

docs/samgis_lisa_on_cuda.prediction_api.rst

@@ -0,0 +1,37 @@
+samgis\_lisa\_on\_cuda.prediction\_api package
+==============================================
+
+Submodules
+----------
+
+samgis\_lisa\_on\_cuda.prediction\_api.global\_models module
+------------------------------------------------------------
+
+.. automodule:: samgis_lisa_on_cuda.prediction_api.global_models
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+samgis\_lisa\_on\_cuda.prediction\_api.lisa module
+--------------------------------------------------
+
+.. automodule:: samgis_lisa_on_cuda.prediction_api.lisa
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+samgis\_lisa\_on\_cuda.prediction\_api.predictors module
+--------------------------------------------------------
+
+.. automodule:: samgis_lisa_on_cuda.prediction_api.predictors
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+Module contents
+---------------
+
+.. automodule:: samgis_lisa_on_cuda.prediction_api
+   :members:
+   :undoc-members:
+   :show-inheritance:

docs/{samgis.rst → samgis_lisa_on_cuda.rst}

@@ -1,5 +1,5 @@
-samgis package
-==============
+samgis\_lisa\_on\_cuda package
+==============================
 
 Subpackages
 -----------
@@ -7,14 +7,14 @@ Subpackages
 .. toctree::
    :maxdepth: 4
 
-   samgis.io
-   samgis.prediction_api
-   samgis.utilities
+   samgis_lisa_on_cuda.io
+   samgis_lisa_on_cuda.prediction_api
+   samgis_lisa_on_cuda.utilities
 
 Module contents
 ---------------
 
-.. automodule:: samgis
+.. automodule:: samgis_lisa_on_cuda
    :members:
    :undoc-members:
    :show-inheritance:

docs/samgis_lisa_on_cuda.utilities.rst

@@ -0,0 +1,37 @@
+samgis\_lisa\_on\_cuda.utilities package
+========================================
+
+Submodules
+----------
+
+samgis\_lisa\_on\_cuda.utilities.constants module
+-------------------------------------------------
+
+.. automodule:: samgis_lisa_on_cuda.utilities.constants
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+samgis\_lisa\_on\_cuda.utilities.session\_logger module
+-------------------------------------------------------
+
+.. automodule:: samgis_lisa_on_cuda.utilities.session_logger
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+samgis\_lisa\_on\_cuda.utilities.type\_hints module
+---------------------------------------------------
+
+.. automodule:: samgis_lisa_on_cuda.utilities.type_hints
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+Module contents
+---------------
+
+.. automodule:: samgis_lisa_on_cuda.utilities
+   :members:
+   :undoc-members:
+   :show-inheritance:

poetry.lock

@@ -1410,42 +1410,38 @@ files = [
 
 [[package]]
 name = "lisa-on-cuda"
-version = "0.1.0"
+version = "1.0.2"
 description = ""
 optional = false
-python-versions = "^3.10"
-files = []
-develop = false
+python-versions = ">=3.10,<3.11"
+files = [
+    {file = "lisa_on_cuda-1.0.2-py3-none-any.whl", hash = "sha256:fd0bab06cd673b52b6a68c0b9add8dfed2ab57737b94a6fe375cb71c1ec923e0"},
+    {file = "lisa_on_cuda-1.0.2.tar.gz", hash = "sha256:96b446405b27b6c001bb5e5db15489b6ba4c60b67323ab7874cc54bc9d6da56e"},
+]
 
 [package.dependencies]
-bitsandbytes = "^0.42.0"
-einops = "^0.7.0"
-fastapi = "^0.110.0"
-gradio = "^4.21.0"
-gradio-client = "^0.12.0"
-markdown2 = "^2.4.13"
-nh3 = "^0.2.15"
+bitsandbytes = ">=0.42.0,<0.43.0"
+einops = ">=0.7.0,<0.8.0"
+fastapi = ">=0.110.0,<0.111.0"
+gradio = ">=4.21.0,<5.0.0"
+gradio-client = ">=0.12.0,<0.13.0"
+markdown2 = ">=2.4.13,<3.0.0"
+nh3 = ">=0.2.15,<0.3.0"
 numpy = "1.25.2"
-openai = "^1.13.3"
+openai = ">=1.13.3,<2.0.0"
 opencv-python-headless = "4.8.1.78"
-packaging = "^24.0"
-peft = "^0.9.0"
-pycocotools = "^2.0.7"
-ray = "^2.9.3"
-scipy = "^1.11.4"
-sentencepiece = "^0.2.0"
-shortuuid = "^1.0.12"
-torch = "^2.2.1"
-torchvision = "^0.17.1"
-tqdm = "^4.66.2"
+packaging = ">=24.0,<25.0"
+peft = ">=0.9.0,<0.10.0"
+pycocotools = ">=2.0.7,<3.0.0"
+ray = ">=2.9.3,<3.0.0"
+scipy = ">=1.11.4,<2.0.0"
+sentencepiece = ">=0.2.0,<0.3.0"
+shortuuid = ">=1.0.12,<2.0.0"
+torch = ">=2.2.1,<3.0.0"
+torchvision = ">=0.17.1,<0.18.0"
+tqdm = ">=4.66.2,<5.0.0"
 transformers = "4.31.0"
-uvicorn = "^0.28.0"
-
-[package.source]
-type = "git"
-url = "https://huggingface.co/spaces/aletrn/lisa-on-cuda"
-reference = "packaging"
-resolved_reference = "910b2411812e8ecc9e336909dec4b5a698f3506c"
+uvicorn = ">=0.28.0,<0.29.0"
 
 [[package]]
 name = "loguru"
@@ -2089,9 +2085,8 @@ files = [
 
 [package.dependencies]
 numpy = [
-    {version = ">=1.23.5", markers = "python_version >= \"3.11\""},
-    {version = ">=1.21.4", markers = "python_version >= \"3.10\" and platform_system == \"Darwin\" and python_version < \"3.11\""},
-    {version = ">=1.21.2", markers = "platform_system != \"Darwin\" and python_version >= \"3.10\" and python_version < \"3.11\""},
+    {version = ">=1.21.4", markers = "python_version >= \"3.10\" and platform_system == \"Darwin\""},
+    {version = ">=1.21.2", markers = "platform_system != \"Darwin\" and python_version >= \"3.10\""},
 ]
 
 [[package]]
@@ -2164,64 +2159,6 @@ files = [
     {file = "packaging-24.0.tar.gz", hash = "sha256:eb82c5e3e56209074766e6885bb04b8c38a0c015d0a30036ebe7ece34c9989e9"},
 ]
 
-[[package]]
-name = "pandas"
-version = "2.1.0"
-description = "Powerful data structures for data analysis, time series, and statistics"
-optional = false
-python-versions = ">=3.9"
-files = [
-    {file = "pandas-2.1.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:40dd20439ff94f1b2ed55b393ecee9cb6f3b08104c2c40b0cb7186a2f0046242"},
-    {file = "pandas-2.1.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:d4f38e4fedeba580285eaac7ede4f686c6701a9e618d8a857b138a126d067f2f"},
-    {file = "pandas-2.1.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6e6a0fe052cf27ceb29be9429428b4918f3740e37ff185658f40d8702f0b3e09"},
-    {file = "pandas-2.1.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9d81e1813191070440d4c7a413cb673052b3b4a984ffd86b8dd468c45742d3cc"},
-    {file = "pandas-2.1.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:eb20252720b1cc1b7d0b2879ffc7e0542dd568f24d7c4b2347cb035206936421"},
-    {file = "pandas-2.1.0-cp310-cp310-win_amd64.whl", hash = "sha256:38f74ef7ebc0ffb43b3d633e23d74882bce7e27bfa09607f3c5d3e03ffd9a4a5"},
-    {file = "pandas-2.1.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:cda72cc8c4761c8f1d97b169661f23a86b16fdb240bdc341173aee17e4d6cedd"},
-    {file = "pandas-2.1.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:d97daeac0db8c993420b10da4f5f5b39b01fc9ca689a17844e07c0a35ac96b4b"},
-    {file = "pandas-2.1.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d8c58b1113892e0c8078f006a167cc210a92bdae23322bb4614f2f0b7a4b510f"},
-    {file = "pandas-2.1.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:629124923bcf798965b054a540f9ccdfd60f71361255c81fa1ecd94a904b9dd3"},
-    {file = "pandas-2.1.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:70cf866af3ab346a10debba8ea78077cf3a8cd14bd5e4bed3d41555a3280041c"},
-    {file = "pandas-2.1.0-cp311-cp311-win_amd64.whl", hash = "sha256:d53c8c1001f6a192ff1de1efe03b31a423d0eee2e9e855e69d004308e046e694"},
-    {file = "pandas-2.1.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:86f100b3876b8c6d1a2c66207288ead435dc71041ee4aea789e55ef0e06408cb"},
-    {file = "pandas-2.1.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:28f330845ad21c11db51e02d8d69acc9035edfd1116926ff7245c7215db57957"},
-    {file = "pandas-2.1.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b9a6ccf0963db88f9b12df6720e55f337447aea217f426a22d71f4213a3099a6"},
-    {file = "pandas-2.1.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d99e678180bc59b0c9443314297bddce4ad35727a1a2656dbe585fd78710b3b9"},
-    {file = "pandas-2.1.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:b31da36d376d50a1a492efb18097b9101bdbd8b3fbb3f49006e02d4495d4c644"},
-    {file = "pandas-2.1.0-cp39-cp39-win_amd64.whl", hash = "sha256:0164b85937707ec7f70b34a6c3a578dbf0f50787f910f21ca3b26a7fd3363437"},
-    {file = "pandas-2.1.0.tar.gz", hash = "sha256:62c24c7fc59e42b775ce0679cfa7b14a5f9bfb7643cfbe708c960699e05fb918"},
-]
-
-[package.dependencies]
-numpy = {version = ">=1.23.2", markers = "python_version >= \"3.11\""}
-python-dateutil = ">=2.8.2"
-pytz = ">=2020.1"
-tzdata = ">=2022.1"
-
-[package.extras]
-all = ["PyQt5 (>=5.15.6)", "SQLAlchemy (>=1.4.36)", "beautifulsoup4 (>=4.11.1)", "bottleneck (>=1.3.4)", "dataframe-api-compat (>=0.1.7)", "fastparquet (>=0.8.1)", "fsspec (>=2022.05.0)", "gcsfs (>=2022.05.0)", "html5lib (>=1.1)", "hypothesis (>=6.46.1)", "jinja2 (>=3.1.2)", "lxml (>=4.8.0)", "matplotlib (>=3.6.1)", "numba (>=0.55.2)", "numexpr (>=2.8.0)", "odfpy (>=1.4.1)", "openpyxl (>=3.0.10)", "pandas-gbq (>=0.17.5)", "psycopg2 (>=2.9.3)", "pyarrow (>=7.0.0)", "pymysql (>=1.0.2)", "pyreadstat (>=1.1.5)", "pytest (>=7.3.2)", "pytest-asyncio (>=0.17.0)", "pytest-xdist (>=2.2.0)", "pyxlsb (>=1.0.9)", "qtpy (>=2.2.0)", "s3fs (>=2022.05.0)", "scipy (>=1.8.1)", "tables (>=3.7.0)", "tabulate (>=0.8.10)", "xarray (>=2022.03.0)", "xlrd (>=2.0.1)", "xlsxwriter (>=3.0.3)", "zstandard (>=0.17.0)"]
-aws = ["s3fs (>=2022.05.0)"]
-clipboard = ["PyQt5 (>=5.15.6)", "qtpy (>=2.2.0)"]
-compression = ["zstandard (>=0.17.0)"]
-computation = ["scipy (>=1.8.1)", "xarray (>=2022.03.0)"]
-consortium-standard = ["dataframe-api-compat (>=0.1.7)"]
-excel = ["odfpy (>=1.4.1)", "openpyxl (>=3.0.10)", "pyxlsb (>=1.0.9)", "xlrd (>=2.0.1)", "xlsxwriter (>=3.0.3)"]
-feather = ["pyarrow (>=7.0.0)"]
-fss = ["fsspec (>=2022.05.0)"]
-gcp = ["gcsfs (>=2022.05.0)", "pandas-gbq (>=0.17.5)"]
-hdf5 = ["tables (>=3.7.0)"]
-html = ["beautifulsoup4 (>=4.11.1)", "html5lib (>=1.1)", "lxml (>=4.8.0)"]
-mysql = ["SQLAlchemy (>=1.4.36)", "pymysql (>=1.0.2)"]
-output-formatting = ["jinja2 (>=3.1.2)", "tabulate (>=0.8.10)"]
-parquet = ["pyarrow (>=7.0.0)"]
-performance = ["bottleneck (>=1.3.4)", "numba (>=0.55.2)", "numexpr (>=2.8.0)"]
-plot = ["matplotlib (>=3.6.1)"]
-postgresql = ["SQLAlchemy (>=1.4.36)", "psycopg2 (>=2.9.3)"]
-spss = ["pyreadstat (>=1.1.5)"]
-sql-other = ["SQLAlchemy (>=1.4.36)"]
-test = ["hypothesis (>=6.46.1)", "pytest (>=7.3.2)", "pytest-asyncio (>=0.17.0)", "pytest-xdist (>=2.2.0)"]
-xml = ["lxml (>=4.8.0)"]
-
 [[package]]
 name = "pandas"
 version = "2.2.1"
@@ -2261,10 +2198,7 @@ files = [
 ]
 
 [package.dependencies]
-numpy = [
-    {version = ">=1.23.2,<2", markers = "python_version == \"3.11\""},
-    {version = ">=1.22.4,<2", markers = "python_version < \"3.11\""},
-]
+numpy = {version = ">=1.22.4,<2", markers = "python_version < \"3.11\""}
 python-dateutil = ">=2.8.2"
 pytz = ">=2020.1"
 tzdata = ">=2022.7"
@@ -3395,27 +3329,23 @@ testing = ["h5py (>=3.7.0)", "huggingface_hub (>=0.12.1)", "hypothesis (>=6.70.2
 torch = ["safetensors[numpy]", "torch (>=1.10)"]
 
 [[package]]
-name = "samgis-core"
-version = "1.0.5"
+name = "samgis_core"
+version = "1.0.7"
 description = "SamGIS CORE"
 optional = false
-python-versions = "^3.10"
-files = []
-develop = false
+python-versions = ">=3.10,<3.11"
+files = [
+    {file = "samgis_core-1.0.7-py3-none-any.whl", hash = "sha256:3f586fa1f9f42f4f52d0ab196fe927be2df03ead8fc59d0441a973adb5fa0933"},
+    {file = "samgis_core-1.0.7.tar.gz", hash = "sha256:c87df720f1e79eda66d1150dc15af5f52a5080aa427f887e89367ee615d7f681"},
+]
 
 [package.dependencies]
-bson = "^0.5.10"
-loguru = "^0.7.2"
+bson = ">=0.5.10,<0.6.0"
+loguru = ">=0.7.2,<0.8.0"
 numpy = "1.25.2"
 onnxruntime = "1.16.3"
 opencv-python-headless = "4.8.1.78"
-pillow = "^10.2.0"
-
-[package.source]
-type = "git"
-url = "https://gitlab.com/aletrn/samgis_core.git"
-reference = "dev"
-resolved_reference = "30a473a54476ea973564f6bdd9453f291b3928b6"
+pillow = ">=10.2.0,<11.0.0"
 
 [[package]]
 name = "scipy"
@@ -4452,5 +4382,5 @@ files = [
 
 [metadata]
 lock-version = "2.0"
-python-versions = "^3.10"
-content-hash = "b53d09cabb776f3009ca99021624310b3da5cc8172b64de8cc694cd32dd7451c"
+python-versions = "~3.10"
+content-hash = "6420e74251249e5a97a0c7faa9f6bf02311ca0b7f7e1c466bb6283efd97da03d"

pyproject.toml

@@ -1,11 +1,15 @@
 [tool.poetry]
 name = "samgis-lisa-on-cuda"
-version = "1.2.3"
+version = "1.3.0"
 description = "A VLM backend for machine learning instance segmentation on geospatial data that uses LISA (Reasoning Segmentation via Large Language Model)."
 authors = ["alessandro trinca tornidor <alessandro@trinca.tornidor.com>"]
 license = "MIT license"
 readme = "README.md"
 
+[metadata]
+name = "samgis-lisa-on-cuda"
+version = "1.3.0"
+
 [tool.poetry.dependencies]
 bson = "^0.5.10"
 contextily = "^1.5.2"
@@ -15,12 +19,12 @@ numpy = "1.25.2"
 onnxruntime = "1.16.3"
 opencv-python-headless = "^4.8.1.78"
 pillow = "^10.2.0"
-python = "^3.10"
+python = "~3.10"
 python-dotenv = "^1.0.1"
 rasterio = "^1.3.9"
 requests = "^2.31.0"
-samgis-core = { git = "https://gitlab.com/aletrn/samgis_core.git", rev = "dev" }
-lisa-on-cuda = { git = "https://huggingface.co/spaces/aletrn/lisa-on-cuda", rev = "packaging" }
+lisa-on-cuda = "^1.0.2"
+samgis-core = "^1.0.7"
 
 [tool.poetry.group.aws_lambda]
 optional = true

pytest.ini

@@ -3,5 +3,5 @@ env_override_existing_values = 1
 env_files =
     test/.test.env
 [path]
-source = samgis
+source = samgis_lisa_on_cuda
 omit = ./venv/*,*tests*,*apps.py,*manage.py,*__init__.py,*migrations*,*asgi*,*wsgi*,*admin.py,*urls.py,./tests/*

samgis/__version__.py

@@ -1 +0,0 @@
-__version__ = "1.2.3"

{samgis → samgis_lisa_on_cuda}/__init__.py

@@ -1,10 +1,10 @@
 """Get machine learning predictions from geodata raster images"""
 import os
 
-# not used here but contextily_tile is imported in samgis.io.tms2geotiff
+# not used here but contextily_tile is imported in samgis_lisa_on_cuda.io.tms2geotiff
 from contextily import tile as contextily_tile
 from pathlib import Path
-from samgis.utilities.constants import SERVICE_NAME
+from samgis_lisa_on_cuda.utilities.constants import SERVICE_NAME
 
 ROOT = Path(globals().get("__file__", "./_")).absolute().parent.parent
 PROJECT_ROOT_FOLDER = Path(os.getenv("PROJECT_ROOT_FOLDER", ROOT))

samgis_lisa_on_cuda/__version__.py

@@ -0,0 +1,4 @@
+import importlib.metadata
+
+
+__version__ = importlib.metadata.version(__package__ or __name__)

{samgis → samgis_lisa_on_cuda}/io/coordinates_pixel_conversion.py

@@ -1,10 +1,10 @@
 """functions useful to convert to/from latitude-longitude coordinates to pixel image coordinates"""
 from samgis_core.utilities.type_hints import tuple_float, tuple_float_any
 
-from samgis import app_logger
-from samgis.utilities.constants import TILE_SIZE, EARTH_EQUATORIAL_RADIUS
-from samgis.utilities.type_hints import ImagePixelCoordinates
-from samgis.utilities.type_hints import LatLngDict
+from samgis_lisa_on_cuda import app_logger
+from samgis_lisa_on_cuda.utilities.constants import TILE_SIZE, EARTH_EQUATORIAL_RADIUS
+from samgis_lisa_on_cuda.utilities.type_hints import ImagePixelCoordinates
+from samgis_lisa_on_cuda.utilities.type_hints import LatLngDict
 
 
 def _get_latlng2pixel_projection(latlng: LatLngDict) -> ImagePixelCoordinates:

{samgis → samgis_lisa_on_cuda}/io/geo_helpers.py

@@ -3,7 +3,7 @@ from affine import Affine
 from numpy import ndarray as np_ndarray
 
 from samgis_core.utilities.type_hints import list_float, tuple_float, dict_str_int
-from samgis import app_logger
+from samgis_lisa_on_cuda import app_logger
 
 
 def load_affine_transformation_from_matrix(matrix_source_coefficients: list_float) -> Affine:

{samgis → samgis_lisa_on_cuda}/io/raster_helpers.py

@@ -2,8 +2,8 @@
 import numpy as np
 from numpy import ndarray, bitwise_not
 
-from samgis import app_logger
-from samgis.utilities.type_hints import XYZTerrainProvidersNames
+from samgis_lisa_on_cuda import app_logger
+from samgis_lisa_on_cuda.utilities.type_hints import XYZTerrainProvidersNames
 
 
 def get_nextzen_terrain_rgb_formula(red: ndarray, green: ndarray, blue: ndarray) -> ndarray:
@@ -80,7 +80,7 @@ def get_rgb_prediction_image(raster_cropped: ndarray, slope_cellsize: int, inver
     Returns:
         tuple of str: image filename, image path (with filename)
     """
-    from samgis.utilities.constants import CHANNEL_EXAGGERATIONS_LIST
+    from samgis_lisa_on_cuda.utilities.constants import CHANNEL_EXAGGERATIONS_LIST
 
     try:
         slope, curvature = get_slope_curvature(raster_cropped, slope_cellsize=slope_cellsize)

{samgis → samgis_lisa_on_cuda}/io/tms2geotiff.py

@@ -4,10 +4,10 @@ from numpy import ndarray
 from samgis_core.utilities.type_hints import tuple_float
 from xyzservices import TileProvider
 
-from samgis import app_logger
-from samgis.utilities.constants import (OUTPUT_CRS_STRING, DRIVER_RASTERIO_GTIFF, N_MAX_RETRIES, N_CONNECTION, N_WAIT,
+from samgis_lisa_on_cuda import app_logger
+from samgis_lisa_on_cuda.utilities.constants import (OUTPUT_CRS_STRING, DRIVER_RASTERIO_GTIFF, N_MAX_RETRIES, N_CONNECTION, N_WAIT,
                                         ZOOM_AUTO, BOOL_USE_CACHE)
-from samgis.utilities.type_hints import tuple_ndarray_transform
+from samgis_lisa_on_cuda.utilities.type_hints import tuple_ndarray_transform
 
 
 bool_use_cache = int(os.getenv("BOOL_USE_CACHE", BOOL_USE_CACHE))
@@ -51,8 +51,8 @@ def download_extent(w: float, s: float, e: float, n: float, zoom: int or str = z
         parsed request input
     """
     try:
-        from samgis import contextily_tile
-        from samgis.io.coordinates_pixel_conversion import _from4326_to3857
+        from samgis_lisa_on_cuda import contextily_tile
+        from samgis_lisa_on_cuda.io.coordinates_pixel_conversion import _from4326_to3857
 
         app_logger.info(f"connection number:{n_connections}, type:{type(n_connections)}.")
         app_logger.info(f"zoom:{zoom}, type:{type(zoom)}.")

{samgis → samgis_lisa_on_cuda}/io/wrappers_helpers.py

@@ -7,10 +7,10 @@ import loguru
 from xyzservices import providers, TileProvider
 
 from lisa_on_cuda.utils.app_helpers import get_cleaned_input
-from samgis import app_logger
-from samgis.io.coordinates_pixel_conversion import get_latlng_to_pixel_coordinates
-from samgis.utilities.constants import COMPLETE_URL_TILES_MAPBOX, COMPLETE_URL_TILES_NEXTZEN, CUSTOM_RESPONSE_MESSAGES
-from samgis.utilities.type_hints import ApiRequestBody, ContentTypes, XYZTerrainProvidersNames, \
+from samgis_lisa_on_cuda import app_logger
+from samgis_lisa_on_cuda.io.coordinates_pixel_conversion import get_latlng_to_pixel_coordinates
+from samgis_lisa_on_cuda.utilities.constants import COMPLETE_URL_TILES_MAPBOX, COMPLETE_URL_TILES_NEXTZEN, CUSTOM_RESPONSE_MESSAGES
+from samgis_lisa_on_cuda.utilities.type_hints import ApiRequestBody, ContentTypes, XYZTerrainProvidersNames, \
     XYZDefaultProvidersNames, StringPromptApiRequestBody
 from samgis_core.utilities.utilities import base64_decode
 

{samgis → samgis_lisa_on_cuda}/prediction_api/lisa.py

@@ -1,8 +1,8 @@
-from samgis import app_logger
-from samgis.io.geo_helpers import get_vectorized_raster_as_geojson
-from samgis.io.tms2geotiff import download_extent
-from samgis.prediction_api.global_models import models_dict
-from samgis.utilities.constants import DEFAULT_URL_TILES
+from samgis_lisa_on_cuda import app_logger
+from samgis_lisa_on_cuda.io.geo_helpers import get_vectorized_raster_as_geojson
+from samgis_lisa_on_cuda.io.tms2geotiff import download_extent
+from samgis_lisa_on_cuda.prediction_api.global_models import models_dict
+from samgis_lisa_on_cuda.utilities.constants import DEFAULT_URL_TILES
 from samgis_core.utilities.type_hints import llist_float, list_dict, dict_str_int
 from lisa_on_cuda.utils import app_helpers
 

{samgis → samgis_lisa_on_cuda}/prediction_api/predictors.py

@@ -1,11 +1,11 @@
 """functions using machine learning instance model(s)"""
-from samgis import app_logger, MODEL_FOLDER
-from samgis.io.geo_helpers import get_vectorized_raster_as_geojson
-from samgis.io.raster_helpers import get_raster_terrain_rgb_like, get_rgb_prediction_image
-from samgis.io.tms2geotiff import download_extent
-from samgis.io.wrappers_helpers import check_source_type_is_terrain
-from samgis.prediction_api.global_models import models_dict
-from samgis.utilities.constants import DEFAULT_URL_TILES, SLOPE_CELLSIZE
+from samgis_lisa_on_cuda import app_logger, MODEL_FOLDER
+from samgis_lisa_on_cuda.io.geo_helpers import get_vectorized_raster_as_geojson
+from samgis_lisa_on_cuda.io.raster_helpers import get_raster_terrain_rgb_like, get_rgb_prediction_image
+from samgis_lisa_on_cuda.io.tms2geotiff import download_extent
+from samgis_lisa_on_cuda.io.wrappers_helpers import check_source_type_is_terrain
+from samgis_lisa_on_cuda.prediction_api.global_models import models_dict
+from samgis_lisa_on_cuda.utilities.constants import DEFAULT_URL_TILES, SLOPE_CELLSIZE
 from samgis_core.prediction_api.sam_onnx import SegmentAnythingONNX
 from samgis_core.prediction_api.sam_onnx import get_raster_inference
 from samgis_core.utilities.constants import MODEL_ENCODER_NAME, MODEL_DECODER_NAME, DEFAULT_INPUT_SHAPE

scripts/extract-openapi-fastapi.py

@@ -7,7 +7,7 @@ import sys
 import yaml
 from uvicorn.importer import import_from_string
 
-from samgis import PROJECT_ROOT_FOLDER
+from samgis_lisa_on_cuda import PROJECT_ROOT_FOLDER
 
 parser = argparse.ArgumentParser(prog="extract-openapi-fastapi.py")
 parser.add_argument("app",       help='App import string. Eg. "main:app"', default="main:app")

scripts/extract-openapi-lambda.py

@@ -1,9 +1,9 @@
 import json
 
-from samgis import PROJECT_ROOT_FOLDER
+from samgis_lisa_on_cuda import PROJECT_ROOT_FOLDER
 
 if __name__ == '__main__':
-    from samgis.utilities.type_hints import ApiRequestBody, ApiResponseBodyFailure, ApiResponseBodySuccess
+    from samgis_lisa_on_cuda.utilities.type_hints import ApiRequestBody, ApiResponseBodyFailure, ApiResponseBodySuccess
 
     with open(PROJECT_ROOT_FOLDER / "docs" / "specs" / "openapi_lambda_wip.json", "w") as output_json:
         json.dump({

static/src/components/PageFooter.vue

@@ -7,7 +7,7 @@
           <span>Trouble on scrolling this page? Open the
           <PageFooterHyperlink path="https://aletrn-samgis-lisa-on-cuda.hf.space">direct URL space</PageFooterHyperlink>
           as a new tab. </span>
-          <span><PageFooterHyperlink path="/">SamGIS</PageFooterHyperlink>: An inference machine learning POC applied to GIS thanks to
+          <span><PageFooterHyperlink path="/">SamGIS-LISA on cuda</PageFooterHyperlink>: An inference machine learning POC applied to GIS thanks to
             <PageFooterHyperlink path="https://github.com/vietanhdev/samexporter/">SAM Exporter</PageFooterHyperlink>
             and inspired by
             <PageFooterHyperlink path="https://samgeo.gishub.org/">Segment Geospatial</PageFooterHyperlink>

tests/__init__.py

@@ -1,4 +1,4 @@
-from samgis import PROJECT_ROOT_FOLDER
+from samgis_lisa_on_cuda import PROJECT_ROOT_FOLDER
 
 
 TEST_ROOT_FOLDER = PROJECT_ROOT_FOLDER / "tests"

tests/io/test_coordinates_pixel_conversion.py

@@ -1,7 +1,7 @@
 import json
 
-from samgis.io.coordinates_pixel_conversion import get_latlng_to_pixel_coordinates
-from samgis.utilities.type_hints import LatLngDict
+from samgis_lisa_on_cuda.io.coordinates_pixel_conversion import get_latlng_to_pixel_coordinates
+from samgis_lisa_on_cuda.utilities.type_hints import LatLngDict
 from tests import TEST_EVENTS_FOLDER
 
 

tests/io/test_geo_helpers.py

@@ -3,7 +3,7 @@ import unittest
 import numpy as np
 import shapely
 
-from samgis.io.geo_helpers import load_affine_transformation_from_matrix
+from samgis_lisa_on_cuda.io.geo_helpers import load_affine_transformation_from_matrix
 from tests import TEST_EVENTS_FOLDER
 
 
@@ -63,7 +63,7 @@ class TestGeoHelpers(unittest.TestCase):
 
     def test_get_vectorized_raster_as_geojson_ok(self):
         from rasterio.transform import Affine
-        from samgis.io.geo_helpers import get_vectorized_raster_as_geojson
+        from samgis_lisa_on_cuda.io.geo_helpers import get_vectorized_raster_as_geojson
 
         name_fn = "samexporter_predict"
 
@@ -81,7 +81,7 @@ class TestGeoHelpers(unittest.TestCase):
                 assert shapely.equals_exact(output_geojson, expected_output_geojson, tolerance=0.000006)
 
     def test_get_vectorized_raster_as_geojson_fail(self):
-        from samgis.io.geo_helpers import get_vectorized_raster_as_geojson
+        from samgis_lisa_on_cuda.io.geo_helpers import get_vectorized_raster_as_geojson
 
         name_fn = "samexporter_predict"
 

tests/io/test_raster_helpers.py

@@ -3,7 +3,7 @@ from unittest.mock import patch
 import numpy as np
 
 from samgis_core.utilities.utilities import hash_calculate
-from samgis.io import raster_helpers
+from samgis_lisa_on_cuda.io import raster_helpers
 
 
 def get_three_channels(size=5, param1=1000, param2=3, param3=-88):
@@ -101,7 +101,7 @@ class Test(unittest.TestCase):
         assert hash_slope == b'IYf6x4G0lmR47j6HRS5kUYWdtmimhLz2nak8py75nwc='
 
     def test_get_slope_curvature_value_error(self):
-        from samgis.io import raster_helpers
+        from samgis_lisa_on_cuda.io import raster_helpers
 
         with self.assertRaises(ValueError):
             try:
@@ -242,7 +242,7 @@ class Test(unittest.TestCase):
         assert hash_output == b'RU7CcoKoR3Fkh5LE+m48DHRVUy/vGq6UgfOFUMXx07M='
 
     def test_get_raster_terrain_rgb_like(self):
-        from samgis.utilities.type_hints import XYZTerrainProvidersNames
+        from samgis_lisa_on_cuda.utilities.type_hints import XYZTerrainProvidersNames
 
         arr_input = raster_helpers.get_rgb_image(channel0, channel1, channel2, invert_image=True)
         output_nextzen = raster_helpers.get_raster_terrain_rgb_like(

tests/io/test_tms2geotiff.py

@@ -3,8 +3,8 @@ import unittest
 import numpy as np
 from samgis_core.utilities.utilities import hash_calculate
 
-from samgis import app_logger
-from samgis.io.tms2geotiff import download_extent
+from samgis_lisa_on_cuda import app_logger
+from samgis_lisa_on_cuda.io.tms2geotiff import download_extent
 from tests import LOCAL_URL_TILE, TEST_EVENTS_FOLDER
 
 

tests/io/test_wrappers_helpers.py

@@ -5,9 +5,9 @@ import unittest
 from http import HTTPStatus
 from unittest.mock import patch
 
-from samgis.io import wrappers_helpers
-from samgis.io.wrappers_helpers import get_parsed_bbox_points_with_dictlist_prompt, get_parsed_request_body, get_response
-from samgis.utilities.type_hints import ApiRequestBody
+from samgis_lisa_on_cuda.io import wrappers_helpers
+from samgis_lisa_on_cuda.io.wrappers_helpers import get_parsed_bbox_points_with_dictlist_prompt, get_parsed_request_body, get_response
+from samgis_lisa_on_cuda.utilities.type_hints import ApiRequestBody
 from tests import TEST_EVENTS_FOLDER
 
 
@@ -95,7 +95,7 @@ class WrappersHelpersTest(unittest.TestCase):
     @patch.object(wrappers_helpers, "providers")
     def test_get_url_tile(self, providers_mocked):
         import xyzservices
-        from samgis.io.wrappers_helpers import get_url_tile
+        from samgis_lisa_on_cuda.io.wrappers_helpers import get_url_tile
 
         from tests import LOCAL_URL_TILE
 
@@ -115,7 +115,7 @@ class WrappersHelpersTest(unittest.TestCase):
 
     @staticmethod
     def test_get_url_tile_real():
-        from samgis.io.wrappers_helpers import get_url_tile
+        from samgis_lisa_on_cuda.io.wrappers_helpers import get_url_tile
 
         assert get_url_tile("OpenStreetMap") == {
             'url': 'https://tile.openstreetmap.org/{z}/{x}/{y}.png', 'max_zoom': 19,

tests/prediction_api/test_predictors.py

@@ -3,8 +3,8 @@ from unittest.mock import patch
 
 import numpy as np
 
-from samgis.prediction_api import predictors
-from samgis.prediction_api.predictors import get_raster_inference, samexporter_predict
+from samgis_lisa_on_cuda.prediction_api import predictors
+from samgis_lisa_on_cuda.prediction_api.predictors import get_raster_inference, samexporter_predict
 from tests import TEST_EVENTS_FOLDER
 
 

tests/test_fastapi_app.py

@@ -5,8 +5,8 @@ from unittest.mock import patch
 
 from fastapi.testclient import TestClient
 
-from samgis import PROJECT_ROOT_FOLDER
-from samgis.io import wrappers_helpers
+from samgis_lisa_on_cuda import PROJECT_ROOT_FOLDER
+from samgis_lisa_on_cuda.io import wrappers_helpers
 from tests import TEST_EVENTS_FOLDER
 from tests.local_tiles_http_server import LocalTilesHttpServer
 from wrappers import fastapi_wrapper

tests/test_lambda_app.py

@@ -3,13 +3,13 @@ import time
 import unittest
 from unittest.mock import patch
 
-from samgis import IS_AWS_LAMBDA
+from samgis_lisa_on_cuda import IS_AWS_LAMBDA
 
 if IS_AWS_LAMBDA:
     try:
         from awslambdaric.lambda_context import LambdaContext
 
-        from samgis.io import wrappers_helpers
+        from samgis_lisa_on_cuda.io import wrappers_helpers
         from wrappers import lambda_wrapper
         from tests.local_tiles_http_server import LocalTilesHttpServer
 

wrappers/fastapi_wrapper.py

@@ -8,8 +8,8 @@ from fastapi.responses import FileResponse, JSONResponse
 from fastapi.staticfiles import StaticFiles
 from pydantic import ValidationError
 
-from samgis import PROJECT_ROOT_FOLDER, WORKDIR
-from samgis.utilities.type_hints import ApiRequestBody, StringPromptApiRequestBody
+from samgis_lisa_on_cuda import PROJECT_ROOT_FOLDER, WORKDIR
+from samgis_lisa_on_cuda.utilities.type_hints import ApiRequestBody, StringPromptApiRequestBody
 from samgis_core.utilities.fastapi_logger import setup_logging
 
 
@@ -39,7 +39,7 @@ async def request_middleware(request, call_next):
 
 @app.post("/post_test_dictlist")
 def post_test_dictlist2(request_input: ApiRequestBody) -> JSONResponse:
-    from samgis.io.wrappers_helpers import get_parsed_bbox_points_with_dictlist_prompt
+    from samgis_lisa_on_cuda.io.wrappers_helpers import get_parsed_bbox_points_with_dictlist_prompt
 
     request_body = get_parsed_bbox_points_with_dictlist_prompt(request_input)
     app_logger.info(f"request_body:{request_body}.")
@@ -51,17 +51,29 @@ def post_test_dictlist2(request_input: ApiRequestBody) -> JSONResponse:
 
 @app.get("/health")
 async def health() -> JSONResponse:
-    from samgis.__version__ import __version__ as version
-    from samgis_core.__version__ import __version__ as version_core
+    import importlib.metadata
+    from importlib.metadata import PackageNotFoundError
 
-    app_logger.info(f"still alive, version:{version}, core version:{version_core}.")
+    try:
+        core_version = importlib.metadata.version('samgis_core')
+        lisa_on_cuda_version = importlib.metadata.version('lisa-on-cuda')
+        samgis_lisa_on_cuda_version = importlib.metadata.version('samgis-lisa-on-cuda')
+    except PackageNotFoundError as pe:
+        app_logger.error(f"pe:{pe}.")
+        samgis_lisa_on_cuda_version = "0.0.0"
+
+    msg = "still alive, "
+    msg += f"""version:{samgis_lisa_on_cuda_version}, core version:{core_version},"""
+    msg += f"""lisa-on-cuda version:{lisa_on_cuda_version},"""
+
+    app_logger.info(msg)
     return JSONResponse(status_code=200, content={"msg": "still alive..."})
 
 
 @app.post("/post_test_string")
 def post_test_string(request_input: StringPromptApiRequestBody) -> JSONResponse:
     from lisa_on_cuda.utils import app_helpers
-    from samgis.io.wrappers_helpers import get_parsed_bbox_points_with_string_prompt
+    from samgis_lisa_on_cuda.io.wrappers_helpers import get_parsed_bbox_points_with_string_prompt
 
     request_body = get_parsed_bbox_points_with_string_prompt(request_input)
     app_logger.info(f"request_body:{request_body}.")
@@ -75,8 +87,8 @@ def post_test_string(request_input: StringPromptApiRequestBody) -> JSONResponse:
 
 @app.post("/infer_lisa")
 def infer_lisa(request_input: StringPromptApiRequestBody) -> JSONResponse:
-    from samgis.prediction_api import lisa
-    from samgis.io.wrappers_helpers import get_parsed_bbox_points_with_string_prompt
+    from samgis_lisa_on_cuda.prediction_api import lisa
+    from samgis_lisa_on_cuda.io.wrappers_helpers import get_parsed_bbox_points_with_string_prompt
 
     app_logger.info("starting lisa inference request...")
 
@@ -119,10 +131,10 @@ def infer_lisa(request_input: StringPromptApiRequestBody) -> JSONResponse:
 
 @app.post("/infer_samgis")
 def infer_samgis(request_input: ApiRequestBody) -> JSONResponse:
-    from samgis.prediction_api import predictors
-    from samgis.io.wrappers_helpers import get_parsed_bbox_points_with_dictlist_prompt
+    from samgis_lisa_on_cuda.prediction_api import predictors
+    from samgis_lisa_on_cuda.io.wrappers_helpers import get_parsed_bbox_points_with_dictlist_prompt
 
-    app_logger.info("starting samgis inference request...")
+    app_logger.info("starting plain samgis inference request...")
 
     try:
         import time
@@ -144,10 +156,14 @@ def infer_samgis(request_input: ApiRequestBody) -> JSONResponse:
             return JSONResponse(status_code=200, content={"body": json.dumps(body)})
         except Exception as inference_exception:
             import subprocess
-            home_content = subprocess.run(
-                "ls -l /var/task", shell=True, universal_newlines=True, stdout=subprocess.PIPE
+            project_root_folder_content = subprocess.run(
+                f"ls -l {PROJECT_ROOT_FOLDER}/", shell=True, universal_newlines=True, stdout=subprocess.PIPE
+            )
+            app_logger.error(f"project_root folder 'ls -l' command output: {project_root_folder_content.stdout}.")
+            workdir_folder_content = subprocess.run(
+                f"ls -l {WORKDIR}/", shell=True, universal_newlines=True, stdout=subprocess.PIPE
             )
-            app_logger.error(f"/home/user ls -l: {home_content.stdout}.")
+            app_logger.error(f"workdir folder 'ls -l' command output: {workdir_folder_content.stdout}.")
             app_logger.error(f"inference error:{inference_exception}.")
             raise HTTPException(
                 status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail="Internal server error on inference")

wrappers/lambda_wrapper.py

@@ -5,9 +5,9 @@ from typing import Dict
 from aws_lambda_powertools.utilities.typing import LambdaContext
 from pydantic import ValidationError
 
-from samgis import app_logger
-from samgis.io.wrappers_helpers import get_parsed_request_body, get_parsed_bbox_points_with_dictlist_prompt, get_response
-from samgis.prediction_api.predictors import samexporter_predict
+from samgis_lisa_on_cuda import app_logger
+from samgis_lisa_on_cuda.io.wrappers_helpers import get_parsed_request_body, get_parsed_bbox_points_with_dictlist_prompt, get_response
+from samgis_lisa_on_cuda.prediction_api.predictors import samexporter_predict
 
 
 def lambda_handler(event: Dict, context: LambdaContext) -> str: