From b9f0b1f8d14293b1a0bae929b8bf4614cdc12a86 Mon Sep 17 00:00:00 2001 From: xiaoxiawang Date: Tue, 11 Nov 2025 11:04:00 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/python/yr/apis.py | 16 +++++----------- api/python/yr/config.py | 2 +- .../zh_cn/Python/yr.DoubleCounter.set.rst | 2 +- .../zh_cn/Python/yr.kv_m_write_tx.rst | 2 -- .../zh_cn/Python/yr.put.rst | 6 ------ 5 files changed, 7 insertions(+), 21 deletions(-) diff --git a/api/python/yr/apis.py b/api/python/yr/apis.py index 396b9d6..ece4025 100644 --- a/api/python/yr/apis.py +++ b/api/python/yr/apis.py @@ -236,14 +236,9 @@ def put(obj: object, create_param: CreateParam = CreateParam()) -> ObjectRef: Examples: >>> import yr >>> yr.init() - >>> # The worker startup parameters need to be configured with shared_disk_directory and shared_disk_size_mb; - >>> # otherwise, this example will result in an error >>> param = yr.CreateParam() >>> param.cache_type = yr.CacheType.DISK >>> bs = bytes(0) - >>> obj_ref1 = yr.put(bs, param) - >>> print(yr.get(obj_ref1)) - >>> # ValueError: value is None or has zero length >>> mem = memoryview(bytes(100)) >>> obj_ref2 = yr.put(mem) >>> print(yr.get(obj_ref2)) @@ -254,7 +249,6 @@ def put(obj: object, create_param: CreateParam = CreateParam()) -> ObjectRef: >>> # The final print output is a memoryview pointer. >>> obj_ref4 = yr.put(100) >>> print(yr.get(obj_ref4)) - >>> 100 """ if (isinstance(obj, (bytes, bytearray, memoryview)) and len(obj) == 0): raise ValueError("value is None or has zero length") @@ -1297,7 +1291,7 @@ class cpp_instance_class: class_name (str): cpp class name. factory_name (str): Name of the static factory function of the cpp class. function_urn (str): Function URN, Defaults to - sn:cn:yrk:12345678901234561234567890123456:function:0-defaultservice-py:$latest. + sn:cn:yrk:12345678901234561234567890123456:function:0-defaultservice-cpp:$latest. Examples: .. code-block:: cpp @@ -1331,7 +1325,7 @@ class cpp_instance_class: >>> import yr >>> yr.init() - >>> cpp_function_urn = "sn:cn:yrk:12345678901234561234567890123456:function:0-yr-mycpp:$latest" + >>> cpp_function_urn = "sn:cn:yrk:12345678901234561234567890123456:function:0-yr-defaultservice-cpp:$latest" >>> counter_class = yr.cpp_instance_class("Counter", "Counter::FactoryCreate",cpp_function_urn) >>> opt = yr.InvokeOptions(cpu=1000, memory=1024) >>> ins = counter_class.options(opt).invoke(11) @@ -1420,7 +1414,7 @@ def cpp_function(function_name: str, function_urn: str) -> FunctionProxy: >>> import yr >>> yr.init() - >>> cpp_function_urn = "sn:cn:yrk:12345678901234561234567890123456:function:0-yr-mycpp:$latest" + >>> cpp_function_urn = "sn:cn:yrk:12345678901234561234567890123456:function:0-yr-defaultservice-cpp:$latest" >>> square_func = yr.cpp_function("Square", cpp_function_urn) >>> result = square_func.invoke(5) >>> print(yr.get(result)) @@ -1470,7 +1464,7 @@ def java_function(class_name: str, function_name: str, function_urn: str) -> Fun >>> import yr >>> yr.init() - >>> java_function_urn = "sn:cn:yrk:12345678901234561234567890123456:function:0-yr-myjava:$latest" + >>> java_function_urn = "sn:cn:yrk:12345678901234561234567890123456:function:0-yr-defaultservice-java:$latest" >>> java_add = yr.java_function("com.yuanrong.demo.PlusOne", "PlusOne", java_function_urn) >>> result = java_add.invoke(1) >>> print(yr.get(result)) @@ -1523,7 +1517,7 @@ def java_instance_class(class_name: str, function_urn: str) -> InstanceCreator: >>> import yr >>> yr.init() - >>> java_function_urn = "sn:cn:yrk:12345678901234561234567890123456:function:0-yr-myjava:$latest" + >>> java_function_urn = "sn:cn:yrk:12345678901234561234567890123456:function:0-yr-defaultservice-java:$latest" >>> >>> java_instance = yr.java_instance_class("com.yuanrong.demo.Counter", java_function_urn).invoke(1) >>> res = java_instance.Add.invoke(5) diff --git a/api/python/yr/config.py b/api/python/yr/config.py index 6c2dfdd..356333a 100644 --- a/api/python/yr/config.py +++ b/api/python/yr/config.py @@ -356,7 +356,7 @@ class InvokeOptions: >>> import yr >>> yr.init() >>> opt = yr.InvokeOptions() - >>> opt.custom_extensions["YR_Metrics"] = "{\"endpoint\":\"127.0.0.1\", \"project_id\":\"my_project_id\"}" + >>> opt.custom_extensions["YR_Metrics"] = "{\'endpoint\':\'127.0.0.1\', \'project_id\':\'my_project_id\'}" In Prometheus, select `metrics name` as `yr_app_instance_billing_invoke_latency`, and you can find the custom tag information in the collected invoke information: diff --git a/docs/multi_language_function_programming_interface/api/distributed_programming/zh_cn/Python/yr.DoubleCounter.set.rst b/docs/multi_language_function_programming_interface/api/distributed_programming/zh_cn/Python/yr.DoubleCounter.set.rst index a28af26..acff9e8 100644 --- a/docs/multi_language_function_programming_interface/api/distributed_programming/zh_cn/Python/yr.DoubleCounter.set.rst +++ b/docs/multi_language_function_programming_interface/api/distributed_programming/zh_cn/Python/yr.DoubleCounter.set.rst @@ -14,7 +14,7 @@ yr.DoubleCounter.set 样例： >>> import yr - >>> config = yr.Config(enable_metrics=True) + >>> config = yr.Config(enable_metrics=True) >>> yr.init(config) >>> >>> @yr.instance diff --git a/docs/multi_language_function_programming_interface/api/distributed_programming/zh_cn/Python/yr.kv_m_write_tx.rst b/docs/multi_language_function_programming_interface/api/distributed_programming/zh_cn/Python/yr.kv_m_write_tx.rst index a77057f..69fb80a 100644 --- a/docs/multi_language_function_programming_interface/api/distributed_programming/zh_cn/Python/yr.kv_m_write_tx.rst +++ b/docs/multi_language_function_programming_interface/api/distributed_programming/zh_cn/Python/yr.kv_m_write_tx.rst @@ -19,8 +19,6 @@ yr.kv_m_write_tx 样例： >>> import yr >>> yr.init() - >>> # worker启动参数需要配置为 shared_disk_directory 和 shared_disk_size_mb - >>> # 否则，此示例将导致错误 >>> mset_param = yr.MSetParam() >>> mset_param.existence = yr.ExistenceOpt.NX >>> mset_param.write_mode = yr.WriteMode.NONE_L2_CACHE_EVICT diff --git a/docs/multi_language_function_programming_interface/api/distributed_programming/zh_cn/Python/yr.put.rst b/docs/multi_language_function_programming_interface/api/distributed_programming/zh_cn/Python/yr.put.rst index 5f8bee7..ccbbf4f 100644 --- a/docs/multi_language_function_programming_interface/api/distributed_programming/zh_cn/Python/yr.put.rst +++ b/docs/multi_language_function_programming_interface/api/distributed_programming/zh_cn/Python/yr.put.rst @@ -28,14 +28,9 @@ yr.put 样例： >>> import yr >>> yr.init() - >>> # worker启动参数需要配置为shared_disk_directory和shared_disk_size_mb - >>> # 否则，此示例将导致错误 >>> param = yr.CreateParam() >>> param.cache_type = yr.CacheType.DISK >>> bs = bytes(0) - >>> obj_ref1 = yr.put(bs, param) - >>> print(yr.get(obj_ref1)) - >>> # ValueError: value is None or has zero length >>> mem = memoryview(bytes(100)) >>> obj_ref2 = yr.put(mem) >>> print(yr.get(obj_ref2)) @@ -46,6 +41,5 @@ yr.put >>> # 最后输出一个 memoryview 指针 >>> obj_ref4 = yr.put(100) >>> print(yr.get(obj_ref4)) - >>> 100 .. _ObjectRef: ../../Python/generated/yr.object_ref.ObjectRef.html#yr.object_ref.ObjectRef -- Gitee From 71dff9b76ed86d6295d3d7621e4ecd7cdaf43c8b Mon Sep 17 00:00:00 2001 From: xiaoxiawang Date: Tue, 11 Nov 2025 14:28:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/python/yr/apis.py | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/api/python/yr/apis.py b/api/python/yr/apis.py index ece4025..6543381 100644 --- a/api/python/yr/apis.py +++ b/api/python/yr/apis.py @@ -1325,8 +1325,11 @@ class cpp_instance_class: >>> import yr >>> yr.init() - >>> cpp_function_urn = "sn:cn:yrk:12345678901234561234567890123456:function:0-yr-defaultservice-cpp:$latest" - >>> counter_class = yr.cpp_instance_class("Counter", "Counter::FactoryCreate",cpp_function_urn) + >>> cpp_function_urn = ( + ... "sn:cn:yrk:12345678901234561234567890123456:" + ... "function:0-yr-defaultservice-cpp:$latest" + ... ) + >>> counter_class = yr.cpp_instance_class("Counter", "Counter::FactoryCreate", cpp_function_urn) >>> opt = yr.InvokeOptions(cpu=1000, memory=1024) >>> ins = counter_class.options(opt).invoke(11) >>> result = ins.Add.invoke(9) @@ -1414,11 +1417,13 @@ def cpp_function(function_name: str, function_urn: str) -> FunctionProxy: >>> import yr >>> yr.init() - >>> cpp_function_urn = "sn:cn:yrk:12345678901234561234567890123456:function:0-yr-defaultservice-cpp:$latest" + >>> cpp_function_urn = ( + ... "sn:cn:yrk:12345678901234561234567890123456:" + ... "function:0-yr-defaultservice-cpp:$latest" + ... ) >>> square_func = yr.cpp_function("Square", cpp_function_urn) >>> result = square_func.invoke(5) >>> print(yr.get(result)) - >>> >>> yr.finalize() """ @@ -1464,7 +1469,10 @@ def java_function(class_name: str, function_name: str, function_urn: str) -> Fun >>> import yr >>> yr.init() - >>> java_function_urn = "sn:cn:yrk:12345678901234561234567890123456:function:0-yr-defaultservice-java:$latest" + >>> java_function_urn = ( + ... "sn:cn:yrk:12345678901234561234567890123456:" + ... "function:0-yr-defaultservice-java:$latest" + ... ) >>> java_add = yr.java_function("com.yuanrong.demo.PlusOne", "PlusOne", java_function_urn) >>> result = java_add.invoke(1) >>> print(yr.get(result)) @@ -1517,7 +1525,10 @@ def java_instance_class(class_name: str, function_urn: str) -> InstanceCreator: >>> import yr >>> yr.init() - >>> java_function_urn = "sn:cn:yrk:12345678901234561234567890123456:function:0-yr-defaultservice-java:$latest" + >>> java_function_urn = ( + ... "sn:cn:yrk:12345678901234561234567890123456:" + ... "function:0-yr-defaultservice-java:$latest" + ... ) >>> >>> java_instance = yr.java_instance_class("com.yuanrong.demo.Counter", java_function_urn).invoke(1) >>> res = java_instance.Add.invoke(5) -- Gitee