maxcompute-tea-openapi 1.0.0__tar.gz → 1.2.0__tar.gz

{maxcompute_tea_openapi-1.0.0 → maxcompute_tea_openapi-1.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: maxcompute_tea_openapi
-Version: 1.0.0
+Version: 1.2.0
 Summary: Alibaba Cloud MaxCompute openapi SDK Library for Python
 Home-page: https://github.com/aliyun/aliyun-odps-openapi-sdk
 Author: Alibaba Cloud MaxCompute Team
@@ -21,8 +21,8 @@ Classifier: Topic :: Software Development
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 Requires-Dist: maxcompute_tea_util<1.0.0,>=0.0.1
-Requires-Dist: alibabacloud_tea_util<1.0.0,>=0.3.13
-Requires-Dist: alibabacloud_credentials<1.0.0,>=0.3.6
+Requires-Dist: alibabacloud_tea_util<1.0.0,>=0.3.14
+Requires-Dist: alibabacloud_credentials<2.0.0,>=1.0.2
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

maxcompute_tea_openapi-1.2.0/maxcompute_tea_openapi/__init__.py

@@ -0,0 +1 @@
+__version__ = "1.2.0"

{maxcompute_tea_openapi-1.0.0 → maxcompute_tea_openapi-1.2.0}/maxcompute_tea_openapi/client.py

@@ -30,6 +30,7 @@ class Client:
     _headers: Dict[str, str] = None
     _suffix: str = None
     _global_parameters: openapi_models.GlobalParameters = None
+    _odps_endpoint: str = None
 
     def __init__(
         self, 
@@ -75,6 +76,7 @@ class Client:
         self._signature_version = config.signature_version
         self._global_parameters = config.global_parameters
         self._suffix = config.suffix
+        self._odps_endpoint = config.odps_endpoint
 
     def do_request(
         self,
@@ -123,12 +125,14 @@ class Client:
             _retry_times = _retry_times + 1
             try:
                 _request = TeaRequest()
-                _request.protocol = UtilClient.default_string(self._protocol, params.protocol)
+                _request.protocol = UtilClient.default_string(request.protocol_override, UtilClient.default_string(self._protocol, params.protocol))
                 _request.method = params.method
                 if not UtilClient.is_unset(self._suffix):
                     _request.pathname = f'/{self._suffix}{params.pathname}'
                 else:
                     _request.pathname = params.pathname
+                if not UtilClient.is_unset(request.pathname_prefix):
+                    _request.pathname = f'{request.pathname_prefix}{_request.pathname}'
                 global_queries = {}
                 global_headers = {}
                 if not UtilClient.is_unset(self._global_parameters):
@@ -150,7 +154,7 @@ class Client:
                     request.query)
                 # endpoint is setted in product client
                 _request.headers = TeaCore.merge({
-                    'host': self._endpoint,
+                    'host': UtilClient.default_string(request.endpoint_override, self._endpoint),
                     'user-agent': self.get_user_agent(),
                     'x-odps-user-agent': self.get_user_agent(),
                     'Date': McUtilClient.get_api_timestamp()
@@ -301,12 +305,14 @@ class Client:
             _retry_times = _retry_times + 1
             try:
                 _request = TeaRequest()
-                _request.protocol = UtilClient.default_string(self._protocol, params.protocol)
+                _request.protocol = UtilClient.default_string(request.protocol_override, UtilClient.default_string(self._protocol, params.protocol))
                 _request.method = params.method
                 if not UtilClient.is_unset(self._suffix):
                     _request.pathname = f'/{self._suffix}{params.pathname}'
                 else:
                     _request.pathname = params.pathname
+                if not UtilClient.is_unset(request.pathname_prefix):
+                    _request.pathname = f'{request.pathname_prefix}{_request.pathname}'
                 global_queries = {}
                 global_headers = {}
                 if not UtilClient.is_unset(self._global_parameters):
@@ -328,7 +334,7 @@ class Client:
                     request.query)
                 # endpoint is setted in product client
                 _request.headers = TeaCore.merge({
-                    'host': self._endpoint,
+                    'host': UtilClient.default_string(request.endpoint_override, self._endpoint),
                     'user-agent': self.get_user_agent(),
                     'x-odps-user-agent': self.get_user_agent(),
                     'Date': McUtilClient.get_api_timestamp()
@@ -437,11 +443,13 @@ class Client:
         model: TeaModel,
         method: str,
         path: str,
+        params: Dict[str, str],
         runtime: util_models.RuntimeOptions,
     ) -> dict:
         UtilClient.validate_model(model)
         req = openapi_models.OpenApiRequest(
-            body=UtilClient.to_map(model)
+            body=UtilClient.to_map(model),
+            query=params
         )
         openapi_params = openapi_models.Params(
             pathname=path,
@@ -455,11 +463,13 @@ class Client:
         model: TeaModel,
         method: str,
         path: str,
+        params: Dict[str, str],
         runtime: util_models.RuntimeOptions,
     ) -> dict:
         UtilClient.validate_model(model)
         req = openapi_models.OpenApiRequest(
-            body=UtilClient.to_map(model)
+            body=UtilClient.to_map(model),
+            query=params
         )
         openapi_params = openapi_models.Params(
             pathname=path,
@@ -473,11 +483,13 @@ class Client:
         model: TeaModel,
         method: str,
         path: str,
+        params: Dict[str, str],
         runtime: util_models.RuntimeOptions,
     ) -> dict:
         UtilClient.validate_model(model)
         req = openapi_models.OpenApiRequest(
-            body=UtilClient.to_map(model)
+            body=UtilClient.to_map(model),
+            query=params
         )
         openapi_params = openapi_models.Params(
             pathname=path,
@@ -491,11 +503,13 @@ class Client:
         model: TeaModel,
         method: str,
         path: str,
+        params: Dict[str, str],
         runtime: util_models.RuntimeOptions,
     ) -> dict:
         UtilClient.validate_model(model)
         req = openapi_models.OpenApiRequest(
-            body=UtilClient.to_map(model)
+            body=UtilClient.to_map(model),
+            query=params
         )
         openapi_params = openapi_models.Params(
             pathname=path,
@@ -504,6 +518,44 @@ class Client:
         )
         return await self.call_api_async(openapi_params, req, runtime)
 
+    def call_routing_api(self) -> openapi_models.RoutingResponse:
+        req = openapi_models.OpenApiRequest(
+            endpoint_override=self._odps_endpoint,
+            pathname_prefix='/api'
+        )
+        openapi_params = openapi_models.Params(
+            pathname='/catalogapi',
+            method='GET',
+            body_type='string'
+        )
+        return TeaCore.from_map(
+            openapi_models.RoutingResponse(),
+            self.do_request(openapi_params, req, util_models.RuntimeOptions())
+        )
+
+    async def call_routing_api_async(self) -> openapi_models.RoutingResponse:
+        req = openapi_models.OpenApiRequest(
+            endpoint_override=self._odps_endpoint,
+            pathname_prefix='/api'
+        )
+        openapi_params = openapi_models.Params(
+            pathname='/catalogapi',
+            method='GET',
+            body_type='string'
+        )
+        return TeaCore.from_map(
+            openapi_models.RoutingResponse(),
+            await self.do_request_async(openapi_params, req, util_models.RuntimeOptions())
+        )
+
+    def get_catalog_endpoint(self) -> str:
+        resp = self.call_routing_api()
+        return resp.body
+
+    async def get_catalog_endpoint_async(self) -> str:
+        resp = await self.call_routing_api_async()
+        return resp.body
+
     def call_api(
         self,
         params: openapi_models.Params,
@@ -515,6 +567,8 @@ class Client:
                 'code': 'ParameterMissing',
                 'message': "'params' can not be unset"
             })
+        if UtilClient.empty(self._endpoint) and not UtilClient.empty(self._odps_endpoint):
+            self._endpoint = self.get_catalog_endpoint()
         return self.do_request(params, request, runtime)
 
     async def call_api_async(
@@ -528,6 +582,8 @@ class Client:
                 'code': 'ParameterMissing',
                 'message': "'params' can not be unset"
             })
+        if UtilClient.empty(self._endpoint) and not UtilClient.empty(self._odps_endpoint):
+            self._endpoint = await self.get_catalog_endpoint_async()
         return await self.do_request_async(params, request, runtime)
 
     def get_user_agent(self) -> str:

{maxcompute_tea_openapi-1.0.0 → maxcompute_tea_openapi-1.2.0}/maxcompute_tea_openapi/models.py

@@ -62,6 +62,7 @@ class Config(TeaModel):
         suffix: str = None,
         signature_version: str = None,
         global_parameters: GlobalParameters = None,
+        odps_endpoint: str = None,
     ):
         # project
         self.project = project
@@ -97,6 +98,8 @@ class Config(TeaModel):
         self.signature_version = signature_version
         # Global Parameters
         self.global_parameters = global_parameters
+        # ODPS endpoint, used to resolve catalog endpoint via routing API when endpoint is not set
+        self.odps_endpoint = odps_endpoint
 
     def validate(self):
         if self.global_parameters:
@@ -142,6 +145,8 @@ class Config(TeaModel):
             result['signatureVersion'] = self.signature_version
         if self.global_parameters is not None:
             result['globalParameters'] = self.global_parameters.to_map()
+        if self.odps_endpoint is not None:
+            result['odpsEndpoint'] = self.odps_endpoint
         return result
 
     def from_map(self, m: dict = None):
@@ -181,6 +186,8 @@ class Config(TeaModel):
         if m.get('globalParameters') is not None:
             temp_model = GlobalParameters()
             self.global_parameters = temp_model.from_map(m['globalParameters'])
+        if m.get('odpsEndpoint') is not None:
+            self.odps_endpoint = m.get('odpsEndpoint')
         return self
 
 
@@ -269,6 +276,8 @@ class OpenApiRequest(TeaModel):
         stream: BinaryIO = None,
         host_map: Dict[str, str] = None,
         endpoint_override: str = None,
+        pathname_prefix: str = None,
+        protocol_override: str = None,
     ):
         self.headers = headers
         self.query = query
