nacos-sdk-python 3.0.3__tar.gz → 3.0.4__tar.gz

{nacos_sdk_python-3.0.3/nacos_sdk_python.egg-info → nacos_sdk_python-3.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nacos-sdk-python
-Version: 3.0.3
+Version: 3.0.4
 Summary: Python client for Nacos.
 Home-page: https://github.com/nacos-group/nacos-sdk-python
 Author: nacos
@@ -105,7 +105,9 @@ client_config = (ClientConfigBuilder()
   * *max_keep_alive_ms* - max keep alive ms in grpc. | default: 60 * 1000
   * *initial_window_size* - initial window size in grpc.  | default: 10 * 1024 * 1024
   * *initial_conn_window_size* - initial connection window size in grpc. | default: 10 * 1024 * 1024
-  * *grpc_timeout* - grpc timeout in milliseconds. default: 3000
+  * *grpc_timeout* - grpc timeout in milliseconds. | default: 3000
+  * *port_offset* - gRPC port offset. The gRPC port = HTTP port + offset. | default: 1000
+  * *capability_negotiation_timeout* - timeout for capability negotiation in milliseconds. | default: 5000
 * *tls_config* - tls config
   * *enabled* - whether enable tls.
   * *ca_file* - ca file path.

{nacos_sdk_python-3.0.3 → nacos_sdk_python-3.0.4}/README.md

@@ -56,7 +56,9 @@ client_config = (ClientConfigBuilder()
   * *max_keep_alive_ms* - max keep alive ms in grpc. | default: 60 * 1000
   * *initial_window_size* - initial window size in grpc.  | default: 10 * 1024 * 1024
   * *initial_conn_window_size* - initial connection window size in grpc. | default: 10 * 1024 * 1024
-  * *grpc_timeout* - grpc timeout in milliseconds. default: 3000
+  * *grpc_timeout* - grpc timeout in milliseconds. | default: 3000
+  * *port_offset* - gRPC port offset. The gRPC port = HTTP port + offset. | default: 1000
+  * *capability_negotiation_timeout* - timeout for capability negotiation in milliseconds. | default: 5000
 * *tls_config* - tls config
   * *enabled* - whether enable tls.
   * *ca_file* - ca file path.

{nacos_sdk_python-3.0.3 → nacos_sdk_python-3.0.4/nacos_sdk_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nacos-sdk-python
-Version: 3.0.3
+Version: 3.0.4
 Summary: Python client for Nacos.
 Home-page: https://github.com/nacos-group/nacos-sdk-python
 Author: nacos
@@ -105,7 +105,9 @@ client_config = (ClientConfigBuilder()
   * *max_keep_alive_ms* - max keep alive ms in grpc. | default: 60 * 1000
   * *initial_window_size* - initial window size in grpc.  | default: 10 * 1024 * 1024
   * *initial_conn_window_size* - initial connection window size in grpc. | default: 10 * 1024 * 1024
-  * *grpc_timeout* - grpc timeout in milliseconds. default: 3000
+  * *grpc_timeout* - grpc timeout in milliseconds. | default: 3000
+  * *port_offset* - gRPC port offset. The gRPC port = HTTP port + offset. | default: 1000
+  * *capability_negotiation_timeout* - timeout for capability negotiation in milliseconds. | default: 5000
 * *tls_config* - tls config
   * *enabled* - whether enable tls.
   * *ca_file* - ca file path.

{nacos_sdk_python-3.0.3 → nacos_sdk_python-3.0.4}/setup.py

@@ -53,7 +53,7 @@ class UploadCommand(Command):
 
 setup(
     name="nacos-sdk-python",
-    version="3.0.3",
+    version="3.0.4",
     packages=find_packages(
         exclude=["test", "*.tests", "*.tests.*", "tests.*", "tests"]),
     url="https://github.com/nacos-group/nacos-sdk-python",

{nacos_sdk_python-3.0.3 → nacos_sdk_python-3.0.4}/v2/nacos/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "3.0.3"
+__version__ = "3.0.4"
 
 from .common.client_config import (KMSConfig,
                                    GRPCConfig,

{nacos_sdk_python-3.0.3 → nacos_sdk_python-3.0.4}/v2/nacos/common/client_config.py

@@ -35,12 +35,14 @@ class GRPCConfig:
                  initial_window_size=Constants.GRPC_INITIAL_WINDOW_SIZE,
                  initial_conn_window_size=Constants.GRPC_INITIAL_CONN_WINDOW_SIZE,
                  grpc_timeout=Constants.DEFAULT_GRPC_TIMEOUT_MILLS,
+                 port_offset=Constants.GRPC_PORT_OFFSET,
                  capability_negotiation_timeout=Constants.GRPC_CAPABILITY_NEGOTIATION_TIMEOUT):
         self.max_receive_message_length = max_receive_message_length
         self.max_keep_alive_ms = max_keep_alive_ms
         self.initial_window_size = initial_window_size
         self.initial_conn_window_size = initial_conn_window_size
         self.grpc_timeout = grpc_timeout
+        self.port_offset = port_offset  # gRPC port offset, default 1000
         self.capability_negotiation_timeout = capability_negotiation_timeout
 
 

{nacos_sdk_python-3.0.3 → nacos_sdk_python-3.0.4}/v2/nacos/common/constants.py

@@ -13,7 +13,7 @@ class Constants:
 
     LABEL_MODULE = "module"
 
-    CLIENT_VERSION = "Nacos-Python-Client:v3.0.3"
+    CLIENT_VERSION = "Nacos-Python-Client:v3.0.4"
 
     DATA_IN_BODY_VERSION = 204
 
@@ -152,6 +152,8 @@ class Constants:
 
     DEFAULT_NAMESPACE_ID = ""
 
+    NAMING_DEFAULT_NAMESPACE_ID = "public"
+
     DEFAULT_USE_CLOUD_NAMESPACE_PARSING = True
 
     WRITE_REDIRECT_CODE = 307
@@ -220,6 +222,8 @@ class Constants:
 
     GRPC_CAPABILITY_NEGOTIATION_TIMEOUT = 5000
 
+    GRPC_PORT_OFFSET = 1000  # gRPC port = HTTP port + offset
+
     DEFAULT_TIMEOUT_MILLS = 10000
 
     PER_TASK_CONFIG_SIZE = 3000

{nacos_sdk_python-3.0.3 → nacos_sdk_python-3.0.4}/v2/nacos/naming/cache/service_info_cache.py

@@ -127,11 +127,7 @@ class ServiceInfoCache:
 
     @staticmethod
     def sort_instances(instances: List[Instance]) -> List[Instance]:
-        def instance_key(instance: Instance) -> (int, int):
-            ip_num = int(''.join(instance.ip.split('.')))
-            return ip_num, instance.port
-
-        return sorted(instances, key=instance_key)
+        return sorted(instances, key=lambda inst: (inst.ip, inst.port))
 
     async def register_callback(self, service_name: str, clusters: str, callback_func_wrapper: SubscribeCallbackFuncWrapper):
         await self.sub_callback_manager.add_callback_func(service_name, clusters, callback_func_wrapper)

{nacos_sdk_python-3.0.3 → nacos_sdk_python-3.0.4}/v2/nacos/redo/abstract_redo_service.py

@@ -42,7 +42,7 @@ class AbstractRedoService(ConnectionEventListener,ABC):
 
 			if not self._connected:
 				self._logger.warning("Grpc Connection is disconnect, skip current redo task")
-				return
+				continue
 
 			try:
 				await self.redo_task()

{nacos_sdk_python-3.0.3 → nacos_sdk_python-3.0.4}/v2/nacos/transport/grpc_client.py

@@ -195,4 +195,4 @@ class GrpcClient(RpcClient):
         return ConnectionType.GRPC
 
     def get_rpc_port_offset(self) -> int:
-        return 1000
+        return self.grpc_config.port_offset