Skip to content

Commit 2c9dc0c

Browse files
committed
Fix linting on failing files updated in previous commit.
Add .flake8 config file.
1 parent 163414e commit 2c9dc0c

File tree

22 files changed

+3504
-2259
lines changed

22 files changed

+3504
-2259
lines changed

.flake8

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[flake8]
2+
extend-ignore = E203

allensdk/brain_observatory/behavior/behavior_project_cache/project_apis/data_io/behavior_neuropixels_project_cloud_api.py

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,28 @@
66
from allensdk.brain_observatory.behavior.behavior_session import (
77
BehaviorSession,
88
)
9+
from allensdk.brain_observatory.ecephys._probe import ProbeWithLFPMeta
910
from allensdk.brain_observatory.ecephys.behavior_ecephys_session import (
1011
BehaviorEcephysSession,
1112
)
12-
from allensdk.brain_observatory.ecephys._probe import ProbeWithLFPMeta
1313
from allensdk.core.dataframe_utils import (
1414
enforce_df_int_typing,
15-
return_one_dataframe_row_only
15+
return_one_dataframe_row_only,
1616
)
1717

1818
INTEGER_COLUMNS = [
19-
"prior_exposures_to_image_set", "ecephys_session_id", "unit_count",
20-
"probe_count", "channel_count"
19+
"prior_exposures_to_image_set",
20+
"ecephys_session_id",
21+
"unit_count",
22+
"probe_count",
23+
"channel_count",
2124
]
2225

2326

2427
class VisualBehaviorNeuropixelsProjectCloudApi(ProjectCloudApiBase):
25-
2628
MANIFEST_COMPATIBILITY = ["0.1.0", "10.0.0"]
2729

