np-workflows 1.6.93__py3-none-any.whl → 1.6.95__py3-none-any.whl

np_workflows/experiments/dynamic_routing/widgets.py

@@ -91,24 +91,39 @@ def photodoc_widget(session: np_session.Session, reminder: str) -> None:
     vimba_dir = np_config.local_to_unc(
         session.rig.mon, np_services.config_from_zk()["ImageVimba"]["data"]
     )
-    n_files = len(tuple(vimba_dir.iterdir()))
-    t0 = time.time()
+
+    def get_file_stats():
+        return {p: p.stat().st_mtime for p in vimba_dir.iterdir() if p.is_file()}
+
+    original_file_stats = get_file_stats()
+
+    timeout_s = 300
     print(
-        f"Take an image in Vimba Viewer and save it with the default name (eg should be unique)."
-        f"\n\n*This cell will wait for a new file to be created in {vimba_dir}, then copy it to the session folder with suffix {reminder!r}*"
+        f"Take an image in Vimba Viewer and save it {vimba_dir} with any name and .png suffix."
+        f"\n\nThis cell will wait for a new file or an existing file to be modified ({timeout_s = })*"
     )
-    timeout_s = 120
-    while len(files := tuple(vimba_dir.iterdir())) == n_files:
+    t0 = time.time()
+    while True:
         time.sleep(1)
+        new_files = len(new_file_stats := get_file_stats()) != len(original_file_stats)
+        modified_files = any(
+            p
+            for p in new_file_stats
+            if new_file_stats[p] > original_file_stats.get(p, 0)
+        )
+        if new_files or modified_files:
+            break
+
         if time.time() - t0 > timeout_s:
             raise TimeoutError(
                 f"No new image file detected in Vimba folder after {timeout_s} seconds - aborting"
             )
-    latest_image = max(
-        (p for p in files if p.is_file()), key=lambda f: f.stat().st_ctime
+    latest_image = max(new_file_stats, key=lambda k: new_file_stats[k])
+    dest = (
+        session.npexp_path
+        / f"{session.npexp_path.name}_{reminder}{latest_image.suffix}"
     )
-    print(f"New file detected:\n\t{latest_image.name}\nCopying to session folder")
-    new_name = f"{session.npexp_path.name}_{reminder}.png"
-    shutil.copy2(latest_image, session.npexp_path / new_name)
-    npxc.validate_or_overwrite(session.npexp_path / new_name, latest_image)
+    print(f"New file detected:\n\t{latest_image.name}\nCopying to:\n\t{dest}")
+    shutil.copy2(latest_image, dest)
+    npxc.validate_or_overwrite(dest, latest_image)
     print("Done!")

{np_workflows-1.6.93.dist-info → np_workflows-1.6.95.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: np-workflows
-Version: 1.6.93
+Version: 1.6.95
 Summary: Ecephys and behavior workflows for the Mindscope Neuropixels team.
 Author-email: Ben Hardcastle <ben.hardcastle@alleninstitute.org>
 License: MIT

{np_workflows-1.6.93.dist-info → np_workflows-1.6.95.dist-info}/RECORD

@@ -2,7 +2,7 @@ np_workflows/__init__.py,sha256=5ZC3gO-VV7PfP13WenHePtvU2wlP68ar6j47pJVvUCM,231
 np_workflows/experiments/__init__.py,sha256=voWNXF2Kl3mmB4PwqnZ4DcD5zhvBq1j2xLUHnLe6So8,39
 np_workflows/experiments/dynamic_routing/__init__.py,sha256=M2oiBrVpy_Wrt7oC8J1wzHvKTYdA2K1UIb0-_7S6SuQ,123
 np_workflows/experiments/dynamic_routing/main.py,sha256=BHleH7NmomD_tMhVPVIpbebetABooOoVClFkggLQS10,2617
-np_workflows/experiments/dynamic_routing/widgets.py,sha256=WMoewsS-VEgJZcR8bkhiAumQEgnIcAwFKk_9qYP1jXY,3946
+np_workflows/experiments/dynamic_routing/widgets.py,sha256=a0vb27Jc6TL3KTehG2uDDUnEG3kaC28WTORdRsk1MxA,4239
 np_workflows/experiments/openscope_P3/P3_workflow_widget.py,sha256=MmGgo-ir4Xy-PDjY3YRhxy5lATAeQ3F9bsuGtF6Bu5I,2361
 np_workflows/experiments/openscope_P3/__init__.py,sha256=g1SzGmPdWB4MPzx7Zaye4YQU89BDocywCfcAs2ITC5A,133
 np_workflows/experiments/openscope_P3/main_P3_pilot.py,sha256=39vcLIEVPoB85TdPQ-QlF0sT7Ej9R7oIQHpGJ-dt1Q0,7007
@@ -41,8 +41,8 @@ np_workflows/shared/__init__.py,sha256=YErshr5fY7jU8TJgWqEHz07tUHnEJEZ_mY31DIpQ5
 np_workflows/shared/base_experiments.py,sha256=KTxsltWtvNlHmlHJkIbMj7qon-RULAlb_Q224c2dtI0,35395
 np_workflows/shared/npxc.py,sha256=R6n6xrLGr31epoDX_99D_Wy7BYgmjjiZ6efl3UOoK3Y,6642
 np_workflows/shared/widgets.py,sha256=xF4PKZugYfyHtCPyYxwYgeH5jpB8vyoGDgenEodTTzo,27799
-np_workflows-1.6.93.dist-info/METADATA,sha256=kUh_0cAZ-B49iNlBgKZBQsUxpWCmgPr6MI33GbxadTg,3399
-np_workflows-1.6.93.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-np_workflows-1.6.93.dist-info/entry_points.txt,sha256=XBvlXc6-LK4_pCjspQZF_yBbopODJIquhZ8J4LhxlaI,41
-np_workflows-1.6.93.dist-info/top_level.txt,sha256=lndEdwvoxg_3fCYd2tyIUfcdvCFegVm3lWUdEf85u8M,13
-np_workflows-1.6.93.dist-info/RECORD,,
+np_workflows-1.6.95.dist-info/METADATA,sha256=skvFVCb9OMs8h2a6IsO0nzzcUohoaxacwKM7KkvJUjM,3399
+np_workflows-1.6.95.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+np_workflows-1.6.95.dist-info/entry_points.txt,sha256=XBvlXc6-LK4_pCjspQZF_yBbopODJIquhZ8J4LhxlaI,41
+np_workflows-1.6.95.dist-info/top_level.txt,sha256=lndEdwvoxg_3fCYd2tyIUfcdvCFegVm3lWUdEf85u8M,13
+np_workflows-1.6.95.dist-info/RECORD,,