@@ -276,6 +285,8 @@ class OpenApiRequest(TeaModel):
         self.stream = stream
         self.host_map = host_map
         self.endpoint_override = endpoint_override
+        self.pathname_prefix = pathname_prefix
+        self.protocol_override = protocol_override
 
     def validate(self):
         pass
@@ -298,6 +309,10 @@ class OpenApiRequest(TeaModel):
             result['hostMap'] = self.host_map
         if self.endpoint_override is not None:
             result['endpointOverride'] = self.endpoint_override
+        if self.pathname_prefix is not None:
+            result['pathnamePrefix'] = self.pathname_prefix
+        if self.protocol_override is not None:
+            result['protocolOverride'] = self.protocol_override
         return result
 
     def from_map(self, m: dict = None):
@@ -314,6 +329,49 @@ class OpenApiRequest(TeaModel):
             self.host_map = m.get('hostMap')
         if m.get('endpointOverride') is not None:
             self.endpoint_override = m.get('endpointOverride')
+        if m.get('pathnamePrefix') is not None:
+            self.pathname_prefix = m.get('pathnamePrefix')
+        if m.get('protocolOverride') is not None:
+            self.protocol_override = m.get('protocolOverride')
+        return self
+
+
+class RoutingResponse(TeaModel):
+    def __init__(
+        self,
+        body: str = None,
+        headers: Dict[str, str] = None,
+        status_code: int = None,
+    ):
+        self.body = body
+        self.headers = headers
+        self.status_code = status_code
+
+    def validate(self):
+        pass
+
+    def to_map(self):
+        _map = super().to_map()
+        if _map is not None:
+            return _map
+
+        result = dict()
+        if self.body is not None:
+            result['body'] = self.body
+        if self.headers is not None:
+            result['headers'] = self.headers
+        if self.status_code is not None:
+            result['statusCode'] = self.status_code
+        return result
+
+    def from_map(self, m: dict = None):
+        m = m or dict()
+        if m.get('body') is not None:
+            self.body = m.get('body')
+        if m.get('headers') is not None:
+            self.headers = m.get('headers')
+        if m.get('statusCode') is not None:
+            self.status_code = m.get('statusCode')
         return self
 
 

