refactor: sam-quantized submodule now referrenced without symlinks, update dockerfile

Dockerfile

@@ -1,4 +1,4 @@
-FROM registry.gitlab.com/aletrn/gis-prediction:1.11.7
+FROM registry.gitlab.com/aletrn/gis-prediction:1.11.8
 
 # Include global arg in this stage of the build
 ARG WORKDIR_ROOT="/var/task"

README.md

@@ -15,9 +15,8 @@ I tested these instructions on macOS, but should work on linux as well.
 ## Segment Anything models
 
 It's possible to prepare the model files using <https://github.com/vietanhdev/samexporter/> or using the ones
-from <https://huggingface.co/aletrn/sam-quantized> (copy them within the folder `/machine_learning_models`).
-
-In this case after the clone of this repository it's best to initialize the `sam-quantized` submodule:
+from <https://huggingface.co/aletrn/sam-quantized>. By default the project contains that submodule.
+If you want to use this (recommended) after the clone of this repository it's best to initialize the `sam-quantized` submodule:
 
 ```bash
 git submodule update --init --recursive

app.py

@@ -23,7 +23,7 @@ from starlette.responses import JSONResponse
 load_dotenv()
 project_root_folder = Path(globals().get("__file__", "./_")).absolute().parent
 workdir = os.getenv("WORKDIR", project_root_folder)
-model_folder = Path(project_root_folder / "machine_learning_models")
+model_folder = Path(project_root_folder / "sam-quantized" / "machine_learning_models")
 
 log_level = os.getenv("LOG_LEVEL", "INFO")
 setup_logging(log_level=log_level)

dockerfiles/dockerfile-samgis-base-with-lambda-support

@@ -126,6 +126,6 @@ FROM runtime
 ARG FASTAPI_STATIC
 RUN mkdir ${FASTAPI_STATIC}
 
-COPY ./machine_learning_models ${LAMBDA_TASK_ROOT}/machine_learning_models
+COPY ./sam-quantized/machine_learning_models ${LAMBDA_TASK_ROOT}/machine_learning_models
 COPY --from=node_prod_deps /appnode/node_modules* ${FASTAPI_STATIC}/node_modules
 COPY --from=node_build /appnode/dist* ${FASTAPI_STATIC}/dist

docs/conf.py

@@ -43,7 +43,7 @@ typehints_defaults = "comma"
 
 templates_path = ['_templates']
 exclude_patterns = [
-    '_build', 'Thumbs.db', '.DS_Store', 'build/*', 'machine_learning_models', 'machine_learning_models/*'
+    '_build', 'Thumbs.db', '.DS_Store', 'build/*', 'machine_learning_models', 'machine_learning_models/*', "sam-quantized/machine_learning_models", "sam-quantized/machine_learning_models/*"
 ]
 
 source_suffix = {

machine_learning_models

@@ -1 +0,0 @@
-sam-quantized/machine_learning_models