ember/fluffychat
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove userGender entries for individual requests

Browse source
This commit is contained in:
Kelrap 2025-12-08 12:18:28 -05:00
parent 7062e42228
commit fafddc2200
10 changed files with 2 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/pangea/analytics_misc/get_analytics_controller.dart
View file

@ -23,7 +23,6 @@ import 'package:fluffychat/pangea/events/constants/pangea_event_types.dart';
import 'package:fluffychat/pangea/events/event_wrappers/pangea_message_event.dart';
import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart';
import 'package:fluffychat/pangea/languages/language_model.dart';
import 'package:fluffychat/pangea/learning_settings/gender_enum.dart';
import 'package:fluffychat/pangea/practice_activities/practice_selection_repo.dart';
import 'package:fluffychat/widgets/matrix.dart';
@ -50,9 +49,6 @@ class GetAnalyticsController extends BaseController {
LanguageModel? get _l1 => _pangeaController.userController.userL1;
LanguageModel? get _l2 => _pangeaController.userController.userL2;
GenderEnum get gender =>
MatrixState.pangeaController.userController.profile.userSettings.gender;
Client get _client => _pangeaController.matrixState.client;
// the minimum XP required for a given level
@ -568,7 +564,6 @@ class GetAnalyticsController extends BaseController {
messages: messages,
userL1: _l1!.langCodeShort,
userL2: _l2!.langCodeShort,
userGender: gender,
upperLevel: upperLevel,
lowerLevel: lowerLevel,
);

2
lib/pangea/choreographer/igc/igc_controller.dart
View file

@ -71,8 +71,6 @@ class IgcController {
userId: MatrixState.pangeaController.userController.client.userID!,
userL1: MatrixState.pangeaController.userController.userL1Code!,
userL2: MatrixState.pangeaController.userController.userL2Code!,
userGender: MatrixState
.pangeaController.userController.profile.userSettings.gender,
enableIGC: true,
enableIT: true,
prevMessages: prevMessages,

6
lib/pangea/choreographer/igc/igc_request_model.dart
View file

@ -1,13 +1,11 @@
import 'dart:convert';
import 'package:fluffychat/pangea/common/constants/model_keys.dart';
import 'package:fluffychat/pangea/learning_settings/gender_enum.dart';
class IGCRequestModel {
final String fullText;
final String userL1;
final String userL2;
final GenderEnum userGender;
final bool enableIT;
final bool enableIGC;
final String userId;
@ -17,7 +15,6 @@ class IGCRequestModel {
required this.fullText,
required this.userL1,
required this.userL2,
required this.userGender,
required this.enableIGC,
required this.enableIT,
required this.userId,
@ -28,7 +25,6 @@ class IGCRequestModel {
ModelKey.fullText: fullText,
ModelKey.userL1: userL1,
ModelKey.userL2: userL2,
ModelKey.userGender: userGender.string,
"enable_it": enableIT,
"enable_igc": enableIGC,
ModelKey.userId: userId,
@ -46,7 +42,6 @@ class IGCRequestModel {
fullText == other.fullText &&
userL1 == other.userL1 &&
userL2 == other.userL2 &&
userGender == other.userGender &&
enableIT == other.enableIT &&
userId == other.userId;
}
@ -56,7 +51,6 @@ class IGCRequestModel {
fullText.trim(),
userL1,
userL2,
userGender,
enableIT,
enableIGC,
userId,

2
lib/pangea/choreographer/it/it_bar.dart
View file

@ -65,8 +65,6 @@ class ITBarState extends State<ITBar> with SingleTickerProviderStateMixin {
tgtLang: MatrixState.pangeaController.userController.userL1!.langCode,
userL1: MatrixState.pangeaController.userController.userL1!.langCode,
userL2: MatrixState.pangeaController.userController.userL2!.langCode,
userGender: MatrixState
.pangeaController.userController.profile.userSettings.gender,
);
void _openListener() {

5
lib/pangea/constructs/construct_repo.dart
View file

@ -4,10 +4,8 @@ import 'package:http/http.dart';
import 'package:fluffychat/pangea/analytics_misc/constructs_model.dart';
import 'package:fluffychat/pangea/common/config/environment.dart';
import 'package:fluffychat/pangea/common/constants/model_keys.dart';
import 'package:fluffychat/pangea/common/network/requests.dart';
import 'package:fluffychat/pangea/common/network/urls.dart';
import 'package:fluffychat/pangea/learning_settings/gender_enum.dart';
import 'package:fluffychat/widgets/matrix.dart';
class ConstructSummary {
@ -71,7 +69,6 @@ class ConstructSummaryRequest {
final List<Map<String, dynamic>> messages;
final String userL1;
final String userL2;
final GenderEnum userGender;
final int upperLevel;
final int lowerLevel;
@ -80,7 +77,6 @@ class ConstructSummaryRequest {
required this.messages,
required this.userL1,
required this.userL2,
required this.userGender,
required this.upperLevel,
required this.lowerLevel,
});
@ -91,7 +87,6 @@ class ConstructSummaryRequest {
'msgs': messages,
'user_l1': userL1,
'user_l2': userL2,
ModelKey.userGender: userGender.string,
'language': userL1,
'upper_level': upperLevel,
'lower_level': lowerLevel,

6
lib/pangea/events/event_wrappers/pangea_message_event.dart
View file

@ -18,7 +18,6 @@ import 'package:fluffychat/pangea/events/repo/language_detection_repo.dart';
import 'package:fluffychat/pangea/events/repo/language_detection_request.dart';
import 'package:fluffychat/pangea/events/repo/language_detection_response.dart';
import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart';
import 'package:fluffychat/pangea/learning_settings/gender_enum.dart';
import 'package:fluffychat/pangea/learning_settings/tool_settings_enum.dart';
import 'package:fluffychat/pangea/speech_to_text/audio_encoding_enum.dart';
import 'package:fluffychat/pangea/speech_to_text/speech_to_text_repo.dart';
@ -80,9 +79,6 @@ class PangeaMessageEvent {
String? get _l1Code =>
MatrixState.pangeaController.userController.userL1?.langCode;
GenderEnum get gender =>
MatrixState.pangeaController.userController.profile.userSettings.gender;
Event? _latestEditCache;
Event get _latestEdit => _latestEditCache ??= _event
.aggregatedEvents(
@ -369,7 +365,6 @@ class PangeaMessageEvent {
langCode: langCode,
userL1: _l1Code ?? LanguageKeys.unknownLanguage,
userL2: _l2Code ?? LanguageKeys.unknownLanguage,
userGender: gender,
);
final result = await TextToSpeechRepo.get(
@ -577,7 +572,6 @@ class PangeaMessageEvent {
tgtLang: targetLang,
userL2: _l2Code ?? LanguageKeys.unknownLanguage,
userL1: _l1Code ?? LanguageKeys.unknownLanguage,
userGender: gender,
),
);

2
lib/pangea/events/event_wrappers/pangea_representation_event.dart
View file

@ -272,8 +272,6 @@ class RepresentationEvent {
tgtLang: userL1,
userL2: userL2,
userL1: userL1,
userGender: MatrixState
.pangeaController.userController.profile.userSettings.gender,
),
);

9
lib/pangea/text_to_speech/text_to_speech_request_model.dart
View file

@ -1,13 +1,11 @@
import 'package:fluffychat/pangea/common/constants/model_keys.dart';
import 'package:fluffychat/pangea/events/models/pangea_token_text_model.dart';
import 'package:fluffychat/pangea/learning_settings/gender_enum.dart';
class TextToSpeechRequestModel {
String text;
String langCode;
String userL1;
String userL2;
GenderEnum userGender;
List<PangeaTokenText> tokens;
TextToSpeechRequestModel({
@ -15,7 +13,6 @@ class TextToSpeechRequestModel {
required this.langCode,
required this.userL1,
required this.userL2,
required this.userGender,
required this.tokens,
});
@ -24,7 +21,6 @@ class TextToSpeechRequestModel {
ModelKey.langCode: langCode,
ModelKey.userL1: userL1,
ModelKey.userL2: userL2,
ModelKey.userGender: userGender.string,
ModelKey.tokens: tokens.map((token) => token.toJson()).toList(),
};
@ -34,10 +30,9 @@ class TextToSpeechRequestModel {
return other is TextToSpeechRequestModel &&
other.text == text &&
other.langCode == langCode &&
other.userGender == userGender;
other.langCode == langCode;
}
@override
int get hashCode => text.hashCode ^ langCode.hashCode ^ userGender.hashCode;
int get hashCode => text.hashCode ^ langCode.hashCode;
}

2
lib/pangea/text_to_speech/tts_controller.dart
View file

@ -279,8 +279,6 @@ class TtsController {
LanguageKeys.unknownLanguage,
userL2: MatrixState.pangeaController.userController.userL2Code ??
LanguageKeys.unknownLanguage,
userGender: MatrixState
.pangeaController.userController.profile.userSettings.gender,
),
);
loadingChoreoStream.add(false);

6
lib/pangea/translation/full_text_translation_request_model.dart
View file

@ -1,5 +1,4 @@
import 'package:fluffychat/pangea/common/constants/model_keys.dart';
import 'package:fluffychat/pangea/learning_settings/gender_enum.dart';
class FullTextTranslationRequestModel {
final String text;
@ -7,7 +6,6 @@ class FullTextTranslationRequestModel {
final String tgtLang;
final String userL1;
final String userL2;
final GenderEnum userGender;
final bool? deepL;
final int? offset;
final int? length;
@ -18,7 +16,6 @@ class FullTextTranslationRequestModel {
required this.tgtLang,
required this.userL2,
required this.userL1,
required this.userGender,
this.deepL = false,
this.offset,
this.length,
@ -30,7 +27,6 @@ class FullTextTranslationRequestModel {
ModelKey.tgtLang: tgtLang,
ModelKey.userL2: userL2,
ModelKey.userL1: userL1,
ModelKey.userGender: userGender.string,
ModelKey.deepL: deepL,
ModelKey.offset: offset,
ModelKey.length: length,
@ -47,7 +43,6 @@ class FullTextTranslationRequestModel {
other.tgtLang == tgtLang &&
other.userL2 == userL2 &&
other.userL1 == userL1 &&
other.userGender == userGender &&
other.deepL == deepL &&
other.offset == offset &&
other.length == length;
@ -60,7 +55,6 @@ class FullTextTranslationRequestModel {
tgtLang.hashCode ^
userL2.hashCode ^
userL1.hashCode ^
userGender.hashCode ^
deepL.hashCode ^
offset.hashCode ^
length.hashCode;