Merge branch 'signals' of https://github.com/NiveditJain/exospherehost into signals

Author: NiveditJain

state-manager/app/controller/prune_signal.py

@@ -13,7 +13,7 @@ async def prune_signal(namespace_name: str, state_id: PydanticObjectId, body: Pr
     try:
         logger.info(f"Received prune signal for state {state_id} for namespace {namespace_name}", x_exosphere_request_id=x_exosphere_request_id)
 
-        state = await State.find_one(State.id == state_id)
+        state = await State.find_one(State.id == state_id, State.namespace_name == namespace_name)
 
         if not state:
             raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="State not found")

state-manager/app/controller/re_queue_after_signal.py

@@ -13,13 +13,13 @@ async def re_queue_after_signal(namespace_name: str, state_id: PydanticObjectId,
     try:
         logger.info(f"Received re-queue after signal for state {state_id} for namespace {namespace_name}", x_exosphere_request_id=x_exosphere_request_id)
 
-        state = await State.find_one(State.id == state_id)
+        state = await State.find_one(State.id == state_id, State.namespace_name == namespace_name)
 
         if not state:
             raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="State not found")
 
         state.status = StateStatusEnum.CREATED
-        state.enqueue_after = state.enqueue_after + body.enqueue_after
+        state.enqueue_after = int(time.time() * 1000) + body.enqueue_after
         await state.save()
 
         return SignalResponseModel(status=StateStatusEnum.CREATED, enqueue_after=state.enqueue_after)

state-manager/app/models/signal_models.py

@@ -11,4 +11,4 @@ class PruneRequestModel(BaseModel):
     data: dict[str, Any] = Field(..., description="Data of the state")
 
 class ReEnqueueAfterRequestModel(BaseModel):
-    enqueue_after: int = Field(..., description="Unix time in milliseconds after which the state should be re-enqueued")
+    enqueue_after: int = Field(..., description="Duration in milliseconds to delay the re-enqueuing of the state")