pretty good

This commit is contained in:
Fabian Freund
2025-02-07 20:45:47 +01:00
parent 025ecaf2e3
commit a12ef8244f
68 changed files with 2359 additions and 1015 deletions
@@ -1,35 +0,0 @@
import 'package:lensai/features/kagi/data/services/autosuggest.dart';
import 'package:lensai/features/kagi/domain/repositories/search_suggestions.dart';
import 'package:lensai/features/search/domain/entities/abstract/i_search_suggestion_provider.dart';
import 'package:riverpod/riverpod.dart';
import 'package:riverpod_annotation/riverpod_annotation.dart';
part 'search_suggestions.g.dart';
@Riverpod(keepAlive: true)
ISearchSuggestionProvider defaultSearchSuggestions(Ref ref) {
return ref.watch(kagiAutosuggestServiceProvider.notifier);
}
@Riverpod(keepAlive: true)
class SearchSuggestions extends _$SearchSuggestions {
late void Function(String query) _addQueryBinding;
void addQuery(String query) => _addQueryBinding(query);
@override
Raw<Stream<List<String>>> build({
ISearchSuggestionProvider? suggestionsProvider,
}) {
final defaultProvider = ref.watch(defaultSearchSuggestionsProvider);
final resolvedProvider = suggestionsProvider ?? defaultProvider;
_addQueryBinding = ref
.watch(searchSuggestionsRepositoryProvider(resolvedProvider).notifier)
.addQuery;
return ref.watch(
searchSuggestionsRepositoryProvider(resolvedProvider),
);
}
}
@@ -1,196 +0,0 @@
// GENERATED CODE - DO NOT MODIFY BY HAND
part of 'search_suggestions.dart';
// **************************************************************************
// RiverpodGenerator
// **************************************************************************
String _$defaultSearchSuggestionsHash() =>
r'56514064baa64acf0a28ec34cfad957dd863538b';
/// See also [defaultSearchSuggestions].
@ProviderFor(defaultSearchSuggestions)
final defaultSearchSuggestionsProvider =
Provider<ISearchSuggestionProvider>.internal(
defaultSearchSuggestions,
name: r'defaultSearchSuggestionsProvider',
debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
? null
: _$defaultSearchSuggestionsHash,
dependencies: null,
allTransitiveDependencies: null,
);
@Deprecated('Will be removed in 3.0. Use Ref instead')
// ignore: unused_element
typedef DefaultSearchSuggestionsRef = ProviderRef<ISearchSuggestionProvider>;
String _$searchSuggestionsHash() => r'ecc378aca325cc6759292a06d8d4d5ace910eb7f';
/// 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 _$SearchSuggestions
extends BuildlessNotifier<Raw<Stream<List<String>>>> {
late final ISearchSuggestionProvider? suggestionsProvider;
Raw<Stream<List<String>>> build({
ISearchSuggestionProvider? suggestionsProvider,
});
}
/// See also [SearchSuggestions].
@ProviderFor(SearchSuggestions)
const searchSuggestionsProvider = SearchSuggestionsFamily();
/// See also [SearchSuggestions].
class SearchSuggestionsFamily extends Family<Raw<Stream<List<String>>>> {
/// See also [SearchSuggestions].
const SearchSuggestionsFamily();
/// See also [SearchSuggestions].
SearchSuggestionsProvider call({
ISearchSuggestionProvider? suggestionsProvider,
}) {
return SearchSuggestionsProvider(
suggestionsProvider: suggestionsProvider,
);
}
@override
SearchSuggestionsProvider getProviderOverride(
covariant SearchSuggestionsProvider provider,
) {
return call(
suggestionsProvider: 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'searchSuggestionsProvider';
}
/// See also [SearchSuggestions].
class SearchSuggestionsProvider
extends NotifierProviderImpl<SearchSuggestions, Raw<Stream<List<String>>>> {
/// See also [SearchSuggestions].
SearchSuggestionsProvider({
ISearchSuggestionProvider? suggestionsProvider,
}) : this._internal(
() => SearchSuggestions()..suggestionsProvider = suggestionsProvider,
from: searchSuggestionsProvider,
name: r'searchSuggestionsProvider',
debugGetCreateSourceHash:
const bool.fromEnvironment('dart.vm.product')
? null
: _$searchSuggestionsHash,
dependencies: SearchSuggestionsFamily._dependencies,
allTransitiveDependencies:
SearchSuggestionsFamily._allTransitiveDependencies,
suggestionsProvider: suggestionsProvider,
);
SearchSuggestionsProvider._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 SearchSuggestions notifier,
) {
return notifier.build(
suggestionsProvider: suggestionsProvider,
);
}
@override
Override overrideWith(SearchSuggestions Function() create) {
return ProviderOverride(
origin: this,
override: SearchSuggestionsProvider._internal(
() => create()..suggestionsProvider = suggestionsProvider,
from: from,
name: null,
dependencies: null,
allTransitiveDependencies: null,
debugGetCreateSourceHash: null,
suggestionsProvider: suggestionsProvider,
),
);
}
@override
NotifierProviderElement<SearchSuggestions, Raw<Stream<List<String>>>>
createElement() {
return _SearchSuggestionsProviderElement(this);
}
@override
bool operator ==(Object other) {
return other is SearchSuggestionsProvider &&
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 SearchSuggestionsRef on NotifierProviderRef<Raw<Stream<List<String>>>> {
/// The parameter `suggestionsProvider` of this provider.
ISearchSuggestionProvider? get suggestionsProvider;
}
class _SearchSuggestionsProviderElement extends NotifierProviderElement<
SearchSuggestions, Raw<Stream<List<String>>>> with SearchSuggestionsRef {
_SearchSuggestionsProviderElement(super.provider);
@override
ISearchSuggestionProvider? get suggestionsProvider =>
(origin as SearchSuggestionsProvider).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
@@ -1,292 +0,0 @@
import 'package:flutter/material.dart';
import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:flutter_markdown/flutter_markdown.dart';
import 'package:go_router/go_router.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:lensai/data/models/equatable_iterable.dart';
import 'package:lensai/extensions/nullable.dart';
import 'package:lensai/features/bangs/data/models/bang_data.dart';
import 'package:lensai/features/bangs/domain/providers/bangs.dart';
import 'package:lensai/features/bangs/domain/providers/search.dart';
import 'package:lensai/features/bangs/domain/repositories/data.dart';
import 'package:lensai/features/geckoview/domain/providers/tab_state.dart';
import 'package:lensai/features/geckoview/domain/repositories/tab.dart';
import 'package:lensai/features/geckoview/features/browser/domain/providers.dart';
import 'package:lensai/features/geckoview/features/tabs/data/models/container_data.dart';
import 'package:lensai/features/geckoview/features/tabs/domain/providers/selected_container.dart';
import 'package:lensai/features/geckoview/features/tabs/domain/repositories/tab_search.dart';
import 'package:lensai/features/geckoview/features/tabs/presentation/widgets/container_chips.dart';
import 'package:lensai/features/search/domain/providers/search_suggestions.dart';
import 'package:lensai/features/search/presentation/widgets/bang_chips.dart';
import 'package:lensai/features/search/presentation/widgets/search_field.dart';
import 'package:lensai/features/search/presentation/widgets/search_suggestion_list.dart';
import 'package:lensai/presentation/hooks/listenable_callback.dart';
import 'package:lensai/presentation/widgets/failure_widget.dart';
import 'package:skeletonizer/skeletonizer.dart';
class SearchScreen extends HookConsumerWidget {
static const _matchPrefix = '***';
final String? initialSearchText;
const SearchScreen({required this.initialSearchText});
@override
Widget build(BuildContext context, WidgetRef ref) {
final formKey = useMemoized(() => GlobalKey<FormState>());
final searchTextController =
useTextEditingController(text: initialSearchText);
useListenableCallback(
searchTextController,
() async {
ref
.read(searchSuggestionsProvider().notifier)
.addQuery(searchTextController.text);
await ref.read(tabSearchRepositoryProvider.notifier).addQuery(
searchTextController.text,
// ignore: avoid_redundant_argument_values
matchPrefix: _matchPrefix,
// ignore: avoid_redundant_argument_values
matchSuffix: _matchPrefix,
);
},
);
final globalSelectedContainer = ref.watch(
selectedContainerDataProvider.select((value) => value.valueOrNull),
);
final defaultSearchBang = ref.watch(
defaultSearchBangDataProvider.select((value) => value.valueOrNull),
);
final selectedBang = useState<BangData?>(null);
final activeBang = selectedBang.value ?? defaultSearchBang;
final showBangIcon = useState(false);
ref.listen(
selectedBangDataProvider(),
(previous, next) {
if (next.hasValue) {
if ((previous?.hasValue ?? false) && previous!.value != next.value) {
showBangIcon.value = true;
}
selectedBang.value = next.value;
}
},
);
Future<void> submitSearch(String query) async {
if (activeBang != null && (formKey.currentState?.validate() == true)) {
final searchUri = await ref.read(
triggerBangSearchProvider(activeBang, query).future,
);
await ref.read(tabRepositoryProvider.notifier).addTab(url: searchUri);
if (context.mounted) {
context.pop();
}
}
}
final selectedContainer = useState<ContainerData?>(globalSelectedContainer);
final availableTabs = ref
.watch(
availableTabIdsProvider(selectedContainer.value?.id).select(
(value) => EquatableCollection(value, immutable: true),
),
)
.collection;
return Scaffold(
body: Form(
key: formKey,
child: CustomScrollView(
slivers: [
SliverAppBar(
floating: true,
pinned: true,
automaticallyImplyLeading: false,
title: SearchField(
showBangIcon: showBangIcon.value,
textEditingController: searchTextController,
onFieldSubmitted: (text) {},
activeBang: activeBang,
),
),
const SliverToBoxAdapter(
child: Divider(),
),
SliverToBoxAdapter(
child: Padding(
padding: const EdgeInsets.only(left: 16.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
'Search Provider',
style: Theme.of(context).textTheme.labelSmall,
),
BangChips(
activeBang: activeBang,
onSelected: (bang) {
ref
.read(selectedBangTriggerProvider().notifier)
.setTrigger(bang.trigger);
},
onDeleted: (bang) async {
if (ref.read(selectedBangTriggerProvider()) ==
bang.trigger) {
ref
.read(
selectedBangTriggerProvider().notifier,
)
.clearTrigger();
} else {
final dialogResult = await BangChips.resetBangDialog(
context,
bang.trigger,
);
if (dialogResult == true) {
await ref
.read(bangDataRepositoryProvider.notifier)
.resetFrequency(bang.trigger);
}
}
},
searchTextController: searchTextController,
),
],
),
),
),
SearchSuggestionList(
searchTextController: searchTextController,
submitSearch: submitSearch,
),
const SliverToBoxAdapter(
child: Divider(),
),
SliverToBoxAdapter(
child: Padding(
padding: const EdgeInsets.only(left: 16.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
'Tabs',
style: Theme.of(context).textTheme.labelSmall,
),
ContainerChips(
displayMenu: false,
selectedContainer: selectedContainer.value,
onSelected: (container) {
selectedContainer.value = container;
},
onDeleted: (container) {
selectedContainer.value = null;
},
searchTextController: searchTextController,
),
],
),
),
),
Consumer(
builder: (context, ref, child) {
final tabs = ref.watch(tabSearchRepositoryProvider);
return SliverSkeletonizer(
enabled: tabs.isLoading,
child: tabs.when(
data: (data) {
if (data == null) {
return const SliverToBoxAdapter(
child: SizedBox.shrink(),
);
}
return SliverList.builder(
itemCount: data.length,
itemBuilder: (context, index) {
final result = data[index];
final headHasMatch =
result.title?.contains(_matchPrefix) ?? false;
final bodyResult =
result.extractedContent ?? result.fullContent;
return ListTile(
title: result.title.mapNotNull(
(title) => MarkdownBody(data: title),
),
subtitle: (!headHasMatch && bodyResult != null)
? MarkdownBody(data: bodyResult)
: null,
);
},
);
},
error: (error, stackTrace) {
return FailureWidget(
title: 'Could not load tabs',
exception: error,
);
},
loading: () => SliverList.builder(
itemCount: tabs.valueOrNull?.length ?? 3,
itemBuilder: (context, index) {
return ListTile(
title: Bone.text(),
);
},
),
),
);
},
),
SliverList.builder(
itemCount: availableTabs.length,
itemBuilder: (context, index) {
return Consumer(
key: ValueKey(availableTabs[index]),
builder: (context, ref, child) {
final tab =
ref.watch(tabStateProvider(availableTabs[index]));
if (tab == null) {
return const SizedBox.shrink();
}
return ListTile(
leading: RepaintBoundary(
child: RawImage(
image: tab.icon?.value,
height: 24,
width: 24,
),
),
title: Text(tab.title),
subtitle: Text(
tab.url.toString(),
softWrap: false,
overflow: TextOverflow.fade,
),
);
},
);
},
),
],
),
),
);
}
}
@@ -1,125 +0,0 @@
import 'package:flutter/material.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/data/models/bang_data.dart';
import 'package:lensai/features/bangs/domain/repositories/search.dart';
import 'package:lensai/features/bangs/presentation/widgets/bang_icon.dart';
import 'package:lensai/presentation/hooks/listenable_callback.dart';
import 'package:lensai/presentation/widgets/selectable_chips.dart';
class BangChips extends HookConsumerWidget {
final bool displayMenu;
final BangData? activeBang;
final void Function(BangData)? onSelected;
final void Function(BangData)? onDeleted;
final TextEditingController? searchTextController;
const BangChips({
required this.activeBang,
required this.onSelected,
required this.onDeleted,
this.searchTextController,
this.displayMenu = true,
});
static Future<bool?> resetBangDialog(
BuildContext context,
String triggerName,
) {
return showDialog<bool>(
context: context,
builder: (context) => AlertDialog(
title: Text(
'Reset usage frequency of $triggerName?',
),
content: const Text(
'This will remove the Bang from quick select.',
),
actions: <Widget>[
TextButton(
onPressed: () => Navigator.pop(context, false),
child: const Text('Cancel'),
),
TextButton(
onPressed: () => Navigator.pop(context, true),
child: const Text('Reset'),
),
],
),
);
}
@override
Widget build(BuildContext context, WidgetRef ref) {
final availableBangs = ref.watch(seamlessBangProviderProvider);
useListenableCallback(
searchTextController,
() {
ref
.read(seamlessBangProviderProvider.notifier)
.search(searchTextController!.text);
},
);
return availableBangs.when(
data: (availableBangs) {
return SizedBox(
height: 48,
child: Row(
children: [
if (activeBang != null || availableBangs.isNotEmpty)
Expanded(
child: SelectableChips(
itemId: (bang) => bang.trigger,
itemAvatar: (bang) => BangIcon(bang, iconSize: 20),
itemLabel: (bang) => Text(bang.websiteName),
availableItems: availableBangs,
selectedItem: activeBang,
onSelected: onSelected,
onDeleted: onDeleted,
),
)
else
Visibility(
visible: displayMenu,
child: Expanded(
child: Text(
"Press '>' to search Bangs.",
style: TextStyle(
color: Theme.of(context).hintColor,
fontStyle: FontStyle.italic,
),
),
),
),
if (displayMenu)
IconButton(
onPressed: () async {
final searchText = searchTextController?.text.trim();
await context.push(
BangSearchRoute(
searchText: (searchText?.isEmpty ?? true)
? BangSearchRoute.emptySearchText
: searchText!,
).location,
);
},
icon: const Icon(Icons.chevron_right),
),
],
),
);
},
error: (error, stackTrace) => const SizedBox.shrink(),
loading: () => const SizedBox(
height: 48,
width: double.infinity,
),
);
}
}
@@ -1,71 +0,0 @@
import 'package:flutter/material.dart';
import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:lensai/features/bangs/data/models/bang_data.dart';
import 'package:lensai/features/bangs/presentation/widgets/bang_icon.dart';
import 'package:lensai/features/user/domain/providers.dart';
import 'package:lensai/presentation/widgets/speech_to_text_button.dart';
class SearchField extends HookConsumerWidget {
final TextEditingController textEditingController;
final FocusNode? focusNode;
final void Function(String)? onFieldSubmitted;
final BangData? activeBang;
final bool showBangIcon;
const SearchField({
super.key,
required this.textEditingController,
required this.onFieldSubmitted,
required this.activeBang,
this.focusNode,
this.showBangIcon = true,
});
@override
Widget build(BuildContext context, WidgetRef ref) {
final incognitoEnabled = ref.watch(incognitoModeEnabledProvider);
final hasText = useListenableSelector(
textEditingController,
() => textEditingController.text.isNotEmpty,
);
return TextFormField(
controller: textEditingController,
enableIMEPersonalizedLearning: !incognitoEnabled,
focusNode: focusNode,
decoration: InputDecoration(
border: InputBorder.none,
prefixIcon: (showBangIcon && activeBang != null)
? Padding(
padding: const EdgeInsetsDirectional.all(12.0),
child: BangIcon(activeBang!, iconSize: 24.0),
)
: null,
label: const Text('Search'),
hintText: 'Ask anything...',
floatingLabelBehavior: FloatingLabelBehavior.always,
suffixIcon: hasText
? IconButton(
onPressed: () {
textEditingController.clear();
},
icon: const Icon(Icons.clear),
)
: SpeechToTextButton(
onTextReceived: (data) {
textEditingController.text = data.toString();
},
),
),
onTapOutside: (focusNode != null)
? (event) {
focusNode!.unfocus();
}
: null,
onFieldSubmitted: onFieldSubmitted,
);
}
}
@@ -1,90 +0,0 @@
import 'package:collection/collection.dart';
import 'package:flutter/material.dart';
import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:lensai/features/bangs/domain/providers/bangs.dart';
import 'package:lensai/features/bangs/domain/repositories/data.dart';
import 'package:lensai/features/search/domain/providers/search_suggestions.dart';
class SearchSuggestionList extends HookConsumerWidget {
final TextEditingController searchTextController;
final Future<void> Function(String query) submitSearch;
final bool showHistory;
const SearchSuggestionList({
required this.searchTextController,
required this.submitSearch,
this.showHistory = true,
super.key,
});
@override
Widget build(BuildContext context, WidgetRef ref) {
useListenableSelector(
searchTextController,
() => searchTextController.text.isNotEmpty,
);
final suggestions = useStream(ref.watch(searchSuggestionsProvider()));
final searchHistory = ref.watch(searchHistoryProvider);
final searchText = searchTextController.text;
if (showHistory &&
(!searchText.isNotEmpty || !suggestions.hasData) &&
(searchHistory.value?.isNotEmpty ?? false)) {
final entries = searchHistory.value!;
return SliverList.builder(
itemCount: entries.length,
itemBuilder: (context, index) {
final query = entries[index].searchQuery;
return ListTile(
leading: const Icon(Icons.history),
title: Text(query),
onLongPress: () {
searchTextController.text = query;
},
onTap: () async {
await submitSearch(query);
},
trailing: IconButton(
onPressed: () async {
await ref
.read(bangDataRepositoryProvider.notifier)
.removeSearchEntry(query);
},
icon: const Icon(Icons.close),
),
);
},
);
}
final prioritizedSuggestions = [
if (searchText.isNotEmpty) searchText,
if (suggestions.data != null)
...suggestions.data!.whereNot((suggestion) => suggestion == searchText),
];
return SliverList.builder(
itemCount: prioritizedSuggestions.length,
itemBuilder: (context, index) {
final suggestion = prioritizedSuggestions[index];
return ListTile(
leading: const Icon(Icons.search),
title: Text(suggestion),
onLongPress: () {
searchTextController.text = suggestion;
},
onTap: () async {
await submitSearch(suggestion);
},
);
},
);
}
}
@@ -24,7 +24,83 @@ class TokenizedFilter<T> {
);
}
factory TokenizedFilter({
static double _calculateScore(
List<String> queryTokens,
List<String> targetTokens,
) {
if (queryTokens.isEmpty || targetTokens.isEmpty) return 0.0;
var score = 0.0;
var exactMatches = 0;
var partialMatches = 0;
for (final queryToken in queryTokens) {
var hasMatch = false;
for (int i = 0; i < targetTokens.length; i++) {
final targetToken = targetTokens[i];
if (targetToken == queryToken) {
// Exact match gets 1.0 points
score += 1.0;
exactMatches++;
hasMatch = true;
break;
} else if (targetToken.contains(queryToken)) {
// Partial match gets points based on match length ratio
final ratio = queryToken.length / targetToken.length;
score += ratio * 0.8; // Partial matches worth 80% of exact matches
partialMatches++;
hasMatch = true;
break;
}
}
if (!hasMatch) {
score -= 0.2; // Penalty for unmatched query tokens
}
}
// Normalize score based on number of query tokens and matches
final matchRatio =
(exactMatches + partialMatches * 0.8) / queryTokens.length;
score = score / queryTokens.length; // Normalize by query length
// Apply match ratio as a multiplier
score *= matchRatio;
// Ensure score is between 0 and 1
return score.clamp(0.0, 1.0);
}
factory TokenizedFilter.sort({
required Iterable<T> items,
required ToString<T> toString,
required String query,
}) {
final queryTokens = _tokenize(query);
final scoredItems = items.map((item) {
final itemString = toString(item);
if (itemString == null || itemString.isEmpty) {
return (item, 0.0);
}
final itemTokens = _tokenize(itemString);
final score = _calculateScore(queryTokens, itemTokens);
return (item, score);
}).toList();
// Sort by score in descending order
scoredItems.sort((a, b) => b.$2.compareTo(a.$2));
// Extract just the items in sorted order
final sorted = scoredItems.map((e) => e.$1).toList();
return TokenizedFilter._(items, sorted);
}
factory TokenizedFilter.remove({
required Iterable<T> items,
required ToString<T> toString,
required String query,