You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2020/08/10 16:30:06 UTC
[airavata] branch airavata-python-sdk-top-level-package created
(now 5d02f8b)
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a change to branch airavata-python-sdk-top-level-package
in repository https://gitbox.apache.org/repos/asf/airavata.git.
at 5d02f8b Move Python airavata SDK modules under top level package
This branch includes the following new commits:
new 5d02f8b Move Python airavata SDK modules under top level package
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[airavata] 01/01: Move Python airavata SDK modules under top level
package
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch airavata-python-sdk-top-level-package
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 5d02f8b6ae8a37fd52bdfdae1ba0faf85b5806dd
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Mon Aug 10 12:29:29 2020 -0400
Move Python airavata SDK modules under top level package
---
.../airavata-python-sdk/.gitignore | 2 +-
.../airavata-python-sdk/README.md | 49 ++---
.../airavata_python_sdk.egg-info/PKG-INFO | 10 -
.../airavata_python_sdk.egg-info/SOURCES.txt | 202 ---------------------
.../dependency_links.txt | 1 -
.../airavata_python_sdk.egg-info/top_level.txt | 4 -
.../airavata-python-sdk/airavata_sdk/__init__.py | 18 ++
.../clients}/__init__.py | 0
.../clients/api_server_client.py | 4 +-
.../clients/credential_store_client.py | 4 +-
.../clients/file_handling_client.py | 0
.../clients/group_manager_client.py | 4 +-
.../{ => airavata_sdk}/clients/iam_admin_client.py | 4 +-
.../clients/keycloak_token_fetcher.py | 2 +-
.../clients/sftp_file_handling_client.py | 0
.../clients/sharing_registry_client.py | 4 +-
.../clients/tenant_profile_client.py | 4 +-
.../clients/user_profile_client.py | 6 +-
.../{ => airavata_sdk}/clients/utils/__init__.py | 0
.../clients/utils/api_server_client_util.py | 6 +-
.../clients/utils/data_model_creation_util.py | 8 +-
.../resources => airavata_sdk/samples}/__init__.py | 0
.../samples/api_server_client_samples.py | 4 +-
.../samples/create_launch_echo_experiment.py | 16 +-
.../samples/create_launch_gaussian_experiment.py | 12 +-
.../{ => airavata_sdk}/samples/file_utils.py | 2 +-
.../samples/group_manager_client_samples.py | 6 +-
.../samples/iam_admin_client_samples.py | 4 +-
.../{ => airavata_sdk}/samples/metadata_fetcher.py | 4 +-
.../samples/resources}/__init__.py | 0
.../samples/resources/incommon_rsa_server_ca.pem | 0
.../samples/sharing_registry_client_samples.py | 4 +-
.../samples/tenant_profile_client_samples.py | 4 +-
.../samples/user_profile_client_samples.py | 4 +-
.../transport}/__init__.py | 0
.../{ => airavata_sdk}/transport/settings.ini | 0
.../{ => airavata_sdk}/transport/settings.py | 0
.../{ => airavata_sdk}/transport/utils.py | 0
.../airavata-python-sdk/setup.py | 2 +-
39 files changed, 98 insertions(+), 296 deletions(-)
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/.gitignore b/airavata-api/airavata-client-sdks/airavata-python-sdk/.gitignore
index fa5de29..37e0880 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/.gitignore
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/.gitignore
@@ -1,5 +1,5 @@
venv
-airavata_custos.egg-info
+airavata_python_sdk.egg-info
*.pyc
.tox
dist
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/README.md b/airavata-api/airavata-client-sdks/airavata-python-sdk/README.md
index 06b97ff..bcd2b09 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/README.md
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/README.md
@@ -9,17 +9,18 @@ The Apache Airavata Python SDK for third party clients to integrate with Airav
Includes thrift stubs generated by a thrift compiler. Mainly contains data model and functions. You may
need to import data model packages to integrate with clients.
- - clients
-
- Includes integration clients, which you want to import and integrate with your code to access airavata middleware.
-
- - samples
-
- Includes set of sample implementation of integration clients to demonastrate the integration with airavata middleware
-
- - transport
-
- Includes connection handling classes and connection pool implementations
+ - airavata_sdk
+ - clients
+
+ Includes integration clients, which you want to import and integrate with your code to access airavata middleware.
+
+ - samples
+
+ Includes set of sample implementation of integration clients to demonastrate the integration with airavata middleware
+
+ - transport
+
+ Includes connection handling classes and connection pool implementations
### Before Integration
@@ -41,7 +42,7 @@ The Apache Airavata Python SDK for third party clients to integrate with Airav
```
- Create a INI file containing server configuration details. For more information refer to default settings file
- [settings.ini](transport/settings.ini)
+ [settings.ini](airavata_sdk/transport/settings.ini)
### Generating Distribution Archives (Optional)
@@ -71,7 +72,7 @@ You should be able to install those packages into your project.
### Integrate With Your Clients
- - [api_server_client](clients/api_server_client.py)
+ - [api_server_client](airavata_sdk/clients/api_server_client.py)
- is_user_exists(authz_token, gateway_id, user_name)
- add_gateway( authz_token, [gateway](airavata/model/workspace/ttypes.py))
- get_all_users_in_gateway( authz_token, gateway_id)
@@ -273,9 +274,9 @@ You should be able to install those packages into your project.
- remove_parsing_template( authz_token, template_id, gateway_id)
- list_all_parsing_templates( authz_token, gateway_id)
- Sample implementations can be found at [api_server_client_samples](samples/api_server_client_samples.py)
+ Sample implementations can be found at [api_server_client_samples](airavata_sdk/samples/api_server_client_samples.py)
- - [group_manager_client](clients/group_manager_client.py)
+ - [group_manager_client](airavata_sdk/clients/group_manager_client.py)
- create_group( authz_token, [group_model](airavata/model/group/ttypes.py))
- update_group( authz_token, group_model)
@@ -291,9 +292,9 @@ You should be able to install those packages into your project.
- has_admin_access( authz_token, group_id, admin_id)
- has_owner_access( authz_token, group_id, owner_id)
- Sample implementations can be found at [group_manager_client_samples](samples/group_manager_client_samples.py)
+ Sample implementations can be found at [group_manager_client_samples](airavata_sdk/samples/group_manager_client_samples.py)
- - [iam_admin_client](clients/iam_admin_client.py)
+ - [iam_admin_client](airavata_sdk/clients/iam_admin_client.py)
- set_up_gateway( authz_token, gateway)
- is_username_available( authz_token, username)
@@ -311,10 +312,10 @@ You should be able to install those packages into your project.
- remove_role_from_user( authz_token, username, role_name)
- get_users_with_role( authz_token, role_name)
- Sample implementations can be found at [iam_admin_client_samples](samples/iam_admin_client_samples.py)
+ Sample implementations can be found at [iam_admin_client_samples](airavata_sdk/samples/iam_admin_client_samples.py)
- - [sharing_registry_client](clients/sharing_registry_client.py)
+ - [sharing_registry_client](airavata_sdk/clients/sharing_registry_client.py)
- create_domain([domain](airavata/model/sharing/ttypes.py))
- update_domain( domain)
@@ -372,11 +373,11 @@ You should be able to install those packages into your project.
- revoke_entity_sharing_from_groups( domain_id, entity_id, group_list, permission_type_id)
- user_has_access( domain_id, user_id, entity_id, permission_type_id)
- Sample implementations can be found at [sharing_registry_client_samples](samples/sharing_registry_client_samples.py)
+ Sample implementations can be found at [sharing_registry_client_samples](airavata_sdk/samples/sharing_registry_client_samples.py)
- - [tenant_profile_client](clients/tenant_profile_client.py)
+ - [tenant_profile_client](airavata_sdk/clients/tenant_profile_client.py)
- add_gateway( authz_token, gateway)
- update_gateway( authz_token, updated_gateway)
@@ -386,10 +387,10 @@ You should be able to install those packages into your project.
- is_gateway_exist( authz_token, gateway_id)
- get_all_gateways_for_user( authz_token, requester_username)
- Sample implementations can be found at [tenant_profile_client_samples](samples/tenant_profile_client_samples.py)
+ Sample implementations can be found at [tenant_profile_client_samples](airavata_sdk/samples/tenant_profile_client_samples.py)
- - [user_profile_client](clients/user_profile_client.py)
+ - [user_profile_client](airavata_sdk/clients/user_profile_client.py)
- initialize_user_profile( authz_token)
- add_user_profile( authz_token, [user_profile](airavata/model/user/ttypes.py))
@@ -399,4 +400,4 @@ You should be able to install those packages into your project.
- get_all_user_profiles_in_gateway( authz_token, gateway_id, offset, limit)
- does_user_exist( authz_token, user_id, gateway_id)
- Sample implementations can be found at [user_profile_client_samples](samples/user_profile_client_samples.py)
\ No newline at end of file
+ Sample implementations can be found at [user_profile_client_samples](airavata_sdk/samples/user_profile_client_samples.py)
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_python_sdk.egg-info/PKG-INFO b/airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_python_sdk.egg-info/PKG-INFO
deleted file mode 100644
index e8e0dce..0000000
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_python_sdk.egg-info/PKG-INFO
+++ /dev/null
@@ -1,10 +0,0 @@
-Metadata-Version: 1.0
-Name: airavata-python-sdk
-Version: 1.0.0
-Summary: Apache Airavata Python SDK
-Home-page: http://airavata.com
-Author: Airavata Developers
-Author-email: dev@airavata.apache.org
-License: Apache License 2.0
-Description: UNKNOWN
-Platform: UNKNOWN
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_python_sdk.egg-info/SOURCES.txt b/airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_python_sdk.egg-info/SOURCES.txt
deleted file mode 100644
index b047fe9..0000000
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_python_sdk.egg-info/SOURCES.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-LICENSE
-README.md
-setup.cfg
-setup.py
-airavata/__init__.py
-airavata/api/Airavata.py
-airavata/api/__init__.py
-airavata/api/constants.py
-airavata/api/ttypes.py
-airavata/api/credential/__init__.py
-airavata/api/credential/store/CredentialStoreService.py
-airavata/api/credential/store/__init__.py
-airavata/api/credential/store/constants.py
-airavata/api/credential/store/ttypes.py
-airavata/api/credential/store/error/__init__.py
-airavata/api/credential/store/error/constants.py
-airavata/api/credential/store/error/ttypes.py
-airavata/api/error/__init__.py
-airavata/api/error/constants.py
-airavata/api/error/ttypes.py
-airavata/api/sharing/SharingRegistryService.py
-airavata/api/sharing/__init__.py
-airavata/api/sharing/constants.py
-airavata/api/sharing/ttypes.py
-airavata/base/__init__.py
-airavata/base/api/BaseAPI.py
-airavata/base/api/__init__.py
-airavata/base/api/constants.py
-airavata/base/api/ttypes.py
-airavata/model/__init__.py
-airavata/model/constants.py
-airavata/model/ttypes.py
-airavata/model/appcatalog/__init__.py
-airavata/model/appcatalog/accountprovisioning/__init__.py
-airavata/model/appcatalog/accountprovisioning/constants.py
-airavata/model/appcatalog/accountprovisioning/ttypes.py
-airavata/model/appcatalog/appdeployment/__init__.py
-airavata/model/appcatalog/appdeployment/constants.py
-airavata/model/appcatalog/appdeployment/ttypes.py
-airavata/model/appcatalog/appinterface/__init__.py
-airavata/model/appcatalog/appinterface/constants.py
-airavata/model/appcatalog/appinterface/ttypes.py
-airavata/model/appcatalog/computeresource/__init__.py
-airavata/model/appcatalog/computeresource/constants.py
-airavata/model/appcatalog/computeresource/ttypes.py
-airavata/model/appcatalog/gatewaygroups/__init__.py
-airavata/model/appcatalog/gatewaygroups/constants.py
-airavata/model/appcatalog/gatewaygroups/ttypes.py
-airavata/model/appcatalog/gatewayprofile/__init__.py
-airavata/model/appcatalog/gatewayprofile/constants.py
-airavata/model/appcatalog/gatewayprofile/ttypes.py
-airavata/model/appcatalog/groupresourceprofile/__init__.py
-airavata/model/appcatalog/groupresourceprofile/constants.py
-airavata/model/appcatalog/groupresourceprofile/ttypes.py
-airavata/model/appcatalog/parallelism/__init__.py
-airavata/model/appcatalog/parallelism/constants.py
-airavata/model/appcatalog/parallelism/ttypes.py
-airavata/model/appcatalog/parser/__init__.py
-airavata/model/appcatalog/parser/constants.py
-airavata/model/appcatalog/parser/ttypes.py
-airavata/model/appcatalog/storageresource/__init__.py
-airavata/model/appcatalog/storageresource/constants.py
-airavata/model/appcatalog/storageresource/ttypes.py
-airavata/model/appcatalog/userresourceprofile/__init__.py
-airavata/model/appcatalog/userresourceprofile/constants.py
-airavata/model/appcatalog/userresourceprofile/ttypes.py
-airavata/model/application/__init__.py
-airavata/model/application/io/__init__.py
-airavata/model/application/io/constants.py
-airavata/model/application/io/ttypes.py
-airavata/model/commons/__init__.py
-airavata/model/commons/constants.py
-airavata/model/commons/ttypes.py
-airavata/model/credential/__init__.py
-airavata/model/credential/store/__init__.py
-airavata/model/credential/store/constants.py
-airavata/model/credential/store/ttypes.py
-airavata/model/data/__init__.py
-airavata/model/data/movement/__init__.py
-airavata/model/data/movement/constants.py
-airavata/model/data/movement/ttypes.py
-airavata/model/data/replica/__init__.py
-airavata/model/data/replica/constants.py
-airavata/model/data/replica/ttypes.py
-airavata/model/dbevent/__init__.py
-airavata/model/dbevent/constants.py
-airavata/model/dbevent/ttypes.py
-airavata/model/experiment/__init__.py
-airavata/model/experiment/constants.py
-airavata/model/experiment/ttypes.py
-airavata/model/group/__init__.py
-airavata/model/group/constants.py
-airavata/model/group/ttypes.py
-airavata/model/job/__init__.py
-airavata/model/job/constants.py
-airavata/model/job/ttypes.py
-airavata/model/messaging/__init__.py
-airavata/model/messaging/event/__init__.py
-airavata/model/messaging/event/constants.py
-airavata/model/messaging/event/ttypes.py
-airavata/model/process/__init__.py
-airavata/model/process/constants.py
-airavata/model/process/ttypes.py
-airavata/model/scheduling/__init__.py
-airavata/model/scheduling/constants.py
-airavata/model/scheduling/ttypes.py
-airavata/model/security/__init__.py
-airavata/model/security/constants.py
-airavata/model/security/ttypes.py
-airavata/model/sharing/__init__.py
-airavata/model/sharing/constants.py
-airavata/model/sharing/ttypes.py
-airavata/model/status/__init__.py
-airavata/model/status/constants.py
-airavata/model/status/ttypes.py
-airavata/model/task/__init__.py
-airavata/model/task/constants.py
-airavata/model/task/ttypes.py
-airavata/model/tenant/__init__.py
-airavata/model/tenant/constants.py
-airavata/model/tenant/ttypes.py
-airavata/model/user/__init__.py
-airavata/model/user/constants.py
-airavata/model/user/ttypes.py
-airavata/model/workflow/__init__.py
-airavata/model/workflow/constants.py
-airavata/model/workflow/ttypes.py
-airavata/model/workspace/__init__.py
-airavata/model/workspace/constants.py
-airavata/model/workspace/ttypes.py
-airavata/service/__init__.py
-airavata/service/profile/__init__.py
-airavata/service/profile/constants.py
-airavata/service/profile/ttypes.py
-airavata/service/profile/groupmanager/__init__.py
-airavata/service/profile/groupmanager/cpi/GroupManagerService.py
-airavata/service/profile/groupmanager/cpi/__init__.py
-airavata/service/profile/groupmanager/cpi/constants.py
-airavata/service/profile/groupmanager/cpi/ttypes.py
-airavata/service/profile/groupmanager/cpi/error/__init__.py
-airavata/service/profile/groupmanager/cpi/error/constants.py
-airavata/service/profile/groupmanager/cpi/error/ttypes.py
-airavata/service/profile/iam/__init__.py
-airavata/service/profile/iam/admin/__init__.py
-airavata/service/profile/iam/admin/services/__init__.py
-airavata/service/profile/iam/admin/services/cpi/IamAdminServices.py
-airavata/service/profile/iam/admin/services/cpi/__init__.py
-airavata/service/profile/iam/admin/services/cpi/constants.py
-airavata/service/profile/iam/admin/services/cpi/ttypes.py
-airavata/service/profile/iam/admin/services/cpi/error/__init__.py
-airavata/service/profile/iam/admin/services/cpi/error/constants.py
-airavata/service/profile/iam/admin/services/cpi/error/ttypes.py
-airavata/service/profile/tenant/__init__.py
-airavata/service/profile/tenant/cpi/TenantProfileService.py
-airavata/service/profile/tenant/cpi/__init__.py
-airavata/service/profile/tenant/cpi/constants.py
-airavata/service/profile/tenant/cpi/ttypes.py
-airavata/service/profile/tenant/cpi/error/__init__.py
-airavata/service/profile/tenant/cpi/error/constants.py
-airavata/service/profile/tenant/cpi/error/ttypes.py
-airavata/service/profile/user/__init__.py
-airavata/service/profile/user/cpi/UserProfileService.py
-airavata/service/profile/user/cpi/__init__.py
-airavata/service/profile/user/cpi/constants.py
-airavata/service/profile/user/cpi/ttypes.py
-airavata/service/profile/user/cpi/error/__init__.py
-airavata/service/profile/user/cpi/error/constants.py
-airavata/service/profile/user/cpi/error/ttypes.py
-airavata_python_sdk.egg-info/PKG-INFO
-airavata_python_sdk.egg-info/SOURCES.txt
-airavata_python_sdk.egg-info/dependency_links.txt
-airavata_python_sdk.egg-info/top_level.txt
-clients/__init__.py
-clients/api_server_client.py
-clients/credential_store_client.py
-clients/file_handling_client.py
-clients/group_manager_client.py
-clients/iam_admin_client.py
-clients/keycloak_token_fetcher.py
-clients/sftp_file_handling_client.py
-clients/sharing_registry_client.py
-clients/tenant_profile_client.py
-clients/user_profile_client.py
-clients/utils/__init__.py
-clients/utils/api_server_client_util.py
-clients/utils/data_model_creation_util.py
-samples/__init__.py
-samples/api_server_client_samples.py
-samples/create_launch_echo_experiment.py
-samples/create_launch_gaussian_experiment.py
-samples/file_utils.py
-samples/group_manager_client_samples.py
-samples/iam_admin_client_samples.py
-samples/metadata_fetcher.py
-samples/sharing_registry_client_samples.py
-samples/tenant_profile_client_samples.py
-samples/user_profile_client_samples.py
-samples/resources/__init__.py
-transport/__init__.py
-transport/settings.ini
-transport/settings.py
-transport/utils.py
\ No newline at end of file
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_python_sdk.egg-info/dependency_links.txt b/airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_python_sdk.egg-info/dependency_links.txt
deleted file mode 100644
index 8b13789..0000000
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_python_sdk.egg-info/dependency_links.txt
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_python_sdk.egg-info/top_level.txt b/airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_python_sdk.egg-info/top_level.txt
deleted file mode 100644
index c01b4d5..0000000
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_python_sdk.egg-info/top_level.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-airavata
-clients
-samples
-transport
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/__init__.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/__init__.py
new file mode 100644
index 0000000..fe95886
--- /dev/null
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/__init__.py
@@ -0,0 +1,18 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/transport/__init__.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/clients/__init__.py
similarity index 100%
rename from airavata-api/airavata-client-sdks/airavata-python-sdk/transport/__init__.py
rename to airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/clients/__init__.py
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/clients/api_server_client.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/clients/api_server_client.py
similarity index 99%
rename from airavata-api/airavata-client-sdks/airavata-python-sdk/clients/api_server_client.py
rename to airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/clients/api_server_client.py
index e5ed86e..c6a1013 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/clients/api_server_client.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/clients/api_server_client.py
@@ -17,8 +17,8 @@
import logging
import configparser
-from transport.settings import APIServerClientSettings
-from transport import utils
+from airavata_sdk.transport.settings import APIServerClientSettings
+from airavata_sdk.transport import utils
from airavata.api.error.ttypes import InvalidRequestException, AiravataClientException, AiravataSystemException, \
AuthorizationException
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/clients/credential_store_client.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/clients/credential_store_client.py
similarity index 96%
rename from airavata-api/airavata-client-sdks/airavata-python-sdk/clients/credential_store_client.py
rename to airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/clients/credential_store_client.py
index 8b4c2cb..318c56e 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/clients/credential_store_client.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/clients/credential_store_client.py
@@ -17,8 +17,8 @@
import logging
import configparser
-from transport.settings import CredentialStoreAPIClientSettings
-from transport import utils
+from airavata_sdk.transport.settings import CredentialStoreAPIClientSettings
+from airavata_sdk.transport import utils
from airavata.api.credential.store.error.ttypes import CredentialStoreException
logger = logging.getLogger(__name__)
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/clients/file_handling_client.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/clients/file_handling_client.py
similarity index 100%
rename from airavata-api/airavata-client-sdks/airavata-python-sdk/clients/file_handling_client.py
rename to airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/clients/file_handling_client.py
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/clients/group_manager_client.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/clients/group_manager_client.py
similarity index 98%
rename from airavata-api/airavata-client-sdks/airavata-python-sdk/clients/group_manager_client.py
rename to airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/clients/group_manager_client.py
index 86de6e1..5405d30 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/clients/group_manager_client.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/clients/group_manager_client.py
@@ -17,8 +17,8 @@
import logging
import configparser
-from transport.settings import GroupManagerClientSettings
-from transport import utils
+from airavata_sdk.transport.settings import GroupManagerClientSettings
+from airavata_sdk.transport import utils
from airavata.api.error.ttypes import TException
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/clients/iam_admin_client.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/clients/iam_admin_client.py
similarity index 98%
rename from airavata-api/airavata-client-sdks/airavata-python-sdk/clients/iam_admin_client.py
rename to airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/clients/iam_admin_client.py
index 9c75f4c..91f7dc3 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/clients/iam_admin_client.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/clients/iam_admin_client.py
@@ -17,8 +17,8 @@
import logging
import configparser
-from transport.settings import IAMAdminClientSettings
-from transport import utils
+from airavata_sdk.transport.settings import IAMAdminClientSettings
+from airavata_sdk.transport import utils
from airavata.api.error.ttypes import TException
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/clients/keycloak_token_fetcher.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/clients/keycloak_token_fetcher.py
similarity index 97%
rename from airavata-api/airavata-client-sdks/airavata-python-sdk/clients/keycloak_token_fetcher.py
rename to airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/clients/keycloak_token_fetcher.py
index 8234b26..054b1b4 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/clients/keycloak_token_fetcher.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/clients/keycloak_token_fetcher.py
@@ -20,7 +20,7 @@ from requests_oauthlib import OAuth2Session
from oauthlib.oauth2 import LegacyApplicationClient
from airavata.model.security.ttypes import AuthzToken
-from transport.settings import KeycloakConfiguration
+from airavata_sdk.transport.settings import KeycloakConfiguration
import os
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/clients/sftp_file_handling_client.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/clients/sftp_file_handling_client.py
similarity index 100%
rename from airavata-api/airavata-client-sdks/airavata-python-sdk/clients/sftp_file_handling_client.py
rename to airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/clients/sftp_file_handling_client.py
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/clients/sharing_registry_client.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/clients/sharing_registry_client.py
similarity index 99%
rename from airavata-api/airavata-client-sdks/airavata-python-sdk/clients/sharing_registry_client.py
rename to airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/clients/sharing_registry_client.py
index 27ed805..19c7b33 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/clients/sharing_registry_client.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/clients/sharing_registry_client.py
@@ -17,8 +17,8 @@
import logging
import configparser
-from transport.settings import SharingAPIClientSettings
-from transport import utils
+from airavata_sdk.transport.settings import SharingAPIClientSettings
+from airavata_sdk.transport import utils
from airavata.api.error.ttypes import TException
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/clients/tenant_profile_client.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/clients/tenant_profile_client.py
similarity index 97%
rename from airavata-api/airavata-client-sdks/airavata-python-sdk/clients/tenant_profile_client.py
rename to airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/clients/tenant_profile_client.py
index 878f728..c48cb9d 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/clients/tenant_profile_client.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/clients/tenant_profile_client.py
@@ -17,8 +17,8 @@
import logging
import configparser
-from transport.settings import TenantProfileServerClientSettings
-from transport import utils
+from airavata_sdk.transport.settings import TenantProfileServerClientSettings
+from airavata_sdk.transport import utils
from airavata.api.error.ttypes import TException
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/clients/user_profile_client.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/clients/user_profile_client.py
similarity index 97%
rename from airavata-api/airavata-client-sdks/airavata-python-sdk/clients/user_profile_client.py
rename to airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/clients/user_profile_client.py
index 5762f22..9ab6985 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/clients/user_profile_client.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/clients/user_profile_client.py
@@ -17,8 +17,8 @@
import logging
import configparser
-from transport.settings import UserProfileClientSettings
-from transport import utils
+from airavata_sdk.transport.settings import UserProfileClientSettings
+from airavata_sdk.transport import utils
from airavata.api.error.ttypes import TException
@@ -147,4 +147,4 @@ class UserProfileClient(object):
config.read(configuration_file_location)
self.user_profile_client_settings.PROFILE_SERVICE_HOST = config.get('ProfileServer', 'PROFILE_SERVICE_HOST')
self.user_profile_client_settings.PROFILE_SERVICE_PORT = config.getint('ProfileServer', 'PROFILE_SERVICE_PORT')
- self.user_profile_client_settings.PROFILE_SERVICE_SECURE = config.getboolean('ProfileServer', 'PROFILE_SERVICE_SECURE')
\ No newline at end of file
+ self.user_profile_client_settings.PROFILE_SERVICE_SECURE = config.getboolean('ProfileServer', 'PROFILE_SERVICE_SECURE')
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/clients/utils/__init__.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/clients/utils/__init__.py
similarity index 100%
rename from airavata-api/airavata-client-sdks/airavata-python-sdk/clients/utils/__init__.py
rename to airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/clients/utils/__init__.py
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/clients/utils/api_server_client_util.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/clients/utils/api_server_client_util.py
similarity index 94%
rename from airavata-api/airavata-client-sdks/airavata-python-sdk/clients/utils/api_server_client_util.py
rename to airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/clients/utils/api_server_client_util.py
index bb6751d..86f9946 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/clients/utils/api_server_client_util.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/clients/utils/api_server_client_util.py
@@ -17,11 +17,11 @@
import logging
import time
import logging
-import samples.file_utils as fb
+import airavata_sdk.samples.file_utils as fb
-from clients.keycloak_token_fetcher import Authenticator
+from airavata_sdk.clients.keycloak_token_fetcher import Authenticator
-from clients.api_server_client import APIServerClient
+from airavata_sdk.clients.api_server_client import APIServerClient
logger = logging.getLogger(__name__)
logger.setLevel(logging.DEBUG)
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/clients/utils/data_model_creation_util.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/clients/utils/data_model_creation_util.py
similarity index 95%
rename from airavata-api/airavata-client-sdks/airavata-python-sdk/clients/utils/data_model_creation_util.py
rename to airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/clients/utils/data_model_creation_util.py
index 2af7ea7..f11c430 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/clients/utils/data_model_creation_util.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/clients/utils/data_model_creation_util.py
@@ -17,12 +17,12 @@
import logging
import time
import logging
-import samples.file_utils as fb
+import airavata_sdk.samples.file_utils as fb
-from clients.keycloak_token_fetcher import Authenticator
+from airavata_sdk.clients.keycloak_token_fetcher import Authenticator
-from clients.api_server_client import APIServerClient
-from clients.utils.api_server_client_util import APIServerClientUtil
+from airavata_sdk.clients.api_server_client import APIServerClient
+from airavata_sdk.clients.utils.api_server_client_util import APIServerClientUtil
from airavata.model.experiment.ttypes import ExperimentModel, ExperimentType, UserConfigurationDataModel
from airavata.model.scheduling.ttypes import ComputationalResourceSchedulingModel
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/samples/resources/__init__.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/samples/__init__.py
similarity index 100%
rename from airavata-api/airavata-client-sdks/airavata-python-sdk/samples/resources/__init__.py
rename to airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/samples/__init__.py
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/samples/api_server_client_samples.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/samples/api_server_client_samples.py
similarity index 98%
rename from airavata-api/airavata-client-sdks/airavata-python-sdk/samples/api_server_client_samples.py
rename to airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/samples/api_server_client_samples.py
index 345fda4..37dd59b 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/samples/api_server_client_samples.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/samples/api_server_client_samples.py
@@ -14,9 +14,9 @@
# limitations under the License.
#
import logging
-from clients.api_server_client import APIServerClient
+from airavata_sdk.clients.api_server_client import APIServerClient
-from clients.keycloak_token_fetcher import Authenticator
+from airavata_sdk.clients.keycloak_token_fetcher import Authenticator
from airavata.model.workspace.ttypes import Gateway, Notification, Project
from airavata.model.experiment.ttypes import ExperimentModel, ExperimentType, UserConfigurationDataModel
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/samples/create_launch_echo_experiment.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/samples/create_launch_echo_experiment.py
similarity index 88%
rename from airavata-api/airavata-client-sdks/airavata-python-sdk/samples/create_launch_echo_experiment.py
rename to airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/samples/create_launch_echo_experiment.py
index 965182b..ee9a9e9 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/samples/create_launch_echo_experiment.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/samples/create_launch_echo_experiment.py
@@ -1,24 +1,24 @@
import logging
import time
import json
-import samples.file_utils as fb
+import airavata_sdk.samples.file_utils as fb
-from clients.keycloak_token_fetcher import Authenticator
+from airavata_sdk.clients.keycloak_token_fetcher import Authenticator
-from clients.api_server_client import APIServerClient
+from airavata_sdk.clients.api_server_client import APIServerClient
-from clients.credential_store_client import CredentialStoreClient
+from airavata_sdk.clients.credential_store_client import CredentialStoreClient
from airavata.model.experiment.ttypes import ExperimentModel, ExperimentType, UserConfigurationDataModel
from airavata.model.scheduling.ttypes import ComputationalResourceSchedulingModel
-from clients.utils.data_model_creation_util import DataModelCreationUtil
+from airavata_sdk.clients.utils.data_model_creation_util import DataModelCreationUtil
-from clients.utils.api_server_client_util import APIServerClientUtil
+from airavata_sdk.clients.utils.api_server_client_util import APIServerClientUtil
-from clients.sftp_file_handling_client import SFTPConnector
+from airavata_sdk.clients.sftp_file_handling_client import SFTPConnector
-from transport.settings import GatewaySettings
+from airavata_sdk.transport.settings import GatewaySettings
logger = logging.getLogger(__name__)
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/samples/create_launch_gaussian_experiment.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/samples/create_launch_gaussian_experiment.py
similarity index 93%
rename from airavata-api/airavata-client-sdks/airavata-python-sdk/samples/create_launch_gaussian_experiment.py
rename to airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/samples/create_launch_gaussian_experiment.py
index d16eb2e..557416e 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/samples/create_launch_gaussian_experiment.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/samples/create_launch_gaussian_experiment.py
@@ -17,17 +17,17 @@
import logging
import time
import json
-import samples.file_utils as fb
+import airavata_sdk.samples.file_utils as fb
-from clients.keycloak_token_fetcher import Authenticator
+from airavata_sdk.clients.keycloak_token_fetcher import Authenticator
-from clients.api_server_client import APIServerClient
+from airavata_sdk.clients.api_server_client import APIServerClient
-from clients.utils.api_server_client_util import APIServerClientUtil
+from airavata_sdk.clients.utils.api_server_client_util import APIServerClientUtil
-from clients.credential_store_client import CredentialStoreClient
+from airavata_sdk.clients.credential_store_client import CredentialStoreClient
-from clients.utils.data_model_creation_util import DataModelCreationUtil
+from airavata_sdk.clients.utils.data_model_creation_util import DataModelCreationUtil
from airavata.model.workspace.ttypes import Gateway, Notification, Project
from airavata.model.experiment.ttypes import ExperimentModel, ExperimentType, UserConfigurationDataModel
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/samples/file_utils.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/samples/file_utils.py
similarity index 97%
rename from airavata-api/airavata-client-sdks/airavata-python-sdk/samples/file_utils.py
rename to airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/samples/file_utils.py
index 45ba3b2..3d03749 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/samples/file_utils.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/samples/file_utils.py
@@ -1,7 +1,7 @@
import io
import paramiko
-from clients.file_handling_client import FileHandler
+from airavata_sdk.clients.file_handling_client import FileHandler
def upload_files(api_server_client, credential_store_client, token, gateway_id, storage_id, storage_host,
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/samples/group_manager_client_samples.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/samples/group_manager_client_samples.py
similarity index 94%
rename from airavata-api/airavata-client-sdks/airavata-python-sdk/samples/group_manager_client_samples.py
rename to airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/samples/group_manager_client_samples.py
index 14e656f..18b1e1b 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/samples/group_manager_client_samples.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/samples/group_manager_client_samples.py
@@ -15,9 +15,9 @@
#
import logging
-from clients.group_manager_client import GroupManagerClient
+from airavata_sdk.clients.group_manager_client import GroupManagerClient
-from clients.keycloak_token_fetcher import Authenticator
+from airavata_sdk.clients.keycloak_token_fetcher import Authenticator
from airavata.api.error.ttypes import TException
@@ -83,4 +83,4 @@ def has_owner_access():
except TException:
logger.exception("Exception occurred")
-get_groups()
\ No newline at end of file
+get_groups()
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/samples/iam_admin_client_samples.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/samples/iam_admin_client_samples.py
similarity index 93%
rename from airavata-api/airavata-client-sdks/airavata-python-sdk/samples/iam_admin_client_samples.py
rename to airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/samples/iam_admin_client_samples.py
index 02f0932..776f7e2 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/samples/iam_admin_client_samples.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/samples/iam_admin_client_samples.py
@@ -15,9 +15,9 @@
#
import logging
-from clients.iam_admin_client import IAMAdminClient
+from airavata_sdk.clients.iam_admin_client import IAMAdminClient
-from clients.keycloak_token_fetcher import Authenticator
+from airavata_sdk.clients.keycloak_token_fetcher import Authenticator
from airavata.api.error.ttypes import TException
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/samples/metadata_fetcher.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/samples/metadata_fetcher.py
similarity index 95%
rename from airavata-api/airavata-client-sdks/airavata-python-sdk/samples/metadata_fetcher.py
rename to airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/samples/metadata_fetcher.py
index c89359c..cb2e63c 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/samples/metadata_fetcher.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/samples/metadata_fetcher.py
@@ -16,9 +16,9 @@
import logging
-from clients.keycloak_token_fetcher import Authenticator
+from airavata_sdk.clients.keycloak_token_fetcher import Authenticator
-from clients.api_server_client import APIServerClient
+from airavata_sdk.clients.api_server_client import APIServerClient
from airavata.model.workspace.ttypes import Gateway, Notification, Project
from airavata.model.experiment.ttypes import ExperimentModel, ExperimentType, UserConfigurationDataModel
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/samples/__init__.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/samples/resources/__init__.py
similarity index 100%
rename from airavata-api/airavata-client-sdks/airavata-python-sdk/samples/__init__.py
rename to airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/samples/resources/__init__.py
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/samples/resources/incommon_rsa_server_ca.pem b/airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/samples/resources/incommon_rsa_server_ca.pem
similarity index 100%
rename from airavata-api/airavata-client-sdks/airavata-python-sdk/samples/resources/incommon_rsa_server_ca.pem
rename to airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/samples/resources/incommon_rsa_server_ca.pem
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/samples/sharing_registry_client_samples.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/samples/sharing_registry_client_samples.py
similarity index 94%
rename from airavata-api/airavata-client-sdks/airavata-python-sdk/samples/sharing_registry_client_samples.py
rename to airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/samples/sharing_registry_client_samples.py
index fbbb8c1..408441d 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/samples/sharing_registry_client_samples.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/samples/sharing_registry_client_samples.py
@@ -16,9 +16,9 @@
import logging
-from clients.sharing_registry_client import SharingRegistryClient
+from airavata_sdk.clients.sharing_registry_client import SharingRegistryClient
-from clients.keycloak_token_fetcher import Authenticator
+from airavata_sdk.clients.keycloak_token_fetcher import Authenticator
from airavata.api.error.ttypes import TException
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/samples/tenant_profile_client_samples.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/samples/tenant_profile_client_samples.py
similarity index 91%
rename from airavata-api/airavata-client-sdks/airavata-python-sdk/samples/tenant_profile_client_samples.py
rename to airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/samples/tenant_profile_client_samples.py
index a6db6df..a1b5612 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/samples/tenant_profile_client_samples.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/samples/tenant_profile_client_samples.py
@@ -15,9 +15,9 @@
#
import logging
-from clients.tenant_profile_client import TenantProfileClient
+from airavata_sdk.clients.tenant_profile_client import TenantProfileClient
-from clients.keycloak_token_fetcher import Authenticator
+from airavata_sdk.clients.keycloak_token_fetcher import Authenticator
from airavata.api.error.ttypes import TException
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/samples/user_profile_client_samples.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/samples/user_profile_client_samples.py
similarity index 94%
rename from airavata-api/airavata-client-sdks/airavata-python-sdk/samples/user_profile_client_samples.py
rename to airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/samples/user_profile_client_samples.py
index d14bb58..a99cb36 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/samples/user_profile_client_samples.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/samples/user_profile_client_samples.py
@@ -15,9 +15,9 @@
#
import logging
-from clients.user_profile_client import UserProfileClient
+from airavata_sdk.clients.user_profile_client import UserProfileClient
-from clients.keycloak_token_fetcher import Authenticator
+from airavata_sdk.clients.keycloak_token_fetcher import Authenticator
from airavata.api.error.ttypes import TException
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/clients/__init__.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/transport/__init__.py
similarity index 100%
rename from airavata-api/airavata-client-sdks/airavata-python-sdk/clients/__init__.py
rename to airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/transport/__init__.py
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/transport/settings.ini b/airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/transport/settings.ini
similarity index 100%
rename from airavata-api/airavata-client-sdks/airavata-python-sdk/transport/settings.ini
rename to airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/transport/settings.ini
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/transport/settings.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/transport/settings.py
similarity index 100%
rename from airavata-api/airavata-client-sdks/airavata-python-sdk/transport/settings.py
rename to airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/transport/settings.py
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/transport/utils.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/transport/utils.py
similarity index 100%
rename from airavata-api/airavata-client-sdks/airavata-python-sdk/transport/utils.py
rename to airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/transport/utils.py
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/setup.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/setup.py
index d190881..f57883c 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/setup.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/setup.py
@@ -12,7 +12,7 @@ setup(
name='airavata-python-sdk',
version='1.0.0',
packages=find_packages(),
- package_data={'transport': ['*.ini'], 'sample': ['*.pem']},
+ package_data={'airavata_sdk.transport': ['*.ini'], 'airavata_sdk.samples.resources': ['*.pem']},
url='http://airavata.com',
license='Apache License 2.0',
author='Airavata Developers',