SSEDislay: SelectedModel provided via parameter & StreamingFixes

This commit is contained in:
Manas Hejmadi
2025-08-09 15:53:22 +05:30
parent 8bc2cbeb7b
commit e06bddca54
4 changed files with 116 additions and 84 deletions

View File

@@ -66,10 +66,7 @@ class ResponseBody extends StatelessWidget {
options.remove(ResponseBodyView.code);
}
// print('reM -> ${responseModel.sseOutput}');
if (httpResponseModel.sseOutput?.isNotEmpty ?? false) {
// final modifiedBody = responseModel.sseOutput!.join('\n\n');
return ResponseBodySuccess(
key: Key("${selectedRequestModel!.id}-response"),
mediaType: MediaType('text', 'event-stream'),
@@ -77,6 +74,7 @@ class ResponseBody extends StatelessWidget {
bytes: utf8.encode((httpResponseModel.sseOutput!).toString()),
body: jsonEncode(httpResponseModel.sseOutput!),
formattedBody: httpResponseModel.sseOutput!.join('\n'),
selectedModel: selectedRequestModel?.aiRequestModel?.model,
);
}
@@ -87,8 +85,8 @@ class ResponseBody extends StatelessWidget {
bytes: httpResponseModel.bodyBytes!,
body: body,
formattedBody: formattedBody,
sseOutput: httpResponseModel.sseOutput,
highlightLanguage: highlightLanguage,
selectedModel: selectedRequestModel?.aiRequestModel?.model,
);
}
}

View File

@@ -7,25 +7,28 @@ import 'package:flutter/material.dart';
import 'package:apidash/utils/utils.dart';
import 'package:apidash/widgets/widgets.dart';
import 'package:apidash/consts.dart';
import 'package:genai/genai.dart';
import 'button_share.dart';
class ResponseBodySuccess extends StatefulWidget {
const ResponseBodySuccess(
{super.key,
required this.mediaType,
required this.body,
required this.options,
required this.bytes,
this.formattedBody,
this.sseOutput,
this.highlightLanguage});
const ResponseBodySuccess({
super.key,
required this.mediaType,
required this.body,
required this.options,
required this.bytes,
this.formattedBody,
// this.sseOutput,
this.highlightLanguage,
this.selectedModel,
});
final MediaType mediaType;
final List<ResponseBodyView> options;
final String body;
final Uint8List bytes;
final String? formattedBody;
final List<String>? sseOutput;
final String? highlightLanguage;
final LLMModel? selectedModel; //ONLY FOR AI-REQUESTS
@override
State<ResponseBodySuccess> createState() => _ResponseBodySuccessState();
@@ -188,7 +191,8 @@ class _ResponseBodySuccessState extends State<ResponseBodySuccess> {
padding: kP8,
decoration: textContainerdecoration,
child: SSEDisplay(
sseOutput: widget.sseOutput ?? [],
sseOutput: widget.formattedBody?.split('\n') ?? [],
selectedLLModel: widget.selectedModel,
),
),
),

View File

@@ -1,27 +1,29 @@
import 'dart:convert';
import 'package:apidash/models/request_model.dart';
import 'package:apidash/providers/collection_providers.dart';
import 'package:apidash/providers/history_providers.dart';
import 'package:apidash_design_system/apidash_design_system.dart';
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:genai/genai.dart';
import 'package:genai/models/ai_request_model.dart';
class SSEDisplay extends ConsumerStatefulWidget {
class SSEDisplay extends StatefulWidget {
final LLMModel? selectedLLModel;
final List<String> sseOutput;
const SSEDisplay({
super.key,
required this.sseOutput,
this.selectedLLModel,
});
@override
ConsumerState<SSEDisplay> createState() => _SSEDisplayState();
State<SSEDisplay> createState() => _SSEDisplayState();
}
class _SSEDisplayState extends ConsumerState<SSEDisplay> {
class _SSEDisplayState extends State<SSEDisplay> {
@override
Widget build(BuildContext context) {
final requestModel = ref.read(selectedRequestModelProvider);
final aiRequestModel = requestModel?.aiRequestModel;
final isAIOutput = (aiRequestModel != null);
final theme = Theme.of(context);
final fontSizeMedium = theme.textTheme.bodyMedium?.fontSize;
final isDark = theme.brightness == Brightness.dark;
@@ -35,78 +37,90 @@ class _SSEDisplayState extends ConsumerState<SSEDisplay> {
);
}
if (isAIOutput) {
if (widget.selectedLLModel != null) {
// For RAW Text output (only AI Requests)
String out = "";
final mc = widget.selectedLLModel!.provider.modelController;
for (String x in widget.sseOutput) {
x = x.substring(6);
if (x.contains('[DONE]')) continue;
out += aiRequestModel.model.provider.modelController
.streamOutputFormatter(jsonDecode(x)) ??
"<?>";
x = x.trim();
if (x.isEmpty || x.contains('[DONE]')) {
continue;
}
// Start with JSON
final pos = x.indexOf('{');
if (pos == -1) continue;
x = x.substring(pos);
Map? dec;
try {
dec = jsonDecode(x);
final z = mc.streamOutputFormatter(dec!);
out += z ?? '<?>';
} catch (e) {
print("Error in JSONDEC $e");
}
}
return SingleChildScrollView(
child: Text(out),
);
}
return SingleChildScrollView(
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: (widget.sseOutput)
.reversed
.where((e) => e != '')
.map<Widget>((chunk) {
Map<String, dynamic>? parsedJson;
try {
parsedJson = jsonDecode(chunk);
} catch (_) {}
return ListView(
padding: kP1,
children: widget.sseOutput.reversed
.where((e) => e.trim() != '')
.map<Widget>((chunk) {
Map<String, dynamic>? parsedJson;
try {
parsedJson = jsonDecode(chunk);
} catch (_) {}
return Card(
color: theme.colorScheme.surfaceContainerLowest,
shape: RoundedRectangleBorder(
borderRadius: kBorderRadius6,
),
child: Padding(
padding: kP8,
child: parsedJson != null
? Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: parsedJson.entries.map((entry) {
return Padding(
padding: const EdgeInsets.symmetric(vertical: 2.0),
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
'${entry.key}: ',
style: kCodeStyle.copyWith(
fontSize: fontSizeMedium,
color: isDark ? kColorGQL.toDark : kColorGQL,
fontWeight: FontWeight.bold,
),
return Card(
color: theme.colorScheme.surfaceContainerLowest,
shape: RoundedRectangleBorder(
borderRadius: kBorderRadius6,
),
child: Padding(
padding: kP8,
child: parsedJson != null
? Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: parsedJson.entries.map((entry) {
return Padding(
padding: const EdgeInsets.symmetric(vertical: 2.0),
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
'${entry.key}: ',
style: kCodeStyle.copyWith(
fontSize: fontSizeMedium,
color: isDark ? kColorGQL.toDark : kColorGQL,
fontWeight: FontWeight.bold,
),
const SizedBox(width: 4),
Expanded(
child: Text(
entry.value.toString(),
style: kCodeStyle,
),
),
const SizedBox(width: 4),
Expanded(
child: Text(
entry.value.toString(),
style: kCodeStyle,
),
],
),
);
}).toList(),
)
: Text(
chunk.toString().trim(),
style: kCodeStyle.copyWith(
fontSize: fontSizeMedium,
),
),
],
),
);
}).toList(),
)
: Text(
chunk.toString().trim(),
style: kCodeStyle.copyWith(
fontSize: fontSizeMedium,
),
),
);
}).toList(),
),
),
),
);
}).toList(),
);
}
}