2830
def _load_manifest_tables(self):
29-
3031
self._get_ecephys_session_table()
3132
self._get_behavior_session_table()
3233
self._get_unit_table()
@@ -56,7 +57,7 @@ def get_behavior_session(
5657
row = return_one_dataframe_row_only(
5758
input_table=self._behavior_session_table,
5859
index_value=behavior_session_id,
59-
table_name="behavior_session_table"
60+
table_name="behavior_session_table",
6061
)
6162
row = row.squeeze()
6263
ecephys_session_id = row.ecephys_session_id
@@ -68,7 +69,7 @@ def get_behavior_session(
6869
row = return_one_dataframe_row_only(
6970
input_table=self._ecephys_session_table,
7071
index_value=ecephys_session_id,
71-
table_name="ecephys_session_table"
72+
table_name="ecephys_session_table",
7273
)
7374

7475
file_id = str(int(row[self.cache.file_id_column]))
@@ -79,7 +80,6 @@ def get_behavior_session(
7980
def get_ecephys_session(
8081
self, ecephys_session_id: int
8182
) -> BehaviorEcephysSession:
82-
8383
"""get a BehaviorEcephysSession by specifying ecephys_session_id
8484
8585
Parameters
@@ -95,7 +95,7 @@ def get_ecephys_session(
9595
session_meta = return_one_dataframe_row_only(
9696
input_table=self._ecephys_session_table,
9797
index_value=ecephys_session_id,
98-
table_name="ecephys_session_table"
98+
table_name="ecephys_session_table",
9999
)
100100
probes_meta = self._probe_table[
101101
(self._probe_table["ecephys_session_id"] == ecephys_session_id)
@@ -122,10 +122,9 @@ def f():
122122
probe_meta = {
123123
p.name: ProbeWithLFPMeta(
124124
lfp_csd_filepath=make_lazy_load_filepath_function(
125-
file_id=str(int(getattr(
126-
p, self.cache.file_id_column)))
127-
),
128-
lfp_sampling_rate=p.lfp_sampling_rate
125+
file_id=str(int(getattr(p, self.cache.file_id_column)))
126+
),
127+
lfp_sampling_rate=p.lfp_sampling_rate,
129128
)
130129
for p in probes_meta.itertuples(index=False)
131130
}

allensdk/brain_observatory/behavior/behavior_project_cache/project_apis/data_io/behavior_project_cloud_api.py

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,23 @@
1313
from allensdk.brain_observatory.behavior.behavior_session import (
1414
BehaviorSession,
1515
)
16-
from allensdk.core.utilities import literal_col_eval
1716
from allensdk.core.dataframe_utils import (
1817
enforce_df_int_typing,
19-
return_one_dataframe_row_only
18+
return_one_dataframe_row_only,
2019
)
20+
from allensdk.core.utilities import literal_col_eval
2121

2222
COL_EVAL_LIST = ["ophys_experiment_id", "ophys_container_id", "driver_line"]
23-
INTEGER_COLUMNS = ["session_number", "prior_exposures_to_image_set",
24-
"ophys_session_id", "imaging_plane_group_count",
25-
"imaging_plane_group", "targeted_areas",
26-
"num_depths_per_area", "num_targeted_structures"]
23+
INTEGER_COLUMNS = [
24+
"session_number",
25+
"prior_exposures_to_image_set",
26+
"ophys_session_id",
27+
"imaging_plane_group_count",
28+
"imaging_plane_group",
29+
"targeted_areas",
30+
"num_depths_per_area",
31+
"num_targeted_structures",
32+
]
2733

2834

2935
def sanitize_data_columns(
@@ -107,17 +113,19 @@ def get_behavior_session(
107113
row = return_one_dataframe_row_only(
108114
input_table=self._behavior_session_table,
109115
index_value=behavior_session_id,
110-
table_name="behavior_session_table"
116+
table_name="behavior_session_table",
111117
)
112118
row = row.squeeze()
113-
has_file_id = (not pd.isna(row[self.cache.file_id_column])
114-
and row[self.cache.file_id_column] > 0)
119+
has_file_id = (
120+
not pd.isna(row[self.cache.file_id_column])
121+
and row[self.cache.file_id_column] > 0
122+
)
115123
if not has_file_id:
116124
oeid = row.ophys_experiment_id[0]
117125
row = return_one_dataframe_row_only(
118126
input_table=self._ophys_experiment_table,
119127
index_value=oeid,
120-
table_name="ophys_experiment_table"
128+
table_name="ophys_experiment_table",
121129
)
122130
file_id = str(int(row[self.cache.file_id_column]))
123131
data_path = self._get_data_path(file_id=file_id)
@@ -141,8 +149,7 @@ def get_behavior_ophys_experiment(
141149
row = return_one_dataframe_row_only(
142150
input_table=self._ophys_experiment_table,
143151
index_value=ophys_experiment_id,
144-
table_name="ophys_experiment_table"
145-
152+
table_name="ophys_experiment_table",
146153
)
147154
file_id = str(int(row[self.cache.file_id_column]))
148155
data_path = self._get_data_path(file_id=file_id)

allensdk/brain_observatory/behavior/behavior_project_cache/tables/util/prior_exposure_processing.py

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,7 @@ def __get_prior_exposure_count(
171171
elif agg_method == "cumsum":
172172
df["to"] = to
173173
df_index_name = df.index.name
174+
174175
def cumsum(x):
175176
return x.cumsum().shift(fill_value=0).astype("int64")
176177

@@ -184,8 +185,7 @@ def cumsum(x):
184185
return counts.reindex(index)
185186

186187

187-
def add_experience_level_ophys(
188-
input_df: pd.DataFrame) -> pd.DataFrame:
188+
def add_experience_level_ophys(input_df: pd.DataFrame) -> pd.DataFrame:
189189
"""
190190
adds a column to ophys tables that contains a string
191191
indicating whether a session had exposure level of Familiar,
@@ -210,36 +210,34 @@ def add_experience_level_ophys(
210210

211211
# do not modify in place
212212
table = input_df.copy(deep=True)
213-
session_number = 'session_number' \
214-
if 'session_number' in table.columns else 'session'
213+
session_number = (
214+
"session_number" if "session_number" in table.columns else "session"
215+
)
215216

216217
# add experience_level column with strings indicating relevant conditions
217-
table['experience_level'] = 'None'
218+
table["experience_level"] = "None"
218219

219-
session_training = table.session_type.str.startswith('TRAINING')
220+
session_training = table.session_type.str.startswith("TRAINING")
220221
train_indices = table[session_training].index.values
221-
table.loc[train_indices, 'experience_level'] = 'Training'
222+
table.loc[train_indices, "experience_level"] = "Training"
222223

223224
session_0123 = table[session_number].isin([0, 1, 2, 3])
224225
familiar_indices = table[session_0123].index.values
225226

226-
table.loc[familiar_indices, 'experience_level'] = 'Familiar'
227+
table.loc[familiar_indices, "experience_level"] = "Familiar"
227228

228229
session_456 = table[session_number].isin([4, 5, 6])
229-
zero_prior_exp = (table.prior_exposures_to_image_set == 0)
230+
zero_prior_exp = table.prior_exposures_to_image_set == 0
230231

231-
novel_indices = table[session_456
232-
& zero_prior_exp].index.values
232+
novel_indices = table[session_456 & zero_prior_exp].index.values
233233

234-
table.loc[novel_indices, 'experience_level'] = 'Novel 1'
234+
table.loc[novel_indices, "experience_level"] = "Novel 1"
235235

236236
session_456 = table[session_number].isin([4, 5, 6])
237-
nonzero_prior_exp = (table.prior_exposures_to_image_set != 0)
238-
novel_gt_1_indices = table[
239-
session_456
240-
& nonzero_prior_exp].index.values
237+
nonzero_prior_exp = table.prior_exposures_to_image_set != 0
238+
novel_gt_1_indices = table[session_456 & nonzero_prior_exp].index.values
241239

242-
table.loc[novel_gt_1_indices, 'experience_level'] = 'Novel >1'
240+
table.loc[novel_gt_1_indices, "experience_level"] = "Novel >1"
243241

244242
return table
245243

0 commit comments

Comments
 (0)