Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added simulation properties isDraft and status to search index #5237

Merged
merged 4 commits into from
Nov 19, 2024
Merged

Added simulation properties isDraft and status to search index #5237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
413c54f
Added simulation properties isDraft and status to SynaptomeSimulation…
crisely09 Nov 19, 2024
0a9b076
remove quotes
crisely09 Nov 19, 2024
1b5a18b
typo
crisely09 Nov 19, 2024
c5b84be
Merge branch 'master' into simulation_properties
crisely09 Nov 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions tests/docker/config/search/construct-query.sparql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,8 @@ CONSTRUCT {
?alias :singleNeuronSimulation ?singleNeuronSimulation .
?singleNeuronSimulation :injectionLocation ?injectionLocation .
?singleNeuronSimulation :recordingLocation ?recordingLocation .
?singleNeuronSimulation :isDraft ?isDraft .
?singleNeuronSimulation :status ?status .
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

status is already used by simulation campaigns, are we sure they are not clashing each other ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

are they indexed together? how is the batch constructed?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is there a way to test this?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They can as the batch takes the state log in its chronological order

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

then isn't it the same for Simulation VS SimulationCampaign, they both use status

?singleNeuronSimulation :emodel ?singleNeuronSimulationEmodelId .
?singleNeuronSimulationEmodelId :name ?singleNeuronSimulationEmodelName .
## SingleNeuronSynaptome
Expand All @@ -254,6 +256,8 @@ CONSTRUCT {
?alias :synaptomeSimulation ?synaptomeSimulation .
?synaptomeSimulation :injectionLocation ?injectionLocation .
?synaptomeSimulation :recordingLocation ?recordingLocation .
?synaptomeSimulation :isDraft ?isDraft .
?synaptomeSimulation :status ?status .
?synaptomeSimulation :synaptome ?synaptomeId .
?synaptomeId :name ?synaptomeName .

Expand Down Expand Up @@ -548,6 +552,8 @@ CONSTRUCT {
# Simulations
OPTIONAL { ?id bmo:injectionLocation ?injectionLocation . } .
OPTIONAL { ?id nsg:recordingLocation ?recordingLocation . } .
OPTIONAL { ?id nsg:status ?status . } .
OPTIONAL { ?id bmo:isDraft ?isDraft . } .

# Bouton density
OPTIONAL {
Expand Down
4 changes: 3 additions & 1 deletion tests/src/test/resources/kg/search/data/single-neuron-simulation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,7 @@
"@id": "https://bbp.epfl.ch/data/emodel",
"@type": "EModel"
},
"recordingLocation": ["dendrite.01A", "dendrite.01B"]
"recordingLocation": ["dendrite.01A", "dendrite.01B"],
"isDraft": true,
"status": "validated"
}
4 changes: 3 additions & 1 deletion tests/src/test/resources/kg/search/data/synaptome-simulation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,7 @@
"used": {
"@id": "https://bbp.epfl.ch/data/synapse/single-neuron-synaptome",
"@type": "SingleNeuronSynaptome"
}
},
"isDraft": false,
"status": "Done"
}
8 changes: 6 additions & 2 deletions tests/src/test/scala/ch/epfl/bluebrain/nexus/tests/kg/SearchConfigIndexingSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1117,7 +1117,9 @@ class SearchConfigIndexingSpec extends BaseIntegrationSpec {
"singleNeuronSimulation": {
"injectionLocation": "dendrite.01B",
"recordingLocation": ["dendrite.01A", "dendrite.01B"],
"emodel": { "@id" : "https://bbp.epfl.ch/data/emodel", "name" : "EM__fa285b7__dSTUT__15"}
"emodel": { "@id" : "https://bbp.epfl.ch/data/emodel", "name" : "EM__fa285b7__dSTUT__15"},
"isDraft": true,
"status": "validated"
}
}"""

Expand Down Expand Up @@ -1146,7 +1148,9 @@ class SearchConfigIndexingSpec extends BaseIntegrationSpec {
"synaptomeSimulation": {
"injectionLocation": "soma[0]",
"recordingLocation": ["soma[0]_0.5", "dend[38]_0.5", "dend[1]_0.4", "apic[53]_0.3"],
"synaptome": { "@id" : "https://bbp.epfl.ch/data/synapse/single-neuron-synaptome", "name" : "synaptome-model-04"}
"synaptome": { "@id" : "https://bbp.epfl.ch/data/synapse/single-neuron-synaptome", "name" : "synaptome-model-04"},
"isDraft": false,
"status": "Done"
}
}"""

Expand Down