Compare commits

..

No commits in common. "main" and "v1.0.47" have entirely different histories.

10 changed files with 217 additions and 556 deletions

View File

@ -124,27 +124,18 @@ mixin CameraAnalysisMixin<T extends ConsumerStatefulWidget> on ConsumerState<T>
// : // :
if (!mounted) return; if (!mounted) return;
final stageNotifier = ValueNotifier<int>(1);
var stageNotifierDisposed = false;
// ignore: use_build_context_synchronously // ignore: use_build_context_synchronously
// mounted BuildContext // mounted BuildContext
showDialog( showDialog(
context: context, context: context,
barrierDismissible: false, barrierDismissible: false,
builder: (context) => AnalyzingDialog(stageNotifier: stageNotifier), builder: (context) => const AnalyzingDialog(),
); );
try { try {
debugPrint('Starting Gemini 2-stage analysis for ${capturedImages.length} images'); debugPrint('Starting Gemini Vision Direct Analysis for ${capturedImages.length} images');
final geminiService = ref.read(geminiServiceProvider); final geminiService = ref.read(geminiServiceProvider);
final result = await geminiService.analyzeSakeLabel( final result = await geminiService.analyzeSakeLabel(capturedImages);
capturedImages,
onStep1Complete: () {
if (!stageNotifierDisposed) stageNotifier.value = 2;
},
);
// Create SakeItem (Schema v2.0) // Create SakeItem (Schema v2.0)
final sakeItem = SakeItem( final sakeItem = SakeItem(
@ -381,38 +372,17 @@ mixin CameraAnalysisMixin<T extends ConsumerStatefulWidget> on ConsumerState<T>
} }
debugPrint('Analysis error: $e'); debugPrint('Analysis error: $e');
final errDetail = _extractErrorCode(e.toString());
messenger.showSnackBar( messenger.showSnackBar(
SnackBar( SnackBar(
content: Text('解析に失敗しました。時間をおいて再試行してください。$errDetail'), content: const Text('解析に失敗しました。時間をおいて再試行してください。'),
duration: const Duration(seconds: 5), duration: const Duration(seconds: 5),
backgroundColor: appColors.error, backgroundColor: appColors.error,
), ),
); );
} }
} finally {
stageNotifierDisposed = true;
stageNotifier.dispose();
} }
} }
/// HTTP
///
String _extractErrorCode(String err) {
final patterns = {
RegExp(r'\b(4\d{2}|5\d{2})\b'): (Match m) => ' [${m.group(0)}]',
RegExp(r'API_KEY_INVALID|PERMISSION_DENIED'): (_) => ' [key?]',
RegExp(r'RESOURCE_EXHAUSTED'): (_) => ' [quota]',
RegExp(r'NOT_FOUND'): (_) => ' [model?]',
RegExp(r'timeout', caseSensitive: false): (_) => ' [timeout]',
};
for (final entry in patterns.entries) {
final m = entry.key.firstMatch(err);
if (m != null) return entry.value(m);
}
return '';
}
/// ///
/// ///
/// ///

View File

