diff --git a/server/app_engine/action.py b/server/app_engine/action.py index c8a592f..b67a3d4 100644 --- a/server/app_engine/action.py +++ b/server/app_engine/action.py @@ -61,14 +61,12 @@ ACTION_NAME_INCREMENT_REMAINING_TRAINING_MINUTES = 'increment_remaining_training_minutes' ACTION_NAME_SAVE_END_OF_SEASON_ENTITIES = 'save_end_of_season_entities' ACTION_NAME_RESET_TEAM_ENTITIES = 'reset_team_entities' -ACTION_NAME_EXPUNGE_BLOB_STORAGE = 'expunge_blob_storage' def create_action_parameters(team_uuid, action_name): if (action_name == ACTION_NAME_RESET_REMAINING_TRAINING_MINUTES or action_name == ACTION_NAME_INCREMENT_REMAINING_TRAINING_MINUTES or action_name == ACTION_NAME_SAVE_END_OF_SEASON_ENTITIES or action_name == ACTION_NAME_RESET_TEAM_ENTITIES or - action_name == ACTION_NAME_EXPUNGE_BLOB_STORAGE or action_name == ACTION_NAME_TEST): is_admin_action = True else: diff --git a/server/app_engine/app_engine.py b/server/app_engine/app_engine.py index c15b40d..a69886e 100644 --- a/server/app_engine/app_engine.py +++ b/server/app_engine/app_engine.py @@ -173,29 +173,6 @@ def validate_string_not_empty(s): raise exceptions.HttpErrorBadRequest(message) -def validate_team_uuid_prefixes(s): - team_uuid_prefixes = [] - tokens = s.split(',') - valid = True - allowed = '0123456789abcdef' - for token in tokens: - if len(token) > 32: - valid = False - break - for c in token: - if c not in allowed: - valid = False - break - if not valid: - break - team_uuid_prefixes.append(token) - if valid: - return team_uuid_prefixes - message = "Error: '%s' is not a valid argument." % s - logging.critical(message) - raise exceptions.HttpErrorBadRequest(message) - - def validate_boolean(s): if s == 'false': return False @@ -1512,8 +1489,8 @@ def create_tflite(): # storage.retrieve_model_entity will raise HttpErrorNotFound # if the team_uuid/model_uuid is not found. model_entity = storage.retrieve_model_entity(team_uuid, model_uuid) - model_folder = model_entity['model_folder'] - exists, download_url = blob_storage.get_tflite_model_with_metadata_url(model_folder) + tflite_files_folder = model_entity['tflite_files_folder'] + exists, download_url = blob_storage.get_tflite_model_with_metadata_url(tflite_files_folder) if exists: blob_storage.set_cors_policy_for_get() else: @@ -1535,8 +1512,8 @@ def get_tflite_download_url(): # storage.retrieve_model_entity will raise HttpErrorNotFound # if the team_uuid/model_uuid is not found. model_entity = storage.retrieve_model_entity(team_uuid, model_uuid) - model_folder = model_entity['model_folder'] - exists, download_url = blob_storage.get_tflite_model_with_metadata_url(model_folder) + tflite_files_folder = model_entity['tflite_files_folder'] + exists, download_url = blob_storage.get_tflite_model_with_metadata_url(tflite_files_folder) if exists: blob_storage.set_cors_policy_for_get() response = { @@ -1640,33 +1617,6 @@ def resetTeamEntities(): } return flask.jsonify(__sanitize(response)) -@app.route('/expungeBlobStorage', methods=['POST']) -@handle_exceptions -@login_required -@roles_accepted(roles.Role.GLOBAL_ADMIN, roles.Role.ML_DEVELOPER) -def expunge_blob_storage(): - data = validate_keys(flask.request.form.to_dict(flat=True), - ['date_time_string', 'keep_tflite_and_labels', 'team_uuid_prefixes']) - date_time_string = data.get('date_time_string') - keep_tflite_and_labels = validate_boolean(data.get('keep_tflite_and_labels')) - team_uuid_prefixes = validate_team_uuid_prefixes(data.get('team_uuid_prefixes')) - action_uuids = [] - for team_uuid_prefix in team_uuid_prefixes: - action_parameters = action.create_action_parameters( - '', action.ACTION_NAME_EXPUNGE_BLOB_STORAGE) - action_parameters['date_time_string'] = date_time_string - action_parameters['keep_tflite_and_labels'] = keep_tflite_and_labels - action_parameters['team_uuid_prefix'] = team_uuid_prefix - action_parameters['num_blobs_deleted'] = 0 - action_parameters['num_blobs_not_deleted'] = 0 - action_uuid = action.trigger_action_via_blob(action_parameters) - action_uuids.append(action_uuid) - - response = { - 'action_uuids': action_uuids, - } - return flask.jsonify(__sanitize(response)) - # performActionGAE is for debugging purposes only. @app.route('/performActionGAE', methods=['POST']) diff --git a/server/app_engine/blob_storage.py b/server/app_engine/blob_storage.py index 6d9064f..7397cab 100644 --- a/server/app_engine/blob_storage.py +++ b/server/app_engine/blob_storage.py @@ -28,6 +28,8 @@ BUCKET_BLOBS = ('%s-blobs' % constants.PROJECT_ID) +CURRENT_SEASON = '2022_2023' + # blob storage def __retrieve_blob(blob_name): @@ -116,7 +118,7 @@ def __delete_blobs(blob_names): # video files def get_video_blob_name(team_uuid, video_uuid): - return '%s/video_files/%s' % (team_uuid, video_uuid) + return '%s/video_files/%s/%s' % (CURRENT_SEASON, team_uuid, video_uuid) def prepare_to_upload_video(team_uuid, video_uuid, content_type): video_blob_name = get_video_blob_name(team_uuid, video_uuid) @@ -142,7 +144,7 @@ def delete_video_blob(video_blob_name): # video frame images def store_video_frame_image(team_uuid, video_uuid, frame_number, content_type, image): - image_blob_name = '%s/image_files/%s/%05d' % (team_uuid, video_uuid, frame_number) + image_blob_name = '%s/image_files/%s/%s/%05d' % (CURRENT_SEASON, team_uuid, video_uuid, frame_number) __write_string_to_blob(image_blob_name, image, content_type) return image_blob_name @@ -164,7 +166,7 @@ def delete_video_frame_images(image_blob_names): # dataset records def get_dataset_folder(team_uuid, dataset_uuid): - return '%s/tf_records/%s' % (team_uuid, dataset_uuid) + return '%s/tf_records/%s/%s' % (CURRENT_SEASON, team_uuid, dataset_uuid) def get_dataset_folder_path(team_uuid, dataset_uuid): return __get_path(get_dataset_folder(team_uuid, dataset_uuid)) @@ -193,7 +195,7 @@ def delete_dataset_blobs(blob_names): # dataset zips def __get_dataset_zip_blob_name(team_uuid, dataset_zip_uuid, partition_index): - return '%s/dataset_zips/%s/%s' % (team_uuid, dataset_zip_uuid, partition_index) + return '%s/dataset_zips/%s/%s/%s' % (CURRENT_SEASON, team_uuid, dataset_zip_uuid, partition_index) def store_dataset_zip(team_uuid, dataset_zip_uuid, partition_index, zip_data): blob_name = __get_dataset_zip_blob_name(team_uuid, dataset_zip_uuid, partition_index) @@ -220,7 +222,7 @@ def get_old_model_folder(team_uuid, model_uuid): return 'models/%s/%s' % (team_uuid, model_uuid) def get_model_folder(team_uuid, model_uuid): - return '%s/models/%s' % (team_uuid, model_uuid) + return '%s/models/%s/%s' % (CURRENT_SEASON, team_uuid, model_uuid) def get_model_folder_path(model_folder): return __get_path(model_folder) @@ -296,14 +298,20 @@ def get_trained_checkpoint_path(model_folder): return __get_path(blob_name) return '' -def __get_tflite_folder(model_folder): +def get_old_tflite_folder(model_folder): return '%s/tflite' % model_folder -def get_tflite_folder_path(model_folder): - return __get_path(__get_tflite_folder(model_folder)) +def get_tflite_files_folder(team_uuid, model_uuid): + return '%s/tflite_files/%s/%s' % (CURRENT_SEASON, team_uuid, model_uuid) + +def get_tflite_files_folder_path(tflite_files_folder): + return __get_path(tflite_files_folder) + +def get_tflite_saved_model_parent_path(model_folder): + return __get_path('%s/tflite' % model_folder) def __get_tflite_saved_model_folder(model_folder): - return '%s/saved_model' % __get_tflite_folder(model_folder) + return '%s/tflite/saved_model' % model_folder def get_tflite_saved_model_path(model_folder): return __get_path(__get_tflite_saved_model_folder(model_folder)) @@ -317,7 +325,7 @@ def tflite_saved_model_exists(model_folder): return False def __get_tflite_quantized_model_blob_name(model_folder): - return '%s/quantized_model' % __get_tflite_folder(model_folder) + return '%s/tflite/quantized_model' % model_folder def tflite_quantized_model_exists(model_folder): client = util.storage_client() @@ -333,92 +341,44 @@ def write_tflite_quantized_model_to_file(model_folder, filename): blob_name = __get_tflite_quantized_model_blob_name(model_folder) return __write_blob_to_file(blob_name, filename) -def __get_tflite_label_map_txt_blob_name(model_folder): - return '%s/label_map.txt' % __get_tflite_folder(model_folder) +def __get_tflite_label_map_txt_blob_name(tflite_files_folder): + return '%s/label_map.txt' % tflite_files_folder -def tflite_label_map_txt_exists(model_folder): +def tflite_label_map_txt_exists(tflite_files_folder): client = util.storage_client() - blob_name = __get_tflite_label_map_txt_blob_name(model_folder) + blob_name = __get_tflite_label_map_txt_blob_name(tflite_files_folder) blob = util.storage_client().get_bucket(BUCKET_BLOBS).blob(blob_name) return blob.exists() -def store_tflite_label_map_txt(model_folder, tflite_label_map_txt): - blob_name = __get_tflite_label_map_txt_blob_name(model_folder) +def store_tflite_label_map_txt(tflite_files_folder, tflite_label_map_txt): + blob_name = __get_tflite_label_map_txt_blob_name(tflite_files_folder) __write_string_to_blob(blob_name, tflite_label_map_txt, 'text/plain') -def write_tflite_label_map_txt_to_file(model_folder, filename): - blob_name = __get_tflite_label_map_txt_blob_name(model_folder) +def write_tflite_label_map_txt_to_file(tflite_files_folder, filename): + blob_name = __get_tflite_label_map_txt_blob_name(tflite_files_folder) return __write_blob_to_file(blob_name, filename) -def get_tflite_model_with_metadata_blob_name(model_folder): - return '%s/model_with_metadata.tflite' % __get_tflite_folder(model_folder) +def get_tflite_model_with_metadata_blob_name(tflite_files_folder): + return '%s/model_with_metadata.tflite' % tflite_files_folder -def tflite_model_with_metadata_exists(model_folder): - blob_name = get_tflite_model_with_metadata_blob_name(model_folder) +def tflite_model_with_metadata_exists(tflite_files_folder): + blob_name = get_tflite_model_with_metadata_blob_name(tflite_files_folder) blob = util.storage_client().get_bucket(BUCKET_BLOBS).blob(blob_name) return blob.exists() -def store_tflite_model_with_metadata(model_folder, tflite_model_with_metadata_filename): - blob_name = get_tflite_model_with_metadata_blob_name(model_folder) +def store_tflite_model_with_metadata(tflite_files_folder, tflite_model_with_metadata_filename): + blob_name = get_tflite_model_with_metadata_blob_name(tflite_files_folder) __write_file_to_blob(blob_name, tflite_model_with_metadata_filename, 'application/octet-stream') -def get_tflite_model_with_metadata_url(model_folder): - return __get_download_url(get_tflite_model_with_metadata_blob_name(model_folder)) +def get_tflite_model_with_metadata_url(tflite_files_folder): + return __get_download_url(get_tflite_model_with_metadata_blob_name(tflite_files_folder)) -def delete_model_blobs(model_folder, action_parameters=None): +def delete_model_blobs(folder, action_parameters=None): client = util.storage_client() - prefix = '%s/' % model_folder + prefix = '%s/' % folder for blob in client.list_blobs(BUCKET_BLOBS, prefix=prefix): - __delete_blob(blob.name) if action_parameters is not None: action.retrigger_if_necessary(action_parameters) - -def expunge_blob_storage(action_parameters): - keep_tflite_and_labels = action_parameters['keep_tflite_and_labels'] - blob_name_prefix = action_parameters['team_uuid_prefix'] - client = util.storage_client() - if 'max_results' not in action_parameters: - action_parameters['max_results'] = 500 - max_results = action_parameters['max_results'] - while True: - action.retrigger_if_necessary(action_parameters) - logging.info('expunge_blob_storage for %s - max_results is %d' % (blob_name_prefix, max_results)) - action.retrigger_if_necessary(action_parameters) - count_blobs = 0 - count_blobs_to_ignore = 0 - blob_names_to_delete = [] - for blob in client.list_blobs(BUCKET_BLOBS, prefix=blob_name_prefix, max_results=max_results): + __delete_blob(blob.name) + if action_parameters is not None: action.retrigger_if_necessary(action_parameters) - count_blobs += 1 - # Don't delete blobs whose names begin with team_info/ - if blob.name.startswith("team_info/"): - count_blobs_to_ignore += 1 - continue - if keep_tflite_and_labels: - # Don't delete blobs whose names end in /tflite/model_with_metadata.tflite - if blob.name.endswith('/tflite/model_with_metadata.tflite'): - count_blobs_to_ignore += 1 - continue - # Don't delete blobs whose names end in /tflite/label_map.txt - if blob.name.endswith('/tflite/label_map.txt'): - count_blobs_to_ignore += 1 - continue - blob_names_to_delete.append(blob.name) - action.retrigger_if_necessary(action_parameters) - logging.info('expunge_blob_storage for %s - found %d blobs' % (blob_name_prefix, count_blobs)) - logging.info('expunge_blob_storage for %s - ignoring %d blobs' % (blob_name_prefix, count_blobs_to_ignore)) - if len(blob_names_to_delete) > 0: - # We found some blobs to delete. - logging.info('expunge_blob_storage for %s - deleting %d blobs' % (blob_name_prefix, len(blob_names_to_delete))) - __delete_blobs(blob_names_to_delete) - action_parameters['num_blobs_deleted'] += len(blob_names_to_delete) - elif count_blobs < max_results: - # We didn't find any blobs to delete and we looked at all the blobs. - action_parameters['num_blobs_not_deleted'] = count_blobs_to_ignore - break - if count_blobs_to_ignore > 0: - # Set max_results so we look at 500 more blobs than we ignore. - max_results = count_blobs_to_ignore + 500 - action_parameters['max_results'] = max_results - logging.info('expunge_blob_storage for %s - incrementing max_results to %d' % (blob_name_prefix, max_results)) - logging.info('expunge_blob_storage for %s - all done!' % blob_name_prefix) diff --git a/server/app_engine/model_trainer.py b/server/app_engine/model_trainer.py index 17f6793..a74f564 100644 --- a/server/app_engine/model_trainer.py +++ b/server/app_engine/model_trainer.py @@ -457,7 +457,6 @@ def retrieve_tags_and_steps(team_uuid, model_uuid, job_type, value_type): # storage.retrieve_model_entity will raise HttpErrorNotFound # if the team_uuid/model_uuid is not found. model_entity = storage.retrieve_model_entity(team_uuid, model_uuid) - model_folder = model_entity['model_folder'] list_of_summary_items = storage.get_model_summary_items_all_steps(model_entity, job_type, value_type) step_and_tag_pairs = [] for summary_items in list_of_summary_items: diff --git a/server/app_engine/storage.py b/server/app_engine/storage.py index 4c29ba9..71da3a1 100644 --- a/server/app_engine/storage.py +++ b/server/app_engine/storage.py @@ -1301,6 +1301,7 @@ def model_trainer_started(team_uuid, model_uuid, description, model_folder, 'model_uuid': model_uuid, 'description': description, 'model_folder': model_folder, + 'tflite_files_folder': blob_storage.get_tflite_files_folder(team_uuid, model_uuid), 'tensorflow_version': tensorflow_version, 'use_tpu': use_tpu, 'dataset_uuids': dataset_uuids, @@ -1385,10 +1386,17 @@ def __query_model_entity(team_uuid, model_uuid): query.add_filter('team_uuid', '=', team_uuid) query.add_filter('model_uuid', '=', model_uuid) model_entities = list(query.fetch(1)) + __update_model_entities(model_entities) + return model_entities + +def __update_model_entities(model_entities): + # In previous versions, the model_folder and tflite_files_folder attributes did not exist in + # the model_entity. Add the here. for model_entity in model_entities: if 'model_folder' not in model_entity: - model_entity['model_folder'] = blob_storage.get_old_model_folder(team_uuid, model_uuid) - return model_entities + model_entity['model_folder'] = blob_storage.get_old_model_folder(team_uuid, model_entity['model_uuid']) + if 'tflite_files_folder' not in model_entity: + model_entity['tflite_files_folder'] = blob_storage.get_old_tflite_folder(model_entity['model_folder']) # Retrieves the model entity associated with the given team_uuid and model_uuid. If no such @@ -1685,9 +1693,7 @@ def retrieve_model_list(team_uuid): query.add_filter('delete_in_progress', '=', False) query.order = ['create_time'] model_entities = list(query.fetch()) - for model_entity in model_entities: - if 'model_folder' not in model_entity: - model_entity['model_folder'] = blob_storage.get_old_model_folder(team_uuid, model_entity['model_uuid']) + __update_model_entities(model_entities) return model_entities def can_delete_datasets(team_uuid, dataset_uuid_requested_list): @@ -1834,6 +1840,7 @@ def finish_delete_model(action_parameters): model_entity = model_entities[0] # Delete the blobs. blob_storage.delete_model_blobs(model_entity['model_folder'], action_parameters=action_parameters) + blob_storage.delete_model_blobs(model_entity['tflite_files_folder'], action_parameters=action_parameters) # Delete the model entity. datastore_client.delete(model_entity.key) @@ -2042,7 +2049,7 @@ def __save_end_of_season_entity(season, team_entity): for model_entity in model_entities: num_models += 1 model_names.append(model_entity['description']) - tflite_blob_names.append(blob_storage.get_tflite_model_with_metadata_blob_name(model_entity['model_folder'])) + tflite_blob_names.append(blob_storage.get_tflite_model_with_metadata_blob_name(model_entity['tflite_files_folder'])) end_of_season_entity['model_names'] = model_names end_of_season_entity['tflite_blob_names'] = tflite_blob_names transaction.put(end_of_season_entity) diff --git a/server/app_engine/templates/admin.html b/server/app_engine/templates/admin.html index e91fe42..b7bbd91 100644 --- a/server/app_engine/templates/admin.html +++ b/server/app_engine/templates/admin.html @@ -117,40 +117,13 @@

