Enhance manual retry state functionality by adding 'manul_retry_fanout_id'

state-manager/app/controller/manual_retry_state.py

@@ -30,7 +30,8 @@ async def manual_retry_state(namespace_name: str, state_id: PydanticObjectId, bo
                 error=None,
                 parents=state.parents,
                 does_unites=state.does_unites,
-                fanout_id=body.fanout_id # this will ensure that multiple unwanted retries are not formed because of index in database
+                fanout_id=body.fanout_id, # this will ensure that multiple unwanted retries are not formed because of index in database
+                manual_retry_fanout_id=body.fanout_id # This is included in the state fingerprint to allow unique manual retries of unite nodes.
             )
             retry_state = await retry_state.insert()
             logger.info(f"Retry state {retry_state.id} created for state {state_id}", x_exosphere_request_id=x_exosphere_request_id)

state-manager/app/models/db/state.py

@@ -27,6 +27,7 @@ class State(BaseDatabaseModel):
     enqueue_after: int = Field(default_factory=lambda: int(time.time() * 1000), gt=0, description="Unix time in milliseconds after which the state should be enqueued")
     retry_count: int = Field(default=0, description="Number of times the state has been retried")
     fanout_id: str = Field(default_factory=lambda: str(uuid.uuid4()), description="Fanout ID of the state")
+    manual_retry_fanout_id: str = Field(default="", description="Fanout ID from a manual retry request, ensuring unique retries for unite nodes.")
 
     @before_event([Insert, Replace, Save])
     def _generate_fingerprint(self):
@@ -42,6 +43,7 @@ def _generate_fingerprint(self):
             "run_id": self.run_id,
             "retry_count": self.retry_count,
             "parents": {k: str(v) for k, v in self.parents.items()},
+            "manual_retry_fanout_id": self.manual_retry_fanout_id,
         }
         payload = json.dumps(
             data,