nacos-sdk-python 2.0.0b3__tar.gz → 2.0.0b5__tar.gz

{nacos-sdk-python-2.0.0b3 → nacos-sdk-python-2.0.0b5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nacos-sdk-python
-Version: 2.0.0b3
+Version: 2.0.0b5
 Summary: Python client for Nacos.
 Home-page: https://github.com/nacos-group/nacos-sdk-python
 Author: nacos
@@ -304,12 +304,16 @@ Description:
         ## Installation
         
         ```shell
-        pip install nacos-sdk-python
+         pip install nacos-sdk-python==2.0.0b4 
         ```
         
         ## Client Configuration
         
         ```
+        from v2.nacos import NacosNamingService, ClientConfigBuilder, GRPCConfig, Instance, SubscribeServiceParam, \
+            RegisterInstanceParam, DeregisterInstanceParam, BatchRegisterInstanceParam, GetServiceParam, ListServiceParam, \
+            ListInstanceParam, NacosConfigService, ConfigParam
+            
         client_config = (ClientConfigBuilder()
                          .access_key(os.getenv('NACOS_ACCESS_KEY'))
                          .secret_key(os.getenv('NACOS_SECRET_KEY'))

{nacos-sdk-python-2.0.0b3 → nacos-sdk-python-2.0.0b5}/README.md

@@ -292,12 +292,16 @@ Supported Nacos version over 2.x
 ## Installation
 
 ```shell
-pip install nacos-sdk-python
+ pip install nacos-sdk-python==2.0.0b4 
 ```
 
 ## Client Configuration
 
 ```
+from v2.nacos import NacosNamingService, ClientConfigBuilder, GRPCConfig, Instance, SubscribeServiceParam, \
+    RegisterInstanceParam, DeregisterInstanceParam, BatchRegisterInstanceParam, GetServiceParam, ListServiceParam, \
+    ListInstanceParam, NacosConfigService, ConfigParam
+    
 client_config = (ClientConfigBuilder()
                  .access_key(os.getenv('NACOS_ACCESS_KEY'))
                  .secret_key(os.getenv('NACOS_SECRET_KEY'))

{nacos-sdk-python-2.0.0b3 → nacos-sdk-python-2.0.0b5}/nacos/client.py

@@ -341,7 +341,7 @@ class NacosClient:
         self.proxies = None
         self.logDir = logDir
 
-        self.heartbeats: Dict[str, HeartbeatTask] = {}
+        self.heartbeats = {}
         if self.username and self.password:
             self.get_access_token()
         logger.info("[client-init] endpoint:%s, tenant:%s" % (endpoint, namespace))
@@ -1150,8 +1150,8 @@ class NacosClient:
 
     def send_heartbeat(self, service_name, ip, port, cluster_name=None, weight=1.0, metadata=None, ephemeral=True,
                        group_name=DEFAULT_GROUP_NAME):
-        logger.info("[send-heartbeat] ip:%s, port:%s, service_name:%s, namespace:%s" % (ip, port, service_name,
-                                                                                        self.namespace))
+        logger.debug("[send-heartbeat] ip:%s, port:%s, service_name:%s, namespace:%s" % (ip, port, service_name,
+                                                                                         self.namespace))
         if "@@" not in service_name and group_name:
             service_name = group_name + "@@" + service_name
 
@@ -1186,7 +1186,7 @@ class NacosClient:
             resp = self._do_sync_req("/nacos/v1/ns/instance/beat", None, params, None, self.default_timeout, "PUT",
                                      "naming")
             c = resp.read()
-            logger.info("[send-heartbeat] ip:%s, port:%s, service_name:%s, namespace:%s, server response:%s" %
+            logger.debug("[send-heartbeat] ip:%s, port:%s, service_name:%s, namespace:%s, server response:%s" %
                         (ip, port, service_name, self.namespace, c))
             return json.loads(c.decode("UTF-8"))
         except HTTPError as e:

{nacos-sdk-python-2.0.0b3 → nacos-sdk-python-2.0.0b5}/nacos_sdk_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nacos-sdk-python
-Version: 2.0.0b3
+Version: 2.0.0b5
 Summary: Python client for Nacos.
 Home-page: https://github.com/nacos-group/nacos-sdk-python
 Author: nacos
@@ -304,12 +304,16 @@ Description:
         ## Installation
         
         ```shell
-        pip install nacos-sdk-python
+         pip install nacos-sdk-python==2.0.0b4 
         ```
         
         ## Client Configuration
         
         ```
+        from v2.nacos import NacosNamingService, ClientConfigBuilder, GRPCConfig, Instance, SubscribeServiceParam, \
+            RegisterInstanceParam, DeregisterInstanceParam, BatchRegisterInstanceParam, GetServiceParam, ListServiceParam, \
+            ListInstanceParam, NacosConfigService, ConfigParam
+            
         client_config = (ClientConfigBuilder()
                          .access_key(os.getenv('NACOS_ACCESS_KEY'))
                          .secret_key(os.getenv('NACOS_SECRET_KEY'))

{nacos-sdk-python-2.0.0b3 → nacos-sdk-python-2.0.0b5}/setup.py

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

{nacos-sdk-python-2.0.0b3 → nacos-sdk-python-2.0.0b5}/v2/nacos/common/client_config.py

@@ -55,6 +55,7 @@ class ClientConfig:
 
         self.endpoint = endpoint
         self.endpoint_context_path = Constants.WEB_CONTEXT
+        self.endpoint_query_header = None
         self.namespace_id = namespace_id
         self.access_key = access_key
         self.context_path = context_path

{nacos-sdk-python-2.0.0b3 → nacos-sdk-python-2.0.0b5}/v2/nacos/common/client_config_builder.py

@@ -1,3 +1,5 @@
+from typing import Dict, List
+
 from v2.nacos.common.client_config import ClientConfig, GRPCConfig
 from v2.nacos.common.client_config import KMSConfig
 from v2.nacos.common.client_config import TLSConfig
@@ -82,5 +84,11 @@ class ClientConfigBuilder:
         self._config.app_conn_labels.update(app_conn_labels)
         return self
 
+    def endpoint_query_header(self, endpoint_query_header: Dict[str, str]) -> "ClientConfigBuilder":
+        if self._config.endpoint_query_header is None:
+            self._config.endpoint_query_header = {}
+        self._config.endpoint_query_header.update(endpoint_query_header)
+        return self
+
     def build(self):
         return self._config

{nacos-sdk-python-2.0.0b3 → nacos-sdk-python-2.0.0b5}/v2/nacos/config/remote/config_grpc_client_proxy.py

@@ -53,6 +53,7 @@ class ConfigGRPCClientProxy:
                                                                self.execute_config_listen_channel)
 
     async def start(self):
+        await self.nacos_server_connector.init()
         await self.fetch_rpc_client(0)
 
     async def fetch_rpc_client(self, task_id: int = 0) -> RpcClient:

{nacos-sdk-python-2.0.0b3 → nacos-sdk-python-2.0.0b5}/v2/nacos/naming/remote/naming_grpc_client_proxy.py

@@ -47,6 +47,7 @@ class NamingGRPCClientProxy:
         self.event_listener = NamingGrpcConnectionEventListener(self)
 
     async def start(self):
+        await self.nacos_server_connector.init()
         labels = {Constants.LABEL_SOURCE: Constants.LABEL_SOURCE_SDK,
                   Constants.LABEL_MODULE: Constants.NAMING_MODULE}
         self.rpc_client = await RpcClientFactory(self.logger).create_client(str(self.uuid), ConnectionType.GRPC, labels,

nacos-sdk-python-2.0.0b5/v2/nacos/transport/grpcauto/nacos_grpc_service_pb2.py

@@ -0,0 +1,51 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# NO CHECKED-IN PROTOBUF GENCODE
+# source: nacos_grpc_service.proto
+# Protobuf Python Version: 5.27.2
+"""Generated protocol buffer code."""
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import runtime_version as _runtime_version
+from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import builder as _builder
+_runtime_version.ValidateProtobufRuntimeVersion(
+    _runtime_version.Domain.PUBLIC,
+    5,
+    27,
+    2,
+    '',
+    'nacos_grpc_service.proto'
+)
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+from google.protobuf import any_pb2 as google_dot_protobuf_dot_any__pb2
+from google.protobuf import timestamp_pb2 as google_dot_protobuf_dot_timestamp__pb2
+
+
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x18nacos_grpc_service.proto\x1a\x19google/protobuf/any.proto\x1a\x1fgoogle/protobuf/timestamp.proto\"\x83\x01\n\x08Metadata\x12\x0c\n\x04type\x18\x03 \x01(\t\x12\x10\n\x08\x63lientIp\x18\x08 \x01(\t\x12\'\n\x07headers\x18\x07 \x03(\x0b\x32\x16.Metadata.HeadersEntry\x1a.\n\x0cHeadersEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"J\n\x07Payload\x12\x1b\n\x08metadata\x18\x02 \x01(\x0b\x32\t.Metadata\x12\"\n\x04\x62ody\x18\x03 \x01(\x0b\x32\x14.google.protobuf.Any28\n\rRequestStream\x12\'\n\rrequestStream\x12\x08.Payload\x1a\x08.Payload\"\x00\x30\x01\x32*\n\x07Request\x12\x1f\n\x07request\x12\x08.Payload\x1a\x08.Payload\"\x00\x32>\n\x0f\x42iRequestStream\x12+\n\x0frequestBiStream\x12\x08.Payload\x1a\x08.Payload\"\x00(\x01\x30\x01\x42#\n\x1f\x63om.alibaba.nacos.api.grpc.autoP\x01\x62\x06proto3')
+
+_globals = globals()
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'nacos_grpc_service_pb2', _globals)
+if not _descriptor._USE_C_DESCRIPTORS:
+  _globals['DESCRIPTOR']._loaded_options = None
+  _globals['DESCRIPTOR']._serialized_options = b'\n\037com.alibaba.nacos.api.grpc.autoP\001'
+  _globals['_METADATA_HEADERSENTRY']._loaded_options = None
+  _globals['_METADATA_HEADERSENTRY']._serialized_options = b'8\001'
+  _globals['_METADATA']._serialized_start=89
+  _globals['_METADATA']._serialized_end=220
+  _globals['_METADATA_HEADERSENTRY']._serialized_start=174
+  _globals['_METADATA_HEADERSENTRY']._serialized_end=220
+  _globals['_PAYLOAD']._serialized_start=222
+  _globals['_PAYLOAD']._serialized_end=296
+  _globals['_REQUESTSTREAM']._serialized_start=298
+  _globals['_REQUESTSTREAM']._serialized_end=354
+  _globals['_REQUEST']._serialized_start=356
+  _globals['_REQUEST']._serialized_end=398
+  _globals['_BIREQUESTSTREAM']._serialized_start=400
+  _globals['_BIREQUESTSTREAM']._serialized_end=462
+# @@protoc_insertion_point(module_scope)

nacos-sdk-python-2.0.0b5/v2/nacos/transport/grpcauto/nacos_grpc_service_pb2_grpc.py

@@ -0,0 +1,244 @@
+# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
+"""Client and server classes corresponding to protobuf-defined services."""
+import grpc
+
+import v2.nacos.transport.grpcauto.nacos_grpc_service_pb2 as nacos__grpc__service__pb2
+
+GRPC_GENERATED_VERSION = '1.66.1'
+GRPC_VERSION = grpc.__version__
+_version_not_supported = False
+
+try:
+    from grpc._utilities import first_version_is_lower
+
+    _version_not_supported = first_version_is_lower(GRPC_VERSION, GRPC_GENERATED_VERSION)
+except ImportError:
+    _version_not_supported = True
+
+if _version_not_supported:
+    raise RuntimeError(
+        f'The grpc package installed is at version {GRPC_VERSION},'
+        + f' but the generated code in nacos_grpc_service_pb2_grpc.py depends on'
+        + f' grpcio>={GRPC_GENERATED_VERSION}.'
+        + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}'
+        + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.'
+    )
+
+
+class RequestStreamStub(object):
+    """Missing associated documentation comment in .proto file."""
+
+    def __init__(self, channel):
+        """Constructor.
+
+        Args:
+            channel: A grpc.Channel.
+        """
+        self.requestStream = channel.unary_stream(
+            '/RequestStream/requestStream',
+            request_serializer=nacos__grpc__service__pb2.Payload.SerializeToString,
+            response_deserializer=nacos__grpc__service__pb2.Payload.FromString,
+            _registered_method=True)
+
+
+class RequestStreamServicer(object):
+    """Missing associated documentation comment in .proto file."""
+
+    def requestStream(self, request, context):
+        """build a streamRequest
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+
+def add_RequestStreamServicer_to_server(servicer, server):
+    rpc_method_handlers = {
+        'requestStream': grpc.unary_stream_rpc_method_handler(
+            servicer.requestStream,
+            request_deserializer=nacos__grpc__service__pb2.Payload.FromString,
+            response_serializer=nacos__grpc__service__pb2.Payload.SerializeToString,
+        ),
+    }
+    generic_handler = grpc.method_handlers_generic_handler(
+        'RequestStream', rpc_method_handlers)
+    server.add_generic_rpc_handlers((generic_handler,))
+    server.add_registered_method_handlers('RequestStream', rpc_method_handlers)
+
+
+# This class is part of an EXPERIMENTAL API.
+class RequestStream(object):
+    """Missing associated documentation comment in .proto file."""
+
+    @staticmethod
+    def requestStream(request,
+                      target,
+                      options=(),
+                      channel_credentials=None,
+                      call_credentials=None,
+                      insecure=False,
+                      compression=None,
+                      wait_for_ready=None,
+                      timeout=None,
+                      metadata=None):
+        return grpc.experimental.unary_stream(
+            request,
+            target,
+            '/RequestStream/requestStream',
+            nacos__grpc__service__pb2.Payload.SerializeToString,
+            nacos__grpc__service__pb2.Payload.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+
+class RequestStub(object):
+    """Missing associated documentation comment in .proto file."""
+
+    def __init__(self, channel):
+        """Constructor.
+
+        Args:
+            channel: A grpc.Channel.
+        """
+        self.request = channel.unary_unary(
+            '/Request/request',
+            request_serializer=nacos__grpc__service__pb2.Payload.SerializeToString,
+            response_deserializer=nacos__grpc__service__pb2.Payload.FromString,
+            _registered_method=True)
+
+
+class RequestServicer(object):
+    """Missing associated documentation comment in .proto file."""
+
+    def request(self, request, context):
+        """Sends a commonRequest
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+
+def add_RequestServicer_to_server(servicer, server):
+    rpc_method_handlers = {
+        'request': grpc.unary_unary_rpc_method_handler(
+            servicer.request,
+            request_deserializer=nacos__grpc__service__pb2.Payload.FromString,
+            response_serializer=nacos__grpc__service__pb2.Payload.SerializeToString,
+        ),
+    }
+    generic_handler = grpc.method_handlers_generic_handler(
+        'Request', rpc_method_handlers)
+    server.add_generic_rpc_handlers((generic_handler,))
+    server.add_registered_method_handlers('Request', rpc_method_handlers)
+
+
+# This class is part of an EXPERIMENTAL API.
+class Request(object):
+    """Missing associated documentation comment in .proto file."""
+
+    @staticmethod
+    def request(request,
+                target,
+                options=(),
+                channel_credentials=None,
+                call_credentials=None,
+                insecure=False,
+                compression=None,
+                wait_for_ready=None,
+                timeout=None,
+                metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/Request/request',
+            nacos__grpc__service__pb2.Payload.SerializeToString,
+            nacos__grpc__service__pb2.Payload.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+
+class BiRequestStreamStub(object):
+    """Missing associated documentation comment in .proto file."""
+
+    def __init__(self, channel):
+        """Constructor.
+
+        Args:
+            channel: A grpc.Channel.
+        """
+        self.requestBiStream = channel.stream_stream(
+            '/BiRequestStream/requestBiStream',
+            request_serializer=nacos__grpc__service__pb2.Payload.SerializeToString,
+            response_deserializer=nacos__grpc__service__pb2.Payload.FromString,
+            _registered_method=True)
+
+
+class BiRequestStreamServicer(object):
+    """Missing associated documentation comment in .proto file."""
+
+    def requestBiStream(self, request_iterator, context):
+        """Sends a commonRequest
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+
+def add_BiRequestStreamServicer_to_server(servicer, server):
+    rpc_method_handlers = {
+        'requestBiStream': grpc.stream_stream_rpc_method_handler(
+            servicer.requestBiStream,
+            request_deserializer=nacos__grpc__service__pb2.Payload.FromString,
+            response_serializer=nacos__grpc__service__pb2.Payload.SerializeToString,
+        ),
+    }
+    generic_handler = grpc.method_handlers_generic_handler(
+        'BiRequestStream', rpc_method_handlers)
+    server.add_generic_rpc_handlers((generic_handler,))
+    server.add_registered_method_handlers('BiRequestStream', rpc_method_handlers)
+
+
+# This class is part of an EXPERIMENTAL API.
+class BiRequestStream(object):
+    """Missing associated documentation comment in .proto file."""
+
+    @staticmethod
+    def requestBiStream(request_iterator,
+                        target,
+                        options=(),
+                        channel_credentials=None,
+                        call_credentials=None,
+                        insecure=False,
+                        compression=None,
+                        wait_for_ready=None,
+                        timeout=None,
+                        metadata=None):
+        return grpc.experimental.stream_stream(
+            request_iterator,
+            target,
+            '/BiRequestStream/requestBiStream',
+            nacos__grpc__service__pb2.Payload.SerializeToString,
+            nacos__grpc__service__pb2.Payload.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)

{nacos-sdk-python-2.0.0b3 → nacos-sdk-python-2.0.0b5}/v2/nacos/transport/http_agent.py

@@ -51,8 +51,8 @@ class HttpAgent:
                         return None, error_msg
 
         except aiohttp.ClientError as e:
-            self.logger.waring(f"[http-request] client error: {e}")
+            self.logger.warning(f"[http-request] client error: {e}")
             return None, e
         except Exception as e:
-            self.logger.waring(f"[http-request] unexpected error: {e}")
+            self.logger.warning(f"[http-request] unexpected error: {e}")
             return None, e

{nacos-sdk-python-2.0.0b3 → nacos-sdk-python-2.0.0b5}/v2/nacos/transport/nacos_server_connector.py

@@ -4,7 +4,7 @@ from typing import List, Optional
 
 from v2.nacos.common.client_config import ClientConfig
 from v2.nacos.common.constants import Constants
-from v2.nacos.common.nacos_exception import NacosException, INVALID_PARAM
+from v2.nacos.common.nacos_exception import NacosException, INVALID_PARAM, INVALID_SERVER_STATUS
 from v2.nacos.transport.auth_client import AuthClient
 from v2.nacos.transport.http_agent import HttpAgent
 
@@ -23,19 +23,20 @@ class NacosServerConnector:
         self.endpoint = client_config.endpoint
         self.server_list_lock = asyncio.Lock()
 
-        if len(self.server_list) == 0:
-            self._get_server_list_from_endpoint()
-            self.refresh_server_list_internal = 30  # second
-            asyncio.create_task(self._refresh_server_srv_if_need())
-
-        if len(self.server_list) == 0:
-            raise NacosException(INVALID_PARAM, "server list is empty")
+        self.refresh_server_list_internal = 30  # second
+        if len(self.server_list) != 0:
+            self.current_index = randrange(0, len(self.server_list))
 
-        self.current_index = randrange(0, len(self.server_list))
         if client_config.username and client_config.password:
             self.auth_client = AuthClient(self.logger, client_config, self.get_server_list, http_agent)
             asyncio.create_task(self.auth_client.get_access_token(True))
 
+    async def init(self):
+        await self._get_server_list_from_endpoint()
+        if len(self.server_list) == 0:
+            raise NacosException(INVALID_SERVER_STATUS, "server list is empty")
+        asyncio.create_task(self._refresh_server_srv_if_need())
+
     async def _get_server_list_from_endpoint(self) -> Optional[List[str]]:
         if not self.endpoint or self.endpoint.strip() == "":
             return None
@@ -43,7 +44,8 @@ class NacosServerConnector:
         url = self.endpoint.strip() + self.client_config.endpoint_context_path + "/serverlist"
         server_list = []
         try:
-            response, err = await self.http_agent.request(url, "GET", None, None, None)
+            response, err = await self.http_agent.request(url, "GET", self.client_config.endpoint_query_header, None,
+                                                          None)
             if err:
                 self.logger.error("[get-server-list] get server list from endpoint failed,url:%s, err:%s", url, err)
                 return None
@@ -53,15 +55,16 @@ class NacosServerConnector:
                     for server_info in response.decode('utf-8').strip().split("\n"):
                         sp = server_info.strip().split(":")
                         if len(sp) == 1:
-                            server_list.append((sp[0] + ":" + Constants.DEFAULT_PORT))
+                            server_list.append((sp[0] + ":" + str(Constants.DEFAULT_PORT)))
                         else:
                             server_list.append(server_info)
 
                     if len(server_list) != 0 and set(server_list) != set(self.server_list):
-                        with self.server_list_lock:
+                        async with self.server_list_lock:
                             old_server_list = self.server_list
                             self.server_list = server_list
-                            self.logger.info("[refresh server list] nacos server list is updated from %s to %s",
+                            self.current_index = randrange(0, len(self.server_list))
+                            self.logger.info("nacos server list is updated from %s to %s",
                                              str(old_server_list), str(server_list))
         except Exception as e:
             self.logger.error("[get-server-list] get server list from endpoint failed,url:%s, err:%s", url, e)
@@ -81,7 +84,7 @@ class NacosServerConnector:
 
     def get_next_server(self):
         if not self.server_list:
-            raise ValueError('server list is empty')
+            raise NacosException(INVALID_SERVER_STATUS, 'server list is empty')
         self.current_index = (self.current_index + 1) % len(self.server_list)
         return self.server_list[self.current_index]