reprocess

2 files changed, 6 insertions, 4 deletions

diff --git a/cli/app/commands/biggan/extract_dense_vectors.py b/cli/app/commands/biggan/extract_dense_vectors.py
index 5320496..7fef459 100644
--- a/cli/app/commands/biggan/extract_dense_vectors.py
+++ b/cli/app/commands/biggan/extract_dense_vectors.py
@@ -15,6 +15,8 @@ from app.search.json import params_dense_dict
   help='Number of optimization iterations')
 @click.option('-v', '--video', 'opt_video', is_flag=True,
   help='Export a video for each dataset')
+@click.option('-rp', '--reprocess', 'opt_reprocess', is_flag=True,
+  help='Reprocess images')
 @click.option('-sc', '--stochastic_clipping', 'opt_stochastic_clipping', default=0,
   help='Compute feature loss')
 @click.option('-lc', '--label_clipping', 'opt_label_clipping', default=0,
@@ -28,7 +30,7 @@ from app.search.json import params_dense_dict
 @click.option('-clip', '--clip_interval', 'opt_clip_interval', default=500,
   help='Interval to clip vectors')
 @click.pass_context
-def cli(ctx, opt_folder_id, opt_latent_steps, opt_dense_steps, opt_video,
+def cli(ctx, opt_folder_id, opt_latent_steps, opt_dense_steps, opt_video, opt_reprocess,
   opt_stochastic_clipping, opt_label_clipping, opt_use_feature_detector, opt_feature_layers, opt_snapshot_interval, opt_clip_interval):
   """
   The full process:
@@ -39,7 +41,7 @@ def cli(ctx, opt_folder_id, opt_latent_steps, opt_dense_steps, opt_video,
   """
   folder = cortex_folder(opt_folder_id)
   files = download_cortex_files(opt_folder_id)
-  unprocessed_files = find_unprocessed_files(files)
+  unprocessed_files = find_unprocessed_files(files, reprocess=opt_reprocess)
   if len(unprocessed_files) == 0:
     print("All files processed, nothing to do")
     return
diff --git a/cli/app/utils/cortex_utils.py b/cli/app/utils/cortex_utils.py
index 01b4bc9..5e1e659 100644
--- a/cli/app/utils/cortex_utils.py
+++ b/cli/app/utils/cortex_utils.py
@@ -27,7 +27,7 @@ def download_cortex_files(opt_folder_id):
         fetch_file(row['url'], fp_out_image)
   return rows
 
-def find_unprocessed_files(files):
+def find_unprocessed_files(files, reprocess=False):
   """Find files that haven't been processed yet.
   This is implied if no matching generated file is found.
   """
@@ -42,7 +42,7 @@ def find_unprocessed_files(files):
     if file['generated'] == 0 and file['processed'] == 0 and file['datatype'] == 'image':
       fn, ext = os.path.splitext(file['name'])
       dataset = fn.split('-')[0]
-      if dataset not in datasets:
+      if dataset not in datasets or reprocess == True:
         unprocessed_files.append(file)
   return unprocessed_files