Merge pull request #46 from jinxiaotian1/master

[UPDATE] 请求修改为连接池方式
yidun · Jul 17, 2024 · 0a1dac6 · 0a1dac6
2 parents 9040de6 + e6eec0a
commit 0a1dac6
Show file tree

Hide file tree

Showing 69 changed files with 828 additions and 345 deletions.
diff --git a/aigc/aigc_stream_callback.py b/aigc/aigc_stream_callback.py
@@ -14,8 +14,8 @@
 import hashlib
 import time
 import random
-import urllib.request as urlrequest
-import urllib.parse as urlparse
+import urllib3
+from urllib.parse import urlencode
 import json
 from gmssl import sm3, func
 
@@ -34,6 +34,7 @@ def __init__(self, secret_id, secret_key):
         """
         self.secret_id = secret_id
         self.secret_key = secret_key
+        self.http = urllib3.PoolManager()  # 初始化连接池
 
     def gen_signature(self, params=None):
         """生成签名信息
@@ -65,9 +66,15 @@ def check(self):
         params["signature"] = self.gen_signature(params)
 
         try:
-            params = urlparse.urlencode(params).encode("utf8")
-            request = urlrequest.Request(self.API_URL, params)
-            content = urlrequest.urlopen(request, timeout=10).read()
+            encoded_params = urlencode(params).encode("utf8")
+            response = self.http.request(
+                'POST',
+                self.API_URL,
+                body=encoded_params,
+                headers={'Content-Type': 'application/x-www-form-urlencoded'},
+                timeout=urllib3.Timeout(connect=10, read=10)
+            )
+            content = response.data
             return json.loads(content)
         except Exception as ex:
             print("调用API接口失败:", str(ex))

diff --git a/aigc/aigc_stream_push.py b/aigc/aigc_stream_push.py
@@ -14,8 +14,8 @@
 import hashlib
 import time
 import random
-import urllib.request as urlrequest
-import urllib.parse as urlparse
+import urllib3
+from urllib.parse import urlencode
 import json
 from gmssl import sm3, func
 
@@ -34,6 +34,7 @@ def __init__(self, secret_id, secret_key):
         """
         self.secret_id = secret_id
         self.secret_key = secret_key
+        self.http = urllib3.PoolManager()  # 初始化连接池
 
     def gen_signature(self, params=None):
         """生成签名信息
@@ -66,9 +67,15 @@ def check(self, params):
         params["signature"] = self.gen_signature(params)
 
         try:
-            params = urlparse.urlencode(params).encode("utf8")
-            request = urlrequest.Request(self.API_URL, params)
-            content = urlrequest.urlopen(request, timeout=10).read()
+            encoded_params = urlencode(params).encode("utf8")
+            response = self.http.request(
+                'POST',
+                self.API_URL,
+                body=encoded_params,
+                headers={'Content-Type': 'application/x-www-form-urlencoded'},
+                timeout=urllib3.Timeout(connect=10, read=10)
+            )
+            content = response.data
             return json.loads(content)
         except Exception as ex:
             print("调用API接口失败:", str(ex))

diff --git a/audio/audio_callback.py b/audio/audio_callback.py
@@ -15,8 +15,8 @@
 import hashlib
 import time
 import random
-import urllib.request as urlrequest
-import urllib.parse as urlparse
+import urllib3
+from urllib.parse import urlencode
 import json
 from gmssl import sm3, func
 
@@ -37,6 +37,7 @@ def __init__(self, secret_id, secret_key, business_id):
         self.secret_id = secret_id
         self.secret_key = secret_key
         self.business_id = business_id
+        self.http = urllib3.PoolManager()  # 初始化连接池
 
     def gen_signature(self, params=None):
         """生成签名信息
@@ -69,9 +70,15 @@ def check(self):
         params["signature"] = self.gen_signature(params)
 
         try:
-            params = urlparse.urlencode(params).encode("utf8")
-            request = urlrequest.Request(self.API_URL, params)
-            content = urlrequest.urlopen(request, timeout=10).read()
+            encoded_params = urlencode(params).encode("utf8")
+            response = self.http.request(
+                'POST',
+                self.API_URL,
+                body=encoded_params,
+                headers={'Content-Type': 'application/x-www-form-urlencoded'},
+                timeout=urllib3.Timeout(connect=10, read=10)
+            )
+            content = response.data
             return json.loads(content)
         except Exception as ex:
             print("调用API接口失败:", str(ex))

diff --git a/audio/audio_check.py b/audio/audio_check.py
@@ -15,8 +15,8 @@
 import hashlib
 import time
 import random
-import urllib.request as urlrequest
-import urllib.parse as urlparse
+import urllib3
+from urllib.parse import urlencode
 import json
 from gmssl import sm3, func
 
@@ -37,6 +37,7 @@ def __init__(self, secret_id, secret_key, business_id):
         self.secret_id = secret_id
         self.secret_key = secret_key
         self.business_id = business_id
+        self.http = urllib3.PoolManager()  # 初始化连接池
 
     def gen_signature(self, params=None):
         """生成签名信息
