From 61d20f8b3732227c92b4584b088499634befc98c Mon Sep 17 00:00:00 2001 From: Kelrap Date: Tue, 30 Jul 2024 11:03:21 -0400 Subject: [PATCH] Add prevMessages to more places --- .../choreographer/controllers/span_data_controller.dart | 2 ++ lib/pangea/constants/model_keys.dart | 1 + lib/pangea/models/igc_text_data_model.dart | 4 ++++ lib/pangea/repo/igc_repo.dart | 2 ++ lib/pangea/repo/span_data_repo.dart | 6 ++++++ 5 files changed, 15 insertions(+) diff --git a/lib/pangea/choreographer/controllers/span_data_controller.dart b/lib/pangea/choreographer/controllers/span_data_controller.dart index 24470454c..910246abf 100644 --- a/lib/pangea/choreographer/controllers/span_data_controller.dart +++ b/lib/pangea/choreographer/controllers/span_data_controller.dart @@ -54,6 +54,7 @@ class SpanDataController { userL2: choreographer.l2LangCode!, enableIGC: choreographer.igcEnabled, enableIT: choreographer.itEnabled, + prevMessages: choreographer.prevMessages(), span: span, ); final int cacheKey = req.hashCode; @@ -71,6 +72,7 @@ class SpanDataController { userL2: choreographer.l2LangCode!, enableIGC: choreographer.igcEnabled, enableIT: choreographer.itEnabled, + prevMessages: choreographer.prevMessages(), span: span, ), ); diff --git a/lib/pangea/constants/model_keys.dart b/lib/pangea/constants/model_keys.dart index b42061446..d252a3c7c 100644 --- a/lib/pangea/constants/model_keys.dart +++ b/lib/pangea/constants/model_keys.dart @@ -69,6 +69,7 @@ class ModelKey { static const String permissions = "permissions"; static const String enableIGC = "enable_igc"; static const String enableIT = "enable_it"; + static const String prevMessages = "prev_messages"; static const String originalSent = "original_sent"; static const String originalWritten = "original_written"; diff --git a/lib/pangea/models/igc_text_data_model.dart b/lib/pangea/models/igc_text_data_model.dart index 5f32f92d1..588318011 100644 --- a/lib/pangea/models/igc_text_data_model.dart +++ b/lib/pangea/models/igc_text_data_model.dart @@ -26,6 +26,7 @@ class IGCTextData { bool enableIT; bool enableIGC; bool loading = false; + Map prevMessages; IGCTextData({ required this.detections, @@ -37,6 +38,7 @@ class IGCTextData { required this.userL2, required this.enableIT, required this.enableIGC, + required this.prevMessages, }); factory IGCTextData.fromJson(Map json) { @@ -76,6 +78,7 @@ class IGCTextData { userL2: json[ModelKey.userL2], enableIT: json["enable_it"], enableIGC: json["enable_igc"], + prevMessages: json["prev_messages"], ); } @@ -93,6 +96,7 @@ class IGCTextData { ModelKey.userL2: userL2, "enable_it": enableIT, "enable_igc": enableIGC, + "prev_messages": prevMessages, }; /// if we haven't run IGC or IT or there are no matches, we use the highest validated detection diff --git a/lib/pangea/repo/igc_repo.dart b/lib/pangea/repo/igc_repo.dart index ce50367cd..0cb3e2e46 100644 --- a/lib/pangea/repo/igc_repo.dart +++ b/lib/pangea/repo/igc_repo.dart @@ -88,6 +88,7 @@ class IgcRepo { userL2: "en", enableIT: true, enableIGC: true, + prevMessages: {}, ); return igcTextData; @@ -131,5 +132,6 @@ class IGCRequestBody { ModelKey.userL2: userL2, "enable_it": enableIT, "enable_igc": enableIGC, + "prev_messages": prevMessages, }; } diff --git a/lib/pangea/repo/span_data_repo.dart b/lib/pangea/repo/span_data_repo.dart index 7073581a1..df6b26c76 100644 --- a/lib/pangea/repo/span_data_repo.dart +++ b/lib/pangea/repo/span_data_repo.dart @@ -5,6 +5,7 @@ import 'package:fluffychat/pangea/config/environment.dart'; import 'package:fluffychat/pangea/enum/span_choice_type.dart'; import 'package:fluffychat/pangea/enum/span_data_type.dart'; import 'package:fluffychat/pangea/models/span_data.dart'; +import 'package:fluffychat/pangea/repo/igc_repo.dart'; import 'package:http/http.dart'; import '../constants/model_keys.dart'; @@ -47,6 +48,7 @@ class SpanDetailsRepoReqAndRes { String userL2; bool enableIT; bool enableIGC; + List prevMessages; SpanData span; SpanDetailsRepoReqAndRes({ @@ -54,6 +56,7 @@ class SpanDetailsRepoReqAndRes { required this.userL2, required this.enableIGC, required this.enableIT, + required this.prevMessages, required this.span, }); @@ -62,6 +65,7 @@ class SpanDetailsRepoReqAndRes { ModelKey.userL2: userL2, "enable_it": enableIT, "enable_igc": enableIGC, + "prev_messages": prevMessages, 'span': span.toJson(), }; @@ -71,6 +75,7 @@ class SpanDetailsRepoReqAndRes { userL2: json['user_l2'] as String, enableIT: json['enable_it'] as bool, enableIGC: json['enable_igc'] as bool, + prevMessages: json['prev_messages'], span: SpanData.fromJson(json['span']), ); @@ -132,6 +137,7 @@ final mockRequest = SpanDetailsRepoReqAndRes( userL2: "en", enableIGC: true, enableIT: true, + prevMessages: [], span: spanDataRepomockSpan, );