#824 Fixed problem with aggregating items

Author: bogadisa

src/backend_api/app/api/routes/unidentified_item.py

@@ -116,7 +116,6 @@ async def get_non_aggregated(
 
 @router.post(
     "/add_aggregated/",
-    response_model=list[schemas.UnidentifiedItem],
     dependencies=[Depends(get_current_active_superuser)],
 )
 async def add_aggregated(
@@ -129,8 +128,4 @@ async def add_aggregated(
     And inserts the new items
     """
 
-    deleted_non_aggregated = await CRUD_unidentifiedItem.add_aggregated(
-        db=db, aggregated_objs=aggregated_objs
-    )
-
-    return deleted_non_aggregated
+    await CRUD_unidentifiedItem.add_aggregated(db=db, aggregated_objs=aggregated_objs)

src/backend_api/app/crud/extensions/crud_unidentifiedItem.py

@@ -35,12 +35,10 @@ async def get_non_aggregated(self, db: Session) -> list[UnidentifiedItem]:
 
     async def add_aggregated(
         self, db: Session, aggregated_objs: list[UnidentifiedItemCreate]
-    ) -> list[UnidentifiedItem]:
+    ):
         stmt = delete(model_UnidentifiedItem).where(
             model_UnidentifiedItem.aggregated.isnot(True),
         )
-        non_aggregated_objs = db.execute(stmt)
+        db.execute(stmt)
 
         await self.create(db, obj_in=aggregated_objs, return_nothing=True)
-
-        return non_aggregated_objs

src/backend_data_retrieval/data_retrieval_app/external_data_retrieval/data_retrieval/poe_api_handler.py

@@ -302,6 +302,12 @@ async def _send_n_recursion_requests(
             logger.exception(
                 f"The following exception occured during {self._send_n_recursion_requests.__name__}: {e}"
             )
+            raise
+        except ProgramTooSlowException:
+            pass
+        except ProgramFinished:
+            pass
+        finally:
             if waiting_for_next_id_lock.locked():
                 logger.info("Released lock after crash")
                 if headers is not None:
@@ -321,7 +327,6 @@ async def _send_n_recursion_requests(
                             )
 
                 waiting_for_next_id_lock.release()
-            raise
 
     async def _follow_stream(
         self,
@@ -355,6 +360,10 @@ async def _follow_stream(
                 stashes = []
                 stashes_ready_event.set()
                 await asyncio.sleep(1)
+        except ProgramTooSlowException:
+            pass
+        except ProgramFinished:
+            pass
         except Exception as e:
             logger.info(
                 f"The following exception occured during {self._follow_stream}: {e}"