fix: Fetch web requests with big payloads dropping connection (#273)

davidmigloz · Dec 15, 2023 · 425889d · 425889d
1 parent 31f624f
commit 425889d
Show file tree

Hide file tree

Showing 12 changed files with 72 additions and 0 deletions.
diff --git a/packages/googleai_dart/lib/src/client.dart b/packages/googleai_dart/lib/src/client.dart
@@ -38,4 +38,9 @@ class GoogleAIClient extends g.GoogleAIClient {
           },
           client: client ?? createDefaultHttpClient(),
         );
+
+  @override
+  Future<http.BaseRequest> onRequest(final http.BaseRequest request) {
+    return onRequestHandler(request);
+  }
 }
diff --git a/packages/googleai_dart/lib/src/http_client/http_client_html.dart b/packages/googleai_dart/lib/src/http_client/http_client_html.dart
@@ -6,3 +6,13 @@ import 'package:http/retry.dart';
 http.Client createDefaultHttpClient() {
   return RetryClient(fetch.FetchClient(mode: fetch.RequestMode.cors));
 }
+
+/// Middleware for HTTP requests.
+Future<http.BaseRequest> onRequestHandler(final http.BaseRequest request) {
+  // If the request if bigger than 60KiB set persistentConnection to false
+  // Ref: https://github.com/Zekfad/fetch_client#large-payload
+  if ((request.contentLength ?? 0) > 61440) {
+    request.persistentConnection = false;
+  }
+  return Future.value(request);
+}
diff --git a/packages/googleai_dart/lib/src/http_client/http_client_io.dart b/packages/googleai_dart/lib/src/http_client/http_client_io.dart
@@ -5,3 +5,8 @@ import 'package:http/retry.dart';
 http.Client createDefaultHttpClient() {
   return RetryClient(http.Client());
 }
+
+/// Middleware for HTTP requests.
+Future<http.BaseRequest> onRequestHandler(final http.BaseRequest request) {
+  return Future.value(request);
+}
diff --git a/packages/googleai_dart/lib/src/http_client/http_client_stub.dart b/packages/googleai_dart/lib/src/http_client/http_client_stub.dart
@@ -4,3 +4,7 @@ import 'package:http/http.dart' as http;
 http.Client createDefaultHttpClient() => throw UnsupportedError(
       'Cannot create a client without dart:html or dart:io.',
     );
+
+/// Middleware for HTTP requests.
+Future<http.BaseRequest> onRequestHandler(final http.BaseRequest request) =>
+    throw UnsupportedError('stub');
diff --git a/packages/mistralai_dart/lib/src/client.dart b/packages/mistralai_dart/lib/src/client.dart
@@ -67,6 +67,11 @@ class MistralAIClient extends g.MistralAIClient {
           (final d) => ChatCompletionStreamResponse.fromJson(json.decode(d)),
         );
   }
+
+  @override
+  Future<http.BaseRequest> onRequest(final http.BaseRequest request) {
+    return onRequestHandler(request);
+  }
 }
 
 class _MistralAIStreamTransformer

diff --git a/packages/mistralai_dart/lib/src/http_client/http_client_html.dart b/packages/mistralai_dart/lib/src/http_client/http_client_html.dart
@@ -6,3 +6,13 @@ import 'package:http/retry.dart';
 http.Client createDefaultHttpClient() {
   return RetryClient(fetch.FetchClient(mode: fetch.RequestMode.cors));
 }
+
+/// Middleware for HTTP requests.
+Future<http.BaseRequest> onRequestHandler(final http.BaseRequest request) {
+  // If the request if bigger than 60KiB set persistentConnection to false
+  // Ref: https://github.com/Zekfad/fetch_client#large-payload
+  if ((request.contentLength ?? 0) > 61440) {
+    request.persistentConnection = false;
+  }
+  return Future.value(request);
+}
diff --git a/packages/mistralai_dart/lib/src/http_client/http_client_io.dart b/packages/mistralai_dart/lib/src/http_client/http_client_io.dart
@@ -5,3 +5,8 @@ import 'package:http/retry.dart';
 http.Client createDefaultHttpClient() {
   return RetryClient(http.Client());
 }
+
+/// Middleware for HTTP requests.
+Future<http.BaseRequest> onRequestHandler(final http.BaseRequest request) {
+  return Future.value(request);
+}
diff --git a/packages/mistralai_dart/lib/src/http_client/http_client_stub.dart b/packages/mistralai_dart/lib/src/http_client/http_client_stub.dart
@@ -4,3 +4,7 @@ import 'package:http/http.dart' as http;
 http.Client createDefaultHttpClient() => throw UnsupportedError(
       'Cannot create a client without dart:html or dart:io.',
     );
+
+/// Middleware for HTTP requests.
+Future<http.BaseRequest> onRequestHandler(final http.BaseRequest request) =>
+    throw UnsupportedError('stub');
diff --git a/packages/ollama_dart/lib/src/client.dart b/packages/ollama_dart/lib/src/client.dart
@@ -149,4 +149,9 @@ class OllamaClient extends g.OllamaClient {
       ),
     );
   }
+
+  @override
+  Future<http.BaseRequest> onRequest(final http.BaseRequest request) {
+    return onRequestHandler(request);
+  }
 }
diff --git a/packages/ollama_dart/lib/src/http_client/http_client_html.dart b/packages/ollama_dart/lib/src/http_client/http_client_html.dart
@@ -6,3 +6,13 @@ import 'package:http/retry.dart';
 http.Client createDefaultHttpClient() {
   return RetryClient(fetch.FetchClient(mode: fetch.RequestMode.cors));
 }
+
+/// Middleware for HTTP requests.
+Future<http.BaseRequest> onRequestHandler(final http.BaseRequest request) {
+  // If the request if bigger than 60KiB set persistentConnection to false
+  // Ref: https://github.com/Zekfad/fetch_client#large-payload
+  if ((request.contentLength ?? 0) > 61440) {
+    request.persistentConnection = false;
+  }
+  return Future.value(request);
+}
diff --git a/packages/ollama_dart/lib/src/http_client/http_client_io.dart b/packages/ollama_dart/lib/src/http_client/http_client_io.dart
@@ -5,3 +5,8 @@ import 'package:http/retry.dart';
 http.Client createDefaultHttpClient() {
   return RetryClient(http.Client());
 }
+
+/// Middleware for HTTP requests.
+Future<http.BaseRequest> onRequestHandler(final http.BaseRequest request) {
+  return Future.value(request);
+}
diff --git a/packages/ollama_dart/lib/src/http_client/http_client_stub.dart b/packages/ollama_dart/lib/src/http_client/http_client_stub.dart
@@ -4,3 +4,7 @@ import 'package:http/http.dart' as http;
 http.Client createDefaultHttpClient() => throw UnsupportedError(
       'Cannot create a client without dart:html or dart:io.',
     );
+
+/// Middleware for HTTP requests.
+Future<http.BaseRequest> onRequestHandler(final http.BaseRequest request) =>
+    throw UnsupportedError('stub');