fix: Ajuste no caminho dos pesos dos modelos

Dockerfile

@@ -1,42 +0,0 @@
-FROM python:3.10-slim
-
-ENV PYTHONDONTWRITEBYTECODE=1 \
-    PYTHONUNBUFFERED=1 \
-    PIP_NO_CACHE_DIR=1 \
-    PORT=7860 \
-    HOME=/home/user \
-    PATH=/home/user/.local/bin:$PATH \
-    HF_HOME=/tmp/.huggingface \
-    TRANSFORMERS_CACHE=/tmp/.cache/huggingface/transformers \
-    HUGGINGFACE_HUB_CACHE=/tmp/.cache/huggingface/hub
-
-RUN useradd -m -u 1000 user
-
-WORKDIR $HOME/app
-
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    build-essential \
-    gcc \
-    g++ \
-    git \
-    libglib2.0-0 \
-    libsm6 \
-    libxext6 \
-    libxrender1 \
-    libgomp1 \
-    && rm -rf /var/lib/apt/lists/*
-
-RUN mkdir -p /tmp/.huggingface /tmp/.cache/huggingface/transformers /tmp/.cache/huggingface/hub
-
-COPY --chown=user requirements.txt $HOME/app/requirements.txt
-
-USER user
-
-RUN pip install --no-cache-dir --upgrade pip setuptools wheel && \
-    pip install --no-cache-dir -r $HOME/app/requirements.txt
-
-COPY --chown=user . $HOME/app
-
-EXPOSE 7860
-
-CMD ["python", "app.py"]

app.py

@@ -4,7 +4,7 @@ import logging
 
 logging.basicConfig(level=logging.INFO)
 
-ROOT = os.path.dirname(__file__)
+ROOT = os.path.abspath(os.environ.get("APP_ROOT", os.path.dirname(__file__)))
 SRC = os.path.join(ROOT, "src")
 
 if SRC not in sys.path:
@@ -20,4 +20,4 @@ if __name__ == "__main__":
         server_name="0.0.0.0",
         server_port=port,
         share=False,
-    )
+    )

dockerfile

@@ -5,6 +5,7 @@ ENV PYTHONDONTWRITEBYTECODE=1 \
     PIP_NO_CACHE_DIR=1 \
     PORT=7860 \
     HOME=/home/user \
+    APP_ROOT=/app \
     PATH=/home/user/.local/bin:$PATH \
     HF_HOME=/tmp/.huggingface \
     TRANSFORMERS_CACHE=/tmp/.cache/huggingface/transformers \
@@ -12,7 +13,7 @@ ENV PYTHONDONTWRITEBYTECODE=1 \
 
 RUN useradd -m -u 1000 user
 
-WORKDIR $HOME/app
+WORKDIR /app
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
     build-essential \
@@ -28,15 +29,17 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 
 RUN mkdir -p /tmp/.huggingface /tmp/.cache/huggingface/transformers /tmp/.cache/huggingface/hub
 
-COPY --chown=user requirements.txt $HOME/app/requirements.txt
+COPY --chown=user requirements.txt $APP_ROOT/requirements.txt
 
 USER user
 
 RUN pip install --no-cache-dir --upgrade pip setuptools wheel && \
-    pip install --no-cache-dir -r $HOME/app/requirements.txt
+    pip install --no-cache-dir -r $APP_ROOT/requirements.txt
 
-COPY --chown=user . $HOME/app
+COPY --chown=user . $APP_ROOT
+
+VOLUME ["/app/data"]
 
 EXPOSE 7860
 
-CMD ["python", "app.py"]
+CMD ["python", "app.py"]

src/models/inference.py

@@ -12,16 +12,39 @@ from models.cam import GradCAMPlusPlus
 
 logging.basicConfig(level=logging.INFO)
 
+
+def _resolve_project_root() -> str:
+    app_root = os.path.abspath(
+        os.environ.get(
+            "APP_ROOT",
+            os.path.join(os.path.dirname(__file__), "..", ".."),
+        )
+    )
+    return app_root
+
+
+def _resolve_data_root(project_root: str) -> str:
+    explicit_data_root = os.environ.get("DATA_ROOT")
+    if explicit_data_root:
+        return os.path.abspath(explicit_data_root)
+
+    hf_persistent_root = "/data"
+    if os.path.exists(hf_persistent_root):
+        return hf_persistent_root
+
+    return os.path.join(project_root, "data")
+
+
 DEVICE = torch.device("cuda" if torch.cuda.is_available() else "cpu")
-PROJECT_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", ".."))
+PROJECT_ROOT = _resolve_project_root()
+DATA_ROOT = _resolve_data_root(PROJECT_ROOT)
 
 CLASS_LIST = ["NEV", "BCC", "ACK", "SEK", "SCC", "MEL"]
 
-ENCODER_DIR = os.path.join(PROJECT_ROOT, "data", "preprocess_data")
+ENCODER_DIR = os.path.join(DATA_ROOT, "preprocess_data")
 MODEL_ROOT_PATTERNS = [
     os.path.join(
-        PROJECT_ROOT,
-        "data",
+        DATA_ROOT,
         "weights",
         "TO_BE_USED",
         "*",
@@ -32,8 +55,7 @@ MODEL_ROOT_PATTERNS = [
         "model_*_with_one-hot-encoder_512_with_best_architecture",
     ),
     os.path.join(
-        PROJECT_ROOT,
-        "data",
+        DATA_ROOT,
         "weights",
         "TO_BE_USED",
         "*",
@@ -68,10 +90,12 @@ _DISCOVERED = False
 def _debug_paths() -> None:
     print(f"[inference] DEVICE={DEVICE}")
     print(f"[inference] PROJECT_ROOT={PROJECT_ROOT}")
+    print(f"[inference] DATA_ROOT={DATA_ROOT}")
+    print(f"[inference] DATA_ROOT exists? {os.path.exists(DATA_ROOT)}")
     print(f"[inference] ENCODER_DIR={ENCODER_DIR}")
     print(f"[inference] ENCODER_DIR exists? {os.path.exists(ENCODER_DIR)}")
 
-    data_root = os.path.join(PROJECT_ROOT, "data")
+    data_root = DATA_ROOT
     weights_root = os.path.join(data_root, "weights")
     to_be_used_root = os.path.join(weights_root, "TO_BE_USED")
 
@@ -238,7 +262,7 @@ def _get_model_and_cam(model_key):
     if not MODEL_CONFIGS:
         raise RuntimeError(
             f"No compatible model checkpoints were found in "
-            f"{os.path.join(PROJECT_ROOT, 'data', 'weights')}. "
+            f"{os.path.join(DATA_ROOT, 'weights')}. "
             f"Please verify that the model assets were uploaded to the Space."
         )