Merge branch 'dev' into req-24-ios-inspector

Author: mdshakib007

Framework/Built_In_Automation/Database/BuiltInFunctions.py

@@ -246,10 +246,10 @@ def db_get_connection(session_name):
                 port=db_port
             )
         elif "mariadb" in db_type:
-            import mariadb
+            import pymysql
 
             # Connect to db
-            db_con = mariadb.connect(
+            db_con = pymysql.connect(
                 user=db_user_id,
                 password=db_password,
                 database=db_name,

Framework/MainDriverApi.py

@@ -1246,7 +1246,7 @@ def send_dom_variables():
         res = RequestFormatter.request("post",
             RequestFormatter.form_uri("node_ai_contents/"),
             data=json.dumps(data),
-            verify=False
+            timeout=600
         )
         if res.status_code == 500:
             CommonUtil.ExecLog(sModuleInfo, res.json()["info"], 2)
@@ -1465,7 +1465,7 @@ def upload_step_report(run_id: str, tc_id: str, step_seq: int, step_id: int, exe
                     "execution_detail": execution_detail,
                 })
             },
-            verify=False
+            timeout=600
         )
         duration = round(res.elapsed.total_seconds(), 2)
         # if res.status_code == 200:
@@ -1506,17 +1506,18 @@ def upload_reports_and_zips(temp_ini_file, run_id):
                             "post",
                             RequestFormatter.form_uri("create_report_log_api/"),
                             data={"execution_report": json.dumps(tc_report)},
-                            verify=False
+                            timeout=600
                         )
                     else:
                         res = RequestFormatter.request("post",
-                        RequestFormatter.form_uri("create_report_log_api/"),
-                        data={
-                            "execution_report": json.dumps(tc_report),
-                            "processed_tc_id":processed_tc_id
-                        },
-                        files=[("file",perf_report_html)],
-                        verify=False)
+                            RequestFormatter.form_uri("create_report_log_api/"),
+                            data={
+                                "execution_report": json.dumps(tc_report),
+                                "processed_tc_id": processed_tc_id
+                            },
+                            files=[("file", perf_report_html)],
+                            timeout=600
+                        )
 
                     if res.status_code == 200:
                         CommonUtil.ExecLog(sModuleInfo, f"Successfully uploaded the execution report of run_id {run_id}", 1)
@@ -1582,10 +1583,11 @@ def upload_reports_and_zips(temp_ini_file, run_id):
                     for zips in opened_zips:
                         files_list.append(("file",zips))
                     res = RequestFormatter.request("post",
-                        RequestFormatter.form_uri("save_log_and_attachment_api/"),
-                        files=files_list,
-                        data={"machine_name": Userid},
-                        verify=False)
+                            RequestFormatter.form_uri("save_log_and_attachment_api/"),
+                            files=files_list,
+                            data={"machine_name": Userid},
+                            timeout=600
+                        )
                     if res.status_code == 200:
                         try:
                             res_json = res.json()
@@ -1629,19 +1631,21 @@ def retry_failed_report_upload():
                     report_json_path = failed_report_dir / folder / 'report.json'
                     report_json = json.load(open(report_json_path))
                     if not report_json.get('perf_filepath'):
-                        res = RequestFormatter.request("post",
+                        res = RequestFormatter.request(
+                            "post",
                             RequestFormatter.form_uri("create_report_log_api/"),
                             data={"execution_report": report_json.get('execution_report')},
-                            verify=False)
+                            timeout=600
+                        )
                     else:
                         res = RequestFormatter.request("post",
                                     RequestFormatter.form_uri("create_report_log_api/"),
                                     data={"execution_report": report_json.get('execution_report'),
                                         "processed_tc_id":report_json.get('processed_tc_id')
-
-                                        },
+                                    },
                                     files=[("file",open(failed_report_dir / folder / 'files' /report_json.get('perf_filepath'),'rb'))],
-                                    verify=False)
+                                    timeout=600
+                                )
 
                         if res.status_code == 200:
                             CommonUtil.ExecLog(sModuleInfo, f"Successfully uploaded the execution report of run_id {report_json.get('run_id')}", 1)
@@ -1705,7 +1709,7 @@ def download_attachment(attachment_info: Dict[str, Any]):
     file_name = url[file_name_start_pos:]
     file_path = attachment_info["download_dir"] / file_name
 
-    r = RequestFormatter.request("get", url, stream=True)
+    r = RequestFormatter.request("get", url, stream=True, timeout=600)
     if r.status_code == requests.codes.ok:
         with open(file_path, 'wb') as f:
             for data in r.iter_content(chunk_size=512*1024):

Framework/Utilities/RequestFormatter.py

@@ -1,6 +1,6 @@
 # -- coding: utf-8 --
 # -- coding: cp1252 --
-
+import asyncio
 from . import ConfigModule
 import os
 import requests
