intermediate

app/lib/features/kagi/data/services/autosuggest.dart

@@ -3,12 +3,14 @@ import 'dart:convert';
 import 'package:exceptions/exceptions.dart';
 import 'package:http/http.dart' as http;
 import 'package:lensai/core/http_error_handler.dart';
+import 'package:lensai/features/search/domain/entities/abstract/i_search_suggestion_provider.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
 part 'autosuggest.g.dart';
 
 @Riverpod(keepAlive: true)
-class KagiAutosuggestService extends _$KagiAutosuggestService {
+class KagiAutosuggestService extends _$KagiAutosuggestService
+    implements ISearchSuggestionProvider {
   static final _baseUrl = Uri.https('kagi.com', 'api/autosuggest');
 
   late http.Client _client;
@@ -18,6 +20,7 @@ class KagiAutosuggestService extends _$KagiAutosuggestService {
     _client = http.Client();
   }
 
+  @override
   Future<Result<List<String>>> getSuggestions(String query) async {
     return Result.fromAsync(
       () async {

app/lib/features/kagi/data/services/autosuggest.g.dart

@@ -7,7 +7,7 @@ part of 'autosuggest.dart';
 // **************************************************************************
 
 String _$kagiAutosuggestServiceHash() =>
-    r'843b0d84b1dde2d903412a123c8c10d26e8036fd';
+    r'e1cb4ef730bcf5c4bf4c77617bb12a22228af576';
 
 /// See also [KagiAutosuggestService].
 @ProviderFor(KagiAutosuggestService)

app/lib/features/kagi/domain/repositories/autosuggest.g.dart

@@ -1,27 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'autosuggest.dart';
-
-// **************************************************************************
-// RiverpodGenerator
-// **************************************************************************
-
-String _$autosuggestRepositoryHash() =>
-    r'48d6bf45d648871f8570edfe1e0b394019084695';
-
-/// See also [AutosuggestRepository].
-@ProviderFor(AutosuggestRepository)
-final autosuggestRepositoryProvider =
-    NotifierProvider<AutosuggestRepository, Raw<Stream<List<String>>>>.internal(
-  AutosuggestRepository.new,
-  name: r'autosuggestRepositoryProvider',
-  debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
-      ? null
-      : _$autosuggestRepositoryHash,
-  dependencies: null,
-  allTransitiveDependencies: null,
-);
-
-typedef _$AutosuggestRepository = Notifier<Raw<Stream<List<String>>>>;
-// ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

app/lib/features/kagi/domain/repositories/search_suggestions.dart

@@ -1,26 +1,28 @@
 import 'dart:async';
 
-import 'package:lensai/features/kagi/data/services/autosuggest.dart';
+import 'package:lensai/features/search/domain/entities/abstract/i_search_suggestion_provider.dart';
 import 'package:lensai/utils/lru_cache.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:rxdart/rxdart.dart';
 
-part 'autosuggest.g.dart';
+part 'search_suggestions.g.dart';
 
 @Riverpod(keepAlive: true)
-class AutosuggestRepository extends _$AutosuggestRepository {
+class SearchSuggestionsRepository extends _$SearchSuggestionsRepository {
   final LRUCache<String, List<String>> _cache;
 
   late StreamController<String> _queryStreamController;
 
-  AutosuggestRepository() : _cache = LRUCache(100);
+  SearchSuggestionsRepository() : _cache = LRUCache(100);
 
   void addQuery(String query) {
     _queryStreamController.add(query);
   }
 
   @override
-  Raw<Stream<List<String>>> build() {
+  Raw<Stream<List<String>>> build(
+    ISearchSuggestionProvider suggestionsProvider,
+  ) {
     _queryStreamController = StreamController();
     ref.onDispose(() async {
       await _queryStreamController.close();
@@ -39,8 +41,7 @@ class AutosuggestRepository extends _$AutosuggestRepository {
           return Stream.value(cached);
         }
 
-        return ref
-            .read(kagiAutosuggestServiceProvider.notifier)
+        return suggestionsProvider
             // ignore: discarded_futures
             .getSuggestions(query)
             // ignore: discarded_futures

app/lib/features/kagi/domain/repositories/search_suggestions.g.dart

@@ -0,0 +1,182 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'search_suggestions.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+String _$searchSuggestionsRepositoryHash() =>
+    r'bc6dc862ae7d887b404972abbbee3c1b27a64d2e';
+
+/// Copied from Dart SDK
+class _SystemHash {
+  _SystemHash._();
+
+  static int combine(int hash, int value) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + value);
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x0007ffff & hash) << 10));
+    return hash ^ (hash >> 6);
+  }
+
+  static int finish(int hash) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x03ffffff & hash) << 3));
+    // ignore: parameter_assignments
+    hash = hash ^ (hash >> 11);
+    return 0x1fffffff & (hash + ((0x00003fff & hash) << 15));
+  }
+}
+
+abstract class _$SearchSuggestionsRepository
+    extends BuildlessNotifier<Raw<Stream<List<String>>>> {
+  late final ISearchSuggestionProvider suggestionsProvider;
+
+  Raw<Stream<List<String>>> build(
+    ISearchSuggestionProvider suggestionsProvider,
+  );
+}
+
+/// See also [SearchSuggestionsRepository].
+@ProviderFor(SearchSuggestionsRepository)
+const searchSuggestionsRepositoryProvider = SearchSuggestionsRepositoryFamily();
+
+/// See also [SearchSuggestionsRepository].
+class SearchSuggestionsRepositoryFamily
+    extends Family<Raw<Stream<List<String>>>> {
+  /// See also [SearchSuggestionsRepository].
+  const SearchSuggestionsRepositoryFamily();
+
+  /// See also [SearchSuggestionsRepository].
+  SearchSuggestionsRepositoryProvider call(
+    ISearchSuggestionProvider suggestionsProvider,
+  ) {
+    return SearchSuggestionsRepositoryProvider(
+      suggestionsProvider,
+    );
+  }
+
+  @override
+  SearchSuggestionsRepositoryProvider getProviderOverride(
+    covariant SearchSuggestionsRepositoryProvider provider,
+  ) {
+    return call(
+      provider.suggestionsProvider,
+    );
+  }
+
+  static const Iterable<ProviderOrFamily>? _dependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get dependencies => _dependencies;
+
+  static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
+      _allTransitiveDependencies;
+
+  @override
+  String? get name => r'searchSuggestionsRepositoryProvider';
+}
+
+/// See also [SearchSuggestionsRepository].
+class SearchSuggestionsRepositoryProvider extends NotifierProviderImpl<
+    SearchSuggestionsRepository, Raw<Stream<List<String>>>> {
+  /// See also [SearchSuggestionsRepository].
+  SearchSuggestionsRepositoryProvider(
+    ISearchSuggestionProvider suggestionsProvider,
+  ) : this._internal(
+          () => SearchSuggestionsRepository()
+            ..suggestionsProvider = suggestionsProvider,
+          from: searchSuggestionsRepositoryProvider,
+          name: r'searchSuggestionsRepositoryProvider',
+          debugGetCreateSourceHash:
+              const bool.fromEnvironment('dart.vm.product')
+                  ? null
+                  : _$searchSuggestionsRepositoryHash,
+          dependencies: SearchSuggestionsRepositoryFamily._dependencies,
+          allTransitiveDependencies:
+              SearchSuggestionsRepositoryFamily._allTransitiveDependencies,
+          suggestionsProvider: suggestionsProvider,
+        );
+
+  SearchSuggestionsRepositoryProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.suggestionsProvider,
+  }) : super.internal();
+
+  final ISearchSuggestionProvider suggestionsProvider;
+
+  @override
+  Raw<Stream<List<String>>> runNotifierBuild(
+    covariant SearchSuggestionsRepository notifier,
+  ) {
+    return notifier.build(
+      suggestionsProvider,
+    );
+  }
+
+  @override
+  Override overrideWith(SearchSuggestionsRepository Function() create) {
+    return ProviderOverride(
+      origin: this,
+      override: SearchSuggestionsRepositoryProvider._internal(
+        () => create()..suggestionsProvider = suggestionsProvider,
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        suggestionsProvider: suggestionsProvider,
+      ),
+    );
+  }
+
+  @override
+  NotifierProviderElement<SearchSuggestionsRepository,
+      Raw<Stream<List<String>>>> createElement() {
+    return _SearchSuggestionsRepositoryProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is SearchSuggestionsRepositoryProvider &&
+        other.suggestionsProvider == suggestionsProvider;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, suggestionsProvider.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
+mixin SearchSuggestionsRepositoryRef
+    on NotifierProviderRef<Raw<Stream<List<String>>>> {
+  /// The parameter `suggestionsProvider` of this provider.
+  ISearchSuggestionProvider get suggestionsProvider;
+}
+
+class _SearchSuggestionsRepositoryProviderElement
+    extends NotifierProviderElement<SearchSuggestionsRepository,
+        Raw<Stream<List<String>>>> with SearchSuggestionsRepositoryRef {
+  _SearchSuggestionsRepositoryProviderElement(super.provider);
+
+  @override
+  ISearchSuggestionProvider get suggestionsProvider =>
+      (origin as SearchSuggestionsRepositoryProvider).suggestionsProvider;
+}
+// ignore_for_file: type=lint
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

app/lib/features/kagi/presentation/tabs/search_tab.dart

@@ -4,7 +4,7 @@ import 'package:flutter_material_design_icons/flutter_material_design_icons.dart
 import 'package:go_router/go_router.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:lensai/core/routing/routes.dart';
-import 'package:lensai/features/bangs/domain/providers.dart';
+import 'package:lensai/features/bangs/domain/providers/bangs.dart';
 import 'package:lensai/features/bangs/domain/repositories/data.dart';
 import 'package:lensai/features/bangs/presentation/widgets/bang_icon.dart';
 import 'package:lensai/features/bangs/presentation/widgets/search_field.dart';
@@ -32,8 +32,8 @@ class SearchTab extends HookConsumerWidget {
 
     final selectedBang = ref
         .watch(selectedBangDataProvider().select((value) => value.valueOrNull));
-    final defaultSearchBang = ref
-        .watch(kagiSearchBangDataProvider.select((value) => value.valueOrNull));
+    final defaultSearchBang = ref.watch(
+        defaultSearchBangDataProvider.select((value) => value.valueOrNull));
 
     final activeBang = selectedBang ?? defaultSearchBang;