Skip to content

Commit 3f48a49

Browse files
slopez-bslopez-b
authored
feat: Cytiva Biacore Insight/Cytiva Biacore T200 Control - Update Slope calculated data's reported units to RU/s (#1077)
- Change the name of `ResonanceUnits` to `ResponseUnit` to reflect allotrope naming. - Use `ResponseUnitPerSecond` (`RU/s`) for slope calculated data.
1 parent 6a8ed1b commit 3f48a49

20 files changed

Lines changed: 890 additions & 835 deletions

File tree

‎src/allotropy/allotrope/models/adm/binding_affinity/rec/_2025/_03/binding_affinity.py‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# generated by datamodel-codegen:
22
# filename: binding-affinity.schema.json
3-
# timestamp: 2025-04-21T17:58:26+00:00
3+
# timestamp: 2025-09-17T17:07:42+00:00
44

55
from __future__ import annotations
66

@@ -16,6 +16,7 @@
1616
TQuantityValueNanomolar,
1717
TQuantityValuePercent,
1818
TQuantityValuePerMolarPerSecond,
19+
TQuantityValueResponseUnit,
1920
TQuantityValueSecondTime,
2021
)
2122
from allotropy.allotrope.models.shared.definitions.definitions import (
@@ -80,9 +81,6 @@ class StatisticsAggregateDocument:
8081
statistics_document: list[StatisticsDocumentItem] | None = None
8182

8283

83-
TQuantityValueResponseUnit = Any
84-
85-
8684
@dataclass(kw_only=True)
8785
class TQuantityValueModel:
8886
unit: TUnit

‎src/allotropy/allotrope/models/adm/binding_affinity_analyzer/wd/_2024/_12/binding_affinity_analyzer.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# generated by datamodel-codegen:
22
# filename: binding-affinity-analyzer.schema.json
3-
# timestamp: 2025-08-29T17:23:20+00:00
3+
# timestamp: 2025-09-17T17:09:51+00:00
44

55
from __future__ import annotations
66

@@ -16,7 +16,7 @@
1616
TQuantityValuePercent,
1717
TQuantityValuePerMolarPerSecond,
1818
TQuantityValuePerSecond,
19-
TQuantityValueResonanceUnits,
19+
TQuantityValueResponseUnit,
2020
TQuantityValueSecondTime,
2121
)
2222
from allotropy.allotrope.models.shared.definitions.definitions import (
@@ -105,10 +105,10 @@ class AnalysisSequenceDocument:
105105

106106
@dataclass(kw_only=True)
107107
class ReportPointDocumentItem:
108-
absolute_resonance: TQuantityValueResonanceUnits | None = None
108+
absolute_resonance: TQuantityValueResponseUnit | None = None
109109
report_point_identifier: TStringValue | None = None
110110
identifier_role: TStringValue | None = None
111-
relative_resonance: TQuantityValueResonanceUnits | None = None
111+
relative_resonance: TQuantityValueResponseUnit | None = None
112112
time_setting: TQuantityValueSecondTime | None = None
113113

114114

@@ -273,7 +273,7 @@ class ProcessedDataDocumentItem:
273273
)
274274
binding_off_rate_measurement_datum__koff_: TQuantityValuePerSecond | None = None
275275
equilibrium_dissociation_constant__KD_: TQuantityValueMolar | None = None
276-
maximum_binding_capacity__Rmax_: TQuantityValueResonanceUnits | None = None
276+
maximum_binding_capacity__Rmax_: TQuantityValueResponseUnit | None = None
277277
report_point_aggregate_document: ReportPointAggregateDocument | None = None
278278

279279

