Skip to content

Commit d6dc6a1

Browse files
committed
lint files
1 parent e05e5d0 commit d6dc6a1

5 files changed

Lines changed: 21 additions & 7 deletions

File tree

app/models/sample_field.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@ class SampleField(db.Model):
1919
@classmethod
2020
def find_by_ids(cls, sample_id, field_id, value, original_name):
2121
return cls.query.filter_by(
22-
sample_id=sample_id, field_id=field_id, value=value, original_name=original_name
22+
sample_id=sample_id,
23+
field_id=field_id,
24+
value=value,
25+
original_name=original_name,
2326
).first()
2427

2528
def save(self):

app/models/sample_taxon.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ def find_all(cls, page):
2727

2828
@classmethod
2929
def find_by_ids(cls, sample_id, taxon_id, original_taxon_id):
30-
return cls.query.filter_by(sample_id=sample_id, taxon_id=taxon_id, original_taxon_id=original_taxon_id).first()
30+
return cls.query.filter_by(
31+
sample_id=sample_id, taxon_id=taxon_id, original_taxon_id=original_taxon_id
32+
).first()
3133

3234
def save(self):
3335
db.session.add(self)

app/scripts/import_normalized_fields.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ def import_samples_fields(self):
118118
"sample_id": sample.id,
119119
"field_id": field_ids[field_name]["field_id"],
120120
"value": row[field_name],
121-
"original_name": field_name
121+
"original_name": field_name,
122122
}
123123
sample_field = find_sample_field_by_ids(data)
124124

@@ -128,8 +128,7 @@ def import_samples_fields(self):
128128
"field_id": field_ids[field_name]["field_id"],
129129
"value": row[field_name],
130130
"data_source_notes": relative_path,
131-
"original_name": field_name
132-
131+
"original_name": field_name,
133132
}
134133
create_sample_field(attrs)
135134
else:

app/scripts/import_normalized_taxa.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,11 @@ def _import_sample_taxa_for_csv(self, df, relative_path, taxa_ids):
222222
# don't create sample_taxon if no taxon_code
223223
if taxon_code == taxon_code:
224224
sample_taxon = find_sample_taxa_by_ids(
225-
{"taxon_id": ids["taxon_id"], "sample_id": sample.id, "original_taxon_id": ids['original_taxon_id']}
225+
{
226+
"taxon_id": ids["taxon_id"],
227+
"sample_id": sample.id,
228+
"original_taxon_id": ids["original_taxon_id"],
229+
}
226230
)
227231
if sample_taxon is None:
228232
attr = {

app/scripts/utils/import_records.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -637,7 +637,13 @@ def find_sample_field_by_ids(params):
637637

638638

639639
def create_sample_field(params):
640-
allowed_attributes = ["sample_id", "field_id", "value", "data_source_notes", "original_name"]
640+
allowed_attributes = [
641+
"sample_id",
642+
"field_id",
643+
"value",
644+
"data_source_notes",
645+
"original_name",
646+
]
641647
attributes = allowed_params(allowed_attributes, params)
642648

643649
record = SampleField(**attributes)

0 commit comments

Comments
 (0)