updates

app.py

@@ -5,7 +5,7 @@ import plotly.graph_objs as go
 from PIL import Image
 import pandas as pd
 from io import BytesIO
-from streamlit_extras.let_it_rain import rain
+# from streamlit_extras.let_it_rain import rain
 from annotated_text import annotated_text
 
 from vouchervision.LeafMachine2_Config_Builder import write_config_file
@@ -17,7 +17,7 @@ from vouchervision.API_validation import APIvalidation
 from vouchervision.utils_hf import setup_streamlit_config, save_uploaded_file, save_uploaded_local, save_uploaded_file_local
 from vouchervision.data_project import convert_pdf_to_jpg
 from vouchervision.utils_LLM import check_system_gpus
-from vouchervision.OCR_google_cloud_vision import check_for_inappropriate_content
+from vouchervision.OCR_google_cloud_vision import SafetyCheck
 
 import cProfile
 import pstats
@@ -255,6 +255,7 @@ def load_gallery(converted_files, uploaded_file):
 
 @st.cache_data
 def handle_image_upload_and_gallery_hf(uploaded_files):
+    SAFE = SafetyCheck(st.session_state['is_hf'])
     if uploaded_files:
         
         # Clear input image gallery and input list
@@ -263,7 +264,7 @@ def handle_image_upload_and_gallery_hf(uploaded_files):
         ind_small = 0
         for uploaded_file in uploaded_files:
 
-            if check_for_inappropriate_content(uploaded_file):
+            if SAFE.check_for_inappropriate_content(uploaded_file):
                 clear_image_uploads()
                 st.error("Warning: You have uploaded an inappropriate image")
                 return True
@@ -883,7 +884,7 @@ def display_test_results(test_results, JSON_results, llm_version):
     # success_count = sum(1 for result in test_results.values() if result)
     # failure_count = len(test_results) - success_count
     # proportional_rain("🥇", success_count, "💔", failure_count, font_size=72, falling_speed=5, animation_length="infinite")
-    rain_emojis(test_results)
+    # rain_emojis(test_results)
 
 
 
@@ -892,44 +893,44 @@ def add_emoji_delay():
 
 
 
-def rain_emojis(test_results):
-    # test_results = {
-    #     'test1': True,   # Test passed
-    #     'test2': True,   # Test passed
-    #     'test3': True,   # Test passed
-    #     'test4': False,  # Test failed
-    #     'test5': False,  # Test failed
-    #     'test6': False,  # Test failed
-    #     'test7': False,  # Test failed
-    #     'test8': False,  # Test failed
-    #     'test9': False,  # Test failed
-    #     'test10': False,  # Test failed
-    # }
-    success_emojis = ["🥇", "🏆", "🍾", "🙌"]
-    failure_emojis = ["💔", "😭"]
-
-    success_count = sum(1 for result in test_results.values() if result)
-    failure_count = len(test_results) - success_count
-
-    chosen_emoji = random.choice(success_emojis)
-    for _ in range(success_count):
-        rain(
-            emoji=chosen_emoji,
-            font_size=72,
-            falling_speed=4,
-            animation_length=2,
-        )
-        add_emoji_delay()
-
-    chosen_emoji = random.choice(failure_emojis)
-    for _ in range(failure_count):
-        rain(
-            emoji=chosen_emoji,
-            font_size=72,
-            falling_speed=5,
-            animation_length=1,
-        )
-        add_emoji_delay()
+# def rain_emojis(test_results):
+#     # test_results = {
+#     #     'test1': True,   # Test passed
+#     #     'test2': True,   # Test passed
+#     #     'test3': True,   # Test passed
+#     #     'test4': False,  # Test failed
+#     #     'test5': False,  # Test failed
+#     #     'test6': False,  # Test failed
+#     #     'test7': False,  # Test failed
+#     #     'test8': False,  # Test failed
+#     #     'test9': False,  # Test failed
+#     #     'test10': False,  # Test failed
+#     # }
+#     success_emojis = ["🥇", "🏆", "🍾", "🙌"]
+#     failure_emojis = ["💔", "😭"]
+
+#     success_count = sum(1 for result in test_results.values() if result)
+#     failure_count = len(test_results) - success_count
+
+#     chosen_emoji = random.choice(success_emojis)
+#     for _ in range(success_count):
+#         rain(
+#             emoji=chosen_emoji,
+#             font_size=72,
+#             falling_speed=4,
+#             animation_length=2,
+#         )
+#         add_emoji_delay()
+
+#     chosen_emoji = random.choice(failure_emojis)
+#     for _ in range(failure_count):
+#         rain(
+#             emoji=chosen_emoji,
+#             font_size=72,
+#             falling_speed=5,
+#             animation_length=1,
+#         )
+#         add_emoji_delay()
 
 
 

vouchervision/OCR_google_cloud_vision.py

@@ -792,18 +792,35 @@ class OCREngine:
         except:
             pass
 
-def check_for_inappropriate_content(file_stream):
-    client = vision.ImageAnnotatorClient()
-
-    content = file_stream.read()
-    image = vision.Image(content=content)
-    response = client.safe_search_detection(image=image)
-    safe = response.safe_search_annotation
-
-    # Check the levels of adult, violence, racy, etc. content.
-    if (safe.adult > vision.Likelihood.POSSIBLE or
-        safe.violence > vision.Likelihood.POSSIBLE or
-        safe.racy > vision.Likelihood.POSSIBLE):
-        return True  # The image violates safe search guidelines.
+class SafetyCheck():
+    def __init__(self, is_hf) -> None:
+        self.is_hf = is_hf
+        self.set_client()
+
+    def set_client(self):
+        if self.is_hf:
+            self.client = vision.ImageAnnotatorClient(credentials=self.get_google_credentials())
+        else:
+            self.client = vision.ImageAnnotatorClient(credentials=self.get_google_credentials())
+
+
+    def get_google_credentials(self):
+        creds_json_str = os.getenv('GOOGLE_APPLICATION_CREDENTIALS')
+        credentials = service_account.Credentials.from_service_account_info(json.loads(creds_json_str))
+        return credentials
     
-    return False  # The image is considered safe.
+    def check_for_inappropriate_content(self, file_stream):
+        self.client = vision.ImageAnnotatorClient()
+
+        content = file_stream.read()
+        image = vision.Image(content=content)
+        response = self.client.safe_search_detection(image=image)
+        safe = response.safe_search_annotation
+
+        # Check the levels of adult, violence, racy, etc. content.
+        if (safe.adult > vision.Likelihood.POSSIBLE or
+            safe.violence > vision.Likelihood.POSSIBLE or
+            safe.racy > vision.Likelihood.POSSIBLE):
+            return True  # The image violates safe search guidelines.
+        
+        return False  # The image is considered safe.