From 5672be582a869c11b9fc9d3ee5867463ee39744b Mon Sep 17 00:00:00 2001 From: LilleBRG Date: Mon, 16 Sep 2024 16:33:37 +0200 Subject: [PATCH] guidebook work --- Mobile/.env | 1 + Mobile/.gitignore | 3 +- Mobile/lib/base/sidemenu.dart | 15 +- Mobile/lib/main.dart | 3 +- Mobile/lib/services/openaiservice.dart | 34 ++-- Mobile/lib/touristguidebook.dart | 211 ++++++++++++++++++------- Mobile/pubspec.yaml | 1 + 7 files changed, 192 insertions(+), 76 deletions(-) create mode 100644 Mobile/.env diff --git a/Mobile/.env b/Mobile/.env new file mode 100644 index 0000000..adb9b6c --- /dev/null +++ b/Mobile/.env @@ -0,0 +1 @@ +OPENAI_API_KEY=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 \ No newline at end of file diff --git a/Mobile/.gitignore b/Mobile/.gitignore index 6b4559a..d90f52b 100644 --- a/Mobile/.gitignore +++ b/Mobile/.gitignore @@ -43,5 +43,4 @@ app.*.map.json /android/app/release environment.json -node_modules -.env \ No newline at end of file +node_modules \ No newline at end of file diff --git a/Mobile/lib/base/sidemenu.dart b/Mobile/lib/base/sidemenu.dart index 95032a5..c24c80e 100644 --- a/Mobile/lib/base/sidemenu.dart +++ b/Mobile/lib/base/sidemenu.dart @@ -106,7 +106,7 @@ class _SideMenuState extends State { ), ListTile( title: const Text('GuideBook'), - leading: const Icon(Icons.person), + leading: const Icon(Icons.menu_book_sharp), selected: _selectedIndex == 5, onTap: () { Navigator.pushReplacementNamed(context, '/tourist-guide-book'); @@ -126,6 +126,19 @@ class _SideMenuState extends State { ), ] : [ + ListTile( + title: const Text('GuideBook'), + leading: const Icon(Icons.menu_book_sharp), + selected: _selectedIndex == 5, + onTap: () { + Navigator.pushReplacementNamed(context, '/tourist-guide-book'); + }, + ), + const Divider( + color: Colors.grey, + thickness: 2, + indent: 40, + ), ListTile( title: const Text('Register'), leading: const Icon(Icons.add_box_outlined), diff --git a/Mobile/lib/main.dart b/Mobile/lib/main.dart index 2214f47..e7ea6b0 100644 --- a/Mobile/lib/main.dart +++ b/Mobile/lib/main.dart @@ -15,11 +15,12 @@ import 'base/sidemenu.dart'; import 'profile.dart'; import 'models.dart'; import 'package:geolocator/geolocator.dart'; +import 'package:flutter_dotenv/flutter_dotenv.dart'; import 'services/api.dart' as api; import 'package:http/http.dart' as http; void main() async { - // Refresh JWT on startup + await dotenv.load(fileName: ".env"); final prefs = await SharedPreferences.getInstance(); if (prefs.getString("token") != null && prefs.getString("refresh-token") != null) { final token = await api.request(null, api.ApiService.auth, "POST", "/RefreshToken", {'refreshToken': prefs.getString("refresh-token")}); diff --git a/Mobile/lib/services/openaiservice.dart b/Mobile/lib/services/openaiservice.dart index a619232..a9ed368 100644 --- a/Mobile/lib/services/openaiservice.dart +++ b/Mobile/lib/services/openaiservice.dart @@ -3,7 +3,7 @@ import 'dart:convert'; import 'package:flutter_dotenv/flutter_dotenv.dart'; class OpenAIService { - static Future> getGuideBook(String country) async { + static Future getGuideBook(String country) async { final apiKey = dotenv.env['OPENAI_API_KEY']; final uri = Uri.parse('https://api.openai.com/v1/chat/completions'); @@ -16,9 +16,10 @@ class OpenAIService { }, { "role": "user", - "content": "Make a tourist guide book over $country. The topics should be: A little introduction to how the people of the country is like and what to expect from the environment, famous tourist attractions in the country(amusement park always included), Basic words that would be nice to learn in the country's language(should always be from English to the country's language) and transportation. These topics should be in a Json-Object format." + "content": "Make a tourist guide book over $country. The topics should be: A little introduction to how the people of the country is like and what to expect from the environment, famous tourist attractions in the country(amusement park always included), Basic words that would be nice to learn in the country's language(should always be from English to the country's language) and transportation. These topics should be in a Json-Object format in this form: {Country: {introduction: {people: , environment: }, tourist_attractions: {famous_sites: [{name: , description: }]}, basic_words: {}, transportation: {overview: , public_transport: {buses: , trains: , taxis: }}}}" } ], + "max_tokens": 1500 }); final response = await http.post( @@ -30,20 +31,25 @@ class OpenAIService { body: requestBody, ); - if (response.statusCode == 200) { + if (response.statusCode == 200) { + final decodedBody = utf8.decode(response.bodyBytes); + final data = jsonDecode(decodedBody); + var content = data['choices'][0]['message']['content']; - try { - return jsonDecode(response.body); - } catch (e) { - return { - 'navn': 'Fejl', - 'art': 'Ukendt', - 'type': 'Fejl', - 'description': 'Fejl ved JSON parsing: $e' - }; - } + content = content.replaceAll('```json', '').replaceAll('```', '').trim(); + + return _extractDescription(content); } else { - throw Exception('Fejl ved hentning af data: ${response.statusCode}'); + throw Exception('Fejl ved billedanalyse: ${response.statusCode}'); } } + + static String _extractDescription(String content) { + final lines = content.split('\n'); + final startIndex = lines.indexWhere((line) => line.startsWith('**Beskrivelse:**')); + + if (startIndex == -1) return content; + + return lines.skip(startIndex).join('\n').trim(); + } } \ No newline at end of file diff --git a/Mobile/lib/touristguidebook.dart b/Mobile/lib/touristguidebook.dart index 85d44af..17fd777 100644 --- a/Mobile/lib/touristguidebook.dart +++ b/Mobile/lib/touristguidebook.dart @@ -1,12 +1,8 @@ +import 'dart:convert'; import 'package:dropdown_search/dropdown_search.dart'; import 'package:flutter/material.dart'; import 'package:mobile/base/sidemenu.dart'; -import 'package:mobile/models.dart' as models; -import 'package:shared_preferences/shared_preferences.dart'; -import 'package:google_fonts/google_fonts.dart'; -import 'dart:convert'; import 'services/openaiservice.dart' as api; -import 'base/variables.dart'; class TouristGuideBookPage extends StatefulWidget { const TouristGuideBookPage({super.key}); @@ -17,15 +13,66 @@ class TouristGuideBookPage extends StatefulWidget { class _TouristGuideBookPageState extends State { String? _selectedCountry; - final List countries = [ - "Afghanistan", "Albania", "Algeria", "Andorra", "Angola", "Argentina", - // Add more countries - ]; + bool _isLoading = false; + Map _touristbook = {}; + final List countries = [ + "Afghanistan", "Albania", "Algeria", "Andorra", "Angola", "Argentina", + "Armenia", "Australia", "Austria", "Azerbaijan", "Bahamas", "Bahrain", + "Bangladesh", "Barbados", "Belarus", "Belgium", "Belize", "Benin", + "Bhutan", "Bolivia", "Bosnia and Herzegovina", "Botswana", "Brazil", + "Brunei", "Bulgaria", "Burkina Faso", "Burundi", "Cabo Verde", "Cambodia", + "Cameroon", "Canada", "Central African Republic", "Chad", "Chile", "China", + "Colombia", "Comoros", "Congo (Congo-Brazzaville)", "Congo (Democratic Republic)", + "Costa Rica", "Croatia", "Cuba", "Cyprus", "Czech Republic", "Denmark", + "Djibouti", "Dominica", "Dominican Republic", "Ecuador", "Egypt", "El Salvador", + "Equatorial Guinea", "Eritrea", "Estonia", "Eswatini", "Ethiopia", "Fiji", + "Finland", "France", "Gabon", "Gambia", "Georgia", "Germany", "Ghana", + "Greece", "Grenada", "Guatemala", "Guinea", "Guinea-Bissau", "Guyana", + "Haiti", "Honduras", "Hungary", "Iceland", "India", "Indonesia", "Iran", + "Iraq", "Ireland", "Israel", "Italy", "Jamaica", "Japan", "Jordan", "Kazakhstan", + "Kenya", "Kiribati", "Kuwait", "Kyrgyzstan", "Laos", "Latvia", "Lebanon", + "Lesotho", "Liberia", "Libya", "Liechtenstein", "Lithuania", "Luxembourg", + "Madagascar", "Malawi", "Malaysia", "Maldives", "Mali", "Malta", "Marshall Islands", + "Mauritania", "Mauritius", "Mexico", "Micronesia", "Moldova", "Monaco", + "Mongolia", "Montenegro", "Morocco", "Mozambique", "Myanmar", "Namibia", + "Nauru", "Nepal", "Netherlands", "New Zealand", "Nicaragua", "Niger", + "Nigeria", "North Korea", "North Macedonia", "Norway", "Oman", "Pakistan", + "Palau", "Panama", "Papua New Guinea", "Paraguay", "Peru", "Philippines", + "Poland", "Portugal", "Qatar", "Romania", "Russia", "Rwanda", "Saint Kitts and Nevis", + "Saint Lucia", "Saint Vincent and the Grenadines", "Samoa", "San Marino", + "Sao Tome and Principe", "Saudi Arabia", "Senegal", "Serbia", "Seychelles", + "Sierra Leone", "Singapore", "Slovakia", "Slovenia", "Solomon Islands", + "Somalia", "South Africa", "South Korea", "South Sudan", "Spain", "Sri Lanka", + "Sudan", "Suriname", "Sweden", "Switzerland", "Syria", "Taiwan", "Tajikistan", + "Tanzania", "Thailand", "Timor-Leste", "Togo", "Tonga", "Trinidad and Tobago", + "Tunisia", "Turkey", "Turkmenistan", "Tuvalu", "Uganda", "Ukraine", + "United Arab Emirates", "United Kingdom", "United States", "Uruguay", "Uzbekistan", + "Vanuatu", "Vatican City", "Venezuela", "Vietnam", "Yemen", "Zambia", "Zimbabwe" +]; Future getBook() async { if (_selectedCountry != null) { - final response = await api.OpenAIService.getGuideBook(_selectedCountry!); - print(response); // For debugging to check the response + setState(() { + _isLoading = true; + }); + + try { + final response = await api.OpenAIService.getGuideBook(_selectedCountry!); + print(response); + final jsonData = jsonDecode(response); + setState(() { + _touristbook = jsonData[_selectedCountry!]; + }); + } catch (e) { + print('Error fetching guidebook: $e'); + ScaffoldMessenger.of(context).showSnackBar( + SnackBar(content: Text('Failed to load guidebook')), + ); + } finally { + setState(() { + _isLoading = false; + }); + } } else { ScaffoldMessenger.of(context).showSnackBar( const SnackBar(content: Text('Choose a country')), @@ -33,54 +80,102 @@ class _TouristGuideBookPageState extends State { } } - @override - Widget build(BuildContext context) { - return SideMenu( - selectedIndex: 5, - body: Scaffold( - appBar: AppBar( - title: Text('Select Country'), - ), - body: Center( - child: Padding( - padding: const EdgeInsets.all(16.0), - child: Column( - children: [ - DropdownSearch( - items: countries, - popupProps: const PopupProps.menu( - showSearchBox: true, - searchFieldProps: TextFieldProps( - decoration: InputDecoration( - labelText: "Search a country", - border: OutlineInputBorder(), - ), - ), - ), - dropdownDecoratorProps: const DropDownDecoratorProps( - dropdownSearchDecoration: InputDecoration( - labelText: "Select a country", - hintText: "Search a country", - border: OutlineInputBorder(), - ), - ), - onChanged: (String? country) { - setState(() { - _selectedCountry = country; - }); - }, - selectedItem: "Select a country you want a touristbook for", - ), - ElevatedButton( - onPressed: getBook, - child: Text('Get Guidebook'), - ), - ], - ), - ), - ), + Widget _buildTouristBookSection(String title, String content) { + return Padding( + padding: const EdgeInsets.symmetric(vertical: 8.0), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text(title, style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold)), + SizedBox(height: 5), + Text(content, style: TextStyle(fontSize: 16)), + ], ), ); } -} + @override +Widget build(BuildContext context) { + return SideMenu( + selectedIndex: 5, + body: Scaffold( + appBar: AppBar( + title: Text('Select Country'), + ), + body: _isLoading + ? Center(child: CircularProgressIndicator()) + : SingleChildScrollView( // Added SingleChildScrollView here + padding: const EdgeInsets.all(16.0), + child: Column( + children: [ + DropdownSearch( + items: countries, + popupProps: const PopupProps.menu( + showSearchBox: true, + searchFieldProps: TextFieldProps( + decoration: InputDecoration( + labelText: "Search a country", + border: OutlineInputBorder(), + ), + ), + ), + dropdownDecoratorProps: const DropDownDecoratorProps( + dropdownSearchDecoration: InputDecoration( + labelText: "Select a country", + hintText: "Search a country", + border: OutlineInputBorder(), + ), + ), + onChanged: (String? country) { + setState(() { + _selectedCountry = country; + }); + }, + selectedItem: "Select a country you want a touristbook for", + ), + SizedBox(height: 20), + ElevatedButton( + onPressed: getBook, + child: Text('Get Guidebook'), + ), + if (_touristbook.isNotEmpty) ...[ + _buildTouristBookSection( + "Introduction - People", + _touristbook['introduction']?['people'] ?? 'No data', + ), + _buildTouristBookSection( + "Introduction - Environment", + _touristbook['introduction']?['environment'] ?? 'No data', + ), + _buildTouristBookSection( + "Famous Sites", + _touristbook['tourist_attractions']?['famous_sites']?.map((site) => site['name'] + ':\n' + site['description']).join('\n') ?? 'No data', + ), + _buildTouristBookSection( + "Basic Language - Greetings", + _touristbook['basic_words']?.entries.map((e) => '${e.key}: ${e.value}').join('\n') ?? 'No data', + ), + _buildTouristBookSection( + "Transportation Overview", + _touristbook['transportation']?['overview'] ?? 'No data', + ), + _buildTouristBookSection( + "Public Transport - Buses", + _touristbook['transportation']?['public_transport']?['buses'] ?? 'No data', + ), + _buildTouristBookSection( + "Public Transport - Trains", + _touristbook['transportation']?['public_transport']?['trains'] ?? 'No data', + ), + _buildTouristBookSection( + "Public Transport - Taxis", + _touristbook['transportation']?['public_transport']?['taxis'] ?? 'No data', + ), + ], + ], + ), + ), + ), + ); +} +} diff --git a/Mobile/pubspec.yaml b/Mobile/pubspec.yaml index 237d531..aaf1ad7 100644 --- a/Mobile/pubspec.yaml +++ b/Mobile/pubspec.yaml @@ -64,6 +64,7 @@ dev_dependencies: flutter: assets: - assets/ + - .env uses-material-design: true # To add assets to your application, add an assets section, like this: