Merge branch 'master' into sls-pb-go-util

Author: crimson-gao

alibabacloud-gateway-sls/Teafile

@@ -24,8 +24,8 @@
   "releases": {
     "ts": "@alicloud/gateway-sls:^0.3.0",
     "go": "github.com/alibabacloud-go/alibabacloud-gateway-sls/client:v0.3.0",
-    "java": "com.aliyun:alibabacloud-gateway-sls:0.3.0",
-    "python": "alibabacloud_gateway_sls:0.3.0",
+    "java": "com.aliyun:alibabacloud-gateway-sls:0.4.0",
+    "python": "alibabacloud_gateway_sls:0.4.0",
     "python2": "alibabacloud_gateway_sls_py2:0.0.6",
     "csharp": "AlibabaCloud.GatewaySls:0.3.0",
     "php": "alibabacloud/gateway-sls:^0.3.0"

alibabacloud-gateway-sls/python/alibabacloud_gateway_sls/__init__.py

@@ -1 +1 @@
-__version__ = "0.3.2"
+__version__ = "0.4.0"

alibabacloud-gateway-sls/python/alibabacloud_gateway_sls/client.py

@@ -17,6 +17,7 @@
 
 
 class Client(SPIClient):
+
     def __init__(self):
         super().__init__()
         self._resp_body_decompress_type = {
@@ -85,7 +86,11 @@ def modify_request(
         # get body bytes
         body_bytes = None
         if not UtilClient.is_unset(request.body):
-            if StringClient.equals(request.req_body_type, 'json') or StringClient.equals(request.req_body_type, 'formData'):
+            # PutLogs
+            if StringClient.equals(request.action, 'PutLogs'):
+                body_bytes = SLS_UtilClient.serialize_log_group_to_pb(request.body)
+                request.headers['content-type'] = 'application/x-protobuf'
+            elif StringClient.equals(request.req_body_type, 'json') or StringClient.equals(request.req_body_type, 'formData'):
                 request.headers['content-type'] = 'application/json'
                 body_str = UtilClient.to_jsonstring(request.body)
                 body_bytes = UtilClient.to_bytes(body_str)
@@ -156,7 +161,11 @@ async def modify_request_async(
         # get body bytes
         body_bytes = None
         if not UtilClient.is_unset(request.body):
-            if StringClient.equals(request.req_body_type, 'json') or StringClient.equals(request.req_body_type, 'formData'):
+            # PutLogs
+            if StringClient.equals(request.action, 'PutLogs'):
+                body_bytes = await SLS_UtilClient.serialize_log_group_to_pb_async(request.body)
+                request.headers['content-type'] = 'application/x-protobuf'
+            elif StringClient.equals(request.req_body_type, 'json') or StringClient.equals(request.req_body_type, 'formData'):
                 request.headers['content-type'] = 'application/json'
                 body_str = UtilClient.to_jsonstring(request.body)
                 body_bytes = UtilClient.to_bytes(body_str)

alibabacloud-gateway-sls/python/setup.py

@@ -24,7 +24,7 @@
 """
 setup module for alibabacloud_gateway_sls.
 
-Created on 20/11/2024
+Created on 18/11/2025
 
 @author: Alibaba Cloud SDK
 """
@@ -38,15 +38,15 @@
 VERSION = __import__(PACKAGE).__version__
 REQUIRES = [
     "alibabacloud_gateway_spi>=0.0.2, <1.0.0",
-    "alibabacloud_credentials>=0.3.5",
+    "alibabacloud_credentials>=1.0.2, <2.0.0",
     "alibabacloud_tea_util>=0.3.13, <1.0.0",
-    "alibabacloud_openapi_util>=0.2.1, <1.0.0",
+    "alibabacloud_openapi_util>=0.2.2, <1.0.0",
     "alibabacloud_darabonba_string>=0.0.4, <1.0.0",
     "alibabacloud_darabonba_map>=0.0.1, <1.0.0",
     "alibabacloud_darabonba_array>=0.1.0, <1.0.0",
     "alibabacloud_darabonba_encode_util>=0.0.2, <1.0.0",
     "alibabacloud_darabonba_signature_util>=0.0.4, <1.0.0",
-    "alibabacloud_gateway_sls_util>=0.3.1, <1.0.0"
+    "alibabacloud_gateway_sls_util>=0.4.0, <1.0.0"
 ]
 
 LONG_DESCRIPTION = ''
@@ -69,17 +69,19 @@
     include_package_data=True,
     platforms="any",
     install_requires=REQUIRES,
-    python_requires=">=3.6",
+    python_requires=">=3.7",
     classifiers=(
         "Development Status :: 4 - Beta",
         "Intended Audience :: Developers",
         "License :: OSI Approved :: Apache Software License",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.6",
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: 3.11',
+        'Programming Language :: Python :: 3.12',
         "Topic :: Software Development"
     )
 )

alibabacloud-gateway-sls/util/Teafile

@@ -16,7 +16,7 @@
     "ts": "@alicloud/gateway-sls-util:^0.3.0",
     "go": "github.com/alibabacloud-go/alibabacloud-gateway-sls-util/client:v0.4.0",
     "java": "com.aliyun:alibabacloud-gateway-sls-util:0.4.0",
-    "python": "alibabacloud_gateway_sls_util:0.3.0",
+    "python": "alibabacloud_gateway_sls_util:0.4.0",
     "python2": "alibabacloud_gateway_sls_util_py2:0.0.1",
     "csharp": "AlibabaCloud.GatewaySls_Util:0.3.0",
     "php": "alibabacloud/gateway-sls-util:^0.3.0"

alibabacloud-gateway-sls/util/python/alibabacloud_gateway_sls_util/__init__.py

@@ -1 +1 @@
-__version__ = "0.3.1"
+__version__ = "0.4.0"

alibabacloud-gateway-sls/util/python/alibabacloud_gateway_sls_util/client.py

@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
 # This file is auto-generated, don't edit it. Thanks.
-from typing import BinaryIO, List
+from typing import BinaryIO, List, Any
 import lz4.block
 import zlib
 import zstd
 import io
+from .log_group_serializer import serialize_log_group_to_pb
 
 # for compressor
 supported_compress_types = ['lz4', 'zstd', 'gzip', 'deflate']
@@ -177,3 +178,15 @@ async def bytes_length_async(
         src: bytes,
     ) -> int:
         return len(src)
+
+    @staticmethod
+    def serialize_log_group_to_pb(
+        log_group: Any,
+    ) -> bytes:
+        return serialize_log_group_to_pb(log_group)
+
+    @staticmethod
+    async def serialize_log_group_to_pb_async(
+        log_group: Any,
+    ) -> bytes:
+        return serialize_log_group_to_pb(log_group)

alibabacloud-gateway-sls/util/python/alibabacloud_gateway_sls_util/log_group_serializer.py

@@ -0,0 +1,10 @@
+from typing import Any
+from aliyun_log_fastpb import serialize_log_group
+
+
+def serialize_log_group_to_pb(log_group: Any) -> bytes:
+    if log_group is None:
+        raise ValueError("log_group is None")
+    if not isinstance(log_group, dict):
+        raise ValueError("log_group is not a dict")
+    return serialize_log_group(log_group)

alibabacloud-gateway-sls/util/python/setup.py

@@ -24,7 +24,7 @@
 """
 setup module for alibabacloud_gateway_sls_util.
 
-Created on 02/06/2023
+Created on 14/11/2025
 
 @author: Alibaba Cloud SDK
 """
@@ -38,7 +38,8 @@
 VERSION = __import__(PACKAGE).__version__
 REQUIRES = [
     "lz4>=4.3.2",
-    "zstd>=1.5.5.1"
+    "zstd>=1.5.5.1",
+    "aliyun-log-fastpb>=0.2.0"
 ]
 
 LONG_DESCRIPTION = ''
@@ -61,17 +62,19 @@
     include_package_data=True,
     platforms="any",
     install_requires=REQUIRES,
-    python_requires=">=3.6",
+    python_requires=">=3.7",
     classifiers=(
         "Development Status :: 4 - Beta",
         "Intended Audience :: Developers",
         "License :: OSI Approved :: Apache Software License",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.6",
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: 3.11',
+        'Programming Language :: Python :: 3.12',
         "Topic :: Software Development"
     )
 )