@@ -169,13 +169,27 @@ def request(*args, **kwargs):
     """
     request() is a wrapper for requests.request which handles automatic session
     management.
+    Default values:
+        verify = False
+        timeout = 70 sec
     """
     renew_token_with_expiry_check()
     if "verify" not in kwargs:
         kwargs["verify"] = False
+    if "timeout" not in kwargs:
+        kwargs["timeout"] = 70
+    
 
     return session.request(*args, **kwargs)
 
+# async wrapper
+async def async_request(*args, **kwargs):
+    """
+    Runs the blocking request() in a worker thread
+    so the event loop is not blocked.
+    """
+    return await asyncio.to_thread(request, *args, **kwargs)
+
 
 def Post(resource_path, payload=None, **kwargs):
     renew_token_with_expiry_check()
@@ -210,16 +224,12 @@ def Get(resource_path, payload=None, **kwargs):
             **kwargs
         ).json()
 
-    except requests.exceptions.RequestException:
-        print(
-            "Exception in UpdateGet: Authentication Failed. Please check your server, username and password. "
-            "Please include full server name. Example: https://zeuz.zeuz.ai.\n"
-            "If you are using IP Address: Type in just the IP without http.  Example: 12.15.10.6"
-        )
+    except requests.exceptions.RequestException as e:
+        print(e)
         return ""
 
     except Exception as e:
-        print("Get Exception: {}".format(e))
+        print(e)
         return {}
 
 

Framework/attachment_db.py

@@ -134,7 +134,7 @@ def download_attachment(self, url: str):
 
             headers = RequestFormatter.add_api_key_to_headers({})
 
-            with RequestFormatter.request("get", url, stream=True, verify=False,**headers) as r:
+            with RequestFormatter.request("get", url, stream=True, timeout=600,**headers) as r:
                 r.raise_for_status()
                 with open(path_to_downloaded_attachment, 'wb') as f:
                     for chunk in r.iter_content(chunk_size=8192):

Framework/deploy_handler/long_poll_handler.py

@@ -9,6 +9,7 @@
 from colorama import Fore
 from pathlib import Path
 from urllib.parse import urlparse
+import requests
 
 from Framework.Utilities import RequestFormatter, ConfigModule, CommonUtil
 from Framework.Utilities.RequestFormatter import REQUEST_TIMEOUT
@@ -237,7 +238,6 @@ def respond_to_key_request(self, request_id: str, private_key_pem: str) -> None:
                     "donor_node_id": node_id,
                     "private_key": private_key_pem
                 },
-                verify=False
             )
 
             if response.ok:
@@ -253,80 +253,74 @@ def respond_to_key_request(self, request_id: str, private_key_pem: str) -> None:
 
     async def run(self, host: str) -> None:
         reconnect = False
-        server_online = False
-        async with httpx.AsyncClient(timeout=httpx.Timeout(70.0), verify=False) as client:
-            while True:
-                if STATE.reconnect_with_credentials is not None:
+        print_online = False
+        while True:
+            if STATE.reconnect_with_credentials is not None:
+                break
+
+            if reconnect:
+                await asyncio.sleep(random.randint(1, 3))
+
+            await self.on_connect_callback(reconnect)
+
+            try:
+                reconnect = True
+                resp = await RequestFormatter.async_request("get", host, timeout=70)
+                if resp is None:
                     break
 
-                if reconnect:
-                    if server_online:
-                        await asyncio.sleep(0.1)
-                    else:
-                        await asyncio.sleep(random.randint(1, 3))
+                if resp.content.startswith(self.ERROR_PREFIX):
+                    self.on_error(resp.content)
+                    continue
 
-                await self.on_connect_callback(reconnect)
+                if resp.ok and print_online:
+                    print_online = False
+                    node_id = CommonUtil.MachineInfo().getLocalUser().lower()
+                    print(f"🟢 {node_id} back to online")
 
