Merge pull request babakcode#2 from zmhu/master

Fix a bug and add a feature.

Author: babakcode

lib/src/implement/gemini_implement.dart

@@ -86,6 +86,80 @@ class GeminiImpl implements GeminiInterface {
  return GeminiModel.jsonToList(response.data['models']);
  }
 
+ @override
+ Stream<Candidates> streamChat(
+ List<Content> chats, {
+ String? modelName,
+ List<SafetySetting>? safetySettings,
+ GenerationConfig? generationConfig,
+ }) async* {
+ Gemini.instance.typeProvider?.clear();
+
+ final response = await api.post(
+ '${modelName ?? Constants.defaultModel}:streamGenerateContent',
+ isStreamResponse: true,
+ data: {'contents': chats.map((e) => e.toJson()).toList()},
+ generationConfig: generationConfig,
+ safetySettings: safetySettings,
+ );
+
+ Gemini.instance.typeProvider?.loading = false;
+ // return GeminiResponse.fromJson(response.data).candidates?.lastOrNull;
+ if (response.statusCode == 200) {
+ final ResponseBody rb = response.data;
+ int index = 0;
+ String modelStr = '';
+ List<int> cacheUnits = [];
+ List<int> list = [];
+
+ await for (final itemList in rb.stream) {
+ list = cacheUnits + itemList;
+
+ cacheUnits.clear();
+
+ String res = "";
+ try {
+ res = utf8.decode(list);
+ } catch (e) {
+ print("error: $e");
+ cacheUnits = list;
+ continue;
+ }
+
+ res = res.trim();
+
+ if (index == 0 && res.startsWith("[")) {
+ res = res.replaceFirst('[', '');
+ }
+ if (res.startsWith(',')) {
+ res = res.replaceFirst(',', '');
+ }
+ if (res.endsWith(']')) {
+ res = res.substring(0, res.length - 1);
+ }
+
+ res = res.trim();
+
+ for (final line in splitter.convert(res)) {
+ if (modelStr == '' && line == ',') {
+ continue;
+ }
+ modelStr += line;
+ try {
+ final candidate = Candidates.fromJson(
+ (jsonDecode(modelStr)['candidates'] as List?)?.firstOrNull);
+ yield candidate;
+ Gemini.instance.typeProvider?.add(candidate.output);
+ modelStr = '';
+ } catch (e) {
+ continue;
+ }
+ }
+ index++;
+ }
+ }
+ }
+
  @override
  Stream<Candidates> streamGenerateContent(String text,
  {List<Uint8List>? images,
@@ -121,9 +195,22 @@ class GeminiImpl implements GeminiInterface {
  final ResponseBody rb = response.data;
  int index = 0;
  String modelStr = '';
+ List<int> cacheUnits = [];
+ List<int> list = [];
 
- await for (final list in rb.stream) {
- String res = utf8.decode(list);
+ await for (final itemList in rb.stream) {
+ list = cacheUnits + itemList;
+
+ cacheUnits.clear();
+
+ String res = "";
+ try {
+ res = utf8.decode(list);
+ } catch (e) {
+ print("error: $e");
+ cacheUnits = list;
+ continue;
+ }
 
  res = res.trim();
 

lib/src/init.dart

@@ -32,11 +32,15 @@ class Gemini implements GeminiInterface {
  /// to see request progress
  static bool enableDebugging = false;
 
+ // String? baseURL;
+
  /// private constructor [Gemini._]
  Gemini._(
  {
  /// [apiKey] is required property
  required String apiKey,
+ String? baseURL,
+ Map<String, dynamic>? headers,
 
  /// theses properties are optional
  List<SafetySetting>? safetySettings,
@@ -45,9 +49,9 @@ class Gemini implements GeminiInterface {
  : _impl = GeminiImpl(
  api: GeminiService(
  Dio(BaseOptions(
- baseUrl:
- '${Constants.baseUrl}${version ?? Constants.defaultVersion}/',
+ baseUrl: '${baseURL ?? Constants.baseUrl}${version ?? Constants.defaultVersion}/',
  contentType: 'application/json',
+ headers: headers,
  )),
  apiKey: apiKey),
  safetySettings: safetySettings,
@@ -67,6 +71,8 @@ class Gemini implements GeminiInterface {
  /// singleton initialize [Gemini.init]
  factory Gemini.init(
  {required String apiKey,
+ String? baseURL,
+ Map<String, dynamic>? headers,
  List<SafetySetting>? safetySettings,
  GenerationConfig? generationConfig,
  bool? enableDebugging,
@@ -78,6 +84,8 @@ class Gemini implements GeminiInterface {
  _firstInit = false;
  instance = Gemini._(
  apiKey: apiKey,
+ baseURL: baseURL,
+ headers: headers,
  safetySettings: safetySettings,
  generationConfig: generationConfig,
  version: version);
@@ -98,6 +106,18 @@ class Gemini implements GeminiInterface {
  safetySettings: safetySettings,
  modelName: modelName);
 
+ @override
+ Stream<Candidates> streamChat(
+ List<Content> chats, {
+ String? modelName,
+ List<SafetySetting>? safetySettings,
+ GenerationConfig? generationConfig,
+ }) =>
+ _impl.streamChat(chats,
+ modelName: modelName,
+ safetySettings: safetySettings,
+ generationConfig: generationConfig);
+
  /// [countTokens] When using long prompts, it might be useful to count tokens
  /// before sending any content to the model.
  /// * not implemented yet

lib/src/repository/gemini_interface.dart

@@ -69,6 +69,13 @@ abstract class GeminiInterface {
  GenerationConfig? generationConfig,
  });
 
+ Stream<Candidates> streamChat(
+ List<Content> chats, {
+ String? modelName,
+ List<SafetySetting>? safetySettings,
+ GenerationConfig? generationConfig,
+ });
+
  /// [chat] or `Multi-turn conversations`
  /// Using Gemini, you can build freeform conversations across multiple turns.
  Future<Candidates?> chat(