add endpoint provider

Author: huiguangjun

alibabacloud_oss_v2/_client.py

@@ -29,6 +29,7 @@
     BodyType,
     OperationInput,
     OperationOutput,
+    EndpointProvider,
 )
 
 
@@ -110,6 +111,7 @@ def __init__(
         feature_flags: Optional[int] = None,
         additional_headers: Optional[List[str]] = None,
         operation_timeout: Optional[Union[int, float]] = None,
+        endpoint_provider: Optional[EndpointProvider] = None,
     ) -> None:
         self.product = product
         self.region = region
@@ -127,7 +129,7 @@ def __init__(
         self.feature_flags = feature_flags or defaults.FF_DEFAULT
         self.additional_headers = additional_headers
         self.operation_timeout = operation_timeout
-
+        self.endpoint_provider = endpoint_provider
 
 class _InnerOptions:
     """client runtime's information."""
@@ -219,7 +221,10 @@ def build_request_context(self, op_input: OperationInput, options: _Options, inn
         """build request context
         """
         # host & path
-        url = _build_url(op_input, options)
+        if options.endpoint_provider is not None:
+            url = options.endpoint_provider.build_url(op_input)
+        else:
+            url = _build_url(op_input, options)
 
         # queries
         if op_input.parameters is not None:

alibabacloud_oss_v2/endpoints.py

@@ -37,20 +37,6 @@ def from_region(region:str, disable_ssl:bool, etype:str) -> str:
 
     return endpoint
 
-
-def vectors_from_region(region: str, disable_ssl: bool, etype: str) -> str:
-    """Generate vectors endpoint from region"""
-    scheme = "https"
-    if disable_ssl:
-        scheme = "http"
-
-    if etype == "internal":
-        endpoint = f"oss-{region}-internal.oss-vectors.aliyuncs.com"
-    else:
-        endpoint = f"oss-{region}.oss-vectors.aliyuncs.com"
-
-    return f"{scheme}://{endpoint}"
-
 def is_ip(hostname:str):
     """Check whether the host name is an IP address."""
     is_ipv6 = False

alibabacloud_oss_v2/types.py

@@ -450,3 +450,11 @@ def iter_bytes(self, **kwargs: Any) -> Iterator[bytes]:
         :return: An iterator of bytes from the stream
         :rtype: Iterator[str]
         """
+
+class EndpointProvider(abc.ABC):
+    """Abstract base class for a EndpointProvider."""
+
+    @abc.abstractmethod
+    def build_url(self, op_input: OperationInput) -> None:
+        """build the request url"""
+

alibabacloud_oss_v2/vectors/client.py

@@ -7,10 +7,10 @@
 from ..signer.vectors_v4 import VectorsSignerV4
 from .. import utils
 from .. import validation
-from .. import endpoints
 
 from . import models
 from . import operations
+from . import endpoints
 from .paginator import (
     ListVectorBucketsPaginator,
     ListVectorIndexPaginator,
@@ -34,29 +34,29 @@ def __init__(self, config: Config, **kwargs) -> None:
         self._build_vectors_user_agent(_config)
         self._client = _SyncClientImpl(_config, **kwargs)
         self._client._options.signer = VectorsSignerV4(user_id=config.user_id)
+        self._client._options.endpoint_provider = endpoints.VectorsEndpointProvider(
+            account_id=config.user_id,
+            endpoint=self._client._options.endpoint
+        )
 
     def __repr__(self) -> str:
         return "<OssVectorsClient>"
 
     def _resolve_vectors_endpoint(self, config: Config) -> None:
         """vectors endpoint"""
-        disable_ssl = utils.safety_bool(config.disable_ssl)
-        endpoint = utils.safety_str(config.endpoint)
-        region = utils.safety_str(config.region)
-        if len(endpoint) > 0:
-            endpoint = endpoints.add_scheme(endpoint, disable_ssl)
-        elif validation.is_valid_region(region):
-            if bool(config.use_internal_endpoint):
-                etype = "internal"
-            else:
-                etype = "default"
-
-            endpoint = endpoints.vectors_from_region(region, disable_ssl, etype)
-
-        if endpoint == "":
+        if config.endpoint is not None:
             return
 
-        config.endpoint = endpoint
+        if not validation.is_valid_region(config.region):
+            return
+
+        if bool(config.use_internal_endpoint):
+            etype = "internal"
+        else:
+            etype = "default"
+
+        config.endpoint = endpoints.from_region(config.region, etype)
+
 
     def _build_vectors_user_agent(self, config: Config) -> str:
         if config.user_agent:

alibabacloud_oss_v2/vectors/endpoints.py

@@ -0,0 +1,35 @@
+
+# -*- coding: utf-8 -*-
+from urllib.parse import ParseResult, quote
+from ..types import EndpointProvider, OperationInput
+
+def from_region(region: str, etype: str) -> str:
+    """Generate vectors endpoint from region"""
+    if etype == "internal":
+        return f"oss-{region}-internal.oss-vectors.aliyuncs.com"
+    else:
+        return f"oss-{region}.oss-vectors.aliyuncs.com"
+
+
+class VectorsEndpointProvider(EndpointProvider):
+    def __init__(
+        self, 
+        endpoint: ParseResult,
+        account_id: str, 
+    ) -> None:
+        self._endpoint = endpoint
+        self._account_id = account_id or ""
+
+    def build_url(self, op_input: OperationInput) -> str:
+        """build the request url"""
+        host = ""
+        paths = []
+        if op_input.bucket is None:
+            host = self._endpoint.netloc
+        else:
+            host = f'{self._account_id}-{op_input.bucket}.{self._endpoint.netloc}'
+
+        if op_input.key is not None:
+            paths.append(quote(op_input.key))
+
+        return f'{self._endpoint.scheme}://{host}/{"/".join(paths)}'