Skip to content

Commit 494edda

Browse files
authored
Merge pull request #327 from linkml/linkml-model-1.8.0rc2
linkml-model-1.8.0rc2
2 parents 34a30ee + 37297a8 commit 494edda

File tree

25 files changed

+7998
-5080
lines changed

25 files changed

+7998
-5080
lines changed

linkml_runtime/linkml_model/annotations.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Auto generated from annotations.yaml by pythongen.py version: 0.0.1
2-
# Generation date: 2024-02-07T17:29:22
2+
# Generation date: 2024-06-27T23:15:03
33
# Schema: annotations
44
#
55
# id: https://w3id.org/linkml/annotations

linkml_runtime/linkml_model/datasets.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Auto generated from datasets.yaml by pythongen.py version: 0.0.1
2-
# Generation date: 2024-02-07T17:29:27
2+
# Generation date: 2024-06-27T23:15:13
33
# Schema: datasets
44
#
55
# id: https://w3id.org/linkml/datasets
1.92 KB
Binary file not shown.

linkml_runtime/linkml_model/extensions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Auto generated from extensions.yaml by pythongen.py version: 0.0.1
2-
# Generation date: 2024-02-07T17:29:29
2+
# Generation date: 2024-06-27T23:15:16
33
# Schema: extensions
44
#
55
# id: https://w3id.org/linkml/extensions

linkml_runtime/linkml_model/graphql/meta.graphql

Lines changed: 96 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,10 @@ type AnonymousSlotExpression implements SlotExpression
156156
range: Element
157157
rangeExpression: AnonymousClassExpression
158158
enumRange: EnumExpression
159+
bindings: [EnumBinding]
159160
required: Boolean
160161
recommended: Boolean
162+
multivalued: Boolean
161163
inlined: Boolean
162164
inlinedAsList: Boolean
163165
minimumValue: Anything
@@ -212,7 +214,6 @@ type ArrayExpression implements Extensible, Annotatable, CommonMetadata
212214
exactNumberDimensions: Integer
213215
minimumNumberDimensions: Integer
214216
maximumNumberDimensions: Anything
215-
hasExtraDimensions: Boolean
216217
dimensions: [DimensionExpression]
217218
extensions: [Extension]
218219
annotations: [Annotation]
@@ -564,6 +565,49 @@ type Element implements Extensible, Annotatable, CommonMetadata
564565
keywords: [String]
565566
}
566567

568+
type EnumBinding implements Extensible, Annotatable, CommonMetadata
569+
{
570+
range: EnumDefinition
571+
obligationLevel: ObligationLevelEnum
572+
bindsValueOf: String
573+
pvFormula: PvFormulaOptions
574+
extensions: [Extension]
575+
annotations: [Annotation]
576+
description: String
577+
altDescriptions: [AltDescription]
578+
title: String
579+
deprecated: String
580+
todos: [String]
581+
notes: [String]
582+
comments: [String]
583+
examples: [Example]
584+
inSubset: [SubsetDefinition]
585+
fromSchema: Uri
586+
importedFrom: String
587+
source: Uriorcurie
588+
inLanguage: String
589+
seeAlso: [Uriorcurie]
590+
deprecatedElementHasExactReplacement: Uriorcurie
591+
deprecatedElementHasPossibleReplacement: Uriorcurie
592+
aliases: [String]
593+
structuredAliases: [StructuredAlias]
594+
mappings: [Uriorcurie]
595+
exactMappings: [Uriorcurie]
596+
closeMappings: [Uriorcurie]
597+
relatedMappings: [Uriorcurie]
598+
narrowMappings: [Uriorcurie]
599+
broadMappings: [Uriorcurie]
600+
createdBy: Uriorcurie
601+
contributors: [Uriorcurie]
602+
createdOn: Datetime
603+
lastUpdatedOn: Datetime
604+
modifiedBy: Uriorcurie
605+
status: Uriorcurie
606+
rank: Integer
607+
categories: [Uriorcurie]
608+
keywords: [String]
609+
}
610+
567611
type EnumDefinition implements EnumExpression
568612
{
569613
name: String!
@@ -817,6 +861,8 @@ type PermissibleValue implements Extensible, Annotatable, CommonMetadata
817861
description: String
818862
meaning: Uriorcurie
819863
unit: UnitOfMeasure
864+
instantiates: [Uriorcurie]
865+
implements: [Uriorcurie]
820866
isA: PermissibleValue
821867
mixins: [PermissibleValue]
822868
extensions: [Extension]
@@ -936,6 +982,7 @@ type SchemaDefinition
936982
generationDate: Datetime
937983
slotNamesUnique: Boolean
938984
settings: [Setting]
985+
bindings: [EnumBinding]
939986
name: Ncname!
940987
}
941988

