Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix #69: sse not work as intended #78

Merged
merged 2 commits into from
Nov 22, 2023
Merged

fix #69: sse not work as intended #78

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7cab0d6
fix #69: sse not work as intended
wliu6v Nov 21, 2023
a17b4fd
Merge branch 'main' into fix-sse
wliu6v Nov 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 14 additions & 28 deletions lib/src/client/openai_client.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import 'dart:async';
import 'dart:convert';
import 'dart:io';
import 'package:chat_gpt_sdk/src/client/openai_wrapper.dart';

import 'package:chat_gpt_sdk/src/client/exception/base_error_wrapper.dart';
import 'package:chat_gpt_sdk/src/client/exception/request_error.dart';
import 'package:chat_gpt_sdk/src/client/openai_wrapper.dart';
import 'package:chat_gpt_sdk/src/logger/logger.dart';
import 'package:chat_gpt_sdk/src/model/cancel/cancel_data.dart';
import 'package:chat_gpt_sdk/src/model/error/openai_error.dart';
import 'package:chat_gpt_sdk/src/utils/json_decode_string.dart';
import 'package:dio/dio.dart';

class OpenAIClient extends OpenAIWrapper {
Expand Down Expand Up @@ -248,7 +248,6 @@ class OpenAIClient extends OpenAIWrapper {
log.log("request body :$request");
final controller = StreamController<T>.broadcast();
final cancelData = CancelData(cancelToken: CancelToken());
final List<int> chunks = [];

try {
onCancel(cancelData);
Expand All @@ -263,42 +262,29 @@ class OpenAIClient extends OpenAIWrapper {
(it) {
it.data.stream.listen(
(it) {
chunks.addAll(it);
},
onDone: () {
final raw = utf8.decode(chunks);
final dataList = raw
final rawData = utf8.decode(it);
final dataList = rawData
.split("\n")
.where((element) => element.isNotEmpty)
.toList();

for (final data in dataList) {
if (data.startsWith("data: ")) {
///remove data:
final mData = data.substring(6);
if (mData.startsWith("[DONE]")) {
for (final line in dataList) {
if (line.startsWith("data: ")) {
final data = line.substring(6);
if (data.startsWith("[DONE]")) {
log.log("stream response is done");
controller.done;
controller.close();

return;
}

final jsonMap = mData.decode();
if (jsonMap.keys.last) {
///decode data
controller
..sink
..add(complete(jsonMap[jsonMap.keys.last]));
} else {
log.log("stream response invalid try regenerate");
log.log("last json error :$mData");

controller.close();
}
controller
..sink
..add(complete(json.decode(data)));
}
}
},
onDone: () {
controller.close();
},
onError: (err, t) {
log.error(err, t);
if (err is DioException) {
Expand Down
Loading