This is an automated email from the ASF dual-hosted git repository. lahirujayathilake pushed a commit to branch storage-update in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 6457e75d7af82dad37c1c0fd8362047e28caba45 Author: lahiruj <[email protected]> AuthorDate: Thu Oct 30 17:55:07 2025 -0400 generated python thrift stubs to align with the latest input/output storage resource types addition --- .../airavata/model/experiment/ttypes.py | 62 ++++++++--------- .../airavata/model/process/ttypes.py | 80 +++++++++++----------- 2 files changed, 71 insertions(+), 71 deletions(-) diff --git a/dev-tools/airavata-python-sdk/airavata/model/experiment/ttypes.py b/dev-tools/airavata-python-sdk/airavata/model/experiment/ttypes.py index b40f86e6d6..abbcfe59b7 100644 --- a/dev-tools/airavata-python-sdk/airavata/model/experiment/ttypes.py +++ b/dev-tools/airavata-python-sdk/airavata/model/experiment/ttypes.py @@ -65,18 +65,18 @@ class UserConfigurationDataModel(object): - throttleResources - userDN - generateCert - - storageId + - inputStorageResourceId + - outputStorageResourceId - experimentDataDir - useUserCRPref - groupResourceProfileId - autoScheduledCompResourceSchedulingList - - outputStorageResourceId """ thrift_spec: typing.Any = None - def __init__(self, airavataAutoSchedule: bool = False, overrideManualScheduledParams: bool = False, shareExperimentPublicly: typing.Optional[bool] = False, computationalResourceScheduling: typing.Optional[airavata.model.scheduling.ttypes.ComputationalResourceSchedulingModel] = None, throttleResources: typing.Optional[bool] = False, userDN: typing.Optional[str] = None, generateCert: typing.Optional[bool] = False, storageId: typing.Optional[str] = None, experimentDataDir: typing.Option [...] + def __init__(self, airavataAutoSchedule: bool = False, overrideManualScheduledParams: bool = False, shareExperimentPublicly: typing.Optional[bool] = False, computationalResourceScheduling: typing.Optional[airavata.model.scheduling.ttypes.ComputationalResourceSchedulingModel] = None, throttleResources: typing.Optional[bool] = False, userDN: typing.Optional[str] = None, generateCert: typing.Optional[bool] = False, inputStorageResourceId: typing.Optional[str] = None, outputStorageResour [...] self.airavataAutoSchedule: bool = airavataAutoSchedule self.overrideManualScheduledParams: bool = overrideManualScheduledParams self.shareExperimentPublicly: typing.Optional[bool] = shareExperimentPublicly @@ -84,12 +84,12 @@ class UserConfigurationDataModel(object): self.throttleResources: typing.Optional[bool] = throttleResources self.userDN: typing.Optional[str] = userDN self.generateCert: typing.Optional[bool] = generateCert - self.storageId: typing.Optional[str] = storageId + self.inputStorageResourceId: typing.Optional[str] = inputStorageResourceId + self.outputStorageResourceId: typing.Optional[str] = outputStorageResourceId self.experimentDataDir: typing.Optional[str] = experimentDataDir self.useUserCRPref: typing.Optional[bool] = useUserCRPref self.groupResourceProfileId: typing.Optional[str] = groupResourceProfileId self.autoScheduledCompResourceSchedulingList: typing.Optional[list[airavata.model.scheduling.ttypes.ComputationalResourceSchedulingModel]] = autoScheduledCompResourceSchedulingList - self.outputStorageResourceId: typing.Optional[str] = outputStorageResourceId def read(self, iprot): if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None: @@ -138,25 +138,30 @@ class UserConfigurationDataModel(object): iprot.skip(ftype) elif fid == 8: if ftype == TType.STRING: - self.storageId = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() + self.inputStorageResourceId = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 9: if ftype == TType.STRING: - self.experimentDataDir = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() + self.outputStorageResourceId = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 10: + if ftype == TType.STRING: + self.experimentDataDir = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() + else: + iprot.skip(ftype) + elif fid == 11: if ftype == TType.BOOL: self.useUserCRPref = iprot.readBool() else: iprot.skip(ftype) - elif fid == 11: + elif fid == 12: if ftype == TType.STRING: self.groupResourceProfileId = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) - elif fid == 12: + elif fid == 13: if ftype == TType.LIST: self.autoScheduledCompResourceSchedulingList = [] (_etype3, _size0) = iprot.readListBegin() @@ -167,11 +172,6 @@ class UserConfigurationDataModel(object): iprot.readListEnd() else: iprot.skip(ftype) - elif fid == 13: - if ftype == TType.STRING: - self.outputStorageResourceId = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() - else: - iprot.skip(ftype) else: iprot.skip(ftype) iprot.readFieldEnd() @@ -211,33 +211,33 @@ class UserConfigurationDataModel(object): oprot.writeFieldBegin('generateCert', TType.BOOL, 7) oprot.writeBool(self.generateCert) oprot.writeFieldEnd() - if self.storageId is not None: - oprot.writeFieldBegin('storageId', TType.STRING, 8) - oprot.writeString(self.storageId.encode('utf-8') if sys.version_info[0] == 2 else self.storageId) + if self.inputStorageResourceId is not None: + oprot.writeFieldBegin('inputStorageResourceId', TType.STRING, 8) + oprot.writeString(self.inputStorageResourceId.encode('utf-8') if sys.version_info[0] == 2 else self.inputStorageResourceId) + oprot.writeFieldEnd() + if self.outputStorageResourceId is not None: + oprot.writeFieldBegin('outputStorageResourceId', TType.STRING, 9) + oprot.writeString(self.outputStorageResourceId.encode('utf-8') if sys.version_info[0] == 2 else self.outputStorageResourceId) oprot.writeFieldEnd() if self.experimentDataDir is not None: - oprot.writeFieldBegin('experimentDataDir', TType.STRING, 9) + oprot.writeFieldBegin('experimentDataDir', TType.STRING, 10) oprot.writeString(self.experimentDataDir.encode('utf-8') if sys.version_info[0] == 2 else self.experimentDataDir) oprot.writeFieldEnd() if self.useUserCRPref is not None: - oprot.writeFieldBegin('useUserCRPref', TType.BOOL, 10) + oprot.writeFieldBegin('useUserCRPref', TType.BOOL, 11) oprot.writeBool(self.useUserCRPref) oprot.writeFieldEnd() if self.groupResourceProfileId is not None: - oprot.writeFieldBegin('groupResourceProfileId', TType.STRING, 11) + oprot.writeFieldBegin('groupResourceProfileId', TType.STRING, 12) oprot.writeString(self.groupResourceProfileId.encode('utf-8') if sys.version_info[0] == 2 else self.groupResourceProfileId) oprot.writeFieldEnd() if self.autoScheduledCompResourceSchedulingList is not None: - oprot.writeFieldBegin('autoScheduledCompResourceSchedulingList', TType.LIST, 12) + oprot.writeFieldBegin('autoScheduledCompResourceSchedulingList', TType.LIST, 13) oprot.writeListBegin(TType.STRUCT, len(self.autoScheduledCompResourceSchedulingList)) for iter6 in self.autoScheduledCompResourceSchedulingList: iter6.write(oprot) oprot.writeListEnd() oprot.writeFieldEnd() - if self.outputStorageResourceId is not None: - oprot.writeFieldBegin('outputStorageResourceId', TType.STRING, 13) - oprot.writeString(self.outputStorageResourceId.encode('utf-8') if sys.version_info[0] == 2 else self.outputStorageResourceId) - oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() @@ -1050,12 +1050,12 @@ UserConfigurationDataModel.thrift_spec = ( (5, TType.BOOL, 'throttleResources', None, False, ), # 5 (6, TType.STRING, 'userDN', 'UTF8', None, ), # 6 (7, TType.BOOL, 'generateCert', None, False, ), # 7 - (8, TType.STRING, 'storageId', 'UTF8', None, ), # 8 - (9, TType.STRING, 'experimentDataDir', 'UTF8', None, ), # 9 - (10, TType.BOOL, 'useUserCRPref', None, None, ), # 10 - (11, TType.STRING, 'groupResourceProfileId', 'UTF8', None, ), # 11 - (12, TType.LIST, 'autoScheduledCompResourceSchedulingList', (TType.STRUCT, [airavata.model.scheduling.ttypes.ComputationalResourceSchedulingModel, None], False), None, ), # 12 - (13, TType.STRING, 'outputStorageResourceId', 'UTF8', None, ), # 13 + (8, TType.STRING, 'inputStorageResourceId', 'UTF8', None, ), # 8 + (9, TType.STRING, 'outputStorageResourceId', 'UTF8', None, ), # 9 + (10, TType.STRING, 'experimentDataDir', 'UTF8', None, ), # 10 + (11, TType.BOOL, 'useUserCRPref', None, None, ), # 11 + (12, TType.STRING, 'groupResourceProfileId', 'UTF8', None, ), # 12 + (13, TType.LIST, 'autoScheduledCompResourceSchedulingList', (TType.STRUCT, [airavata.model.scheduling.ttypes.ComputationalResourceSchedulingModel, None], False), None, ), # 13 ) all_structs.append(ExperimentModel) ExperimentModel.thrift_spec = ( diff --git a/dev-tools/airavata-python-sdk/airavata/model/process/ttypes.py b/dev-tools/airavata-python-sdk/airavata/model/process/ttypes.py index 0f2456df6b..4b82d5abdd 100644 --- a/dev-tools/airavata-python-sdk/airavata/model/process/ttypes.py +++ b/dev-tools/airavata-python-sdk/airavata/model/process/ttypes.py @@ -150,7 +150,8 @@ class ProcessModel(object): - gatewayExecutionId - enableEmailNotification - emailAddresses - - storageResourceId + - inputStorageResourceId + - outputStorageResourceId - userDn - generateCert - experimentDataDir @@ -158,13 +159,12 @@ class ProcessModel(object): - useUserCRPref - groupResourceProfileId - processWorkflows - - outputStorageResourceId """ thrift_spec: typing.Any = None - def __init__(self, processId: str = "DO_NOT_SET_AT_CLIENTS", experimentId: str = None, creationTime: typing.Optional[int] = None, lastUpdateTime: typing.Optional[int] = None, processStatuses: typing.Optional[list[airavata.model.status.ttypes.ProcessStatus]] = None, processDetail: typing.Optional[str] = None, applicationInterfaceId: typing.Optional[str] = None, applicationDeploymentId: typing.Optional[str] = None, computeResourceId: typing.Optional[str] = None, processInputs: typing.O [...] + def __init__(self, processId: str = "DO_NOT_SET_AT_CLIENTS", experimentId: str = None, creationTime: typing.Optional[int] = None, lastUpdateTime: typing.Optional[int] = None, processStatuses: typing.Optional[list[airavata.model.status.ttypes.ProcessStatus]] = None, processDetail: typing.Optional[str] = None, applicationInterfaceId: typing.Optional[str] = None, applicationDeploymentId: typing.Optional[str] = None, computeResourceId: typing.Optional[str] = None, processInputs: typing.O [...] self.processId: str = processId self.experimentId: str = experimentId self.creationTime: typing.Optional[int] = creationTime @@ -183,7 +183,8 @@ class ProcessModel(object): self.gatewayExecutionId: typing.Optional[str] = gatewayExecutionId self.enableEmailNotification: typing.Optional[bool] = enableEmailNotification self.emailAddresses: typing.Optional[list[str]] = emailAddresses - self.storageResourceId: typing.Optional[str] = storageResourceId + self.inputStorageResourceId: typing.Optional[str] = inputStorageResourceId + self.outputStorageResourceId: typing.Optional[str] = outputStorageResourceId self.userDn: typing.Optional[str] = userDn self.generateCert: typing.Optional[bool] = generateCert self.experimentDataDir: typing.Optional[str] = experimentDataDir @@ -191,7 +192,6 @@ class ProcessModel(object): self.useUserCRPref: typing.Optional[bool] = useUserCRPref self.groupResourceProfileId: typing.Optional[str] = groupResourceProfileId self.processWorkflows: typing.Optional[list[ProcessWorkflow]] = processWorkflows - self.outputStorageResourceId: typing.Optional[str] = outputStorageResourceId def read(self, iprot): if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None: @@ -330,40 +330,45 @@ class ProcessModel(object): iprot.skip(ftype) elif fid == 19: if ftype == TType.STRING: - self.storageResourceId = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() + self.inputStorageResourceId = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 20: if ftype == TType.STRING: - self.userDn = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() + self.outputStorageResourceId = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 21: + if ftype == TType.STRING: + self.userDn = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() + else: + iprot.skip(ftype) + elif fid == 22: if ftype == TType.BOOL: self.generateCert = iprot.readBool() else: iprot.skip(ftype) - elif fid == 22: + elif fid == 23: if ftype == TType.STRING: self.experimentDataDir = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) - elif fid == 23: + elif fid == 24: if ftype == TType.STRING: self.userName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) - elif fid == 24: + elif fid == 25: if ftype == TType.BOOL: self.useUserCRPref = iprot.readBool() else: iprot.skip(ftype) - elif fid == 25: + elif fid == 26: if ftype == TType.STRING: self.groupResourceProfileId = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) - elif fid == 26: + elif fid == 27: if ftype == TType.LIST: self.processWorkflows = [] (_etype39, _size36) = iprot.readListBegin() @@ -374,11 +379,6 @@ class ProcessModel(object): iprot.readListEnd() else: iprot.skip(ftype) - elif fid == 27: - if ftype == TType.STRING: - self.outputStorageResourceId = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() - else: - iprot.skip(ftype) else: iprot.skip(ftype) iprot.readFieldEnd() @@ -480,45 +480,45 @@ class ProcessModel(object): oprot.writeString(iter47.encode('utf-8') if sys.version_info[0] == 2 else iter47) oprot.writeListEnd() oprot.writeFieldEnd() - if self.storageResourceId is not None: - oprot.writeFieldBegin('storageResourceId', TType.STRING, 19) - oprot.writeString(self.storageResourceId.encode('utf-8') if sys.version_info[0] == 2 else self.storageResourceId) + if self.inputStorageResourceId is not None: + oprot.writeFieldBegin('inputStorageResourceId', TType.STRING, 19) + oprot.writeString(self.inputStorageResourceId.encode('utf-8') if sys.version_info[0] == 2 else self.inputStorageResourceId) + oprot.writeFieldEnd() + if self.outputStorageResourceId is not None: + oprot.writeFieldBegin('outputStorageResourceId', TType.STRING, 20) + oprot.writeString(self.outputStorageResourceId.encode('utf-8') if sys.version_info[0] == 2 else self.outputStorageResourceId) oprot.writeFieldEnd() if self.userDn is not None: - oprot.writeFieldBegin('userDn', TType.STRING, 20) + oprot.writeFieldBegin('userDn', TType.STRING, 21) oprot.writeString(self.userDn.encode('utf-8') if sys.version_info[0] == 2 else self.userDn) oprot.writeFieldEnd() if self.generateCert is not None: - oprot.writeFieldBegin('generateCert', TType.BOOL, 21) + oprot.writeFieldBegin('generateCert', TType.BOOL, 22) oprot.writeBool(self.generateCert) oprot.writeFieldEnd() if self.experimentDataDir is not None: - oprot.writeFieldBegin('experimentDataDir', TType.STRING, 22) + oprot.writeFieldBegin('experimentDataDir', TType.STRING, 23) oprot.writeString(self.experimentDataDir.encode('utf-8') if sys.version_info[0] == 2 else self.experimentDataDir) oprot.writeFieldEnd() if self.userName is not None: - oprot.writeFieldBegin('userName', TType.STRING, 23) + oprot.writeFieldBegin('userName', TType.STRING, 24) oprot.writeString(self.userName.encode('utf-8') if sys.version_info[0] == 2 else self.userName) oprot.writeFieldEnd() if self.useUserCRPref is not None: - oprot.writeFieldBegin('useUserCRPref', TType.BOOL, 24) + oprot.writeFieldBegin('useUserCRPref', TType.BOOL, 25) oprot.writeBool(self.useUserCRPref) oprot.writeFieldEnd() if self.groupResourceProfileId is not None: - oprot.writeFieldBegin('groupResourceProfileId', TType.STRING, 25) + oprot.writeFieldBegin('groupResourceProfileId', TType.STRING, 26) oprot.writeString(self.groupResourceProfileId.encode('utf-8') if sys.version_info[0] == 2 else self.groupResourceProfileId) oprot.writeFieldEnd() if self.processWorkflows is not None: - oprot.writeFieldBegin('processWorkflows', TType.LIST, 26) + oprot.writeFieldBegin('processWorkflows', TType.LIST, 27) oprot.writeListBegin(TType.STRUCT, len(self.processWorkflows)) for iter48 in self.processWorkflows: iter48.write(oprot) oprot.writeListEnd() oprot.writeFieldEnd() - if self.outputStorageResourceId is not None: - oprot.writeFieldBegin('outputStorageResourceId', TType.STRING, 27) - oprot.writeString(self.outputStorageResourceId.encode('utf-8') if sys.version_info[0] == 2 else self.outputStorageResourceId) - oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() @@ -568,15 +568,15 @@ ProcessModel.thrift_spec = ( (16, TType.STRING, 'gatewayExecutionId', 'UTF8', None, ), # 16 (17, TType.BOOL, 'enableEmailNotification', None, None, ), # 17 (18, TType.LIST, 'emailAddresses', (TType.STRING, 'UTF8', False), None, ), # 18 - (19, TType.STRING, 'storageResourceId', 'UTF8', None, ), # 19 - (20, TType.STRING, 'userDn', 'UTF8', None, ), # 20 - (21, TType.BOOL, 'generateCert', None, False, ), # 21 - (22, TType.STRING, 'experimentDataDir', 'UTF8', None, ), # 22 - (23, TType.STRING, 'userName', 'UTF8', None, ), # 23 - (24, TType.BOOL, 'useUserCRPref', None, None, ), # 24 - (25, TType.STRING, 'groupResourceProfileId', 'UTF8', None, ), # 25 - (26, TType.LIST, 'processWorkflows', (TType.STRUCT, [ProcessWorkflow, None], False), None, ), # 26 - (27, TType.STRING, 'outputStorageResourceId', 'UTF8', None, ), # 27 + (19, TType.STRING, 'inputStorageResourceId', 'UTF8', None, ), # 19 + (20, TType.STRING, 'outputStorageResourceId', 'UTF8', None, ), # 20 + (21, TType.STRING, 'userDn', 'UTF8', None, ), # 21 + (22, TType.BOOL, 'generateCert', None, False, ), # 22 + (23, TType.STRING, 'experimentDataDir', 'UTF8', None, ), # 23 + (24, TType.STRING, 'userName', 'UTF8', None, ), # 24 + (25, TType.BOOL, 'useUserCRPref', None, None, ), # 25 + (26, TType.STRING, 'groupResourceProfileId', 'UTF8', None, ), # 26 + (27, TType.LIST, 'processWorkflows', (TType.STRUCT, [ProcessWorkflow, None], False), None, ), # 27 ) fix_spec(all_structs) del all_structs
