TheDeepDas commited on
Commit
4569bb2
Β·
1 Parent(s): 9905a42

Add OpenCV system deps, YOLO model test, and config fixes

Browse files
Files changed (3) hide show
  1. Dockerfile +10 -3
  2. start-hf.sh +9 -0
  3. test_yolo_model.py +158 -0
Dockerfile CHANGED
@@ -8,6 +8,7 @@ WORKDIR /app
8
  ENV PYTHONDONTWRITEBYTECODE=1
9
  ENV PYTHONUNBUFFERED=1
10
  ENV PORT=7860
 
11
 
12
  # Create a non-root user for security
13
  RUN useradd --create-home --shell /bin/bash app
@@ -36,9 +37,15 @@ RUN pip install --no-cache-dir -r requirements.txt
36
  COPY . .
37
 
38
  # Create necessary directories with proper permissions
39
- RUN mkdir -p models app/uploads /tmp/uploads && \
40
- chown -R app:app /app /tmp/uploads && \
41
- chmod -R 755 /app /tmp/uploads
 
 
 
 
 
 
42
 
43
  # Make startup script executable
44
  RUN chmod +x start-hf.sh && chown app:app start-hf.sh
 
8
  ENV PYTHONDONTWRITEBYTECODE=1
9
  ENV PYTHONUNBUFFERED=1
10
  ENV PORT=7860
11
+ ENV YOLO_CONFIG_DIR=/tmp/Ultralytics
12
 
13
  # Create a non-root user for security
14
  RUN useradd --create-home --shell /bin/bash app
 
37
  COPY . .
38
 
39
  # Create necessary directories with proper permissions
40
+ RUN mkdir -p models app/uploads /tmp/uploads /tmp/Ultralytics && \
41
+ chown -R app:app /app /tmp/uploads /tmp/Ultralytics && \
42
+ chmod -R 755 /app /tmp/uploads /tmp/Ultralytics
43
+
44
+ # Pre-download and test YOLO model (as app user)
45
+ RUN chown app:app test_yolo_model.py && chmod +x test_yolo_model.py
46
+ USER app
47
+ RUN python test_yolo_model.py || echo "Warning: YOLO model test failed, will retry at runtime"
48
+ USER root
49
 
50
  # Make startup script executable
51
  RUN chmod +x start-hf.sh && chown app:app start-hf.sh
start-hf.sh CHANGED
@@ -12,5 +12,14 @@ export ALLOWED_ORIGINS=${ALLOWED_ORIGINS:-"*"}
12
  echo "πŸ“‘ Port: ${PORT:-7860}"
13
  echo "πŸ”— Allowed Origins: $ALLOWED_ORIGINS"
14
 
 
 
 
 
 
 
 
 
 
15
  # Start the FastAPI application
16
  exec uvicorn app.main:app --host 0.0.0.0 --port ${PORT:-7860} --workers 1
 
12
  echo "πŸ“‘ Port: ${PORT:-7860}"
13
  echo "πŸ”— Allowed Origins: $ALLOWED_ORIGINS"
14
 
15
+ # Test YOLO model availability (quick test)
16
+ echo "πŸ€– Testing YOLO model..."
17
+ python test_yolo_model.py
18
+ if [ $? -eq 0 ]; then
19
+ echo "βœ“ YOLO model ready"
20
+ else
21
+ echo "⚠️ YOLO model test failed, object detection may not work"
22
+ fi
23
+
24
  # Start the FastAPI application
25
  exec uvicorn app.main:app --host 0.0.0.0 --port ${PORT:-7860} --workers 1
