Add capsule manager apis (#8)

* Create cla.yml * Create trigger-circleci.yml * repo-sync-2023-10-30T16:05:08+0800 * rm files * fix comment
secretflow · Oct 31, 2023 · 47a9d68 · 47a9d68
1 parent e419c5c
commit 47a9d68
Show file tree

Hide file tree

Showing 15 changed files with 891 additions and 46 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,11 +1,11 @@
 # Copyright 2023 Ant Group Co., Ltd.
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -67,7 +67,7 @@ jobs:
             python3 -m pip install grpcio-tools==1.48.2 mypy-protobuf==3.1.0 protobuf==3.19.4 twine
             make build
             ls 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} dist/*.whl
 
 # Invoke jobs via workflows
 # See: https://circleci.com/docs/2.0/configuration-reference/#workflows

diff --git a/python/setup.py b/python/setup.py
@@ -1,26 +1,28 @@
 import setuptools
 import os
 
+
 def read(fname):
     with open(os.path.join(os.path.dirname(__file__), fname)) as f:
         return f.read()
 
+
 setuptools.setup(
-    name = "sdc-apis",
-    version = "0.1.0b0",
-    author = "secretflow",
-    author_email = "[email protected]",
-    description = "SecretFlow Data Capsule apis proto generated python",
-    long_description_content_type = 'text/markdown',
-    long_description = 'SecretFlow Data Capsule apis proto generated python',
-    license = "Apache 2.0",
-    url = "https://github.com/secretflow/secure-data-capsule-apis",
-    packages = setuptools.find_packages(),
-    install_requires = read('requirements.txt'),
-    classifiers = [
+    name="sdc-apis",
+    version="0.2.0.dev20230930",
+    author="secretflow",
+    author_email="[email protected]",
+    description="SecretFlow Data Capsule apis proto generated python",
+    long_description_content_type="text/markdown",
+    long_description="SecretFlow Data Capsule apis proto generated python",
+    license="Apache 2.0",
+    url="https://github.com/secretflow/secure-data-capsule-apis",
+    packages=setuptools.find_packages(),
+    install_requires=read("requirements.txt"),
+    classifiers=[
         "Programming Language :: Python :: 3",
         "License :: OSI Approved :: Apache Software License",
         "Operating System :: OS Independent",
     ],
     include_package_data=True,
-)
+)
diff --git a/secretflowapis/v1/common.proto b/secretflowapis/v1/common.proto
@@ -1,11 +1,11 @@
 // Copyright 2023 Ant Group Co., Ltd.
-// 
+//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
-// 
+//
 //   http://www.apache.org/licenses/LICENSE-2.0
-// 
+//
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,8 +17,6 @@ syntax = "proto3";
 
 package secretflowapis.v1;
 
-option java_package = "com.alipay.secretflow.secretflowapis.v1";
-option java_outer_classname = "CommonProto";
 
 // RequestHeader carries the user custom headers.
 message RequestHeader {

diff --git a/secretflowapis/v1/sdc/authmanager/auth_manager.proto b/secretflowapis/v1/sdc/authmanager/auth_manager.proto
@@ -24,8 +24,6 @@ import "secretflowapis/v1/sdc/teeapps/tee_task_params.proto";
 
 package secretflowapis.v1.sdc.authmanager;
 
-option java_package = "com.alipay.secretflow.secretflowapis.v1.sdc.authmanager";
-option java_outer_classname = "AuthManagerProto";
 
 message GetExportDataKeyRequest {
   RequestHeader header = 1;
@@ -62,8 +60,8 @@ message ComputeMeta {
     // The data storage path and the corresponding data decryption key
     DataUri data_uri_with_dks = 2;
   }
-  // data_uuid -> meta
-  map<string, InputMeta> input_metas = 3;
+  // The order of `input_metas` is same to `TeeTaskParams.inputs`.
+  repeated InputMeta input_metas = 3;
 
   // The public key of AuthManager
   //

diff --git a/secretflowapis/v1/sdc/core.proto b/secretflowapis/v1/sdc/core.proto
@@ -1,11 +1,11 @@
 // Copyright 2023 Ant Group Co., Ltd.
-// 
+//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
-// 
+//
 //   http://www.apache.org/licenses/LICENSE-2.0
-// 
+//
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,8 +19,6 @@ import "google/protobuf/any.proto";
 
 package secretflowapis.v1.sdc;
 
-option java_package = "com.alipay.secretflow.secretflowapis.v1.sdc";
-option java_outer_classname = "CoreProto";
 
 enum PrimitiveDataType {
   PrimitiveDataType_UNDEFINED = 0;

diff --git a/secretflowapis/v1/sdc/dataagent/data_agent.proto b/secretflowapis/v1/sdc/dataagent/data_agent.proto
@@ -22,8 +22,6 @@ import "secretflowapis/v1/sdc/digital_envelope.proto";
 
 package secretflowapis.v1.sdc.dataagent;
 
-option java_package = "com.alipay.secretflow.secretflowapis.v1.sdc.dataagent";
-option java_outer_classname = "DataAgentProto";
 
 // 机构注册自己的公钥
 message RegisterInsPubKeyRequest {
@@ -357,7 +355,7 @@ message PartitionIdInfo {
   // 2. 读取某个分区：分区格式为 ${yyyymmdd}，时区为 UTC+0, 如 20230404
   // 3. 读取一个范围的分区：（${yyyymmdd},${yyyymmdd}), 为闭区间，
   //      如 (20230304,20230404) 表示从 20230304（包含） 到 20230404（包含） 的所有分区
-  // 4. 2 和 3 可以组合以冒号隔开，如 (20230304,20230404);20230201 
+  // 4. 2 和 3 可以组合以冒号隔开，如 (20230304,20230404);20230201
   //      表示从 20230304（包含） 到 20230404（包含）的所有分区以及 20230201 分区
   string partition_expr = 3;
 }

diff --git a/secretflowapis/v1/sdc/digital_envelope.proto b/secretflowapis/v1/sdc/digital_envelope.proto
@@ -1,11 +1,11 @@
 // Copyright 2023 Ant Group Co., Ltd.
-// 
+//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
-// 
+//
 //   http://www.apache.org/licenses/LICENSE-2.0
-// 
+//
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,8 +17,6 @@ syntax = "proto3";
 
 package secretflowapis.v1.sdc;
 
-option java_package = "com.alipay.secretflow.secretflowapis.v1.sdc";
-option java_outer_classname = "DigitalEnvelopeProto";
 
 /// 公钥定义
 //  目前系统中，国密和国际密码标准不会出现混用的情况：

diff --git a/secretflowapis/v1/sdc/teeapps/tee_task_params.proto b/secretflowapis/v1/sdc/teeapps/tee_task_params.proto
@@ -1,11 +1,11 @@
 // Copyright 2023 Ant Group Co., Ltd.
-// 
+//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
-// 
+//
 //   http://www.apache.org/licenses/LICENSE-2.0
-// 
+//
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,8 +19,6 @@ import "google/protobuf/any.proto";
 
 package secretflowapis.v1.sdc.teeapps;
 
-option java_package = "com.alipay.secretflow.secretflowapis.v1.sdc.teeapps";
-option java_outer_classname = "TeeTaskParamsProto";
 
 message TeeTaskParams {
   message Input {

diff --git a/secretflowapis/v1/status.proto b/secretflowapis/v1/status.proto
@@ -20,8 +20,6 @@ import "google/protobuf/any.proto";
 
 package secretflowapis.v1;
 
-option java_package = "com.alipay.secretflow.secretflowapis.v1";
-option java_outer_classname = "StatusProto";
 
 message Status {
   // The status code, which should be one of google rpc code or custom code.

diff --git a/secretflowapis/v2/common.proto b/secretflowapis/v2/common.proto
@@ -0,0 +1,25 @@
+// Copyright 2023 Ant Group Co., Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+syntax = "proto3";
+
+package secretflowapis.v2;
+
+
+// RequestHeader carries the user custom headers.
+message RequestHeader {
+  // Custom headers used to record custom information.
+  map<string, string> custom_headers = 1;
+}