Merge pull request #131 from taosdata/fix/sunpeng/TS-2701-fix-rest-and-ws-for-cloud

fix: fix rest and ws for cloud

Author: sunpe

taos-ws-py/src/lib.rs

@@ -263,12 +263,12 @@ fn connect(
                 dsn.protocol = Some(scheme.extract::<String>()?);
             }
         } else if let Some(native) = args.get_item("native") {
-            _ = native;
+            let _ = native;
         } else if dsn.protocol.is_none() {
             dsn.protocol.replace("ws".to_string());
         }
 
-        let host = args.get_item("ip").or(args.get_item("database"));
+        let host = args.get_item("host").or(args.get_item("ip"));
         let port = args.get_item("port");
         match (host, port) {
             (Some(host), Some(port)) => {
@@ -304,6 +304,7 @@ fn connect(
         {
             dsn.set(key.extract::<&str>()?, value.extract::<&str>()?);
         }
+        dsn.addresses.push(addr);
     }
 
     let builder =

taosrest/sqlalchemy.py

@@ -9,13 +9,23 @@ class AlchemyRestConnection:
     Error = taosrest.Error
 
     def connect(self, **kwargs):
-        host = kwargs["host"] if "host" in kwargs else "localhost"
-        port = kwargs["port"] if "port" in kwargs else "6041"
+        host = kwargs["host"] if "host" in kwargs else None
+        port = kwargs["port"] if "port" in kwargs else None
         user = kwargs["username"] if "username" in kwargs else "root"
         password = kwargs["password"] if "password" in kwargs else "taosdata"
         database = kwargs["database"] if "database" in kwargs else None
-        url = f"http://{host}:{port}"
-        return taosrest.connect(url=url, user=user, password=password, database=database)
+        token = kwargs["token"] if "token" in kwargs else None
+
+        if not host and not port:
+            host = 'localhost'
+            port = 6041
+        if not host:
+            host = 'localhost'
+
+        url = f"http://{host}"
+        if port:
+            url += f':{port}'
+        return taosrest.connect(url=url, user=user, password=password, database=database, token=token)
 
 
 class TaosRestDialect(default.DefaultDialect):