v1.21.5 (#194)

* session fix

* Get integrations overview request

---------

Co-authored-by: LennartSchmidtKern <[email protected]>
Co-authored-by: JWittmeyer <[email protected]>

Author: 3 people

cognition_objects/integration.py

@@ -51,6 +51,37 @@ def get_all(
     return query.order_by(CognitionIntegration.created_at.desc()).all()
 
 
+def get_all_all_overview(
+    integration_type: Optional[CognitionIntegrationType] = None,
+) -> Dict[str, Any]:
+    add_filter = ""
+    if integration_type:
+        add_filter = f" WHERE type = '{integration_type.value}' "
+    query = f"""
+    SELECT jsonb_object_agg(org_id::text, integrations)
+    FROM (
+        SELECT 
+            organization_id AS org_id,
+            jsonb_object_agg(
+                id::text,
+                jsonb_build_object(
+                    'name', name,
+                    'state', state,
+                    'error_message', error_message,
+                    'is_synced', is_synced,
+                    'last_synced_at', last_synced_at
+                )
+            ) AS integrations
+        FROM cognition.integration i
+        {add_filter}
+        GROUP BY organization_id
+    ) sub """
+    value = general.execute_first(query)
+    if value and value[0]:
+        return value[0]
+    return {}
+
+
 def get_all_in_org(
     org_id: str,
     integration_type: Optional[str] = None,

listeners.py

@@ -1,31 +1,34 @@
 from sqlalchemy import event
 from datetime import datetime, timezone
 from submodules.model.models import CognitionConversation, CognitionMessage
-from submodules.model.session_wrapper import with_session
 import traceback
 
 from src.controller.admin_query_message_summary import (
     manager as admin_query_message_summary_manager,
 )
+from submodules.model.business_objects import general
 
 
 @event.listens_for(CognitionConversation, "after_insert")
-@with_session()
 def after_insert(mapper, connection, conversation_entity: CognitionConversation):
     try:
+        session_token = general.get_ctx_token()
         admin_query_message_summary_manager.log_conversation_summary(
             conversation_entity, 1
         )
     except Exception:
-        print("Error in after_insert listener of CognitionConversation", flush=True)
         print(traceback.format_exc(), flush=True)
+    finally:
+        general.remove_and_refresh_session(session_token)
 
 
 @event.listens_for(CognitionMessage, "after_insert")
-@with_session()
 def after_insert(mapper, connection, message_entity: CognitionMessage):
     try:
+        session_token = general.get_ctx_token()
         admin_query_message_summary_manager.log_message_summary(message_entity)
     except Exception:
         print("Error in after_insert listener of CognitionMessage", flush=True)
         print(traceback.format_exc(), flush=True)
+    finally:
+        general.remove_and_refresh_session(session_token)