You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by di...@apache.org on 2022/04/10 18:34:00 UTC
[airavata-mft] 02/02: Fixing the issue of invalid library paths in generated python sdk stubs
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
commit ab540519125be867390adda4ddc4cdb89558cc82
Author: Dimuthu Wannipurage <di...@gmail.com>
AuthorDate: Sun Apr 10 14:32:58 2022 -0400
Fixing the issue of invalid library paths in generated python sdk stubs
---
python-sdk/README.md | 2 +-
python-sdk/generate-stubs.sh | 78 --------------------
python-sdk/setup.cfg | 5 +-
.../src/airavata_mft_sdk/MFTTransferApi_pb2.py | 6 +-
.../airavata_mft_sdk/MFTTransferApi_pb2_grpc.py | 2 +-
.../airavata_mft_sdk/azure/AzureCredential_pb2.py | 2 +-
.../azure/AzureSecretService_pb2.py | 6 +-
.../azure/AzureSecretService_pb2_grpc.py | 4 +-
.../azure/AzureStorageService_pb2.py | 6 +-
.../azure/AzureStorageService_pb2_grpc.py | 4 +-
.../src/airavata_mft_sdk/box/BoxCredential_pb2.py | 2 +-
.../airavata_mft_sdk/box/BoxSecretService_pb2.py | 6 +-
.../box/BoxSecretService_pb2_grpc.py | 4 +-
.../airavata_mft_sdk/box/BoxStorageService_pb2.py | 6 +-
.../box/BoxStorageService_pb2_grpc.py | 4 +-
.../dropbox/DropboxCredential_pb2.py | 2 +-
.../dropbox/DropboxSecretService_pb2.py | 6 +-
.../dropbox/DropboxSecretService_pb2_grpc.py | 4 +-
.../dropbox/DropboxStorageService_pb2.py | 6 +-
.../dropbox/DropboxStorageService_pb2_grpc.py | 4 +-
.../src/airavata_mft_sdk/ftp/FTPCredential_pb2.py | 2 +-
.../airavata_mft_sdk/ftp/FTPSecretService_pb2.py | 6 +-
.../ftp/FTPSecretService_pb2_grpc.py | 4 +-
.../airavata_mft_sdk/ftp/FTPStorageService_pb2.py | 6 +-
.../ftp/FTPStorageService_pb2_grpc.py | 4 +-
.../src/airavata_mft_sdk/gcs/GCSCredential_pb2.py | 2 +-
.../airavata_mft_sdk/gcs/GCSSecretService_pb2.py | 6 +-
.../gcs/GCSSecretService_pb2_grpc.py | 4 +-
.../airavata_mft_sdk/gcs/GCSStorageService_pb2.py | 6 +-
.../gcs/GCSStorageService_pb2_grpc.py | 4 +-
python-sdk/src/airavata_mft_sdk/generate-stubs.sh | 85 ++++++++++++++++++++++
.../airavata_mft_sdk/google/api/annotations_pb2.py | 6 +-
.../src/airavata_mft_sdk/google/api/http_pb2.py | 2 +-
.../local/LocalStorageService_pb2.py | 6 +-
.../local/LocalStorageService_pb2_grpc.py | 4 +-
python-sdk/src/airavata_mft_sdk/mft_client.py | 2 +-
.../resource/ResourceService_pb2.py | 22 +++---
.../resource/ResourceService_pb2_grpc.py | 4 +-
.../resourcesecretmap/StorageSecretMap_pb2.py | 6 +-
.../resourcesecretmap/StorageSecretMap_pb2_grpc.py | 4 +-
.../src/airavata_mft_sdk/s3/S3Credential_pb2.py | 2 +-
.../src/airavata_mft_sdk/s3/S3SecretService_pb2.py | 6 +-
.../s3/S3SecretService_pb2_grpc.py | 4 +-
.../airavata_mft_sdk/s3/S3StorageService_pb2.py | 6 +-
.../s3/S3StorageService_pb2_grpc.py | 4 +-
.../src/airavata_mft_sdk/scp/SCPCredential_pb2.py | 2 +-
.../airavata_mft_sdk/scp/SCPSecretService_pb2.py | 6 +-
.../scp/SCPSecretService_pb2_grpc.py | 4 +-
.../airavata_mft_sdk/scp/SCPStorageService_pb2.py | 6 +-
.../scp/SCPStorageService_pb2_grpc.py | 4 +-
50 files changed, 199 insertions(+), 189 deletions(-)
diff --git a/python-sdk/README.md b/python-sdk/README.md
index 29561e8..39b2357 100644
--- a/python-sdk/README.md
+++ b/python-sdk/README.md
@@ -4,7 +4,7 @@
virtualenv -p python3 env
source env/bin/activate
pip install grpcio grpcio-tools
-cd mft-sdk
+cd src/airavata_mft_sdk
./generate-stubs.sh
```
diff --git a/python-sdk/generate-stubs.sh b/python-sdk/generate-stubs.sh
deleted file mode 100755
index 1c4feb9..0000000
--- a/python-sdk/generate-stubs.sh
+++ /dev/null
@@ -1,78 +0,0 @@
-RESOURCE_DIR=.
-SECRET_DIR=.
-COMMON_DIR=.
-TRANSFER_DIR=.
-
-mkdir -p $RESOURCE_DIR
-mkdir -p $SECRET_DIR
-mkdir -p $COMMON_DIR
-mkdir -p $TRANSFER_DIR
-
-touch $RESOURCE_DIR/__init__.py
-touch $SECRET_DIR/__init__.py
-touch $COMMON_DIR/__init__.py
-touch $COMMON_DIR/__init__.py
-
-python -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
-
-python -m grpc_tools.protoc --proto_path=../services/resource-service/stub/src/main/proto \
- --proto_path=../common/mft-common-proto/src/main/proto/ \
- --proto_path=. \
- ../services/resource-service/stub/src/main/proto/resource/ResourceService.proto \
- ../services/resource-service/stub/src/main/proto/s3/S3StorageService.proto \
- ../services/resource-service/stub/src/main/proto/s3/S3Storage.proto \
- ../services/resource-service/stub/src/main/proto/scp/SCPStorage.proto \
- ../services/resource-service/stub/src/main/proto/scp/SCPStorageService.proto \
- ../services/resource-service/stub/src/main/proto/resourcesecretmap/StorageSecretMap.proto \
- ../services/resource-service/stub/src/main/proto/local/LocalStorageService.proto \
- ../services/resource-service/stub/src/main/proto/local/LocalStorage.proto \
- ../services/resource-service/stub/src/main/proto/gcs/GCSStorageService.proto \
- ../services/resource-service/stub/src/main/proto/gcs/GCSStorage.proto \
- ../services/resource-service/stub/src/main/proto/ftp/FTPStorageService.proto \
- ../services/resource-service/stub/src/main/proto/ftp/FTPStorage.proto \
- ../services/resource-service/stub/src/main/proto/dropbox/DropboxStorageService.proto \
- ../services/resource-service/stub/src/main/proto/dropbox/DropboxStorage.proto \
- ../services/resource-service/stub/src/main/proto/box/BoxStorageService.proto \
- ../services/resource-service/stub/src/main/proto/box/BoxStorage.proto \
- ../services/resource-service/stub/src/main/proto/azure/AzureStorageService.proto \
- ../services/resource-service/stub/src/main/proto/azure/AzureStorage.proto \
- --python_out=$RESOURCE_DIR --grpc_python_out=$RESOURCE_DIR
-
-
-python -m grpc_tools.protoc --proto_path=../services/secret-service/stub/src/main/proto \
- --proto_path=../common/mft-common-proto/src/main/proto/ \
- --proto_path=. \
- ../services/secret-service/stub/src/main/proto/azure/AzureCredential.proto \
- ../services/secret-service/stub/src/main/proto/azure/AzureSecretService.proto \
- ../services/secret-service/stub/src/main/proto/box/BoxCredential.proto \
- ../services/secret-service/stub/src/main/proto/box/BoxSecretService.proto \
- ../services/secret-service/stub/src/main/proto/dropbox/DropboxCredential.proto \
- ../services/secret-service/stub/src/main/proto/dropbox/DropboxSecretService.proto \
- ../services/secret-service/stub/src/main/proto/ftp/FTPCredential.proto \
- ../services/secret-service/stub/src/main/proto/ftp/FTPSecretService.proto \
- ../services/secret-service/stub/src/main/proto/gcs/GCSCredential.proto \
- ../services/secret-service/stub/src/main/proto/gcs/GCSSecretService.proto \
- ../services/secret-service/stub/src/main/proto/s3/S3Credential.proto \
- ../services/secret-service/stub/src/main/proto/s3/S3SecretService.proto \
- ../services/secret-service/stub/src/main/proto/scp/SCPCredential.proto \
- ../services/secret-service/stub/src/main/proto/scp/SCPSecretService.proto \
- --python_out=$SECRET_DIR --grpc_python_out=$SECRET_DIR
-
-python -m grpc_tools.protoc --proto_path=../api/stub/src/main/proto \
- --proto_path=../common/mft-common-proto/src/main/proto/ \
- --proto_path=. \
- ../api/stub/src/main/proto/MFTTransferApi.proto \
- --python_out=$TRANSFER_DIR --grpc_python_out=$TRANSFER_DIR
-
-
-touch azure/__init__.py
-touch box/__init__.py
-touch dropbox/__init__.py
-touch ftp/__init__.py
-touch gcs/__init__.py
-touch local/__init__.py
-touch resource/__init__.py
-touch resourcesecretmap/__init__.py
-touch s3/__init__.py
-touch scp/__init__.py
diff --git a/python-sdk/setup.cfg b/python-sdk/setup.cfg
index fa49687..fa00a42 100644
--- a/python-sdk/setup.cfg
+++ b/python-sdk/setup.cfg
@@ -1,6 +1,6 @@
[metadata]
name = airavata_mft_sdk
-version = 0.0.1-alpha1
+version = 0.0.1-alpha2
author = Airavata MFT Developers
author_email = dev@airavata.apache.org
description = Python SDK for Apache Airavata Managed File Transfers (MFT)
@@ -18,6 +18,9 @@ package_dir =
= src
packages = find:
python_requires = >=3.6
+install_requires=
+ grpcio>='1.44.0'
+ grpcio-tools>='1.44.0'
[options.packages.find]
where = src
\ No newline at end of file
diff --git a/python-sdk/src/airavata_mft_sdk/MFTTransferApi_pb2.py b/python-sdk/src/airavata_mft_sdk/MFTTransferApi_pb2.py
index 4324474..b0c4182 100644
--- a/python-sdk/src/airavata_mft_sdk/MFTTransferApi_pb2.py
+++ b/python-sdk/src/airavata_mft_sdk/MFTTransferApi_pb2.py
@@ -12,9 +12,9 @@ from google.protobuf import symbol_database as _symbol_database
_sym_db = _symbol_database.Default()
-from google.api import annotations_pb2 as google_dot_api_dot_annotations__pb2
-from google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
-import CredCommon_pb2 as CredCommon__pb2
+from airavata_mft_sdk.google.api import annotations_pb2 as google_dot_api_dot_annotations__pb2
+from airavata_mft_sdk.google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
+import airavata_mft_sdk.CredCommon_pb2 as CredCommon__pb2
DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x14MFTTransferApi.proto\x12#org.apache.airavata.mft.api.service\x1a\x1cgoogle/api/annotations.proto\x1a\x1bgoogle/protobuf/empty.proto\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\"\x [...]
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 6842933..75e5f71 100644
--- a/python-sdk/src/airavata_mft_sdk/MFTTransferApi_pb2_grpc.py
+++ b/python-sdk/src/airavata_mft_sdk/MFTTransferApi_pb2_grpc.py
@@ -2,7 +2,7 @@
"""Client and server classes corresponding to protobuf-defined services."""
import grpc
-import MFTTransferApi_pb2 as MFTTransferApi__pb2
+import airavata_mft_sdk.MFTTransferApi_pb2 as MFTTransferApi__pb2
class MFTTransferServiceStub(object):
diff --git a/python-sdk/src/airavata_mft_sdk/azure/AzureCredential_pb2.py b/python-sdk/src/airavata_mft_sdk/azure/AzureCredential_pb2.py
index 9f09a4d..a2ec3c4 100644
--- a/python-sdk/src/airavata_mft_sdk/azure/AzureCredential_pb2.py
+++ b/python-sdk/src/airavata_mft_sdk/azure/AzureCredential_pb2.py
@@ -12,7 +12,7 @@ from google.protobuf import symbol_database as _symbol_database
_sym_db = _symbol_database.Default()
-import CredCommon_pb2 as CredCommon__pb2
+import airavata_mft_sdk.CredCommon_pb2 as CredCommon__pb2
DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1b\x61zure/AzureCredential.proto\x12.org.apache.airavata.mft.credential.stubs.azure\x1a\x10\x43redCommon.proto\"9\n\x0b\x41zureSecret\x12\x10\n\x08secretId\x18\x01 \x01(\t\x12\x18\n\x10\x63onnectionString\x18\x02 \x01(\t\"h\n\x15\x41zureSecretGetRequest\x12\x10\n\x08secretId\x18\x01 \x01(\t\x12=\n\nauthzToken\x18\x02 \x01(\x0b\x32).org.apache.airavata.mft.common.AuthToken\"s\n\x18\x41zureSecretCreateRequest\x12\x18\n\x10\x63 [...]
diff --git a/python-sdk/src/airavata_mft_sdk/azure/AzureSecretService_pb2.py b/python-sdk/src/airavata_mft_sdk/azure/AzureSecretService_pb2.py
index d105319..26d32e3 100644
--- a/python-sdk/src/airavata_mft_sdk/azure/AzureSecretService_pb2.py
+++ b/python-sdk/src/airavata_mft_sdk/azure/AzureSecretService_pb2.py
@@ -12,9 +12,9 @@ from google.protobuf import symbol_database as _symbol_database
_sym_db = _symbol_database.Default()
-from google.api import annotations_pb2 as google_dot_api_dot_annotations__pb2
-from google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
-from azure import AzureCredential_pb2 as azure_dot_AzureCredential__pb2
+from airavata_mft_sdk.google.api import annotations_pb2 as google_dot_api_dot_annotations__pb2
+from airavata_mft_sdk.google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
+from airavata_mft_sdk.azure import AzureCredential_pb2 as azure_dot_AzureCredential__pb2
DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1e\x61zure/AzureSecretService.proto\x12\x30org.apache.airavata.mft.credential.service.azure\x1a\x1cgoogle/api/annotations.proto\x1a\x1bgoogle/protobuf/empty.proto\x1a\x1b\x61zure/AzureCredential.proto2\xa8\x05\n\x12\x41zureSecretService\x12\xb0\x01\n\x0egetAzureSecret\x12\x45.org.apache.airavata.mft.credential.stubs.azure.AzureSecretGetRequest\x1a;.org.apache.airavata.mft.credential.stubs.azure.AzureSecret\"\x1a\x82\xd3\xe4\ [...]
diff --git a/python-sdk/src/airavata_mft_sdk/azure/AzureSecretService_pb2_grpc.py b/python-sdk/src/airavata_mft_sdk/azure/AzureSecretService_pb2_grpc.py
index 9f65c32..3617580 100644
--- a/python-sdk/src/airavata_mft_sdk/azure/AzureSecretService_pb2_grpc.py
+++ b/python-sdk/src/airavata_mft_sdk/azure/AzureSecretService_pb2_grpc.py
@@ -2,8 +2,8 @@
"""Client and server classes corresponding to protobuf-defined services."""
import grpc
-from azure import AzureCredential_pb2 as azure_dot_AzureCredential__pb2
-from google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
+from airavata_mft_sdk.azure import AzureCredential_pb2 as azure_dot_AzureCredential__pb2
+from airavata_mft_sdk.google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
class AzureSecretServiceStub(object):
diff --git a/python-sdk/src/airavata_mft_sdk/azure/AzureStorageService_pb2.py b/python-sdk/src/airavata_mft_sdk/azure/AzureStorageService_pb2.py
index 6bc9ed3..1982b34 100644
--- a/python-sdk/src/airavata_mft_sdk/azure/AzureStorageService_pb2.py
+++ b/python-sdk/src/airavata_mft_sdk/azure/AzureStorageService_pb2.py
@@ -12,9 +12,9 @@ from google.protobuf import symbol_database as _symbol_database
_sym_db = _symbol_database.Default()
-from google.api import annotations_pb2 as google_dot_api_dot_annotations__pb2
-from google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
-from azure import AzureStorage_pb2 as azure_dot_AzureStorage__pb2
+from airavata_mft_sdk.google.api import annotations_pb2 as google_dot_api_dot_annotations__pb2
+from airavata_mft_sdk.google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
+from airavata_mft_sdk.azure import AzureStorage_pb2 as azure_dot_AzureStorage__pb2
DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1f\x61zure/AzureStorageService.proto\x12.org.apache.airavata.mft.resource.service.azure\x1a\x1cgoogle/api/annotations.proto\x1a\x1bgoogle/protobuf/empty.proto\x1a\x18\x61zure/AzureStorage.proto2\xd9\x07\n\x13\x41zureStorageService\x12\xd7\x01\n\x10listAzureStorage\x12M.org.apache.airavata.mft.resource.stubs.azure.storage.AzureStorageListRequest\x1aN.org.apache.airavata.mft.resource.stubs.azure.storage.AzureStorageListRespons [...]
diff --git a/python-sdk/src/airavata_mft_sdk/azure/AzureStorageService_pb2_grpc.py b/python-sdk/src/airavata_mft_sdk/azure/AzureStorageService_pb2_grpc.py
index f4eb119..6cd6c51 100644
--- a/python-sdk/src/airavata_mft_sdk/azure/AzureStorageService_pb2_grpc.py
+++ b/python-sdk/src/airavata_mft_sdk/azure/AzureStorageService_pb2_grpc.py
@@ -2,8 +2,8 @@
"""Client and server classes corresponding to protobuf-defined services."""
import grpc
-from azure import AzureStorage_pb2 as azure_dot_AzureStorage__pb2
-from google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
+from airavata_mft_sdk.azure import AzureStorage_pb2 as azure_dot_AzureStorage__pb2
+from airavata_mft_sdk.google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
class AzureStorageServiceStub(object):
diff --git a/python-sdk/src/airavata_mft_sdk/box/BoxCredential_pb2.py b/python-sdk/src/airavata_mft_sdk/box/BoxCredential_pb2.py
index 8361713..132628e 100644
--- a/python-sdk/src/airavata_mft_sdk/box/BoxCredential_pb2.py
+++ b/python-sdk/src/airavata_mft_sdk/box/BoxCredential_pb2.py
@@ -12,7 +12,7 @@ from google.protobuf import symbol_database as _symbol_database
_sym_db = _symbol_database.Default()
-import CredCommon_pb2 as CredCommon__pb2
+import airavata_mft_sdk.CredCommon_pb2 as CredCommon__pb2
DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x17\x62ox/BoxCredential.proto\x12,org.apache.airavata.mft.credential.stubs.box\x1a\x10\x43redCommon.proto\"2\n\tBoxSecret\x12\x10\n\x08secretId\x18\x01 \x01(\t\x12\x13\n\x0b\x61\x63\x63\x65ssToken\x18\x02 \x01(\t\"f\n\x13\x42oxSecretGetRequest\x12\x10\n\x08secretId\x18\x01 \x01(\t\x12=\n\nauthzToken\x18\x02 \x01(\x0b\x32).org.apache.airavata.mft.common.AuthToken\"l\n\x16\x42oxSecretCreateRequest\x12\x13\n\x0b\x61\x63\x63\x65s [...]
diff --git a/python-sdk/src/airavata_mft_sdk/box/BoxSecretService_pb2.py b/python-sdk/src/airavata_mft_sdk/box/BoxSecretService_pb2.py
index 0b0f553..8209788 100644
--- a/python-sdk/src/airavata_mft_sdk/box/BoxSecretService_pb2.py
+++ b/python-sdk/src/airavata_mft_sdk/box/BoxSecretService_pb2.py
@@ -12,9 +12,9 @@ from google.protobuf import symbol_database as _symbol_database
_sym_db = _symbol_database.Default()
-from google.api import annotations_pb2 as google_dot_api_dot_annotations__pb2
-from google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
-from box import BoxCredential_pb2 as box_dot_BoxCredential__pb2
+from airavata_mft_sdk.google.api import annotations_pb2 as google_dot_api_dot_annotations__pb2
+from airavata_mft_sdk.google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
+from airavata_mft_sdk.box import BoxCredential_pb2 as box_dot_BoxCredential__pb2
DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1a\x62ox/BoxSecretService.proto\x12.org.apache.airavata.mft.credential.service.box\x1a\x1cgoogle/api/annotations.proto\x1a\x1bgoogle/protobuf/empty.proto\x1a\x17\x62ox/BoxCredential.proto2\xfe\x04\n\x10\x42oxSecretService\x12\xa4\x01\n\x0cgetBoxSecret\x12\x41.org.apache.airavata.mft.credential.stubs.box.BoxSecretGetRequest\x1a\x37.org.apache.airavata.mft.credential.stubs.box.BoxSecret\"\x18\x82\xd3\xe4\x93\x02\x12\x12\x10/v1 [...]
diff --git a/python-sdk/src/airavata_mft_sdk/box/BoxSecretService_pb2_grpc.py b/python-sdk/src/airavata_mft_sdk/box/BoxSecretService_pb2_grpc.py
index 1d09c22..cd6b2b8 100644
--- a/python-sdk/src/airavata_mft_sdk/box/BoxSecretService_pb2_grpc.py
+++ b/python-sdk/src/airavata_mft_sdk/box/BoxSecretService_pb2_grpc.py
@@ -2,8 +2,8 @@
"""Client and server classes corresponding to protobuf-defined services."""
import grpc
-from box import BoxCredential_pb2 as box_dot_BoxCredential__pb2
-from google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
+from airavata_mft_sdk.box import BoxCredential_pb2 as box_dot_BoxCredential__pb2
+from airavata_mft_sdk.google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
class BoxSecretServiceStub(object):
diff --git a/python-sdk/src/airavata_mft_sdk/box/BoxStorageService_pb2.py b/python-sdk/src/airavata_mft_sdk/box/BoxStorageService_pb2.py
index d640edc..91d490c 100644
--- a/python-sdk/src/airavata_mft_sdk/box/BoxStorageService_pb2.py
+++ b/python-sdk/src/airavata_mft_sdk/box/BoxStorageService_pb2.py
@@ -12,9 +12,9 @@ from google.protobuf import symbol_database as _symbol_database
_sym_db = _symbol_database.Default()
-from google.api import annotations_pb2 as google_dot_api_dot_annotations__pb2
-from google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
-from box import BoxStorage_pb2 as box_dot_BoxStorage__pb2
+from airavata_mft_sdk.google.api import annotations_pb2 as google_dot_api_dot_annotations__pb2
+from airavata_mft_sdk.google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
+from airavata_mft_sdk.box import BoxStorage_pb2 as box_dot_BoxStorage__pb2
DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1b\x62ox/BoxStorageService.proto\x12,org.apache.airavata.mft.resource.service.box\x1a\x1cgoogle/api/annotations.proto\x1a\x1bgoogle/protobuf/empty.proto\x1a\x14\x62ox/BoxStorage.proto2\xa3\x07\n\x11\x42oxStorageService\x12\xcb\x01\n\x0elistBoxStorage\x12I.org.apache.airavata.mft.resource.stubs.box.storage.BoxStorageListRequest\x1aJ.org.apache.airavata.mft.resource.stubs.box.storage.BoxStorageListResponse\"\"\x82\xd3\xe4\x93\ [...]
diff --git a/python-sdk/src/airavata_mft_sdk/box/BoxStorageService_pb2_grpc.py b/python-sdk/src/airavata_mft_sdk/box/BoxStorageService_pb2_grpc.py
index bc96941..68589aa 100644
--- a/python-sdk/src/airavata_mft_sdk/box/BoxStorageService_pb2_grpc.py
+++ b/python-sdk/src/airavata_mft_sdk/box/BoxStorageService_pb2_grpc.py
@@ -2,8 +2,8 @@
"""Client and server classes corresponding to protobuf-defined services."""
import grpc
-from box import BoxStorage_pb2 as box_dot_BoxStorage__pb2
-from google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
+from airavata_mft_sdk.box import BoxStorage_pb2 as box_dot_BoxStorage__pb2
+from airavata_mft_sdk.google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
class BoxStorageServiceStub(object):
diff --git a/python-sdk/src/airavata_mft_sdk/dropbox/DropboxCredential_pb2.py b/python-sdk/src/airavata_mft_sdk/dropbox/DropboxCredential_pb2.py
index aa3d4ad..833773a 100644
--- a/python-sdk/src/airavata_mft_sdk/dropbox/DropboxCredential_pb2.py
+++ b/python-sdk/src/airavata_mft_sdk/dropbox/DropboxCredential_pb2.py
@@ -12,7 +12,7 @@ from google.protobuf import symbol_database as _symbol_database
_sym_db = _symbol_database.Default()
-import CredCommon_pb2 as CredCommon__pb2
+import airavata_mft_sdk.CredCommon_pb2 as CredCommon__pb2
DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1f\x64ropbox/DropboxCredential.proto\x12\x30org.apache.airavata.mft.credential.stubs.dropbox\x1a\x10\x43redCommon.proto\"6\n\rDropboxSecret\x12\x10\n\x08secretId\x18\x01 \x01(\t\x12\x13\n\x0b\x61\x63\x63\x65ssToken\x18\x02 \x01(\t\"j\n\x17\x44ropboxSecretGetRequest\x12\x10\n\x08secretId\x18\x01 \x01(\t\x12=\n\nauthzToken\x18\x02 \x01(\x0b\x32).org.apache.airavata.mft.common.AuthToken\"p\n\x1a\x44ropboxSecretCreateRequest\x12 [...]
diff --git a/python-sdk/src/airavata_mft_sdk/dropbox/DropboxSecretService_pb2.py b/python-sdk/src/airavata_mft_sdk/dropbox/DropboxSecretService_pb2.py
index 7c5382c..c9382a6 100644
--- a/python-sdk/src/airavata_mft_sdk/dropbox/DropboxSecretService_pb2.py
+++ b/python-sdk/src/airavata_mft_sdk/dropbox/DropboxSecretService_pb2.py
@@ -12,9 +12,9 @@ from google.protobuf import symbol_database as _symbol_database
_sym_db = _symbol_database.Default()
-from google.api import annotations_pb2 as google_dot_api_dot_annotations__pb2
-from google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
-from dropbox import DropboxCredential_pb2 as dropbox_dot_DropboxCredential__pb2
+from airavata_mft_sdk.google.api import annotations_pb2 as google_dot_api_dot_annotations__pb2
+from airavata_mft_sdk.google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
+from airavata_mft_sdk.dropbox import DropboxCredential_pb2 as dropbox_dot_DropboxCredential__pb2
DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\"dropbox/DropboxSecretService.proto\x12\x32org.apache.airavata.mft.credential.service.dropbox\x1a\x1cgoogle/api/annotations.proto\x1a\x1bgoogle/protobuf/empty.proto\x1a\x1f\x64ropbox/DropboxCredential.proto2\xd2\x05\n\x14\x44ropboxSecretService\x12\xbc\x01\n\x10getDropboxSecret\x12I.org.apache.airavata.mft.credential.stubs.dropbox.DropboxSecretGetRequest\x1a?.org.apache.airavata.mft.credential.stubs.dropbox.DropboxSecret\"\x1 [...]
diff --git a/python-sdk/src/airavata_mft_sdk/dropbox/DropboxSecretService_pb2_grpc.py b/python-sdk/src/airavata_mft_sdk/dropbox/DropboxSecretService_pb2_grpc.py
index 70383b5..78ea5c5 100644
--- a/python-sdk/src/airavata_mft_sdk/dropbox/DropboxSecretService_pb2_grpc.py
+++ b/python-sdk/src/airavata_mft_sdk/dropbox/DropboxSecretService_pb2_grpc.py
@@ -2,8 +2,8 @@
"""Client and server classes corresponding to protobuf-defined services."""
import grpc
-from dropbox import DropboxCredential_pb2 as dropbox_dot_DropboxCredential__pb2
-from google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
+from airavata_mft_sdk.dropbox import DropboxCredential_pb2 as dropbox_dot_DropboxCredential__pb2
+from airavata_mft_sdk.google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
class DropboxSecretServiceStub(object):
diff --git a/python-sdk/src/airavata_mft_sdk/dropbox/DropboxStorageService_pb2.py b/python-sdk/src/airavata_mft_sdk/dropbox/DropboxStorageService_pb2.py
index 56ca0cf..56b8cab 100644
--- a/python-sdk/src/airavata_mft_sdk/dropbox/DropboxStorageService_pb2.py
+++ b/python-sdk/src/airavata_mft_sdk/dropbox/DropboxStorageService_pb2.py
@@ -12,9 +12,9 @@ from google.protobuf import symbol_database as _symbol_database
_sym_db = _symbol_database.Default()
-from google.api import annotations_pb2 as google_dot_api_dot_annotations__pb2
-from google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
-from dropbox import DropboxStorage_pb2 as dropbox_dot_DropboxStorage__pb2
+from airavata_mft_sdk.google.api import annotations_pb2 as google_dot_api_dot_annotations__pb2
+from airavata_mft_sdk.google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
+from airavata_mft_sdk.dropbox import DropboxStorage_pb2 as dropbox_dot_DropboxStorage__pb2
DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n#dropbox/DropboxStorageService.proto\x12\x30org.apache.airavata.mft.resource.service.dropbox\x1a\x1cgoogle/api/annotations.proto\x1a\x1bgoogle/protobuf/empty.proto\x1a\x1c\x64ropbox/DropboxStorage.proto2\x8f\x08\n\x15\x44ropboxStorageService\x12\xe3\x01\n\x12listDropboxStorage\x12Q.org.apache.airavata.mft.resource.stubs.dropbox.storage.DropboxStorageListRequest\x1aR.org.apache.airavata.mft.resource.stubs.dropbox.storage.Dropbo [...]
diff --git a/python-sdk/src/airavata_mft_sdk/dropbox/DropboxStorageService_pb2_grpc.py b/python-sdk/src/airavata_mft_sdk/dropbox/DropboxStorageService_pb2_grpc.py
index 6539064..a66c092 100644
--- a/python-sdk/src/airavata_mft_sdk/dropbox/DropboxStorageService_pb2_grpc.py
+++ b/python-sdk/src/airavata_mft_sdk/dropbox/DropboxStorageService_pb2_grpc.py
@@ -2,8 +2,8 @@
"""Client and server classes corresponding to protobuf-defined services."""
import grpc
-from dropbox import DropboxStorage_pb2 as dropbox_dot_DropboxStorage__pb2
-from google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
+from airavata_mft_sdk.dropbox import DropboxStorage_pb2 as dropbox_dot_DropboxStorage__pb2
+from airavata_mft_sdk.google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
class DropboxStorageServiceStub(object):
diff --git a/python-sdk/src/airavata_mft_sdk/ftp/FTPCredential_pb2.py b/python-sdk/src/airavata_mft_sdk/ftp/FTPCredential_pb2.py
index 266de76..efd5ea5 100644
--- a/python-sdk/src/airavata_mft_sdk/ftp/FTPCredential_pb2.py
+++ b/python-sdk/src/airavata_mft_sdk/ftp/FTPCredential_pb2.py
@@ -12,7 +12,7 @@ from google.protobuf import symbol_database as _symbol_database
_sym_db = _symbol_database.Default()
-import CredCommon_pb2 as CredCommon__pb2
+import airavata_mft_sdk.CredCommon_pb2 as CredCommon__pb2
DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x17\x66tp/FTPCredential.proto\x12,org.apache.airavata.mft.credential.stubs.ftp\x1a\x10\x43redCommon.proto\"?\n\tFTPSecret\x12\x10\n\x08secretId\x18\x01 \x01(\t\x12\x0e\n\x06userId\x18\x02 \x01(\t\x12\x10\n\x08password\x18\x03 \x01(\t\"f\n\x13\x46TPSecretGetRequest\x12\x10\n\x08secretId\x18\x01 \x01(\t\x12=\n\nauthzToken\x18\x02 \x01(\x0b\x32).org.apache.airavata.mft.common.AuthToken\"y\n\x16\x46TPSecretCreateRequest\x12\x0e\n [...]
diff --git a/python-sdk/src/airavata_mft_sdk/ftp/FTPSecretService_pb2.py b/python-sdk/src/airavata_mft_sdk/ftp/FTPSecretService_pb2.py
index 015ee34..b547ba0 100644
--- a/python-sdk/src/airavata_mft_sdk/ftp/FTPSecretService_pb2.py
+++ b/python-sdk/src/airavata_mft_sdk/ftp/FTPSecretService_pb2.py
@@ -12,9 +12,9 @@ from google.protobuf import symbol_database as _symbol_database
_sym_db = _symbol_database.Default()
-from google.api import annotations_pb2 as google_dot_api_dot_annotations__pb2
-from google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
-from ftp import FTPCredential_pb2 as ftp_dot_FTPCredential__pb2
+from airavata_mft_sdk.google.api import annotations_pb2 as google_dot_api_dot_annotations__pb2
+from airavata_mft_sdk.google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
+from airavata_mft_sdk.ftp import FTPCredential_pb2 as ftp_dot_FTPCredential__pb2
DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1a\x66tp/FTPSecretService.proto\x12.org.apache.airavata.mft.credential.service.ftp\x1a\x1cgoogle/api/annotations.proto\x1a\x1bgoogle/protobuf/empty.proto\x1a\x17\x66tp/FTPCredential.proto2\xfe\x04\n\x10\x46TPSecretService\x12\xa4\x01\n\x0cgetFTPSecret\x12\x41.org.apache.airavata.mft.credential.stubs.ftp.FTPSecretGetRequest\x1a\x37.org.apache.airavata.mft.credential.stubs.ftp.FTPSecret\"\x18\x82\xd3\xe4\x93\x02\x12\x12\x10/v1 [...]
diff --git a/python-sdk/src/airavata_mft_sdk/ftp/FTPSecretService_pb2_grpc.py b/python-sdk/src/airavata_mft_sdk/ftp/FTPSecretService_pb2_grpc.py
index f844a25..36d39aa 100644
--- a/python-sdk/src/airavata_mft_sdk/ftp/FTPSecretService_pb2_grpc.py
+++ b/python-sdk/src/airavata_mft_sdk/ftp/FTPSecretService_pb2_grpc.py
@@ -2,8 +2,8 @@
"""Client and server classes corresponding to protobuf-defined services."""
import grpc
-from ftp import FTPCredential_pb2 as ftp_dot_FTPCredential__pb2
-from google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
+from airavata_mft_sdk.ftp import FTPCredential_pb2 as ftp_dot_FTPCredential__pb2
+from airavata_mft_sdk.google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
class FTPSecretServiceStub(object):
diff --git a/python-sdk/src/airavata_mft_sdk/ftp/FTPStorageService_pb2.py b/python-sdk/src/airavata_mft_sdk/ftp/FTPStorageService_pb2.py
index e219bd2..39ed558 100644
--- a/python-sdk/src/airavata_mft_sdk/ftp/FTPStorageService_pb2.py
+++ b/python-sdk/src/airavata_mft_sdk/ftp/FTPStorageService_pb2.py
@@ -12,9 +12,9 @@ from google.protobuf import symbol_database as _symbol_database
_sym_db = _symbol_database.Default()
-from google.api import annotations_pb2 as google_dot_api_dot_annotations__pb2
-from google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
-from ftp import FTPStorage_pb2 as ftp_dot_FTPStorage__pb2
+from airavata_mft_sdk.google.api import annotations_pb2 as google_dot_api_dot_annotations__pb2
+from airavata_mft_sdk.google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
+from airavata_mft_sdk.ftp import FTPStorage_pb2 as ftp_dot_FTPStorage__pb2
DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1b\x66tp/FTPStorageService.proto\x12,org.apache.airavata.mft.resource.service.ftp\x1a\x1cgoogle/api/annotations.proto\x1a\x1bgoogle/protobuf/empty.proto\x1a\x14\x66tp/FTPStorage.proto2\xa3\x07\n\x11\x46TPStorageService\x12\xcb\x01\n\x0elistFTPStorage\x12I.org.apache.airavata.mft.resource.stubs.ftp.storage.FTPStorageListRequest\x1aJ.org.apache.airavata.mft.resource.stubs.ftp.storage.FTPStorageListResponse\"\"\x82\xd3\xe4\x93\ [...]
diff --git a/python-sdk/src/airavata_mft_sdk/ftp/FTPStorageService_pb2_grpc.py b/python-sdk/src/airavata_mft_sdk/ftp/FTPStorageService_pb2_grpc.py
index da29dc8..4b188f0 100644
--- a/python-sdk/src/airavata_mft_sdk/ftp/FTPStorageService_pb2_grpc.py
+++ b/python-sdk/src/airavata_mft_sdk/ftp/FTPStorageService_pb2_grpc.py
@@ -2,8 +2,8 @@
"""Client and server classes corresponding to protobuf-defined services."""
import grpc
-from ftp import FTPStorage_pb2 as ftp_dot_FTPStorage__pb2
-from google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
+from airavata_mft_sdk.ftp import FTPStorage_pb2 as ftp_dot_FTPStorage__pb2
+from airavata_mft_sdk.google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
class FTPStorageServiceStub(object):
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 a3535f0..f9208dd 100644
--- a/python-sdk/src/airavata_mft_sdk/gcs/GCSCredential_pb2.py
+++ b/python-sdk/src/airavata_mft_sdk/gcs/GCSCredential_pb2.py
@@ -12,7 +12,7 @@ from google.protobuf import symbol_database as _symbol_database
_sym_db = _symbol_database.Default()
-import CredCommon_pb2 as CredCommon__pb2
+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 [...]
diff --git a/python-sdk/src/airavata_mft_sdk/gcs/GCSSecretService_pb2.py b/python-sdk/src/airavata_mft_sdk/gcs/GCSSecretService_pb2.py
index 6d3dbf5..c1df561 100644
--- a/python-sdk/src/airavata_mft_sdk/gcs/GCSSecretService_pb2.py
+++ b/python-sdk/src/airavata_mft_sdk/gcs/GCSSecretService_pb2.py
@@ -12,9 +12,9 @@ from google.protobuf import symbol_database as _symbol_database
_sym_db = _symbol_database.Default()
-from google.api import annotations_pb2 as google_dot_api_dot_annotations__pb2
-from google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
-from gcs import GCSCredential_pb2 as gcs_dot_GCSCredential__pb2
+from airavata_mft_sdk.google.api import annotations_pb2 as google_dot_api_dot_annotations__pb2
+from airavata_mft_sdk.google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
+from airavata_mft_sdk.gcs import GCSCredential_pb2 as gcs_dot_GCSCredential__pb2
DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1agcs/GCSSecretService.proto\x12.org.apache.airavata.mft.credential.service.gcs\x1a\x1cgoogle/api/annotations.proto\x1a\x1bgoogle/protobuf/empty.proto\x1a\x17gcs/GCSCredential.proto2\xfe\x04\n\x10GCSSecretService\x12\xa4\x01\n\x0cgetGCSSecret\x12\x41.org.apache.airavata.mft.credential.stubs.gcs.GCSSecretGetRequest\x1a\x37.org.apache.airavata.mft.credential.stubs.gcs.GCSSecret\"\x18\x82\xd3\xe4\x93\x02\x12\x12\x10/v1.0/secret [...]
diff --git a/python-sdk/src/airavata_mft_sdk/gcs/GCSSecretService_pb2_grpc.py b/python-sdk/src/airavata_mft_sdk/gcs/GCSSecretService_pb2_grpc.py
index 7df2ea5..9738484 100644
--- a/python-sdk/src/airavata_mft_sdk/gcs/GCSSecretService_pb2_grpc.py
+++ b/python-sdk/src/airavata_mft_sdk/gcs/GCSSecretService_pb2_grpc.py
@@ -2,8 +2,8 @@
"""Client and server classes corresponding to protobuf-defined services."""
import grpc
-from gcs import GCSCredential_pb2 as gcs_dot_GCSCredential__pb2
-from google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
+from airavata_mft_sdk.gcs import GCSCredential_pb2 as gcs_dot_GCSCredential__pb2
+from airavata_mft_sdk.google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
class GCSSecretServiceStub(object):
diff --git a/python-sdk/src/airavata_mft_sdk/gcs/GCSStorageService_pb2.py b/python-sdk/src/airavata_mft_sdk/gcs/GCSStorageService_pb2.py
index 207ddfb..e271158 100644
--- a/python-sdk/src/airavata_mft_sdk/gcs/GCSStorageService_pb2.py
+++ b/python-sdk/src/airavata_mft_sdk/gcs/GCSStorageService_pb2.py
@@ -12,9 +12,9 @@ from google.protobuf import symbol_database as _symbol_database
_sym_db = _symbol_database.Default()
-from google.api import annotations_pb2 as google_dot_api_dot_annotations__pb2
-from google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
-from gcs import GCSStorage_pb2 as gcs_dot_GCSStorage__pb2
+from airavata_mft_sdk.google.api import annotations_pb2 as google_dot_api_dot_annotations__pb2
+from airavata_mft_sdk.google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
+from airavata_mft_sdk.gcs import GCSStorage_pb2 as gcs_dot_GCSStorage__pb2
DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1bgcs/GCSStorageService.proto\x12,org.apache.airavata.mft.resource.service.gcs\x1a\x1cgoogle/api/annotations.proto\x1a\x1bgoogle/protobuf/empty.proto\x1a\x14gcs/GCSStorage.proto2\xa3\x07\n\x11GCSStorageService\x12\xcb\x01\n\x0elistGCSStorage\x12I.org.apache.airavata.mft.resource.stubs.gcs.storage.GCSStorageListRequest\x1aJ.org.apache.airavata.mft.resource.stubs.gcs.storage.GCSStorageListResponse\"\"\x82\xd3\xe4\x93\x02\x1c\x [...]
diff --git a/python-sdk/src/airavata_mft_sdk/gcs/GCSStorageService_pb2_grpc.py b/python-sdk/src/airavata_mft_sdk/gcs/GCSStorageService_pb2_grpc.py
index 64a315e..576825d 100644
--- a/python-sdk/src/airavata_mft_sdk/gcs/GCSStorageService_pb2_grpc.py
+++ b/python-sdk/src/airavata_mft_sdk/gcs/GCSStorageService_pb2_grpc.py
@@ -2,8 +2,8 @@
"""Client and server classes corresponding to protobuf-defined services."""
import grpc
-from gcs import GCSStorage_pb2 as gcs_dot_GCSStorage__pb2
-from google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
+from airavata_mft_sdk.gcs import GCSStorage_pb2 as gcs_dot_GCSStorage__pb2
+from airavata_mft_sdk.google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
class GCSStorageServiceStub(object):
diff --git a/python-sdk/src/airavata_mft_sdk/generate-stubs.sh b/python-sdk/src/airavata_mft_sdk/generate-stubs.sh
new file mode 100755
index 0000000..73d19f1
--- /dev/null
+++ b/python-sdk/src/airavata_mft_sdk/generate-stubs.sh
@@ -0,0 +1,85 @@
+RESOURCE_DIR=.
+SECRET_DIR=.
+COMMON_DIR=.
+TRANSFER_DIR=.
+
+mkdir -p $RESOURCE_DIR
+mkdir -p $SECRET_DIR
+mkdir -p $COMMON_DIR
+mkdir -p $TRANSFER_DIR
+
+touch $RESOURCE_DIR/__init__.py
+touch $SECRET_DIR/__init__.py
+touch $COMMON_DIR/__init__.py
+touch $COMMON_DIR/__init__.py
+
+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
+
+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=. \
+ ../../../services/resource-service/stub/src/main/proto/resource/ResourceService.proto \
+ ../../../services/resource-service/stub/src/main/proto/s3/S3StorageService.proto \
+ ../../../services/resource-service/stub/src/main/proto/s3/S3Storage.proto \
+ ../../../services/resource-service/stub/src/main/proto/scp/SCPStorage.proto \
+ ../../../services/resource-service/stub/src/main/proto/scp/SCPStorageService.proto \
+ ../../../services/resource-service/stub/src/main/proto/resourcesecretmap/StorageSecretMap.proto \
+ ../../../services/resource-service/stub/src/main/proto/local/LocalStorageService.proto \
+ ../../../services/resource-service/stub/src/main/proto/local/LocalStorage.proto \
+ ../../../services/resource-service/stub/src/main/proto/gcs/GCSStorageService.proto \
+ ../../../services/resource-service/stub/src/main/proto/gcs/GCSStorage.proto \
+ ../../../services/resource-service/stub/src/main/proto/ftp/FTPStorageService.proto \
+ ../../../services/resource-service/stub/src/main/proto/ftp/FTPStorage.proto \
+ ../../../services/resource-service/stub/src/main/proto/dropbox/DropboxStorageService.proto \
+ ../../../services/resource-service/stub/src/main/proto/dropbox/DropboxStorage.proto \
+ ../../../services/resource-service/stub/src/main/proto/box/BoxStorageService.proto \
+ ../../../services/resource-service/stub/src/main/proto/box/BoxStorage.proto \
+ ../../../services/resource-service/stub/src/main/proto/azure/AzureStorageService.proto \
+ ../../../services/resource-service/stub/src/main/proto/azure/AzureStorage.proto \
+ --python_out=$RESOURCE_DIR --grpc_python_out=$RESOURCE_DIR
+
+
+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=. \
+ ../../../services/secret-service/stub/src/main/proto/azure/AzureCredential.proto \
+ ../../../services/secret-service/stub/src/main/proto/azure/AzureSecretService.proto \
+ ../../../services/secret-service/stub/src/main/proto/box/BoxCredential.proto \
+ ../../../services/secret-service/stub/src/main/proto/box/BoxSecretService.proto \
+ ../../../services/secret-service/stub/src/main/proto/dropbox/DropboxCredential.proto \
+ ../../../services/secret-service/stub/src/main/proto/dropbox/DropboxSecretService.proto \
+ ../../../services/secret-service/stub/src/main/proto/ftp/FTPCredential.proto \
+ ../../../services/secret-service/stub/src/main/proto/ftp/FTPSecretService.proto \
+ ../../../services/secret-service/stub/src/main/proto/gcs/GCSCredential.proto \
+ ../../../services/secret-service/stub/src/main/proto/gcs/GCSSecretService.proto \
+ ../../../services/secret-service/stub/src/main/proto/s3/S3Credential.proto \
+ ../../../services/secret-service/stub/src/main/proto/s3/S3SecretService.proto \
+ ../../../services/secret-service/stub/src/main/proto/scp/SCPCredential.proto \
+ ../../../services/secret-service/stub/src/main/proto/scp/SCPSecretService.proto \
+ --python_out=$SECRET_DIR --grpc_python_out=$SECRET_DIR
+
+python3 -m grpc_tools.protoc --proto_path=../../../api/stub/src/main/proto \
+ --proto_path=../../../common/mft-common-proto/src/main/proto/ \
+ --proto_path=. \
+ ../../../api/stub/src/main/proto/MFTTransferApi.proto \
+ --python_out=$TRANSFER_DIR --grpc_python_out=$TRANSFER_DIR
+
+
+touch azure/__init__.py
+touch box/__init__.py
+touch dropbox/__init__.py
+touch ftp/__init__.py
+touch gcs/__init__.py
+touch local/__init__.py
+touch resource/__init__.py
+touch resourcesecretmap/__init__.py
+touch s3/__init__.py
+touch scp/__init__.py
+
+
+sed -i 's/from \([^)]*\)pb2/from airavata_mft_sdk.\1pb2/' */*.py
+sed -i 's/from \([^)]*\)pb2/from airavata_mft_sdk.\1pb2/' *.py
+
+sed -i 's/^import \([^)]*\)pb2/import airavata_mft_sdk.\1pb2/' */*.py
+sed -i 's/^import \([^)]*\)pb2/import airavata_mft_sdk.\1pb2/' *.py
\ No newline at end of file
diff --git a/python-sdk/src/airavata_mft_sdk/google/api/annotations_pb2.py b/python-sdk/src/airavata_mft_sdk/google/api/annotations_pb2.py
index c7e1a0f..adb6c10 100644
--- a/python-sdk/src/airavata_mft_sdk/google/api/annotations_pb2.py
+++ b/python-sdk/src/airavata_mft_sdk/google/api/annotations_pb2.py
@@ -7,14 +7,14 @@ from google.protobuf import descriptor as _descriptor
from google.protobuf import message as _message
from google.protobuf import reflection as _reflection
from google.protobuf import symbol_database as _symbol_database
-from google.protobuf import descriptor_pb2
+from airavata_mft_sdk.airavata_mft_sdk.airavata_mft_sdk.airavata_mft_sdk.google.protobuf import airavata_mft_sdk.airavata_mft_sdk.airavata_mft_sdk.descriptor_pb2
# @@protoc_insertion_point(imports)
_sym_db = _symbol_database.Default()
-from google.api import http_pb2 as google_dot_api_dot_http__pb2
-from google.protobuf import descriptor_pb2 as google_dot_protobuf_dot_descriptor__pb2
+from airavata_mft_sdk.airavata_mft_sdk.airavata_mft_sdk.airavata_mft_sdk.google.api import airavata_mft_sdk.airavata_mft_sdk.airavata_mft_sdk.http_pb2 as google_dot_api_dot_http__pb2
+from airavata_mft_sdk.airavata_mft_sdk.airavata_mft_sdk.airavata_mft_sdk.google.protobuf import airavata_mft_sdk.airavata_mft_sdk.airavata_mft_sdk.descriptor_pb2 as google_dot_protobuf_dot_descriptor__pb2
DESCRIPTOR = _descriptor.FileDescriptor(
diff --git a/python-sdk/src/airavata_mft_sdk/google/api/http_pb2.py b/python-sdk/src/airavata_mft_sdk/google/api/http_pb2.py
index a5c2bf4..b91f7eb 100644
--- a/python-sdk/src/airavata_mft_sdk/google/api/http_pb2.py
+++ b/python-sdk/src/airavata_mft_sdk/google/api/http_pb2.py
@@ -7,7 +7,7 @@ from google.protobuf import descriptor as _descriptor
from google.protobuf import message as _message
from google.protobuf import reflection as _reflection
from google.protobuf import symbol_database as _symbol_database
-from google.protobuf import descriptor_pb2
+from airavata_mft_sdk.airavata_mft_sdk.airavata_mft_sdk.airavata_mft_sdk.google.protobuf import airavata_mft_sdk.airavata_mft_sdk.airavata_mft_sdk.descriptor_pb2
# @@protoc_insertion_point(imports)
_sym_db = _symbol_database.Default()
diff --git a/python-sdk/src/airavata_mft_sdk/local/LocalStorageService_pb2.py b/python-sdk/src/airavata_mft_sdk/local/LocalStorageService_pb2.py
index 80af73e..4e0115b 100644
--- a/python-sdk/src/airavata_mft_sdk/local/LocalStorageService_pb2.py
+++ b/python-sdk/src/airavata_mft_sdk/local/LocalStorageService_pb2.py
@@ -12,9 +12,9 @@ from google.protobuf import symbol_database as _symbol_database
_sym_db = _symbol_database.Default()
-from google.api import annotations_pb2 as google_dot_api_dot_annotations__pb2
-from google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
-from local import LocalStorage_pb2 as local_dot_LocalStorage__pb2
+from airavata_mft_sdk.google.api import annotations_pb2 as google_dot_api_dot_annotations__pb2
+from airavata_mft_sdk.google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
+from airavata_mft_sdk.local import LocalStorage_pb2 as local_dot_LocalStorage__pb2
DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1flocal/LocalStorageService.proto\x12.org.apache.airavata.mft.resource.service.local\x1a\x1cgoogle/api/annotations.proto\x1a\x1bgoogle/protobuf/empty.proto\x1a\x18local/LocalStorage.proto2\xd9\x07\n\x13LocalStorageService\x12\xd7\x01\n\x10listLocalStorage\x12M.org.apache.airavata.mft.resource.stubs.local.storage.LocalStorageListRequest\x1aN.org.apache.airavata.mft.resource.stubs.local.storage.LocalStorageListResponse\"$\x82\ [...]
diff --git a/python-sdk/src/airavata_mft_sdk/local/LocalStorageService_pb2_grpc.py b/python-sdk/src/airavata_mft_sdk/local/LocalStorageService_pb2_grpc.py
index 3bedb84..2390d42 100644
--- a/python-sdk/src/airavata_mft_sdk/local/LocalStorageService_pb2_grpc.py
+++ b/python-sdk/src/airavata_mft_sdk/local/LocalStorageService_pb2_grpc.py
@@ -2,8 +2,8 @@
"""Client and server classes corresponding to protobuf-defined services."""
import grpc
-from google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
-from local import LocalStorage_pb2 as local_dot_LocalStorage__pb2
+from airavata_mft_sdk.google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
+from airavata_mft_sdk.local import LocalStorage_pb2 as local_dot_LocalStorage__pb2
class LocalStorageServiceStub(object):
diff --git a/python-sdk/src/airavata_mft_sdk/mft_client.py b/python-sdk/src/airavata_mft_sdk/mft_client.py
index 822fdaf..c112a7d 100644
--- a/python-sdk/src/airavata_mft_sdk/mft_client.py
+++ b/python-sdk/src/airavata_mft_sdk/mft_client.py
@@ -1,5 +1,5 @@
import grpc
-import mft_sdk.MFTTransferApi_pb2_grpc as transfer_grpc
+import airavata_mft_sdk.airavata_mft_sdk.airavata_mft_sdk.airavata_mft_sdk.mft_sdk.MFTTransferApi_pb2_grpc as transfer_grpc
class MFTClient:
diff --git a/python-sdk/src/airavata_mft_sdk/resource/ResourceService_pb2.py b/python-sdk/src/airavata_mft_sdk/resource/ResourceService_pb2.py
index e403915..316a2a9 100644
--- a/python-sdk/src/airavata_mft_sdk/resource/ResourceService_pb2.py
+++ b/python-sdk/src/airavata_mft_sdk/resource/ResourceService_pb2.py
@@ -12,17 +12,17 @@ from google.protobuf import symbol_database as _symbol_database
_sym_db = _symbol_database.Default()
-from google.api import annotations_pb2 as google_dot_api_dot_annotations__pb2
-from google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
-from azure import AzureStorage_pb2 as azure_dot_AzureStorage__pb2
-from box import BoxStorage_pb2 as box_dot_BoxStorage__pb2
-from dropbox import DropboxStorage_pb2 as dropbox_dot_DropboxStorage__pb2
-from ftp import FTPStorage_pb2 as ftp_dot_FTPStorage__pb2
-from gcs import GCSStorage_pb2 as gcs_dot_GCSStorage__pb2
-from local import LocalStorage_pb2 as local_dot_LocalStorage__pb2
-from s3 import S3Storage_pb2 as s3_dot_S3Storage__pb2
-from scp import SCPStorage_pb2 as scp_dot_SCPStorage__pb2
-import CredCommon_pb2 as CredCommon__pb2
+from airavata_mft_sdk.google.api import annotations_pb2 as google_dot_api_dot_annotations__pb2
+from airavata_mft_sdk.google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
+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.s3 import S3Storage_pb2 as s3_dot_S3Storage__pb2
+from airavata_mft_sdk.scp import SCPStorage_pb2 as scp_dot_SCPStorage__pb2
+import airavata_mft_sdk.CredCommon_pb2 as CredCommon__pb2
DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1eresource/ResourceService.proto\x12-org.apache.airavata.mft.resource.stubs.common\x1a\x1cgoogle/api/annotations.proto\x1a\x1bgoogle/protobuf/empty.proto\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\x12s3/S3Storage.proto\x1a\x14scp/SCPStorage.proto\x1a\x10\x43redCommon.pro [...]
diff --git a/python-sdk/src/airavata_mft_sdk/resource/ResourceService_pb2_grpc.py b/python-sdk/src/airavata_mft_sdk/resource/ResourceService_pb2_grpc.py
index 055acd7..2018e47 100644
--- a/python-sdk/src/airavata_mft_sdk/resource/ResourceService_pb2_grpc.py
+++ b/python-sdk/src/airavata_mft_sdk/resource/ResourceService_pb2_grpc.py
@@ -2,8 +2,8 @@
"""Client and server classes corresponding to protobuf-defined services."""
import grpc
-from google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
-from resource import ResourceService_pb2 as resource_dot_ResourceService__pb2
+from airavata_mft_sdk.google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
+from airavata_mft_sdk.resource import ResourceService_pb2 as resource_dot_ResourceService__pb2
class GenericResourceServiceStub(object):
diff --git a/python-sdk/src/airavata_mft_sdk/resourcesecretmap/StorageSecretMap_pb2.py b/python-sdk/src/airavata_mft_sdk/resourcesecretmap/StorageSecretMap_pb2.py
index e4045ef..da7deb7 100644
--- a/python-sdk/src/airavata_mft_sdk/resourcesecretmap/StorageSecretMap_pb2.py
+++ b/python-sdk/src/airavata_mft_sdk/resourcesecretmap/StorageSecretMap_pb2.py
@@ -12,9 +12,9 @@ from google.protobuf import symbol_database as _symbol_database
_sym_db = _symbol_database.Default()
-import CredCommon_pb2 as CredCommon__pb2
-from google.api import annotations_pb2 as google_dot_api_dot_annotations__pb2
-from google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
+import airavata_mft_sdk.CredCommon_pb2 as CredCommon__pb2
+from airavata_mft_sdk.google.api import annotations_pb2 as google_dot_api_dot_annotations__pb2
+from airavata_mft_sdk.google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n(resourcesecretmap/StorageSecretMap.proto\x12\x33org.apache.airavata.mft.storage.stubs.storagesecret\x1a\x10\x43redCommon.proto\x1a\x1cgoogle/api/annotations.proto\x1a\x1bgoogle/protobuf/empty.proto\"\xfc\x01\n\rStorageSecret\x12\n\n\x02id\x18\x01 \x01(\t\x12\x11\n\tstorageId\x18\x02 \x01(\t\x12\x10\n\x08secretId\x18\x03 \x01(\t\x12\\\n\x04type\x18\x04 \x01(\x0e\x32N.org.apache.airavata.mft.storage.stubs.storagesecret.StorageS [...]
diff --git a/python-sdk/src/airavata_mft_sdk/resourcesecretmap/StorageSecretMap_pb2_grpc.py b/python-sdk/src/airavata_mft_sdk/resourcesecretmap/StorageSecretMap_pb2_grpc.py
index 8f1238a..9092668 100644
--- a/python-sdk/src/airavata_mft_sdk/resourcesecretmap/StorageSecretMap_pb2_grpc.py
+++ b/python-sdk/src/airavata_mft_sdk/resourcesecretmap/StorageSecretMap_pb2_grpc.py
@@ -2,8 +2,8 @@
"""Client and server classes corresponding to protobuf-defined services."""
import grpc
-from google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
-from resourcesecretmap import StorageSecretMap_pb2 as resourcesecretmap_dot_StorageSecretMap__pb2
+from airavata_mft_sdk.google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
+from airavata_mft_sdk.resourcesecretmap import StorageSecretMap_pb2 as resourcesecretmap_dot_StorageSecretMap__pb2
class StorageSecretServiceStub(object):
diff --git a/python-sdk/src/airavata_mft_sdk/s3/S3Credential_pb2.py b/python-sdk/src/airavata_mft_sdk/s3/S3Credential_pb2.py
index 2f7f7a3..d87a2b4 100644
--- a/python-sdk/src/airavata_mft_sdk/s3/S3Credential_pb2.py
+++ b/python-sdk/src/airavata_mft_sdk/s3/S3Credential_pb2.py
@@ -12,7 +12,7 @@ from google.protobuf import symbol_database as _symbol_database
_sym_db = _symbol_database.Default()
-import CredCommon_pb2 as CredCommon__pb2
+import airavata_mft_sdk.CredCommon_pb2 as CredCommon__pb2
DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x15s3/S3Credential.proto\x12+org.apache.airavata.mft.credential.stubs.s3\x1a\x10\x43redCommon.proto\"B\n\x08S3Secret\x12\x10\n\x08secretId\x18\x01 \x01(\t\x12\x11\n\taccessKey\x18\x02 \x01(\t\x12\x11\n\tsecretKey\x18\x03 \x01(\t\"e\n\x12S3SecretGetRequest\x12\x10\n\x08secretId\x18\x01 \x01(\t\x12=\n\nauthzToken\x18\x02 \x01(\x0b\x32).org.apache.airavata.mft.common.AuthToken\"|\n\x15S3SecretCreateRequest\x12\x11\n\taccessKey\x [...]
diff --git a/python-sdk/src/airavata_mft_sdk/s3/S3SecretService_pb2.py b/python-sdk/src/airavata_mft_sdk/s3/S3SecretService_pb2.py
index 2932b35..0753e24 100644
--- a/python-sdk/src/airavata_mft_sdk/s3/S3SecretService_pb2.py
+++ b/python-sdk/src/airavata_mft_sdk/s3/S3SecretService_pb2.py
@@ -12,9 +12,9 @@ from google.protobuf import symbol_database as _symbol_database
_sym_db = _symbol_database.Default()
-from google.api import annotations_pb2 as google_dot_api_dot_annotations__pb2
-from google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
-from s3 import S3Credential_pb2 as s3_dot_S3Credential__pb2
+from airavata_mft_sdk.google.api import annotations_pb2 as google_dot_api_dot_annotations__pb2
+from airavata_mft_sdk.google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
+from airavata_mft_sdk.s3 import S3Credential_pb2 as s3_dot_S3Credential__pb2
DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x18s3/S3SecretService.proto\x12-org.apache.airavata.mft.credential.service.s3\x1a\x1cgoogle/api/annotations.proto\x1a\x1bgoogle/protobuf/empty.proto\x1a\x15s3/S3Credential.proto2\xe9\x04\n\x0fS3SecretService\x12\x9e\x01\n\x0bgetS3Secret\x12?.org.apache.airavata.mft.credential.stubs.s3.S3SecretGetRequest\x1a\x35.org.apache.airavata.mft.credential.stubs.s3.S3Secret\"\x17\x82\xd3\xe4\x93\x02\x11\x12\x0f/v1.0/secret/s3\x12\xa4\x0 [...]
diff --git a/python-sdk/src/airavata_mft_sdk/s3/S3SecretService_pb2_grpc.py b/python-sdk/src/airavata_mft_sdk/s3/S3SecretService_pb2_grpc.py
index 8871ce5..b9a92d7 100644
--- a/python-sdk/src/airavata_mft_sdk/s3/S3SecretService_pb2_grpc.py
+++ b/python-sdk/src/airavata_mft_sdk/s3/S3SecretService_pb2_grpc.py
@@ -2,8 +2,8 @@
"""Client and server classes corresponding to protobuf-defined services."""
import grpc
-from google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
-from s3 import S3Credential_pb2 as s3_dot_S3Credential__pb2
+from airavata_mft_sdk.google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
+from airavata_mft_sdk.s3 import S3Credential_pb2 as s3_dot_S3Credential__pb2
class S3SecretServiceStub(object):
diff --git a/python-sdk/src/airavata_mft_sdk/s3/S3StorageService_pb2.py b/python-sdk/src/airavata_mft_sdk/s3/S3StorageService_pb2.py
index fdcc7c9..f93c8bb 100644
--- a/python-sdk/src/airavata_mft_sdk/s3/S3StorageService_pb2.py
+++ b/python-sdk/src/airavata_mft_sdk/s3/S3StorageService_pb2.py
@@ -12,9 +12,9 @@ from google.protobuf import symbol_database as _symbol_database
_sym_db = _symbol_database.Default()
-from google.api import annotations_pb2 as google_dot_api_dot_annotations__pb2
-from google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
-from s3 import S3Storage_pb2 as s3_dot_S3Storage__pb2
+from airavata_mft_sdk.google.api import annotations_pb2 as google_dot_api_dot_annotations__pb2
+from airavata_mft_sdk.google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
+from airavata_mft_sdk.s3 import S3Storage_pb2 as s3_dot_S3Storage__pb2
DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x19s3/S3StorageService.proto\x12+org.apache.airavata.mft.resource.service.s3\x1a\x1cgoogle/api/annotations.proto\x1a\x1bgoogle/protobuf/empty.proto\x1a\x12s3/S3Storage.proto2\x88\x07\n\x10S3StorageService\x12\xc5\x01\n\rlistS3Storage\x12G.org.apache.airavata.mft.resource.stubs.s3.storage.S3StorageListRequest\x1aH.org.apache.airavata.mft.resource.stubs.s3.storage.S3StorageListResponse\"!\x82\xd3\xe4\x93\x02\x1b\x12\x19/v1.0/re [...]
diff --git a/python-sdk/src/airavata_mft_sdk/s3/S3StorageService_pb2_grpc.py b/python-sdk/src/airavata_mft_sdk/s3/S3StorageService_pb2_grpc.py
index 1432d83..5e9ab39 100644
--- a/python-sdk/src/airavata_mft_sdk/s3/S3StorageService_pb2_grpc.py
+++ b/python-sdk/src/airavata_mft_sdk/s3/S3StorageService_pb2_grpc.py
@@ -2,8 +2,8 @@
"""Client and server classes corresponding to protobuf-defined services."""
import grpc
-from google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
-from s3 import S3Storage_pb2 as s3_dot_S3Storage__pb2
+from airavata_mft_sdk.google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
+from airavata_mft_sdk.s3 import S3Storage_pb2 as s3_dot_S3Storage__pb2
class S3StorageServiceStub(object):
diff --git a/python-sdk/src/airavata_mft_sdk/scp/SCPCredential_pb2.py b/python-sdk/src/airavata_mft_sdk/scp/SCPCredential_pb2.py
index dc6ebac..76c04a4 100644
--- a/python-sdk/src/airavata_mft_sdk/scp/SCPCredential_pb2.py
+++ b/python-sdk/src/airavata_mft_sdk/scp/SCPCredential_pb2.py
@@ -12,7 +12,7 @@ from google.protobuf import symbol_database as _symbol_database
_sym_db = _symbol_database.Default()
-import CredCommon_pb2 as CredCommon__pb2
+import airavata_mft_sdk.CredCommon_pb2 as CredCommon__pb2
DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x17scp/SCPCredential.proto\x12,org.apache.airavata.mft.credential.stubs.scp\x1a\x10\x43redCommon.proto\"f\n\tSCPSecret\x12\x10\n\x08secretId\x18\x01 \x01(\t\x12\x12\n\nprivateKey\x18\x02 \x01(\t\x12\x11\n\tpublicKey\x18\x03 \x01(\t\x12\x12\n\npassphrase\x18\x04 \x01(\t\x12\x0c\n\x04user\x18\x05 \x01(\t\"f\n\x13SCPSecretGetRequest\x12\x10\n\x08secretId\x18\x01 \x01(\t\x12=\n\nauthzToken\x18\x02 \x01(\x0b\x32).org.apache.airava [...]
diff --git a/python-sdk/src/airavata_mft_sdk/scp/SCPSecretService_pb2.py b/python-sdk/src/airavata_mft_sdk/scp/SCPSecretService_pb2.py
index 48ce03f..73b354b 100644
--- a/python-sdk/src/airavata_mft_sdk/scp/SCPSecretService_pb2.py
+++ b/python-sdk/src/airavata_mft_sdk/scp/SCPSecretService_pb2.py
@@ -12,9 +12,9 @@ from google.protobuf import symbol_database as _symbol_database
_sym_db = _symbol_database.Default()
-from google.api import annotations_pb2 as google_dot_api_dot_annotations__pb2
-from google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
-from scp import SCPCredential_pb2 as scp_dot_SCPCredential__pb2
+from airavata_mft_sdk.google.api import annotations_pb2 as google_dot_api_dot_annotations__pb2
+from airavata_mft_sdk.google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
+from airavata_mft_sdk.scp import SCPCredential_pb2 as scp_dot_SCPCredential__pb2
DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1ascp/SCPSecretService.proto\x12.org.apache.airavata.mft.credential.service.scp\x1a\x1cgoogle/api/annotations.proto\x1a\x1bgoogle/protobuf/empty.proto\x1a\x17scp/SCPCredential.proto2\xfe\x04\n\x10SCPSecretService\x12\xa4\x01\n\x0cgetSCPSecret\x12\x41.org.apache.airavata.mft.credential.stubs.scp.SCPSecretGetRequest\x1a\x37.org.apache.airavata.mft.credential.stubs.scp.SCPSecret\"\x18\x82\xd3\xe4\x93\x02\x12\x12\x10/v1.0/secret [...]
diff --git a/python-sdk/src/airavata_mft_sdk/scp/SCPSecretService_pb2_grpc.py b/python-sdk/src/airavata_mft_sdk/scp/SCPSecretService_pb2_grpc.py
index 69b4542..3d97816 100644
--- a/python-sdk/src/airavata_mft_sdk/scp/SCPSecretService_pb2_grpc.py
+++ b/python-sdk/src/airavata_mft_sdk/scp/SCPSecretService_pb2_grpc.py
@@ -2,8 +2,8 @@
"""Client and server classes corresponding to protobuf-defined services."""
import grpc
-from google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
-from scp import SCPCredential_pb2 as scp_dot_SCPCredential__pb2
+from airavata_mft_sdk.google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
+from airavata_mft_sdk.scp import SCPCredential_pb2 as scp_dot_SCPCredential__pb2
class SCPSecretServiceStub(object):
diff --git a/python-sdk/src/airavata_mft_sdk/scp/SCPStorageService_pb2.py b/python-sdk/src/airavata_mft_sdk/scp/SCPStorageService_pb2.py
index 776363d..3585135 100644
--- a/python-sdk/src/airavata_mft_sdk/scp/SCPStorageService_pb2.py
+++ b/python-sdk/src/airavata_mft_sdk/scp/SCPStorageService_pb2.py
@@ -12,9 +12,9 @@ from google.protobuf import symbol_database as _symbol_database
_sym_db = _symbol_database.Default()
-from google.api import annotations_pb2 as google_dot_api_dot_annotations__pb2
-from google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
-from scp import SCPStorage_pb2 as scp_dot_SCPStorage__pb2
+from airavata_mft_sdk.google.api import annotations_pb2 as google_dot_api_dot_annotations__pb2
+from airavata_mft_sdk.google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
+from airavata_mft_sdk.scp import SCPStorage_pb2 as scp_dot_SCPStorage__pb2
DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1bscp/SCPStorageService.proto\x12,org.apache.airavata.mft.resource.service.scp\x1a\x1cgoogle/api/annotations.proto\x1a\x1bgoogle/protobuf/empty.proto\x1a\x14scp/SCPStorage.proto2\xa3\x07\n\x11SCPStorageService\x12\xcb\x01\n\x0elistSCPStorage\x12I.org.apache.airavata.mft.resource.stubs.scp.storage.SCPStorageListRequest\x1aJ.org.apache.airavata.mft.resource.stubs.scp.storage.SCPStorageListResponse\"\"\x82\xd3\xe4\x93\x02\x1c\x [...]
diff --git a/python-sdk/src/airavata_mft_sdk/scp/SCPStorageService_pb2_grpc.py b/python-sdk/src/airavata_mft_sdk/scp/SCPStorageService_pb2_grpc.py
index ad99254..60068ac 100644
--- a/python-sdk/src/airavata_mft_sdk/scp/SCPStorageService_pb2_grpc.py
+++ b/python-sdk/src/airavata_mft_sdk/scp/SCPStorageService_pb2_grpc.py
@@ -2,8 +2,8 @@
"""Client and server classes corresponding to protobuf-defined services."""
import grpc
-from google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
-from scp import SCPStorage_pb2 as scp_dot_SCPStorage__pb2
+from airavata_mft_sdk.google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2
+from airavata_mft_sdk.scp import SCPStorage_pb2 as scp_dot_SCPStorage__pb2
class SCPStorageServiceStub(object):