repo-sync-2024-07-02T14:32:42+0800 (#75)

* repo-sync-2024-07-02T14:32:42+0800

* fix test

.circleci/config.yml

@@ -66,11 +66,9 @@ workflows:
           mapping: |
             .circleci/continue-config.yml build-and-run true
             secretflow_serving/.* build-and-run true
-            secretflow_serving_lib/.* build-and-run true
-            requirements.txt build-and-run true
+            python_lib/.* build-and-run true
             bazel/.* build-and-run true
             .bazelrc build-and-run true
-            requirements.txt build-and-run true
       - lint
   publish-workflow:
     when:

.circleci/continue-config.yml

@@ -40,7 +40,7 @@ commands:
       - run:
           name: Install Python dependencies
           command: |
-            python3 -m pip install -r requirements.txt
+            python3 -m pip install -r python_lib/requirements.txt
             python3 -m pip install -r .ci/requirements-ci.txt
       - run:
           name: Setup GCS
@@ -122,7 +122,7 @@ jobs:
             source $HOME/miniconda/bin/activate
             conda init bash zsh
       - build_and_test:
-          bazel_targets: "//secretflow_serving_lib/..."
+          bazel_targets: "//python_lib/..."
 
 workflows:
   unittest:

.circleci/release-config.yml

@@ -57,9 +57,9 @@ commands:
 
             sh ./build_wheel_entrypoint.sh
             python3 -m pip install twine
-            ls dist/*.whl
+            ls python_lib/dist/*.whl
 
-            python3 -m twine upload -r pypi -u __token__ -p ${PYPI_TWINE_TOKEN} dist/*.whl
+            python3 -m twine upload -r pypi -u __token__ -p ${PYPI_TWINE_TOKEN} python_lib/dist/*.whl
 
 # Define a job to be invoked later in a workflow.
 # See: https://circleci.com/docs/2.0/configuration-reference/#jobs

.licenserc.yaml

@@ -49,6 +49,7 @@ header: # <1>
     - '**/*.po'
     - '**/*.svg'
     - '**/*.rst'
+    - '**/*.rst_t'
     - '**/*.lds'
     - '**/*.patch'
     - '**/*.mlir'

build_wheel_entrypoint.sh

@@ -15,6 +15,10 @@
 # limitations under the License.
 set -e
 
+cd python_lib
 rm -rf dist
 python setup.py bdist_wheel
 python -m pip install dist/*.whl --force-reinstall
+cd -
+
+python -c "import secretflow_serving_lib"

docs/build.sh

@@ -15,6 +15,8 @@
 # limitations under the License.
 #
 
+set -e
+
 usage() { echo "Usage: $0 [-l <en|zh_CN>]" 1>&2; exit 1; }
 
 
@@ -40,7 +42,11 @@ if [[ "$l" != "en" && "$l" != "zh_CN" ]]; then
     usage
 fi
 
+if [ -e source/library/secretflow_serving_lib ]; then
+    rm -rf source/library/secretflow_serving_lib
+fi
 
 SPHINX_APIDOC_OPTIONS=members,autosummary
+
 make clean
 env PYTHONPATH=$PYTHONPATH:$PWD/.. make SPHINXOPTS="-D language='${l}'" html

docs/locales/zh_CN/LC_MESSAGES/index.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: SecretFlow-Serving \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-19 02:30+0000\n"
+"POT-Creation-Date: 2024-06-28 09:33+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -94,14 +94,17 @@ msgstr ""
 "</topics/graph/operator_list>`"
 
 #: ../../source/index.rst:50
-msgid "**Reference**: :doc:`SecretFlow-Serving model </reference/model>`"
-msgstr "**参考**：:doc:`SecretFlow-Serving 模型 </reference/model>`"
+msgid ""
+"**Reference**: :doc:`SecretFlow-Serving model </reference/model>` | :doc"
+":`secretflow-serving-lib docs </reference/modules>`"
+msgstr "**参考**：:doc:`SecretFlow-Serving 模型 </reference/model>` | :doc"
+":`secretflow-serving-lib 文档 </reference/modules>`"
 
-#: ../../source/index.rst:54
+#: ../../source/index.rst:55
 msgid "Prediction Algorithms"
 msgstr "预测算法"
 
-#: ../../source/index.rst:56
+#: ../../source/index.rst:57
 msgid ""
 "**Introduction**: :doc:`Introduction to prediction algorithms "
 "</topics/algorithm/intro>`"

docs/locales/zh_CN/LC_MESSAGES/reference/index.po

@@ -1,14 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) 2023 Ant Group Co., Ltd.
+# Copyright (C) 2024 Ant Group Co., Ltd.
 # This file is distributed under the same license as the SecretFlow-Serving
 # package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2023.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2024.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: SecretFlow-Serving \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-18 10:12+0000\n"
+"POT-Creation-Date: 2024-06-28 06:39+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -37,6 +37,10 @@ msgstr ""
 msgid "SpanInfo"
 msgstr ""
 
+#: ../../source/reference/index.rst:39
+msgid "Modules"
+msgstr ""
+
 #: ../../source/reference/index.rst:4
 msgid "Reference"
 msgstr "参考"

docs/locales/zh_CN/LC_MESSAGES/reference/modules.po

@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2024 Ant Group Co., Ltd.
+# This file is distributed under the same license as the SecretFlow-Serving
+# package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2024.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: SecretFlow-Serving \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-06-28 06:39+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <[email protected]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.14.0\n"
+
+#: ../../source/reference/modules.rst:2
+msgid "secretflow_serving_lib"
+msgstr ""

docs/locales/zh_CN/LC_MESSAGES/reference/secretflow_serving_lib.po

@@ -0,0 +1,215 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2024 Ant Group Co., Ltd.
+# This file is distributed under the same license as the SecretFlow-Serving
+# package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2024.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: SecretFlow-Serving \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-06-28 06:39+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <[email protected]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.14.0\n"
+
+#: ../../source/reference/secretflow_serving_lib.rst:2
+msgid "secretflow\\_serving\\_lib package"
+msgstr ""
+
+#: ../../source/reference/secretflow_serving_lib.rst:5
+msgid "Submodules"
+msgstr ""
+
+#: ../../source/reference/secretflow_serving_lib.rst:8
+msgid "secretflow\\_serving\\_lib.api module"
+msgstr ""
+
+#: of secretflow_serving_lib.api.get_all_ops:1
+msgid "Get all OpDef of Operators provided by Secretflow-Serving."
+msgstr ""
+
+#: of secretflow_serving_lib.api.get_graph_version:1
+msgid "Get the version of GraphDef defined in Secretflow-Serving."
+msgstr ""
+
+#: of secretflow_serving_lib.api.get_op:1
+msgid "Get the OpDef of specific Operator provided by Secretflow-Serving."
+msgstr ""
+
+#: of secretflow_serving_lib.api.get_op
+#: secretflow_serving_lib.graph_builder.GraphBuilder.add_node
+#: secretflow_serving_lib.graph_builder.GraphBuilder.begin_new_execution
+#: secretflow_serving_lib.graph_builder.build_serving_tar
+#: secretflow_serving_lib.graph_builder.check_graph_views
+msgid "Parameters"
+msgstr ""
+
+#: of secretflow_serving_lib.api.get_op:3
+msgid "The name of Operator."
+msgstr ""
+
+#: ../../source/reference/secretflow_serving_lib.rst:16
+msgid "secretflow\\_serving\\_lib.attr\\_pb2 module"
+msgstr ""
+
+#: ../../source/reference/secretflow_serving_lib.rst:24
+msgid "secretflow\\_serving\\_lib.bundle\\_pb2 module"
+msgstr ""
+
+#: ../../source/reference/secretflow_serving_lib.rst:32
+msgid "secretflow\\_serving\\_lib.compute\\_trace\\_pb2 module"
+msgstr ""
+
+#: ../../source/reference/secretflow_serving_lib.rst:40
+msgid "secretflow\\_serving\\_lib.data\\_type\\_pb2 module"
+msgstr ""
+
+#: ../../source/reference/secretflow_serving_lib.rst:48
+msgid "secretflow\\_serving\\_lib.feature\\_pb2 module"
+msgstr ""
+
+#: ../../source/reference/secretflow_serving_lib.rst:56
+msgid "secretflow\\_serving\\_lib.graph\\_builder module"
+msgstr ""
+
+#: of secretflow_serving_lib.graph_builder.GraphBuilder:1
+msgid "Bases: :py:class:`object`"
+msgstr ""
+
+#: of secretflow_serving_lib.graph_builder.GraphBuilder:1
+msgid "Builder for GraphDef"
+msgstr ""
+
+#: of secretflow_serving_lib.graph_builder.GraphBuilder.add_node:1
+msgid "Add a node to the last execution."
+msgstr ""
+
+#: of secretflow_serving_lib.graph_builder.GraphBuilder.add_node:3
+msgid "name of the node"
+msgstr ""
+
+#: of secretflow_serving_lib.graph_builder.GraphBuilder.add_node:4
+msgid "op name"
+msgstr ""
+
+#: of secretflow_serving_lib.graph_builder.GraphBuilder.add_node:5
+msgid "list of parent node names"
+msgstr ""
+
+#: of secretflow_serving_lib.graph_builder.GraphBuilder.add_node:6
+msgid "attrs of the node specified by corresponding OpDef"
+msgstr ""
+
+#: of secretflow_serving_lib.graph_builder.GraphBuilder.begin_new_execution:1
+msgid "Start a new execution for node adding"
+msgstr ""
+
+#: of secretflow_serving_lib.graph_builder.GraphBuilder.begin_new_execution:3
+msgid ""
+"dispatch type for execution, DP_ALL by default  - DP_ALL: executed by all"
+" parties, - DP_ANYONE: executed by all anyone of parties, - DP_SPECIFIED:"
+" executed by the party with specific_flag is True"
+msgstr ""
+
+#: of secretflow_serving_lib.graph_builder.GraphBuilder.begin_new_execution:3
+msgid "dispatch type for execution, DP_ALL by default"
+msgstr ""
+
+#: of secretflow_serving_lib.graph_builder.GraphBuilder.begin_new_execution:5
+msgid "DP_ALL: executed by all parties,"
+msgstr ""
+
+#: of secretflow_serving_lib.graph_builder.GraphBuilder.begin_new_execution:6
+msgid "DP_ANYONE: executed by all anyone of parties,"
+msgstr ""
+
+#: of secretflow_serving_lib.graph_builder.GraphBuilder.begin_new_execution:7
+msgid "DP_SPECIFIED: executed by the party with specific_flag is True"
+msgstr ""
+
+#: of secretflow_serving_lib.graph_builder.GraphBuilder.begin_new_execution:8
+msgid ""
+"whether to executed by this party, False by default, if True, "
+"dispatch_type must be DP_SPECIFIED"
+msgstr ""
+
+#: of secretflow_serving_lib.graph_builder.GraphBuilder.begin_new_execution:9
+msgid "whether to run in session mode, False by default"
+msgstr ""
+
+#: of secretflow_serving_lib.graph_builder.GraphBuilder.build_proto:1
+msgid "Get the GraphDef include all nodes and executions"
+msgstr ""
+
+#: of secretflow_serving_lib.graph_builder.GraphBuilder.build_view_proto:1
+msgid "Get the GraphDef of Graph"
+msgstr ""
+
+#: of secretflow_serving_lib.graph_builder.GraphBuilder.get_execution_count:1
+msgid "Get number of executions."
+msgstr ""
+
+#: of secretflow_serving_lib.graph_builder.build_serving_tar:1
+msgid "Build tar model file which can be loaded by Secretflow-Serving."
+msgstr ""
+
+#: of secretflow_serving_lib.graph_builder.build_serving_tar:3
+msgid "name of the model"
+msgstr ""
+
+#: of secretflow_serving_lib.graph_builder.build_serving_tar:4
+msgid "description of the model"
+msgstr ""
+
+#: of secretflow_serving_lib.graph_builder.build_serving_tar:5
+msgid "GraphDef of the model"
+msgstr ""
+
+#: of secretflow_serving_lib.graph_builder.build_serving_tar:6
+msgid "type of model file, json or pb, default is json"
+msgstr ""
+
+#: of secretflow_serving_lib.graph_builder.build_serving_tar
+msgid "Returns"
+msgstr ""
+
+#: of secretflow_serving_lib.graph_builder.build_serving_tar:8
+msgid "io stream"
+msgstr ""
+
+#: of secretflow_serving_lib.graph_builder.build_serving_tar
+msgid "Return type"
+msgstr ""
+
+#: of secretflow_serving_lib.graph_builder.check_graph_views:1
+msgid "Check whether the GraphViews of multiple parties are consistent."
+msgstr ""
+
+#: of secretflow_serving_lib.graph_builder.check_graph_views:3
+msgid "key is party name, value is corresponding graph_view"
+msgstr ""
+
+#: ../../source/reference/secretflow_serving_lib.rst:64
+msgid "secretflow\\_serving\\_lib.graph\\_pb2 module"
+msgstr ""
+
+#: ../../source/reference/secretflow_serving_lib.rst:72
+msgid "secretflow\\_serving\\_lib.link\\_function\\_pb2 module"
+msgstr ""
+
+#: ../../source/reference/secretflow_serving_lib.rst:80
+msgid "secretflow\\_serving\\_lib.op\\_pb2 module"
+msgstr ""
+
+#: ../../source/reference/secretflow_serving_lib.rst:88
+msgid "secretflow\\_serving\\_lib.version module"
+msgstr ""
+
+#: ../../source/reference/secretflow_serving_lib.rst:96
+msgid "Module contents"
+msgstr ""