From 43508285b2cfbc220d2e8db8499ff3bc6a2e9c82 Mon Sep 17 00:00:00 2001 From: Kat Schelonka Date: Fri, 13 Mar 2020 09:47:47 -0700 Subject: [PATCH] Remove unnecessary imports and update asynchronous type in BehaviorProjectCache --- .../brain_observatory/behavior/behavior_project_cache.py | 2 +- allensdk/brain_observatory/ecephys/ecephys_project_cache.py | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/allensdk/brain_observatory/behavior/behavior_project_cache.py b/allensdk/brain_observatory/behavior/behavior_project_cache.py index a71d62e4e..15f305759 100644 --- a/allensdk/brain_observatory/behavior/behavior_project_cache.py +++ b/allensdk/brain_observatory/behavior/behavior_project_cache.py @@ -127,7 +127,7 @@ def from_lims(cls, manifest: Optional[Union[str, Path]] = None, mtrain_credentials: Optional[DbCredentials] = None, host: Optional[str] = None, scheme: Optional[str] = None, - asynchronous: Optional[str] = None) -> "BehaviorProjectCache": + asynchronous: bool = True) -> "BehaviorProjectCache": """ Construct a BehaviorProjectCache with a lims api. Use this method to create a BehaviorProjectCache instance rather than calling diff --git a/allensdk/brain_observatory/ecephys/ecephys_project_cache.py b/allensdk/brain_observatory/ecephys/ecephys_project_cache.py index 61cf084d0..e8d7d23b5 100644 --- a/allensdk/brain_observatory/ecephys/ecephys_project_cache.py +++ b/allensdk/brain_observatory/ecephys/ecephys_project_cache.py @@ -11,12 +11,9 @@ from allensdk.api.cache import Cache from allensdk.core.authentication import DbCredentials from allensdk.brain_observatory.ecephys.ecephys_project_api import ( - EcephysProjectApi, EcephysProjectLimsApi, EcephysProjectWarehouseApi, + EcephysProjectApi, EcephysProjectLimsApi, EcephysProjectWarehouseApi, EcephysProjectFixedApi ) -from allensdk.brain_observatory.ecephys.ecephys_project_api.rma_engine import ( - AsyncRmaEngine, RmaEngine -) from allensdk.brain_observatory.ecephys.ecephys_project_api.http_engine import ( write_bytes_from_coroutine, write_from_stream ) @@ -27,6 +24,7 @@ from allensdk.brain_observatory.ecephys import get_unit_filter_value from allensdk.api.caching_utilities import one_file_call_caching + class EcephysProjectCache(Cache): SESSIONS_KEY = 'sessions'