@@ -997,7 +1044,6 @@ type SlotDefinition implements SlotExpression
9971044
singularName: String
9981045
domain: ClassDefinition
9991046
slotUri: Uriorcurie
1000-
multivalued: Boolean
10011047
array: ArrayExpression
10021048
inherited: Boolean
10031049
readonly: String
@@ -1032,14 +1078,17 @@ type SlotDefinition implements SlotExpression
10321078
disjointWith: [SlotDefinition]
10331079
childrenAreMutuallyDisjoint: Boolean
10341080
unionOf: [SlotDefinition]
1081+
typeMappings: [TypeMapping]
10351082
isA: SlotDefinition
10361083
mixins: [SlotDefinition]
10371084
applyTo: [SlotDefinition]
10381085
range: Element
10391086
rangeExpression: AnonymousClassExpression
10401087
enumRange: EnumExpression
1088+
bindings: [EnumBinding]
10411089
required: Boolean
10421090
recommended: Boolean
1091+
multivalued: Boolean
10431092
inlined: Boolean
10441093
inlinedAsList: Boolean
10451094
minimumValue: Anything
@@ -1069,8 +1118,10 @@ interface SlotExpression
10691118
range: Element
10701119
rangeExpression: AnonymousClassExpression
10711120
enumRange: EnumExpression
1121+
bindings: [EnumBinding]
10721122
required: Boolean
10731123
recommended: Boolean
1124+
multivalued: Boolean
10741125
inlined: Boolean
10751126
inlinedAsList: Boolean
10761127
minimumValue: Anything
@@ -1100,6 +1151,7 @@ type StructuredAlias implements Expression, Extensible, Annotatable, CommonMetad
11001151
literalForm: String!
11011152
predicate: AliasPredicateEnum
11021153
categories: [Uriorcurie]
1154+
contexts: [Uri]
11031155
extensions: [Extension]
11041156
annotations: [Annotation]
11051157
description: String
@@ -1265,6 +1317,48 @@ interface TypeExpression
12651317
allOf: [AnonymousTypeExpression]
12661318
}
12671319

1320+
type TypeMapping implements Extensible, Annotatable, CommonMetadata
1321+
{
1322+
framework: String!
1323+
type: TypeDefinition
1324+
stringSerialization: String
1325+
extensions: [Extension]
1326+
annotations: [Annotation]
1327+
description: String
1328+
altDescriptions: [AltDescription]
1329+
title: String
1330+
deprecated: String
1331+
todos: [String]
1332+
notes: [String]
1333+
comments: [String]
1334+
examples: [Example]
1335+
inSubset: [SubsetDefinition]
1336+
fromSchema: Uri
1337+
importedFrom: String
1338+
source: Uriorcurie
1339+
inLanguage: String
1340+
seeAlso: [Uriorcurie]
1341+
deprecatedElementHasExactReplacement: Uriorcurie
1342+
deprecatedElementHasPossibleReplacement: Uriorcurie
1343+
aliases: [String]
1344+
structuredAliases: [StructuredAlias]
1345+
mappings: [Uriorcurie]
1346+
exactMappings: [Uriorcurie]
1347+
closeMappings: [Uriorcurie]
1348+
relatedMappings: [Uriorcurie]
1349+
narrowMappings: [Uriorcurie]
1350+
broadMappings: [Uriorcurie]
1351+
createdBy: Uriorcurie
1352+
contributors: [Uriorcurie]
1353+
createdOn: Datetime
1354+
lastUpdatedOn: Datetime
1355+
modifiedBy: Uriorcurie
1356+
status: Uriorcurie
1357+
rank: Integer
1358+
categories: [Uriorcurie]
1359+
keywords: [String]
1360+
}
1361+
12681362
type UniqueKey implements Extensible, Annotatable, CommonMetadata
12691363
{
12701364
uniqueKeyName: String!

linkml_runtime/linkml_model/jsonld/meta.context.jsonld

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"comments": {
33
"description": "Auto generated by LinkML jsonld context generator",
4-
"generation_date": "2024-02-07T17:29:49",
4+
"generation_date": "2024-06-27T23:15:38",
55
"source": "meta.yaml"
66
},
77
"@context": {
@@ -44,6 +44,9 @@
4444
"alias": {
4545
"@id": "skos:prefLabel"
4646
},
47+
"contexts": {
48+
"@type": "@id"
49+
},
4750
"predicate": {
4851
"@context": {
4952
"@vocab": "@null",
@@ -86,6 +89,9 @@
8689
"bidirectional": {
8790
"@type": "xsd:boolean"
8891
},
92+
"bindings": {
93+
"@type": "@id"
94+
},
8995
"boolean_slot": {
9096
"@type": "@id"
9197
},
@@ -233,9 +239,6 @@
233239
"generation_date": {
234240
"@type": "xsd:dateTime"
235241
},
236-
"has_extra_dimensions": {
237-
"@type": "xsd:boolean"
238-
},
239242
"has_member": {
240243
"@type": "@id"
241244
},
@@ -357,6 +360,9 @@
357360
"locally_reflexive": {
358361
"@type": "xsd:boolean"
359362
},
363+
"type": {
364+
"@type": "@id"
365+
},
360366
"mappings": {
361367
"@type": "@id",
362368
"@id": "skos:mappingRelation"
@@ -412,6 +418,14 @@
412418
"notes": {
413419
"@id": "skos:editorialNote"
414420
},
421+
"obligation_level": {
422+
"@context": {
423+
"@vocab": "@null",
424+
"text": "skos:notation",
425+
"description": "skos:prefLabel",
426+
"meaning": "@id"
427+
}
428+
},
415429
"open_world": {
416430
"@type": "xsd:boolean"
417431
},
@@ -607,6 +621,9 @@
607621
"tree_root": {
608622
"@type": "xsd:boolean"
609623
},
624+
"type_mappings": {
625+
"@type": "@id"
626+
},
610627
"uri": {
611628
"@type": "@id"
612629
},

0 commit comments

Comments
 (0)