Skip to content

Commit

Permalink
Run build.
Browse files Browse the repository at this point in the history
  • Loading branch information
jgadling committed Aug 1, 2024
1 parent 21f43b8 commit bf7c59a
Show file tree
Hide file tree
Showing 201 changed files with 2,805 additions and 903 deletions.
1,888 changes: 1,677 additions & 211 deletions schema/v1.1.0/api_models_materialized.yaml

Large diffs are not rendered by default.

99 changes: 62 additions & 37 deletions schema/v1.1.0/dataset_config_materialized.yaml

Large diffs are not rendered by default.

31 changes: 28 additions & 3 deletions schema/v1.1.0/dataset_config_models.py
Original file line number Diff line number Diff line change
Expand Up @@ -479,6 +479,19 @@ def __contains__(self, key: str) -> bool:
)


class AnnotationFileSourceEnum(str, Enum):
"""
How the annotation file was acquired
"""

# Annotation submitted by dataset author
dataset_author = "dataset_author"
# Annotation submitted by community member
community = "community"
# Annotation submitted by portal standardization
portal_standard = "portal_standard"


class AnnotationMethodTypeEnum(str, Enum):
"""
Describes how the annotations were generated.
Expand Down Expand Up @@ -612,7 +625,7 @@ class TomogramProcessingEnum(str, Enum):
raw = "raw"


class TomogromReconstructionMethodEnum(str, Enum):
class TomogramReconstructionMethodEnum(str, Enum):
"""
Tomogram reconstruction method
"""
Expand All @@ -638,6 +651,17 @@ class TomogramTypeEnum(str, Enum):
CANONICAL = "CANONICAL"


class AlignmentTypeEnum(str, Enum):
"""
Type of alignment
"""

# per-section non-rigid alignment available
LOCAL = "LOCAL"
# only per-section rigid alignment available
GLOBAL = "GLOBAL"


class PicturePath(ConfiguredBaseModel):
"""
A set of paths to representative images of a piece of data.
Expand Down Expand Up @@ -2141,13 +2165,13 @@ class Tomogram(AuthoredEntity):
}
},
)
reconstruction_method: Optional[Union[TomogromReconstructionMethodEnum, str]] = Field(
reconstruction_method: Optional[Union[TomogramReconstructionMethodEnum, str]] = Field(
None,
description="""Describe reconstruction method (WBP, SART, SIRT)""",
json_schema_extra={
"linkml_meta": {
"alias": "reconstruction_method",
"any_of": [{"range": "tomogrom_reconstruction_method_enum"}, {"range": "StringFormattedString"}],
"any_of": [{"range": "tomogram_reconstruction_method_enum"}, {"range": "StringFormattedString"}],
"domain_of": ["Tomogram"],
}
},
Expand Down Expand Up @@ -6183,3 +6207,4 @@ class TomogramHeader(ConfiguredBaseModel):
VoxelSpacingSource.model_rebuild()
VoxelSpacingLiteral.model_rebuild()
TomogramHeader.model_rebuild()

45 changes: 32 additions & 13 deletions schema/v1.1.0/dataset_config_models.schema.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
{
"$defs": {
"AlignmentTypeEnum": {
"description": "Type of alignment",
"enum": [
"LOCAL",
"GLOBAL"
],
"title": "AlignmentTypeEnum",
"type": "string"
},
"Annotation": {
"additionalProperties": false,
"description": "Metadata describing an annotation.",
Expand Down Expand Up @@ -136,6 +145,16 @@
"title": "AnnotationFileShapeTypeEnum",
"type": "string"
},
"AnnotationFileSourceEnum": {
"description": "How the annotation file was acquired",
"enum": [
"dataset_author",
"community",
"portal_standard"
],
"title": "AnnotationFileSourceEnum",
"type": "string"
},
"AnnotationInstanceSegmentationFile": {
"additionalProperties": false,
"description": "File and sourcing data for an instance segmentation annotation. Annotation that identifies individual instances of object shapes.",
Expand Down Expand Up @@ -2090,7 +2109,7 @@
"reconstruction_method": {
"anyOf": [
{
"$ref": "#/$defs/TomogromReconstructionMethodEnum"
"$ref": "#/$defs/TomogramReconstructionMethodEnum"
},
{
"pattern": "^[ ]*\\{[a-zA-Z0-9_-]+\\}[ ]*$",
Expand Down Expand Up @@ -2222,6 +2241,18 @@
"title": "TomogramProcessingEnum",
"type": "string"
},
"TomogramReconstructionMethodEnum": {
"description": "Tomogram reconstruction method",
"enum": [
"SART",
"Fourier Space",
"SIRT",
"WBP",
"Unknown"
],
"title": "TomogramReconstructionMethodEnum",
"type": "string"
},
"TomogramSize": {
"additionalProperties": false,
"description": "The size of a tomogram in voxels in each dimension.",
Expand Down Expand Up @@ -2286,18 +2317,6 @@
"title": "TomogramTypeEnum",
"type": "string"
},
"TomogromReconstructionMethodEnum": {
"description": "Tomogram reconstruction method",
"enum": [
"SART",
"Fourier Space",
"SIRT",
"WBP",
"Unknown"
],
"title": "TomogromReconstructionMethodEnum",
"type": "string"
},
"VoxelSpacingEntity": {
"additionalProperties": false,
"description": "A voxel spacing entity.",
Expand Down
62 changes: 62 additions & 0 deletions schema/v1.1.0/metadata-docs/AlignmentTypeEnum.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
# Enum: AlignmentTypeEnum




_Type of alignment_



URI: [AlignmentTypeEnum](AlignmentTypeEnum.md)

## Permissible Values

| Value | Meaning | Description |
| --- | --- | --- |
| LOCAL | None | per-section non-rigid alignment available |
| GLOBAL | None | only per-section rigid alignment available |









## Identifier and Mapping Information







### Schema Source


* from schema: metadata






## LinkML Source

<details>
```yaml
name: alignment_type_enum
description: Type of alignment
from_schema: metadata
rank: 1000
permissible_values:
LOCAL:
text: LOCAL
description: per-section non-rigid alignment available
GLOBAL:
text: GLOBAL
description: only per-section rigid alignment available

```
</details>
80 changes: 40 additions & 40 deletions schema/v1.1.0/metadata-docs/Annotation.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,76 +24,76 @@ URI: [cdp-meta:Annotation](metadataAnnotation)
click DateStampedEntity href "../DateStampedEntity"
AuthoredEntity <|-- Annotation
click AuthoredEntity href "../AuthoredEntity"
Annotation : annotation_method
Annotation : annotation_object
Annotation --> "1" AnnotationObject : annotation_object
click AnnotationObject href "../AnnotationObject"
Annotation : annotation_publications
Annotation : annotation_software
Annotation : authors
Annotation --> "1..*" Author : authors
click Author href "../Author"
Annotation : confidence
Annotation --> "0..1" AnnotationConfidence : confidence
click AnnotationConfidence href "../AnnotationConfidence"
Annotation : dates
Annotation --> "1" DateStamp : dates
click DateStamp href "../DateStamp"
Annotation : files
Annotation --> "*" AnnotationSourceFile : files
click AnnotationSourceFile href "../AnnotationSourceFile"
Annotation : ground_truth_status
Annotation : is_curator_recommended
Annotation : method_type
Annotation --> "1" AnnotationMethodTypeEnum : method_type
click AnnotationMethodTypeEnum href "../AnnotationMethodTypeEnum"
Annotation : object_count
Annotation : version
```


Expand Down Expand Up @@ -590,4 +590,4 @@ attributes:
minimum_cardinality: 1

```
</details>
</details>
10 changes: 5 additions & 5 deletions schema/v1.1.0/metadata-docs/AnnotationConfidence.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ URI: [cdp-meta:AnnotationConfidence](metadataAnnotationConfidence)
class AnnotationConfidence
click AnnotationConfidence href "../AnnotationConfidence"
AnnotationConfidence : ground_truth_used
AnnotationConfidence : precision
AnnotationConfidence : recall
```


Expand Down Expand Up @@ -221,4 +221,4 @@ attributes:
inlined_as_list: true

```
</details>
</details>
Loading

0 comments on commit bf7c59a

Please sign in to comment.