‎src/allotropy/allotrope/models/shared/definitions/custom.py‎

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,13 @@
6666
RelativeLightUnit,
6767
RelativeLightUnitTimesMilliliter,
6868
RelativeLightUnitTimesSecond,
69-
ResonanceUnits,
69+
ResponseUnit,
70+
ResponseUnitPerSecond,
7071
SecondTime,
7172
SeimensPerMeter,
7273
SquareCentimetersPerGram,
7374
SquareCentimetersPerMole,
74-
SquareResonanceUnits,
75+
SquareResponseUnit,
7576
TODO,
7677
Unitless,
7778
UnitPerLiter,
@@ -755,12 +756,24 @@ class TNullableQuantityValueRelativeLightUnitTimesSecond(
755756

756757

757758
@dataclass(frozen=True, kw_only=True)
758-
class TQuantityValueResonanceUnits(ResonanceUnits, TQuantityValue):
759+
class TQuantityValueResponseUnit(ResponseUnit, TQuantityValue):
759760
pass
760761

761762

762763
@dataclass(frozen=True, kw_only=True)
763-
class TNullableQuantityValueResonanceUnits(ResonanceUnits, TNullableQuantityValue):
764+
class TNullableQuantityValueResponseUnit(ResponseUnit, TNullableQuantityValue):
765+
pass
766+
767+
768+
@dataclass(frozen=True, kw_only=True)
769+
class TQuantityValueResponseUnitPerSecond(ResponseUnitPerSecond, TQuantityValue):
770+
pass
771+
772+
773+
@dataclass(frozen=True, kw_only=True)
774+
class TNullableQuantityValueResponseUnitPerSecond(
775+
ResponseUnitPerSecond, TNullableQuantityValue
776+
):
764777
pass
765778

766779

@@ -809,13 +822,13 @@ class TNullableQuantityValueSquareCentimetersPerMole(
809822

810823

811824
@dataclass(frozen=True, kw_only=True)
812-
class TQuantityValueSquareResonanceUnits(SquareResonanceUnits, TQuantityValue):
825+
class TQuantityValueSquareResponseUnit(SquareResponseUnit, TQuantityValue):
813826
pass
814827

815828

816829
@dataclass(frozen=True, kw_only=True)
817-
class TNullableQuantityValueSquareResonanceUnits(
818-
SquareResonanceUnits, TNullableQuantityValue
830+
class TNullableQuantityValueSquareResponseUnit(
831+
SquareResponseUnit, TNullableQuantityValue
819832
):
820833
pass
821834

‎src/allotropy/allotrope/models/shared/definitions/units.py‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -310,10 +310,15 @@ class RelativeLightUnitTimesSecond(HasUnit):
310310

311311

312312
@dataclass(frozen=True, kw_only=True)
313-
class ResonanceUnits(HasUnit):
313+
class ResponseUnit(HasUnit):
314314
unit: str = "RU"
315315

316316

317+
@dataclass(frozen=True, kw_only=True)
318+
class ResponseUnitPerSecond(HasUnit):
319+
unit: str = "RU/s"
320+
321+
317322
@dataclass(frozen=True, kw_only=True)
318323
class SecondTime(HasUnit):
319324
unit: str = "s"
@@ -335,7 +340,7 @@ class SquareCentimetersPerMole(HasUnit):
335340

336341

337342
@dataclass(frozen=True, kw_only=True)
338-
class SquareResonanceUnits(HasUnit):
343+
class SquareResponseUnit(HasUnit):
339344
unit: str = "RU^2"
340345

341346

‎src/allotropy/allotrope/schema_mappers/adm/binding_affinity_analyzer/benchling/_2024/_12/binding_affinity_analyzer.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
TQuantityValuePercent,
3434
TQuantityValuePerMolarPerSecond,
3535
TQuantityValuePerSecond,
36-
TQuantityValueResonanceUnits,
36+
TQuantityValueResponseUnit,
3737
TQuantityValueSecondTime,
3838
)
3939
from allotropy.allotrope.models.shared.definitions.definitions import TDatacube
@@ -256,7 +256,7 @@ def _get_surface_plasmon_resonance_measurement_document(
256256
measurement.equilibrium_dissociation_constant__kd_,
257257
),
258258
maximum_binding_capacity__Rmax_=quantity_or_none(
259-
TQuantityValueResonanceUnits,
259+
TQuantityValueResponseUnit,
260260
measurement.maximum_binding_capacity__rmax_,
261261
),
262262
report_point_aggregate_document=(
@@ -266,11 +266,11 @@ def _get_surface_plasmon_resonance_measurement_document(
266266
ReportPointDocumentItem(
267267
report_point_identifier=report_point.identifier,
268268
identifier_role=report_point.identifier_role,
269-
absolute_resonance=TQuantityValueResonanceUnits(
269+
absolute_resonance=TQuantityValueResponseUnit(
270270
value=report_point.absolute_resonance
271271
),
272272
relative_resonance=quantity_or_none(
273-
TQuantityValueResonanceUnits,
273+
TQuantityValueResponseUnit,
274274
report_point.relative_resonance,
275275
),
276276
time_setting=TQuantityValueSecondTime(

‎src/allotropy/allotrope/schemas/adm/binding-affinity-analyzer/WD/2024/12/binding-affinity-analyzer.schema.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@
216216
"$ref": "http://purl.allotrope.org/json-schemas/adm/core/REC/2024/09/core.schema#/$defs/tQuantityValue"
217217
},
218218
{
219-
"$ref": "http://purl.allotrope.org/json-schemas/qudt/REC/2024/09/units.schema#/$defs/ResonanceUnits"
219+
"$ref": "http://purl.allotrope.org/json-schemas/qudt/REC/2024/09/units.schema#/$defs/ResponseUnit"
220220
}
221221
]
222222
}
@@ -4958,7 +4958,7 @@
49584958
"unit": {
49594959
"type": "string",
49604960
"const": "RU",
4961-
"$asm.unit-iri": "http://qudt.org/vocab/unit#ResonanceUnits"
4961+
"$asm.unit-iri": "http://purl.allotrope.org/ontology/qudt-ext/unit#ResponseUnit"
49624962
}
49634963
},
49644964
"required": [
@@ -4970,7 +4970,7 @@
49704970
"unit": {
49714971
"type": "string",
49724972
"const": "RU/s",
4973-
"$asm.unit-iri": "http://qudt.org/vocab/unit#ResonanceUnitsPerSecond"
4973+
"$asm.unit-iri": "http://purl.allotrope.org/ontology/qudt-ext/unit#ResponseUnitPerSecond"
49744974
}
49754975
},
49764976
"required": [

‎src/allotropy/allotrope/schemas/adm/binding-affinity/REC/2025/03/binding-affinity.schema.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12276,4 +12276,4 @@
1227612276
"required": [
1227712277
"$asm.manifest"
1227812278
]
12279-
}
12279+
}

‎src/allotropy/allotrope/schemas/adm/flow-cytometry/BENCHLING/2025/03/flow-cytometry.schema.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11565,7 +11565,7 @@
1156511565
"RU/s": {
1156611566
"properties": {
1156711567
"unit": {
11568-
"$asm.unit-iri": "http://qudt.org/vocab/unit#ResponseUnitsPerSecond",
11568+
"$asm.unit-iri": "http://purl.allotrope.org/ontology/qudt-ext/unit#ResponseUnitPerSecond",
1156911569
"const": "RU/s",
1157011570
"type": "string"
1157111571
}

‎src/allotropy/allotrope/schemas/shared/definitions/custom.json‎

Lines changed: 29 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1199,23 +1199,43 @@
11991199
}
12001200
]
12011201
},
1202-
"tQuantityValueResonanceUnits": {
1202+
"TQuantityValueResponseUnit": {
12031203
"allOf": [
12041204
{
12051205
"$ref": "#/$defs/tQuantityValue"
12061206
},
12071207
{
1208-
"$ref": "#/$defs/ResonanceUnits"
1208+
"$ref": "#/$defs/ResponseUnit"
12091209
}
12101210
]
12111211
},
1212-
"tNullableQuantityValueResonanceUnits": {
1212+
"tNullableQuantityValueResponseUnit": {
12131213
"allOf": [
12141214
{
12151215
"$ref": "#/$defs/tNullableQuantityValue"
12161216
},
12171217
{
1218-
"$ref": "#/$defs/ResonanceUnits"
1218+
"$ref": "#/$defs/ResponseUnit"
1219+
}
1220+
]
1221+
},
1222+
"TQuantityValueResponseUnitPerSecond": {
1223+
"allOf": [
1224+
{
1225+
"$ref": "#/$defs/tQuantityValue"
1226+
},
1227+
{
1228+
"$ref": "#/$defs/ResponseUnitPerSecond"
1229+
}
1230+
]
1231+
},
1232+
"tNullableQuantityValueResponseUnitPerSecond": {
1233+
"allOf": [
1234+
{
1235+
"$ref": "#/$defs/tNullableQuantityValue"
1236+
},
1237+
{
1238+
"$ref": "#/$defs/ResponseUnitPerSecond"
12191239
}
12201240
]
12211241
},
@@ -1299,23 +1319,23 @@
12991319
}
13001320
]
13011321
},
1302-
"tQuantityValueSquareResonanceUnits": {
1322+
"tQuantityValueSquareResponseUnit": {
13031323
"allOf": [
13041324
{
13051325
"$ref": "#/$defs/tQuantityValue"
13061326
},
13071327
{
1308-
"$ref": "#/$defs/SquareResonanceUnits"
1328+
"$ref": "#/$defs/SquareResponseUnit"
13091329
}
13101330
]
13111331
},
1312-
"tNullableQuantityValueSquareResonanceUnits": {
1332+
"tNullableQuantityValueSquareResponseUnit": {
13131333
"allOf": [
13141334
{
13151335
"$ref": "#/$defs/tNullableQuantityValue"
13161336
},
13171337
{
1318-
"$ref": "#/$defs/SquareResonanceUnits"
1338+
"$ref": "#/$defs/SquareResponseUnit"
13191339
}
13201340
]
13211341
},
@@ -1379,4 +1399,4 @@
13791399
}
13801400
]
13811401
}
1382-
}
1402+
}

‎src/allotropy/allotrope/schemas/shared/definitions/units.json‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -719,12 +719,24 @@
719719
"unit"
720720
]
721721
},
722-
"ResonanceUnits": {
722+
"ResponseUnit": {
723723
"properties": {
724724
"unit": {
725725
"type": "string",
726726
"const": "RU",
727-
"$asm.unit-iri": "http://qudt.org/vocab/unit#ResonanceUnits"
727+
"$asm.unit-iri": "http://purl.allotrope.org/ontology/qudt-ext/unit#ResponseUnit"
728+
}
729+
},
730+
"required": [
731+
"unit"
732+
]
733+
},
734+
"ResponseUnitPerSecond": {
735+
"properties": {
736+
"unit": {
737+
"type": "string",
738+
"const": "RU/s",
739+
"$asm.unit-iri": "http://purl.allotrope.org/ontology/qudt-ext/unit#ResponseUnitPerSecond"
728740
}
729741
},
730742
"required": [
@@ -779,7 +791,7 @@
779791
"unit"
780792
]
781793
},
782-
"SquareResonanceUnits": {
794+
"SquareResponseUnit": {
783795
"properties": {
784796
"unit": {
785797
"type": "string",

0 commit comments

Comments
 (0)