Skip to content

Commit 9c27789

Browse files
committed
refactor 'biological_entity' to 'organism' and regen visualizer, models, docs
1 parent b9be7f7 commit 9c27789

168 files changed

Lines changed: 3101 additions & 4242 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

docs/elements/AMP2DataGenerationActivity.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -283,11 +283,11 @@ attributes:
283283
- MassSpectrometryStandardRun
284284
- PurchasedMaterial
285285
- LabProcessingActivity
286+
- organism
286287
- Site
287288
- Sample
288289
- SamplingActivity
289290
- SoilSamplingActivity
290-
- biological_entity
291291
- Study
292292
- SoftwareControlledTermValue
293293
range: string
@@ -313,11 +313,11 @@ attributes:
313313
- MassSpectrometryStandardRun
314314
- PurchasedMaterial
315315
- LabProcessingActivity
316+
- organism
316317
- Site
317318
- Sample
318319
- SamplingActivity
319320
- SoilSamplingActivity
320-
- biological_entity
321321
- Study
322322
- TimestampValue
323323
- TextValue
@@ -374,6 +374,7 @@ attributes:
374374
- MassSpectrometryStandardRun
375375
- PurchasedMaterial
376376
- LabProcessingActivity
377+
- organism
377378
- MAOMProduct
378379
- WEOMProduct
379380
- Site
@@ -414,7 +415,6 @@ attributes:
414415
- SynthesizedMaterialSamplingActivity
415416
- TerraformSamplingActivity
416417
- WaterSamplingActivity
417-
- biological_entity
418418
- Study
419419
- ProjectParticipant
420420
- TimestampValue

docs/elements/AMP2PlateSetupActivity.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -457,6 +457,7 @@ attributes:
457457
- MassSpectrometryStandardRun
458458
- PurchasedMaterial
459459
- LabProcessingActivity
460+
- organism
460461
- MAOMProduct
461462
- WEOMProduct
462463
- Site
@@ -497,7 +498,6 @@ attributes:
497498
- SynthesizedMaterialSamplingActivity
498499
- TerraformSamplingActivity
499500
- WaterSamplingActivity
500-
- biological_entity
501501
- Study
502502
- ProjectParticipant
503503
- TimestampValue

docs/elements/AMP2UserSample.md

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@ _A user-submitted microbial sample for AMP2 workflows._
77

88
__
99

10-
_References a biological_entity for identity (the "what") and carries_
10+
_References an organism for identity (the "what") and carries_
1111

1212
_physical/logistical metadata for the specific sample instance (the "this tube")._
1313

1414
__
1515

16-
_Relationship to biological_entity:_
16+
_Relationship to organism:_
1717

18-
_ - Many AMP2UserSample instances can reference one biological_entity_
18+
_ - Many AMP2UserSample instances can reference one organism_
1919

20-
_ - biological_entity_ref is the FK (required)_
20+
_ - organism_ref is the FK (required)_
2121

2222
_ - Example: 1000 samples of strain KT2440_pTE314_
2323

