Add EXT_START/END_OBS events when submitted via http

gemini-hlsw · Nov 20, 2023 · 80b1652 · 80b1652
1 parent f35bbfa
commit 80b1652
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 14 deletions.
diff --git a/gds/src/main/scala/edu/gemini/aspen/gds/observations/ObservationFSM.scala b/gds/src/main/scala/edu/gemini/aspen/gds/observations/ObservationFSM.scala
@@ -12,6 +12,7 @@ import java.util.logging.Logger
 trait ObservationFSM[F[_]] {
   def addObservationEvent(obsEvent: ObservationEvent): F[Unit]
   def stopObservation: F[Unit]
+  def startObservation: F[Unit]
   def step: F[Unit]
 }
 
@@ -58,13 +59,17 @@ object ObservationFSM {
             )
         }.flatten
 
-        def stopObservation: F[Unit] = state.modify {
-          case Running(events) =>
-            WaitingForEvents(events, retryConfig.retries) -> (logger.infoF(
-              s"Observation $dataLabel stopped by Seqexeq"
-            ) >> qStep)
-          case st @ _          => st -> F.unit
-        }.flatten
+        def startObservation: F[Unit] = addObservationEvent(ObservationEvent.EXT_START_OBS)
+
+        def stopObservation: F[Unit] = 
+          addObservationEvent(ObservationEvent.EXT_END_OBS) *> 
+            state.modify {
+              case Running(events) =>
+                WaitingForEvents(events, retryConfig.retries) -> (logger.infoF(
+                  s"Observation $dataLabel stopped by Seqexeq"
+                ) >> qStep)
+              case st @ _          => st -> F.unit
+            }.flatten
 
         def step: F[Unit] = state.modify {
           case st @ WaitingForEvents(_, _) => st -> waitForEvents

diff --git a/gds/src/main/scala/edu/gemini/aspen/gds/observations/ObservationManager.scala b/gds/src/main/scala/edu/gemini/aspen/gds/observations/ObservationManager.scala
@@ -54,10 +54,11 @@ object ObservationManager {
         def process(stateEvent: ObservationStateEvent): F[Unit] = {
           println(stateEvent)
           stateEvent match {
-            case Start(dataLabel, _) =>
+            case Start(dataLabel) =>
               for {
                 _ <- logger.infoF(s"Starting observation $dataLabel")
-                _ <- addDataLabel(dataLabel)
+                i <- addDataLabel(dataLabel)
+                _ <- i.fsm.startObservation
               } yield ()
 
             case e @ Stop(dataLabel) => withObsItem(dataLabel, e)(_.fsm.stopObservation)

diff --git a/gds/src/main/scala/edu/gemini/aspen/gds/observations/ObservationStateEvent.scala b/gds/src/main/scala/edu/gemini/aspen/gds/observations/ObservationStateEvent.scala
@@ -6,7 +6,7 @@ import edu.gemini.aspen.giapi.data.{ DataLabel, ObservationEvent }
 sealed trait ObservationStateEvent
 
 object ObservationStateEvent {
-  final case class Start(dataLabel: DataLabel, programId: String) extends ObservationStateEvent
+  final case class Start(dataLabel: DataLabel) extends ObservationStateEvent
   final case class Stop(dataLabel: DataLabel) extends ObservationStateEvent
   final case class Abort(dataLabel: DataLabel) extends ObservationStateEvent
   final case class Delete(dataLabel: DataLabel) extends ObservationStateEvent

diff --git a/gds/src/main/scala/edu/gemini/aspen/gds/seqexec/Requests.scala b/gds/src/main/scala/edu/gemini/aspen/gds/seqexec/Requests.scala
@@ -13,7 +13,6 @@ private[seqexec] final case class KeywordRequest(
 )
 
 private[seqexec] final case class OpenObservationRequest(
-  programId: String,
   dataLabel: DataLabel,
   keywords:  List[KeywordValue]
 )
@@ -53,10 +52,9 @@ object Decoders {
     new Decoder[OpenObservationRequest] {
       final def apply(c: HCursor): Decoder.Result[OpenObservationRequest] =
         for {
-          pi  <- c.downField("program_id").as[String]
           dl  <- c.downField("data_label").as[DataLabel]
           kws <- c.downField("keywords").as[List[KeywordValue]]
-        } yield OpenObservationRequest(pi, dl, kws)
+        } yield OpenObservationRequest(dl, kws)
     }
 
   implicit val dataLabelRqstDecoder: Decoder[DataLabelRequest] =

diff --git a/gds/src/main/scala/edu/gemini/aspen/gds/seqexec/SeqexecServer.scala b/gds/src/main/scala/edu/gemini/aspen/gds/seqexec/SeqexecServer.scala
@@ -46,7 +46,7 @@ object SeqexecServer {
           for {
             oor <- req.as[OpenObservationRequest]
             _   <-
-              obsStateQ.offer(Start(oor.dataLabel, oor.programId))
+              obsStateQ.offer(Start(oor.dataLabel))
             _   <- oor.keywords.traverse { kw =>
                      obsStateQ.offer(AddKeyword(oor.dataLabel, kwv2Collected(kw)))
                    }