Skip to content

Commit

Permalink
merge master and more
Browse files Browse the repository at this point in the history
  • Loading branch information
Karl-Svard committed Jan 8, 2025
2 parents f9b4c70 + 4bf1687 commit 3286ec3
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 7.17.4
current_version = 7.18.0
commit = True
tag = True
tag_name = v{new_version}
Expand Down
2 changes: 1 addition & 1 deletion cg_lims/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "7.17.4"
__version__ = "7.18.0"
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ class ProcessUDFs(BaseModel):
lot_nr_h2o_aliquot_samples_fragmentation: Optional[str] = Field(
None, alias="Nuclease free water"
)
lot_nr_elution_buffer_aliquot_samples_fragmentation: Optional[str] = Field(
None, alias="Lot no: Elution Buffer"
)


class ArtifactUDFs(BaseModel):
Expand Down
3 changes: 3 additions & 0 deletions cg_lims/models/arnold/prep/twist/bead_purification_twist.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ class ArtifactUDFs(BaseModel):
class ProcessUDFs(BaseModel):
lot_nr_etoh_bead_purification_post_hyb: Optional[str] = Field(None, alias="Ethanol")
lot_nr_h2o_bead_purification_post_hyb: Optional[str] = Field(None, alias="Nuclease free water")
lot_nr_elution_buffer_bead_purification_post_hyb: Optional[str] = Field(
None, alias="Lot no: Elution Buffer"
)
bead_purification_post_hyb_method: Optional[str] = Field(None, alias="Method document")
binding_and_purification_beads: Optional[str] = Field(
None, alias="Twist Binding and Purification beads"
Expand Down
6 changes: 6 additions & 0 deletions cg_lims/models/arnold/prep/twist/buffer_exchange.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,13 @@ class ArtifactUDFs(BaseModel):
concentration: Optional[float] = Field(None, alias="Concentration")


class ProcessUDFs(BaseModel):
lot_nr_elution_buffer_bex: Optional[str] = Field(None, alias="Lot no: Elution Buffer")


class ArnoldStep(BaseStep):
artifact_udfs: ArtifactUDFs
process_udfs: ProcessUDFs

class Config:
allow_population_by_field_name = True
Expand All @@ -31,6 +36,7 @@ def get_buffer_exchange_twist(lims: Lims, sample_id: str, prep_id: str) -> Optio
return ArnoldStep(
**analyte.base_fields(),
artifact_udfs=ArtifactUDFs(**analyte.artifact_udfs()),
process_udfs=ProcessUDFs(**analyte.process_udfs()),
sample_id=sample_id,
prep_id=prep_id,
step_type="buffer_exchange",
Expand Down

0 comments on commit 3286ec3

Please sign in to comment.