refactor: more flows
This commit is contained in:
@@ -74,6 +74,30 @@ abstract class OutboundTask with _$OutboundTask {
|
||||
String? error,
|
||||
}) = GenerateImageTask;
|
||||
|
||||
const factory OutboundTask.saveConversation({
|
||||
required String id,
|
||||
String? conversationId,
|
||||
@Default(TaskStatus.queued) TaskStatus status,
|
||||
@Default(0) int attempt,
|
||||
String? idempotencyKey,
|
||||
DateTime? enqueuedAt,
|
||||
DateTime? startedAt,
|
||||
DateTime? completedAt,
|
||||
String? error,
|
||||
}) = SaveConversationTask;
|
||||
|
||||
const factory OutboundTask.generateTitle({
|
||||
required String id,
|
||||
required String conversationId,
|
||||
@Default(TaskStatus.queued) TaskStatus status,
|
||||
@Default(0) int attempt,
|
||||
String? idempotencyKey,
|
||||
DateTime? enqueuedAt,
|
||||
DateTime? startedAt,
|
||||
DateTime? completedAt,
|
||||
String? error,
|
||||
}) = GenerateTitleTask;
|
||||
|
||||
factory OutboundTask.fromJson(Map<String, dynamic> json) =>
|
||||
_$OutboundTaskFromJson(json);
|
||||
|
||||
|
||||
@@ -226,4 +226,63 @@ class TaskQueueNotifier extends StateNotifier<List<OutboundTask>> {
|
||||
await _save();
|
||||
}
|
||||
}
|
||||
|
||||
Future<String> enqueueUploadMedia({
|
||||
required String? conversationId,
|
||||
required String filePath,
|
||||
required String fileName,
|
||||
int? fileSize,
|
||||
String? mimeType,
|
||||
String? checksum,
|
||||
}) async {
|
||||
final id = _uuid.v4();
|
||||
final task = OutboundTask.uploadMedia(
|
||||
id: id,
|
||||
conversationId: conversationId,
|
||||
filePath: filePath,
|
||||
fileName: fileName,
|
||||
fileSize: fileSize,
|
||||
mimeType: mimeType,
|
||||
checksum: checksum,
|
||||
enqueuedAt: DateTime.now(),
|
||||
);
|
||||
state = [...state, task];
|
||||
await _save();
|
||||
_process();
|
||||
return id;
|
||||
}
|
||||
|
||||
Future<String> enqueueSaveConversation({
|
||||
required String? conversationId,
|
||||
String? idempotencyKey,
|
||||
}) async {
|
||||
final id = _uuid.v4();
|
||||
final task = OutboundTask.saveConversation(
|
||||
id: id,
|
||||
conversationId: conversationId,
|
||||
idempotencyKey: idempotencyKey,
|
||||
enqueuedAt: DateTime.now(),
|
||||
);
|
||||
state = [...state, task];
|
||||
await _save();
|
||||
_process();
|
||||
return id;
|
||||
}
|
||||
|
||||
Future<String> enqueueGenerateTitle({
|
||||
required String conversationId,
|
||||
String? idempotencyKey,
|
||||
}) async {
|
||||
final id = _uuid.v4();
|
||||
final task = OutboundTask.generateTitle(
|
||||
id: id,
|
||||
conversationId: conversationId,
|
||||
idempotencyKey: idempotencyKey,
|
||||
enqueuedAt: DateTime.now(),
|
||||
);
|
||||
state = [...state, task];
|
||||
await _save();
|
||||
_process();
|
||||
return id;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -20,6 +20,8 @@ class TaskWorker {
|
||||
uploadMedia: _performUploadMedia,
|
||||
executeToolCall: _performExecuteToolCall,
|
||||
generateImage: _performGenerateImage,
|
||||
saveConversation: _performSaveConversation,
|
||||
generateTitle: _performGenerateTitle,
|
||||
);
|
||||
}
|
||||
|
||||
@@ -278,4 +280,78 @@ class TaskWorker {
|
||||
_ref.read(chat.chatMessagesProvider.notifier).finishStreaming();
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _performSaveConversation(SaveConversationTask task) async {
|
||||
final api = _ref.read(apiServiceProvider);
|
||||
final messages = _ref.read(chat.chatMessagesProvider);
|
||||
final activeConv = _ref.read(activeConversationProvider);
|
||||
final selectedModel = _ref.read(selectedModelProvider);
|
||||
if (api == null || messages.isEmpty || activeConv == null) return;
|
||||
|
||||
// Skip if last assistant is empty placeholder
|
||||
final last = messages.last;
|
||||
if (last.role == 'assistant' &&
|
||||
last.content.trim().isEmpty &&
|
||||
(last.files?.isEmpty ?? true) &&
|
||||
(last.attachmentIds?.isEmpty ?? true)) {
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
await api.updateConversationWithMessages(
|
||||
activeConv.id,
|
||||
messages,
|
||||
model: selectedModel?.id,
|
||||
);
|
||||
final updated = activeConv.copyWith(
|
||||
messages: messages,
|
||||
updatedAt: DateTime.now(),
|
||||
);
|
||||
_ref.read(activeConversationProvider.notifier).state = updated;
|
||||
_ref.invalidate(conversationsProvider);
|
||||
} catch (_) {}
|
||||
}
|
||||
|
||||
Future<void> _performGenerateTitle(GenerateTitleTask task) async {
|
||||
final api = _ref.read(apiServiceProvider);
|
||||
final activeConv = _ref.read(activeConversationProvider);
|
||||
final selectedModel = _ref.read(selectedModelProvider);
|
||||
if (api == null || selectedModel == null) return;
|
||||
try {
|
||||
final messages = _ref.read(chat.chatMessagesProvider);
|
||||
final formatted = <Map<String, dynamic>>[];
|
||||
for (final msg in messages) {
|
||||
formatted.add({
|
||||
'id': msg.id,
|
||||
'role': msg.role,
|
||||
'content': msg.content,
|
||||
'timestamp': msg.timestamp.millisecondsSinceEpoch ~/ 1000,
|
||||
});
|
||||
}
|
||||
final title = await api.generateTitle(
|
||||
conversationId: task.conversationId,
|
||||
messages: formatted,
|
||||
model: selectedModel.id,
|
||||
);
|
||||
if (title != null && title.isNotEmpty && title != 'New Chat') {
|
||||
if (activeConv != null && activeConv.id == task.conversationId) {
|
||||
final updated = activeConv.copyWith(
|
||||
title: title.length > 100 ? '${title.substring(0, 100)}...' : title,
|
||||
updatedAt: DateTime.now(),
|
||||
);
|
||||
_ref.read(activeConversationProvider.notifier).state = updated;
|
||||
try {
|
||||
final cur = _ref.read(chat.chatMessagesProvider);
|
||||
await api.updateConversationWithMessages(
|
||||
updated.id,
|
||||
cur,
|
||||
title: updated.title,
|
||||
model: selectedModel.id,
|
||||
);
|
||||
} catch (_) {}
|
||||
_ref.invalidate(conversationsProvider);
|
||||
}
|
||||
}
|
||||
} catch (_) {}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user