Update app.py

app.py

@@ -21,17 +21,24 @@ def preprocess_image_for_ocr(image):
 
 
 
+import re
+
 def extract_medication_lines(text):
     """
-    Extracts medicine lines with possible decimals in dose (e.g., 2.5MG), with or without explicit dose.
+    Extracts medication lines robustly:
+    - Matches form as T./TAB./TAB/TABLET/TABLETS, C./CAP./CAP/CAPSULE/CAPSULES, etc.
+    - Floating/slash doses (e.g., 2.5MG, 10/20MG)
+    - Optional second form (prefix/suffix/mid)
+    - Any case
     """
-    form = r"(TAB(L?ET)?|CAP(SULE)?|SYRUP|SYP|DROP(S)?|INJ(CTION)?|OINTMENT|CREAM|GEL|PATCH|SOL(UTION)?|ORAL)"
+    # Comprehensive form pattern (optional . or plural S)
+    form = r"(T\.?|TAB\.?|TABLET(S)?|C\.?|CAP\.?|CAPSULE(S)?|SYRUP(S)?|SYP|DROP(S)?|INJ\.?|INJECTION(S)?|OINTMENT(S)?|CREAM(S)?|GEL(S)?|PATCH(ES)?|SOL\.?|SOLUTION(S)?|ORAL)"
     name = r"([A-Z0-9\-/]+(?:\s+[A-Z0-9\-/]+){0,4})"
-    opt_form = fr"(?:\s+{form})?"                 # form can repeat at end
-    # Now dose accepts decimal e.g. 2.5MG and number/slash (e.g. 20/50MG)
-    opt_dose = r"(?:\s*\d{1,4}(?:\.\d+)?(?:/\d{1,4}(?:\.\d+)?)?\s*(mg|ml|mcg|g|kg|units|IU|%|))?"
+    opt_form = fr"(?:\s+{form})?"  # allow form at end as well
+    # Dose: decimal numbers, slash combos, unit, or blank
+    opt_dose = r"(?:\s*\d{1,4}(?:\.\d+)?(?:/\d{1,4}(?:\.\d+)?)?\s*(mg|ml|mcg|g|kg|units|iu|%|))?"
 
-    pat = re.compile(
+    pattern = re.compile(
         fr"\b{form}\s+{name}{opt_form}{opt_dose}\b",
         re.IGNORECASE
     )
@@ -40,7 +47,7 @@ def extract_medication_lines(text):
     matches = set()
     for line in lines:
         line = line.strip()
-        for m in pat.finditer(line):
+        for m in pattern.finditer(line):
             out = m.group(0)
             out = re.sub(r"\s+", " ", out).strip()
             matches.add(out.upper())