ars/iiEsaywebUIapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: fix lints

Browse Source
This commit is contained in:
cogwheel0
2025-09-16 18:15:44 +05:30
parent a5d5f60ed7
commit f80930685c
12 changed files with 277 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/core/services/api_service.dart
View File

@@ -392,11 +392,11 @@ class ApiService {
debugPrint(
'🔍 DEBUG: Sample chat data fields: ${chatData.keys.toList()}',
);
final _sampleStr = chatData.toString();
final _preview = _sampleStr.length > 200
? _sampleStr.substring(0, 200)
: _sampleStr;
debugPrint('🔍 DEBUG: Sample chat data: $_preview...');
final samplePreviewSource = chatData.toString();
final preview = samplePreviewSource.length > 200
? samplePreviewSource.substring(0, 200)
: samplePreviewSource;
debugPrint('🔍 DEBUG: Sample chat data: $preview...');
}
final conversation = _parseOpenWebUIChat(chatData);
@@ -475,8 +475,8 @@ class ApiService {
// Debug logging for folder assignment
if (folderId != null) {
final _idPreview = id.length > 8 ? id.substring(0, 8) : id;
debugPrint('🔍 DEBUG: Conversation $_idPreview has folderId: $folderId');
final idPreview = id.length > 8 ? id.substring(0, 8) : id;
debugPrint('🔍 DEBUG: Conversation $idPreview has folderId: $folderId');
}
debugPrint(
@@ -3357,11 +3357,11 @@ class ApiService {
} else if (response.data is Map) {
DebugLogger.log(' Object keys: ${(response.data as Map).keys}');
}
final _dataStr = response.data.toString();
final _dataPreview = _dataStr.length > 200
? _dataStr.substring(0, 200)
: _dataStr;
DebugLogger.log(' Sample data: $_dataPreview...');
final dataSampleSource = response.data.toString();
final dataPreview = dataSampleSource.length > 200
? dataSampleSource.substring(0, 200)
: dataSampleSource;
DebugLogger.log(' Sample data: $dataPreview...');
} catch (e) {
debugPrint('❌ $endpoint - Error: $e');
}

80
lib/core/services/streaming_helper.dart
View File

@@ -33,7 +33,8 @@ StreamSubscription<String> attachUnifiedChunkedStreaming({
// Message update callbacks
required void Function(String) appendToLastMessage,
required void Function(String) replaceLastMessageContent,
required void Function(ChatMessage Function(ChatMessage)) updateLastMessageWith,
required void Function(ChatMessage Function(ChatMessage))
updateLastMessageWith,
required void Function() finishStreaming,
required List<ChatMessage> Function() getMessages,
}) {
@@ -71,7 +72,7 @@ StreamSubscription<String> attachUnifiedChunkedStreaming({
bool suppressSocketContent = suppressSocketContentInitially;
bool usingDynamicChannel = usingDynamicChannelInitially;
void _updateImagesFromCurrentContent() {
void updateImagesFromCurrentContent() {
try {
final msgs = getMessages();
if (msgs.isEmpty || msgs.last.role != 'assistant') return;
@@ -236,13 +237,13 @@ StreamSubscription<String> attachUnifiedChunkedStreaming({
for (final call in tc) {
if (call is Map<String, dynamic>) {
final fn = call['function'];
final name =
(fn is Map && fn['name'] is String)
? fn['name'] as String
: null;
final name = (fn is Map && fn['name'] is String)
? fn['name'] as String
: null;
if (name is String && name.isNotEmpty) {
final msgs = getMessages();
final exists = (msgs.isNotEmpty) &&
final exists =
(msgs.isNotEmpty) &&
RegExp(
r'<details\s+type=\"tool_calls\"[^>]*\bname=\"' +
RegExp.escape(name) +
@@ -262,20 +263,20 @@ StreamSubscription<String> attachUnifiedChunkedStreaming({
final content = delta['content']?.toString() ?? '';
if (content.isNotEmpty) {
appendToLastMessage(content);
_updateImagesFromCurrentContent();
updateImagesFromCurrentContent();
}
}
}
} catch (_) {
if (s.isNotEmpty) {
appendToLastMessage(s);
_updateImagesFromCurrentContent();
updateImagesFromCurrentContent();
}
}
} else {
if (s.isNotEmpty) {
appendToLastMessage(s);
_updateImagesFromCurrentContent();
updateImagesFromCurrentContent();
}
}
} else if (line is Map) {
@@ -320,10 +321,12 @@ StreamSubscription<String> attachUnifiedChunkedStreaming({
: null;
if (name is String && name.isNotEmpty) {
final msgs = getMessages();
final exists = (msgs.isNotEmpty) &&
final exists =
(msgs.isNotEmpty) &&
RegExp(
r'<details\s+type=\"tool_calls\"[^>]*\bname=\"' +
RegExp.escape(name) + r'\"',
RegExp.escape(name) +
r'\"',
multiLine: true,
).hasMatch(msgs.last.content);
if (!exists) {
@@ -353,10 +356,12 @@ StreamSubscription<String> attachUnifiedChunkedStreaming({
: null;
if (name is String && name.isNotEmpty) {
final msgs = getMessages();
final exists = (msgs.isNotEmpty) &&
final exists =
(msgs.isNotEmpty) &&
RegExp(
r'<details\s+type=\"tool_calls\"[^>]*\bname=\"' +
RegExp.escape(name) + r'\"',
RegExp.escape(name) +
r'\"',
multiLine: true,
).hasMatch(msgs.last.content);
if (!exists) {
@@ -372,7 +377,7 @@ StreamSubscription<String> attachUnifiedChunkedStreaming({
final content = delta['content']?.toString() ?? '';
if (content.isNotEmpty) {
appendToLastMessage(content);
_updateImagesFromCurrentContent();
updateImagesFromCurrentContent();
}
}
}
@@ -409,7 +414,9 @@ StreamSubscription<String> attachUnifiedChunkedStreaming({
final list = chatObj['messages'];
if (list is List) {
final target = list.firstWhere(
(m) => (m is Map && (m['id']?.toString() == assistantMessageId)),
(m) =>
(m is Map &&
(m['id']?.toString() == assistantMessageId)),
orElse: () => null,
);
if (target != null) {
@@ -431,7 +438,8 @@ StreamSubscription<String> attachUnifiedChunkedStreaming({
final history = chatObj['history'];
if (history is Map && history['messages'] is Map) {
final Map<String, dynamic> messagesMap =
(history['messages'] as Map).cast<String, dynamic>();
(history['messages'] as Map)
.cast<String, dynamic>();
final msg = messagesMap[assistantMessageId];
if (msg is Map) {
final rawContent = msg['content'];
@@ -454,7 +462,8 @@ StreamSubscription<String> attachUnifiedChunkedStreaming({
replaceLastMessageContent(content);
}
}
} catch (_) {} finally {
} catch (_) {
} finally {
finishStreaming();
}
});
@@ -483,21 +492,23 @@ StreamSubscription<String> attachUnifiedChunkedStreaming({
}
if (content.isNotEmpty) {
// Replace current assistant message with a readable error
replaceLastMessageContent('⚠️ ' + content);
replaceLastMessageContent('⚠️ $content');
}
} catch (_) {}
// Ensure UI exits streaming state
finishStreaming();
} else if ((type == 'chat:message:delta' || type == 'message') && payload != null) {
} else if ((type == 'chat:message:delta' || type == 'message') &&
payload != null) {
// Incremental message content over socket; respect suppression on SSE-driven flows
if (!suppressSocketContent) {
final content = payload['content']?.toString() ?? '';
if (content.isNotEmpty) {
appendToLastMessage(content);
_updateImagesFromCurrentContent();
updateImagesFromCurrentContent();
}
}
} else if ((type == 'chat:message' || type == 'replace') && payload != null) {
} else if ((type == 'chat:message' || type == 'replace') &&
payload != null) {
// Full message replacement over socket; respect suppression on SSE-driven flows
if (!suppressSocketContent) {
final content = payload['content']?.toString() ?? '';
@@ -600,10 +611,9 @@ StreamSubscription<String> attachUnifiedChunkedStreaming({
} else if (type == 'event:status' && payload != null) {
final status = payload['status']?.toString() ?? '';
if (status.isNotEmpty) {
updateLastMessageWith((m) => m.copyWith(metadata: {
...?m.metadata,
'status': status,
}));
updateLastMessageWith(
(m) => m.copyWith(metadata: {...?m.metadata, 'status': status}),
);
}
} else if (type == 'event:tool' && payload != null) {
// Accept files from both 'result' and 'files'
@@ -624,7 +634,7 @@ StreamSubscription<String> attachUnifiedChunkedStreaming({
final content = payload['content']?.toString() ?? '';
if (content.isNotEmpty) {
appendToLastMessage(content);
_updateImagesFromCurrentContent();
updateImagesFromCurrentContent();
}
}
} catch (_) {}
@@ -640,7 +650,7 @@ StreamSubscription<String> attachUnifiedChunkedStreaming({
final content = payload['content']?.toString() ?? '';
if (content.isNotEmpty) {
appendToLastMessage(content);
_updateImagesFromCurrentContent();
updateImagesFromCurrentContent();
}
}
} catch (_) {}
@@ -656,7 +666,9 @@ StreamSubscription<String> attachUnifiedChunkedStreaming({
} catch (_) {}
try {
final msgs = getMessages();
if (msgs.isNotEmpty && msgs.last.role == 'assistant' && msgs.last.isStreaming) {
if (msgs.isNotEmpty &&
msgs.last.role == 'assistant' &&
msgs.last.isStreaming) {
finishStreaming();
}
} catch (_) {}
@@ -681,17 +693,21 @@ StreamSubscription<String> attachUnifiedChunkedStreaming({
}
}
if (isSearching && (chunk.contains('[/SEARCHING]') || chunk.contains('Search complete'))) {
if (isSearching &&
(chunk.contains('[/SEARCHING]') ||
chunk.contains('Search complete'))) {
isSearching = false;
updateLastMessageWith(
(message) => message.copyWith(metadata: {'webSearchActive': false}),
);
effectiveChunk = effectiveChunk.replaceAll('[SEARCHING]', '').replaceAll('[/SEARCHING]', '');
effectiveChunk = effectiveChunk
.replaceAll('[SEARCHING]', '')
.replaceAll('[/SEARCHING]', '');
}
if (effectiveChunk.trim().isNotEmpty) {
appendToLastMessage(effectiveChunk);
_updateImagesFromCurrentContent();
updateImagesFromCurrentContent();
}
},
onDone: () async {