-                try:
-                    reconnect = True
-                    resp = await self.fetch(host, client)
-                    if resp is None:
-                        break
-
-                    if resp.content.startswith(self.ERROR_PREFIX):
-                        server_online = False
-                        self.on_error(resp.content)
-                        continue
-
-                    if resp.status_code == httpx.codes.NO_CONTENT:
-                        server_online = False
-                        continue
-
-                    if not resp.is_success:
-                        server_online = False
-                        print(
-                            "[deploy] facing difficulty communicating with the server, status code:",
-                            resp.status_code,
-                            " | reconnecting",
-                        )
-                        try:
-                            print(Fore.YELLOW + str(resp.content))
-                        except Exception:
-                            pass
-
-                        # Encountered a server error, retry.
-                        await asyncio.sleep(random.randint(1, 3))
-                        return
-
-                    should_quit = await self.on_message(resp.content)
-                    if should_quit:
-                        break
-
-                    reconnect = False
-                    server_online = True
-                except httpx.ReadTimeout:
-                    pass
-                except Exception:
-                    traceback.print_exc()
-                    print("[deploy] RETRYING...")
-
-    async def fetch(self, host: str, client: httpx.AsyncClient) -> httpx.Response | None:
-        try:
-            api_key = ConfigModule.get_config_value("Authentication", "api-key")
-            headers = {"X-API-KEY": api_key}
-            
-            while True:
+                if resp.status_code == httpx.codes.NO_CONTENT:
+                    continue
+
+                if resp.status_code == httpx.codes.BAD_GATEWAY:
+                    print_online = True
+                    print(Fore.YELLOW + "Server offline. Retrying after 30s")
+                    await asyncio.sleep(30)
+                    continue
+
+                if not resp.ok:
+                    print(
+                        "[deploy] Request Error, status code:",
+                        resp.status_code,
+                        "| reconnecting",
+                    )
+
+                    # Encountered a server error, retry.
+                    await asyncio.sleep(random.randint(1, 3))
+                    continue
+
+                should_quit = await self.on_message(resp.content)
+                if should_quit:
+                    break
+
+                reconnect = False
+            except (
+                requests.exceptions.ConnectTimeout,
+                requests.exceptions.ReadTimeout,
+                requests.exceptions.ConnectionError,
+            ) as e:
+                # Nginx down, VM down, network issue, docker-compose stopped
                 if STATE.reconnect_with_credentials is not None:
                     return None
-                
-                try:
-                    resp = await client.get(host, headers=headers)
-                    return resp
-                except asyncio.CancelledError:
+                print_online = True
+                print(e)
+                print(Fore.YELLOW + "Retrying after 30s")
+                await asyncio.sleep(30)
+
+            except Exception as e:
+                if STATE.reconnect_with_credentials is not None:
                     return None
-                except Exception:
-                    if STATE.reconnect_with_credentials is not None:
-                        return None
-                    await asyncio.sleep(0.1)
-        except Exception:
-            return None
+                print_online = True
+                print(e)
+                print(Fore.YELLOW + "Retrying after 30s")
+                await asyncio.sleep(30)
+

Framework/install_handler/android/adb.py

@@ -3,55 +3,15 @@
 import platform
 import os
 from Framework.install_handler.utils import send_response
+from Framework.install_handler.android.android_sdk import update_android_sdk_path
 
 
 async def check_status() -> bool:
    """Check if ADB (Android Debug Bridge) is installed."""
    print("[installer][android-adb] Checking status...")
 
-   # Dynamically refresh ANDROID_HOME and PATH from registry on Windows
-   system = platform.system()
-   if system == "Windows":
-       try:
-           import winreg
-           with winreg.OpenKey(winreg.HKEY_CURRENT_USER, r"Environment", 0, winreg.KEY_READ) as key:
-               try:
-                   android_home_reg, _ = winreg.QueryValueEx(key, "ANDROID_HOME")
-                   if android_home_reg:
-                       # Expand environment variables before checking if path exists
-                       android_home_expanded = os.path.expandvars(android_home_reg)
-                       if os.path.exists(android_home_expanded):
-                           os.environ['ANDROID_HOME'] = android_home_expanded
-                           # Update PATH with platform-tools (where ADB is located)
-                           platform_tools = os.path.join(android_home_expanded, "platform-tools")
-                           current_path = os.environ.get('PATH', '')
-                           if platform_tools not in current_path:
-                               os.environ['PATH'] = f"{platform_tools};{current_path}"
-                           print(f"[installer][android-adb] Refreshed ANDROID_HOME from registry: {android_home_expanded}")
-               except FileNotFoundError:
-                   pass
-               
-               # Also check ANDROID_SDK_ROOT if ANDROID_HOME not found
-               if 'ANDROID_HOME' not in os.environ or not os.path.exists(os.environ.get('ANDROID_HOME', '')):
-                   try:
-                       android_sdk_root_reg, _ = winreg.QueryValueEx(key, "ANDROID_SDK_ROOT")
-                       if android_sdk_root_reg:
-                           # Expand environment variables before checking if path exists
-                           android_sdk_root_expanded = os.path.expandvars(android_sdk_root_reg)
-                           if os.path.exists(android_sdk_root_expanded):
-                               os.environ['ANDROID_SDK_ROOT'] = android_sdk_root_expanded
-                               # Update PATH with platform-tools (where ADB is located)
-                               platform_tools = os.path.join(android_sdk_root_expanded, "platform-tools")
-                               current_path = os.environ.get('PATH', '')
-                               if platform_tools not in current_path:
-                                   os.environ['PATH'] = f"{platform_tools};{current_path}"
-                               print(f"[installer][android-adb] Refreshed ANDROID_SDK_ROOT from registry: {android_sdk_root_expanded}")
-                   except FileNotFoundError:
-                       pass
-       except Exception as e:
-           print(f"[installer][android-adb] Failed to refresh from registry: {e}")
-  
    try:
+
        loop = asyncio.get_event_loop()
        result = await loop.run_in_executor(
            None,