星曜裸金属服务器(epc)：星海支持智启

Author: fengyikai

ksyun/common/abstract_client.py

@@ -229,7 +229,9 @@ def _get_endpoint(self):
 
 
     def call(self, action, params, options=None):
-        req = RequestInternal(self._get_endpoint(), self.profile.httpProfile.reqMethod, self._requestPath)
+        # Use custom path from HttpProfile if available, otherwise use default _requestPath
+        request_path = self.profile.httpProfile.path if self.profile.httpProfile.path else self._requestPath
+        req = RequestInternal(self._get_endpoint(), self.profile.httpProfile.reqMethod, request_path)
         self._build_req_inter(action, params, req, options)
         resp_inter = self.request.send_request(req)
         self._check_status(resp_inter)
@@ -252,9 +254,11 @@ def call_octet_stream(self, action, headers, body):
         if self.profile.httpProfile.reqMethod != "POST":
             raise SDKError("ClientError", "Invalid request method.")
 
+        # Use custom path from HttpProfile if available, otherwise use default _requestPath
+        request_path = self.profile.httpProfile.path if self.profile.httpProfile.path else self._requestPath
         req = RequestInternal(self._get_endpoint(),
                               self.profile.httpProfile.reqMethod,
-                              self._requestPath)
+                              request_path)
         for key in headers:
             req.header[key] = headers[key]
         req.data = body

ksyun/common/http/request.py

@@ -72,6 +72,36 @@ def __init__(self, host, req_timeout=60, debug=False, proxy=None, is_http=False,
         self.request_size = 0
         self.response_size = 0
 
+    def _build_url(self, base_url, path=None, query_params=None):
+        """Build complete URL from base_url, path and query parameters.
+
+        Ensures no double slashes between domain and path.
+
+        :param base_url: Base URL (scheme + domain)
+        :type base_url: str
+        :param path: URL path
+        :type path: str
+        :param query_params: Query parameters
+        :type query_params: str
+        :return: Complete URL
+        :rtype: str
+        """
+        # Start with base URL, remove trailing slash if present
+        url = base_url.rstrip('/')
+
+        # Add path if provided
+        if path:
+            # Ensure path starts with /
+            if not path.startswith('/'):
+                path = '/' + path
+            url += path
+
+        # Add query parameters if provided
+        if query_params:
+            url += '?' + query_params
+
+        return url
+
     def set_req_timeout(self, req_timeout):
         self.req_timeout = req_timeout
 
@@ -89,14 +119,14 @@ def _request(self, req_inter):
             req_inter.header["Connection"] = "Keep-Alive"
         if self.debug:
             logger.debug("SendRequest %s" % req_inter)
+
         if req_inter.method == 'GET':
-            req_inter_url = '%s?%s' % (self.host, req_inter.data)
+            # For GET requests, parameters are in the query string (req_inter.data)
+            req_inter_url = self._build_url(self.host, req_inter.uri, req_inter.data)
             return self.conn.request(req_inter.method, req_inter_url, None, req_inter.header, req_inter.auth)
         elif req_inter.method == 'POST' or req_inter.method == 'PUT' or req_inter.method == 'DELETE':
-            if req_inter.uri_params:
-                req_inter_url = '%s?%s' % (self.host, req_inter.uri_params)
-            else:
-                req_inter_url = self.host
+            # For POST/PUT/DELETE, use uri_params for query string if present
+            req_inter_url = self._build_url(self.host, req_inter.uri, req_inter.uri_params if req_inter.uri_params else None)
             return self.conn.request(req_inter.method, req_inter_url, req_inter.data, req_inter.header, req_inter.auth)
         else:
             raise KsyunSDKException("ClientParamsError", 'Method only support (GET, POST, PUT, DELETE)')
@@ -115,7 +145,7 @@ def send_request(self, req_inter):
 
 
 class RequestInternal(object):
-    def __init__(self, host="", method="", uri="", header=None, data="",auth=None):
+    def __init__(self, host="", method="", uri="", header=None, data="", auth=None):
         if header is None:
             header = {}
         self.host = host
@@ -124,6 +154,7 @@ def __init__(self, host="", method="", uri="", header=None, data="",auth=None):
         self.header = header
         self.data = data
         self.auth = auth
+        self.uri_params = None  # Query parameters for POST/PUT/DELETE requests
 
     def __str__(self):
         headers = "\n".join("%s: %s" % (k, v) for k, v in self.header.items())

ksyun/common/profile/http_profile.py

@@ -17,7 +17,7 @@ class HttpProfile(object):
     scheme = "https"
 
     def __init__(self, protocol=None, endpoint=None, reqMethod="POST", reqTimeout=60,
-                 keepAlive=False, proxy=None, rootDomain=None, certification=None):
+                 keepAlive=False, proxy=None, rootDomain=None, certification=None, path=None):
         """HTTP profile.
         :param protocol: http or https, default is https.
         :type protocol: str
@@ -29,6 +29,8 @@ def __init__(self, protocol=None, endpoint=None, reqMethod="POST", reqTimeout=60
         :type reqTimeout: int
         :param rootDomain: The root domain to access, like: api.ksyun.com.
         :type rootDomain: str
+        :param path: Custom URL path like /api/xxx/xxx. Query parameters will be automatically removed.
+        :type path: str
         """
         self.endpoint = endpoint
         self.reqTimeout = 60 if reqTimeout is None else reqTimeout
@@ -40,3 +42,26 @@ def __init__(self, protocol=None, endpoint=None, reqMethod="POST", reqTimeout=60
         self.proxy = proxy
         self.rootDomain = "api.ksyun.com" if rootDomain is None else rootDomain
         self.certification = certification
+        # Clean path: remove query parameters if present
+        self.path = self._clean_path(path) if path else None
+
+    def _clean_path(self, path):
+        """Clean path by removing query parameters and normalizing slashes.
+
+        :param path: The path to clean
+        :type path: str
+        :return: Cleaned path
+        :rtype: str
+        """
+        if not path:
+            return None
+
+        # Remove query parameters (everything after ?)
+        if '?' in path:
+            path = path.split('?')[0]
+
+        # Ensure path starts with /
+        if not path.startswith('/'):
+            path = '/' + path
+
+        return path