nacos-sdk-rust-binding-py 0.1.0__tar.gz → 0.1.2__tar.gz

{nacos_sdk_rust_binding_py-0.1.0 → nacos_sdk_rust_binding_py-0.1.2}/Cargo.lock

@@ -524,9 +524,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.18"
+version = "0.4.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "518ef76f2f87365916b142844c16d8fefd85039bc5699050210a7778ee1cd1de"
+checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4"
 
 [[package]]
 name = "matchit"
@@ -609,7 +609,7 @@ dependencies = [
 
 [[package]]
 name = "nacos-sdk-rust-binding-py"
-version = "0.1.0"
+version = "0.1.2"
 dependencies = [
  "lazy_static",
  "nacos-sdk",

{nacos_sdk_rust_binding_py-0.1.0 → nacos_sdk_rust_binding_py-0.1.2}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "nacos-sdk-rust-binding-py"
-version = "0.1.0"
+version = "0.1.2"
 edition = "2021"
 license = "Apache-2.0"
 publish = false

nacos_sdk_rust_binding_py-0.1.2/PKG-INFO

@@ -0,0 +1,249 @@
+Metadata-Version: 2.1
+Name: nacos-sdk-rust-binding-py
+Version: 0.1.2
+Classifier: Programming Language :: Rust
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: Implementation :: PyPy
+Requires-Dist: pdoc ; extra == 'docs'
+Requires-Dist: behave ; extra == 'test'
+Provides-Extra: docs
+Provides-Extra: test
+License-File: LICENSE
+Summary: nacos-sdk-rust binding for Python.
+Keywords: nacos,ffi,pyo3,binding,python
+Author: CheirshCai <785427346@qq.com>
+Author-email: CheirshCai <785427346@qq.com>
+License: Apache-2.0
+Requires-Python: >=3.7
+Description-Content-Type: text/markdown; charset=UTF-8; variant=GFM
+Project-URL: Documentation, https://github.com/opc-source/nacos-sdk-rust-binding-py.git
+Project-URL: Homepage, https://github.com/opc-source/nacos-sdk-rust-binding-py.git
+Project-URL: Repository, https://github.com/opc-source/nacos-sdk-rust-binding-py.git
+
+# nacos-sdk-rust-binding-py
+nacos-sdk-rust binding for Python with PyO3.
+
+Tip: nacos-sdk-python 仓库暂未提供 2.x gRPC 交互模式，为了能升级它，故而通过 ffi 方式调用 nacos-sdk-rust
+
+## Installation
+
+```bash
+pip install nacos-sdk-rust-binding-py
+```
+
+- project package see https://pypi.org/project/nacos-sdk-rust-binding-py
+
+## Usage
+
+**使用样例请看仓库内的 examples 目录**
+
+- 客户端日志请在目录 `$HOME/logs/nacos/` 查看
+
+### Definition of ClientOptions
+
+```python
+class ClientOptions:
+    # Server Addr, e.g. address:port[,address:port],...]
+    #[pyo3(set, get)]
+    server_addr: String,
+    # Namespace/Tenant
+    #[pyo3(set, get)]
+    namespace: String,
+    # AppName
+    #[pyo3(set, get)]
+    app_name: Option<String>,
+    # Username for Auth
+    #[pyo3(set, get)]
+    username: Option<String>,
+    # Password for Auth
+    #[pyo3(set, get)]
+    password: Option<String>,
+
+    # Init
+    def __init__(self, server_addr, namespace, app_name, username, password):
+        self.server_addr = server_addr
+        self.server_addr = namespace
+        self.app_name = app_name
+        self.username = username
+        self.password = password
+
+```
+
+### Definition of Config
+
+```python
+class NacosConfigResponse:
+    # Namespace/Tenant
+    # [pyo3(get)]
+    namespace: String,
+    # DataId
+    # [pyo3(get)]
+    data_id: String,
+    # Group
+    # [pyo3(get)]
+    group: String,
+    # Content
+    # [pyo3(get)]
+    content: String,
+    # Content's Type; e.g. json,properties,xml,html,text,yaml
+    # [pyo3(get)]
+    content_type: String,
+    # Content's md5
+    # [pyo3(get)]
+    md5: String,
+
+
+class NacosConfigClient:
+    # Init. If it fails, pay attention to err
+    def __init__(self, client_options: ClientOptions):
+        # inner logic xxx
+        pass
+
+    # Get config's content. If it fails, pay attention to err
+    def get_config(self, data_id: String, group: String) -> String:
+        pass
+
+    # Get NacosConfigResponse. If it fails, pay attention to err
+    def get_config_resp(self, data_id: String, group: String) -> NacosConfigResponse:
+        pass
+
+    # Publish config. If it fails, pay attention to err
+    def publish_config(self, data_id: String, group: String, content: String) -> bool:
+        pass
+
+    # Remove config. If it fails, pay attention to err
+    def remove_config(self, data_id: String, group: String) -> bool:
+        pass
+
+    # Add NacosConfigChangeListener callback func, which listen the config change. If it fails, pay attention to err
+    def add_listener(self, data_id: String, group: String, listener: py_function):
+        pass
+
+
+```
+
+### Definition of Naming
+
+```python
+class NacosServiceInstance:
+    # Instance Id
+    #[pyo3(set, get)]
+    instance_id: Option<String>,
+    # Ip
+    #[pyo3(set, get)]
+    ip: String,
+    # Port
+    #[pyo3(set, get)]
+    port: i32,
+    # Weight, default 1.0
+    #[pyo3(set, get)]
+    weight: Option<f64>,
+    # Healthy or not, default true
+    #[pyo3(set, get)]
+    healthy: Option<bool>,
+    # Enabled ot not, default true
+    #[pyo3(set, get)]
+    enabled: Option<bool>,
+    # Ephemeral or not, default true
+    #[pyo3(set, get)]
+    ephemeral: Option<bool>,
+    # Cluster Name, default 'DEFAULT'
+    #[pyo3(set, get)]
+    cluster_name: Option<String>,
+    # Service Name
+    #[pyo3(set, get)]
+    service_name: Option<String>,
+    # Metadata, default '{}'
+    #[pyo3(set, get)]
+    metadata: Option<std::collections::HashMap<String, String>>,
+
+    # Init
+    def __init__(self, ip, port, weight, healthy, enabled, ephemeral, cluster_name, service_name, metadata):
+        # inner logic xxx
+        pass
+
+
+class NacosNamingClient:
+    # Init. If it fails, pay attention to err
+    def __init__(self, client_options: ClientOptions):
+        # inner logic xxx
+        pass
+
+    # Register instance. If it fails, pay attention to err
+    def register_instance(self, service_name: String, group: String, service_instance: NacosServiceInstance):
+        pass
+
+    # Deregister instance. If it fails, pay attention to err
+    def deregister_instance(self, service_name: String, group: String, service_instance: NacosServiceInstance):
+        pass
+
+    # Batch register instance, improve interaction efficiency. If it fails, pay attention to err
+    def batch_register_instance(self, service_name: String, group: String, service_instances: [NacosServiceInstance]):
+        pass
+
+    # Get all instances by service and group. default cluster=[], subscribe=true. If it fails, pay attention to err
+    def get_all_instances(self, service_name: String, group: String, clusters: Option<[String]>, subscribe: Option<bool>) -> [NacosServiceInstance]:
+        pass
+
+    # Select instances whether healthy or not. default cluster=[], subscribe=true, healthy=true. If it fails, pay attention to err
+    def select_instances(self, service_name: String, group: String, clusters: Option<[String]>, subscribe: Option<bool>, healthy: Option<bool>) -> [NacosServiceInstance]:
+        pass
+
+    # Select one healthy instance. default cluster=[], subscribe=true. If it fails, pay attention to err
+    def select_one_healthy_instance(self, service_name: String, group: String, clusters: Option<[String]>, subscribe: Option<bool>) -> NacosServiceInstance:
+        pass
+
+    # Add NacosNamingEventListener callback func, which listen the instance change. If it fails, pay attention to err
+    def subscribe(self, service_name: String, group: String, clusters: Option<[String]>, listener: py_function) -> NacosServiceInstance:
+        pass
+
+
+```
+
+## Development
+
+Setup virtualenv:
+
+```shell
+python -m venv venv
+```
+
+Activate venv:
+
+```shell
+source venv/bin/activate
+````
+
+Install `maturin`:
+
+```shell
+pip install maturin[patchelf]
+```
+
+Build bindings:
+
+```shell
+maturin develop
+```
+
+Run some tests:
+
+```shell
+maturin develop -E test
+behave tests
+```
+
+Build API docs:
+
+```shell
+maturin develop -E docs
+pdoc nacos-sdk-rust-binding-py
+```
+
+# License
+[Apache License Version 2.0](LICENSE)
+
+# Acknowledgement
+- binding for Python with [PyO3](https://github.com/PyO3/pyo3.git)
+- binding the [nacos-sdk-rust](https://github.com/nacos-group/nacos-sdk-rust.git)
+

nacos_sdk_rust_binding_py-0.1.2/README.md

@@ -0,0 +1,226 @@
+# nacos-sdk-rust-binding-py
+nacos-sdk-rust binding for Python with PyO3.
+
+Tip: nacos-sdk-python 仓库暂未提供 2.x gRPC 交互模式，为了能升级它，故而通过 ffi 方式调用 nacos-sdk-rust
+
+## Installation
+
+```bash
+pip install nacos-sdk-rust-binding-py
+```
+
+- project package see https://pypi.org/project/nacos-sdk-rust-binding-py
+
+## Usage
+
+**使用样例请看仓库内的 examples 目录**
+
+- 客户端日志请在目录 `$HOME/logs/nacos/` 查看
+
+### Definition of ClientOptions
+
+```python
+class ClientOptions:
+    # Server Addr, e.g. address:port[,address:port],...]
+    #[pyo3(set, get)]
+    server_addr: String,
+    # Namespace/Tenant
+    #[pyo3(set, get)]
+    namespace: String,
+    # AppName
+    #[pyo3(set, get)]
+    app_name: Option<String>,
+    # Username for Auth
+    #[pyo3(set, get)]
+    username: Option<String>,
+    # Password for Auth
+    #[pyo3(set, get)]
+    password: Option<String>,
+
+    # Init
+    def __init__(self, server_addr, namespace, app_name, username, password):
+        self.server_addr = server_addr
+        self.server_addr = namespace
+        self.app_name = app_name
+        self.username = username
+        self.password = password
+
+```
+
+### Definition of Config
+
+```python
+class NacosConfigResponse:
+    # Namespace/Tenant
+    # [pyo3(get)]
+    namespace: String,
+    # DataId
+    # [pyo3(get)]
+    data_id: String,
+    # Group
+    # [pyo3(get)]
+    group: String,
+    # Content
+    # [pyo3(get)]
+    content: String,
+    # Content's Type; e.g. json,properties,xml,html,text,yaml
+    # [pyo3(get)]
+    content_type: String,
+    # Content's md5
+    # [pyo3(get)]
+    md5: String,
+
+
+class NacosConfigClient:
+    # Init. If it fails, pay attention to err
+    def __init__(self, client_options: ClientOptions):
+        # inner logic xxx
+        pass
+
+    # Get config's content. If it fails, pay attention to err
+    def get_config(self, data_id: String, group: String) -> String:
+        pass
+
+    # Get NacosConfigResponse. If it fails, pay attention to err
+    def get_config_resp(self, data_id: String, group: String) -> NacosConfigResponse:
+        pass
+
+    # Publish config. If it fails, pay attention to err
+    def publish_config(self, data_id: String, group: String, content: String) -> bool:
+        pass
+
+    # Remove config. If it fails, pay attention to err
+    def remove_config(self, data_id: String, group: String) -> bool:
+        pass
+
+    # Add NacosConfigChangeListener callback func, which listen the config change. If it fails, pay attention to err
+    def add_listener(self, data_id: String, group: String, listener: py_function):
+        pass
+
+
+```
+
+### Definition of Naming
+
+```python
+class NacosServiceInstance:
+    # Instance Id
+    #[pyo3(set, get)]
+    instance_id: Option<String>,
+    # Ip
+    #[pyo3(set, get)]
+    ip: String,
+    # Port
+    #[pyo3(set, get)]
+    port: i32,
+    # Weight, default 1.0
+    #[pyo3(set, get)]
+    weight: Option<f64>,
+    # Healthy or not, default true
+    #[pyo3(set, get)]
+    healthy: Option<bool>,
+    # Enabled ot not, default true
+    #[pyo3(set, get)]
+    enabled: Option<bool>,
+    # Ephemeral or not, default true
+    #[pyo3(set, get)]
+    ephemeral: Option<bool>,
+    # Cluster Name, default 'DEFAULT'
+    #[pyo3(set, get)]
+    cluster_name: Option<String>,
+    # Service Name
+    #[pyo3(set, get)]
+    service_name: Option<String>,
+    # Metadata, default '{}'
+    #[pyo3(set, get)]
+    metadata: Option<std::collections::HashMap<String, String>>,
+
+    # Init
+    def __init__(self, ip, port, weight, healthy, enabled, ephemeral, cluster_name, service_name, metadata):
+        # inner logic xxx
+        pass
+
+
+class NacosNamingClient:
+    # Init. If it fails, pay attention to err
+    def __init__(self, client_options: ClientOptions):
+        # inner logic xxx
+        pass
+
+    # Register instance. If it fails, pay attention to err
+    def register_instance(self, service_name: String, group: String, service_instance: NacosServiceInstance):
+        pass
+
+    # Deregister instance. If it fails, pay attention to err
+    def deregister_instance(self, service_name: String, group: String, service_instance: NacosServiceInstance):
+        pass
+
+    # Batch register instance, improve interaction efficiency. If it fails, pay attention to err
+    def batch_register_instance(self, service_name: String, group: String, service_instances: [NacosServiceInstance]):
+        pass
+
+    # Get all instances by service and group. default cluster=[], subscribe=true. If it fails, pay attention to err
+    def get_all_instances(self, service_name: String, group: String, clusters: Option<[String]>, subscribe: Option<bool>) -> [NacosServiceInstance]:
+        pass
+
+    # Select instances whether healthy or not. default cluster=[], subscribe=true, healthy=true. If it fails, pay attention to err
+    def select_instances(self, service_name: String, group: String, clusters: Option<[String]>, subscribe: Option<bool>, healthy: Option<bool>) -> [NacosServiceInstance]:
+        pass
+
+    # Select one healthy instance. default cluster=[], subscribe=true. If it fails, pay attention to err
+    def select_one_healthy_instance(self, service_name: String, group: String, clusters: Option<[String]>, subscribe: Option<bool>) -> NacosServiceInstance:
+        pass
+
+    # Add NacosNamingEventListener callback func, which listen the instance change. If it fails, pay attention to err
+    def subscribe(self, service_name: String, group: String, clusters: Option<[String]>, listener: py_function) -> NacosServiceInstance:
+        pass
+
+
+```
+
+## Development
+
+Setup virtualenv:
+
+```shell
+python -m venv venv
+```
+
+Activate venv:
+
+```shell
+source venv/bin/activate
+````
+
+Install `maturin`:
+
+```shell
+pip install maturin[patchelf]
+```
+
+Build bindings:
+
+```shell
+maturin develop
+```
+
+Run some tests:
+
+```shell
+maturin develop -E test
+behave tests
+```
+
+Build API docs:
+
+```shell
+maturin develop -E docs
+pdoc nacos-sdk-rust-binding-py
+```
+
+# License
+[Apache License Version 2.0](LICENSE)
+
+# Acknowledgement
+- binding for Python with [PyO3](https://github.com/PyO3/pyo3.git)
+- binding the [nacos-sdk-rust](https://github.com/nacos-group/nacos-sdk-rust.git)

nacos_sdk_rust_binding_py-0.1.2/examples/config.py

@@ -0,0 +1,60 @@
+#!/usr/bin/python3
+
+import time
+import nacos_sdk_rust_binding_py as nacos
+
+client_options = nacos.ClientOptions("0.0.0.0:8848", "love", "simple_app_py", "nacos", "nacos")
+
+config_client = nacos.NacosConfigClient(client_options)
+
+time.sleep(1)
+
+data_id = "todo-dataid"
+group = "LOVE"
+publish_content = "test-content"
+
+
+# 自定义配置监听的函数，接受的参数为 `nacos.NacosConfigResponse`
+def listen_config(config_resp: nacos.NacosConfigResponse):
+    print(f"listen_config,config_resp={str(config_resp)}")
+    print(f"listen_config,config_resp.content={config_resp.content}")
+
+
+# example: 添加配置监听（对目标 data_id, group 配置变化的监听）
+config_client.add_listener(data_id, group, listen_config)
+
+# example: 推送配置
+config_client.publish_config(data_id, group, publish_content)
+
+time.sleep(1)
+
+# example: 获取配置，返回值为 `nacos.NacosConfigResponse`
+config_content_resp = config_client.get_config_resp(data_id, group)
+
+# example: 获取配置，返回值为 content: String
+get_config_content = config_client.get_config(data_id, group)
+
+assert get_config_content == publish_content
+assert config_content_resp.content == publish_content
+
+print(f"get_config_content={get_config_content}")
+print(f"config_content_resp={str(config_content_resp)},resp_content={config_content_resp.content}")
+
+time.sleep(1)
+
+# example: 推送配置，使配置监听函数被调用
+config_client.publish_config(data_id, group, "publish_content for listen_config")
+
+# sleep for user look at nacos-server, the config be listening
+time.sleep(300)
+
+# example: 删除配置
+config_client.remove_config(data_id, group)
+
+# example: 获取的配置不存在，会抛出异常
+try:
+    get_config_content_removed = config_client.get_config(data_id, group)
+except RuntimeError:
+    print("config already be removed.")
+
+time.sleep(10)

nacos_sdk_rust_binding_py-0.1.2/examples/naming.py

@@ -0,0 +1,48 @@
+#!/usr/bin/python3
+
+import time
+import nacos_sdk_rust_binding_py as nacos
+
+client_options = nacos.ClientOptions("0.0.0.0:8848", "love", "simple_app_py", "nacos", "nacos")
+
+naming_client = nacos.NacosNamingClient(client_options)
+
+time.sleep(1)
+
+service_name = "todo-service-name"
+group = "dev"
+service_instance = nacos.NacosServiceInstance("127.0.0.1", 8080)
+
+
+# 自定义服务订阅函数，接受的参数为 `nacos.NacosConfigResponse`
+def subscribe_instances(instances: [nacos.NacosServiceInstance]):
+    print(f"subscribe_instances,instances={str(instances)}")
+    for ins in instances:
+        print(f"subscribe_instances,instances[x].ip={ins.ip}")
+
+
+# example: 添加配置监听（对目标 data_id, group 配置变化的监听）
+naming_client.subscribe(service_name, group, None, subscribe_instances)
+
+time.sleep(1)
+
+# example: 注册服务实例
+naming_client.register_instance(service_name, group, service_instance)
+
+time.sleep(1)
+
+# example: 获取服务实例列表
+get_instances = naming_client.get_all_instances(service_name, group)
+
+assert len(get_instances) > 0
+assert get_instances[0].ip == service_instance.ip
+
+print(f"get_instances={str(get_instances)}")
+for i in get_instances:
+    print(f"get_instances[x].ip={i.ip}")
+
+# example: 批量服务实例，可使前面的配置监听函数被调用
+service_instance2 = nacos.NacosServiceInstance("127.0.0.2", 8080)
+naming_client.batch_register_instance(service_name, group, [service_instance, service_instance2])
+
+time.sleep(300)

{nacos_sdk_rust_binding_py-0.1.0 → nacos_sdk_rust_binding_py-0.1.2}/pyproject.toml

@@ -20,9 +20,9 @@ docs = ["pdoc"]
 test = ["behave"]
 
 [project.urls]
-Documentation = "https://github.com/opc-source/nacos-sdk-rust-binding-node.git"
-Homepage = "https://github.com/opc-source/nacos-sdk-rust-binding-node.git"
-Repository = "https://github.com/opc-source/nacos-sdk-rust-binding-node.git"
+Documentation = "https://github.com/opc-source/nacos-sdk-rust-binding-py.git"
+Homepage = "https://github.com/opc-source/nacos-sdk-rust-binding-py.git"
+Repository = "https://github.com/opc-source/nacos-sdk-rust-binding-py.git"
 
 [tool.maturin]
 features = ["pyo3/extension-module"]

{nacos_sdk_rust_binding_py-0.1.0 → nacos_sdk_rust_binding_py-0.1.2}/src/config.rs

@@ -1,7 +1,7 @@
 #![deny(clippy::all)]
 
-use pyo3::exceptions::PyRuntimeError;
-use pyo3::{pyclass, pymethods, PyResult, Python};
+use pyo3::exceptions::{PyRuntimeError, PyValueError};
+use pyo3::{pyclass, pymethods, PyAny, PyErr, PyObject, PyResult, Python, ToPyObject};
 
 use std::sync::Arc;
 
@@ -95,25 +95,27 @@ impl NacosConfigClient {
     /// Add NacosConfigChangeListener callback func, which listen the config change.
     /// If it fails, pay attention to err
     #[pyo3(signature = (data_id, group, listener))]
-    #[allow(unused_variables)]
     pub fn add_listener(
         &self,
         py: Python,
         data_id: String,
         group: String,
-        listener: &pyo3::PyAny, // todo PyFunction arg: <NacosConfigResponse>
+        listener: &PyAny, // PyFunction arg: <NacosConfigResponse>
     ) -> PyResult<()> {
-        /*
+        if !listener.is_callable() {
+            return Err(PyErr::new::<PyValueError, _>(
+                "Arg `listener` must be a callable",
+            ));
+        }
         self.inner
             .add_listener(
                 data_id,
                 group,
                 Arc::new(NacosConfigChangeListener {
-                    func: Arc::new(listener),
+                    func: Arc::new(listener.to_object(py)),
                 }),
             )
             .map_err(|nacos_err| PyRuntimeError::new_err(format!("{:?}", &nacos_err)))?;
-        */
         Ok(())
     }
 
@@ -127,7 +129,7 @@ impl NacosConfigClient {
         py: Python,
         data_id: String,
         group: String,
-        listener: &pyo3::PyAny, // todo PyFunction arg: <NacosConfigResponse>
+        listener: &PyAny, // PyFunction arg: <NacosConfigResponse>
     ) -> PyResult<()> {
         Ok(())
     }
@@ -136,33 +138,40 @@ impl NacosConfigClient {
 #[pyclass]
 pub struct NacosConfigResponse {
     /// Namespace/Tenant
+    #[pyo3(get)]
     pub namespace: String,
     /// DataId
+    #[pyo3(get)]
     pub data_id: String,
     /// Group
+    #[pyo3(get)]
     pub group: String,
     /// Content
+    #[pyo3(get)]
     pub content: String,
     /// Content's Type; e.g. json,properties,xml,html,text,yaml
+    #[pyo3(get)]
     pub content_type: String,
     /// Content's md5
+    #[pyo3(get)]
     pub md5: String,
 }
 
-/*
 pub struct NacosConfigChangeListener {
-    func: Arc<PyFunction>,
+    func: Arc<PyObject>,
 }
 
 impl nacos_sdk::api::config::ConfigChangeListener for NacosConfigChangeListener {
     fn notify(&self, config_resp: nacos_sdk::api::config::ConfigResponse) {
         let ffi_conf_resp = transfer_conf_resp(config_resp);
 
-        // todo call PyFunction with args
-        let _ = self.func.call(ffi_conf_resp, None);
+        // call PyFunction with args
+        let _ = Python::with_gil(|py| -> PyResult<()> {
+            let _ = self.func.call(py, (ffi_conf_resp,), None);
+            Ok(())
+        });
     }
 }
-*/
 
 fn transfer_conf_resp(config_resp: nacos_sdk::api::config::ConfigResponse) -> NacosConfigResponse {
     NacosConfigResponse {

{nacos_sdk_rust_binding_py-0.1.0 → nacos_sdk_rust_binding_py-0.1.2}/src/lib.rs

@@ -56,17 +56,42 @@ fn init_logger() -> &'static tracing_appender::non_blocking::WorkerGuard {
 #[derive(Clone)]
 pub struct ClientOptions {
     /// Server Addr, e.g. address:port[,address:port],...]
+    #[pyo3(set, get)]
     pub server_addr: String,
     /// Namespace/Tenant
+    #[pyo3(set, get)]
     pub namespace: String,
     /// AppName
+    #[pyo3(set, get)]
     pub app_name: Option<String>,
     /// Username for Auth
+    #[pyo3(set, get)]
     pub username: Option<String>,
     /// Password for Auth
+    #[pyo3(set, get)]
     pub password: Option<String>,
 }
 
+#[pymethods]
+impl ClientOptions {
+    #[new]
+    pub fn new(
+        server_addr: String,
+        namespace: String,
+        app_name: Option<String>,
+        username: Option<String>,
+        password: Option<String>,
+    ) -> PyResult<ClientOptions> {
+        Ok(Self {
+            server_addr,
+            namespace,
+            app_name,
+            username,
+            password,
+        })
+    }
+}
+
 mod config;
 pub use config::*;
 

{nacos_sdk_rust_binding_py-0.1.0 → nacos_sdk_rust_binding_py-0.1.2}/src/naming.rs

@@ -1,7 +1,7 @@
 #![deny(clippy::all)]
 
-use pyo3::exceptions::PyRuntimeError;
-use pyo3::{pyclass, pymethods, PyResult, Python};
+use pyo3::exceptions::{PyRuntimeError, PyValueError};
+use pyo3::{pyclass, pymethods, PyAny, PyErr, PyObject, PyResult, Python, ToPyObject};
 
 use std::sync::Arc;
 
@@ -183,27 +183,29 @@ impl NacosNamingClient {
     /// Add NacosNamingEventListener callback func, which listen the instance change.
     /// If it fails, pay attention to err
     #[pyo3(signature = (service_name, group, clusters, listener))]
-    #[allow(unused_variables)]
     pub fn subscribe(
         &self,
         py: Python,
         service_name: String,
         group: String,
         clusters: Option<Vec<String>>,
-        listener: &pyo3::PyAny, // todo PyFunction arg: Vec<NacosServiceInstance>
+        listener: &PyAny, // PyFunction arg: Vec<NacosServiceInstance>
     ) -> PyResult<()> {
-        /*
+        if !listener.is_callable() {
+            return Err(PyErr::new::<PyValueError, _>(
+                "Arg `listener` must be a callable",
+            ));
+        }
         self.inner
             .subscribe(
                 service_name,
                 Some(group),
                 clusters.unwrap_or_default(),
                 Arc::new(NacosNamingEventListener {
-                    func: Arc::new(listener),
+                    func: Arc::new(listener.to_object(py)),
                 }),
             )
             .map_err(|nacos_err| PyRuntimeError::new_err(format!("{:?}", &nacos_err)))?;
-        */
         Ok(())
     }
 
@@ -218,15 +220,14 @@ impl NacosNamingClient {
         service_name: String,
         group: String,
         clusters: Option<Vec<String>>,
-        listener: &pyo3::PyAny, // todo PyFunction arg: Vec<NacosServiceInstance>
+        listener: &PyAny, // PyFunction arg: Vec<NacosServiceInstance>
     ) -> PyResult<()> {
         Ok(())
     }
 }
 
-/*
 pub struct NacosNamingEventListener {
-    func: Arc<PyFunction>,
+    func: Arc<PyObject>,
 }
 
 impl nacos_sdk::api::naming::NamingEventListener for NacosNamingEventListener {
@@ -237,42 +238,84 @@ impl nacos_sdk::api::naming::NamingEventListener for NacosNamingEventListener {
 
         let rust_instances = event.instances.clone().unwrap();
 
-        let ffi_instances = rust_instances
+        let ffi_instances: Vec<NacosServiceInstance> = rust_instances
             .iter()
             .map(transfer_rust_instance_to_ffi)
             .collect();
 
-        // todo call PyFunction with args
-        let _ = self.func.call(ffi_instances, None);
+        // call PyFunction with args
+        let _ = Python::with_gil(|py| -> PyResult<()> {
+            let _ = self.func.call(py, (ffi_instances,), None);
+            Ok(())
+        });
     }
 }
-*/
 
 #[pyclass]
 #[derive(Clone)]
 pub struct NacosServiceInstance {
     /// Instance Id
+    #[pyo3(set, get)]
     pub instance_id: Option<String>,
     /// Ip
+    #[pyo3(set, get)]
     pub ip: String,
     /// Port
+    #[pyo3(set, get)]
     pub port: i32,
     /// Weight, default 1.0
+    #[pyo3(set, get)]
     pub weight: Option<f64>,
     /// Healthy or not, default true
+    #[pyo3(set, get)]
     pub healthy: Option<bool>,
     /// Enabled ot not, default true
+    #[pyo3(set, get)]
     pub enabled: Option<bool>,
     /// Ephemeral or not, default true
+    #[pyo3(set, get)]
     pub ephemeral: Option<bool>,
     /// Cluster Name, default 'DEFAULT'
+    #[pyo3(set, get)]
     pub cluster_name: Option<String>,
     /// Service Name
+    #[pyo3(set, get)]
     pub service_name: Option<String>,
     /// Metadata, default '{}'
+    #[pyo3(set, get)]
     pub metadata: Option<std::collections::HashMap<String, String>>,
 }
 
+#[pymethods]
+impl NacosServiceInstance {
+    #[new]
+    #[allow(clippy::too_many_arguments)]
+    pub fn new(
+        ip: String,
+        port: i32,
+        weight: Option<f64>,
+        healthy: Option<bool>,
+        enabled: Option<bool>,
+        ephemeral: Option<bool>,
+        cluster_name: Option<String>,
+        service_name: Option<String>,
+        metadata: Option<std::collections::HashMap<String, String>>,
+    ) -> PyResult<NacosServiceInstance> {
+        Ok(Self {
+            instance_id: None,
+            ip,
+            port,
+            weight,
+            healthy,
+            enabled,
+            ephemeral,
+            cluster_name,
+            service_name,
+            metadata,
+        })
+    }
+}
+
 fn transfer_ffi_instance_to_rust(
     ffi_instance: &NacosServiceInstance,
 ) -> nacos_sdk::api::naming::ServiceInstance {

nacos_sdk_rust_binding_py-0.1.0/PKG-INFO

@@ -1,83 +0,0 @@
-Metadata-Version: 2.1
-Name: nacos-sdk-rust-binding-py
-Version: 0.1.0
-Classifier: Programming Language :: Rust
-Classifier: Programming Language :: Python :: Implementation :: CPython
-Classifier: Programming Language :: Python :: Implementation :: PyPy
-Requires-Dist: pdoc ; extra == 'docs'
-Requires-Dist: behave ; extra == 'test'
-Provides-Extra: docs
-Provides-Extra: test
-License-File: LICENSE
-Summary: nacos-sdk-rust binding for Python.
-Keywords: nacos,ffi,pyo3,binding,python
-Author: CheirshCai <785427346@qq.com>
-Author-email: CheirshCai <785427346@qq.com>
-License: Apache-2.0
-Requires-Python: >=3.7
-Description-Content-Type: text/markdown; charset=UTF-8; variant=GFM
-Project-URL: Documentation, https://github.com/opc-source/nacos-sdk-rust-binding-node.git
-Project-URL: Homepage, https://github.com/opc-source/nacos-sdk-rust-binding-node.git
-Project-URL: Repository, https://github.com/opc-source/nacos-sdk-rust-binding-node.git
-
-# nacos-sdk-rust-binding-py
-nacos-sdk-rust binding for Python with PyO3.
-
-Tip: nacos-sdk-python 仓库暂未提供 2.x gRPC 交互模式，为了能升级它，故而通过 ffi 方式调用 nacos-sdk-rust
-
-## Installation
-
-```bash
-pip install nacos_sdk_rust_binding_py
-```
-
-# Usage
-- TODO
-
-## Development
-
-Setup virtualenv:
-
-```shell
-python -m venv venv
-```
-
-Activate venv:
-
-```shell
-source venv/bin/activate
-````
-
-Install `maturin`:
-
-```shell
-pip install maturin[patchelf]
-```
-
-Build bindings:
-
-```shell
-maturin develop
-```
-
-Run some tests:
-
-```shell
-maturin develop -E test
-behave tests
-```
-
-Build API docs:
-
-```shell
-maturin develop -E docs
-pdoc nacos_sdk_rust_binding_py
-```
-
-# License
-[Apache License Version 2.0](LICENSE)
-
-# Acknowledgement
-- binding for Python with [PyO3](https://github.com/PyO3/pyo3.git)
-- binding the [nacos-sdk-rust](https://github.com/nacos-group/nacos-sdk-rust.git)
-

nacos_sdk_rust_binding_py-0.1.0/README.md

@@ -1,60 +0,0 @@
-# nacos-sdk-rust-binding-py
-nacos-sdk-rust binding for Python with PyO3.
-
-Tip: nacos-sdk-python 仓库暂未提供 2.x gRPC 交互模式，为了能升级它，故而通过 ffi 方式调用 nacos-sdk-rust
-
-## Installation
-
-```bash
-pip install nacos_sdk_rust_binding_py
-```
-
-# Usage
-- TODO
-
-## Development
-
-Setup virtualenv:
-
-```shell
-python -m venv venv
-```
-
-Activate venv:
-
-```shell
-source venv/bin/activate
-````
-
-Install `maturin`:
-
-```shell
-pip install maturin[patchelf]
-```
-
-Build bindings:
-
-```shell
-maturin develop
-```
-
-Run some tests:
-
-```shell
-maturin develop -E test
-behave tests
-```
-
-Build API docs:
-
-```shell
-maturin develop -E docs
-pdoc nacos_sdk_rust_binding_py
-```
-
-# License
-[Apache License Version 2.0](LICENSE)
-
-# Acknowledgement
-- binding for Python with [PyO3](https://github.com/PyO3/pyo3.git)
-- binding the [nacos-sdk-rust](https://github.com/nacos-group/nacos-sdk-rust.git)