logging

app.py

@@ -18,7 +18,34 @@ from common import (
     REPO_DIR,
     SERVER_URL,
 )
-from client_server_interface import FHEClient
+
+import requests
+from requests.adapters import HTTPAdapter
+from requests.packages.urllib3.util.retry import Retry
+import logging
+
+# Set up logging
+logging.basicConfig(level=logging.DEBUG)
+logger = logging.getLogger(__name__)
+
+def requests_retry_session(
+    retries=3,
+    backoff_factor=0.3,
+    status_forcelist=(500, 502, 504),
+    session=None,
+):
+    session = session or requests.Session()
+    retry = Retry(
+        total=retries,
+        read=retries,
+        connect=retries,
+        backoff_factor=backoff_factor,
+        status_forcelist=status_forcelist,
+    )
+    adapter = HTTPAdapter(max_retries=retry)
+    session.mount('http://', adapter)
+    session.mount('https://', adapter)
+    return session
 
 # Uncomment here to have both the server and client in the same terminal
 subprocess.Popen(["uvicorn", "server:app"], cwd=REPO_DIR)
@@ -222,19 +249,26 @@ def run_fhe(user_id):
     url = SERVER_URL + "run_fhe"
     
     try:
-        with requests.post(url=url, data=data, timeout=120) as response:
+        logger.info(f"Sending request to {url} with user_id: {user_id}")
+        with requests_retry_session().post(url=url, data=data, timeout=300) as response:
+            logger.info(f"Received response with status code: {response.status_code}")
             response.raise_for_status()  # Raises an HTTPError for bad responses
             if response.ok:
                 return response.json()
             else:
+                logger.error(f"Server responded with status code {response.status_code}")
                 raise gr.Error(f"Server responded with status code {response.status_code}")
     except requests.exceptions.Timeout:
+        logger.error("The request timed out. The server might be overloaded.")
         raise gr.Error("The request timed out. The server might be overloaded.")
-    except requests.exceptions.ConnectionError:
+    except requests.exceptions.ConnectionError as e:
+        logger.error(f"Failed to connect to the server. Error: {str(e)}")
         raise gr.Error("Failed to connect to the server. Please check your network connection.")
     except requests.exceptions.RequestException as e:
+        logger.error(f"An error occurred: {str(e)}")
         raise gr.Error(f"An error occurred: {str(e)}")
     except Exception as e:
+        logger.error(f"An unexpected error occurred: {str(e)}")
         raise gr.Error(f"An unexpected error occurred: {str(e)}")
 
 def get_output(user_id):