@@ -70,9 +71,15 @@ def check(self, params):
         params["signature"] = self.gen_signature(params)
 
         try:
-            params = urlparse.urlencode(params).encode("utf8")
-            request = urlrequest.Request(self.API_URL, params)
-            content = urlrequest.urlopen(request, timeout=1).read()
+            encoded_params = urlencode(params).encode("utf8")
+            response = self.http.request(
+                'POST',
+                self.API_URL,
+                body=encoded_params,
+                headers={'Content-Type': 'application/x-www-form-urlencoded'},
+                timeout=urllib3.Timeout(connect=1.0, read=1.0)
+            )
+            content = response.data
             return json.loads(content)
         except Exception as ex:
             print("调用API接口失败:", str(ex))

diff --git a/audio/audio_query.py b/audio/audio_query.py
@@ -15,8 +15,8 @@
 import hashlib
 import time
 import random
-import urllib.request as urlrequest
-import urllib.parse as urlparse
+import urllib3
+from urllib.parse import urlencode
 import json
 from gmssl import sm3, func
 
@@ -37,6 +37,7 @@ def __init__(self, secret_id, secret_key, business_id):
         self.secret_id = secret_id
         self.secret_key = secret_key
         self.business_id = business_id
+        self.http = urllib3.PoolManager()  # 初始化连接池
 
     def gen_signature(self, params=None):
         """生成签名信息
@@ -70,9 +71,15 @@ def query(self, params):
         params["signature"] = self.gen_signature(params)
 
         try:
-            params = urlparse.urlencode(params).encode("utf8")
-            request = urlrequest.Request(self.API_URL, params)
-            content = urlrequest.urlopen(request, timeout=10).read()
+            encoded_params = urlencode(params).encode("utf8")
+            response = self.http.request(
+                'POST',
+                self.API_URL,
+                body=encoded_params,
+                headers={'Content-Type': 'application/x-www-form-urlencoded'},
+                timeout=urllib3.Timeout(connect=10, read=10)
+            )
+            content = response.data
             return json.loads(content)
         except Exception as ex:
             print("调用API接口失败:", str(ex))

diff --git a/audio/audio_submit.py b/audio/audio_submit.py
@@ -15,8 +15,8 @@
 import hashlib
 import time
 import random
-import urllib.request as urlrequest
-import urllib.parse as urlparse
+import urllib3
+from urllib.parse import urlencode
 import json
 from gmssl import sm3, func
 
@@ -37,6 +37,7 @@ def __init__(self, secret_id, secret_key, business_id):
         self.secret_id = secret_id
         self.secret_key = secret_key
         self.business_id = business_id
+        self.http = urllib3.PoolManager()  # 初始化连接池
 
     def gen_signature(self, params=None):
         """生成签名信息
@@ -70,9 +71,15 @@ def check(self, params):
         params["signature"] = self.gen_signature(params)
 
         try:
-            params = urlparse.urlencode(params).encode("utf8")
-            request = urlrequest.Request(self.API_URL, params)
-            content = urlrequest.urlopen(request, timeout=1).read()
+            encoded_params = urlencode(params).encode("utf8")
+            response = self.http.request(
+                'POST',
+                self.API_URL,
+                body=encoded_params,
+                headers={'Content-Type': 'application/x-www-form-urlencoded'},
+                timeout=urllib3.Timeout(connect=1.0, read=1.0)
+            )
+            content = response.data
             return json.loads(content)
         except Exception as ex:
             print("调用API接口失败:", str(ex))

diff --git a/audio/liveaudio_callback.py b/audio/liveaudio_callback.py
@@ -15,8 +15,8 @@
 import hashlib
 import time
 import random
-import urllib.request as urlrequest
-import urllib.parse as urlparse
+import urllib3
+from urllib.parse import urlencode
 import json
 from gmssl import sm3, func
 
@@ -37,6 +37,7 @@ def __init__(self, secret_id, secret_key, business_id):
         self.secret_id = secret_id
         self.secret_key = secret_key
         self.business_id = business_id
