nacos-sdk-python 2.0.0__tar.gz → 2.0.0b1__tar.gz

{nacos-sdk-python-2.0.0 → nacos-sdk-python-2.0.0b1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nacos-sdk-python
-Version: 2.0.0
+Version: 2.0.0b1
 Summary: Python client for Nacos.
 Home-page: https://github.com/nacos-group/nacos-sdk-python
 Author: nacos
@@ -304,16 +304,12 @@ Description:
         ## Installation
         
         ```shell
-         pip install nacos-sdk-python==2.0.0b5 
+        pip install nacos-sdk-python
         ```
         
         ## 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.0 → nacos-sdk-python-2.0.0b1}/README.md

@@ -292,16 +292,12 @@ Supported Nacos version over 2.x
 ## Installation
 
 ```shell
- pip install nacos-sdk-python==2.0.0b5 
+pip install nacos-sdk-python
 ```
 
 ## 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.0 → nacos-sdk-python-2.0.0b1}/nacos/client.py

@@ -46,7 +46,7 @@ from .timer import NacosTimer, NacosTimerManager
 
 logger = logging.getLogger(__name__)
 
-VERSION = "0.1.16"
+VERSION = "2.0.0.beta1"
 
 DEFAULT_GROUP_NAME = "DEFAULT_GROUP"
 DEFAULT_NAMESPACE = ""
@@ -341,7 +341,7 @@ class NacosClient:
         self.proxies = None
         self.logDir = logDir
 
-        self.heartbeats = {}
+        self.heartbeats: Dict[str, HeartbeatTask] = {}
         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.debug("[send-heartbeat] ip:%s, port:%s, service_name:%s, namespace:%s" % (ip, port, service_name,
-                                                                                         self.namespace))
+        logger.info("[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.debug("[send-heartbeat] ip:%s, port:%s, service_name:%s, namespace:%s, server response:%s" %
+            logger.info("[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.0 → nacos-sdk-python-2.0.0b1}/nacos_sdk_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nacos-sdk-python
-Version: 2.0.0
+Version: 2.0.0b1
 Summary: Python client for Nacos.
 Home-page: https://github.com/nacos-group/nacos-sdk-python
 Author: nacos
@@ -304,16 +304,12 @@ Description:
         ## Installation
         
         ```shell
-         pip install nacos-sdk-python==2.0.0b5 
+        pip install nacos-sdk-python
         ```
         
         ## 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.0b1/nacos_sdk_python.egg-info/SOURCES.txt

@@ -0,0 +1,15 @@
+README.md
+setup.py
+nacos/__init__.py
+nacos/client.py
+nacos/commons.py
+nacos/exception.py
+nacos/files.py
+nacos/listener.py
+nacos/params.py
+nacos/task.py
+nacos/timer.py
+nacos_sdk_python.egg-info/PKG-INFO
+nacos_sdk_python.egg-info/SOURCES.txt
+nacos_sdk_python.egg-info/dependency_links.txt
+nacos_sdk_python.egg-info/top_level.txt

{nacos-sdk-python-2.0.0 → nacos-sdk-python-2.0.0b1}/nacos_sdk_python.egg-info/top_level.txt

@@ -1,2 +1 @@
 nacos
-v2

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

@@ -5,6 +5,8 @@ from shutil import rmtree
 
 from setuptools import find_packages, setup, Command
 
+import nacos
+
 #  just run `python setup.py upload`
 here = os.path.abspath(os.path.dirname(__file__))
 
@@ -12,11 +14,6 @@ with io.open(os.path.join(here, 'README.md'), encoding='UTF-8') as f:
     long_description = '\n' + f.read()
 
 
-def read_requirements():
-    with open(os.path.join(here, 'requirements.txt'), encoding='utf-8') as f:
-        return f.read().splitlines()
-
-
 class UploadCommand(Command):
     """Support setup.py upload."""
 
@@ -53,7 +50,7 @@ class UploadCommand(Command):
 
 setup(
     name="nacos-sdk-python",
-    version="2.0.0",
+    version=nacos.__version__,
     packages=find_packages(
         exclude=["test", "*.tests", "*.tests.*", "tests.*", "tests"]),
     url="https://github.com/nacos-group/nacos-sdk-python",
@@ -72,7 +69,7 @@ setup(
     description="Python client for Nacos.",
     long_description=long_description,
     long_description_content_type="text/markdown",
-    install_requires=read_requirements(),
+    install_requires=[],
     # $ setup.py publish support.
     cmdclass={
         'upload': UploadCommand,

nacos-sdk-python-2.0.0/nacos_sdk_python.egg-info/SOURCES.txt

@@ -1,105 +0,0 @@
-README.md
-setup.py
-nacos/__init__.py
-nacos/client.py
-nacos/commons.py
-nacos/exception.py
-nacos/files.py
-nacos/listener.py
-nacos/params.py
-nacos/task.py
-nacos/timer.py
-nacos_sdk_python.egg-info/PKG-INFO
-nacos_sdk_python.egg-info/SOURCES.txt
-nacos_sdk_python.egg-info/dependency_links.txt
-nacos_sdk_python.egg-info/requires.txt
-nacos_sdk_python.egg-info/top_level.txt
-v2/__init__.py
-v2/nacos/__init__.py
-v2/nacos/nacos_client.py
-v2/nacos/common/__init__.py
-v2/nacos/common/client_config.py
-v2/nacos/common/client_config_builder.py
-v2/nacos/common/constants.py
-v2/nacos/common/nacos_exception.py
-v2/nacos/common/payload_registry.py
-v2/nacos/common/preserved_metadata_key.py
-v2/nacos/config/__init__.py
-v2/nacos/config/nacos_config_service.py
-v2/nacos/config/cache/__init__.py
-v2/nacos/config/cache/config_info_cache.py
-v2/nacos/config/cache/config_subscribe_manager.py
-v2/nacos/config/encryption/__init__.py
-v2/nacos/config/encryption/kms_client.py
-v2/nacos/config/encryption/kms_handler.py
-v2/nacos/config/encryption/plugin/__init__.py
-v2/nacos/config/encryption/plugin/encryption_plugin.py
-v2/nacos/config/encryption/plugin/kms_aes_128_encrytion_plugin.py
-v2/nacos/config/encryption/plugin/kms_aes_256_encrytion_plugin.py
-v2/nacos/config/encryption/plugin/kms_base_encryption_plugin.py
-v2/nacos/config/encryption/plugin/kms_encrytion_plugin.py
-v2/nacos/config/filter/__init__.py
-v2/nacos/config/filter/config_encryption_filter.py
-v2/nacos/config/filter/config_filter.py
-v2/nacos/config/model/__init__.py
-v2/nacos/config/model/config.py
-v2/nacos/config/model/config_param.py
-v2/nacos/config/model/config_request.py
-v2/nacos/config/model/config_response.py
-v2/nacos/config/remote/__init__.py
-v2/nacos/config/remote/config_change_notify_request_handler.py
-v2/nacos/config/remote/config_grpc_client_proxy.py
-v2/nacos/config/remote/config_grpc_connection_event_listener.py
-v2/nacos/config/util/__init__.py
-v2/nacos/config/util/config_client_util.py
-v2/nacos/naming/__init__.py
-v2/nacos/naming/nacos_naming_service.py
-v2/nacos/naming/cache/__init__.py
-v2/nacos/naming/cache/service_info_cache.py
-v2/nacos/naming/cache/subscribe_manager.py
-v2/nacos/naming/event/__init__.py
-v2/nacos/naming/event/instance_change_notifier.py
-v2/nacos/naming/model/__init__.py
-v2/nacos/naming/model/instance.py
-v2/nacos/naming/model/naming_param.py
-v2/nacos/naming/model/naming_request.py
-v2/nacos/naming/model/naming_response.py
-v2/nacos/naming/model/service.py
-v2/nacos/naming/remote/__init__.py
-v2/nacos/naming/remote/naming_grpc_client_proxy.py
-v2/nacos/naming/remote/naming_grpc_connection_event_listener.py
-v2/nacos/naming/remote/naming_push_request_handler.py
-v2/nacos/naming/util/__init__.py
-v2/nacos/naming/util/naming_client_util.py
-v2/nacos/naming/util/naming_remote_constants.py
-v2/nacos/proto/__init__.py
-v2/nacos/transport/__init__.py
-v2/nacos/transport/auth_client.py
-v2/nacos/transport/connection.py
-v2/nacos/transport/connection_event_listener.py
-v2/nacos/transport/grpc_client.py
-v2/nacos/transport/grpc_connection.py
-v2/nacos/transport/grpc_util.py
-v2/nacos/transport/http_agent.py
-v2/nacos/transport/nacos_server_connector.py
-v2/nacos/transport/rpc_client.py
-v2/nacos/transport/rpc_client_factory.py
-v2/nacos/transport/server_request_handler.py
-v2/nacos/transport/grpcauto/__init__.py
-v2/nacos/transport/grpcauto/nacos_grpc_service_pb2.py
-v2/nacos/transport/grpcauto/nacos_grpc_service_pb2_grpc.py
-v2/nacos/transport/model/__init__.py
-v2/nacos/transport/model/internal_request.py
-v2/nacos/transport/model/internal_response.py
-v2/nacos/transport/model/rpc_request.py
-v2/nacos/transport/model/rpc_response.py
-v2/nacos/transport/model/server_info.py
-v2/nacos/utils/__init__.py
-v2/nacos/utils/aes_util.py
-v2/nacos/utils/common_util.py
-v2/nacos/utils/content_util.py
-v2/nacos/utils/encode_util.py
-v2/nacos/utils/file_util.py
-v2/nacos/utils/hmac_util.py
-v2/nacos/utils/md5_util.py
-v2/nacos/utils/net_util.py

nacos-sdk-python-2.0.0/nacos_sdk_python.egg-info/requires.txt

@@ -1,9 +0,0 @@
-aiofiles>=24.1.0
-aiohttp>=3.10.11
-alibabacloud_kms20160120>=2.2.3
-alibabacloud_tea_openapi>=0.3.12
-grpcio>=1.66.1
-protobuf>=3.20.3
-psutil>=5.9.6
-pycryptodome>=3.19.1
-pydantic>=2.10.4

nacos-sdk-python-2.0.0/v2/nacos/__init__.py

@@ -1,41 +0,0 @@
-from .common.client_config import (KMSConfig,
-                                   GRPCConfig,
-                                   TLSConfig,
-                                   ClientConfig)
-from .common.client_config_builder import ClientConfigBuilder
-from .common.nacos_exception import NacosException
-from .config.model.config_param import ConfigParam
-from .config.nacos_config_service import NacosConfigService
-from .naming.model.instance import Instance
-from .naming.model.naming_param import (RegisterInstanceParam,
-                                        BatchRegisterInstanceParam,
-                                        DeregisterInstanceParam,
-                                        ListInstanceParam,
-                                        SubscribeServiceParam,
-                                        GetServiceParam,
-                                        ListServiceParam)
-from .naming.model.service import (Service,
-                                   ServiceList)
-from .naming.nacos_naming_service import NacosNamingService
-
-__all__ = [
-    "KMSConfig",
-    "GRPCConfig",
-    "TLSConfig",
-    "ClientConfig",
-    "ClientConfigBuilder",
-    "NacosException",
-    "ConfigParam",
-    "NacosConfigService",
-    "Instance",
-    "Service",
-    "ServiceList",
-    "RegisterInstanceParam",
-    "BatchRegisterInstanceParam",
-    "DeregisterInstanceParam",
-    "ListInstanceParam",
-    "SubscribeServiceParam",
-    "GetServiceParam",
-    "ListServiceParam",
-    "NacosNamingService"
-]

nacos-sdk-python-2.0.0/v2/nacos/common/client_config.py

@@ -1,127 +0,0 @@
-import logging
-
-from v2.nacos.common.constants import Constants
-from v2.nacos.common.nacos_exception import NacosException, INVALID_PARAM
-
-
-class KMSConfig:
-    def __init__(self, enabled=False, endpoint='', access_key='', secret_key='', client_key_content='', password=''):
-        self.enabled = enabled  # 是否启用kms
-        self.endpoint = endpoint  # kms服务的地址
-        self.client_key_content = client_key_content
-        self.password = password
-        self.access_key = access_key
-        self.secret_key = secret_key
-
-
-class TLSConfig:
-    def __init__(self, enabled=False, appointed=False, ca_file='', cert_file='',
-                 key_file='', server_name_override=''):
-        self.enabled = enabled  # 是否启用tls
-        self.appointed = appointed  # 指明是否使用预设的配置
-        self.ca_file = ca_file  # CA证书文件的路径
-        self.cert_file = cert_file  # 客户端证书文件的路径
-        self.key_file = key_file  # 私钥文件的路径
-        self.server_name_override = server_name_override  # 服务器名称覆盖（用于测试）
-
-    def __str__(self):
-        return str(self.__dict__)
-
-
-class GRPCConfig:
-    def __init__(self, max_receive_message_length=Constants.GRPC_MAX_RECEIVE_MESSAGE_LENGTH,
-                 max_keep_alive_ms=Constants.GRPC_KEEPALIVE_TIME_MILLS,
-                 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):
-        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
-
-
-class ClientConfig:
-    def __init__(self, server_addresses=None, endpoint=None, namespace_id='', context_path='', access_key=None,
-                 secret_key=None, username=None, password=None, app_name='', app_key='', log_dir='', log_level=None,
-                 log_rotation_backup_count=None, app_conn_labels=None):
-        self.server_list = []
-        try:
-            if server_addresses is not None and server_addresses.strip() != "":
-                for server_address in server_addresses.strip().split(','):
-                    self.server_list.append(server_address.strip())
-        except Exception:
-            raise NacosException(INVALID_PARAM, "server_addresses is invalid")
-
-        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
-        self.secret_key = secret_key
-        self.username = username  # the username for nacos auth
-        self.password = password  # the password for nacos auth
-        self.app_name = app_name
-        self.app_key = app_key
-        self.cache_dir = ''
-        self.disable_use_config_cache = False
-        self.log_dir = log_dir
-        self.log_level = logging.INFO if log_level is None else log_level  # the log level for nacos client, default value is logging.INFO: log_level
-        self.log_rotation_backup_count = 7 if log_rotation_backup_count is None else log_rotation_backup_count
-        self.timeout_ms = 10 * 1000  # timeout for requesting Nacos server, default value is 10000ms
-        self.heart_beat_interval = 5 * 1000  # the time interval for sending beat to server,default value is 5000ms
-        self.kms_config = KMSConfig(enabled=False)
-        self.tls_config = TLSConfig(enabled=False)
-        self.grpc_config = GRPCConfig()
-        self.load_cache_at_start = True
-        self.update_cache_when_empty = False
-        self.app_conn_labels = app_conn_labels
-
-    def set_log_level(self, log_level):
-        self.log_level = log_level
-        return self
-
-    def set_cache_dir(self, cache_dir):
-        self.cache_dir = cache_dir
-        return self
-
-    def set_log_dir(self, log_dir):
-        self.log_dir = log_dir
-        return self
-
-    def set_timeout_ms(self, timeout_ms):
-        self.timeout_ms = timeout_ms
-        return self
-
-    def set_heart_beat_interval(self, heart_beat_interval):
-        self.heart_beat_interval = heart_beat_interval
-        return self
-
-    def set_tls_config(self, tls_config: TLSConfig):
-        self.tls_config = tls_config
-        return self
-
-    def set_kms_config(self, kms_config: KMSConfig):
-        self.kms_config = kms_config
-        return self
-
-    def set_grpc_config(self, grpc_config: GRPCConfig):
-        self.grpc_config = grpc_config
-        return self
-
-    def set_load_cache_at_start(self, load_cache_at_start):
-        self.load_cache_at_start = load_cache_at_start
-        return self
-
-    def set_update_cache_when_empty(self, update_cache_when_empty: bool):
-        self.update_cache_when_empty = update_cache_when_empty
-        return self
-
-    def set_endpoint_context_path(self, endpoint_context_path):
-        self.endpoint_context_path = endpoint_context_path
-        return self
-
-    def set_app_conn_labels(self, app_conn_labels: dict):
-        self.app_conn_labels = app_conn_labels
-        return self

nacos-sdk-python-2.0.0/v2/nacos/common/client_config_builder.py

@@ -1,94 +0,0 @@
-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
-from v2.nacos.common.constants import Constants
-
-
-class ClientConfigBuilder:
-    def __init__(self):
-        self._config = ClientConfig()
-
-    def server_address(self, server_address: str) -> "ClientConfigBuilder":
-        if server_address is not None and server_address.strip() != "":
-            for server_address in server_address.strip().split(','):
-                self._config.server_list.append(server_address.strip())
-        return self
-
-    def endpoint(self, endpoint) -> "ClientConfigBuilder":
-        self._config.endpoint = endpoint
-        return self
-
-    def namespace_id(self, namespace_id: str) -> "ClientConfigBuilder":
-        if namespace_id is None:
-            namespace_id = Constants.DEFAULT_NAMESPACE_ID
-        self._config.namespace_id = namespace_id
-        return self
-
-    def timeout_ms(self, timeout_ms) -> "ClientConfigBuilder":
-        self._config.timeout_ms = timeout_ms
-        return self
-
-    def heart_beat_interval(self, heart_beat_interval) -> "ClientConfigBuilder":
-        self._config.heart_beat_interval = heart_beat_interval
-        return self
-
-    def log_level(self, log_level) -> "ClientConfigBuilder":
-        self._config.log_level = log_level
-        return self
-
-    def log_dir(self, log_dir: str) -> "ClientConfigBuilder":
-        self._config.log_dir = log_dir
-        return self
-
-    def access_key(self, access_key: str) -> "ClientConfigBuilder":
-        self._config.access_key = access_key
-        return self
-
-    def secret_key(self, secret_key: str) -> "ClientConfigBuilder":
-        self._config.secret_key = secret_key
-        return self
-
-    def username(self, username: str) -> "ClientConfigBuilder":
-        self._config.username = username
-        return self
-
-    def password(self, password: str) -> "ClientConfigBuilder":
-        self._config.password = password
-        return self
-
-    def cache_dir(self, cache_dir: str) -> "ClientConfigBuilder":
-        self._config.cache_dir = cache_dir
-        return self
-
-    def tls_config(self, tls_config: TLSConfig) -> "ClientConfigBuilder":
-        self._config.tls_config = tls_config
-        return self
-
-    def kms_config(self, kms_config: KMSConfig) -> "ClientConfigBuilder":
-        self._config.kms_config = kms_config
-        return self
-
-    def grpc_config(self, grpc_config: GRPCConfig) -> "ClientConfigBuilder":
-        self._config.grpc_config = grpc_config
-        return self
-
-    def load_cache_at_start(self, load_cache_at_start: bool) -> "ClientConfigBuilder":
-        self._config.load_cache_at_start = load_cache_at_start
-        return self
-
-    def app_conn_labels(self, app_conn_labels: dict) -> "ClientConfigBuilder":
-        if self._config.app_conn_labels is None:
-            self._config.app_conn_labels = {}
-        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