@ -358,15 +358,6 @@ class _PendingAnalysisScreenState extends ConsumerState<PendingAnalysisScreen> {
width: 60, width: 60,
height: 60, height: 60,
fit: BoxFit.cover, fit: BoxFit.cover,
errorBuilder: (_, __, ___) => Container(
width: 60,
height: 60,
decoration: BoxDecoration(
color: appColors.divider,
borderRadius: BorderRadius.circular(8),
),
child: Icon(LucideIcons.image, color: appColors.iconSubtle),
),
), ),
) )
: Container( : Container(

View File

@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:lucide_icons/lucide_icons.dart'; import 'package:lucide_icons/lucide_icons.dart';
import '../providers/theme_provider.dart'; import '../providers/theme_provider.dart';
import '../theme/app_colors.dart';
import '../widgets/settings/display_settings_section.dart'; import '../widgets/settings/display_settings_section.dart';
import '../widgets/settings/other_settings_section.dart'; import '../widgets/settings/other_settings_section.dart';
import '../widgets/settings/backup_settings_section.dart'; import '../widgets/settings/backup_settings_section.dart';
@ -23,7 +22,7 @@ class _ShopSettingsScreenState extends ConsumerState<ShopSettingsScreen> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final userProfile = ref.watch(userProfileProvider); final userProfile = ref.watch(userProfileProvider);
final appColors = Theme.of(context).extension<AppColors>()!; final isDark = Theme.of(context).brightness == Brightness.dark;
return Scaffold( return Scaffold(
appBar: AppBar( appBar: AppBar(
@ -36,9 +35,9 @@ class _ShopSettingsScreenState extends ConsumerState<ShopSettingsScreen> {
// Business Config Section // Business Config Section
_buildSectionHeader(context, '価格設定', LucideIcons.briefcase), _buildSectionHeader(context, '価格設定', LucideIcons.briefcase),
Card( Card(
color: appColors.surfaceElevated, color: isDark ? const Color(0xFF1E1E1E) : null,
child: ListTile( child: ListTile(
leading: Icon(LucideIcons.percent, color: appColors.iconAccent), leading: Icon(LucideIcons.percent, color: isDark ? Colors.orange[300] : Theme.of(context).primaryColor),
title: const Text('基本掛率'), title: const Text('基本掛率'),
trailing: Row( trailing: Row(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
@ -46,15 +45,15 @@ class _ShopSettingsScreenState extends ConsumerState<ShopSettingsScreen> {
Text('×', style: TextStyle( Text('×', style: TextStyle(
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontSize: 16, fontSize: 16,
color: appColors.textSecondary, color: isDark ? Colors.grey[400] : Colors.grey[600],
)), )),
const SizedBox(width: 8), const SizedBox(width: 8),
Container( Container(
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 4), padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 4),
decoration: BoxDecoration( decoration: BoxDecoration(
color: appColors.surfaceSubtle, color: isDark ? Colors.grey[800] : Colors.grey[100],
borderRadius: BorderRadius.circular(8), borderRadius: BorderRadius.circular(8),
border: Border.all(color: appColors.divider), border: Border.all(color: isDark ? Colors.grey[700]! : Colors.grey[300]!),
), ),
child: DropdownButton<double>( child: DropdownButton<double>(
value: userProfile.defaultMarkup, value: userProfile.defaultMarkup,
@ -97,18 +96,18 @@ class _ShopSettingsScreenState extends ConsumerState<ShopSettingsScreen> {
} }
Widget _buildSectionHeader(BuildContext context, String title, IconData icon) { Widget _buildSectionHeader(BuildContext context, String title, IconData icon) {
final appColors = Theme.of(context).extension<AppColors>()!; final isDark = Theme.of(context).brightness == Brightness.dark;
return Padding( return Padding(
padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 4), padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 4),
child: Row( child: Row(
children: [ children: [
Icon(icon, size: 20, color: appColors.iconAccent), Icon(icon, size: 20, color: isDark ? Colors.orange[300] : Theme.of(context).primaryColor),
const SizedBox(width: 8), const SizedBox(width: 8),
Text( Text(
title, title,
style: Theme.of(context).textTheme.titleMedium?.copyWith( style: Theme.of(context).textTheme.titleMedium?.copyWith(
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
color: appColors.textPrimary, color: isDark ? Colors.grey[300] : Theme.of(context).primaryColor,
), ),
), ),
], ],

View File

@ -11,15 +11,6 @@ import 'package:path_provider/path_provider.dart';
import 'package:path/path.dart' as path; import 'package:path/path.dart' as path;
import '../models/sake_item.dart'; import '../models/sake_item.dart';
///
/// UI /使
class PreRestoreBackupException implements Exception {
const PreRestoreBackupException();
@override
String toString() => 'PreRestoreBackupException: pre-restore safety backup failed';
}
/// Google Driveへのバックアップ /// Google Driveへのバックアップ
/// ///
/// ///
@ -334,11 +325,8 @@ class BackupService {
final driveApi = drive.DriveApi(authClient); final driveApi = drive.DriveApi(authClient);
// 3. 退 // 3. 退
final preBackupOk = await _createPreRestoreBackup(); await _createPreRestoreBackup();
if (!preBackupOk) {
throw const PreRestoreBackupException();
}
// 4. Google Driveからダウンロード // 4. Google Driveからダウンロード
final zipFile = await _downloadFromDrive(driveApi); final zipFile = await _downloadFromDrive(driveApi);
@ -354,55 +342,26 @@ class BackupService {
await zipFile.delete(); await zipFile.delete();
return success; return success;
} on PreRestoreBackupException {
rethrow;
} catch (error) { } catch (error) {
debugPrint('[RESTORE] Restore error: $error'); debugPrint('[RESTORE] Restore error: $error');
return false; return false;
} }
} }
/// 退 true false /// 退
Future<bool> _createPreRestoreBackup() async { Future<void> _createPreRestoreBackup() async {
try { try {
final tempDir = await getTemporaryDirectory(); final tempDir = await getTemporaryDirectory();
final backupPath = path.join(tempDir.path, 'pre_restore_backup.zip'); final backupPath = path.join(tempDir.path, 'pre_restore_backup.zip');
final zipFile = await _createBackupZip(); final zipFile = await _createBackupZip();
if (zipFile == null) { if (zipFile != null) {
debugPrint('[RESTORE] Pre-restore backup: ZIP creation failed');
return false;
}
await zipFile.copy(backupPath); await zipFile.copy(backupPath);
await zipFile.delete(); await zipFile.delete();
debugPrint('[RESTORE] Pre-restore backup saved: $backupPath'); debugPrint('[RESTORE] Pre-restore backup saved: $backupPath');
return true; }
} catch (error) { } catch (error) {
debugPrint('[RESTORE] Pre-restore backup error: $error'); debugPrint('[RESTORE] Pre-restore backup error: $error');
return false;
}
}
///
Future<bool> restoreBackupSkippingPreBackup() async {
try {
final account = _googleSignIn.currentUser;
if (account == null) return false;
final authClient = await _googleSignIn.authenticatedClient();
if (authClient == null) return false;
final driveApi = drive.DriveApi(authClient);
final zipFile = await _downloadFromDrive(driveApi);
if (zipFile == null) return false;
final success = await _restoreFromZip(zipFile);
await zipFile.delete();
return success;
} catch (error) {
debugPrint('[RESTORE] Force restore error: $error');
return false;
} }
} }
@ -434,14 +393,7 @@ class BackupService {
// 3. // 3.
final sink = downloadFile.openWrite(); final sink = downloadFile.openWrite();
await media.stream.pipe(sink).timeout( await media.stream.pipe(sink);
const Duration(minutes: 3),
onTimeout: () {
sink.close();
try { downloadFile.deleteSync(); } catch (_) {}
throw TimeoutException('Backup download timed out after 3 minutes');
},
);
debugPrint('[RESTORE] Download complete: $downloadPath'); debugPrint('[RESTORE] Download complete: $downloadPath');
return downloadFile; return downloadFile;
@ -532,7 +484,7 @@ class BackupService {
isUserEdited: data['userData']['isUserEdited'] as bool, isUserEdited: data['userData']['isUserEdited'] as bool,
price: data['userData']['price'] as int?, price: data['userData']['price'] as int?,
costPrice: data['userData']['costPrice'] as int?, costPrice: data['userData']['costPrice'] as int?,
markup: (data['userData']['markup'] as num?)?.toDouble() ?? 3.0, markup: (data['userData']['markup'] as num).toDouble(),
priceVariants: data['userData']['priceVariants'] != null priceVariants: data['userData']['priceVariants'] != null
? Map<String, int>.from(data['userData']['priceVariants'] as Map) ? Map<String, int>.from(data['userData']['priceVariants'] as Map)
: null, : null,

View File

@ -13,280 +13,16 @@ class GeminiService {
// AI Proxy Server Configuration // AI Proxy Server Configuration
static final String _proxyUrl = Secrets.aiProxyAnalyzeUrl; static final String _proxyUrl = Secrets.aiProxyAnalyzeUrl;
// ? Proxy側で管理されているが
static DateTime? _lastApiCallTime; static DateTime? _lastApiCallTime;
static const Duration _minApiInterval = Duration(seconds: 2); static const Duration _minApiInterval = Duration(seconds: 2);
GeminiService(); GeminiService();
// ============================================================ ///
// Public API Future<SakeAnalysisResult> analyzeSakeLabel(List<String> imagePaths, {bool forceRefresh = false}) async {
// ============================================================ //
const prompt = '''
/// 2: OCR
///
/// [onStep1Complete]: Stage 1
/// UI 2使
/// APIモードconsumer APK1
Future<SakeAnalysisResult> analyzeSakeLabel(
List<String> imagePaths, {
bool forceRefresh = false,
VoidCallback? onStep1Complete,
}) async {
if (Secrets.useProxy) {
return _callProxyApi(
imagePaths: imagePaths,
customPrompt: _mainAnalysisPrompt,
forceRefresh: forceRefresh,
);
}
return _runTwoStageAnalysis(
imagePaths,
forceRefresh: forceRefresh,
onStep1Complete: onStep1Complete,
);
}
/// :
Future<SakeAnalysisResult> reanalyzeSakeLabel(
List<String> imagePaths, {
String? previousName,
String? previousBrand,
}) async {
final prevNameStr = previousName != null ? '$previousName' : '不明';
final prevBrandStr = previousBrand != null ? '$previousBrand' : '不明';
final challengePrompt = '''
:
- name: $prevNameStr
- brand: $prevBrandStr
##
1. 1
2. name=$prevNameStr
3.
4. N N
## namebrandprefectureの読み取りOCR厳守
-
-
- /
- prefecture null
##
使
##
JSONのみ返す:
{
"name": "ラベルに写っている銘柄名(補完禁止)",
"brand": "ラベルに写っている蔵元名(補完禁止)",
"prefecture": "ラベルに書かれた都道府県名なければnull",
"type": "特定名称なければnull",
"description": "説明文100文字程度",
"catchCopy": "20文字以内のキャッチコピー",
"confidenceScore": 80,
"flavorTags": ["フルーティー", "辛口"],
"tasteStats": {"aroma":3,"sweetness":3,"acidity":3,"bitterness":3,"body":3},
"alcoholContent": 15.0,
"polishingRatio": 50,
"sakeMeterValue": 3.0,
"riceVariety": null,
"yeast": null,
"manufacturingYearMonth": null
}
''';
return _callDirectApi(
imagePaths,
challengePrompt,
forceRefresh: true,
temperature: 0.3,
);
}
// ============================================================
// 2APIモード専用
// ============================================================
/// Stage1(OCR) Stage2() 2
Future<SakeAnalysisResult> _runTwoStageAnalysis(
List<String> imagePaths, {
bool forceRefresh = false,
VoidCallback? onStep1Complete,
}) async {
// Stage1実行前にキャッシュ確認 API
if (!forceRefresh && imagePaths.isNotEmpty) {
final imageHash = await AnalysisCacheService.computeCombinedHash(imagePaths);
final cached = await AnalysisCacheService.getCached(imageHash);
if (cached != null) {
debugPrint('2-stage: cache hit, skipping API calls');
return cached.asCached();
}
}
final apiKey = Secrets.geminiApiKey;
if (apiKey.isEmpty) throw Exception('Gemini API Key is missing. Please set GEMINI_API_KEY.');
// Stage1/2I/O節約
final imageParts = <DataPart>[];
for (final path in imagePaths) {
final bytes = await File(path).readAsBytes();
imageParts.add(DataPart('image/jpeg', bytes));
debugPrint('Loaded image for 2-stage: ${(bytes.length / 1024).toStringAsFixed(1)}KB');
}
// --- Stage 1: OCR専念301---
Map<String, String?> ocr;
try {
ocr = await _performOcrStep(apiKey, imageParts);
debugPrint('Stage1 OCR: name="${ocr['name']}" brand="${ocr['brand']}" pref="${ocr['prefecture']}"');
} catch (e) {
debugPrint('Stage1 OCR failed ($e), falling back to single-stage');
return _callDirectApi(imagePaths, null, forceRefresh: forceRefresh);
}
// Stage1 name/brand null = 2
if (ocr['name'] == null && ocr['brand'] == null) {
debugPrint('Stage1 returned no text, falling back to single-stage');
return _callDirectApi(imagePaths, null, forceRefresh: forceRefresh);
}
// Stage 1 UI AnalyzingDialog Stage2
onStep1Complete?.call();
// --- Stage 2: OCR結果を制約として渡し ---
// _callDirectApi Stage2
// forceRefresh=false
//
final stage2Prompt = _buildStage2Prompt(ocr);
return _callDirectApi(imagePaths, stage2Prompt, forceRefresh: forceRefresh);
}
/// Stage 1: OCRのみ実行name / brand / prefecture
///
///
/// rethrow
Future<Map<String, String?>> _performOcrStep(
String apiKey,
List<DataPart> imageParts,
) async {
const ocrPrompt = '''
3OCRしてください
-
- :
- N文字しかなければN文字のみ出力する
JSONのみ返す:
{"name": "銘柄名", "brand": "蔵元名", "prefecture": "都道府県名またはnull"}
''';
final model = GenerativeModel(
model: 'gemini-2.5-flash',
apiKey: apiKey,
systemInstruction: Content.system(
'あなたはOCR専用システムです。ラベルの文字を一字一句正確に書き起こすだけです。'
'銘柄名の補完・変換・拡張は厳禁。見えている文字数と出力文字数を一致させること。',
),
generationConfig: GenerationConfig(
responseMimeType: 'application/json',
temperature: 0,
),
);
final parts = <Part>[TextPart(ocrPrompt), ...imageParts];
final response = await model
.generateContent([Content.multi(parts)])
.timeout(const Duration(seconds: 30));
final jsonStr = response.text;
if (jsonStr == null || jsonStr.isEmpty) {
throw Exception('Stage1: empty response');
}
final map = jsonDecode(jsonStr) as Map<String, dynamic>;
return {
'name': map['name'] as String?,
'brand': map['brand'] as String?,
'prefecture': map['prefecture'] as String?,
};
}
/// Stage 2 : Stage 1 OCR
///
/// Gemini name/brand/prefecture
/// hallucination
String _buildStage2Prompt(Map<String, String?> ocr) {
final name = ocr['name'];
final brand = ocr['brand'];
final prefecture = ocr['prefecture'];
final nameConstraint = name != null ? '$name」(確定済み — 変更禁止)' : 'null確定済み';
final brandConstraint = brand != null ? '$brand」(確定済み — 変更禁止)' : 'null確定済み';
final prefConstraint = prefecture != null ? '$prefecture」(確定済み — 変更禁止)' : 'null確定済み';
final nameJson = name != null ? jsonEncode(name) : 'null';
final brandJson = brand != null ? jsonEncode(brand) : 'null';
final prefJson = prefecture != null ? jsonEncode(prefecture) : 'null';
return '''
1OCR結果 3
OCRした確定結果です
- name: $nameConstraint
- brand: $brandConstraint
- prefecture: $prefConstraint
3JSONに含め
##
- type: null
- description: type 100
- catchCopy: 20
- flavorTags:
- tasteStats: 15 3
- alcoholContent: type
- polishingRatio: type
- sakeMeterValue:
- riceVariety: null
- yeast: null
- manufacturingYearMonth: null
- confidenceScore: 0100
##
JSONのみ返す:
{
"name": $nameJson,
"brand": $brandJson,
"prefecture": $prefJson,
"type": "特定名称なければnull",
"description": "説明文100文字程度",
"catchCopy": "20文字以内のキャッチコピー",
"confidenceScore": 80,
"flavorTags": ["フルーティー", "辛口"],
"tasteStats": {"aroma":3,"sweetness":3,"acidity":3,"bitterness":3,"body":3},
"alcoholContent": 15.0,
"polishingRatio": 50,
"sakeMeterValue": 3.0,
"riceVariety": null,
"yeast": null,
"manufacturingYearMonth": null
}
''';
}
// ============================================================
// 1
// ============================================================
static const String _mainAnalysisPrompt = '''
JSONを返してください JSONを返してください
@ -350,15 +86,93 @@ name・brand を出力する直前に以下を確認してください:
} }
'''; ''';
// ============================================================ return _callProxyApi(
// APIコールiOSビルド用 / USE_PROXY=true imagePaths: imagePaths,
// ============================================================ customPrompt: prompt, // Override server default
forceRefresh: forceRefresh,
);
}
/// :
///
/// analyzeSakeLabel :
/// - name/brand
/// - temperature=0.3
/// - hallucination
Future<SakeAnalysisResult> reanalyzeSakeLabel(
List<String> imagePaths, {
String? previousName,
String? previousBrand,
}) async {
final prevNameStr = previousName != null ? '$previousName' : '不明';
final prevBrandStr = previousBrand != null ? '$previousBrand' : '不明';
final challengePrompt = '''
:
- name: $prevNameStr
- brand: $prevBrandStr
##
1. 1
2. name=$prevNameStr
3.
4. N N
## namebrandprefectureの読み取りOCR厳守
-
-
- /
- prefecture null
##
使
##
JSONのみ返す:
{
"name": "ラベルに写っている銘柄名(補完禁止)",
"brand": "ラベルに写っている蔵元名(補完禁止)",
"prefecture": "ラベルに書かれた都道府県名なければnull",
"type": "特定名称なければnull",
"description": "説明文100文字程度",
"catchCopy": "20文字以内のキャッチコピー",
"confidenceScore": 80,
"flavorTags": ["フルーティー", "辛口"],
"tasteStats": {"aroma":3,"sweetness":3,"acidity":3,"bitterness":3,"body":3},
"alcoholContent": 15.0,
"polishingRatio": 50,
"sakeMeterValue": 3.0,
"riceVariety": null,
"yeast": null,
"manufacturingYearMonth": null
}
''';
return _callDirectApi(
imagePaths,
challengePrompt,
forceRefresh: true,
temperature: 0.3,
);
}
/// : ProxyへのAPIコール
Future<SakeAnalysisResult> _callProxyApi({ Future<SakeAnalysisResult> _callProxyApi({
required List<String> imagePaths, required List<String> imagePaths,
String? customPrompt, String? customPrompt,
bool forceRefresh = false, bool forceRefresh = false,
}) async { }) async {
// Check Mode: Direct vs Proxy
if (!Secrets.useProxy) {
debugPrint('Direct Cloud Mode: Connecting to Gemini API directly...');
return _callDirectApi(imagePaths, customPrompt, forceRefresh: forceRefresh);
}
// 1. forceRefresh=false // 1. forceRefresh=false
if (!forceRefresh && imagePaths.isNotEmpty) { if (!forceRefresh && imagePaths.isNotEmpty) {
final imageHash = await AnalysisCacheService.computeCombinedHash(imagePaths); final imageHash = await AnalysisCacheService.computeCombinedHash(imagePaths);
@ -379,20 +193,21 @@ name・brand を出力する直前に以下を確認してください:
} }
_lastApiCallTime = DateTime.now(); _lastApiCallTime = DateTime.now();
// 3. Base64変換 // 2. Base64変換
List<String> base64Images = []; List<String> base64Images = [];
for (final path in imagePaths) { for (final path in imagePaths) {
// Read already-compressed images directly (compressed at capture time)
final bytes = await File(path).readAsBytes(); final bytes = await File(path).readAsBytes();
final base64String = base64Encode(bytes); final base64String = base64Encode(bytes);
base64Images.add(base64String); base64Images.add(base64String);
debugPrint('Encoded processed image: ${(bytes.length / 1024).toStringAsFixed(1)}KB'); debugPrint('Encoded processed image: ${(bytes.length / 1024).toStringAsFixed(1)}KB');
} }
// 4. ID取得 // 3. ID取得
final deviceId = await DeviceService.getDeviceId(); final deviceId = await DeviceService.getDeviceId();
if (kDebugMode) debugPrint('Device ID: $deviceId'); if (kDebugMode) debugPrint('Device ID: $deviceId');
// 5. // 4.
final requestBody = jsonEncode({ final requestBody = jsonEncode({
"device_id": deviceId, "device_id": deviceId,
"images": base64Images, "images": base64Images,
@ -401,7 +216,7 @@ name・brand を出力する直前に以下を確認してください:
debugPrint('Calling Proxy: $_proxyUrl'); debugPrint('Calling Proxy: $_proxyUrl');
// 6. Bearer Token認証付き // 5. Bearer Token認証付き
final headers = { final headers = {
"Content-Type": "application/json", "Content-Type": "application/json",
if (Secrets.proxyAuthToken.isNotEmpty) if (Secrets.proxyAuthToken.isNotEmpty)
@ -411,16 +226,18 @@ name・brand を出力する直前に以下を確認してください:
Uri.parse(_proxyUrl), Uri.parse(_proxyUrl),
headers: headers, headers: headers,
body: requestBody, body: requestBody,
).timeout(const Duration(seconds: 60)); ).timeout(const Duration(seconds: 60)); // : 60 ()
// 7. // 6.
if (response.statusCode == 200) { if (response.statusCode == 200) {
// : { "success": true, "data": {...}, "usage": {...} }
final jsonResponse = jsonDecode(utf8.decode(response.bodyBytes)); final jsonResponse = jsonDecode(utf8.decode(response.bodyBytes));
if (jsonResponse['success'] == true) { if (jsonResponse['success'] == true) {
final data = jsonResponse['data']; final data = jsonResponse['data'];
if (data == null) throw Exception("サーバーからのデータが空です"); if (data == null) throw Exception("サーバーからのデータが空です");
// 使
if (jsonResponse['usage'] != null) { if (jsonResponse['usage'] != null) {
final usage = jsonResponse['usage']; final usage = jsonResponse['usage'];
debugPrint('API Usage: ${usage['today']}/${usage['limit']}'); debugPrint('API Usage: ${usage['today']}/${usage['limit']}');
@ -428,6 +245,9 @@ name・brand を出力する直前に以下を確認してください:
final result = SakeAnalysisResult.fromJson(data); final result = SakeAnalysisResult.fromJson(data);
// tasteStats SakeAnalysisResult.fromJson
// API不使用
if (imagePaths.isNotEmpty) { if (imagePaths.isNotEmpty) {
final imageHash = await AnalysisCacheService.computeCombinedHash(imagePaths); final imageHash = await AnalysisCacheService.computeCombinedHash(imagePaths);
await AnalysisCacheService.saveCache(imageHash, result); await AnalysisCacheService.saveCache(imageHash, result);
@ -440,9 +260,11 @@ name・brand を出力する直前に以下を確認してください:
return result; return result;
} else { } else {
// Proxy側での論理エラー ()
throw Exception(jsonResponse['error'] ?? '不明なエラーが発生しました'); throw Exception(jsonResponse['error'] ?? '不明なエラーが発生しました');
} }
} else { } else {
// HTTPエラー
if (kDebugMode) { if (kDebugMode) {
debugPrint('Proxy Error: ${response.statusCode} ${response.body}'); debugPrint('Proxy Error: ${response.statusCode} ${response.body}');
} }
@ -451,6 +273,7 @@ name・brand を出力する直前に以下を確認してください:
} catch (e) { } catch (e) {
debugPrint('Proxy Call Failed: $e'); debugPrint('Proxy Call Failed: $e');
//
final errorMsg = e.toString().toLowerCase(); final errorMsg = e.toString().toLowerCase();
if (errorMsg.contains('limit') || errorMsg.contains('上限')) { if (errorMsg.contains('limit') || errorMsg.contains('上限')) {
throw Exception('本日のAI解析リクエスト上限に達しました。\n明日またお試しください。'); throw Exception('本日のAI解析リクエスト上限に達しました。\n明日またお試しください。');
@ -459,16 +282,10 @@ name・brand を出力する直前に以下を確認してください:
} }
} }
// ============================================================ /// Direct Cloud API Implementation (No Proxy)
// APIコールconsumer APK / USE_PROXY=false Future<SakeAnalysisResult> _callDirectApi(List<String> imagePaths, String? customPrompt, {bool forceRefresh = false, double temperature = 0}) async {
// ============================================================ // 1.
// forceRefresh=trueの場合はキャッシュをスキップ
Future<SakeAnalysisResult> _callDirectApi(
List<String> imagePaths,
String? customPrompt, {
bool forceRefresh = false,
double temperature = 0,
}) async {
if (!forceRefresh && imagePaths.isNotEmpty) { if (!forceRefresh && imagePaths.isNotEmpty) {
final imageHash = await AnalysisCacheService.computeCombinedHash(imagePaths); final imageHash = await AnalysisCacheService.computeCombinedHash(imagePaths);
final cached = await AnalysisCacheService.getCached(imageHash); final cached = await AnalysisCacheService.getCached(imageHash);
@ -478,22 +295,65 @@ name・brand を出力する直前に以下を確認してください:
} }
} }
// 2. API Key確認
final apiKey = Secrets.geminiApiKey; final apiKey = Secrets.geminiApiKey;
if (apiKey.isEmpty) { if (apiKey.isEmpty) {
throw Exception('Gemini API Key is missing. Please set GEMINI_API_KEY.'); throw Exception('Gemini API Key is missing. Please set GEMINI_API_KEY.');
} }
// : 503/UNAVAILABLE
// NOTE: Google
// Phase 2
const primaryModel = 'gemini-2.5-flash'; const primaryModel = 'gemini-2.5-flash';
const fallbackModel = 'gemini-2.5-flash-lite'; const fallbackModel = 'gemini-2.0-flash';
final promptText = customPrompt ?? _mainAnalysisPrompt; // customPrompt analyzeSakeLabel null
final promptText = customPrompt ?? '''
JSONを返してください
## namebrandprefectureの読み取りOCR厳守
3
/ / 鹿鹿
N N
- prefecture: null
##
使
- tasteStats: 15 3
- alcoholContentpolishingRatio: type
##
JSONのみ返す:
{
"name": "ラベルに写っている銘柄名の文字(一字一句そのまま・補完禁止)",
"brand": "ラベルに写っている蔵元名の文字(一字一句そのまま・補完禁止)",
"prefecture": "ラベルに書かれた都道府県名なければnull・推測禁止",
"type": "特定名称ラベルから読む。なければnull",
"description": "ラベル情報とtypeから推定した説明文100文字程度",
"catchCopy": "20文字以内のキャッチコピー",
"confidenceScore": 80,
"flavorTags": ["フルーティー", "辛口"],
"tasteStats": {"aroma":3,"sweetness":3,"acidity":3,"bitterness":3,"body":3},
"alcoholContent": 15.0,
"polishingRatio": 50,
"sakeMeterValue": 3.0,
"riceVariety": "山田錦",
"yeast": "きょうかい9号",
"manufacturingYearMonth": "2023.10"
}
''';
// Prepare Content parts ()
final contentParts = <Part>[TextPart(promptText)]; final contentParts = <Part>[TextPart(promptText)];
for (var path in imagePaths) { for (var path in imagePaths) {
final bytes = await File(path).readAsBytes(); final bytes = await File(path).readAsBytes();
contentParts.add(DataPart('image/jpeg', bytes)); contentParts.add(DataPart('image/jpeg', bytes));
} }
// 503 :
const maxRetries = 3; const maxRetries = 3;
final modelsToTry = [primaryModel, primaryModel, primaryModel, fallbackModel]; final modelsToTry = [primaryModel, primaryModel, primaryModel, fallbackModel];
@ -538,9 +398,11 @@ name・brand を出力する直前に以下を確認してください:
final jsonMap = jsonDecode(jsonString); final jsonMap = jsonDecode(jsonString);
final result = SakeAnalysisResult.fromJson(jsonMap); final result = SakeAnalysisResult.fromJson(jsonMap);
// 3.
if (imagePaths.isNotEmpty) { if (imagePaths.isNotEmpty) {
final imageHash = await AnalysisCacheService.computeCombinedHash(imagePaths); final imageHash = await AnalysisCacheService.computeCombinedHash(imagePaths);
await AnalysisCacheService.saveCache(imageHash, result); await AnalysisCacheService.saveCache(imageHash, result);
// 4. forceRefresh
await AnalysisCacheService.registerBrandIndex( await AnalysisCacheService.registerBrandIndex(
result.name, result.name,
imageHash, imageHash,
@ -557,20 +419,22 @@ name・brand を出力する直前に以下を確認してください:
debugPrint('Direct API Error (attempt $attempt, model: $modelName): $e'); debugPrint('Direct API Error (attempt $attempt, model: $modelName): $e');
if (isLastAttempt || !is503) { if (isLastAttempt || !is503) {
if (is503) throw const GeminiCongestionException(); // or 503
if (is503) {
throw const GeminiCongestionException();
}
throw Exception('AI解析エラー(Direct): $e'); throw Exception('AI解析エラー(Direct): $e');
} }
// 503
} }
} }
//
throw Exception('AI解析に失敗しました。再試行してください。'); throw Exception('AI解析に失敗しました。再試行してください。');
} }
} }
// ============================================================ // Analysis Result Model
// Data Models
// ============================================================
class SakeAnalysisResult { class SakeAnalysisResult {
final String? name; final String? name;
final String? brand; final String? brand;
@ -582,6 +446,7 @@ class SakeAnalysisResult {
final List<String> flavorTags; final List<String> flavorTags;
final Map<String, int> tasteStats; final Map<String, int> tasteStats;
// New Fields
final double? alcoholContent; final double? alcoholContent;
final int? polishingRatio; final int? polishingRatio;
final double? sakeMeterValue; final double? sakeMeterValue;
@ -590,6 +455,7 @@ class SakeAnalysisResult {
final String? manufacturingYearMonth; final String? manufacturingYearMonth;
/// EXP付与使 /// EXP付与使
/// JSON false
final bool isFromCache; final bool isFromCache;
SakeAnalysisResult({ SakeAnalysisResult({
@ -611,6 +477,7 @@ class SakeAnalysisResult {
this.isFromCache = false, this.isFromCache = false,
}); });
///
SakeAnalysisResult asCached() => SakeAnalysisResult( SakeAnalysisResult asCached() => SakeAnalysisResult(
name: name, brand: brand, prefecture: prefecture, type: type, name: name, brand: brand, prefecture: prefecture, type: type,
description: description, catchCopy: catchCopy, confidenceScore: confidenceScore, description: description, catchCopy: catchCopy, confidenceScore: confidenceScore,
@ -622,6 +489,7 @@ class SakeAnalysisResult {
); );
factory SakeAnalysisResult.fromJson(Map<String, dynamic> json) { factory SakeAnalysisResult.fromJson(Map<String, dynamic> json) {
// tasteStats: 3 (15)
const requiredStatKeys = ['aroma', 'sweetness', 'acidity', 'bitterness', 'body']; const requiredStatKeys = ['aroma', 'sweetness', 'acidity', 'bitterness', 'body'];
Map<String, int> stats = {}; Map<String, int> stats = {};
if (json['tasteStats'] is Map) { if (json['tasteStats'] is Map) {
@ -654,6 +522,7 @@ class SakeAnalysisResult {
); );
} }
/// JSON形式に変換
Map<String, dynamic> toJson() { Map<String, dynamic> toJson() {
return { return {
'name': name, 'name': name,

View File

@ -2,12 +2,7 @@ import 'package:flutter/material.dart';
import 'dart:async'; import 'dart:async';
class AnalyzingDialog extends StatefulWidget { class AnalyzingDialog extends StatefulWidget {
/// Stage ValueNotifier const AnalyzingDialog({super.key});
/// null Stage1
/// value 2 Stage2
final ValueNotifier<int>? stageNotifier;
const AnalyzingDialog({super.key, this.stageNotifier});
@override @override
State<AnalyzingDialog> createState() => _AnalyzingDialogState(); State<AnalyzingDialog> createState() => _AnalyzingDialogState();
@ -15,70 +10,32 @@ class AnalyzingDialog extends StatefulWidget {
class _AnalyzingDialogState extends State<AnalyzingDialog> { class _AnalyzingDialogState extends State<AnalyzingDialog> {
int _messageIndex = 0; int _messageIndex = 0;
Timer? _timer;
static const _stage1Messages = [ final List<String> _messages = [
'ラベルを読み取っています...', 'ラベルを読んでいます...',
'文字を一字一句確認中...', '銘柄を確認しています...',
];
static const _stage2Messages = [
'この日本酒の個性を分析中...', 'この日本酒の個性を分析中...',
'フレーバーチャートを描画しています...', 'フレーバーチャートを描画しています...',
'素敵なキャッチコピーを考えています...', '素敵なキャッチコピーを考えています...',
]; ];
List<String> get _currentMessages =>
(_stage == 2) ? _stage2Messages : _stage1Messages;
int _stage = 1;
@override @override
void initState() { void initState() {
super.initState(); super.initState();
widget.stageNotifier?.addListener(_onStageChanged);
_startMessageRotation(); _startMessageRotation();
} }
void _onStageChanged() {
final newStage = widget.stageNotifier?.value ?? 1;
if (newStage != _stage) {
_timer?.cancel();
setState(() {
_stage = newStage;
_messageIndex = 0;
});
_startMessageRotation();
}
}
void _startMessageRotation() { void _startMessageRotation() {
_timer = Timer.periodic(const Duration(milliseconds: 1800), (timer) { Future.delayed(const Duration(milliseconds: 1500), () {
if (!mounted) { if (mounted && _messageIndex < _messages.length - 1) {
timer.cancel();
return;
}
final messages = _currentMessages;
if (_messageIndex < messages.length - 1) {
setState(() => _messageIndex++); setState(() => _messageIndex++);
} else { _startMessageRotation();
timer.cancel();
} }
}); });
} }
@override
void dispose() {
_timer?.cancel();
widget.stageNotifier?.removeListener(_onStageChanged);
super.dispose();
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final messages = _currentMessages;
final safeIndex = _messageIndex.clamp(0, messages.length - 1);
return Dialog( return Dialog(
child: Padding( child: Padding(
padding: const EdgeInsets.all(24.0), padding: const EdgeInsets.all(24.0),
@ -88,19 +45,10 @@ class _AnalyzingDialogState extends State<AnalyzingDialog> {
const CircularProgressIndicator(), const CircularProgressIndicator(),
const SizedBox(height: 24), const SizedBox(height: 24),
Text( Text(
messages[safeIndex], _messages[_messageIndex],
style: Theme.of(context).textTheme.titleMedium, style: Theme.of(context).textTheme.titleMedium,
textAlign: TextAlign.center, textAlign: TextAlign.center,
), ),
if (widget.stageNotifier != null) ...[
const SizedBox(height: 12),
Text(
'ステップ $_stage / 2',
style: Theme.of(context).textTheme.bodySmall?.copyWith(
color: Theme.of(context).colorScheme.onSurface.withValues(alpha: 0.4),
),
),
],
], ],
), ),
), ),

View File

@ -272,7 +272,6 @@ class _SakeDetailSpecsState extends State<SakeDetailSpecs> {
_isEditing, _isEditing,
suffixIcon: LucideIcons.calendar, suffixIcon: LucideIcons.calendar,
onSuffixTap: () => _showDatePicker(context), onSuffixTap: () => _showDatePicker(context),
helperText: '例: 2023-10',
), ),
], ],
), ),
@ -304,11 +303,10 @@ class _SakeDetailSpecsState extends State<SakeDetailSpecs> {
void _showDatePicker(BuildContext context) { void _showDatePicker(BuildContext context) {
if (!_isEditing) return; if (!_isEditing) return;
// Parse current value or use now (AI出力 "2023.10" "2023-10" ) // Parse current value or use now
DateTime initialDate = DateTime.now(); DateTime initialDate = DateTime.now();
try { try {
final normalized = _manufacturingController.text.replaceAll('.', '-'); final parts = _manufacturingController.text.split('-');
final parts = normalized.split('-');
if (parts.length >= 2) { if (parts.length >= 2) {
final year = int.parse(parts[0]); final year = int.parse(parts[0]);
final month = int.parse(parts[1]); final month = int.parse(parts[1]);

View File

@ -1,12 +1,9 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:lucide_icons/lucide_icons.dart'; import 'package:lucide_icons/lucide_icons.dart';
import '../../providers/sake_list_provider.dart';
import '../../providers/theme_provider.dart';
import '../../services/backup_service.dart'; import '../../services/backup_service.dart';
import '../../theme/app_colors.dart'; import '../../theme/app_colors.dart';
class BackupSettingsSection extends ConsumerStatefulWidget { class BackupSettingsSection extends StatefulWidget {
final String title; final String title;
const BackupSettingsSection({ const BackupSettingsSection({
@ -15,12 +12,12 @@ class BackupSettingsSection extends ConsumerStatefulWidget {
}); });
@override @override
ConsumerState<BackupSettingsSection> createState() => _BackupSettingsSectionState(); State<BackupSettingsSection> createState() => _BackupSettingsSectionState();
} }
enum _BackupState { idle, signingIn, signingOut, backingUp, restoring } enum _BackupState { idle, signingIn, signingOut, backingUp, restoring }
class _BackupSettingsSectionState extends ConsumerState<BackupSettingsSection> { class _BackupSettingsSectionState extends State<BackupSettingsSection> {
final BackupService _backupService = BackupService(); final BackupService _backupService = BackupService();
_BackupState _state = _BackupState.idle; _BackupState _state = _BackupState.idle;
@ -31,11 +28,7 @@ enum _BackupState { idle, signingIn, signingOut, backingUp, restoring }
} }
Future<void> _initBackupService() async { Future<void> _initBackupService() async {
try {
await _backupService.init(); await _backupService.init();
} catch (e) {
debugPrint('[Backup] Init error (silent sign-in failed): $e');
}
if (mounted) { if (mounted) {
setState(() {}); setState(() {});
} }
@ -139,7 +132,7 @@ enum _BackupState { idle, signingIn, signingOut, backingUp, restoring }
Future<void> _restoreBackup() async { Future<void> _restoreBackup() async {
final messenger = ScaffoldMessenger.of(context); final messenger = ScaffoldMessenger.of(context);
final appColors = Theme.of(context).extension<AppColors>()!; final appColors = Theme.of(context).extension<AppColors>()!;
// Note: hasBackup check is async
final hasBackup = await _backupService.hasBackupOnDrive(); final hasBackup = await _backupService.hasBackupOnDrive();
if (!hasBackup) { if (!hasBackup) {
if (mounted) { if (mounted) {
@ -180,29 +173,11 @@ enum _BackupState { idle, signingIn, signingOut, backingUp, restoring }
), ),
); );
if (confirmed != true || !mounted) return; if (confirmed == true && mounted) {
await _executeRestore(forceSkipPreBackup: false);
}
/// PreRestoreBackupException
Future<void> _executeRestore({required bool forceSkipPreBackup}) async {
final messenger = ScaffoldMessenger.of(context);
final appColors = Theme.of(context).extension<AppColors>()!;
setState(() => _state = _BackupState.restoring); setState(() => _state = _BackupState.restoring);
final success = await _backupService.restoreBackup();
try {
final success = forceSkipPreBackup
? await _backupService.restoreBackupSkippingPreBackup()
: await _backupService.restoreBackup();
if (mounted) { if (mounted) {
setState(() => _state = _BackupState.idle); setState(() => _state = _BackupState.idle);
if (success) {
ref.invalidate(rawSakeListItemsProvider);
ref.invalidate(sakeSortOrderProvider);
ref.invalidate(userProfileProvider);
}
messenger.showSnackBar( messenger.showSnackBar(
SnackBar( SnackBar(
content: Text(success ? '復元が完了しました' : '復元に失敗しました'), content: Text(success ? '復元が完了しました' : '復元に失敗しました'),
@ -210,47 +185,6 @@ enum _BackupState { idle, signingIn, signingOut, backingUp, restoring }
), ),
); );
} }
} on PreRestoreBackupException {
if (!mounted) return;
setState(() => _state = _BackupState.idle);
//
final continueAnyway = await showDialog<bool>(
context: context,
builder: (context) => AlertDialog(
title: Row(
children: [
Icon(LucideIcons.alertTriangle, color: appColors.error, size: 24),
const SizedBox(width: 8),
const Text('安全バックアップに失敗'),
],
),
content: const Text(
'復元前の安全コピー作成に失敗しました。\n'
'このまま続行すると、現在のデータが失われた場合に\n'
'元に戻せない可能性があります。\n\n'
'続行しますか?',
),
actions: [
TextButton(
onPressed: () => Navigator.pop(context, false),
child: const Text('中断'),
),
ElevatedButton(
onPressed: () => Navigator.pop(context, true),
style: ElevatedButton.styleFrom(
backgroundColor: appColors.error,
foregroundColor: appColors.surfaceSubtle,
),
child: const Text('それでも続行'),
),
],
),
);
if (continueAnyway == true && mounted) {
await _executeRestore(forceSkipPreBackup: true);
}
} }
} }

View File

@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
# In Windows, build-name is used as the major, minor, and patch parts # In Windows, build-name is used as the major, minor, and patch parts
# of the product and file versions while build-number is used as the build suffix. # of the product and file versions while build-number is used as the build suffix.
version: 1.0.49+56 version: 1.0.47+54
environment: environment:
sdk: ^3.10.1 sdk: ^3.10.1

View File

@ -1,19 +1,19 @@
{ {
"version": "v1.0.49", "version": "v1.0.46",
"name": "Ponshu Room 1.0.49 (2026-04-23)", "name": "Ponshu Room 1.0.46 (2026-04-23)",
"date": "2026-04-23", "date": "2026-04-23",
"apks": { "apks": {
"maita": { "maita": {
"lite": { "lite": {
"filename": "ponshu_room_consumer_maita.apk", "filename": "ponshu_room_consumer_maita.apk",
"url": "https://posimai-lab.tail72e846.ts.net/mai/ponshu-room-lite/releases/download/v1.0.49/ponshu_room_consumer_maita.apk", "url": "https://posimai-lab.tail72e846.ts.net/mai/ponshu-room-lite/releases/download/v1.0.46/ponshu_room_consumer_maita.apk",
"size_mb": 91 "size_mb": 91
} }
}, },
"eiji": { "eiji": {
"lite": { "lite": {
"filename": "ponshu_room_consumer_eiji.apk", "filename": "ponshu_room_consumer_eiji.apk",
"url": "https://posimai-lab.tail72e846.ts.net/mai/ponshu-room-lite/releases/download/v1.0.49/ponshu_room_consumer_eiji.apk", "url": "https://posimai-lab.tail72e846.ts.net/mai/ponshu-room-lite/releases/download/v1.0.46/ponshu_room_consumer_eiji.apk",
"size_mb": 91 "size_mb": 91
} }
} }