{maxcompute_tea_openapi-1.0.0 → maxcompute_tea_openapi-1.2.0}/maxcompute_tea_openapi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: maxcompute_tea_openapi
-Version: 1.0.0
+Version: 1.2.0
 Summary: Alibaba Cloud MaxCompute openapi SDK Library for Python
 Home-page: https://github.com/aliyun/aliyun-odps-openapi-sdk
 Author: Alibaba Cloud MaxCompute Team
@@ -21,8 +21,8 @@ Classifier: Topic :: Software Development
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 Requires-Dist: maxcompute_tea_util<1.0.0,>=0.0.1
-Requires-Dist: alibabacloud_tea_util<1.0.0,>=0.3.13
-Requires-Dist: alibabacloud_credentials<1.0.0,>=0.3.6
+Requires-Dist: alibabacloud_tea_util<1.0.0,>=0.3.14
+Requires-Dist: alibabacloud_credentials<2.0.0,>=1.0.2
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

maxcompute_tea_openapi-1.2.0/maxcompute_tea_openapi.egg-info/requires.txt

@@ -0,0 +1,3 @@
+maxcompute_tea_util<1.0.0,>=0.0.1
+alibabacloud_tea_util<1.0.0,>=0.3.14
+alibabacloud_credentials<2.0.0,>=1.0.2

{maxcompute_tea_openapi-1.0.0 → maxcompute_tea_openapi-1.2.0}/setup.py

@@ -24,7 +24,7 @@ from setuptools import setup, find_packages
 """
 setup module for maxcompute_tea_openapi.
 
-Created on 09/04/2025
+Created on 26/05/2026
 
 @author: Alibaba Cloud MaxCompute Team
 """
@@ -38,8 +38,8 @@ URL = "https://github.com/aliyun/aliyun-odps-openapi-sdk"
 VERSION = __import__(PACKAGE).__version__
 REQUIRES = [
     "maxcompute_tea_util>=0.0.1, <1.0.0",
-    "alibabacloud_tea_util>=0.3.13, <1.0.0",
-    "alibabacloud_credentials>=0.3.6, <1.0.0"
+    "alibabacloud_tea_util>=0.3.14, <1.0.0",
+    "alibabacloud_credentials>=1.0.2, <2.0.0"
 ]
 
 LONG_DESCRIPTION = ''

maxcompute_tea_openapi-1.0.0/maxcompute_tea_openapi/__init__.py

@@ -1 +0,0 @@
-__version__ = "1.0.0"

maxcompute_tea_openapi-1.0.0/maxcompute_tea_openapi.egg-info/requires.txt

@@ -1,3 +0,0 @@
-maxcompute_tea_util<1.0.0,>=0.0.1
-alibabacloud_tea_util<1.0.0,>=0.3.13
-alibabacloud_credentials<1.0.0,>=0.3.6