+        self.http = urllib3.PoolManager()  # 初始化连接池
 
     def gen_signature(self, params=None):
         """生成签名信息
@@ -69,9 +70,15 @@ def check(self):
         params["signature"] = self.gen_signature(params)
 
         try:
-            params = urlparse.urlencode(params).encode("utf8")
-            request = urlrequest.Request(self.API_URL, params)
-            content = urlrequest.urlopen(request, timeout=10).read()
+            encoded_params = urlencode(params).encode("utf8")
+            response = self.http.request(
+                'POST',
+                self.API_URL,
+                body=encoded_params,
+                headers={'Content-Type': 'application/x-www-form-urlencoded'},
+                timeout=urllib3.Timeout(connect=10, read=10)
+            )
+            content = response.data
             return json.loads(content)
         except Exception as ex:
             print("调用API接口失败:", str(ex))

diff --git a/audio/liveaudio_check.py b/audio/liveaudio_check.py
@@ -15,8 +15,8 @@
 import hashlib
 import time
 import random
-import urllib.request as urlrequest
-import urllib.parse as urlparse
+import urllib3
+from urllib.parse import urlencode
 import json
 from gmssl import sm3, func
 
@@ -37,6 +37,7 @@ def __init__(self, secret_id, secret_key, business_id):
         self.secret_id = secret_id
         self.secret_key = secret_key
         self.business_id = business_id
+        self.http = urllib3.PoolManager()  # 初始化连接池
 
     def gen_signature(self, params=None):
         """生成签名信息
@@ -70,9 +71,15 @@ def check(self, params):
         params["signature"] = self.gen_signature(params)
 
         try:
-            params = urlparse.urlencode(params).encode("utf8")
-            request = urlrequest.Request(self.API_URL, params)
-            content = urlrequest.urlopen(request, timeout=1).read()
+            encoded_params = urlencode(params).encode("utf8")
+            response = self.http.request(
+                'POST',
+                self.API_URL,
+                body=encoded_params,
+                headers={'Content-Type': 'application/x-www-form-urlencoded'},
+                timeout=urllib3.Timeout(connect=1.0, read=1.0)
+            )
+            content = response.data
             return json.loads(content)
         except Exception as ex:
             print("调用API接口失败:", str(ex))

diff --git a/audio/liveaudio_feedback.py b/audio/liveaudio_feedback.py
@@ -15,8 +15,8 @@
 import hashlib
 import time
 import random
-import urllib.request as urlrequest
-import urllib.parse as urlparse
+import urllib3
+from urllib.parse import urlencode
 import json
 from gmssl import sm3, func
 
@@ -37,6 +37,7 @@ def __init__(self, secret_id, secret_key, business_id):
         self.secret_id = secret_id
         self.secret_key = secret_key
         self.business_id = business_id
+        self.http = urllib3.PoolManager()  # 初始化连接池
 
     def gen_signature(self, params=None):
         """生成签名信息
@@ -68,9 +69,15 @@ def check(self, params):
         params["signature"] = self.gen_signature(params)
 
         try:
-            params = urlparse.urlencode(params).encode("utf8")
-            request = urlrequest.Request(self.API_URL, params)
-            content = urlrequest.urlopen(request, timeout=10).read()
+            encoded_params = urlencode(params).encode("utf8")
+            response = self.http.request(
+                'POST',
+                self.API_URL,
+                body=encoded_params,
+                headers={'Content-Type': 'application/x-www-form-urlencoded'},
+                timeout=urllib3.Timeout(connect=10, read=10)
+            )
+            content = response.data
             return json.loads(content)
         except Exception as ex:
             print("调用API接口失败:", str(ex))

diff --git a/audio/liveaudio_queryextra.py b/audio/liveaudio_queryextra.py
@@ -15,8 +15,8 @@
 import hashlib
 import time
 import random
-import urllib.request as urlrequest
-import urllib.parse as urlparse
+import urllib3
+from urllib.parse import urlencode
 import json
 from gmssl import sm3, func
 
@@ -37,6 +37,7 @@ def __init__(self, secret_id, secret_key, business_id):
         self.secret_id = secret_id
         self.secret_key = secret_key
         self.business_id = business_id
+        self.http = urllib3.PoolManager()  # 初始化连接池
 
     def gen_signature(self, params=None):
         """生成签名信息
@@ -68,9 +69,15 @@ def check(self, params):
         params["signature"] = self.gen_signature(params)
 
         try:
-            params = urlparse.urlencode(params).encode("utf8")
-            request = urlrequest.Request(self.API_URL, params)
-            content = urlrequest.urlopen(request, timeout=10).read()
+            encoded_params = urlencode(params).encode("utf8")
+            response = self.http.request(
+                'POST',
+                self.API_URL,
+                body=encoded_params,
+                headers={'Content-Type': 'application/x-www-form-urlencoded'},
+                timeout=urllib3.Timeout(connect=10, read=10)
+            )
+            content = response.data
             return json.loads(content)
         except Exception as ex:
             print("调用API接口失败:", str(ex))