Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor #374

Merged
merged 2 commits into from
Feb 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/main.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'dart:io';

import 'package:flutter/material.dart';
import 'package:maid/pages/home_page.dart';
import 'package:maid/ui/mobile/pages/home_page.dart';
import 'package:maid/providers/ai_platform.dart';
import 'package:maid/providers/session.dart';
import 'package:maid/providers/character.dart';
Expand Down
40 changes: 36 additions & 4 deletions lib/static/generation_manager.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import 'dart:async';
import 'dart:convert';
import 'dart:io';
import 'dart:math';

import 'package:device_info_plus/device_info_plus.dart';
import 'package:flutter/material.dart';
import 'package:http/http.dart';
import 'package:langchain/langchain.dart';
Expand All @@ -13,9 +15,9 @@ import 'package:maid/providers/character.dart';
import 'package:maid/providers/session.dart';
import 'package:maid/static/logger.dart';
import 'package:maid/providers/ai_platform.dart';
import 'package:maid/static/networking.dart';
import 'package:lan_scanner/lan_scanner.dart';
import 'package:network_info_plus/network_info_plus.dart';
import 'package:permission_handler/permission_handler.dart';
import 'package:provider/provider.dart';

class GenerationManager {
Expand Down Expand Up @@ -108,7 +110,7 @@ class GenerationManager {
final character = context.read<Character>();
final session = context.read<Session>();

bool permissionGranted = await Networking.getNearbyDevicesPermission();
bool permissionGranted = await getNearbyDevicesPermission();
if (!permissionGranted) {
return;
}
Expand Down Expand Up @@ -271,7 +273,7 @@ class GenerationManager {
static Future<List<String>> getOptions(AiPlatform ai) async {
switch (ai.apiType) {
case AiPlatformType.ollama:
bool permissionGranted = await Networking.getNearbyDevicesPermission();
bool permissionGranted = await getNearbyDevicesPermission();
if (!permissionGranted) {
return [];
}
Expand Down Expand Up @@ -308,7 +310,7 @@ class GenerationManager {
}

static Future<String> getOllamaUrl() async {
bool permissionGranted = await Networking.getNearbyDevicesPermission();
bool permissionGranted = await getNearbyDevicesPermission();
if (!permissionGranted) {
return '';
}
Expand Down Expand Up @@ -354,4 +356,34 @@ class GenerationManager {

return '';
}

static Future<bool> getNearbyDevicesPermission() async {
if (!Platform.isAndroid && !Platform.isIOS) {
return true;
}

// Get sdk version
final sdk = await DeviceInfoPlugin().androidInfo.then((value) => value.version.sdkInt);
var permissions = <Permission>[]; // List of permissions to request

if (sdk <= 32) {
// ACCESS_FINE_LOCATION is required
permissions.add(Permission.location);
} else {
// NEARBY_WIFI_DEVICES is required
permissions.add(Permission.nearbyWifiDevices);
}

// Request permissions and check if all are granted
Map<Permission, PermissionStatus> statuses = await permissions.request();
bool allPermissionsGranted = statuses.values.every((status) => status.isGranted);

if (allPermissionsGranted) {
Logger.log("Nearby Devices - permission granted");
return true;
} else {
Logger.log("Nearby Devices - permission denied");
return false;
}
}
}
38 changes: 0 additions & 38 deletions lib/static/networking.dart

This file was deleted.

File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import 'package:flutter/material.dart';
import 'package:maid/providers/character.dart';
import 'package:maid/providers/session.dart';
import 'package:maid/static/logger.dart';
import 'package:maid/widgets/dialogs.dart';
import 'package:maid/widgets/double_button_row.dart';
import 'package:maid/widgets/text_field_list_tile.dart';
import 'package:maid/ui/mobile/widgets/dialogs.dart';
import 'package:maid/ui/mobile/widgets/double_button_row.dart';
import 'package:maid/ui/mobile/widgets/text_field_list_tile.dart';
import 'package:provider/provider.dart';
import 'package:shared_preferences/shared_preferences.dart';

Expand Down
14 changes: 7 additions & 7 deletions lib/pages/home_page.dart → lib/ui/mobile/pages/home_page.dart
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
import 'dart:math';

import 'package:flutter/material.dart';
import 'package:maid/pages/about_page.dart';
import 'package:maid/pages/character_page.dart';
import 'package:maid/pages/platform_page.dart';
import 'package:maid/pages/sessions_page.dart';
import 'package:maid/pages/settings_page.dart';
import 'package:maid/ui/mobile/pages/about_page.dart';
import 'package:maid/ui/mobile/pages/character_page.dart';
import 'package:maid/ui/mobile/pages/platform_page.dart';
import 'package:maid/ui/mobile/pages/sessions_page.dart';
import 'package:maid/ui/mobile/pages/settings_page.dart';
import 'package:maid/providers/character.dart';
import 'package:system_info2/system_info2.dart';
import 'package:maid/providers/session.dart';
import 'package:maid/widgets/chat_widgets/chat_message.dart';
import 'package:maid/widgets/chat_widgets/chat_field.dart';
import 'package:maid/ui/mobile/widgets/chat_widgets/chat_message.dart';
import 'package:maid/ui/mobile/widgets/chat_widgets/chat_field.dart';
import 'package:provider/provider.dart';

class HomePage extends StatefulWidget {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ import 'package:flutter/material.dart';
import 'package:maid/providers/session.dart';
import 'package:maid/static/logger.dart';
import 'package:maid/providers/ai_platform.dart';
import 'package:maid/widgets/platform_widgets/local_platform.dart';
import 'package:maid/widgets/platform_widgets/mistralai_platform.dart';
import 'package:maid/widgets/platform_widgets/ollama_platform.dart';
import 'package:maid/widgets/platform_widgets/openai_platform.dart';
import 'package:maid/widgets/dialogs.dart';
import 'package:maid/widgets/dropdowns/api_dropdown.dart';
import 'package:maid/widgets/double_button_row.dart';
import 'package:maid/widgets/text_field_list_tile.dart';
import 'package:maid/ui/mobile/widgets/platform_widgets/local_platform.dart';
import 'package:maid/ui/mobile/widgets/platform_widgets/mistralai_platform.dart';
import 'package:maid/ui/mobile/widgets/platform_widgets/ollama_platform.dart';
import 'package:maid/ui/mobile/widgets/platform_widgets/openai_platform.dart';
import 'package:maid/ui/mobile/widgets/dialogs.dart';
import 'package:maid/ui/mobile/widgets/dropdowns/api_dropdown.dart';
import 'package:maid/ui/mobile/widgets/double_button_row.dart';
import 'package:maid/ui/mobile/widgets/text_field_list_tile.dart';
import 'package:provider/provider.dart';
import 'package:shared_preferences/shared_preferences.dart';

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import 'package:maid/static/logger.dart';
import 'package:maid/main.dart';
import 'package:maid/static/user.dart';
import 'package:maid_ui/maid_ui.dart';
import 'package:maid/widgets/text_field_list_tile.dart';
import 'package:maid/ui/mobile/widgets/text_field_list_tile.dart';
import 'package:provider/provider.dart';
import 'package:shared_preferences/shared_preferences.dart';

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:maid/providers/ai_platform.dart';
import 'package:maid/widgets/text_field_list_tile.dart';
import 'package:maid/ui/mobile/widgets/text_field_list_tile.dart';
import 'package:provider/provider.dart';

class ApiKeyParameter extends StatelessWidget {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:maid/providers/ai_platform.dart';
import 'package:maid/widgets/slider_list_tile.dart';
import 'package:maid/ui/mobile/widgets/slider_list_tile.dart';
import 'package:provider/provider.dart';

class MirostatEtaParameter extends StatelessWidget {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:maid/providers/ai_platform.dart';
import 'package:maid/widgets/slider_list_tile.dart';
import 'package:maid/ui/mobile/widgets/slider_list_tile.dart';
import 'package:provider/provider.dart';

class MirostatParameter extends StatelessWidget {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:maid/providers/ai_platform.dart';
import 'package:maid/widgets/slider_list_tile.dart';
import 'package:maid/ui/mobile/widgets/slider_list_tile.dart';
import 'package:provider/provider.dart';

class MirostatTauParameter extends StatelessWidget {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:maid/providers/ai_platform.dart';
import 'package:maid/widgets/slider_list_tile.dart';
import 'package:maid/ui/mobile/widgets/slider_list_tile.dart';
import 'package:provider/provider.dart';

class NBatchParameter extends StatelessWidget {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:maid/providers/ai_platform.dart';
import 'package:maid/widgets/slider_list_tile.dart';
import 'package:maid/ui/mobile/widgets/slider_list_tile.dart';
import 'package:provider/provider.dart';

class NCtxParameter extends StatelessWidget {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:maid/providers/ai_platform.dart';
import 'package:maid/widgets/slider_list_tile.dart';
import 'package:maid/ui/mobile/widgets/slider_list_tile.dart';
import 'package:provider/provider.dart';

class NKeepParameter extends StatelessWidget {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:maid/providers/ai_platform.dart';
import 'package:maid/widgets/slider_list_tile.dart';
import 'package:maid/ui/mobile/widgets/slider_list_tile.dart';
import 'package:provider/provider.dart';

class NPredictParameter extends StatelessWidget {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import 'dart:io';

import 'package:flutter/material.dart';
import 'package:maid/providers/ai_platform.dart';
import 'package:maid/widgets/slider_list_tile.dart';
import 'package:maid/ui/mobile/widgets/slider_list_tile.dart';
import 'package:provider/provider.dart';

class NThreadsParameter extends StatelessWidget {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:maid/providers/ai_platform.dart';
import 'package:maid/widgets/slider_list_tile.dart';
import 'package:maid/ui/mobile/widgets/slider_list_tile.dart';
import 'package:provider/provider.dart';

class PenaltyFrequencyParameter extends StatelessWidget {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:maid/providers/ai_platform.dart';
import 'package:maid/widgets/slider_list_tile.dart';
import 'package:maid/ui/mobile/widgets/slider_list_tile.dart';
import 'package:provider/provider.dart';

class PenaltyLastNParameter extends StatelessWidget {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:maid/providers/ai_platform.dart';
import 'package:maid/widgets/slider_list_tile.dart';
import 'package:maid/ui/mobile/widgets/slider_list_tile.dart';
import 'package:provider/provider.dart';

class PenaltyPresentParameter extends StatelessWidget {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:maid/providers/ai_platform.dart';
import 'package:maid/widgets/slider_list_tile.dart';
import 'package:maid/ui/mobile/widgets/slider_list_tile.dart';
import 'package:provider/provider.dart';

class PenaltyRepeatParameter extends StatelessWidget {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:maid/providers/ai_platform.dart';
import 'package:maid/widgets/slider_list_tile.dart';
import 'package:maid/ui/mobile/widgets/slider_list_tile.dart';
import 'package:provider/provider.dart';

class TemperatureParameter extends StatelessWidget {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:maid/providers/ai_platform.dart';
import 'package:maid/widgets/slider_list_tile.dart';
import 'package:maid/ui/mobile/widgets/slider_list_tile.dart';
import 'package:provider/provider.dart';

class TfsZParameter extends StatelessWidget {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:maid/providers/ai_platform.dart';
import 'package:maid/widgets/slider_list_tile.dart';
import 'package:maid/ui/mobile/widgets/slider_list_tile.dart';
import 'package:provider/provider.dart';

class TopKParameter extends StatelessWidget {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:maid/providers/ai_platform.dart';
import 'package:maid/widgets/slider_list_tile.dart';
import 'package:maid/ui/mobile/widgets/slider_list_tile.dart';
import 'package:provider/provider.dart';

class TopPParameter extends StatelessWidget {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:maid/providers/ai_platform.dart';
import 'package:maid/widgets/slider_list_tile.dart';
import 'package:maid/ui/mobile/widgets/slider_list_tile.dart';
import 'package:provider/provider.dart';

class TypicalPParameter extends StatelessWidget {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:maid/providers/ai_platform.dart';
import 'package:maid/widgets/text_field_list_tile.dart';
import 'package:maid/ui/mobile/widgets/text_field_list_tile.dart';
import 'package:provider/provider.dart';

class UrlParameter extends StatelessWidget {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
import 'package:flutter/material.dart';
import 'package:maid/providers/ai_platform.dart';
import 'package:maid/widgets/dialogs.dart';
import 'package:maid/widgets/parameter_widgets/penalize_nl_parameter.dart';
import 'package:maid/widgets/parameter_widgets/mirostat_eta_parameter.dart';
import 'package:maid/widgets/parameter_widgets/mirostat_parameter.dart';
import 'package:maid/widgets/parameter_widgets/mirostat_tau_parameter.dart';
import 'package:maid/widgets/parameter_widgets/n_batch_parameter.dart';
import 'package:maid/widgets/parameter_widgets/n_ctx_parameter.dart';
import 'package:maid/widgets/parameter_widgets/n_threads_parameter.dart';
import 'package:maid/widgets/parameter_widgets/penalty_frequency_parameter.dart';
import 'package:maid/widgets/parameter_widgets/penalty_last_n_parameter.dart';
import 'package:maid/widgets/parameter_widgets/penalty_present_parameter.dart';
import 'package:maid/widgets/parameter_widgets/penalty_repeat_parameter.dart';
import 'package:maid/widgets/parameter_widgets/seed_parameter.dart';
import 'package:maid/widgets/double_button_row.dart';
import 'package:maid/widgets/dropdowns/format_dropdown.dart';
import 'package:maid/widgets/parameter_widgets/temperature_parameter.dart';
import 'package:maid/widgets/parameter_widgets/tfs_z_parameter.dart';
import 'package:maid/widgets/parameter_widgets/top_k_parameter.dart';
import 'package:maid/widgets/parameter_widgets/top_p_parameter.dart';
import 'package:maid/widgets/parameter_widgets/typical_p_parameter.dart';
import 'package:maid/ui/mobile/widgets/dialogs.dart';
import 'package:maid/ui/mobile/widgets/parameter_widgets/penalize_nl_parameter.dart';
import 'package:maid/ui/mobile/widgets/parameter_widgets/mirostat_eta_parameter.dart';
import 'package:maid/ui/mobile/widgets/parameter_widgets/mirostat_parameter.dart';
import 'package:maid/ui/mobile/widgets/parameter_widgets/mirostat_tau_parameter.dart';
import 'package:maid/ui/mobile/widgets/parameter_widgets/n_batch_parameter.dart';
import 'package:maid/ui/mobile/widgets/parameter_widgets/n_ctx_parameter.dart';
import 'package:maid/ui/mobile/widgets/parameter_widgets/n_threads_parameter.dart';
import 'package:maid/ui/mobile/widgets/parameter_widgets/penalty_frequency_parameter.dart';
import 'package:maid/ui/mobile/widgets/parameter_widgets/penalty_last_n_parameter.dart';
import 'package:maid/ui/mobile/widgets/parameter_widgets/penalty_present_parameter.dart';
import 'package:maid/ui/mobile/widgets/parameter_widgets/penalty_repeat_parameter.dart';
import 'package:maid/ui/mobile/widgets/parameter_widgets/seed_parameter.dart';
import 'package:maid/ui/mobile/widgets/double_button_row.dart';
import 'package:maid/ui/mobile/widgets/dropdowns/format_dropdown.dart';
import 'package:maid/ui/mobile/widgets/parameter_widgets/temperature_parameter.dart';
import 'package:maid/ui/mobile/widgets/parameter_widgets/tfs_z_parameter.dart';
import 'package:maid/ui/mobile/widgets/parameter_widgets/top_k_parameter.dart';
import 'package:maid/ui/mobile/widgets/parameter_widgets/top_p_parameter.dart';
import 'package:maid/ui/mobile/widgets/parameter_widgets/typical_p_parameter.dart';
import 'package:provider/provider.dart';

class LocalPlatform extends StatelessWidget {
Expand Down