Merge pull request #271 from tigergraph/restpp-path-same-port-fix

Restpp path same port fix

Author: parkererickson-tg

pyTigerGraph/common/base.py

@@ -168,14 +168,18 @@ def __init__(self, host: str = "http://127.0.0.1", graphname: str = "MyGraph",
 
         restppPort = str(restppPort)
         sslPort = str(sslPort)
-        if self.tgCloud and (restppPort == "9000" or restppPort == "443"):
+        gsPort = str(gsPort)
+        if restppPort == gsPort:
+            self.restppPort = restppPort
+            self.restppUrl = self.host + ":" + restppPort + "/restpp"
+        elif self.tgCloud and (restppPort == "9000" or restppPort == "443"):
             self.restppPort = sslPort
             self.restppUrl = self.host + ":" + sslPort + "/restpp"
         else:
             self.restppPort = restppPort
             self.restppUrl = self.host + ":" + self.restppPort
+            
         self.gsPort = ""
-        gsPort = str(gsPort)
         if self.tgCloud and (gsPort == "14240" or gsPort == "443"):
             self.gsPort = sslPort
             self.gsUrl = self.host + ":" + sslPort

pyTigerGraph/pyTigerGraphBase.py

@@ -184,14 +184,20 @@ def __init__(self, host: str = "http://127.0.0.1", graphname: str = "MyGraph",
                 raise (TigerGraphException("Incorrect graphname."))
 
         restppPort = str(restppPort)
+        gsPort = str(gsPort)
         sslPort = str(sslPort)
-        if self.tgCloud and (restppPort == "9000" or restppPort == "443"):
+        if restppPort == gsPort:
+            self.restppPort = restppPort
+            self.restppUrl = self.host + ":" + restppPort + "/restpp"
+        elif (self.tgCloud and (restppPort == "9000" or restppPort == "443")):
+            if restppPort == gsPort:
+                sslPort = gsPort
             self.restppPort = sslPort
             self.restppUrl = self.host + ":" + sslPort + "/restpp"
         else:
             self.restppPort = restppPort
             self.restppUrl = self.host + ":" + self.restppPort
-        gsPort = str(gsPort)
+        
         self.gsPort = gsPort
         if self.tgCloud and (gsPort == "14240" or gsPort == "443"):
             self.gsPort = sslPort

pyTigerGraph/pytgasync/pyTigerGraphGSQL.py

@@ -55,8 +55,7 @@ async def gsql(self, query: str, graphname: str = None, options=None) -> Union[s
                                   authMode="pwd", resKey=None, skipCheck=True,
                                   jsonResponse=False,
                                   headers={"Content-Type": "text/plain"})
-
-        except httpx.HTTPError as e:
+        except httpx.HTTPStatusError as e:
             if e.response.status_code == 404:
                 res = await self._req("POST",
                                       self.gsUrl + "/gsqlserver/gsql/file",