Update API.py

Author: prostraction

whatsapp_api_client_python/API.py

@@ -27,15 +27,15 @@ class GreenApi:
     media: str
     idInstance: str
     apiTokenInstance: str
-    directHost: bool #Flag for determining and using a direct host
+    useDirectHost: bool
 
     def __init__(
             self,
             idInstance: str,
             apiTokenInstance: str,
             debug_mode: bool = False,
             raise_errors: bool = False,
-            directHost: bool = False,
+            useDirectHost: bool = False,
             host: str = "https://api.green-api.com",
             media: str = "https://media.green-api.com",
             host_timeout: float = 180, # sec per retry
@@ -45,12 +45,8 @@ def __init__(
         self.media = media
         self.debug_mode = debug_mode
         self.raise_errors = raise_errors
-        self.directHost = directHost
-        if self.directHost:
-            self.host, self.media = self._determine_host(idInstance)
-        else:
-            self.host = host
-            self.media = media
+        self.useDirectHost = useDirectHost
+        self.host, self.media = self._determine_host(idInstance) if self.useDirectHost else (host, media)
 
         self.host_timeout = host_timeout
         self.media_timeout = media_timeout
@@ -76,14 +72,15 @@ def __init__(
         self.logger = logging.getLogger("whatsapp-api-client-python")
         self.__prepare_logger()
 
-    def _determine_host(self, idInstance: str) -> str: #Method for determining a direct host
+    def _determine_host(self, idInstance: str) -> str:
         mapping = {
-            "1103": (f"https://{idInstance[:4]}.api.green-api.com", f"https://{idInstance[:4]}.media.green-api.com"),
+            "1103": (f"https://1103.api.green-api.com", f"https://1103.media.green-api.com"),
             "1104": (f"https://1103.api.green-api.com", f"https://1103.media.green-api.com"),
-            "5700": (f"https://{idInstance[:4]}.api.green-api.com", f"https://{idInstance[:4]}.media.green-api.com") ,
+            "5700": (f"https://5700.api.green-api.com", f"https://5700.media.green-api.com"),
+            "7103": ("https://7103.api.greenapi.com", "https://7103.media.greenapi.com"),
+            "7105": ("https://7105.api.greenapi.com", "https://7105.media.greenapi.com"),
             "7723": ("https://7700.api.greenapi.com", "https://7700.media.greenapi.com"),
-            "7726": ("https://api.greenapi.com", "https://media.greenapi.com"),
-            "7": (f"https://{idInstance[:4]}.api.greenapi.com", f"https://{idInstance[:4]}.media.greenapi.com")
+            "7726": ("https://api.greenapi.com", "https://media.greenapi.com")
         }
         return next((url for key, url in mapping.items() if idInstance.startswith(key)), ("https://api.green-api.com", "https://media.green-api.com"))
 
@@ -231,4 +228,4 @@ def request(
 
         url = url.replace("{{partnerToken}}", self.partnerToken)
 
-        return super().request(method, url, payload, files)
+        return super().request(method, url, payload, files)