np-services 0.1.59__tar.gz → 0.1.61__tar.gz

{np_services-0.1.59 → np_services-0.1.61}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: np-services
-Version: 0.1.59
+Version: 0.1.61
 Summary: Tools for interfacing with devices and services used in Mindscope Neuropixels experiments at the Allen Institute.
 Author-Email: bjhardcastle <ben.hardcastle@alleninstitute.org>
 Classifier: Programming Language :: Python :: 3

{np_services-0.1.59 → np_services-0.1.61}/pyproject.toml

@@ -18,7 +18,7 @@ dependencies = [
     "npc-mvr>=0.1.2",
 ]
 name = "np-services"
-version = "0.1.59"
+version = "0.1.61"
 description = "Tools for interfacing with devices and services used in Mindscope Neuropixels experiments at the Allen Institute."
 readme = "README.md"
 classifiers = [

{np_services-0.1.59 → np_services-0.1.61}/src/np_services/scripts/pretest.py

@@ -3,6 +3,7 @@ import contextlib
 import functools
 import os
 import pathlib
+import sys
 import tempfile
 import time
 import logging
@@ -11,9 +12,6 @@ from typing import Iterable, Literal
 import upath
 
 
-os.environ["USE_TEST_RIG"] = "0"
-os.environ["AIBS_RIG_ID"] = "NP.3"
-
 import np_session
 import np_services
 import np_config
@@ -262,7 +260,7 @@ def configure_services(services: Iterable[np_services.Testable]) -> None:
 def get_temp_dir() -> pathlib.Path:
     return pathlib.Path(tempfile.mkdtemp())
 
-def main(
+def run_pretest(
     recorders: Iterable[np_services.Testable] = DEFAULT_RECORDERS,
     stim: np_services.Startable = DEFAULT_STIM,
     other: Iterable[np_services.Testable] = DEFAULT_SERVICES,
@@ -310,7 +308,16 @@ def parse_args() -> dict:
     parser.add_argument("--check_audio", action="store_true", help="Check audio-running line on sync", default=False)
     return vars(parser.parse_args())
 
-if __name__ == '__main__':
-    main(
+def main() -> None:
+    logging.basicConfig(
+        level="INFO",
+        format="%(name)s | %(levelname)s | %(message)s",
+        datefmt="%H:%M:%S",
+        stream=sys.stdout,
+    )
+    run_pretest(
         **parse_args()
-    )
+    )
+
+if __name__ == '__main__':
+    main()

np_services-0.1.59/tests/test_proxies.py

@@ -1,91 +0,0 @@
-import os
-import pathlib
-import tempfile
-import time
-
-os.environ["USE_TEST_RIG"] = "1"
-os.environ["AIBS_RIG_ID"] = "NP.1"
-
-import np_logging
-
-from np_services import *
-
-logger = np_logging.getLogger()
-
-with np_logging.debug():
-    
-    
-    if False:
-        
-        Cam3d.label = 'pretest'
-        Cam3d.pretest()
-        
-    if False:
-        MouseDirector.user = 'ben.hardcastle'
-        MouseDirector.mouse = 366122
-        MouseDirector.pretest()
-
-    if True:
-        NewScaleCoordinateRecorder.log_root = pathlib.Path(tempfile.mkdtemp())
-        NewScaleCoordinateRecorder.pretest()
-
-    if False:
-        with stop_on_error(ImageMVR, reraise=False):
-            ImageMVR.pretest()
-
-    if False:
-        with stop_on_error(VideoMVR, reraise=False):
-            VideoMVR.pretest()
-
-    if False:
-        OpenEphys.folder = "test"
-        with stop_on_error(OpenEphys, reraise=False):
-            OpenEphys.pretest()
-
-    if False:
-        with stop_on_error(Sync, reraise=False):
-            Sync.pretest()
-
-    if False:
-        # NoCamstim.password  # careful not to commit this to github!
-        NoCamstim.data_root = pathlib.Path("C:/ProgramData/camstim/output")
-        NoCamstim.remote_file = pathlib.Path(
-            "C:/Users/svc_neuropix/Desktop/run_blue_opto.bat"
-        )
-        NoCamstim.initialize()  # will prompt for password if not entered
-        NoCamstim.start()
-
-    if False:
-        ScriptCamstim.data_root = pathlib.Path("C:/ProgramData/camstim/output")
-        ScriptCamstim.script = (
-            "C:/Users/svc_neuropix/Desktop/optotagging/optotagging_sro.py"
-        )
-        ScriptCamstim.params = (
-            "C:/Users/svc_neuropix/Desktop/optotagging/experiment_params_blue.json"
-        )
-        ScriptCamstim.initialize()
-        ScriptCamstim.start()
-
-    if False:
-        SessionCamstim.initialize()
-        SessionCamstim.lims_user_id = "ben.hardcastle"
-        SessionCamstim.labtracks_mouse_id = 598796
-        SessionCamstim.start()
-
-    quit()
-
-    ImageMVR.host = VideoMVR.host = NewScaleCoordinateRecorder.host = "w10dtsm18280"
-    NewScaleCoordinateRecorder.initialize()
-    NewScaleCoordinateRecorder.start()
-    NewScaleCoordinateRecorder.start()
-    # VideoMVR.initialize()
-    # VideoMVR.test()
-    # with stop_on_error(VideoMVR):
-    #     VideoMVR.start()
-    #     time.sleep(VideoMVR.pretest_duration_sec)
-    #     VideoMVR.verify()
-    # VideoMVR.finalize()
-
-    Camstim.get_proxy().session_output_path
-    Camstim.get_proxy().start_session(mouse_id, user_id)
-    Camstim.get_proxy().status["running"]