Merge pull request #304 from Subaru-PFS/dev-main

refresh upload_id at each submission

src/pfs_target_uploader/__init__.py

@@ -1 +1 @@
-__version__ = "3.2.0"
+__version__ = "3.2.1"

src/pfs_target_uploader/pn_app.py

@@ -583,6 +583,7 @@ def cb_submit(event):
                 ],
                 disabled=True,
             )
+        panel_input.assign_secret_token()
         panel_timer.timer(False)
 
     # set callback to the buttons

src/pfs_target_uploader/widgets/FileInputWidgets.py

@@ -61,6 +61,11 @@ def reset(self):
         self.file_input.mime_type = None
         self.file_input.value = None
 
+    def assign_secret_token(self, nbytes=8):
+        st = secrets.token_hex(nbytes)
+        self.secret_token = st
+        logger.info(f"Assigning a new secret token as an upload_id: {st}")
+
     def validate(self, date_begin=None, date_end=None, warn_threshold=100000):
         t_start = time.time()
         if date_begin >= date_end:
@@ -75,15 +80,14 @@ def validate(self, date_begin=None, date_end=None, warn_threshold=100000):
             or (self.file_input.value != self.previous_value)
             or (self.file_input.mime_type != self.previous_mime_type)
         ):
-            st = secrets.token_hex(8)
+
+            self.assign_secret_token()
 
             logger.info("New file detected.")
-            logger.info(f"    Upload ID updated: {st}")
+            logger.info(f"    Upload ID updated: {self.secret_token}")
             logger.info(f"    Filename: {self.file_input.filename}")
             logger.info(f"    MIME Type: {self.file_input.mime_type}")
 
-            self.secret_token = st
-
             self.previous_filename = self.file_input.filename
             self.previous_value = self.file_input.value
             self.previous_mime_type = self.file_input.mime_type