Skip to content

Commit 456ab10

Browse files
committed
Linting
1 parent 32fc2b0 commit 456ab10

File tree

2 files changed

+6
-20
lines changed

2 files changed

+6
-20
lines changed

src/scaup/crud/samples.py

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@
1515

1616

1717
def _get_protein(proteinId: int, token):
18-
upstream_compound = ExternalRequest.request(
19-
token=token, url=f"/proteins/{proteinId}"
20-
)
18+
upstream_compound = ExternalRequest.request(token=token, url=f"/proteins/{proteinId}")
2119

2220
if upstream_compound.status_code != 200:
2321
app_logger.error(
@@ -85,11 +83,7 @@ def create_sample(shipmentId: int, params: SampleIn, token: str):
8583
if params.parents:
8684
inner_db.session.execute(
8785
insert(SampleParentChild),
88-
[
89-
{"childId": child.id, "parentId": parent}
90-
for child in samples
91-
for parent in params.parents
92-
],
86+
[{"childId": child.id, "parentId": parent} for child in samples for parent in params.parents],
9387
)
9488

9589
inner_db.session.commit()
@@ -151,9 +145,7 @@ def get_samples(
151145
if ignore_external or token is None:
152146
return samples
153147

154-
ext_shipment_id = inner_db.session.scalar(
155-
select(Shipment.externalId).filter(Shipment.id == shipment_id)
156-
)
148+
ext_shipment_id = inner_db.session.scalar(select(Shipment.externalId).filter(Shipment.id == shipment_id))
157149

158150
if ext_shipment_id is None:
159151
return samples
@@ -163,9 +155,7 @@ def get_samples(
163155
)
164156

165157
if ext_samples.status_code != 200:
166-
app_logger.warning(
167-
"Expeye returned %i: %s", ext_samples.status_code, ext_samples.text
168-
)
158+
app_logger.warning("Expeye returned %i: %s", ext_samples.status_code, ext_samples.text)
169159
return samples
170160

171161
validated_samples = Paged[SampleOut].model_validate(samples, from_attributes=True)
@@ -178,9 +168,7 @@ def get_samples(
178168
for i, sample in enumerate(validated_samples.items)
179169
if sample.externalId == ext_sample["blSampleId"]
180170
)
181-
validated_samples.items[i].dataCollectionGroupId = ext_sample[
182-
"dataCollectionGroupId"
183-
]
171+
validated_samples.items[i].dataCollectionGroupId = ext_sample["dataCollectionGroupId"]
184172
except StopIteration:
185173
pass
186174

src/scaup/models/samples.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,7 @@ class SampleOut(BaseSample):
5252
derivedSamples: Optional[List["SampleOut"]] = Field(
5353
default=None, validation_alias=AliasPath("Sample", "derivedSamples")
5454
)
55-
externalId: Optional[int] = Field(
56-
default=None, validation_alias=InnerAlias("externalId")
57-
)
55+
externalId: Optional[int] = Field(default=None, validation_alias=InnerAlias("externalId"))
5856

5957

6058
class SampleExternal(BaseExternal):

0 commit comments

Comments
 (0)