refactor(memory): streamline memory extraction by utilizing extract_text_content utility

surfsense_backend/app/agents/new_chat/memory_extraction.py

@@ -16,6 +16,7 @@ from sqlalchemy import select
 
 from app.agents.new_chat.tools.update_memory import _save_memory
 from app.db import SearchSpace, User, shielded_async_session
+from app.utils.content_utils import extract_text_content
 
 logger = logging.getLogger(__name__)
 
@@ -144,11 +145,7 @@ async def extract_and_save_memory(
                 [HumanMessage(content=prompt)],
                 config={"tags": ["surfsense:internal", "memory-extraction"]},
             )
-            text = (
-                response.content
-                if isinstance(response.content, str)
-                else str(response.content)
-            ).strip()
+            text = extract_text_content(response.content).strip()
 
             if text == "NO_UPDATE" or not text:
                 logger.debug("Memory extraction: no update needed (user %s)", uid)
@@ -207,11 +204,7 @@ async def extract_and_save_team_memory(
                 [HumanMessage(content=prompt)],
                 config={"tags": ["surfsense:internal", "team-memory-extraction"]},
             )
-            text = (
-                response.content
-                if isinstance(response.content, str)
-                else str(response.content)
-            ).strip()
+            text = extract_text_content(response.content).strip()
 
             if text == "NO_UPDATE" or not text:
                 logger.debug(

surfsense_backend/app/agents/new_chat/tools/update_memory.py

@@ -27,6 +27,7 @@ from sqlalchemy import select
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from app.db import SearchSpace, User
+from app.utils.content_utils import extract_text_content
 
 logger = logging.getLogger(__name__)
 
@@ -188,11 +189,7 @@ async def _forced_rewrite(content: str, llm: Any) -> str | None:
             [HumanMessage(content=prompt)],
             config={"tags": ["surfsense:internal"]},
         )
-        text = (
-            response.content
-            if isinstance(response.content, str)
-            else str(response.content)
-        )
+        text = extract_text_content(response.content)
         return text.strip()
     except Exception:
         logger.exception("Forced rewrite LLM call failed")
@@ -235,6 +232,16 @@ async def _save_memory(
     label : str
         Human label for log messages (e.g. "user memory", "team memory").
     """
+    if not isinstance(updated_memory, str):
+        logger.warning(
+            "Refusing non-string memory payload (type=%s)",
+            type(updated_memory).__name__,
+        )
+        return {
+            "status": "error",
+            "message": "Internal error: memory payload must be a string.",
+        }
+
     content = updated_memory
 
     # --- forced rewrite if over the hard limit ---

surfsense_backend/app/routes/memory_routes.py

@@ -16,6 +16,7 @@ from app.agents.new_chat.llm_config import (
 from app.agents.new_chat.tools.update_memory import MEMORY_HARD_LIMIT, _save_memory
 from app.db import User, get_async_session
 from app.users import current_active_user
+from app.utils.content_utils import extract_text_content
 
 logger = logging.getLogger(__name__)
 
@@ -123,11 +124,7 @@ async def edit_user_memory(
             [HumanMessage(content=prompt)],
             config={"tags": ["surfsense:internal", "memory-edit"]},
         )
-        updated = (
-            response.content
-            if isinstance(response.content, str)
-            else str(response.content)
-        ).strip()
+        updated = extract_text_content(response.content).strip()
     except Exception as e:
         logger.exception("Memory edit LLM call failed: %s", e)
         raise HTTPException(status_code=500, detail="Memory edit failed.") from e

surfsense_backend/app/routes/search_spaces_routes.py

@@ -35,6 +35,7 @@ from app.schemas import (
     SearchSpaceWithStats,
 )
 from app.users import current_active_user
+from app.utils.content_utils import extract_text_content
 from app.utils.rbac import check_permission, check_search_space_access
 
 logger = logging.getLogger(__name__)
@@ -356,11 +357,7 @@ async def edit_team_memory(
             [HumanMessage(content=prompt)],
             config={"tags": ["surfsense:internal", "memory-edit"]},
         )
-        updated = (
-            response.content
-            if isinstance(response.content, str)
-            else str(response.content)
-        ).strip()
+        updated = extract_text_content(response.content).strip()
     except Exception as e:
         logger.exception("Team memory edit LLM call failed: %s", e)
         raise HTTPException(status_code=500, detail="Team memory edit failed.") from e