Skip to content

Commit 4114530

Browse files
authored
Merge branch 'main' into uta-refactor
2 parents 6f81a69 + 15bd9f3 commit 4114530

1 file changed

Lines changed: 28 additions & 16 deletions

File tree

src/cool_seq_tool/mappers/exon_genomic_coords.py

Lines changed: 28 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ class TxSegment(BaseModelForbidExtra):
6767

6868
exon_ord: StrictInt = Field(..., description="Exon number. 0-based.")
6969
offset: StrictInt = Field(
70-
0,
70+
default=0,
7171
description="The value added to or subtracted from the `genomic_location` to find the start or end of an exon.",
7272
)
7373
genomic_location: SequenceLocation = Field(
@@ -114,19 +114,23 @@ def check_seg_pos(cls, values: dict) -> dict: # noqa: N805
114114
class GenomicTxSeg(BaseModelForbidExtra):
115115
"""Model for representing a boundary for a transcript segment."""
116116

117-
seg: TxSegment | None = Field(None, description="Transcript segment.")
117+
seg: TxSegment | None = Field(default=None, description="Transcript segment.")
118118
gene: StrictStr | None = Field(
119-
None, description="Valid, case-sensitive HGNC gene symbol."
119+
default=None, description="Valid, case-sensitive HGNC gene symbol."
120+
)
121+
genomic_ac: StrictStr | None = Field(
122+
default=None, description="RefSeq genomic accession."
123+
)
124+
tx_ac: StrictStr | None = Field(
125+
default=None, description="RefSeq transcript accession."
120126
)
121-
genomic_ac: StrictStr | None = Field(None, description="RefSeq genomic accession.")
122-
tx_ac: StrictStr | None = Field(None, description="RefSeq transcript accession.")
123127
tx_status: TranscriptPriority | None = Field(
124-
None, description="Transcript priority for RefSeq transcript accession"
128+
default=None, description="Transcript priority for RefSeq transcript accession"
125129
)
126130
strand: Strand | None = Field(
127-
None, description="The strand that the transcript accession exists on."
131+
default=None, description="The strand that the transcript accession exists on."
128132
)
129-
errors: list[StrictStr] = Field([], description="Error messages.")
133+
errors: list[StrictStr] = Field(default=[], description="Error messages.")
130134

131135
@model_validator(mode="before")
132136
def check_errors(cls, values: dict) -> dict: # noqa: N805
@@ -179,19 +183,27 @@ class GenomicTxSegService(BaseModelForbidExtra):
179183
"""Service model for genomic and transcript data."""
180184

181185
gene: StrictStr | None = Field(
182-
None, description="Valid, case-sensitive HGNC gene symbol."
186+
default=None, description="Valid, case-sensitive HGNC gene symbol."
187+
)
188+
genomic_ac: StrictStr | None = Field(
189+
default=None, description="RefSeq genomic accession."
190+
)
191+
tx_ac: StrictStr | None = Field(
192+
default=None, description="RefSeq transcript accession."
183193
)
184-
genomic_ac: StrictStr | None = Field(None, description="RefSeq genomic accession.")
185-
tx_ac: StrictStr | None = Field(None, description="RefSeq transcript accession.")
186194
tx_status: TranscriptPriority | None = Field(
187-
None, description="Transcript priority for RefSeq transcript accession"
195+
default=None, description="Transcript priority for RefSeq transcript accession"
188196
)
189197
strand: Strand | None = Field(
190-
None, description="The strand that the transcript exists on."
198+
default=None, description="The strand that the transcript exists on."
199+
)
200+
seg_start: TxSegment | None = Field(
201+
default=None, description="Start transcript segment."
202+
)
203+
seg_end: TxSegment | None = Field(
204+
default=None, description="End transcript segment."
191205
)
192-
seg_start: TxSegment | None = Field(None, description="Start transcript segment.")
193-
seg_end: TxSegment | None = Field(None, description="End transcript segment.")
194-
errors: list[StrictStr] = Field([], description="Error messages.")
206+
errors: list[StrictStr] = Field(default=[], description="Error messages.")
195207
service_meta: ServiceMeta = Field(..., description="Service metadata.")
196208

197209
@model_validator(mode="before")

0 commit comments

Comments
 (0)