Update ocr_engine.py

ocr_engine.py

@@ -93,7 +93,7 @@ def detect_roi(img):
         logging.info("No suitable ROI found, attempting fallback criteria.")
         # Fallback with relaxed criteria
         valid_contours = [c for c in contours if 500 < cv2.contourArea(c) < (img_area * 0.95) and 
-                        0.8 <= cv2.boundingRect(c)[2]/cv2.boundingRect(c)[3] <= 12.0]
+                          0.8 <= cv2.boundingRect(c)[2]/cv2.boundingRect(c)[3] <= 12.0]
         if valid_contours:
             contour = max(valid_contours, key=cv2.contourArea)
             x, y, w, h = cv2.boundingRect(contour)
@@ -254,11 +254,11 @@ def extract_weight_from_image(pil_img):
 
         brightness = estimate_brightness(img)
         conf_threshold = 0.7 if brightness > 150 else (0.6 if brightness > 80 else 0.4)
-        if roi_bbox := detect_roi(img)[1]:
+        roi_img, roi_bbox = detect_roi(img)
+        if roi_bbox:
             roi_area = roi_bbox[2] * roi_bbox[3]
             conf_threshold *= 1.2 if roi_area > (img.shape[0] * img.shape[1] * 0.5) else 1.0
 
-        roi_img, roi_bbox = detect_roi(img)
         custom_result = custom_seven_segment_ocr(roi_img, roi_bbox)
         if custom_result:
             try:
@@ -285,4 +285,76 @@ def extract_weight_from_image(pil_img):
         results = easyocr_reader.readtext(final_roi, detail=1, paragraph=False, 
                                           contrast_ths=0.4, adjust_contrast=1.2, 
                                           text_threshold=0.5, mag_ratio=4.0, 
-                                          allowlist='0123456789. kglb', batch_size=batch Horrible error: invalid syntax
+                                          allowlist='0123456789. kglb', batch_size=batch_size, y_ths=0.2)
+
+        best_weight = None
+        best_conf = 0.0
+        best_score = 0.0
+        unit = None
+        for (bbox, text, conf) in results:
+            if 'kg' in text.lower():
+                unit = 'kg'
+                continue
+            elif 'g' in text.lower():
+                unit = 'g'
+                continue
+            elif 'lb' in text.lower():
+                unit = 'lb'
+                continue
+            text = re.sub(r"[^\d\.]", "", text)
+            if text.count('.') > 1:
+                text = text.replace('.', '', text.count('.') - 1)
+            text = text.strip('.')
+            if re.fullmatch(r"^\d*\.?\d*$", text):
+                try:
+                    weight = float(text)
+                    if unit == 'g':
+                        weight /= 1000  # Convert grams to kilograms
+                    elif unit == 'lb':
+                        weight *= 0.453592  # Convert pounds to kilograms
+                    range_score = 1.5 if 0.01 <= weight <= 500 else 0.8
+                    digit_count = len(text.replace('.', ''))
+                    digit_score = 1.3 if 2 <= digit_count <= 6 else 0.9
+                    score = conf * range_score * digit_score
+                    if roi_bbox:
+                        (x_roi, y_roi, w_roi, h_roi) = roi_bbox
+                        roi_area = w_roi * h_roi
+                        x_min, y_min = int(min(b[0] for b in bbox)), int(min(b[1] for b in bbox))
+                        x_max, y_max = int(max(b[0] for b in bbox)), int(max(b[1] for b in bbox))
+                        bbox_area = (x_max - x_min) * (y_max - y_min)
+                        if roi_area > 0 and bbox_area / roi_area < 0.05:
+                            score *= 0.6
+                    if score > best_score and conf > conf_threshold:
+                        best_weight = text
+                        best_conf = conf
+                        best_score = score
+                        logging.info(f"Candidate EasyOCR weight: '{text}', Unit: {unit or 'none'}, Conf: {conf}, Score: {score}")
+                except ValueError:
+                    logging.warning(f"Could not convert '{text}' to float during EasyOCR fallback.")
+
+        if not best_weight:
+            logging.info("No valid weight detected after all attempts.")
+            return "Not detected", 0.0
+
+        # Format the weight
+        if "." in best_weight:
+            int_part, dec_part = best_weight.split(".")
+            int_part = int_part.lstrip("0") or "0"
+            dec_part = dec_part.rstrip('0')
+            best_weight = f"{int_part}.{dec_part}" if dec_part else int_part
+        else:
+            best_weight = best_weight.lstrip('0') or "0"
+
+        try:
+            final_weight = float(best_weight)
+            if final_weight < 0.01 or final_weight > 500:
+                best_conf *= 0.7
+        except ValueError:
+            pass
+
+        logging.info(f"Final detected weight: {best_weight}, Unit: {unit or 'none'}, Confidence: {round(best_conf * 100, 2)}%")
+        return best_weight, round(best_conf * 100, 2)
+
+    except Exception as e:
+        logging.error(f"Weight extraction failed unexpectedly: {str(e)}")
+        return "Not detected", 0.0