chore: Update Dockerfile and requirements.txt, and install additional Python packages

Former-commit-id: 3550d7eab461bf64ef3c3c6f764858bee6e7e571
Former-commit-id: ab7f1f05303afa418835763ceae3d49d013d9804

Dockerfile

@@ -1,33 +1,45 @@
-# Use the official Python base image
-FROM python:3.10-slim
+# Dockerfile for Python application with dependencies and runtime optimizations
 
-# Set the initial working directory
+# Use Python 3.10 slim-buster as base image
+FROM python:3.10-slim-buster
+
+# Set working directory in the container
 WORKDIR /app
 
-# Copy the requirements.txt file from the api directory
-COPY ../api/requirements.txt ./
+# Install system dependencies
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+        ffmpeg \
+        libsm6 \
+        libxext6 \
+        libgl1-mesa-glx \
+    && rm -rf /var/lib/apt/lists/*
 
-# Install dependencies specified in requirements.txt
-RUN pip install --no-cache-dir -r requirements.txt
+# Copy everything from the current directory to /app in the container
+COPY . .
 
-# Create a non-root user and set up the environment
-RUN useradd -m -u 1000 user
+# Install Python dependencies
+RUN pip install --no-cache-dir -r api/requirements.txt
 
-USER user
+# Create a non-root user to run the application
+RUN useradd -m -u 1000 user
 
+# Set environment variables
 ENV HOME=/home/user \
-    PATH=/home/user/.local/bin:$PATH
-
-# Set the final working directory
-WORKDIR $HOME/app
+    PATH=/home/user/.local/bin:$PATH \
+    PYTHONPATH=$HOME/app/scripts
 
+# Set ownership to non-root user
+RUN chown -R user:user /app
 
+# Switch to the non-root user
+USER user
 
-# Copy the entire project into the container, setting the appropriate ownership
-COPY --chown=user . $HOME/app
+# Install the application in editable mode
+RUN pip install --no-cache-dir -e /app
 
-# Set the working directory to /home/user/app/api
-WORKDIR $HOME/app/api
+# Set working directory for the application
+WORKDIR /app/api
 
-# Command to run the API
-CMD ["python", "endpoints.py"]
+# Command to run the application
+CMD ["python", "endpoints.py"]

api/requirements.txt

@@ -11,3 +11,7 @@ torch
 utils==1.0.2
 uvicorn==0.30.1
 boto3
+ultralytics
+transformers 
+
+

api/routers/painting.py

@@ -1,5 +1,4 @@
-import sys
-sys.path.append('../scripts')
+from pathlib import Path
 import os
 import uuid
 from typing import List, Tuple, Any, Dict
@@ -7,7 +6,7 @@ from fastapi import APIRouter, File, UploadFile, HTTPException, Form, Depends, B
 from pydantic import BaseModel, Field
 from PIL import Image
 import lightning.pytorch as pl
-from utils import pil_to_s3_json, pil_to_b64_json, ImageAugmentation, accelerator
+from scripts.api_utils import pil_to_s3_json, pil_to_b64_json, ImageAugmentation, accelerator
 from inpainting_pipeline import AutoPaintingPipeline, load_pipeline
 from hydra import compose, initialize
 from async_batcher.batcher import AsyncBatcher
@@ -18,7 +17,7 @@ pl.seed_everything(42)
 router = APIRouter()
 
 # Initialize Hydra configuration
-with initialize(version_base=None, config_path="../../configs"):
+with initialize(version_base=None, config_path=Path(__file__).resolve().parent.parent / "configs"):
     cfg = compose(config_name="inpainting")
 
 # Load the inpainting pipeline

api/routers/sdxl_text_to_image.py

@@ -1,21 +1,13 @@
-import sys
-sys.path.append("../scripts")  # Path of the scripts directory
 import config
 from fastapi import APIRouter, HTTPException
-from pydantic import BaseModel
-import base64
-from io import BytesIO
 from typing import List
-import uuid
 from diffusers import DiffusionPipeline
 import torch
 from functools import lru_cache
-from PIL import Image
-import io
-from scripts.utils import accelerator
+from scripts.api_utils import accelerator
 from models.sdxl_input import InputFormat
 from async_batcher.batcher import AsyncBatcher
-from utils import pil_to_b64_json, pil_to_s3_json
+from scripts.api_utils import pil_to_b64_json, pil_to_s3_json
 torch._inductor.config.conv_1x1_as_mm = True
 torch._inductor.config.coordinate_descent_tuning = True
 torch._inductor.config.epilogue_fusion = False

picpilot.egg-info/PKG-INFO

@@ -0,0 +1,4 @@
+Metadata-Version: 2.1
+Name: picpilot
+Version: 0.1
+License-File: LICENSE

picpilot.egg-info/SOURCES.txt

@@ -0,0 +1,23 @@
+LICENSE
+README.md
+setup.py
+api/__init__.py
+api/endpoints.py
+api/models/__init__.py
+api/models/painting.py
+api/models/sdxl_input.py
+picpilot.egg-info/PKG-INFO
+picpilot.egg-info/SOURCES.txt
+picpilot.egg-info/dependency_links.txt
+picpilot.egg-info/top_level.txt
+scripts/__init__.py
+scripts/api_utils.py
+scripts/config.py
+scripts/inpainting_pipeline.py
+scripts/kandinsky3_inpainting.py
+scripts/load_pipeline.py
+scripts/logger.py
+scripts/products10k_captions.py
+scripts/s3_manager.py
+scripts/sdxl_lora_inference.py
+scripts/sdxl_lora_tuner.py

picpilot.egg-info/dependency_links.txt

@@ -0,0 +1 @@
+

picpilot.egg-info/top_level.txt

@@ -0,0 +1,2 @@
+api
+scripts

run.sh

@@ -1,3 +1,2 @@
-apt-get update && apt-get install python3-dev
-uv pip install -r requirements.txt
+apt-get update && apt-get install python3-dev -y
 apt install libgl1-mesa-glx -y

scripts/inpainting_pipeline.py

@@ -1,7 +1,7 @@
 import torch
 from diffusers import AutoPipelineForInpainting
 from diffusers.utils import load_image
-from utils import accelerator, ImageAugmentation
+from api_utils import accelerator, ImageAugmentation
 import hydra
 from omegaconf import DictConfig
 from PIL import Image

scripts/kandinsky3_inpainting.py

@@ -2,7 +2,7 @@ import sys
 import torch
 sys.path.append('../')
 from Kandinsky.kandinsky3 import get_inpainting_pipeline
-from utils import ImageAugmentation
+from api_utils import ImageAugmentation
 from diffusers.utils import load_image
 from PIL import Image
 

setup.py

@@ -0,0 +1,6 @@
+from setuptools import setup, find_packages
+
+setup(name='picpilot',
+      version='0.1',
+      packages=find_packages(),
+)

ui/ui.py

@@ -6,9 +6,9 @@ from io import BytesIO
 
 
 
-sdxl_inference_endpoint = 'http://127.0.0.1:8000/api/v1/product-diffusion/sdxl_v0_lora_inference'
-sdxl_batch_inference_endpoint = 'http://127.0.0.1:8000/api/v1/product-diffusion/sdxl_v0_lora_inference/batch'
-kandinsky_inpainting_inference = 'http://127.0.0.1:8000/api/v1/product-diffusion/kandinskyv2.2_inpainting'
+sdxl_inference_endpoint = 'http://127.0.0.1:7860/api/v1/product-diffusion/sdxl_v0_lora_inference'
+sdxl_batch_inference_endpoint = 'http://127.0.0.1:7860/api/v1/product-diffusion/sdxl_v0_lora_inference/batch'
+kandinsky_inpainting_inference = 'http://127.0.0.1:7860/api/v1/product-diffusion/kandinskyv2.2_inpainting'
 
 # Define the InpaintingRequest model
 class InputRequest(BaseModel):