Fix: Beta testing fixes (#16)

Co-authored-by: phernandez <phernandez@basicmachines.co>

src/basic_memory/api/routers/memory_router.py

@@ -32,6 +32,7 @@ async def to_graph_context(context, entity_repository: EntityRepository, page: i
                 return EntitySummary(
                     title=item.title,  # pyright: ignore
                     permalink=item.permalink,
+                    content=item.content,
                     file_path=item.file_path,
                     created_at=item.created_at,
                 )
@@ -52,8 +53,8 @@ async def to_graph_context(context, entity_repository: EntityRepository, page: i
                     file_path=item.file_path,
                     permalink=item.permalink,  # pyright: ignore
                     relation_type=item.type,
-                    from_id=from_entity.permalink,  # pyright: ignore
-                    to_id=to_entity.permalink if to_entity else None,
+                    from_entity=from_entity.permalink,  # pyright: ignore
+                    to_entity=to_entity.permalink if to_entity else None,
                     created_at=item.created_at,
                 )
             case _:  # pragma: no cover

src/basic_memory/api/routers/search_router.py

@@ -1,11 +1,9 @@
 """Router for search operations."""
 
-from dataclasses import asdict
-
 from fastapi import APIRouter, BackgroundTasks
 
 from basic_memory.schemas.search import SearchQuery, SearchResult, SearchResponse
-from basic_memory.deps import SearchServiceDep
+from basic_memory.deps import SearchServiceDep, EntityServiceDep
 
 router = APIRouter(prefix="/search", tags=["search"])
 
@@ -14,6 +12,7 @@ router = APIRouter(prefix="/search", tags=["search"])
 async def search(
     query: SearchQuery,
     search_service: SearchServiceDep,
+    entity_service: EntityServiceDep,
     page: int = 1,
     page_size: int = 10,
 ):
@@ -21,7 +20,26 @@ async def search(
     limit = page_size
     offset = (page - 1) * page_size
     results = await search_service.search(query, limit=limit, offset=offset)
-    search_results = [SearchResult.model_validate(asdict(r)) for r in results]
+
+    search_results = []
+    for r in results:
+        entities = await entity_service.get_entities_by_id([r.entity_id, r.from_id, r.to_id])  # pyright: ignore
+        search_results.append(
+            SearchResult(
+                title=r.title,  # pyright: ignore
+                type=r.type,  # pyright: ignore
+                permalink=r.permalink,
+                score=r.score,  # pyright: ignore
+                entity=entities[0].permalink if entities else None,
+                content=r.content,
+                file_path=r.file_path,
+                metadata=r.metadata,
+                category=r.category,
+                from_entity=entities[0].permalink if entities else None,
+                to_entity=entities[1].permalink if len(entities) > 1 else None,
+                relation_type=r.relation_type,
+            )
+        )
     return SearchResponse(
         results=search_results,
         current_page=page,