feat: add .gitignore

config/settings.py

@@ -1,12 +1,6 @@
 import os
 from pathlib import Path
 
-<<<<<<< HEAD
-=======
-
-PROJECT_ROOT = Path(__file__).resolve().parent.parent
-
->>>>>>> f0ccc5b2aab442939699255b2b73e4266ef3a51c
 API_HOST = os.getenv(
     "API_HOST",
     "http://skin-test-api.ailuowan.com"
@@ -17,7 +11,6 @@ API_CALLBACK = os.getenv(
     "/api/v1/analysis/callback"
 )
 
-<<<<<<< HEAD
 # SQLite must reside on persistent local storage; Compose uses /data/analysis.
 TASK_DB_PATH = os.getenv(
     "TASK_DB_PATH", str(Path(__file__).resolve().parent.parent / "data" / "tasks.sqlite3")
@@ -26,24 +19,3 @@ MAX_CONCURRENT_TASKS = int(os.getenv("MAX_CONCURRENT_TASKS", "1"))
 MAX_PENDING_TASKS = int(os.getenv("MAX_PENDING_TASKS", "100"))
 MODEL_PATH = os.getenv("MODEL_PATH", str(Path(__file__).resolve().parent.parent / "best.pt"))
 IMAGE_WORKERS = int(os.getenv("IMAGE_WORKERS", "4"))
-=======
-ANALYSIS_ROOT = os.getenv(
-    "ANALYSIS_ROOT",
-    "/data/analysis"
-)
-
-MODEL_PATH = os.getenv(
-    "MODEL_PATH",
-    "/app/best.pt"
-)
-
-PORE_PREDICTOR_PATH = os.getenv(
-    "PORE_PREDICTOR_PATH",
-    str(PROJECT_ROOT / "shape_predictor_68_face_landmarks.dat")
-)
-
-PORE_ENABLED = os.getenv(
-    "PORE_ENABLED",
-    "1"
-).strip().lower() not in {"0", "false", "no", "off"}
->>>>>>> f0ccc5b2aab442939699255b2b73e4266ef3a51c