add permission

Dockerfile

@@ -8,6 +8,11 @@ RUN apt-get update && \
     build-essential \
     && rm -rf /var/lib/apt/lists/*
 
+# Create a non-root user to run the application
+RUN useradd -m appuser && \
+    mkdir -p /home/appuser/app /home/appuser/.cache && \
+    chown -R appuser:appuser /home/appuser
+
 # Copy requirements first to leverage Docker cache
 COPY requirements.txt .
 RUN pip install --no-cache-dir -r requirements.txt
@@ -16,12 +21,8 @@ RUN pip install --no-cache-dir -r requirements.txt
 COPY . .
 
 # Create upload directory with proper permissions
-RUN mkdir -p static/uploads && \
-    chmod -R 777 static/uploads
-
-# Create metadata directory with proper permissions
-RUN mkdir -p static/metadata && \
-    chmod -R 777 static/metadata
+RUN mkdir -p static/uploads static/metadata && \
+    chmod -R 777 static
 
 # Set environment variables for Hugging Face
 ENV PYTHONUNBUFFERED=1
@@ -37,5 +38,8 @@ ENV ENV=production
 # Expose port for Hugging Face Spaces (uses port 7860)
 EXPOSE 7860
 
+# Switch to the non-root user
+# USER appuser
+
 # Run the application
 CMD ["uvicorn", "app:app", "--host", "0.0.0.0", "--port", "7860"]

app.py

@@ -19,6 +19,7 @@ import io
 from huggingface_hub import HfApi, HfFolder, create_repo
 from huggingface_hub.utils import RepositoryNotFoundError
 from huggingface_hub.hf_api import RepoFile
+import tempfile
 
 # Create FastAPI app
 app = FastAPI(title="Image Uploader")
@@ -63,6 +64,13 @@ DATASET_REPO = os.environ.get("HF_DATASET_REPO", "image-uploader-data")
 IMAGES_PATH = "images"
 METADATA_PATH = "metadata"
 
+# Set HF cache directory to a writable location
+# This is necessary for Hugging Face Spaces which has permission issues with the default cache location
+os.environ["HF_HOME"] = os.path.join(tempfile.gettempdir(), "huggingface")
+os.environ["HUGGINGFACE_HUB_CACHE"] = os.path.join(tempfile.gettempdir(), "huggingface", "hub")
+os.makedirs(os.environ["HF_HOME"], exist_ok=True)
+os.makedirs(os.environ["HUGGINGFACE_HUB_CACHE"], exist_ok=True)
+
 # Initialize HfApi
 hf_api = HfApi(token=HF_TOKEN)
 
@@ -71,22 +79,38 @@ def ensure_repo_exists():
     try:
         # Check if repo exists
         hf_api.repo_info(repo_id=f"{HF_USERNAME}/{DATASET_REPO}", repo_type="dataset")
+        print(f"Repository {HF_USERNAME}/{DATASET_REPO} exists")
     except RepositoryNotFoundError:
         # Create repo if it doesn't exist
-        create_repo(f"{HF_USERNAME}/{DATASET_REPO}", repo_type="dataset", token=HF_TOKEN)
-        # Initialize metadata
-        metadata = json.dumps({})
-        hf_api.upload_file(
-            path_or_fileobj=io.BytesIO(metadata.encode()),
-            path_in_repo=f"{METADATA_PATH}/image_metadata.json",
-            repo_id=f"{HF_USERNAME}/{DATASET_REPO}",
-            repo_type="dataset",
-            token=HF_TOKEN
-        )
+        try:
+            print(f"Creating repository {HF_USERNAME}/{DATASET_REPO}")
+            create_repo(f"{HF_USERNAME}/{DATASET_REPO}", repo_type="dataset", token=HF_TOKEN)
+            # Initialize metadata
+            metadata = json.dumps({})
+            hf_api.upload_file(
+                path_or_fileobj=io.BytesIO(metadata.encode()),
+                path_in_repo=f"{METADATA_PATH}/image_metadata.json",
+                repo_id=f"{HF_USERNAME}/{DATASET_REPO}",
+                repo_type="dataset",
+                token=HF_TOKEN
+            )
+            print(f"Repository created and initialized")
+        except Exception as e:
+            print(f"Error creating repository: {e}")
+    except Exception as e:
+        print(f"Error checking repository: {e}")
 
 # Initialize repository if in production
 if os.environ.get("ENV", "development") == "production":
-    ensure_repo_exists()
+    print("Running in production mode, checking Hugging Face repository...")
+    if HF_USERNAME and HF_TOKEN:
+        print(f"Using Hugging Face credentials for user: {HF_USERNAME}")
+        try:
+            ensure_repo_exists()
+        except Exception as e:
+            print(f"Error ensuring repository exists: {e}")
+    else:
+        print("Warning: HF_USERNAME or HF_TOKEN not set. Running without Hugging Face integration.")
 
 def get_file_extension(filename: str) -> str:
     """Get the file extension from a filename."""
@@ -114,14 +138,17 @@ def verify_auth(request: Request):
 def get_image_metadata():
     """Get all image metadata including hashtags."""
     # In production, get metadata from Hugging Face
-    if os.environ.get("ENV", "development") == "production" and HF_USERNAME:
+    if os.environ.get("ENV", "development") == "production" and HF_USERNAME and HF_TOKEN:
         try:
+            print(f"Fetching metadata from Hugging Face repository {HF_USERNAME}/{DATASET_REPO}")
             metadata_file = hf_api.hf_hub_download(
                 repo_id=f"{HF_USERNAME}/{DATASET_REPO}",
                 filename=f"{METADATA_PATH}/image_metadata.json",
                 repo_type="dataset",
-                token=HF_TOKEN
+                token=HF_TOKEN,
+                local_dir=os.path.join(tempfile.gettempdir(), "hf_downloads")
             )
+            print(f"Metadata downloaded to {metadata_file}")
             with open(metadata_file, "r") as f:
                 return json.load(f)
         except Exception as e:
@@ -139,6 +166,7 @@ def save_image_metadata(metadata):
     # In production, save to Hugging Face
     if os.environ.get("ENV", "development") == "production" and HF_USERNAME and HF_TOKEN:
         try:
+            print(f"Saving metadata to Hugging Face repository {HF_USERNAME}/{DATASET_REPO}")
             metadata_str = json.dumps(metadata)
             hf_api.upload_file(
                 path_or_fileobj=io.BytesIO(metadata_str.encode()),
@@ -147,12 +175,16 @@ def save_image_metadata(metadata):
                 repo_type="dataset",
                 token=HF_TOKEN
             )
+            print(f"Metadata saved successfully")
         except Exception as e:
             print(f"Error saving metadata to Hugging Face: {e}")
-    
-    # Local development or fallback
-    with open(METADATA_FILE, "w") as f:
-        json.dump(metadata, f)
+            # Still save locally as fallback
+            with open(METADATA_FILE, "w") as f:
+                json.dump(metadata, f)
+    else:
+        # Local development or fallback
+        with open(METADATA_FILE, "w") as f:
+            json.dump(metadata, f)
 
 def add_hashtags_to_image(filename, hashtags, original_filename=None):
     """Add hashtags to an image."""
@@ -182,6 +214,7 @@ def upload_to_hf(file_content, filename):
     """Upload a file to Hugging Face Dataset Repository."""
     if os.environ.get("ENV", "development") == "production" and HF_USERNAME and HF_TOKEN:
         try:
+            print(f"Uploading file {filename} to Hugging Face repository {HF_USERNAME}/{DATASET_REPO}")
             hf_api.upload_file(
                 path_or_fileobj=io.BytesIO(file_content),
                 path_in_repo=f"{IMAGES_PATH}/{filename}",
@@ -189,6 +222,7 @@ def upload_to_hf(file_content, filename):
                 repo_type="dataset",
                 token=HF_TOKEN
             )
+            print(f"File {filename} uploaded successfully")
             return True
         except Exception as e:
             print(f"Error uploading to Hugging Face: {e}")
@@ -199,12 +233,14 @@ def delete_from_hf(filename):
     """Delete a file from Hugging Face Dataset Repository."""
     if os.environ.get("ENV", "development") == "production" and HF_USERNAME and HF_TOKEN:
         try:
+            print(f"Deleting file {filename} from Hugging Face repository {HF_USERNAME}/{DATASET_REPO}")
             hf_api.delete_file(
                 path_in_repo=f"{IMAGES_PATH}/{filename}",
                 repo_id=f"{HF_USERNAME}/{DATASET_REPO}",
                 repo_type="dataset",
                 token=HF_TOKEN
             )
+            print(f"File {filename} deleted successfully")
             return True
         except Exception as e:
             print(f"Error deleting from Hugging Face: {e}")
@@ -221,6 +257,7 @@ def list_hf_images():
     """List all images in the Hugging Face repo."""
     if os.environ.get("ENV", "development") == "production" and HF_USERNAME and HF_TOKEN:
         try:
+            print(f"Listing files from Hugging Face repository {HF_USERNAME}/{DATASET_REPO}")
             files = hf_api.list_repo_files(
                 repo_id=f"{HF_USERNAME}/{DATASET_REPO}",
                 repo_type="dataset",
@@ -228,7 +265,9 @@ def list_hf_images():
             )
             # Filter only image files in the images directory
             image_files = [f for f in files if f.startswith(f"{IMAGES_PATH}/")]
-            return [os.path.basename(f) for f in image_files]
+            image_basenames = [os.path.basename(f) for f in image_files]
+            print(f"Found {len(image_basenames)} images")
+            return image_basenames
         except Exception as e:
             print(f"Error listing files from Hugging Face: {e}")
             return []