Merge pull request #155 from cogwheel0/improve-conversation-fetching

feat(conversations): Improve conversation and folder fetching with concurrent requests

lib/core/providers/app_providers.dart

@@ -984,15 +984,28 @@ class Conversations extends _$Conversations {
 
     try {
       DebugLogger.log('fetch-start', scope: 'conversations');
-      final conversations = await api.getConversations();
+      final conversationsFuture = api.getConversations();
+      final foldersFuture = api.getFolders().catchError((error, stackTrace) {
+        DebugLogger.error(
+          'folders-fetch-failed',
+          scope: 'conversations',
+          error: error,
+          stackTrace: stackTrace,
+        );
+        return <Map<String, dynamic>>[];
+      });
+
+      final results = await Future.wait<dynamic>([
+        conversationsFuture,
+        foldersFuture,
+      ]);
+      final conversations = results[0] as List<Conversation>;
+      final foldersData = results[1] as List<Map<String, dynamic>>;
       DebugLogger.log(
         'fetch-ok',
         scope: 'conversations',
         data: {'count': conversations.length},
       );
-
-      try {
-        final foldersData = await api.getFolders();
       DebugLogger.log(
         'folders-fetched',
         scope: 'conversations',
@@ -1081,7 +1094,7 @@ class Conversations extends _$Conversations {
         List<Conversation> folderConvs = const [];
         if (shouldFetchFolder) {
           try {
-              folderConvs = await api.getConversationsInFolder(folder.id);
+            folderConvs = await api.getFolderConversationSummaries(folder.id);
             DebugLogger.log(
               'folder-sync',
               scope: 'conversations/map',
@@ -1161,21 +1174,6 @@ class Conversations extends _$Conversations {
       );
       _updateCacheTimestamp(DateTime.now());
       return sortedConversations;
-      } catch (e) {
-        DebugLogger.error(
-          'folders-fetch-failed',
-          scope: 'conversations',
-          error: e,
-        );
-        final sorted = _sortByUpdatedAt(conversations.toList());
-        DebugLogger.log(
-          'sort',
-          scope: 'conversations',
-          data: {'source': 'fallback'},
-        );
-        _updateCacheTimestamp(DateTime.now());
-        return sorted;
-      }
     } catch (e, stackTrace) {
       DebugLogger.error(
         'fetch-failed',

lib/core/services/api_service.dart

@@ -409,6 +409,15 @@ class ApiService {
 
   // Conversations - Updated to use correct OpenWebUI API
   Future<List<Conversation>> getConversations({int? limit, int? skip}) async {
+    final pinnedFuture = _fetchChatCollection(
+      '/api/v1/chats/pinned',
+      debugLabel: 'pinned chats',
+    );
+    final archivedFuture = _fetchChatCollection(
+      '/api/v1/chats/archived',
+      debugLabel: 'archived chats',
+    );
+
     List<dynamic> allRegularChats = [];
 
     if (limit == null) {
@@ -422,7 +431,11 @@ class ApiService {
       while (true) {
         final response = await _dio.get(
           '/api/v1/chats/',
-          queryParameters: {'page': currentPage},
+          queryParameters: {
+            'page': currentPage,
+            'include_folders': true,
+            'include_pinned': true,
+          },
         );
 
         if (response.data is! List) {
@@ -454,14 +467,21 @@ class ApiService {
       );
     } else {
       // Original single page fetch
+      final pageQuery = <String, dynamic>{
+        'include_folders': true,
+        'include_pinned': true,
+      };
+      if (limit > 0) {
+        pageQuery['page'] = (((skip ?? 0) / limit).floor() + 1).clamp(
+          1,
+          1 << 30,
+        );
+      }
       final regularResponse = await _dio.get(
         '/api/v1/chats/',
         // Convert skip/limit to 1-based page index expected by OpenWebUI.
         // Example: skip=0 => page=1, skip=limit => page=2, etc.
-        queryParameters: {
+        queryParameters: pageQuery,
-          if (limit > 0)
-            'page': (((skip ?? 0) / limit).floor() + 1).clamp(1, 1 << 30),
-        },
       );
 
       if (regularResponse.data is! List) {
@@ -473,14 +493,12 @@ class ApiService {
       allRegularChats = regularResponse.data as List;
     }
 
-    final pinnedChatList = await _fetchChatCollection(
+    final pinnedAndArchived = await Future.wait<List<dynamic>>([
-      '/api/v1/chats/pinned',
+      pinnedFuture,
-      debugLabel: 'pinned chats',
+      archivedFuture,
-    );
+    ]);
-    final archivedChatList = await _fetchChatCollection(
+    final pinnedChatList = pinnedAndArchived[0];
-      '/api/v1/chats/all/archived',
+    final archivedChatList = pinnedAndArchived[1];
-      debugLabel: 'archived chats',
-    );
     final regularChatList = allRegularChats;
 
     DebugLogger.log(
@@ -1035,17 +1053,21 @@ class ApiService {
     );
   }
 
-  Future<List<Conversation>> getConversationsInFolder(String folderId) async {
+  Future<List<Conversation>> getFolderConversationSummaries(
-    _traceApi('Fetching conversations in folder: $folderId');
+    String folderId,
-    final response = await _dio.get('/api/v1/chats/folder/$folderId');
+  ) async {
+    _traceApi('Fetching conversation summaries in folder: $folderId');
+    final response = await _dio.get('/api/v1/chats/folder/$folderId/list');
     final data = response.data;
-    if (data is List) {
+    if (data is! List) {
-      return _parseConversationSummaryList(
+      return const [];
-        data,
-        debugLabel: 'parse_folder_$folderId',
-      );
     }
-    return [];
+    final normalized = data
+        .whereType<Map<String, dynamic>>()
+        .map(parseConversationSummary)
+        .map(Conversation.fromJson)
+        .toList(growable: false);
+    return normalized;
   }
 
   // Tags