phyloforfun commited on
Commit
c6a70af
1 Parent(s): ae215ea

Major update. Support for 15 LLMs, World Flora Online taxonomy validation, geolocation, 2 OCR methods, significant UI changes, stability improvements, consistent JSON parsing

Browse files
.gitignore CHANGED
@@ -7,10 +7,19 @@ yolov8x-pose.pt
7
  yolov8n.pt
8
  *PRIVATE_DATA*
9
 
 
 
 
 
 
10
 
11
  # Dirs
 
12
  demo/demo_output/*
13
  demo/demo_configs/*
 
 
 
14
  wandb/
15
  venv_LM2_linux/
16
  venv_LM2_l/
@@ -18,20 +27,25 @@ venv_LM2_310/
18
  venv_LM2_38/
19
  venv_LM2/
20
  venv_VV/
 
 
21
  tests/
22
- uploads/
23
- uploads_small/
24
  .vscode/
25
  runs/
26
  KP_Test/
27
 
28
  # VV Specific
 
 
 
 
29
  demo/demo_output/*
30
  demo/validation_configs/*
31
  /bin/*
32
  !/bin/version.yml
33
  release*
34
  expense_report/*
 
35
  leafmachine2/*/.gitignore
36
 
37
  /bin/*
 
7
  yolov8n.pt
8
  *PRIVATE_DATA*
9
 
10
+ # Prompts
11
+ /custom_prompts/*
12
+ !/custom_prompts/SLTPvA_long.yaml
13
+ !/custom_prompts/SLTPvA_medium.yaml
14
+ !/custom_prompts/SLTPvA_short.yaml
15
 
16
  # Dirs
17
+ custom_prompts_deprecated/
18
  demo/demo_output/*
19
  demo/demo_configs/*
20
+ uploads/*
21
+ uploads_small/*
22
+ settings/*
23
  wandb/
24
  venv_LM2_linux/
25
  venv_LM2_l/
 
27
  venv_LM2_38/
28
  venv_LM2/
29
  venv_VV/
30
+ venv*/
31
+ .venv*/
32
  tests/
 
 
33
  .vscode/
34
  runs/
35
  KP_Test/
36
 
37
  # VV Specific
38
+ vouchervision/DEP_*
39
+ SLTP_Demo/
40
+ .streamlit/secrets.toml
41
+ **/secrets.toml
42
  demo/demo_output/*
43
  demo/validation_configs/*
44
  /bin/*
45
  !/bin/version.yml
46
  release*
47
  expense_report/*
48
+
49
  leafmachine2/*/.gitignore
50
 
51
  /bin/*
vouchervision/OCR_google_cloud_vision.py CHANGED
@@ -731,6 +731,10 @@ class OCREngine:
731
  else:
732
  self.OCR = self.OCR + "\ntrOCR:\n" + self.detect_text_with_trOCR_using_google_bboxes(self.do_use_trOCR, logger)
733
  # logger.info(f"OCR:\n{self.OCR}")
 
 
 
 
734
 
735
  if do_create_OCR_helper_image and ('LLaVA' not in self.OCR_option):
736
  self.image = Image.open(self.path)
 
731
  else:
732
  self.OCR = self.OCR + "\ntrOCR:\n" + self.detect_text_with_trOCR_using_google_bboxes(self.do_use_trOCR, logger)
733
  # logger.info(f"OCR:\n{self.OCR}")
734
+ else:
735
+ # populate self.OCR_JSON_to_file = {}
736
+ _ = self.detect_text_with_trOCR_using_google_bboxes(self.do_use_trOCR, logger)
737
+
738
 
739
  if do_create_OCR_helper_image and ('LLaVA' not in self.OCR_option):
740
  self.image = Image.open(self.path)