Expunge storage (Firestore)



Expunge blob storage

-

Team UUID Prefixes

-
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-
-
- -
-
- -
- +
Please use the Cloud Console to delete the following Storage folders:


diff --git a/server/cf_action.py b/server/cf_action.py index 72c9420..fb31139 100644 --- a/server/cf_action.py +++ b/server/cf_action.py @@ -65,7 +65,6 @@ def __perform_action(action_parameters, time_limit): action.ACTION_NAME_INCREMENT_REMAINING_TRAINING_MINUTES: storage.increment_remaining_training_minutes, action.ACTION_NAME_SAVE_END_OF_SEASON_ENTITIES: storage.save_end_of_season_entities, action.ACTION_NAME_RESET_TEAM_ENTITIES: storage.reset_team_entities, - action.ACTION_NAME_EXPUNGE_BLOB_STORAGE: blob_storage.expunge_blob_storage, } action_fn = action_fns.get(action_parameters[action.ACTION_NAME], None) if action_fn is not None: diff --git a/server/cf_tflite_creator.py b/server/cf_tflite_creator.py index 47ce31d..0de9b99 100644 --- a/server/cf_tflite_creator.py +++ b/server/cf_tflite_creator.py @@ -42,6 +42,7 @@ def create_tflite(action_parameters): try: model_entity = storage.retrieve_model_entity(team_uuid, model_uuid) model_folder = model_entity['model_folder'] + tflite_files_folder = model_entity['tflite_files_folder'] # The following code is inspired by # https://colab.sandbox.google.com/github/tensorflow/models/blob/master/research/object_detection/colab_tutorials/convert_odt_model_to_TFLite.ipynb @@ -60,7 +61,7 @@ def create_tflite(action_parameters): logging.critical(message) raise exceptions.HttpErrorNotFound(message) trained_checkpoint_dir = trained_checkpoint_path[:trained_checkpoint_path.rindex('/')] - output_directory = blob_storage.get_tflite_folder_path(model_folder) + output_directory = blob_storage.get_tflite_saved_model_parent_path(model_folder) max_detections = 10 # This matches the default for TFObjectDetector.Parameters.maxNumDetections in the the FTC SDK. export_tflite_graph_lib_tf2.export_tflite_model(pipeline_config, trained_checkpoint_dir, output_directory, max_detections, use_regular_nms=False) @@ -77,24 +78,24 @@ def create_tflite(action_parameters): action.retrigger_if_necessary(action_parameters) - if not blob_storage.tflite_label_map_txt_exists(model_folder): + if not blob_storage.tflite_label_map_txt_exists(tflite_files_folder): # Create the label map. - blob_storage.store_tflite_label_map_txt(model_folder, + blob_storage.store_tflite_label_map_txt(tflite_files_folder, '\n'.join(model_entity['sorted_label_list'])) action.retrigger_if_necessary(action_parameters) - if not blob_storage.tflite_model_with_metadata_exists(model_folder): + if not blob_storage.tflite_model_with_metadata_exists(tflite_files_folder): # Add Metadata # Make a temporary directory - folder = '/tmp/tflite_creater/%s' % str(uuid.uuid4().hex) - os.makedirs(folder, exist_ok=True) + temp_folder = '/tmp/tflite_creater/%s' % str(uuid.uuid4().hex) + os.makedirs(temp_folder, exist_ok=True) try: - quantized_model_filename = '%s/quantized_model' % folder + quantized_model_filename = '%s/quantized_model' % temp_folder blob_storage.write_tflite_quantized_model_to_file(model_folder, quantized_model_filename) - label_map_txt_filename = '%s/label_map.txt' % folder - blob_storage.write_tflite_label_map_txt_to_file(model_folder, label_map_txt_filename) - model_with_metadata_filename = '%s/model_with_metadata.tflite' % folder + label_map_txt_filename = '%s/label_map.txt' % temp_folder + blob_storage.write_tflite_label_map_txt_to_file(tflite_files_folder, label_map_txt_filename) + model_with_metadata_filename = '%s/model_with_metadata.tflite' % temp_folder writer = object_detector.MetadataWriter.create_for_inference( writer_utils.load_file(quantized_model_filename), @@ -102,10 +103,10 @@ def create_tflite(action_parameters): label_file_paths=[label_map_txt_filename]) writer_utils.save_file(writer.populate(), model_with_metadata_filename) - blob_storage.store_tflite_model_with_metadata(model_folder, model_with_metadata_filename) + blob_storage.store_tflite_model_with_metadata(tflite_files_folder, model_with_metadata_filename) finally: # Delete the temporary directory. - shutil.rmtree(folder) + shutil.rmtree(temp_folder) except: # Check if the model has been deleted. team_entity = storage.retrieve_team_entity(team_uuid) diff --git a/server/src/js/admin.js b/server/src/js/admin.js index d101628..958880f 100644 --- a/server/src/js/admin.js +++ b/server/src/js/admin.js @@ -57,20 +57,6 @@ fmltc.Admin = function() { this.resetTeamEntitiesActionUuid = document.getElementById('resetTeamEntitiesActionUuid'); this.resetTeamEntitiesButton.onclick = this.resetTeamEntitiesButton_onclick.bind(this); - this.team_uuid_prefix_checkboxes = []; - const uuid_chars = '0123456789abcdef'; - for (var i = 0; i < uuid_chars.length; i++) { - const ch = uuid_chars.charAt(i); - const checkbox = document.getElementById('team_uuid_' + ch); - this.team_uuid_prefix_checkboxes.push(checkbox); - } - this.keepTfLiteFilesCheckbox = document.getElementById('keepTfLiteFilesCheckbox'); - this.expungeBlobStorageButton = document.getElementById('expungeBlobStorageButton'); - this.expungeBlobStorageResponse = document.getElementById('expungeBlobStorageResponse'); - this.expungeBlobStorageMonitorInfo = document.getElementById('expungeBlobStorageMonitorInfo'); - this.expungeBlobStorageActionUuids = document.getElementById('expungeBlobStorageActionUuids'); - this.expungeBlobStorageButton.onclick = this.expungeBlobStorageButton_onclick.bind(this); - this.confirmationDialog = document.getElementById('confirmationDialog'); this.confirmationTitle = document.getElementById('confirmationTitle'); this.confirmationXButton = document.getElementById('confirmationXButton'); @@ -108,12 +94,6 @@ fmltc.Admin.prototype.enableInputsAndButtons = function(enable) { this.resetTeamEntitiesButton.disabled = !enable; - for (var i = 0; i < this.team_uuid_prefix_checkboxes.length; i++) { - this.team_uuid_prefix_checkboxes[i].disabled = !enable; - } - this.keepTfLiteFilesCheckbox.disabled = !enable; - this.expungeBlobStorageButton.disabled = !enable; - this.refreshConfigButton.disables = !enable; }; @@ -215,20 +195,6 @@ fmltc.Admin.prototype.resetTeamEntitiesButton_onclick = function() { this.confirmationCallback = this.resetTeamEntities.bind(this); }; -fmltc.Admin.prototype.expungeBlobStorageButton_onclick = function() { - this.confirmationTitle.textContent = 'Expunge Blob Storage'; - let message = 'Are you sure you want to delete all blobs'; - if (this.keepTfLiteFilesCheckbox.checked) { - message += ', except TFLite files'; - } - message += '?'; - this.confirmationAreYouSure.textContent = message; - this.confirmationInput.value = ''; - this.confirmationYesButton.disabled = true; - this.confirmationDialog.style.display = 'block'; - this.confirmationCallback = this.expungeBlobStorage.bind(this); -}; - fmltc.Admin.prototype.confirmationInput_oninput = function() { this.confirmationYesButton.disabled = (this.confirmationInput.value != 'Confirm'); }; @@ -282,45 +248,6 @@ fmltc.Admin.prototype.xhr_resetTeamEntities_onreadystatechange = function(xhr, p } }; -fmltc.Admin.prototype.expungeBlobStorage = function() { - this.enableInputsAndButtons(false); - - let team_uuid_prefixes = []; - for (var i = 0; i < this.team_uuid_prefix_checkboxes.length; i++) { - if (this.team_uuid_prefix_checkboxes[i].checked) { - const id = this.team_uuid_prefix_checkboxes[i].id; - if (id.startsWith('team_uuid_')) { - const char = id.substring(10); // length of 'team_uuid_' is 10. - team_uuid_prefixes.push(char); - } - } - } - - const xhr = new XMLHttpRequest(); - const params = 'keep_tflite_and_labels=' + this.keepTfLiteFilesCheckbox.checked + - '&team_uuid_prefixes=' + encodeURIComponent(team_uuid_prefixes.join(',')) + - '&date_time_string=' + encodeURIComponent(new Date().toLocaleString()); - xhr.open('POST', '/expungeBlobStorage', true); - xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded'); - xhr.onreadystatechange = this.xhr_expungeBlobStorage_onreadystatechange.bind(this, xhr, params); - xhr.send(params); -}; - -fmltc.Admin.prototype.xhr_expungeBlobStorage_onreadystatechange = function(xhr, params) { - if (xhr.readyState === 4) { - xhr.onreadystatechange = null; - - if (xhr.status === 200) { - const response = JSON.parse(xhr.responseText); - this.expungeBlobStorageActionUuids.textContent = response.action_uuids.join(', '); - this.expungeBlobStorageMonitorInfo.style.display = 'block'; - - } else { - this.expungeBlobStorageResponse.textContent = 'Failure - status: ' + xhr.status + ', statusText: ' + xhr.status; - } - } -}; - fmltc.Admin.prototype.refreshConfigButton_onclick = function() { const xhr = new XMLHttpRequest(); xhr.open('POST', '/refreshConfig', true);