Skip to content

Commit c00ac6a

Browse files
committed
some storage function missed flag - all updated
1 parent 8661dca commit c00ac6a

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

python/fedml/api/modules/storage.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,8 @@ def download(data_name, api_key, service, dest_path, show_progress=True, encrypt
132132
return FedMLResponse(code=ResponseCode.FAILURE, message=error_message)
133133

134134

135-
def get_user_metadata(data_name, api_key=None) -> FedMLResponse:
136-
api_key = authenticate(api_key)
135+
def get_user_metadata(data_name, api_key=None, encrypted_api_key_flag=False) -> FedMLResponse:
136+
api_key = authenticate(api_key, encrypted_api_key_flag=encrypted_api_key_flag)
137137
user_id, message = _get_user_id_from_api_key(api_key)
138138

139139
if user_id is None:
@@ -195,8 +195,8 @@ def list_objects(api_key=None, encrypted_api_key_flag=False) -> FedMLResponse:
195195

196196

197197
# Todo(alaydshah): Query service from object metadata. Make the transaction atomic or rollback if partially failed
198-
def delete(data_name, service, api_key=None) -> FedMLResponse:
199-
api_key = authenticate(api_key)
198+
def delete(data_name, service, api_key=None, encrypted_api_key_flag=False) -> FedMLResponse:
199+
api_key = authenticate(api_key, encrypted_api_key_flag=encrypted_api_key_flag)
200200
user_id, message = _get_user_id_from_api_key(api_key)
201201

202202
if user_id is None:
@@ -209,7 +209,8 @@ def delete(data_name, service, api_key=None) -> FedMLResponse:
209209
if result:
210210
logging.info(f"Successfully deleted object from storage service.")
211211
try:
212-
response = _delete_dataset(api_key=api_key, data_name=data_name)
212+
response = _delete_dataset(api_key=api_key, data_name=data_name,
213+
encrypted_api_key_flag=encrypted_api_key_flag)
213214
code, message, data = _get_data_from_response(message="Failed to delete data", response=response)
214215
except Exception as e:
215216
message = (f"Deleted object from storage service but failed to delete object metadata from Nexus Backend "
@@ -622,11 +623,12 @@ def _get_dataset_metadata(api_key: str, data_name: str, encrypted_api_key_flag=F
622623
return response
623624

624625

625-
def _delete_dataset(api_key: str, data_name: str) -> requests.Response:
626+
def _delete_dataset(api_key: str, data_name: str, encrypted_api_key_flag=False) -> requests.Response:
626627
dataset_url = ServerConstants.get_dataset_url()
627628
cert_path = MLOpsConfigs.get_cert_path_with_version()
628629
headers = ServerConstants.API_HEADERS
629630
headers["Authorization"] = f"Bearer {api_key}"
631+
headers["Encrypted"] = str(encrypted_api_key_flag)
630632
if cert_path is not None:
631633
try:
632634
requests.session().verify = cert_path

0 commit comments

Comments
 (0)