flutter/apidash
1
0
Fork 0
mirror of https://github.com/foss42/apidash.git synced 2025-12-03 19:39:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

genai: Minor Refactoring and Corrections

Browse Source
This commit is contained in:
Manas Hejmadi
2025-08-11 15:10:13 +05:30
parent eb852df646
commit 30075a6d95
7 changed files with 60 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
lib/providers/collection_providers.dart
View File

@@ -332,32 +332,14 @@ class CollectionStateNotifier
}
APIType apiType = executionRequestModel.apiType;
late HttpRequestModel substitutedHttpRequestModel;
AIRequestModel? aiRequestModel;
bool noSSL = ref.read(settingsProvider).isSSLDisabled;
HttpRequestModel substitutedHttpRequestModel;
if (apiType == APIType.ai) {
aiRequestModel = requestModel.aiRequestModel!;
final streamingMode = aiRequestModel.payload
.configMap[LLMConfigName.stream.name]?.configValue.value ??
false;
final genAIRequest = aiRequestModel.createRequest(stream: streamingMode);
substitutedHttpRequestModel = getSubstitutedHttpRequestModel(
HttpRequestModel(
method: HTTPVerb.post,
headers: [
...genAIRequest.headers.entries.map(
(x) => NameValueModel(name: x.key, value: x.value),
),
],
url: genAIRequest.endpoint,
bodyContentType: ContentType.json,
body: jsonEncode(genAIRequest.body),
),
);
substitutedHttpRequestModel =
getSubstitutedHttpRequestModel(aiRequestModel.convertToHTTPRequest());
} else {
substitutedHttpRequestModel = getSubstitutedHttpRequestModel(
executionRequestModel.httpRequestModel!);
@@ -371,6 +353,7 @@ class CollectionStateNotifier
sendingTime: DateTime.now(),
),
};
bool streamingMode = true; //Default: Streaming First
final stream = await streamHttpRequest(
requestId,
@@ -388,8 +371,6 @@ class CollectionStateNotifier
StreamSubscription? sub;
bool streaming = true; //DEFAULT to streaming
sub = stream.listen((rec) async {
if (rec == null) return;
@@ -399,7 +380,7 @@ class CollectionStateNotifier
final errorMessage = rec.$4;
if (isStreamingResponse == false) {
streaming = false;
streamingMode = false;
if (!completer.isCompleted) {
completer.complete((response, duration, errorMessage));
}
@@ -467,20 +448,18 @@ class CollectionStateNotifier
isStreamingResponse: isStreamingResponse,
);
if (!streaming) {
//AI-FORMATTING for Non Streaming Varaint
if (apiType == APIType.ai) {
final mT = httpResponseModel?.mediaType;
final body = (mT?.subtype == kSubTypeJson)
? utf8.decode(response.bodyBytes)
: response.body;
//AI-FORMATTING for Non Streaming Varaint
if (streamingMode == false && apiType == APIType.ai) {
final mT = httpResponseModel?.mediaType;
final body = (mT?.subtype == kSubTypeJson)
? utf8.decode(response.bodyBytes)
: response.body;
final fb = response.statusCode == 200
? aiRequestModel?.model.provider.modelController
.outputFormatter(jsonDecode(body))
: formatBody(body, mT);
httpResponseModel = httpResponseModel?.copyWith(formattedBody: fb);
}
final fb = response.statusCode == 200
? aiRequestModel?.model.provider.modelController
.outputFormatter(jsonDecode(body))
: formatBody(body, mT);
httpResponseModel = httpResponseModel?.copyWith(formattedBody: fb);
}
newRequestModel = newRequestModel.copyWith(

14
lib/screens/home_page/editor_pane/details_card/response_pane.dart
View File

@@ -52,10 +52,7 @@ class ResponseDetails extends ConsumerWidget {
selectedRequestModelProvider.select((value) => value?.responseStatus));
final message = ref
.watch(selectedRequestModelProvider.select((value) => value?.message));
HttpResponseModel? httpResponseModel;
httpResponseModel = ref.watch(selectedRequestModelProvider
final responseModel = ref.watch(selectedRequestModelProvider
.select((value) => value?.httpResponseModel));
return Column(
@@ -63,7 +60,7 @@ class ResponseDetails extends ConsumerWidget {
ResponsePaneHeader(
responseStatus: responseStatus,
message: message,
time: httpResponseModel?.time,
time: responseModel?.time,
onClearResponse: () {
ref.read(collectionStateNotifierProvider.notifier).clearResponse();
},
@@ -111,8 +108,9 @@ class ResponseHeadersTab extends ConsumerWidget {
Widget build(BuildContext context, WidgetRef ref) {
final requestHeaders =
ref.watch(selectedRequestModelProvider.select((value) {
return value?.httpResponseModel!.requestHeaders;
}));
return value?.httpResponseModel!.requestHeaders;
})) ??
{};
final responseHeaders =
ref.watch(selectedRequestModelProvider.select((value) {
@@ -122,7 +120,7 @@ class ResponseHeadersTab extends ConsumerWidget {
return ResponseHeaders(
responseHeaders: responseHeaders,
requestHeaders: requestHeaders as Map? ?? {},
requestHeaders: requestHeaders,
);
}
}

10
lib/screens/home_page/editor_pane/url_card.dart
View File

@@ -124,14 +124,12 @@ class URLTextField extends ConsumerWidget {
?.httpRequestModel
?.url,
onChanged: (value) {
final aim = ref
.read(collectionStateNotifierProvider)![selectedId]!
.aiRequestModel;
if (aim != null) {
aim.payload.endpoint = value;
if (aiReqM != null) {
// Handle AI Endpoint Changes
aiReqM.payload.endpoint = value;
ref
.read(collectionStateNotifierProvider.notifier)
.update(aiRequestModel: aim.updatePayload(aim.payload));
.update(aiRequestModel: aiReqM.updatePayload(aiReqM.payload));
} else {
ref.read(collectionStateNotifierProvider.notifier).update(url: value);
}

25
lib/widgets/response_body.dart
View File

@@ -18,17 +18,16 @@ class ResponseBody extends StatelessWidget {
@override
Widget build(BuildContext context) {
HttpResponseModel? httpResponseModel =
selectedRequestModel?.httpResponseModel;
final responseModel = selectedRequestModel?.httpResponseModel;
if (httpResponseModel == null) {
if (responseModel == null) {
return const ErrorMessage(
message: '$kNullResponseModelError $kUnexpectedRaiseIssue');
}
final isSSE = httpResponseModel.sseOutput?.isNotEmpty ?? false;
var body = httpResponseModel.body;
var formattedBody = httpResponseModel.formattedBody;
final isSSE = responseModel.sseOutput?.isNotEmpty ?? false;
var body = responseModel.body;
var formattedBody = responseModel.formattedBody;
if (body == null) {
return const ErrorMessage(
@@ -42,11 +41,11 @@ class ResponseBody extends StatelessWidget {
);
}
if (isSSE) {
body = httpResponseModel.sseOutput!.join();
body = responseModel.sseOutput!.join();
}
final mediaType =
httpResponseModel.mediaType ?? MediaType(kTypeText, kSubTypePlain);
responseModel.mediaType ?? MediaType(kTypeText, kSubTypePlain);
// Fix #415: Treat null Content-type as plain text instead of Error message
// if (mediaType == null) {
@@ -66,14 +65,14 @@ class ResponseBody extends StatelessWidget {
options.remove(ResponseBodyView.code);
}
if (httpResponseModel.sseOutput?.isNotEmpty ?? false) {
if (responseModel.sseOutput?.isNotEmpty ?? false) {
return ResponseBodySuccess(
key: Key("${selectedRequestModel!.id}-response"),
mediaType: MediaType('text', 'event-stream'),
options: [ResponseBodyView.sse, ResponseBodyView.raw],
bytes: utf8.encode((httpResponseModel.sseOutput!).toString()),
body: jsonEncode(httpResponseModel.sseOutput!),
formattedBody: httpResponseModel.sseOutput!.join('\n'),
bytes: utf8.encode((responseModel.sseOutput!).toString()),
body: jsonEncode(responseModel.sseOutput!),
formattedBody: responseModel.sseOutput!.join('\n'),
selectedModel: selectedRequestModel?.aiRequestModel?.model,
);
}
@@ -82,7 +81,7 @@ class ResponseBody extends StatelessWidget {
key: Key("${selectedRequestModel!.id}-response"),
mediaType: mediaType,
options: options,
bytes: httpResponseModel.bodyBytes!,
bytes: responseModel.bodyBytes!,
body: body,
formattedBody: formattedBody,
highlightLanguage: highlightLanguage,

1
lib/widgets/response_body_success.dart
View File

@@ -18,7 +18,6 @@ class ResponseBodySuccess extends StatefulWidget {
required this.options,
required this.bytes,
this.formattedBody,
// this.sseOutput,
this.highlightLanguage,
this.selectedModel,
});

5
lib/widgets/sse_display.dart
View File

@@ -1,12 +1,7 @@
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 StatefulWidget {
final LLMModel? selectedLLModel;

22
packages/genai/lib/models/ai_request_model.dart
View File

@@ -1,4 +1,8 @@
import 'dart:convert';
import 'package:better_networking/better_networking.dart';
import 'package:freezed_annotation/freezed_annotation.dart';
import 'package:genai/llm_config.dart';
import '../llm_model.dart';
import '../llm_provider.dart';
import '../llm_saveobject.dart';
@@ -59,4 +63,22 @@ class AIRequestModel with _$AIRequestModel {
provider: provider,
);
}
HttpRequestModel convertToHTTPRequest() {
final streamingMode =
payload.configMap[LLMConfigName.stream.name]?.configValue.value ??
false;
final genAIRequest = createRequest(stream: streamingMode);
return HttpRequestModel(
method: HTTPVerb.post,
headers: [
...genAIRequest.headers.entries.map(
(x) => NameValueModel(name: x.key, value: x.value),
),
],
url: genAIRequest.endpoint,
bodyContentType: ContentType.json,
body: jsonEncode(genAIRequest.body),
);
}
}