Update app.py

app.py

@@ -666,28 +666,25 @@ def analyze_colors(image_bytes):
     image_bytes.seek(0)
     file_bytes = np.asarray(bytearray(image_bytes.read()), dtype=np.uint8)
     img = cv2.imdecode(file_bytes, cv2.IMREAD_COLOR)
-
-    # Преобразуем в HSV
     hsv = cv2.cvtColor(img, cv2.COLOR_BGR2HSV)
 
-    # Диапазоны цветов в HSV
-    green_mask = cv2.inRange(hsv, (36, 40, 40), (86, 255, 255))
-    yellow_mask = cv2.inRange(hsv, (46, 40, 220), (56, 100, 255))
-
-    brown_mask = cv2.inRange(hsv, (8, 50, 30), (18, 255, 130))
+    # Обновлённые диапазоны HSV (Hue, Saturation, Value)
+    color_ranges = {
+        "green":  ((36, 40, 40), (86, 255, 255)),   # Зелёный
+        "yellow": ((20, 100, 100), (30, 255, 255)),  # Жёлтый
+        "brown":  ((10, 50, 20), (20, 150, 150)),    # Коричневый
+        "orange": ((5, 100, 100), (15, 255, 255))    # Оранжевый
+    }
 
     total_pixels = img.shape[0] * img.shape[1]
+    result = {}
 
-    green_percent = int((cv2.countNonZero(green_mask) / total_pixels) * 100)
-    yellow_percent = int((cv2.countNonZero(yellow_mask) / total_pixels) * 100)
-    brown_percent = int((cv2.countNonZero(brown_mask) / total_pixels) * 100)
-
-    return {
-        "green": green_percent,
-        "yellow": yellow_percent,
-        "brown": brown_percent
-    }
+    for color, (lower, upper) in color_ranges.items():
+        mask = cv2.inRange(hsv, np.array(lower), np.array(upper))
+        percent = int((cv2.countNonZero(mask) / total_pixels) * 100)
+        result[color] = percent
 
+    return result
 
 
 @app.route('/last_image', methods=['GET'])