refine code

Author: huiguangjun

alibabacloud_oss_v2/__init__.py

@@ -44,7 +44,6 @@
 
 from .config import Config
 from .client import Client
-from .vector_client import VectorClient
 
 # If the Crypto(pycryptodome) module was not imported, the encryption feature is not supported.
 try:

alibabacloud_oss_v2/_client.py

@@ -5,6 +5,7 @@
 from typing import Any, Optional, Dict, Iterable, List, Union, cast, Tuple, Iterator
 from urllib.parse import urlparse, ParseResult, urlencode, quote
 from xml.etree import ElementTree as ET
+import json
 from . import retry
 from . import transport
 from . import exceptions
@@ -367,7 +368,10 @@ def service_error_response_handler(response: HttpResponse) -> None:
             if not response.is_stream_consumed:
                 _ = response.read()
 
-            raise _to_service_error(response)
+            if response.headers.get('Content-Type', '') == 'application/json':
+                raise _to_service_error_json(response)
+            else:
+                raise _to_service_error(response)
 
         # insert service error responsed handler first
         handlers.append(service_error_response_handler)
@@ -677,6 +681,61 @@ def _to_service_error(response: HttpResponse) -> exceptions.ServiceError:
         error_fileds=error_fileds
     )
 
+def _to_service_error_json(response: HttpResponse) -> exceptions.ServiceError:
+    timestamp = serde.deserialize_httptime(response.headers.get('Date'))
+    content = response.content or b''
+    response.close()
+
+    error_fileds = {}
+    code = 'BadErrorResponse'
+    message = ''
+    ec = ''
+    request_id = ''
+    err_body = b''
+    try:
+        err_body = content
+        if len(err_body) == 0:
+            err_body = base64.b64decode(
+                response.headers.get('x-oss-err', ''))
+        root = json.loads(err_body)
+        errElem = root.get('Error', None)
+        if errElem is not None:
+            for k, v in errElem.items():
+                if isinstance(v, str):
+                    error_fileds[k] = v
+            message = error_fileds.get('Message', '')
+            code = error_fileds.get('Code', '')
+            ec = error_fileds.get('EC', '')
+            request_id = error_fileds.get('RequestId', '')
+        else:
+            message = f'Expect root node Error, but get {root.keys()}.'
+    except json.JSONDecodeError as e:
+        errstr = err_body.decode()
+        if '"Error":' in errstr:
+            m = re.search('"Code":(.*),', errstr)
+            if m:
+                code = m.group(1).strip(' "')
+            m = re.search('<Message>(.*)</Message>', errstr)
+            if m:
+                message = m.group(1).strip(' "')
+        if len(message) == 0:
+            message = f'Failed to parse json from response body due to: {str(e)}. With part response body {err_body[:256]}.'
+    except Exception as e:
+        message = f'The body of the response was not readable, due to : {str(e)}.'
+
+    return exceptions.ServiceError(
+        status_code=response.status_code,
+        code=code,
+        message=message,
+        request_id=request_id or response.headers.get('x-oss-request-id', ''),
+        ec=ec or response.headers.get('x-oss-ec', ''),
+        timestamp=timestamp,
+        request_target=f'{response.request.method} {response.request.url}',
+        snapshot=content,
+        headers=response.headers,
+        error_fileds=error_fileds
+    )
+
 def _build_user_agent(config: Config) -> str:
     if config.user_agent:
         return f'{utils.get_default_user_agent()}/{config.user_agent}'

alibabacloud_oss_v2/config.py

@@ -29,7 +29,8 @@ def __init__(
         additional_headers: Optional[List[str]] = None,
         user_agent: Optional[str] = None,
         cloud_box_id: Optional[str] = None,
-        enable_auto_detect_cloud_box_id: Optional[bool] = None
+        enable_auto_detect_cloud_box_id: Optional[bool] = None,
+        user_id: Optional[str] = None
     ) -> None:
         """
         Args:
@@ -73,6 +74,7 @@ def __init__(
             user_agent: (str, optional): The optional user specific identifier appended to the User-Agent header.
             cloud_box_id: (str, optional): The cloud box id.
             enable_auto_detect_cloud_box_id: (bool, optional): The cloud box id is automatically extracted from endpoint.
+            user_id: (str, optional): The user id, must be required in vectors options.
         """
         self.region = region
         self.endpoint = endpoint
@@ -98,6 +100,7 @@ def __init__(
         self.user_agent = user_agent
         self.cloud_box_id = cloud_box_id
         self.enable_auto_detect_cloud_box_id = enable_auto_detect_cloud_box_id
+        self.user_id = user_id
 
 def load_default() -> Config:
     """Using the SDK's default configuration"""

alibabacloud_oss_v2/signer/signer_vector_v4.py renamed to alibabacloud_oss_v2/signer/vectors_v4.py

@@ -11,10 +11,13 @@
 from ..types import HttpRequest, SigningContext, Signer
 
 
-class SignerVectorsV4(Signer):
+class VectorsSignerV4(Signer):
     """Signer Vectors V4
     """
 
+    def __init__(self, user_id: str) -> None:
+        self._user_id = user_id
+
     def sign(self, signing_ctx: SigningContext) -> None:
         if signing_ctx is None:
             raise exceptions.ParamNullError(field="SigningContext")
@@ -26,6 +29,10 @@ def sign(self, signing_ctx: SigningContext) -> None:
         if signing_ctx.request is None:
             raise exceptions.ParamNullOrEmptyError(
                 field="SigningContext.request")
+        
+        if self._user_id is None or self._user_id == '':
+            raise exceptions.ParamNullOrEmptyError(
+                field="SignerVectorsV4.user_id")
 
         if signing_ctx.auth_method_query:
             return self._auth_query(signing_ctx)
@@ -231,7 +238,7 @@ def _calc_canonical_request(self,
         request = signing_ctx.request
 
         # canonical uri
-        uri = '/'
+        uri = f'/acs:ossvector:{signing_ctx.region}:{self._uid}:'
         if signing_ctx.bucket is not None:
             uri = uri + signing_ctx.bucket + '/'
         if signing_ctx.key is not None:

alibabacloud_oss_v2/utils.py

@@ -269,5 +269,4 @@ def get_default_user_agent() -> str:
 def get_vector_user_agent() -> str:
     """Returns the default user agent string
     """
-    sysinfo = f'{platform.system()}/{platform.release()}/{platform.machine()};{platform.python_version()}'
-    return f'vector/alibabacloud-python-sdk-v2/{VERSION} ({sysinfo})'
+    return 'vector-client'

alibabacloud_oss_v2/vector_models/__init__.py

@@ -0,0 +1,7 @@
+# -*- coding: utf-8 -*-
+
+# sub mod
+from . import models
+
+
+from .client import Client