Skip to content

Commit 43880a8

Browse files
dbirmandbirman
committed
Merge branch '1696-update-release-information-to-include-posting-to-internal-channels' of https://github.com/AllenNeuralDynamics/aind-data-schema into 1696-update-release-information-to-include-posting-to-internal-channels
2 parents 3abd7f0 + 868329b commit 43880a8

14 files changed

Lines changed: 1989 additions & 37 deletions

‎schemas/acquisition_schema.json‎

Lines changed: 202 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3294,6 +3294,7 @@
32943294
"Columbia University": "#/$defs/_Columbia_University",
32953295
"Computar": "#/$defs/_Computar",
32963296
"Conoptics": "#/$defs/_Conoptics",
3297+
"CrestOptics": "#/$defs/_Crestoptics",
32973298
"Custom": "#/$defs/_Custom",
32983299
"DigiKey": "#/$defs/_Digikey",
32993300
"Dodotronic": "#/$defs/_Dodotronic",
@@ -3324,6 +3325,7 @@
33243325
"Leica": "#/$defs/_Leica",
33253326
"LifeCanvas": "#/$defs/_Lifecanvas",
33263327
"Lumen Dynamics": "#/$defs/_Lumen_Dynamics",
3328+
"Lumencor": "#/$defs/_Lumencor",
33273329
"MBF Bioscience": "#/$defs/_Mbf_Bioscience",
33283330
"MIT Department of Brain and Cognitive Sciences": "#/$defs/_Mit_Department_Of_Brain_And_Cognitive_Sciences",
33293331
"MKS Newport": "#/$defs/_Mks_Newport",
@@ -3363,9 +3365,11 @@
33633365
"Simons Foundation": "#/$defs/_Simons_Foundation",
33643366
"Spectra-Physics": "#/$defs/_Spectra_Physics",
33653367
"Spinnaker": "#/$defs/_Spinnaker",
3368+
"TE Connectivity": "#/$defs/_Te_Connectivity",
33663369
"Tamron": "#/$defs/_Tamron",
33673370
"Technical Manufacturing Corporation": "#/$defs/_Technical_Manufacturing_Corporation",
33683371
"Teledyne FLIR": "#/$defs/_Teledyne_Flir",
3372+
"Teledyne Vision Solutions": "#/$defs/_Teledyne_Vision_Solutions",
33693373
"Templeton World Charity Foundation": "#/$defs/_Templeton_World_Charity_Foundation",
33703374
"The Imaging Source": "#/$defs/_The_Imaging_Source",
33713375
"The Lee Company": "#/$defs/_The_Lee_Company",
@@ -3461,6 +3465,9 @@
34613465
{
34623466
"$ref": "#/$defs/_Conoptics"
34633467
},
3468+
{
3469+
"$ref": "#/$defs/_Crestoptics"
3470+
},
34643471
{
34653472
"$ref": "#/$defs/_Custom"
34663473
},
@@ -3551,6 +3558,9 @@
35513558
{
35523559
"$ref": "#/$defs/_Lumen_Dynamics"
35533560
},
3561+
{
3562+
"$ref": "#/$defs/_Lumencor"
3563+
},
35543564
{
35553565
"$ref": "#/$defs/_Mbf_Bioscience"
35563566
},
@@ -3668,6 +3678,9 @@
36683678
{
36693679
"$ref": "#/$defs/_Spinnaker"
36703680
},
3681+
{
3682+
"$ref": "#/$defs/_Te_Connectivity"
3683+
},
36713684
{
36723685
"$ref": "#/$defs/_Tamron"
36733686
},
@@ -3677,6 +3690,9 @@
36773690
{
36783691
"$ref": "#/$defs/_Teledyne_Flir"
36793692
},
3693+
{
3694+
"$ref": "#/$defs/_Teledyne_Vision_Solutions"
3695+
},
36803696
{
36813697
"$ref": "#/$defs/_Templeton_World_Charity_Foundation"
36823698
},
@@ -4639,6 +4655,7 @@
46394655
"Columbia University": "#/$defs/_Columbia_University",
46404656
"Computar": "#/$defs/_Computar",
46414657
"Conoptics": "#/$defs/_Conoptics",
4658+
"CrestOptics": "#/$defs/_Crestoptics",
46424659
"Custom": "#/$defs/_Custom",
46434660
"DigiKey": "#/$defs/_Digikey",
46444661
"Dodotronic": "#/$defs/_Dodotronic",
@@ -4669,6 +4686,7 @@
46694686
"Leica": "#/$defs/_Leica",
46704687
"LifeCanvas": "#/$defs/_Lifecanvas",
46714688
"Lumen Dynamics": "#/$defs/_Lumen_Dynamics",
4689+
"Lumencor": "#/$defs/_Lumencor",
46724690
"MBF Bioscience": "#/$defs/_Mbf_Bioscience",
46734691
"MIT Department of Brain and Cognitive Sciences": "#/$defs/_Mit_Department_Of_Brain_And_Cognitive_Sciences",
46744692
"MKS Newport": "#/$defs/_Mks_Newport",
@@ -4708,9 +4726,11 @@
47084726
"Simons Foundation": "#/$defs/_Simons_Foundation",
47094727
"Spectra-Physics": "#/$defs/_Spectra_Physics",
47104728
"Spinnaker": "#/$defs/_Spinnaker",
4729+
"TE Connectivity": "#/$defs/_Te_Connectivity",
47114730
"Tamron": "#/$defs/_Tamron",
47124731
"Technical Manufacturing Corporation": "#/$defs/_Technical_Manufacturing_Corporation",
47134732
"Teledyne FLIR": "#/$defs/_Teledyne_Flir",
4733+
"Teledyne Vision Solutions": "#/$defs/_Teledyne_Vision_Solutions",
47144734
"Templeton World Charity Foundation": "#/$defs/_Templeton_World_Charity_Foundation",
47154735
"The Imaging Source": "#/$defs/_The_Imaging_Source",
47164736
"The Lee Company": "#/$defs/_The_Lee_Company",
@@ -4806,6 +4826,9 @@
48064826
{
48074827
"$ref": "#/$defs/_Conoptics"
48084828
},
4829+
{
4830+
"$ref": "#/$defs/_Crestoptics"
4831+
},
48094832
{
48104833
"$ref": "#/$defs/_Custom"
48114834
},
@@ -4896,6 +4919,9 @@
48964919
{
48974920
"$ref": "#/$defs/_Lumen_Dynamics"
48984921
},
4922+
{
4923+
"$ref": "#/$defs/_Lumencor"
4924+
},
48994925
{
49004926
"$ref": "#/$defs/_Mbf_Bioscience"
49014927
},
@@ -5013,6 +5039,9 @@
50135039
{
50145040
"$ref": "#/$defs/_Spinnaker"
50155041
},
5042+
{
5043+
"$ref": "#/$defs/_Te_Connectivity"
5044+
},
50165045
{
50175046
"$ref": "#/$defs/_Tamron"
50185047
},
@@ -5022,6 +5051,9 @@
50225051
{
50235052
"$ref": "#/$defs/_Teledyne_Flir"
50245053
},
5054+
{
5055+
"$ref": "#/$defs/_Teledyne_Vision_Solutions"
5056+
},
50255057
{
50265058
"$ref": "#/$defs/_Templeton_World_Charity_Foundation"
50275059
},
@@ -7436,6 +7468,48 @@
74367468
"title": "_Conoptics",
74377469
"type": "object"
74387470
},
7471+
"_Crestoptics": {
7472+
"description": "Model CrestOptics",
7473+
"properties": {
7474+
"name": {
7475+
"const": "CrestOptics",
7476+
"default": "CrestOptics",
7477+
"title": "Name",
7478+
"type": "string"
7479+
},
7480+
"abbreviation": {
7481+
"const": null,
7482+
"default": null,
7483+
"title": "Abbreviation",
7484+
"type": "null"
7485+
},
7486+
"registry": {
7487+
"anyOf": [
7488+
{
7489+
"$ref": "#/$defs/Registry"
7490+
},
7491+
{
7492+
"type": "null"
7493+
}
7494+
],
7495+
"default": null
7496+
},
7497+
"registry_identifier": {
7498+
"anyOf": [
7499+
{
7500+
"type": "string"
7501+
},
7502+
{
7503+
"type": "null"
7504+
}
7505+
],
7506+
"default": null,
7507+
"title": "Registry Identifier"
7508+
}
7509+
},
7510+
"title": "_Crestoptics",
7511+
"type": "object"
7512+
},
74397513
"_Custom": {
74407514
"description": "Model Custom",
74417515
"properties": {
@@ -8843,6 +8917,48 @@
88438917
"title": "_Lumen_Dynamics",
88448918
"type": "object"
88458919
},
8920+
"_Lumencor": {
8921+
"description": "Model Lumencor",
8922+
"properties": {
8923+
"name": {
8924+
"const": "Lumencor",
8925+
"default": "Lumencor",
8926+
"title": "Name",
8927+
"type": "string"
8928+
},
8929+
"abbreviation": {
8930+
"const": null,
8931+
"default": null,
8932+
"title": "Abbreviation",
8933+
"type": "null"
8934+
},
8935+
"registry": {
8936+
"anyOf": [
8937+
{
8938+
"$ref": "#/$defs/Registry"
8939+
},
8940+
{
8941+
"type": "null"
8942+
}
8943+
],
8944+
"default": null
8945+
},
8946+
"registry_identifier": {
8947+
"anyOf": [
8948+
{
8949+
"type": "string"
8950+
},
8951+
{
8952+
"type": "null"
8953+
}
8954+
],
8955+
"default": null,
8956+
"title": "Registry Identifier"
8957+
}
8958+
},
8959+
"title": "_Lumencor",
8960+
"type": "object"
8961+
},
88468962
"_Mapseq": {
88478963
"additionalProperties": false,
88488964
"description": "Model MAPseq",
@@ -10683,6 +10799,48 @@
1068310799
"title": "_Tamron",
1068410800
"type": "object"
1068510801
},
10802+
"_Te_Connectivity": {
10803+
"description": "Model TE Connectivity",
10804+
"properties": {
10805+
"name": {
10806+
"const": "TE Connectivity",
10807+
"default": "TE Connectivity",
10808+
"title": "Name",
10809+
"type": "string"
10810+
},
10811+
"abbreviation": {
10812+
"const": null,
10813+
"default": null,
10814+
"title": "Abbreviation",
10815+
"type": "null"
10816+
},
10817+
"registry": {
10818+
"anyOf": [
10819+
{
10820+
"$ref": "#/$defs/Registry"
10821+
},
10822+
{
10823+
"type": "null"
10824+
}
10825+
],
10826+
"default": "Research Organization Registry (ROR)"
10827+
},
10828+
"registry_identifier": {
10829+
"anyOf": [
10830+
{
10831+
"type": "string"
10832+
},
10833+
{
10834+
"type": "null"
10835+
}
10836+
],
10837+
"default": "034frgp20",
10838+
"title": "Registry Identifier"
10839+
}
10840+
},
10841+
"title": "_Te_Connectivity",
10842+
"type": "object"
10843+
},
1068610844
"_Technical_Manufacturing_Corporation": {
1068710845
"description": "Model Technical Manufacturing Corporation",
1068810846
"properties": {
@@ -10767,6 +10925,48 @@
1076710925
"title": "_Teledyne_Flir",
1076810926
"type": "object"
1076910927
},
10928+
"_Teledyne_Vision_Solutions": {
10929+
"description": "Model Teledyne Vision Solutions",
10930+
"properties": {
10931+
"name": {
10932+
"const": "Teledyne Vision Solutions",
10933+
"default": "Teledyne Vision Solutions",
10934+
"title": "Name",
10935+
"type": "string"
10936+
},
10937+
"abbreviation": {
10938+
"const": null,
10939+
"default": null,
10940+
"title": "Abbreviation",
10941+
"type": "null"
10942+
},
10943+
"registry": {
10944+
"anyOf": [
10945+
{
10946+
"$ref": "#/$defs/Registry"
10947+
},
10948+
{
10949+
"type": "null"
10950+
}
10951+
],
10952+
"default": null
10953+
},
10954+
"registry_identifier": {
10955+
"anyOf": [
10956+
{
10957+
"type": "string"
10958+
},
10959+
{
10960+
"type": "null"
10961+
}
10962+
],
10963+
"default": null,
10964+
"title": "Registry Identifier"
10965+
}
10966+
},
10967+
"title": "_Teledyne_Vision_Solutions",
10968+
"type": "object"
10969+
},
1077010970
"_Templeton_World_Charity_Foundation": {
1077110971
"description": "Model Templeton World Charity Foundation",
1077210972
"properties": {
@@ -11288,8 +11488,8 @@
1128811488
"type": "string"
1128911489
},
1129011490
"schema_version": {
11291-
"const": "2.2.3",
11292-
"default": "2.2.3",
11491+
"const": "2.2.4",
11492+
"default": "2.2.4",
1129311493
"title": "Schema Version",
1129411494
"type": "string"
1129511495
},

‎schemas/data_description_schema.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1560,8 +1560,8 @@
15601560
"type": "string"
15611561
},
15621562
"schema_version": {
1563-
"const": "2.3.0",
1564-
"default": "2.3.0",
1563+
"const": "2.3.1",
1564+
"default": "2.3.1",
15651565
"title": "Schema Version",
15661566
"type": "string"
15671567
},
@@ -1615,8 +1615,8 @@
16151615
}
16161616
],
16171617
"default": null,
1618-
"description": "Name of data, conventionally also the name of the directory containing all data and metadata",
1619-
"title": "Name"
1618+
"description": "When left blank, a name will be generated based on subject_id and creation_time. Conventionally also used as the name of the data folder.",
1619+
"title": "Data asset name"
16201620
},
16211621
"institution": {
16221622
"description": "An established society, corporation, foundation or other organization that collected this data",

0 commit comments

Comments
 (0)