From 0a21c3b12b80c8a894fd46fa4c9e236a456d9025 Mon Sep 17 00:00:00 2001 From: "lucuma-steward[bot]" <106720676+lucuma-steward[bot]@users.noreply.github.com> Date: Sat, 16 Nov 2024 00:04:21 +0000 Subject: [PATCH] Update ODB Schema --- .../lucuma/schemas/ObservationDB.graphql | 58 +++++++++++++++---- 1 file changed, 47 insertions(+), 11 deletions(-) diff --git a/lucuma-schemas/src/clue/resources/lucuma/schemas/ObservationDB.graphql b/lucuma-schemas/src/clue/resources/lucuma/schemas/ObservationDB.graphql index 9fd7eb4..dbb5165 100644 --- a/lucuma-schemas/src/clue/resources/lucuma/schemas/ObservationDB.graphql +++ b/lucuma-schemas/src/clue/resources/lucuma/schemas/ObservationDB.graphql @@ -5028,7 +5028,7 @@ type Execution { ): ExecutionConfig """Determines the execution state as a whole of this observation.""" - state: ObservationExecutionState! + executionState: ExecutionState! """ Executed (or at least partially executed) atom records, across all visits. @@ -6646,22 +6646,23 @@ type Observation { workflow: ObservationWorkflow! } -enum ObservationExecutionState { +enum ExecutionState { """ - The observation isn't sufficiently defined, or there is a problem that - must first be resolved. + The sequence or observation isn't sufficiently defined, or there is a problem + that must first be resolved. """ NOT_DEFINED - """No execution visit has been recorded for this observation.""" + """No execution visit has been recorded.""" NOT_STARTED """ - At least one visit was made for this observation, but it is not yet complete. + At least one visit was made, but the sequence or observation is not yet + complete. """ ONGOING - """No more science data is expected for this observation.""" + """No more data is expected.""" COMPLETED } @@ -7362,6 +7363,34 @@ type Query { includeDeleted: Boolean! = false ): ObservationSelectResult! + """ + Observations grouped by commonly held observing modes. Identify the program by + specifying only one of programId, programReference, or proposalReference. If + more than one is provided, all must match. If none are set, nothing will + match. + """ + observingModeGroup( + """Program ID""" + programId: ProgramId + + """Proposal Reference""" + proposalReference: ProposalReferenceLabel + + """Program reference""" + programReference: ProgramReferenceLabel + + """Filters the selection of observations.""" + WHERE: WhereObservation + + """ + Limits the result to at most this number of matches (but never more than 1000). + """ + LIMIT: NonNegInt + + """Set to true to include deleted values""" + includeDeleted: Boolean! = false + ): ObservingModeGroupSelectResult! + """ Returns the program with the given id or reference, if any. Identify the program by specifying only one of programId, programReference, or @@ -7530,9 +7559,6 @@ type ObservingMode { } type ObservingModeGroup { - """IDs of observations that use the same constraints""" - observationIds: [ObservationId!]! - """Observations associated with the common value""" observations( """Set to true to include deleted values""" @@ -7550,7 +7576,10 @@ type ObservingModeGroup { ): ObservationSelectResult! """Commonly held value across the observations""" - observingMode: ObservingMode + observingMode: ObservingMode! + + """Link back to program.""" + program: Program! } """ @@ -7679,6 +7708,13 @@ type SequenceDigest { and any remaining atoms not included in 'possibleFuture'. """ atomCount: NonNegInt! + + """ + Execution state for the sequence. Note, acquisition sequences are never + 'COMPLETED'. The execution state for the observation as a whole is that of + the science sequence. + """ + executionState: ExecutionState! } """