Fix for MODEL_PATH export

app/main.py

@@ -1,3 +1,4 @@
+import os
 import chromadb
 
 from fastapi import FastAPI, Request, Form, File, UploadFile, Depends
@@ -38,7 +39,7 @@ async def startup_event():
     db_path = CHROMADB_LOC
     chromadb_face_helper = ChromaDBFaceHelper(db_path) # Used by APIs
     # Perform any other startup tasks here
-
+    print(f"MODEL_PATH in main.py = {os.getenv('MODEL_PATH')} ")
 
 # Mount static files
 app.mount("/static", StaticFiles(directory="static"), name="static")

app/utils/download_model.py

@@ -2,13 +2,15 @@ import os
 import requests
 from transformers import AutoModel
 
-'''
-DO NOT PRINT ANYTHING OTHER THAN MODEL PATH IN THIS SCRIPT, THIS IS BEING EXPORTED BY DOCKER ENTRY POINT!
-'''
 def model_file_exists_and_valid(model_file_path):
     # Check if the model file exists and has a size greater than 0
     return os.path.exists(model_file_path) and os.path.getsize(model_file_path) > 0
 
+def write_model_path_to_txt_file(model_file_path):
+    # Write the model path to model_path.txt
+    with open('/home/user/data/models/model_path.txt', 'w') as f:
+        f.write(model_file_path)
+
 def download_hf_model():
     '''
     Model File Path for HF Models: The download_hf_model function now includes a default model file path (pytorch_model.bin) check. 
@@ -20,7 +22,7 @@ def download_hf_model():
     
     if model_file_exists_and_valid(model_file_path):
         print(f"Model {model_name} already downloaded.")
-        print(model_file_path)
+        write_model_path_to_txt_file(model_file_path)
         return
     
     # Authenticate with Hugging Face using the token, if available
@@ -33,7 +35,7 @@ def download_hf_model():
     model = AutoModel.from_pretrained(model_name)
     model.save_pretrained(model_dir)
     print(f"Model {model_name} downloaded and saved to {model_dir}")
-    print(model_file_path)
+    write_model_path_to_txt_file(model_file_path)
 
 def download_gguf_model():
     model_name = os.getenv("HF_MODEL_NAME")
@@ -45,7 +47,7 @@ def download_gguf_model():
     
     if model_file_exists_and_valid(model_file_path):
         print(f"Model {model_name} already downloaded.")
-        print(model_file_path)
+        write_model_path_to_txt_file(model_file_path)
         return
     
     print(f"Downloading model from {model_url}...")
@@ -56,7 +58,7 @@ def download_gguf_model():
         print(f"Model downloaded and saved to {model_file_path}")
     else:
         print(f"Failed to download the model. Status code: {response.status_code}")
-    print(model_file_path)
+    write_model_path_to_txt_file(model_file_path)
 
 def download_model():
     model_class = os.getenv("MODEL_CLASS")

entrypoint.sh

@@ -6,27 +6,20 @@ export HF_HOME=/home/user/data/hf_cache
 # Assuming HF_TOKEN is already exported to the environment
 echo "Using Hugging Face API token for authentication"
 
-# Use the environment variable for the model name
-MODEL_DIR="/home/user/data/models/${HF_MODEL_NAME}"
-MODEL_URL=${HF_MODEL_URL}  # Ensure consistent variable naming
-
-# Download the model if it does not exist
-if [ ! -d "$MODEL_DIR" ]; then
-    echo "Model not found. Downloading ${HF_MODEL_NAME} from ${MODEL_URL}..."
-    # Navigate to the directory where download_model.py is located
-    cd /home/user/app/app/utils
-
-    # Execute the download_model script
-    echo "Downloading the model..."
-    MODEL_PATH=$(python download_model.py) || { echo "Model download failed"; exit 1; }
-    export MODEL_PATH
-
-
-    # Navigate back to the app directory
-    cd /home/user/app
-else 
-    echo "Model ${HF_MODEL_NAME} already present."
-fi
+# Navigate to the directory where download_model.py is located
+echo "Determining model path..."
+cd /home/user/app/app/utils
+
+# Execute the download_model script
+python download_model.py || { echo "Model download failed"; exit 1; }
+# export MODEL_PATH
+# Read the model path from model_path.txt and export it
+MODEL_PATH=$(cat /home/user/data/models/model_path.txt)
+export MODEL_PATH
+echo "@ Entrypoint - MODEL_PATH exported=${MODEL_PATH}"
+
+# Navigate back to the app directory
+cd /home/user/app
 
 # Execute the main command of the container
 exec "$@"