From 53f88e4998b129c4ad9204a3ac92d83df592eb0e Mon Sep 17 00:00:00 2001 From: David Miguel Date: Thu, 12 Dec 2024 23:42:32 +0100 Subject: [PATCH] refactor: Add new lint rules and fix issues --- analysis_options.yaml | 6 +++- examples/browser_summarizer/pubspec.lock | 6 ++-- examples/hello_world_flutter/pubspec.lock | 6 ++-- packages/anthropic_sdk_dart/pubspec.lock | 14 ++++----- .../test/messages_test.dart | 4 +-- .../chromadb/test/chroma_client_test.dart | 2 +- .../langchain/lib/src/agents/executor.dart | 2 +- .../test/chains/sequential_test.dart | 2 +- .../test/chat_models/chat_anthropic_test.dart | 2 +- .../vector_stores/objectbox/objectbox.dart | 2 +- .../lib/src/exceptions/base.dart | 2 +- .../lib/src/output_parsers/utils.dart | 6 ++-- .../test/prompts/template_test.dart | 4 +-- .../test/runnables/stream_test.dart | 4 +-- .../langchain_firebase/example/pubspec.lock | 30 +++++++++---------- .../vertex_ai/chat_firebase_vertex_ai.dart | 2 +- .../src/chat_models/vertex_ai/mappers.dart | 3 +- packages/langchain_firebase/pubspec.lock | 30 +++++++++---------- .../google_ai/chat_google_generative_ai.dart | 2 +- .../chat_google_generative_ai_test.dart | 2 +- .../test/chat_models/chat_mistralai_test.dart | 2 +- .../test/chat_models/chat_ollama_test.dart | 2 +- .../test/llms/ollama_test.dart | 2 +- .../lib/src/chat_models/mappers.dart | 4 +-- .../test/chains/qa_with_sources_test.dart | 2 +- .../test/chat_models/github_models_test.dart | 2 +- .../test/chat_models/open_router_test.dart | 2 +- .../test/chat_models/together_ai_test.dart | 2 +- .../example/mistralai_dart_example.dart | 2 +- .../mistralai_dart_chat_completions_test.dart | 2 +- .../example/ollama_dart_example.dart | 4 +-- .../test/ollama_dart_chat_test.dart | 2 +- .../test/ollama_dart_completions_test.dart | 2 +- .../test/ollama_dart_models_test.dart | 8 ++--- packages/openai_dart/oas/main.dart | 3 +- .../test/openai_client_chat_test.dart | 2 +- .../test/openai_client_completions_test.dart | 2 +- .../test/client_test.dart | 2 +- .../maching_engine_client_test.dart | 6 ++-- 39 files changed, 94 insertions(+), 90 deletions(-) diff --git a/analysis_options.yaml b/analysis_options.yaml index 9a364363..5018f3d2 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -28,6 +28,7 @@ linter: - avoid_escaping_inner_quotes - avoid_field_initializers_in_const_classes - avoid_function_literals_in_foreach_calls + - avoid_futureor_void - avoid_implementing_value_types - avoid_init_to_null - avoid_js_rounded_ints @@ -75,7 +76,7 @@ linter: - empty_constructor_bodies - empty_statements - enable_null_safety - - eol_at_end_of_file + # - eol_at_end_of_file # Seems to be causing some perf issues (https://github.com/dart-lang/sdk/issues/55281#issuecomment-2519977056) - exhaustive_cases - file_names - hash_and_equals @@ -107,6 +108,7 @@ linter: - noop_primitive_operations - null_check_on_nullable_type_parameter - null_closures + - omit_obvious_local_variable_types - only_throw_errors - overridden_fields - package_names @@ -154,6 +156,7 @@ linter: - slash_for_doc_comments - sort_child_properties_last - sort_unnamed_constructors_first + # - specify_nonobvious_local_variable_types # Disabled because it's very verbose - test_types_in_equals - throw_in_finally - tighten_type_of_initializing_formals @@ -204,5 +207,6 @@ linter: - use_string_in_part_of_directives - use_super_parameters - use_test_throws_matchers + - use_truncating_division - valid_regexps - void_checks diff --git a/examples/browser_summarizer/pubspec.lock b/examples/browser_summarizer/pubspec.lock index 122dd88d..24047cfe 100644 --- a/examples/browser_summarizer/pubspec.lock +++ b/examples/browser_summarizer/pubspec.lock @@ -45,10 +45,10 @@ packages: dependency: transitive description: name: collection - sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf url: "https://pub.dev" source: hosted - version: "1.18.0" + version: "1.19.0" cross_file: dependency: transitive description: @@ -466,7 +466,7 @@ packages: dependency: transitive description: flutter source: sdk - version: "0.0.99" + version: "0.0.0" source_span: dependency: transitive description: diff --git a/examples/hello_world_flutter/pubspec.lock b/examples/hello_world_flutter/pubspec.lock index 60c77ee2..ad3a8f1e 100644 --- a/examples/hello_world_flutter/pubspec.lock +++ b/examples/hello_world_flutter/pubspec.lock @@ -45,10 +45,10 @@ packages: dependency: transitive description: name: collection - sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf url: "https://pub.dev" source: hosted - version: "1.18.0" + version: "1.19.0" cross_file: dependency: transitive description: @@ -329,7 +329,7 @@ packages: dependency: transitive description: flutter source: sdk - version: "0.0.99" + version: "0.0.0" source_span: dependency: transitive description: diff --git a/packages/anthropic_sdk_dart/pubspec.lock b/packages/anthropic_sdk_dart/pubspec.lock index b14e69c1..95589935 100644 --- a/packages/anthropic_sdk_dart/pubspec.lock +++ b/packages/anthropic_sdk_dart/pubspec.lock @@ -5,23 +5,23 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: "45cfa8471b89fb6643fe9bf51bd7931a76b8f5ec2d65de4fb176dba8d4f22c77" + sha256: "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab" url: "https://pub.dev" source: hosted - version: "73.0.0" + version: "76.0.0" _macros: dependency: transitive description: dart source: sdk - version: "0.3.2" + version: "0.3.3" analyzer: dependency: transitive description: name: analyzer - sha256: "4959fec185fe70cce007c57e9ab6983101dbe593d2bf8bbfb4453aaec0cf470a" + sha256: "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e" url: "https://pub.dev" source: hosted - version: "6.8.0" + version: "6.11.0" args: dependency: transitive description: @@ -322,10 +322,10 @@ packages: dependency: transitive description: name: macros - sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536" + sha256: "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656" url: "https://pub.dev" source: hosted - version: "0.1.2-main.4" + version: "0.1.3-main.0" matcher: dependency: transitive description: diff --git a/packages/anthropic_sdk_dart/test/messages_test.dart b/packages/anthropic_sdk_dart/test/messages_test.dart index 1501561b..3f9f74e0 100644 --- a/packages/anthropic_sdk_dart/test/messages_test.dart +++ b/packages/anthropic_sdk_dart/test/messages_test.dart @@ -85,7 +85,7 @@ void main() { ], ), ); - String text = ''; + var text = ''; await for (final res in stream) { res.map( messageStart: (v) { @@ -268,7 +268,7 @@ void main() { final stream = client.createMessageStream( request: request1, ); - String inputJson = ''; + var inputJson = ''; await for (final res in stream) { res.map( messageStart: (v) { diff --git a/packages/chromadb/test/chroma_client_test.dart b/packages/chromadb/test/chroma_client_test.dart index 4e68783a..e41c2cab 100644 --- a/packages/chromadb/test/chroma_client_test.dart +++ b/packages/chromadb/test/chroma_client_test.dart @@ -175,7 +175,7 @@ void main() async { [6.0, 7.0, 8.0, 9.0, 10.0], [11.0, 12.0, 13.0, 14.0, 15.0], ]; - final List> metadata = [ + final metadata = >[ {'test': 'test1'}, {'test': 'test2'}, {'test': 'test3'}, diff --git a/packages/langchain/lib/src/agents/executor.dart b/packages/langchain/lib/src/agents/executor.dart index e22525e1..3cfd13c6 100644 --- a/packages/langchain/lib/src/agents/executor.dart +++ b/packages/langchain/lib/src/agents/executor.dart @@ -84,7 +84,7 @@ class AgentExecutor extends BaseChain { final agent = this.agent; final tools = _internalTools; if (agent is BaseMultiActionAgent) { - for (final Tool tool in tools) { + for (final tool in tools) { if (tool.returnDirect) { return false; } diff --git a/packages/langchain/test/chains/sequential_test.dart b/packages/langchain/test/chains/sequential_test.dart index 0e3a189c..da251df7 100644 --- a/packages/langchain/test/chains/sequential_test.dart +++ b/packages/langchain/test/chains/sequential_test.dart @@ -306,7 +306,7 @@ class _FakeChain extends BaseChain { @override Future callInternal(final ChainValues inputs) async { - final Map outputs = {}; + final outputs = {}; for (final variable in outputVariables) { final variables = [ for (final k in {...inputVariables, ...?memory?.memoryKeys}) inputs[k], diff --git a/packages/langchain_anthropic/test/chat_models/chat_anthropic_test.dart b/packages/langchain_anthropic/test/chat_models/chat_anthropic_test.dart index 541c847f..50398a01 100644 --- a/packages/langchain_anthropic/test/chat_models/chat_anthropic_test.dart +++ b/packages/langchain_anthropic/test/chat_models/chat_anthropic_test.dart @@ -144,7 +144,7 @@ void main() { ), ); - String content = ''; + var content = ''; int count = 0; await for (final res in stream) { content += res.output.content; diff --git a/packages/langchain_community/lib/src/vector_stores/objectbox/objectbox.dart b/packages/langchain_community/lib/src/vector_stores/objectbox/objectbox.dart index 686aba16..77806ba0 100644 --- a/packages/langchain_community/lib/src/vector_stores/objectbox/objectbox.dart +++ b/packages/langchain_community/lib/src/vector_stores/objectbox/objectbox.dart @@ -133,7 +133,7 @@ class ObjectBoxVectorStore extends BaseObjectBoxVectorStore { /// Creates a [Document] from an [ObjectBoxDocument] entity. static Document _createDoc(ObjectBoxDocument entity) { - Map metadata = const {}; + var metadata = const {}; try { metadata = jsonDecode(entity.metadata); } catch (_) {} diff --git a/packages/langchain_core/lib/src/exceptions/base.dart b/packages/langchain_core/lib/src/exceptions/base.dart index a31dd6ea..c7dc35a5 100644 --- a/packages/langchain_core/lib/src/exceptions/base.dart +++ b/packages/langchain_core/lib/src/exceptions/base.dart @@ -33,7 +33,7 @@ base class LangChainException implements Exception { @override String toString() { - String output = '[$code] $message'; + var output = '[$code] $message'; if (stackTrace != null) { output += '\n\n$stackTrace'; diff --git a/packages/langchain_core/lib/src/output_parsers/utils.dart b/packages/langchain_core/lib/src/output_parsers/utils.dart index 12a26b1c..2e6e9bb0 100644 --- a/packages/langchain_core/lib/src/output_parsers/utils.dart +++ b/packages/langchain_core/lib/src/output_parsers/utils.dart @@ -18,10 +18,10 @@ dynamic parsePartialJson(final String s) { } // Initialize variables - String newStr = ''; + var newStr = ''; final stack = []; - bool isInsideString = false; - bool escaped = false; + var isInsideString = false; + var escaped = false; // Process each character in the string one at a time for (int i = 0; i < s.length; i++) { diff --git a/packages/langchain_core/test/prompts/template_test.dart b/packages/langchain_core/test/prompts/template_test.dart index d38b1d39..867970c7 100644 --- a/packages/langchain_core/test/prompts/template_test.dart +++ b/packages/langchain_core/test/prompts/template_test.dart @@ -5,7 +5,7 @@ import 'package:test/test.dart'; void main() { group('Template tests', () { test('Render renderFStringTemplate', () { - final List<(String, InputValues, String)> scenarios = [ + final scenarios = <(String, InputValues, String)>[ ('{foo}', {'foo': 'bar'}, 'bar'), ('pre{foo}post', {'foo': 'bar'}, 'prebarpost'), ('{{pre{foo}post}}', {'foo': 'bar'}, '{prebarpost}'), @@ -26,7 +26,7 @@ void main() { }); test('Invalid f-strings', () { - final List<(String, InputValues)> scenarios = [ + final scenarios = <(String, InputValues)>[ ('{', {}), ('}', {}), ('{foo', {}), diff --git a/packages/langchain_core/test/runnables/stream_test.dart b/packages/langchain_core/test/runnables/stream_test.dart index eabd57e3..0f8ee7b2 100644 --- a/packages/langchain_core/test/runnables/stream_test.dart +++ b/packages/langchain_core/test/runnables/stream_test.dart @@ -141,7 +141,7 @@ void main() { final stream = promptTemplate.streamFromInputStream(inputStream); int count = 0; - PromptValue output = PromptValue.string(''); + var output = PromptValue.string(''); await stream.forEach((final i) { count++; output = output.concat(i); @@ -171,7 +171,7 @@ void main() { final stream = promptTemplate.streamFromInputStream(inputStream); int count = 0; - PromptValue output = PromptValue.chat([ChatMessage.humanText('')]); + var output = PromptValue.chat([ChatMessage.humanText('')]); await stream.forEach((final i) { count++; output = output.concat(i); diff --git a/packages/langchain_firebase/example/pubspec.lock b/packages/langchain_firebase/example/pubspec.lock index ff513690..5788586c 100644 --- a/packages/langchain_firebase/example/pubspec.lock +++ b/packages/langchain_firebase/example/pubspec.lock @@ -53,10 +53,10 @@ packages: dependency: transitive description: name: collection - sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf url: "https://pub.dev" source: hosted - version: "1.18.0" + version: "1.19.0" cross_file: dependency: transitive description: @@ -257,18 +257,18 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05" + sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06" url: "https://pub.dev" source: hosted - version: "10.0.5" + version: "10.0.7" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806" + sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379" url: "https://pub.dev" source: hosted - version: "3.0.5" + version: "3.0.8" leak_tracker_testing: dependency: transitive description: @@ -345,7 +345,7 @@ packages: dependency: transitive description: flutter source: sdk - version: "0.0.99" + version: "0.0.0" source_span: dependency: transitive description: @@ -366,10 +366,10 @@ packages: dependency: transitive description: name: stack_trace - sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377" url: "https://pub.dev" source: hosted - version: "1.11.1" + version: "1.12.0" stream_channel: dependency: transitive description: @@ -382,10 +382,10 @@ packages: dependency: transitive description: name: string_scanner - sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3" url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.3.0" term_glyph: dependency: transitive description: @@ -398,10 +398,10 @@ packages: dependency: transitive description: name: test_api - sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb" + sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c" url: "https://pub.dev" source: hosted - version: "0.7.2" + version: "0.7.3" typed_data: dependency: transitive description: @@ -430,10 +430,10 @@ packages: dependency: transitive description: name: vm_service - sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d" + sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b url: "https://pub.dev" source: hosted - version: "14.2.5" + version: "14.3.0" web: dependency: transitive description: diff --git a/packages/langchain_firebase/lib/src/chat_models/vertex_ai/chat_firebase_vertex_ai.dart b/packages/langchain_firebase/lib/src/chat_models/vertex_ai/chat_firebase_vertex_ai.dart index 83ac8d8c..5cf824ca 100644 --- a/packages/langchain_firebase/lib/src/chat_models/vertex_ai/chat_firebase_vertex_ai.dart +++ b/packages/langchain_firebase/lib/src/chat_models/vertex_ai/chat_firebase_vertex_ai.dart @@ -338,7 +338,7 @@ class ChatFirebaseVertexAI extends BaseChatModel { ? messages.firstOrNull?.contentAsString : null; - bool recreate = false; + var recreate = false; if (model != _currentModel) { _currentModel = model; recreate = true; diff --git a/packages/langchain_firebase/lib/src/chat_models/vertex_ai/mappers.dart b/packages/langchain_firebase/lib/src/chat_models/vertex_ai/mappers.dart index 9c55d409..533c8143 100644 --- a/packages/langchain_firebase/lib/src/chat_models/vertex_ai/mappers.dart +++ b/packages/langchain_firebase/lib/src/chat_models/vertex_ai/mappers.dart @@ -1,7 +1,6 @@ // ignore_for_file: public_member_api_docs import 'dart:convert'; -import 'package:collection/collection.dart'; import 'package:firebase_vertexai/firebase_vertexai.dart' as f; import 'package:langchain_core/chat_models.dart'; import 'package:langchain_core/language_models.dart'; @@ -95,7 +94,7 @@ extension GenerateContentResponseMapper on f.GenerateContentResponse { _ => throw AssertionError('Unknown part type: $p'), }, ) - .whereNotNull() + .nonNulls .join('\n'), toolCalls: candidate.content.parts .whereType() diff --git a/packages/langchain_firebase/pubspec.lock b/packages/langchain_firebase/pubspec.lock index 54681afe..a1a18fcf 100644 --- a/packages/langchain_firebase/pubspec.lock +++ b/packages/langchain_firebase/pubspec.lock @@ -45,10 +45,10 @@ packages: dependency: "direct main" description: name: collection - sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf url: "https://pub.dev" source: hosted - version: "1.18.0" + version: "1.19.0" cross_file: dependency: transitive description: @@ -211,18 +211,18 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05" + sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06" url: "https://pub.dev" source: hosted - version: "10.0.5" + version: "10.0.7" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806" + sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379" url: "https://pub.dev" source: hosted - version: "3.0.5" + version: "3.0.8" leak_tracker_testing: dependency: transitive description: @@ -283,7 +283,7 @@ packages: dependency: transitive description: flutter source: sdk - version: "0.0.99" + version: "0.0.0" source_span: dependency: transitive description: @@ -304,10 +304,10 @@ packages: dependency: transitive description: name: stack_trace - sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377" url: "https://pub.dev" source: hosted - version: "1.11.1" + version: "1.12.0" stream_channel: dependency: transitive description: @@ -320,10 +320,10 @@ packages: dependency: transitive description: name: string_scanner - sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3" url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.3.0" term_glyph: dependency: transitive description: @@ -336,10 +336,10 @@ packages: dependency: transitive description: name: test_api - sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb" + sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c" url: "https://pub.dev" source: hosted - version: "0.7.2" + version: "0.7.3" typed_data: dependency: transitive description: @@ -368,10 +368,10 @@ packages: dependency: transitive description: name: vm_service - sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d" + sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b url: "https://pub.dev" source: hosted - version: "14.2.5" + version: "14.3.0" web: dependency: transitive description: diff --git a/packages/langchain_google/lib/src/chat_models/google_ai/chat_google_generative_ai.dart b/packages/langchain_google/lib/src/chat_models/google_ai/chat_google_generative_ai.dart index 13c94838..8ed0b0e4 100644 --- a/packages/langchain_google/lib/src/chat_models/google_ai/chat_google_generative_ai.dart +++ b/packages/langchain_google/lib/src/chat_models/google_ai/chat_google_generative_ai.dart @@ -403,7 +403,7 @@ class ChatGoogleGenerativeAI ? messages.firstOrNull?.contentAsString : null; - bool recreate = false; + var recreate = false; if (model != _currentModel) { _currentModel = model; recreate = true; diff --git a/packages/langchain_google/test/chat_models/google_ai/chat_google_generative_ai_test.dart b/packages/langchain_google/test/chat_models/google_ai/chat_google_generative_ai_test.dart index 6db2f7e8..087dde4a 100644 --- a/packages/langchain_google/test/chat_models/google_ai/chat_google_generative_ai_test.dart +++ b/packages/langchain_google/test/chat_models/google_ai/chat_google_generative_ai_test.dart @@ -155,7 +155,7 @@ void main() { ), ); - String content = ''; + var content = ''; int count = 0; await for (final res in stream) { content += res.output.content; diff --git a/packages/langchain_mistralai/test/chat_models/chat_mistralai_test.dart b/packages/langchain_mistralai/test/chat_models/chat_mistralai_test.dart index ec8d1ac2..0f0c238d 100644 --- a/packages/langchain_mistralai/test/chat_models/chat_mistralai_test.dart +++ b/packages/langchain_mistralai/test/chat_models/chat_mistralai_test.dart @@ -118,7 +118,7 @@ void main() { final stream = chain.stream({'max_num': '9'}); - String content = ''; + var content = ''; int count = 0; await for (final res in stream) { content += res.trim(); diff --git a/packages/langchain_ollama/test/chat_models/chat_ollama_test.dart b/packages/langchain_ollama/test/chat_models/chat_ollama_test.dart index 9aac4640..73fe24cb 100644 --- a/packages/langchain_ollama/test/chat_models/chat_ollama_test.dart +++ b/packages/langchain_ollama/test/chat_models/chat_ollama_test.dart @@ -180,7 +180,7 @@ void main() { final stream = chain.stream({'max_num': '9'}); - String content = ''; + var content = ''; int count = 0; await for (final res in stream) { content += res.trim(); diff --git a/packages/langchain_ollama/test/llms/ollama_test.dart b/packages/langchain_ollama/test/llms/ollama_test.dart index 7426b0c6..a7f99a58 100644 --- a/packages/langchain_ollama/test/llms/ollama_test.dart +++ b/packages/langchain_ollama/test/llms/ollama_test.dart @@ -183,7 +183,7 @@ void main() { final stream = chain.stream({'max_num': '9'}); - String content = ''; + var content = ''; int count = 0; await for (final res in stream) { content += res.trim(); diff --git a/packages/langchain_openai/lib/src/chat_models/mappers.dart b/packages/langchain_openai/lib/src/chat_models/mappers.dart index ad8bec0b..1bb0ad67 100644 --- a/packages/langchain_openai/lib/src/chat_models/mappers.dart +++ b/packages/langchain_openai/lib/src/chat_models/mappers.dart @@ -218,7 +218,7 @@ extension CreateChatCompletionResponseMapper on CreateChatCompletionResponse { AIChatMessageToolCall _mapMessageToolCall( final ChatCompletionMessageToolCall tooCall, ) { - Map args = {}; + var args = {}; try { args = tooCall.function.arguments.isEmpty ? {} @@ -313,7 +313,7 @@ extension CreateChatCompletionStreamResponseMapper AIChatMessageToolCall _mapMessageToolCall( final ChatCompletionStreamMessageToolCallChunk toolCall, ) { - Map args = {}; + var args = {}; try { args = json.decode(toolCall.function?.arguments ?? ''); } catch (_) {} diff --git a/packages/langchain_openai/test/chains/qa_with_sources_test.dart b/packages/langchain_openai/test/chains/qa_with_sources_test.dart index c655af98..217c9369 100644 --- a/packages/langchain_openai/test/chains/qa_with_sources_test.dart +++ b/packages/langchain_openai/test/chains/qa_with_sources_test.dart @@ -137,7 +137,7 @@ Question: {question} final stream = chain.stream('What did President Biden say about Russia?'); - String content = ''; + var content = ''; int count = 0; await for (final res in stream) { content += res; diff --git a/packages/langchain_openai/test/chat_models/github_models_test.dart b/packages/langchain_openai/test/chat_models/github_models_test.dart index 7eac34dd..2bc9e766 100644 --- a/packages/langchain_openai/test/chat_models/github_models_test.dart +++ b/packages/langchain_openai/test/chat_models/github_models_test.dart @@ -80,7 +80,7 @@ void main() { ), ); - String content = ''; + var content = ''; int count = 0; await for (final res in stream) { content += res.output.content.replaceAll(RegExp(r'[\s\n]'), ''); diff --git a/packages/langchain_openai/test/chat_models/open_router_test.dart b/packages/langchain_openai/test/chat_models/open_router_test.dart index d7c8fc9c..506a5033 100644 --- a/packages/langchain_openai/test/chat_models/open_router_test.dart +++ b/packages/langchain_openai/test/chat_models/open_router_test.dart @@ -75,7 +75,7 @@ void main() { options: ChatOpenAIOptions(model: model), ); - String content = ''; + var content = ''; int count = 0; await for (final res in stream) { content += res.output.content.replaceAll(RegExp(r'[\s\n]'), ''); diff --git a/packages/langchain_openai/test/chat_models/together_ai_test.dart b/packages/langchain_openai/test/chat_models/together_ai_test.dart index b20da78e..ac22a971 100644 --- a/packages/langchain_openai/test/chat_models/together_ai_test.dart +++ b/packages/langchain_openai/test/chat_models/together_ai_test.dart @@ -71,7 +71,7 @@ void main() { options: ChatOpenAIOptions(model: model), ); - String content = ''; + var content = ''; int count = 0; await for (final res in stream) { content += res.output.content.replaceAll(RegExp(r'[\s\n]'), ''); diff --git a/packages/mistralai_dart/example/mistralai_dart_example.dart b/packages/mistralai_dart/example/mistralai_dart_example.dart index eedf28ba..fc2d36b0 100644 --- a/packages/mistralai_dart/example/mistralai_dart_example.dart +++ b/packages/mistralai_dart/example/mistralai_dart_example.dart @@ -51,7 +51,7 @@ Future _createChatCompletionStream(final MistralAIClient client) async { ], ), ); - String text = ''; + var text = ''; await for (final res in stream) { text += res.choices.first.delta.content?.trim() ?? ''; } diff --git a/packages/mistralai_dart/test/mistralai_dart_chat_completions_test.dart b/packages/mistralai_dart/test/mistralai_dart_chat_completions_test.dart index 82aa0344..f57c372f 100644 --- a/packages/mistralai_dart/test/mistralai_dart_chat_completions_test.dart +++ b/packages/mistralai_dart/test/mistralai_dart_chat_completions_test.dart @@ -79,7 +79,7 @@ void main() { ], ), ); - String text = ''; + var text = ''; ChatCompletionStreamResponse? lastResponse; await for (final res in stream) { expect(res.id, isNotEmpty); diff --git a/packages/ollama_dart/example/ollama_dart_example.dart b/packages/ollama_dart/example/ollama_dart_example.dart index 53dc2abf..0f6ce56b 100644 --- a/packages/ollama_dart/example/ollama_dart_example.dart +++ b/packages/ollama_dart/example/ollama_dart_example.dart @@ -60,7 +60,7 @@ Future _generateCompletionStream(final OllamaClient client) async { prompt: 'Why is the sky blue?', ), ); - String text = ''; + var text = ''; await for (final res in stream) { text += res.response?.trim() ?? ''; } @@ -131,7 +131,7 @@ Future _generateChatCompletionStream(final OllamaClient client) async { ], ), ); - String text = ''; + var text = ''; await for (final res in stream) { text += res.message.content.trim(); } diff --git a/packages/ollama_dart/test/ollama_dart_chat_test.dart b/packages/ollama_dart/test/ollama_dart_chat_test.dart index 3e8afd82..6b41db9c 100644 --- a/packages/ollama_dart/test/ollama_dart_chat_test.dart +++ b/packages/ollama_dart/test/ollama_dart_chat_test.dart @@ -77,7 +77,7 @@ void main() { ], ), ); - String text = ''; + var text = ''; await for (final res in stream) { text += res.message.content.trim(); } diff --git a/packages/ollama_dart/test/ollama_dart_completions_test.dart b/packages/ollama_dart/test/ollama_dart_completions_test.dart index 5a134b37..6593469a 100644 --- a/packages/ollama_dart/test/ollama_dart_completions_test.dart +++ b/packages/ollama_dart/test/ollama_dart_completions_test.dart @@ -66,7 +66,7 @@ void main() { prompt: testPrompt, ), ); - String text = ''; + var text = ''; await for (final res in stream) { expect(res.response, isNotNull); text += res.response!.trim(); diff --git a/packages/ollama_dart/test/ollama_dart_models_test.dart b/packages/ollama_dart/test/ollama_dart_models_test.dart index 03086e4b..651402da 100644 --- a/packages/ollama_dart/test/ollama_dart_models_test.dart +++ b/packages/ollama_dart/test/ollama_dart_models_test.dart @@ -24,8 +24,8 @@ void main() { }); test('Test create model', () async { - const String modelName = 'mario'; - const String modelfile = + const modelName = 'mario'; + const modelfile = 'FROM $defaultModel\nSYSTEM You are mario from Super Mario Bros.'; final res = await client.createModel( @@ -39,8 +39,8 @@ void main() { }); test('Test create model stream', () async { - const String modelName = 'mario-stream'; - const String modelfile = + const modelName = 'mario-stream'; + const modelfile = 'FROM $defaultModel\nSYSTEM You are mario from Super Mario Bros.'; final stream = client.createModelStream( diff --git a/packages/openai_dart/oas/main.dart b/packages/openai_dart/oas/main.dart index 5ddcc891..bac38277 100644 --- a/packages/openai_dart/oas/main.dart +++ b/packages/openai_dart/oas/main.dart @@ -56,7 +56,8 @@ String? _onSchemaUnionFactoryName( 'ChatCompletionFunctionCallEnumeration' => 'mode', 'ChatCompletionFunctionCallChatCompletionFunctionCallOption' => 'function', - 'PredictionContentContentListChatCompletionMessageContentPartText' => 'textParts', + 'PredictionContentContentListChatCompletionMessageContentPartText' => + 'textParts', 'PredictionContentContentString' => 'text', 'ResponseFormatText' => 'text', 'ResponseFormatJsonObject' => 'jsonObject', diff --git a/packages/openai_dart/test/openai_client_chat_test.dart b/packages/openai_dart/test/openai_client_chat_test.dart index f792be44..5eb40975 100644 --- a/packages/openai_dart/test/openai_client_chat_test.dart +++ b/packages/openai_dart/test/openai_client_chat_test.dart @@ -177,7 +177,7 @@ void main() { ), ); final stream = client.createChatCompletionStream(request: request); - String text = ''; + var text = ''; CreateChatCompletionStreamResponse? lastResponse; ChatCompletionStreamResponseChoice? lastChoice; await for (final res in stream) { diff --git a/packages/openai_dart/test/openai_client_completions_test.dart b/packages/openai_dart/test/openai_client_completions_test.dart index 35717f82..042d0d5e 100644 --- a/packages/openai_dart/test/openai_client_completions_test.dart +++ b/packages/openai_dart/test/openai_client_completions_test.dart @@ -135,7 +135,7 @@ void main() { temperature: 0, ); final stream = client.createCompletionStream(request: request); - String text = ''; + var text = ''; await for (final res in stream) { expect(res.choices, isNotEmpty); text += res.choices.first.text.trim(); diff --git a/packages/openai_realtime_dart/test/client_test.dart b/packages/openai_realtime_dart/test/client_test.dart index 7de75400..0da5bed5 100644 --- a/packages/openai_realtime_dart/test/client_test.dart +++ b/packages/openai_realtime_dart/test/client_test.dart @@ -88,7 +88,7 @@ void main() { test('Tool calling test', timeout: const Timeout(Duration(minutes: 5)), () async { final realtimeEvents = []; - bool toolCalled = false; + var toolCalled = false; final client = RealtimeClient( apiKey: Platform.environment['OPENAI_API_KEY'], debug: true, diff --git a/packages/vertex_ai/test/matching_engine/maching_engine_client_test.dart b/packages/vertex_ai/test/matching_engine/maching_engine_client_test.dart index 2a99c361..64614855 100644 --- a/packages/vertex_ai/test/matching_engine/maching_engine_client_test.dart +++ b/packages/vertex_ai/test/matching_engine/maching_engine_client_test.dart @@ -32,7 +32,7 @@ void main() async { ), ); // 2. Poll for operation completion (takes around 30min) - VertexAIOperation operation = res; + var operation = res; while (!operation.done) { print('Index creation operation not done yet...'); await Future.delayed(const Duration(seconds: 10)); @@ -51,7 +51,7 @@ void main() async { publicEndpointEnabled: true, ); // 2. Poll for operation completion (takes around 10s) - VertexAIOperation operation = res; + var operation = res; while (!operation.done) { print('Index endpoint creation operation not done yet...'); await Future.delayed(const Duration(seconds: 10)); @@ -71,7 +71,7 @@ void main() async { deployedIndexDisplayName: 'test-deployed-index', ); // 2. Poll for operation completion (takes around 30min) - VertexAIOperation operation = res; + var operation = res; while (!operation.done) { print('Index deployment operation not done yet...'); await Future.delayed(const Duration(seconds: 10));