joungmin
1b90f58585
코드 결함 1건 + 문서 정확성 nit 3건. 사용자 동작에 영향 있는 건 (1)
번만, 나머지는 문서 정정.
(1) _LazyLlmService._delegate sticky cache 수정 (main.dart)
- 기존: 첫 호출 시점에 잡힌 delegate (Mock vs Gemma) 가 앱 재시작까지
유지 — 옵트인 OFF 상태에서 첫 suggestFrame 호출 → Mock 잡힘 → 사용자
옵트인 ON + 다운로드 완료 후에도 같은 Mock 만 반환 (사용자는 AI 가
켜진 줄 알고 mock 응답 받음).
- 수정: 매 _resolve() 호출마다 checkAvailability 재평가. 캐시는
(Gemma↔Mock 종류) + (Gemma 의 modelPath) 모두 일치할 때만 재사용 →
state 변화 시 자동 교체. flutter_gemma installModel 자체가
idempotent 라 반복 resolve 비용 무시 가능.
(2) reference doc nit 3건 — 04-QA round 2 가 08-Documenter 로 인계한
nit 를 Reviewer 가 직접 정정:
- L184: "device_info_plus 로 systemFeatures / totalMem 조회" → 실
구현은 MethodChannel `life_helper/device_caps`. device_info_plus
는 deps 에 있지만 4GB 임계 측정엔 미사용 (isLowRamDevice 는 ~1GB).
- L186: F1 후속 이슈 번호 "#222 등" → "#219 별도 이슈".
- L191: follow-up 매핑 — 임의 "#219 ProGuard rules 정제" 항목 제거.
Planner OOS 기준 #219=F1 unload, #220=F2 purge, #221=AC10 corpus,
#222=production keystore 로 정정.
검증: flutter analyze 무이슈, flutter test 88/88 통과.
Refs #218
97 lines
3.1 KiB
Dart
97 lines
3.1 KiB
Dart
import 'package:flutter/material.dart';
|
|
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
|
|
|
import 'data/ai/gemma_llm_service.dart';
|
|
import 'data/ai/llm_service.dart';
|
|
import 'data/ai/model_lifecycle.dart';
|
|
import 'data/db/daos/meta_dao.dart';
|
|
import 'state/ai_providers.dart';
|
|
import 'state/providers.dart';
|
|
import 'ui/screens/habit_list_screen.dart';
|
|
|
|
Future<void> main() async {
|
|
WidgetsFlutterBinding.ensureInitialized();
|
|
final db = await openProductionDatabase();
|
|
runApp(ProviderScope(
|
|
overrides: [
|
|
appDatabaseProvider.overrideWithValue(db),
|
|
// #218: real GemmaLlmService when model file is on disk + verified,
|
|
// MockLlmService otherwise. The provider is read lazily by the frame
|
|
// suggestion flow, so the resolution is dynamic per call.
|
|
llmServiceProvider.overrideWith((ref) {
|
|
return _LazyLlmService(
|
|
lifecycle: ref.watch(modelLifecycleProvider),
|
|
meta: ref.watch(metaDaoProvider),
|
|
);
|
|
}),
|
|
],
|
|
child: const LifeHelperApp(),
|
|
));
|
|
}
|
|
|
|
/// Adapter that lazily resolves between [GemmaLlmService] (when the
|
|
/// model file exists + meta is intact) and [MockLlmService] (fallback,
|
|
/// graceful empty candidates). Keeps the rest of the app unaware of
|
|
/// the difference — `suggestFrame` only sees [LlmService].
|
|
class _LazyLlmService implements LlmService {
|
|
_LazyLlmService({required this.lifecycle, required this.meta});
|
|
final ModelLifecycle lifecycle;
|
|
final MetaDao meta;
|
|
LlmService? _delegate;
|
|
|
|
Future<LlmService> _resolve() async {
|
|
final avail = await lifecycle.checkAvailability();
|
|
final path = await meta.find(AiMetaKeys.modelPath);
|
|
final wantGemma = avail == ModelAvailability.ready && path != null;
|
|
// Re-resolve every call so opt-in / opt-out state changes are reflected
|
|
// without an app restart. Repeat-resolve of the same kind reuses the
|
|
// cached instance (Gemma's flutter_gemma installModel is idempotent;
|
|
// Mock has no setup), but the kind itself flips when availability does.
|
|
final keep = _delegate != null &&
|
|
(wantGemma == (_delegate is GemmaLlmService)) &&
|
|
(!wantGemma ||
|
|
(_delegate as GemmaLlmService).modelPath == path);
|
|
if (!keep) {
|
|
_delegate = wantGemma
|
|
? GemmaLlmService(modelPath: path)
|
|
: MockLlmService();
|
|
}
|
|
return _delegate!;
|
|
}
|
|
|
|
@override
|
|
bool get isLoaded => _delegate?.isLoaded ?? false;
|
|
|
|
@override
|
|
Future<void> load() async => (await _resolve()).load();
|
|
|
|
@override
|
|
Future<void> unload() async {
|
|
final d = _delegate;
|
|
if (d != null) await d.unload();
|
|
}
|
|
|
|
@override
|
|
Future<Map<String, dynamic>> generateStructured(
|
|
String prompt,
|
|
Map<String, dynamic> schema,
|
|
) async =>
|
|
(await _resolve()).generateStructured(prompt, schema);
|
|
}
|
|
|
|
class LifeHelperApp extends StatelessWidget {
|
|
const LifeHelperApp({super.key});
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
return MaterialApp(
|
|
title: 'life-helper',
|
|
theme: ThemeData(
|
|
colorScheme: ColorScheme.fromSeed(seedColor: Colors.indigo),
|
|
useMaterial3: true,
|
|
),
|
|
home: const HabitListScreen(),
|
|
);
|
|
}
|
|
}
|