@@ -50,17 +50,6 @@ URI: [analysis_api_schema:AMP2UserSample](https://w3id.org/MONet/analysis-api-sc
5050
5151
AMP2UserSample : analysis_type
5252
53-
AMP2UserSample : biological_entity_ref
54-
55-
56-
57-
58-
59-
AMP2UserSample --> "1" BiologicalEntity : biological_entity_ref
60-
click BiologicalEntity href "../BiologicalEntity/"
61-
62-
63-
6453
AMP2UserSample : cbi
6554
6655
AMP2UserSample : collection_date
@@ -90,6 +79,17 @@ URI: [analysis_api_schema:AMP2UserSample](https://w3id.org/MONet/analysis-api-sc
9079
9180
AMP2UserSample : name
9281
82+
AMP2UserSample : organism_ref
83+
84+
85+
86+
87+
88+
AMP2UserSample --> "1" Organism : organism_ref
89+
click Organism href "../Organism/"
90+
91+
92+
9393
AMP2UserSample : other_guid_source
9494
9595
AMP2UserSample : shipped_sample_size
@@ -125,7 +125,7 @@ URI: [analysis_api_schema:AMP2UserSample](https://w3id.org/MONet/analysis-api-sc
125125

126126
| Name | Cardinality and Range | Description | Inheritance |
127127
| --- | --- | --- | --- |
128-
| [biological_entity_ref](biological_entity_ref.md) | 1 <br/> [BiologicalEntity](BiologicalEntity.md) | FK to biological_entity representing the biological identity this sample inst... | direct |
128+
| [organism_ref](organism_ref.md) | 1 <br/> [Organism](Organism.md) | FK to organism representing the biological identity this sample instantiates | direct |
129129
| [collection_date](collection_date.md) | 0..1 <br/> [Date](Date.md) | The date the sample was collected or received from the user | direct |
130130
| [growth_facil](growth_facil.md) | 0..1 <br/> [GrowthFacilityEnum](GrowthFacilityEnum.md) | Type of facility or location from where the sample was collected or | direct |
131131
| [isol_growth_condt](isol_growth_condt.md) | 0..1 <br/> [String](String.md) | Publication reference in the form of pubmed ID (PMID), digital object | direct |
@@ -193,17 +193,17 @@ URI: [analysis_api_schema:AMP2UserSample](https://w3id.org/MONet/analysis-api-sc
193193
```yaml
194194
name: AMP2UserSample
195195
description: "A user-submitted microbial sample for AMP2 workflows.\n\nReferences\
196-
\ a biological_entity for identity (the \"what\") and carries\nphysical/logistical\
197-
\ metadata for the specific sample instance (the \"this tube\").\n\nRelationship\
198-
\ to biological_entity:\n - Many AMP2UserSample instances can reference one biological_entity\n\
199-
\ - biological_entity_ref is the FK (required)\n - Example: 1000 samples of strain\
200-
\ KT2440_pTE314\n\nWorkflow integration:\n - Enters workflow via SampleReceiving\
201-
\ activity\n - Processed through StrainPurity → StockCulturePreparation → PreCultureGrowth\
202-
\ → ExperimentalCulture\n - Outputs ProcessedSample instances at each stage"
196+
\ an organism for identity (the \"what\") and carries\nphysical/logistical metadata\
197+
\ for the specific sample instance (the \"this tube\").\n\nRelationship to organism:\n\
198+
\ - Many AMP2UserSample instances can reference one organism\n - organism_ref\
199+
\ is the FK (required)\n - Example: 1000 samples of strain KT2440_pTE314\n\nWorkflow\
200+
\ integration:\n - Enters workflow via SampleReceiving activity\n - Processed\
201+
\ through StrainPurity → StockCulturePreparation → PreCultureGrowth → ExperimentalCulture\n\
202+
\ - Outputs ProcessedSample instances at each stage"
203203
from_schema: https://w3id.org/MONet/analysis-api-schema
204204
is_a: Sample
205205
slots:
206-
- biological_entity_ref
206+
- organism_ref
207207
- collection_date
208208
- growth_facil
209209
- isol_growth_condt
@@ -216,12 +216,12 @@ slots:
216216
- analysis_type
217217
- cbi
218218
slot_usage:
219-
biological_entity_ref:
220-
name: biological_entity_ref
221-
description: 'FK to biological_entity representing the biological identity this
222-
sample instantiates.
219+
organism_ref:
220+
name: organism_ref
221+
description: 'FK to organism representing the biological identity this sample
222+
instantiates.
223223
224-
Required - every AMP2UserSample must reference a biological_entity.'
224+
Required - every AMP2UserSample must reference an organism.'
225225
required: true
226226
storage_condition:
227227
name: storage_condition
@@ -240,7 +240,7 @@ slot_usage:
240240
name: name
241241
description: 'Sample identifier/name (e.g., "PP_0055").
242242
243-
May match strain_identifier on biological_entity for 1:1 cases,
243+
May match strain_identifier on organism for 1:1 cases,
244244
245245
but typically unique per sample instance.
246246
@@ -279,6 +279,7 @@ attributes:
279279
- MassSpectrometryStandardRun
280280
- PurchasedMaterial
281281
- LabProcessingActivity
282+
- organism
282283
- MAOMProduct
283284
- WEOMProduct
284285
- Site
@@ -319,7 +320,6 @@ attributes:
319320
- SynthesizedMaterialSamplingActivity
320321
- TerraformSamplingActivity
321322
- WaterSamplingActivity
322-
- biological_entity
323323
- Study
324324
- ProjectParticipant
325325
- TimestampValue
@@ -342,22 +342,22 @@ attributes:
342342
```yaml
343343
name: AMP2UserSample
344344
description: "A user-submitted microbial sample for AMP2 workflows.\n\nReferences\
345-
\ a biological_entity for identity (the \"what\") and carries\nphysical/logistical\
346-
\ metadata for the specific sample instance (the \"this tube\").\n\nRelationship\
347-
\ to biological_entity:\n - Many AMP2UserSample instances can reference one biological_entity\n\
348-
\ - biological_entity_ref is the FK (required)\n - Example: 1000 samples of strain\
349-
\ KT2440_pTE314\n\nWorkflow integration:\n - Enters workflow via SampleReceiving\
350-
\ activity\n - Processed through StrainPurity → StockCulturePreparation → PreCultureGrowth\
351-
\ → ExperimentalCulture\n - Outputs ProcessedSample instances at each stage"
345+
\ an organism for identity (the \"what\") and carries\nphysical/logistical metadata\
346+
\ for the specific sample instance (the \"this tube\").\n\nRelationship to organism:\n\
347+
\ - Many AMP2UserSample instances can reference one organism\n - organism_ref\
348+
\ is the FK (required)\n - Example: 1000 samples of strain KT2440_pTE314\n\nWorkflow\
349+
\ integration:\n - Enters workflow via SampleReceiving activity\n - Processed\
350+
\ through StrainPurity → StockCulturePreparation → PreCultureGrowth → ExperimentalCulture\n\
351+
\ - Outputs ProcessedSample instances at each stage"
352352
from_schema: https://w3id.org/MONet/analysis-api-schema
353353
is_a: Sample
354354
slot_usage:
355-
biological_entity_ref:
356-
name: biological_entity_ref
357-
description: 'FK to biological_entity representing the biological identity this
358-
sample instantiates.
355+
organism_ref:
356+
name: organism_ref
357+
description: 'FK to organism representing the biological identity this sample
358+
instantiates.
359359
360-
Required - every AMP2UserSample must reference a biological_entity.'
360+
Required - every AMP2UserSample must reference an organism.'
361361
required: true
362362
storage_condition:
363363
name: storage_condition
@@ -376,7 +376,7 @@ slot_usage:
376376
name: name
377377
description: 'Sample identifier/name (e.g., "PP_0055").
378378
379-
May match strain_identifier on biological_entity for 1:1 cases,
379+
May match strain_identifier on organism for 1:1 cases,
380380
381381
but typically unique per sample instance.
382382
@@ -417,6 +417,7 @@ attributes:
417417
- MassSpectrometryStandardRun
418418
- PurchasedMaterial
419419
- LabProcessingActivity
420+
- organism
420421
- MAOMProduct
421422
- WEOMProduct
422423
- Site
@@ -457,7 +458,6 @@ attributes:
457458
- SynthesizedMaterialSamplingActivity
458459
- TerraformSamplingActivity
459460
- WaterSamplingActivity
460-
- biological_entity
461461
- Study
462462
- ProjectParticipant
463463
- TimestampValue
@@ -470,24 +470,24 @@ attributes:
470470
- zipDownload
471471
range: uuid
472472
required: true
473-
biological_entity_ref:
474-
name: biological_entity_ref
475-
description: 'FK to biological_entity representing the biological identity this
476-
sample instantiates.
473+
organism_ref:
474+
name: organism_ref
475+
description: 'FK to organism representing the biological identity this sample
476+
instantiates.
477477
478-
Required - every AMP2UserSample must reference a biological_entity.'
478+
Required - every AMP2UserSample must reference an organism.'
479479
from_schema: https://w3id.org/MONet/analysis-api-schema
480480
aliases:
481481
- strain_ref
482482
- strain_id
483483
rank: 1000
484-
alias: biological_entity_ref
484+
alias: organism_ref
485485
owner: AMP2UserSample
486486
domain_of:
487487
- CultureGrowth
488488
- AMP2UserSample
489489
- EngineeredStrainSample
490-
range: biological_entity
490+
range: organism
491491
required: true
492492
collection_date:
493493
name: collection_date
@@ -694,7 +694,7 @@ attributes:
694694
name: name
695695
description: 'Sample identifier/name (e.g., "PP_0055").
696696
697-
May match strain_identifier on biological_entity for 1:1 cases,
697+
May match strain_identifier on organism for 1:1 cases,
698698
699699
but typically unique per sample instance.
700700
@@ -716,11 +716,11 @@ attributes:
716716
- MassSpectrometryStandardRun
717717
- PurchasedMaterial
718718
- LabProcessingActivity
719+
- organism
719720
- Site
720721
- Sample
721722
- SamplingActivity
722723
- SoilSamplingActivity
723-
- biological_entity
724724
- Study
725725
- SoftwareControlledTermValue
726726
range: string
@@ -746,11 +746,11 @@ attributes:
746746
- MassSpectrometryStandardRun
747747
- PurchasedMaterial
748748
- LabProcessingActivity
749+
- organism
749750
- Site
750751
- Sample
751752
- SamplingActivity
752753
- SoilSamplingActivity
753-
- biological_entity
754754
- Study
755755
- TimestampValue
756756
- TextValue

docs/elements/Activity.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ attributes:
146146
- MassSpectrometryStandardRun
147147
- PurchasedMaterial
148148
- LabProcessingActivity
149+
- organism
149150
- MAOMProduct
150151
- WEOMProduct
151152
- Site
@@ -186,7 +187,6 @@ attributes:
186187
- SynthesizedMaterialSamplingActivity
187188
- TerraformSamplingActivity
188189
- WaterSamplingActivity
189-
- biological_entity
190190
- Study
191191
- ProjectParticipant
192192
- TimestampValue
@@ -273,6 +273,7 @@ attributes:
273273
- MassSpectrometryStandardRun
274274
- PurchasedMaterial
275275
- LabProcessingActivity
276+
- organism
276277
- MAOMProduct
277278
- WEOMProduct
278279
- Site
@@ -313,7 +314,6 @@ attributes:
313314
- SynthesizedMaterialSamplingActivity
314315
- TerraformSamplingActivity
315316
- WaterSamplingActivity
316-
- biological_entity
317317
- Study
318318
- ProjectParticipant
319319
- TimestampValue
@@ -386,11 +386,11 @@ attributes:
386386
- MassSpectrometryStandardRun
387387
- PurchasedMaterial
388388
- LabProcessingActivity
389+
- organism
389390
- Site
390391
- Sample
391392
- SamplingActivity
392393
- SoilSamplingActivity
393-
- biological_entity
394394
- Study
395395
- SoftwareControlledTermValue
396396
range: string
@@ -416,11 +416,11 @@ attributes:
416416
- MassSpectrometryStandardRun
417417
- PurchasedMaterial
418418
- LabProcessingActivity
419+
- organism
419420
- Site
420421
- Sample
421422
- SamplingActivity
422423
- SoilSamplingActivity
423-
- biological_entity
424424
- Study
425425
- TimestampValue
426426
- TextValue

0 commit comments

Comments
 (0)