solve conflict

app.py

@@ -6,7 +6,9 @@ import json
 import requests
 import time
 from concurrent.futures import ThreadPoolExecutor
-from utils import is_chinese, process_image_without_resize, parse_response, templates_agent_cogagent, template_grounding_cogvlm, postprocess_text
+from PIL import Image
+import base64
+import hashlib
 
 DESCRIPTION = '''<h2 style='text-align: center'> <a href="https://github.com/THUDM/CogVLM2"> CogVLM2 </a></h2>'''
 
@@ -14,11 +16,26 @@ NOTES = 'This app is adapted from <a href="https://github.com/THUDM/CogVLM">http
 
 MAINTENANCE_NOTICE1 = 'Hint 1: If the app report "Something went wrong, connection error out", please turn off your proxy and retry.<br>Hint 2: If you upload a large size of image like 10MB, it may take some time to upload and process. Please be patient and wait.'
 
-
 default_chatbox = [("", "Hi, What do you want to know about this image?")]
 
 URL = os.environ.get("URL")
 
+def process_image_without_resize(image_prompt):
+    image = Image.open(image_prompt)
+    print(f"height:{image.height}, width:{image.width}")
+    timestamp = time.time()
+    file_ext = os.path.splitext(image_prompt)[1]
+    filename = f"examples/{timestamp}{file_ext}"
+    filename_grounding = f"examples/{timestamp}_grounding{file_ext}"
+    image.save(filename)
+    print(f"temporal filename {filename}")
+    with open(filename, "rb") as image_file:
+        bytes = base64.b64encode(image_file.read())
+        encoded_img = str(bytes, encoding='utf-8')
+        image_hash = hashlib.sha256(bytes).hexdigest()
+        os.remove(filename)
+        return image, encoded_img, image_hash, filename_grounding
+
 
 def make_request(URL, headers, data):
     response = requests.request("POST", URL, headers=headers, data=data, timeout=(60, 100))

requirements.txt

@@ -2,5 +2,4 @@ gradio==4.29.0
 seaborn
 Pillow
 matplotlib
-spacy==3.6.0
 requests