test_yolo_model.py ADDED
@@ -0,0 +1,158 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ #!/usr/bin/env python3
2
+ """
3
+ Test script to download and load YOLO model for marine pollution detection.
4
+ This ensures the model is available before the main application starts.
5
+ """
6
+
7
+ import os
8
+ import sys
9
+ import logging
10
+ from pathlib import Path
11
+
12
+ # Configure logging
13
+ logging.basicConfig(
14
+ level=logging.INFO,
15
+ format='%(asctime)s - %(name)s - %(levelname)s - %(message)s'
16
+ )
17
+ logger = logging.getLogger(__name__)
18
+
19
+ def test_opencv():
20
+ """Test if OpenCV is available"""
21
+ try:
22
+ import cv2
23
+ logger.info(f"βœ“ OpenCV loaded successfully: {cv2.__version__}")
24
+ return True
25
+ except ImportError as e:
26
+ logger.error(f"βœ— OpenCV not available: {e}")
27
+ return False
28
+
29
+ def test_torch():
30
+ """Test if PyTorch is available"""
31
+ try:
32
+ import torch
33
+ logger.info(f"βœ“ PyTorch loaded successfully: {torch.__version__}")
34
+ logger.info(f" CUDA available: {torch.cuda.is_available()}")
35
+ if torch.cuda.is_available():
36
+ logger.info(f" CUDA device: {torch.cuda.get_device_name(0)}")
37
+ else:
38
+ logger.info(" Using CPU for inference")
39
+ return True
40
+ except ImportError as e:
41
+ logger.error(f"βœ— PyTorch not available: {e}")
42
+ return False
43
+
44
+ def test_ultralytics():
45
+ """Test if Ultralytics YOLO is available"""
46
+ try:
47
+ from ultralytics import YOLO
48
+ logger.info("βœ“ Ultralytics YOLO loaded successfully")
49
+ return True
50
+ except ImportError as e:
51
+ logger.error(f"βœ— Ultralytics not available: {e}")
52
+ return False
53
+
54
+ def download_and_test_model():
55
+ """Download and test the YOLO model"""
56
+ try:
57
+ from ultralytics import YOLO
58
+ import torch
59
+
60
+ # Set to CPU mode if no CUDA
61
+ if not torch.cuda.is_available():
62
+ os.environ["CUDA_VISIBLE_DEVICES"] = "-1"
63
+ logger.info("Forcing CPU mode (no CUDA available)")
64
+
65
+ # Model to download (YOLOv8x - largest/most accurate)
66
+ model_name = "yolov8x.pt"
67
+ logger.info(f"Attempting to load/download {model_name}...")
68
+
69
+ # Check if model already exists
70
+ model_path = Path.home() / ".cache" / "ultralytics" / model_name
71
+ if model_path.exists():
72
+ logger.info(f"βœ“ Model already exists at: {model_path}")
73
+ else:
74
+ logger.info(f"Model not found, will download to: {model_path}")
75
+
76
+ # Load the model (will auto-download if not present)
77
+ logger.info("Loading model...")
78
+ model = YOLO(model_name)
79
+
80
+ # Verify model loaded
81
+ if hasattr(model, 'model') and model.model is not None:
82
+ logger.info(f"βœ“ Model loaded successfully!")
83
+
84
+ # Get model info
85
+ try:
86
+ model_info = model.info()
87
+ if isinstance(model_info, dict):
88
+ logger.info(f" Model type: {model_info.get('model_type', 'unknown')}")
89
+ elif hasattr(model_info, 'model_type'):
90
+ logger.info(f" Model type: {model_info.model_type}")
91
+ except Exception as e:
92
+ logger.warning(f"Could not get detailed model info: {e}")
93
+
94
+ # Test inference with a dummy image
95
+ logger.info("Testing inference with dummy image...")
96
+ import numpy as np
97
+ import tempfile
98
+ import cv2
99
+
100
+ # Create a small test image
101
+ test_img = np.zeros((100, 100, 3), dtype=np.uint8)
102
+ temp_path = tempfile.mktemp(suffix='.jpg')
103
+ cv2.imwrite(temp_path, test_img)
104
+
105
+ # Run inference
106
+ results = model(temp_path, verbose=False)
107
+ os.unlink(temp_path)
108
+
109
+ logger.info("βœ“ Model inference test successful!")
110
+ return True
111
+ else:
112
+ logger.error("βœ— Model loaded but verification failed")
113
+ return False
114
+
115
+ except Exception as e:
116
+ logger.error(f"βœ— Failed to download/test model: {e}", exc_info=True)
117
+ return False
118
+
119
+ def main():
120
+ """Run all tests"""
121
+ logger.info("=" * 60)
122
+ logger.info("YOLO Model Test Suite")
123
+ logger.info("=" * 60)
124
+
125
+ results = {
126
+ "OpenCV": test_opencv(),
127
+ "PyTorch": test_torch(),
128
+ "Ultralytics": test_ultralytics(),
129
+ }
130
+
131
+ # Only test model if all dependencies are available
132
+ if all(results.values()):
133
+ logger.info("\nAll dependencies available. Testing model...")
134
+ results["YOLO Model"] = download_and_test_model()
135
+ else:
136
+ logger.error("\nMissing dependencies. Skipping model test.")
137
+ results["YOLO Model"] = False
138
+
139
+ # Print summary
140
+ logger.info("\n" + "=" * 60)
141
+ logger.info("Test Summary:")
142
+ logger.info("=" * 60)
143
+ for test, passed in results.items():
144
+ status = "βœ“ PASS" if passed else "βœ— FAIL"
145
+ logger.info(f" {test:20s}: {status}")
146
+
147
+ all_passed = all(results.values())
148
+ logger.info("=" * 60)
149
+
150
+ if all_passed:
151
+ logger.info("βœ“ All tests passed! System ready for object detection.")
152
+ return 0
153
+ else:
154
+ logger.error("βœ— Some tests failed. Check logs above.")
155
+ return 1
156
+
157
+ if __name__ == "__main__":
158
+ sys.exit(main())