This is an automated email from the ASF dual-hosted git repository.
dimuthuupe pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-mft.git
The following commit(s) were added to refs/heads/master by this push:
new 90e3918 Python SDK 0.0.1-alpha13 release
90e3918 is described below
commit 90e39187554cffe50ecaf19880769bf196500cfd
Author: Dimuthu Wannipurage <[email protected]>
AuthorDate: Mon Dec 12 05:20:20 2022 -0500
Python SDK 0.0.1-alpha13 release
---
.gitignore | 1 +
agent/stub/src/main/proto/MFTAgentStubs.proto | 38 +++----
api/stub/pom.xml | 21 +---
python-sdk/README.md | 19 +++-
python-sdk/setup.cfg | 2 +-
.../src/airavata_mft_sdk/MFTAgentStubs_pb2.py | 121 +++++++++++++++++++++
.../src/airavata_mft_sdk/MFTAgentStubs_pb2_grpc.py | 4 +
.../src/airavata_mft_sdk/MFTTransferApi_pb2.py | 101 +++++++----------
.../airavata_mft_sdk/MFTTransferApi_pb2_grpc.py | 60 +++-------
.../src/airavata_mft_sdk/gcs/GCSCredential_pb2.py | 28 ++---
python-sdk/src/airavata_mft_sdk/generate-stubs.sh | 17 ++-
11 files changed, 251 insertions(+), 161 deletions(-)
diff --git a/.gitignore b/.gitignore
index d717107..861afbf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1208,3 +1208,4 @@ airavata-mft/
# Custom rules (everything added below won't be overriden by 'Generate
.gitignore File' if you use 'Update' option)
+python-sdk/env
\ No newline at end of file
diff --git a/agent/stub/src/main/proto/MFTAgentStubs.proto
b/agent/stub/src/main/proto/MFTAgentStubs.proto
index d040981..17eda3b 100644
--- a/agent/stub/src/main/proto/MFTAgentStubs.proto
+++ b/agent/stub/src/main/proto/MFTAgentStubs.proto
@@ -20,26 +20,26 @@ syntax = "proto3";
option java_multiple_files = true;
package org.apache.airavata.mft.agent.stub;
-import "AzureStorage.proto";
-import "BoxStorage.proto";
-import "DropboxStorage.proto";
-import "FTPStorage.proto";
-import "GCSStorage.proto";
-import "LocalStorage.proto";
-import "ODataStorage.proto";
-import "S3Storage.proto";
-import "SCPStorage.proto";
-import "SwiftStorage.proto";
+import "azure/AzureStorage.proto";
+import "box/BoxStorage.proto";
+import "dropbox/DropboxStorage.proto";
+import "ftp/FTPStorage.proto";
+import "gcs/GCSStorage.proto";
+import "local/LocalStorage.proto";
+import "odata/ODataStorage.proto";
+import "s3/S3Storage.proto";
+import "scp/SCPStorage.proto";
+import "swift/SwiftStorage.proto";
-import "AzureCredential.proto";
-import "BoxCredential.proto";
-import "DropboxCredential.proto";
-import "FTPCredential.proto";
-import "GCSCredential.proto";
-import "ODataCredential.proto";
-import "S3Credential.proto";
-import "SCPCredential.proto";
-import "SwiftCredential.proto";
+import "azure/AzureCredential.proto";
+import "box/BoxCredential.proto";
+import "dropbox/DropboxCredential.proto";
+import "ftp/FTPCredential.proto";
+import "gcs/GCSCredential.proto";
+import "odata/ODataCredential.proto";
+import "s3/S3Credential.proto";
+import "scp/SCPCredential.proto";
+import "swift/SwiftCredential.proto";
message StorageWrapper {
oneof storage {
diff --git a/api/stub/pom.xml b/api/stub/pom.xml
index c6c8e5f..4d7652d 100644
--- a/api/stub/pom.xml
+++ b/api/stub/pom.xml
@@ -63,25 +63,8 @@
<pluginArtifact>io.grpc:protoc-gen-grpc-java:1.0.1:exe:${os.detected.classifier}</pluginArtifact>
<additionalProtoPathElements>
<additionalProtoPathElement>../../common/mft-common-proto/src/main/proto</additionalProtoPathElement>
-
<additionalProtoPathElement>../../services/resource-service/stub/src/main/proto/azure</additionalProtoPathElement>
-
<additionalProtoPathElement>../../services/resource-service/stub/src/main/proto/box</additionalProtoPathElement>
-
<additionalProtoPathElement>../../services/resource-service/stub/src/main/proto/dropbox</additionalProtoPathElement>
-
<additionalProtoPathElement>../../services/resource-service/stub/src/main/proto/ftp</additionalProtoPathElement>
-
<additionalProtoPathElement>../../services/resource-service/stub/src/main/proto/gcs</additionalProtoPathElement>
-
<additionalProtoPathElement>../../services/resource-service/stub/src/main/proto/local</additionalProtoPathElement>
-
<additionalProtoPathElement>../../services/resource-service/stub/src/main/proto/odata</additionalProtoPathElement>
-
<additionalProtoPathElement>../../services/resource-service/stub/src/main/proto/s3</additionalProtoPathElement>
-
<additionalProtoPathElement>../../services/resource-service/stub/src/main/proto/scp</additionalProtoPathElement>
-
<additionalProtoPathElement>../../services/resource-service/stub/src/main/proto/swift</additionalProtoPathElement>
-
<additionalProtoPathElement>../../services/secret-service/stub/src/main/proto/azure</additionalProtoPathElement>
-
<additionalProtoPathElement>../../services/secret-service/stub/src/main/proto/box</additionalProtoPathElement>
-
<additionalProtoPathElement>../../services/secret-service/stub/src/main/proto/dropbox</additionalProtoPathElement>
-
<additionalProtoPathElement>../../services/secret-service/stub/src/main/proto/ftp</additionalProtoPathElement>
-
<additionalProtoPathElement>../../services/secret-service/stub/src/main/proto/gcs</additionalProtoPathElement>
-
<additionalProtoPathElement>../../services/secret-service/stub/src/main/proto/odata</additionalProtoPathElement>
-
<additionalProtoPathElement>../../services/secret-service/stub/src/main/proto/s3</additionalProtoPathElement>
-
<additionalProtoPathElement>../../services/secret-service/stub/src/main/proto/scp</additionalProtoPathElement>
-
<additionalProtoPathElement>../../services/secret-service/stub/src/main/proto/swift</additionalProtoPathElement>
+
<additionalProtoPathElement>../../services/resource-service/stub/src/main/proto</additionalProtoPathElement>
+
<additionalProtoPathElement>../../services/secret-service/stub/src/main/proto</additionalProtoPathElement>
<additionalProtoPathElement>../../agent/stub/src/main/proto</additionalProtoPathElement>
</additionalProtoPathElements>
</configuration>
diff --git a/python-sdk/README.md b/python-sdk/README.md
index 39b2357..ef9374a 100644
--- a/python-sdk/README.md
+++ b/python-sdk/README.md
@@ -9,10 +9,27 @@ cd src/airavata_mft_sdk
```
### Build the distribution
+
+* Increase the version of the distribution in setup.cfg and run following
commands
+in the directory where the setup.cfg exists. (airavata-mft/python-sdk)
+
+* If you are not in a virtual environment created in the "Generate Protobuf /
Grpc sources" section,
+run following commands to create the virtual environment and install
dependencies.
+Otherwise, move to the next command section
+
```
+virtualenv -p python3 env
+source env/bin/activate
+pip install grpcio grpcio-tools
+```
+
+
+```
+rm -rf dist
python3 -m pip install --upgrade build
python3 -m build
python3 -m pip install --upgrade twine
python3 -m twine upload --repository pypi dist/*
```
-
+* Commit setup.cfg file with all updates to the python stubs created in
+the src directory
diff --git a/python-sdk/setup.cfg b/python-sdk/setup.cfg
index ac5ef85..4018b87 100644
--- a/python-sdk/setup.cfg
+++ b/python-sdk/setup.cfg
@@ -1,6 +1,6 @@
[metadata]
name = airavata_mft_sdk
-version = 0.0.1-alpha13
+version = 0.0.1-alpha14
author = Airavata MFT Developers
author_email = [email protected]
description = Python SDK for Apache Airavata Managed File Transfers (MFT)
diff --git a/python-sdk/src/airavata_mft_sdk/MFTAgentStubs_pb2.py
b/python-sdk/src/airavata_mft_sdk/MFTAgentStubs_pb2.py
new file mode 100644
index 0000000..a72c134
--- /dev/null
+++ b/python-sdk/src/airavata_mft_sdk/MFTAgentStubs_pb2.py
@@ -0,0 +1,121 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler. DO NOT EDIT!
+# source: MFTAgentStubs.proto
+"""Generated protocol buffer code."""
+from google.protobuf.internal import enum_type_wrapper
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import message as _message
+from google.protobuf import reflection as _reflection
+from google.protobuf import symbol_database as _symbol_database
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+from airavata_mft_sdk.azure import AzureStorage_pb2 as
azure_dot_AzureStorage__pb2
+from airavata_mft_sdk.box import BoxStorage_pb2 as box_dot_BoxStorage__pb2
+from airavata_mft_sdk.dropbox import DropboxStorage_pb2 as
dropbox_dot_DropboxStorage__pb2
+from airavata_mft_sdk.ftp import FTPStorage_pb2 as ftp_dot_FTPStorage__pb2
+from airavata_mft_sdk.gcs import GCSStorage_pb2 as gcs_dot_GCSStorage__pb2
+from airavata_mft_sdk.local import LocalStorage_pb2 as
local_dot_LocalStorage__pb2
+from airavata_mft_sdk.odata import ODataStorage_pb2 as
odata_dot_ODataStorage__pb2
+from airavata_mft_sdk.s3 import S3Storage_pb2 as s3_dot_S3Storage__pb2
+from airavata_mft_sdk.scp import SCPStorage_pb2 as scp_dot_SCPStorage__pb2
+from airavata_mft_sdk.swift import SwiftStorage_pb2 as
swift_dot_SwiftStorage__pb2
+from airavata_mft_sdk.azure import AzureCredential_pb2 as
azure_dot_AzureCredential__pb2
+from airavata_mft_sdk.box import BoxCredential_pb2 as
box_dot_BoxCredential__pb2
+from airavata_mft_sdk.dropbox import DropboxCredential_pb2 as
dropbox_dot_DropboxCredential__pb2
+from airavata_mft_sdk.ftp import FTPCredential_pb2 as
ftp_dot_FTPCredential__pb2
+from airavata_mft_sdk.gcs import GCSCredential_pb2 as
gcs_dot_GCSCredential__pb2
+from airavata_mft_sdk.odata import ODataCredential_pb2 as
odata_dot_ODataCredential__pb2
+from airavata_mft_sdk.s3 import S3Credential_pb2 as s3_dot_S3Credential__pb2
+from airavata_mft_sdk.scp import SCPCredential_pb2 as
scp_dot_SCPCredential__pb2
+from airavata_mft_sdk.swift import SwiftCredential_pb2 as
swift_dot_SwiftCredential__pb2
+
+
+DESCRIPTOR =
_descriptor_pool.Default().AddSerializedFile(b'\n\x13MFTAgentStubs.proto\x12\"org.apache.airavata.mft.agent.stub\x1a\x18\x61zure/AzureStorage.proto\x1a\x14\x62ox/BoxStorage.proto\x1a\x1c\x64ropbox/DropboxStorage.proto\x1a\x14\x66tp/FTPStorage.proto\x1a\x14gcs/GCSStorage.proto\x1a\x18local/LocalStorage.proto\x1a\x18odata/ODataStorage.proto\x1a\x12s3/S3Storage.proto\x1a\x14scp/SCPStorage.proto\x1a\x18swift/SwiftStorage.proto\x1a\x1b\x61zure/AzureCredential.proto\x1a\x17\x62ox/
[...]
+
+_METADATAFETCHERROR = DESCRIPTOR.enum_types_by_name['MetadataFetchError']
+MetadataFetchError = enum_type_wrapper.EnumTypeWrapper(_METADATAFETCHERROR)
+NOT_FOUND = 0
+NO_PERMISSION = 1
+
+
+_STORAGEWRAPPER = DESCRIPTOR.message_types_by_name['StorageWrapper']
+_SECRETWRAPPER = DESCRIPTOR.message_types_by_name['SecretWrapper']
+_AGENTTRANSFERREQUEST =
DESCRIPTOR.message_types_by_name['AgentTransferRequest']
+_FILEMETADATA = DESCRIPTOR.message_types_by_name['FileMetadata']
+_DIRECTORYMETADATA = DESCRIPTOR.message_types_by_name['DirectoryMetadata']
+_RESOURCEMETADATA = DESCRIPTOR.message_types_by_name['ResourceMetadata']
+_GETRESOURCEMETADATAREQUEST =
DESCRIPTOR.message_types_by_name['GetResourceMetadataRequest']
+StorageWrapper = _reflection.GeneratedProtocolMessageType('StorageWrapper',
(_message.Message,), {
+ 'DESCRIPTOR' : _STORAGEWRAPPER,
+ '__module__' : 'MFTAgentStubs_pb2'
+ #
@@protoc_insertion_point(class_scope:org.apache.airavata.mft.agent.stub.StorageWrapper)
+ })
+_sym_db.RegisterMessage(StorageWrapper)
+
+SecretWrapper = _reflection.GeneratedProtocolMessageType('SecretWrapper',
(_message.Message,), {
+ 'DESCRIPTOR' : _SECRETWRAPPER,
+ '__module__' : 'MFTAgentStubs_pb2'
+ #
@@protoc_insertion_point(class_scope:org.apache.airavata.mft.agent.stub.SecretWrapper)
+ })
+_sym_db.RegisterMessage(SecretWrapper)
+
+AgentTransferRequest =
_reflection.GeneratedProtocolMessageType('AgentTransferRequest',
(_message.Message,), {
+ 'DESCRIPTOR' : _AGENTTRANSFERREQUEST,
+ '__module__' : 'MFTAgentStubs_pb2'
+ #
@@protoc_insertion_point(class_scope:org.apache.airavata.mft.agent.stub.AgentTransferRequest)
+ })
+_sym_db.RegisterMessage(AgentTransferRequest)
+
+FileMetadata = _reflection.GeneratedProtocolMessageType('FileMetadata',
(_message.Message,), {
+ 'DESCRIPTOR' : _FILEMETADATA,
+ '__module__' : 'MFTAgentStubs_pb2'
+ #
@@protoc_insertion_point(class_scope:org.apache.airavata.mft.agent.stub.FileMetadata)
+ })
+_sym_db.RegisterMessage(FileMetadata)
+
+DirectoryMetadata =
_reflection.GeneratedProtocolMessageType('DirectoryMetadata',
(_message.Message,), {
+ 'DESCRIPTOR' : _DIRECTORYMETADATA,
+ '__module__' : 'MFTAgentStubs_pb2'
+ #
@@protoc_insertion_point(class_scope:org.apache.airavata.mft.agent.stub.DirectoryMetadata)
+ })
+_sym_db.RegisterMessage(DirectoryMetadata)
+
+ResourceMetadata =
_reflection.GeneratedProtocolMessageType('ResourceMetadata',
(_message.Message,), {
+ 'DESCRIPTOR' : _RESOURCEMETADATA,
+ '__module__' : 'MFTAgentStubs_pb2'
+ #
@@protoc_insertion_point(class_scope:org.apache.airavata.mft.agent.stub.ResourceMetadata)
+ })
+_sym_db.RegisterMessage(ResourceMetadata)
+
+GetResourceMetadataRequest =
_reflection.GeneratedProtocolMessageType('GetResourceMetadataRequest',
(_message.Message,), {
+ 'DESCRIPTOR' : _GETRESOURCEMETADATAREQUEST,
+ '__module__' : 'MFTAgentStubs_pb2'
+ #
@@protoc_insertion_point(class_scope:org.apache.airavata.mft.agent.stub.GetResourceMetadataRequest)
+ })
+_sym_db.RegisterMessage(GetResourceMetadataRequest)
+
+if _descriptor._USE_C_DESCRIPTORS == False:
+
+ DESCRIPTOR._options = None
+ DESCRIPTOR._serialized_options = b'P\001'
+ _METADATAFETCHERROR._serialized_start=3301
+ _METADATAFETCHERROR._serialized_end=3355
+ _STORAGEWRAPPER._serialized_start=545
+ _STORAGEWRAPPER._serialized_end=1395
+ _SECRETWRAPPER._serialized_start=1398
+ _SECRETWRAPPER._serialized_end=2098
+ _AGENTTRANSFERREQUEST._serialized_start=2101
+ _AGENTTRANSFERREQUEST._serialized_end=2474
+ _FILEMETADATA._serialized_start=2477
+ _FILEMETADATA._serialized_end=2614
+ _DIRECTORYMETADATA._serialized_start=2617
+ _DIRECTORYMETADATA._serialized_end=2862
+ _RESOURCEMETADATA._serialized_start=2865
+ _RESOURCEMETADATA._serialized_end=3110
+ _GETRESOURCEMETADATAREQUEST._serialized_start=3113
+ _GETRESOURCEMETADATAREQUEST._serialized_end=3299
+# @@protoc_insertion_point(module_scope)
diff --git a/python-sdk/src/airavata_mft_sdk/MFTAgentStubs_pb2_grpc.py
b/python-sdk/src/airavata_mft_sdk/MFTAgentStubs_pb2_grpc.py
new file mode 100644
index 0000000..2daafff
--- /dev/null
+++ b/python-sdk/src/airavata_mft_sdk/MFTAgentStubs_pb2_grpc.py
@@ -0,0 +1,4 @@
+# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
+"""Client and server classes corresponding to protobuf-defined services."""
+import grpc
+
diff --git a/python-sdk/src/airavata_mft_sdk/MFTTransferApi_pb2.py
b/python-sdk/src/airavata_mft_sdk/MFTTransferApi_pb2.py
index aac39df..7579626 100644
--- a/python-sdk/src/airavata_mft_sdk/MFTTransferApi_pb2.py
+++ b/python-sdk/src/airavata_mft_sdk/MFTTransferApi_pb2.py
@@ -13,9 +13,10 @@ _sym_db = _symbol_database.Default()
import airavata_mft_sdk.CredCommon_pb2 as CredCommon__pb2
+import airavata_mft_sdk.MFTAgentStubs_pb2 as MFTAgentStubs__pb2
-DESCRIPTOR =
_descriptor_pool.Default().AddSerializedFile(b'\n\x14MFTTransferApi.proto\x12#org.apache.airavata.mft.api.service\x1a\x10\x43redCommon.proto\"\x9b\x01\n\x10\x43\x61llbackEndpoint\x12P\n\x04type\x18\x01
\x01(\x0e\x32\x42.org.apache.airavata.mft.api.service.CallbackEndpoint.CallbackType\x12\x10\n\x08\x65ndpoint\x18\x02
\x01(\t\"#\n\x0c\x43\x61llbackType\x12\x08\n\x04HTTP\x10\x00\x12\t\n\x05KAFKA\x10\x01\"\xf3\x03\n\x12TransferApiRequest\x12\x12\n\nsourcePath\x18\x01
\x01(\t\x1 [...]
+DESCRIPTOR =
_descriptor_pool.Default().AddSerializedFile(b'\n\x14MFTTransferApi.proto\x12#org.apache.airavata.mft.api.service\x1a\x10\x43redCommon.proto\x1a\x13MFTAgentStubs.proto\"\x9b\x01\n\x10\x43\x61llbackEndpoint\x12P\n\x04type\x18\x01
\x01(\x0e\x32\x42.org.apache.airavata.mft.api.service.CallbackEndpoint.CallbackType\x12\x10\n\x08\x65ndpoint\x18\x02
\x01(\t\"#\n\x0c\x43\x61llbackType\x12\x08\n\x04HTTP\x10\x00\x12\t\n\x05KAFKA\x10\x01\"\xf3\x03\n\x12TransferApiRequest\x12\x12\n\nso
[...]
@@ -31,10 +32,8 @@ _HTTPDOWNLOADAPIREQUEST =
DESCRIPTOR.message_types_by_name['HttpDownloadApiReque
_HTTPDOWNLOADAPIRESPONSE =
DESCRIPTOR.message_types_by_name['HttpDownloadApiResponse']
_TRANSFERSTATEAPIREQUEST =
DESCRIPTOR.message_types_by_name['TransferStateApiRequest']
_TRANSFERSTATEAPIRESPONSE =
DESCRIPTOR.message_types_by_name['TransferStateApiResponse']
-_RESOURCEAVAILABILITYREQUEST =
DESCRIPTOR.message_types_by_name['ResourceAvailabilityRequest']
_RESOURCEAVAILABILITYRESPONSE =
DESCRIPTOR.message_types_by_name['ResourceAvailabilityResponse']
-_FILEMETADATARESPONSE =
DESCRIPTOR.message_types_by_name['FileMetadataResponse']
-_DIRECTORYMETADATARESPONSE =
DESCRIPTOR.message_types_by_name['DirectoryMetadataResponse']
+_GETRESOURCEMETADATAFROMIDSREQUEST =
DESCRIPTOR.message_types_by_name['GetResourceMetadataFromIDsRequest']
_FETCHRESOURCEMETADATAREQUEST =
DESCRIPTOR.message_types_by_name['FetchResourceMetadataRequest']
_CALLBACKENDPOINT_CALLBACKTYPE =
_CALLBACKENDPOINT.enum_types_by_name['CallbackType']
CallbackEndpoint =
_reflection.GeneratedProtocolMessageType('CallbackEndpoint',
(_message.Message,), {
@@ -122,13 +121,6 @@ TransferStateApiResponse =
_reflection.GeneratedProtocolMessageType('TransferSta
})
_sym_db.RegisterMessage(TransferStateApiResponse)
-ResourceAvailabilityRequest =
_reflection.GeneratedProtocolMessageType('ResourceAvailabilityRequest',
(_message.Message,), {
- 'DESCRIPTOR' : _RESOURCEAVAILABILITYREQUEST,
- '__module__' : 'MFTTransferApi_pb2'
- #
@@protoc_insertion_point(class_scope:org.apache.airavata.mft.api.service.ResourceAvailabilityRequest)
- })
-_sym_db.RegisterMessage(ResourceAvailabilityRequest)
-
ResourceAvailabilityResponse =
_reflection.GeneratedProtocolMessageType('ResourceAvailabilityResponse',
(_message.Message,), {
'DESCRIPTOR' : _RESOURCEAVAILABILITYRESPONSE,
'__module__' : 'MFTTransferApi_pb2'
@@ -136,19 +128,12 @@ ResourceAvailabilityResponse =
_reflection.GeneratedProtocolMessageType('Resourc
})
_sym_db.RegisterMessage(ResourceAvailabilityResponse)
-FileMetadataResponse =
_reflection.GeneratedProtocolMessageType('FileMetadataResponse',
(_message.Message,), {
- 'DESCRIPTOR' : _FILEMETADATARESPONSE,
- '__module__' : 'MFTTransferApi_pb2'
- #
@@protoc_insertion_point(class_scope:org.apache.airavata.mft.api.service.FileMetadataResponse)
- })
-_sym_db.RegisterMessage(FileMetadataResponse)
-
-DirectoryMetadataResponse =
_reflection.GeneratedProtocolMessageType('DirectoryMetadataResponse',
(_message.Message,), {
- 'DESCRIPTOR' : _DIRECTORYMETADATARESPONSE,
+GetResourceMetadataFromIDsRequest =
_reflection.GeneratedProtocolMessageType('GetResourceMetadataFromIDsRequest',
(_message.Message,), {
+ 'DESCRIPTOR' : _GETRESOURCEMETADATAFROMIDSREQUEST,
'__module__' : 'MFTTransferApi_pb2'
- #
@@protoc_insertion_point(class_scope:org.apache.airavata.mft.api.service.DirectoryMetadataResponse)
+ #
@@protoc_insertion_point(class_scope:org.apache.airavata.mft.api.service.GetResourceMetadataFromIDsRequest)
})
-_sym_db.RegisterMessage(DirectoryMetadataResponse)
+_sym_db.RegisterMessage(GetResourceMetadataFromIDsRequest)
FetchResourceMetadataRequest =
_reflection.GeneratedProtocolMessageType('FetchResourceMetadataRequest',
(_message.Message,), {
'DESCRIPTOR' : _FETCHRESOURCEMETADATAREQUEST,
@@ -164,42 +149,38 @@ if _descriptor._USE_C_DESCRIPTORS == False:
DESCRIPTOR._serialized_options = b'P\001'
_TRANSFERAPIREQUEST_TARGETAGENTSENTRY._options = None
_TRANSFERAPIREQUEST_TARGETAGENTSENTRY._serialized_options = b'8\001'
- _CALLBACKENDPOINT._serialized_start=80
- _CALLBACKENDPOINT._serialized_end=235
- _CALLBACKENDPOINT_CALLBACKTYPE._serialized_start=200
- _CALLBACKENDPOINT_CALLBACKTYPE._serialized_end=235
- _TRANSFERAPIREQUEST._serialized_start=238
- _TRANSFERAPIREQUEST._serialized_end=737
- _TRANSFERAPIREQUEST_TARGETAGENTSENTRY._serialized_start=686
- _TRANSFERAPIREQUEST_TARGETAGENTSENTRY._serialized_end=737
- _TRANSFERAPIRESPONSE._serialized_start=739
- _TRANSFERAPIRESPONSE._serialized_end=780
- _BATCHTRANSFERAPIREQUEST._serialized_start=782
- _BATCHTRANSFERAPIREQUEST._serialized_end=890
- _BATCHTRANSFERAPIRESPONSE._serialized_start=892
- _BATCHTRANSFERAPIRESPONSE._serialized_end=939
- _HTTPUPLOADAPIREQUEST._serialized_start=942
- _HTTPUPLOADAPIREQUEST._serialized_end=1137
- _HTTPUPLOADAPIRESPONSE._serialized_start=1139
- _HTTPUPLOADAPIRESPONSE._serialized_end=1196
- _HTTPDOWNLOADAPIREQUEST._serialized_start=1199
- _HTTPDOWNLOADAPIREQUEST._serialized_end=1386
- _HTTPDOWNLOADAPIRESPONSE._serialized_start=1388
- _HTTPDOWNLOADAPIRESPONSE._serialized_end=1447
- _TRANSFERSTATEAPIREQUEST._serialized_start=1449
- _TRANSFERSTATEAPIREQUEST._serialized_end=1568
- _TRANSFERSTATEAPIRESPONSE._serialized_start=1570
- _TRANSFERSTATEAPIRESPONSE._serialized_end=1676
- _RESOURCEAVAILABILITYREQUEST._serialized_start=1679
- _RESOURCEAVAILABILITYREQUEST._serialized_end=1846
- _RESOURCEAVAILABILITYRESPONSE._serialized_start=1848
- _RESOURCEAVAILABILITYRESPONSE._serialized_end=1897
- _FILEMETADATARESPONSE._serialized_start=1900
- _FILEMETADATARESPONSE._serialized_end=2099
- _DIRECTORYMETADATARESPONSE._serialized_start=2102
- _DIRECTORYMETADATARESPONSE._serialized_end=2452
- _FETCHRESOURCEMETADATAREQUEST._serialized_start=2455
- _FETCHRESOURCEMETADATAREQUEST._serialized_end=2646
- _MFTTRANSFERSERVICE._serialized_start=2649
- _MFTTRANSFERSERVICE._serialized_end=4012
+ _CALLBACKENDPOINT._serialized_start=101
+ _CALLBACKENDPOINT._serialized_end=256
+ _CALLBACKENDPOINT_CALLBACKTYPE._serialized_start=221
+ _CALLBACKENDPOINT_CALLBACKTYPE._serialized_end=256
+ _TRANSFERAPIREQUEST._serialized_start=259
+ _TRANSFERAPIREQUEST._serialized_end=758
+ _TRANSFERAPIREQUEST_TARGETAGENTSENTRY._serialized_start=707
+ _TRANSFERAPIREQUEST_TARGETAGENTSENTRY._serialized_end=758
+ _TRANSFERAPIRESPONSE._serialized_start=760
+ _TRANSFERAPIRESPONSE._serialized_end=801
+ _BATCHTRANSFERAPIREQUEST._serialized_start=803
+ _BATCHTRANSFERAPIREQUEST._serialized_end=911
+ _BATCHTRANSFERAPIRESPONSE._serialized_start=913
+ _BATCHTRANSFERAPIRESPONSE._serialized_end=960
+ _HTTPUPLOADAPIREQUEST._serialized_start=963
+ _HTTPUPLOADAPIREQUEST._serialized_end=1158
+ _HTTPUPLOADAPIRESPONSE._serialized_start=1160
+ _HTTPUPLOADAPIRESPONSE._serialized_end=1217
+ _HTTPDOWNLOADAPIREQUEST._serialized_start=1220
+ _HTTPDOWNLOADAPIREQUEST._serialized_end=1407
+ _HTTPDOWNLOADAPIRESPONSE._serialized_start=1409
+ _HTTPDOWNLOADAPIRESPONSE._serialized_end=1468
+ _TRANSFERSTATEAPIREQUEST._serialized_start=1470
+ _TRANSFERSTATEAPIREQUEST._serialized_end=1589
+ _TRANSFERSTATEAPIRESPONSE._serialized_start=1591
+ _TRANSFERSTATEAPIRESPONSE._serialized_end=1697
+ _RESOURCEAVAILABILITYRESPONSE._serialized_start=1699
+ _RESOURCEAVAILABILITYRESPONSE._serialized_end=1748
+ _GETRESOURCEMETADATAFROMIDSREQUEST._serialized_start=1750
+ _GETRESOURCEMETADATAFROMIDSREQUEST._serialized_end=1844
+ _FETCHRESOURCEMETADATAREQUEST._serialized_start=1847
+ _FETCHRESOURCEMETADATAREQUEST._serialized_end=2144
+ _MFTTRANSFERSERVICE._serialized_start=2147
+ _MFTTRANSFERSERVICE._serialized_end=3335
# @@protoc_insertion_point(module_scope)
diff --git a/python-sdk/src/airavata_mft_sdk/MFTTransferApi_pb2_grpc.py
b/python-sdk/src/airavata_mft_sdk/MFTTransferApi_pb2_grpc.py
index ff83e45..37be085 100644
--- a/python-sdk/src/airavata_mft_sdk/MFTTransferApi_pb2_grpc.py
+++ b/python-sdk/src/airavata_mft_sdk/MFTTransferApi_pb2_grpc.py
@@ -2,6 +2,7 @@
"""Client and server classes corresponding to protobuf-defined services."""
import grpc
+import airavata_mft_sdk.MFTAgentStubs_pb2 as MFTAgentStubs__pb2
import airavata_mft_sdk.MFTTransferApi_pb2 as MFTTransferApi__pb2
@@ -46,18 +47,13 @@ class MFTTransferServiceStub(object):
)
self.getResourceAvailability = channel.unary_unary(
'/org.apache.airavata.mft.api.service.MFTTransferService/getResourceAvailability',
-
request_serializer=MFTTransferApi__pb2.ResourceAvailabilityRequest.SerializeToString,
-
response_deserializer=MFTTransferApi__pb2.ResourceAvailabilityResponse.FromString,
- )
- self.getFileResourceMetadata = channel.unary_unary(
-
'/org.apache.airavata.mft.api.service.MFTTransferService/getFileResourceMetadata',
request_serializer=MFTTransferApi__pb2.FetchResourceMetadataRequest.SerializeToString,
-
response_deserializer=MFTTransferApi__pb2.FileMetadataResponse.FromString,
+
response_deserializer=MFTTransferApi__pb2.ResourceAvailabilityResponse.FromString,
)
- self.getDirectoryResourceMetadata = channel.unary_unary(
-
'/org.apache.airavata.mft.api.service.MFTTransferService/getDirectoryResourceMetadata',
+ self.resourceMetadata = channel.unary_unary(
+
'/org.apache.airavata.mft.api.service.MFTTransferService/resourceMetadata',
request_serializer=MFTTransferApi__pb2.FetchResourceMetadataRequest.SerializeToString,
-
response_deserializer=MFTTransferApi__pb2.DirectoryMetadataResponse.FromString,
+
response_deserializer=MFTAgentStubs__pb2.ResourceMetadata.FromString,
)
@@ -106,13 +102,7 @@ class MFTTransferServiceServicer(object):
context.set_details('Method not implemented!')
raise NotImplementedError('Method not implemented!')
- def getFileResourceMetadata(self, request, context):
- """Missing associated documentation comment in .proto file."""
- context.set_code(grpc.StatusCode.UNIMPLEMENTED)
- context.set_details('Method not implemented!')
- raise NotImplementedError('Method not implemented!')
-
- def getDirectoryResourceMetadata(self, request, context):
+ def resourceMetadata(self, request, context):
"""Missing associated documentation comment in .proto file."""
context.set_code(grpc.StatusCode.UNIMPLEMENTED)
context.set_details('Method not implemented!')
@@ -153,18 +143,13 @@ def add_MFTTransferServiceServicer_to_server(servicer,
server):
),
'getResourceAvailability': grpc.unary_unary_rpc_method_handler(
servicer.getResourceAvailability,
-
request_deserializer=MFTTransferApi__pb2.ResourceAvailabilityRequest.FromString,
-
response_serializer=MFTTransferApi__pb2.ResourceAvailabilityResponse.SerializeToString,
- ),
- 'getFileResourceMetadata': grpc.unary_unary_rpc_method_handler(
- servicer.getFileResourceMetadata,
request_deserializer=MFTTransferApi__pb2.FetchResourceMetadataRequest.FromString,
-
response_serializer=MFTTransferApi__pb2.FileMetadataResponse.SerializeToString,
+
response_serializer=MFTTransferApi__pb2.ResourceAvailabilityResponse.SerializeToString,
),
- 'getDirectoryResourceMetadata':
grpc.unary_unary_rpc_method_handler(
- servicer.getDirectoryResourceMetadata,
+ 'resourceMetadata': grpc.unary_unary_rpc_method_handler(
+ servicer.resourceMetadata,
request_deserializer=MFTTransferApi__pb2.FetchResourceMetadataRequest.FromString,
-
response_serializer=MFTTransferApi__pb2.DirectoryMetadataResponse.SerializeToString,
+
response_serializer=MFTAgentStubs__pb2.ResourceMetadata.SerializeToString,
),
}
generic_handler = grpc.method_handlers_generic_handler(
@@ -290,30 +275,13 @@ class MFTTransferService(object):
timeout=None,
metadata=None):
return grpc.experimental.unary_unary(request, target,
'/org.apache.airavata.mft.api.service.MFTTransferService/getResourceAvailability',
- MFTTransferApi__pb2.ResourceAvailabilityRequest.SerializeToString,
- MFTTransferApi__pb2.ResourceAvailabilityResponse.FromString,
- options, channel_credentials,
- insecure, call_credentials, compression, wait_for_ready, timeout,
metadata)
-
- @staticmethod
- def getFileResourceMetadata(request,
- target,
- options=(),
- channel_credentials=None,
- call_credentials=None,
- insecure=False,
- compression=None,
- wait_for_ready=None,
- timeout=None,
- metadata=None):
- return grpc.experimental.unary_unary(request, target,
'/org.apache.airavata.mft.api.service.MFTTransferService/getFileResourceMetadata',
MFTTransferApi__pb2.FetchResourceMetadataRequest.SerializeToString,
- MFTTransferApi__pb2.FileMetadataResponse.FromString,
+ MFTTransferApi__pb2.ResourceAvailabilityResponse.FromString,
options, channel_credentials,
insecure, call_credentials, compression, wait_for_ready, timeout,
metadata)
@staticmethod
- def getDirectoryResourceMetadata(request,
+ def resourceMetadata(request,
target,
options=(),
channel_credentials=None,
@@ -323,8 +291,8 @@ class MFTTransferService(object):
wait_for_ready=None,
timeout=None,
metadata=None):
- return grpc.experimental.unary_unary(request, target,
'/org.apache.airavata.mft.api.service.MFTTransferService/getDirectoryResourceMetadata',
+ return grpc.experimental.unary_unary(request, target,
'/org.apache.airavata.mft.api.service.MFTTransferService/resourceMetadata',
MFTTransferApi__pb2.FetchResourceMetadataRequest.SerializeToString,
- MFTTransferApi__pb2.DirectoryMetadataResponse.FromString,
+ MFTAgentStubs__pb2.ResourceMetadata.FromString,
options, channel_credentials,
insecure, call_credentials, compression, wait_for_ready, timeout,
metadata)
diff --git a/python-sdk/src/airavata_mft_sdk/gcs/GCSCredential_pb2.py
b/python-sdk/src/airavata_mft_sdk/gcs/GCSCredential_pb2.py
index 2dff5da..fe3c2f0 100644
--- a/python-sdk/src/airavata_mft_sdk/gcs/GCSCredential_pb2.py
+++ b/python-sdk/src/airavata_mft_sdk/gcs/GCSCredential_pb2.py
@@ -15,7 +15,7 @@ _sym_db = _symbol_database.Default()
import airavata_mft_sdk.CredCommon_pb2 as CredCommon__pb2
-DESCRIPTOR =
_descriptor_pool.Default().AddSerializedFile(b'\n\x17gcs/GCSCredential.proto\x12,org.apache.airavata.mft.credential.stubs.gcs\x1a\x10\x43redCommon.proto\"6\n\tGCSSecret\x12\x10\n\x08secretId\x18\x01
\x01(\t\x12\x17\n\x0f\x63redentialsJson\x18\x02
\x01(\t\"f\n\x13GCSSecretGetRequest\x12\x10\n\x08secretId\x18\x01
\x01(\t\x12=\n\nauthzToken\x18\x02
\x01(\x0b\x32).org.apache.airavata.mft.common.AuthToken\"p\n\x16GCSSecretCreateRequest\x12\x17\n\x0f\x63redentialsJson\x18\x01
\x01 [...]
+DESCRIPTOR =
_descriptor_pool.Default().AddSerializedFile(b'\n\x17gcs/GCSCredential.proto\x12,org.apache.airavata.mft.credential.stubs.gcs\x1a\x10\x43redCommon.proto\"Y\n\tGCSSecret\x12\x10\n\x08secretId\x18\x01
\x01(\t\x12\x11\n\tprojectId\x18\x02 \x01(\t\x12\x12\n\nprivateKey\x18\x03
\x01(\t\x12\x13\n\x0b\x63lientEmail\x18\x04
\x01(\t\"f\n\x13GCSSecretGetRequest\x12\x10\n\x08secretId\x18\x01
\x01(\t\x12=\n\nauthzToken\x18\x02
\x01(\x0b\x32).org.apache.airavata.mft.common.AuthToken\"\x9 [...]
@@ -80,17 +80,17 @@ if _descriptor._USE_C_DESCRIPTORS == False:
DESCRIPTOR._options = None
DESCRIPTOR._serialized_options = b'P\001'
_GCSSECRET._serialized_start=91
- _GCSSECRET._serialized_end=145
- _GCSSECRETGETREQUEST._serialized_start=147
- _GCSSECRETGETREQUEST._serialized_end=249
- _GCSSECRETCREATEREQUEST._serialized_start=251
- _GCSSECRETCREATEREQUEST._serialized_end=363
- _GCSSECRETUPDATEREQUEST._serialized_start=366
- _GCSSECRETUPDATEREQUEST._serialized_end=496
- _GCSSECRETUPDATERESPONSE._serialized_start=498
- _GCSSECRETUPDATERESPONSE._serialized_end=541
- _GCSSECRETDELETEREQUEST._serialized_start=543
- _GCSSECRETDELETEREQUEST._serialized_end=648
- _GCSSECRETDELETERESPONSE._serialized_start=650
- _GCSSECRETDELETERESPONSE._serialized_end=691
+ _GCSSECRET._serialized_end=180
+ _GCSSECRETGETREQUEST._serialized_start=182
+ _GCSSECRETGETREQUEST._serialized_end=284
+ _GCSSECRETCREATEREQUEST._serialized_start=287
+ _GCSSECRETCREATEREQUEST._serialized_end=434
+ _GCSSECRETUPDATEREQUEST._serialized_start=437
+ _GCSSECRETUPDATEREQUEST._serialized_end=602
+ _GCSSECRETUPDATERESPONSE._serialized_start=604
+ _GCSSECRETUPDATERESPONSE._serialized_end=647
+ _GCSSECRETDELETEREQUEST._serialized_start=649
+ _GCSSECRETDELETEREQUEST._serialized_end=754
+ _GCSSECRETDELETERESPONSE._serialized_start=756
+ _GCSSECRETDELETERESPONSE._serialized_end=797
# @@protoc_insertion_point(module_scope)
diff --git a/python-sdk/src/airavata_mft_sdk/generate-stubs.sh
b/python-sdk/src/airavata_mft_sdk/generate-stubs.sh
index 7ad1f0e..3240c3a 100755
--- a/python-sdk/src/airavata_mft_sdk/generate-stubs.sh
+++ b/python-sdk/src/airavata_mft_sdk/generate-stubs.sh
@@ -13,9 +13,11 @@ touch $SECRET_DIR/__init__.py
touch $COMMON_DIR/__init__.py
touch $COMMON_DIR/__init__.py
+echo "Building Common Stubs........."
python3 -m grpc_tools.protoc
--proto_path=../../../common/mft-common-proto/src/main/proto/ \
../../../common/mft-common-proto/src/main/proto/CredCommon.proto
--python_out=$COMMON_DIR --grpc_python_out=$COMMON_DIR
+echo "Building Resource Stubs........."
python3 -m grpc_tools.protoc
--proto_path=../../../services/resource-service/stub/src/main/proto \
--proto_path=../../../common/mft-common-proto/src/main/proto/ \
--proto_path=. \
@@ -44,7 +46,7 @@ python3 -m grpc_tools.protoc
--proto_path=../../../services/resource-service/stu
../../../services/resource-service/stub/src/main/proto/common/StorageCommon.proto
\
--python_out=$RESOURCE_DIR --grpc_python_out=$RESOURCE_DIR
-
+echo "Building Secret Stubs........."
python3 -m grpc_tools.protoc
--proto_path=../../../services/secret-service/stub/src/main/proto \
--proto_path=../../../common/mft-common-proto/src/main/proto/ \
--proto_path=. \
@@ -68,8 +70,21 @@ python3 -m grpc_tools.protoc
--proto_path=../../../services/secret-service/stub/
../../../services/secret-service/stub/src/main/proto/odata/ODataSecretService.proto
\
--python_out=$SECRET_DIR --grpc_python_out=$SECRET_DIR
+echo "Building Agent Stubs........."
+python3 -m grpc_tools.protoc --proto_path=../../../agent/stub/src/main/proto/ \
+ --proto_path=../../../common/mft-common-proto/src/main/proto/ \
+ --proto_path=../../../services/resource-service/stub/src/main/proto \
+ --proto_path=../../../services/secret-service/stub/src/main/proto \
+ --proto_path=. \
+ ../../../agent/stub/src/main/proto/MFTAgentStubs.proto
--python_out=. --grpc_python_out=.
+
+echo "Building API Stubs........."
+
python3 -m grpc_tools.protoc --proto_path=../../../api/stub/src/main/proto \
--proto_path=../../../common/mft-common-proto/src/main/proto/ \
+ --proto_path=../../../services/resource-service/stub/src/main/proto \
+ --proto_path=../../../services/secret-service/stub/src/main/proto \
+ --proto_path=../../../agent/stub/src/main/proto/ \
--proto_path=. \
../../../api/stub/src/main/proto/MFTTransferApi.proto \
--python_out=$TRANSFER_DIR --grpc_python_out=$TRANSFER_DIR
