Merge branch 'develop_liste' into main

OliverKlukas · Apr 18, 2021 · 1f0844b · 1f0844b
2 parents 1abf121 + d6fe016
commit 1f0844b
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 26 deletions.
diff --git a/recipe_generator/lib/services/discoverRecipes.dart b/recipe_generator/lib/services/discoverRecipes.dart
@@ -9,7 +9,7 @@ Future<String> fetchTitlesByPreference(String userPreference) async {
   String prompt = buildPrompt(userPreference);
   Object configuration = {
     "prompt": prompt,
-    "max_tokens": 128,
+    "max_tokens": 64,
     "temperature": 0.7,
     "top_p": 1.0,
     "frequency_penalty": 0.0,

diff --git a/recipe_generator/lib/services/image_service.dart b/recipe_generator/lib/services/image_service.dart
@@ -16,10 +16,14 @@ Future<String> fetchImageUrl(String recipeName) async {
   );
 
   // Fetch a photo
-  final photos = await client.search.photos(recipeName, page: 1, perPage: 1).goAndGet();
-
-  // URL
-  String url = photos.results[0].urls.regular.toString();
+  String url = "https://img.chefkoch-cdn.de/rezepte/807111184564987/bilder/668266/crop-960x720/spaghetti-bolognese.jpg"; // Standard image
+  try{
+    final photos = await client.search.photos(recipeName, page: 1, perPage: 1).goAndGet();
+    // URL
+    url = photos.results[0].urls.regular.toString();
+  } on Exception catch(e) {
+     print(e);
+  }
 
   // Close the client when it is done being used to clean up allocate resources
   client.close();

diff --git a/recipe_generator/lib/views/discovery.dart b/recipe_generator/lib/views/discovery.dart
@@ -63,31 +63,52 @@ class _DiscoveryPageState extends State<DiscoveryPage> {
 
   // Search functionality
   Future<void> filterSearchResults(String query) async {
-    List<Recipe> dummySearchList = <Recipe>[];
-    dummySearchList.addAll(widget.allRecipes);
     if(query.isNotEmpty) {
-      List<Recipe> dummyListData = <Recipe>[];
-      print(fetchTitlesByPreference(query));
-      searchRecipeWithInput(query).then((futureRecipeTitle) {
-          setState(() async {
-            if (futureRecipeTitle is List) {
-              for (var i=0; i<futureRecipeTitle.length; i++) {
-                dummyListData.add(Recipe(
-                    name: futureRecipeTitle[i].toString(), imageURL: await fetchImageUrl(futureRecipeTitle[i].toString())));
-              };
-              widget.dispRecipes.clear();
-              widget.allRecipes.addAll(dummyListData);
-              widget.dispRecipes.addAll(dummyListData);
+      fetchTitlesByPreference(query).then((genRecipes) {
+        setState(() async {
+          // List cleaning
+          List<String> sRecipeList = genRecipes.split('\n');
+          sRecipeList.removeLast();
+          for (var i=0; i<sRecipeList.length; i++) {
+            if(i > 0) {
+              sRecipeList[i] = sRecipeList[i].substring(3);
+            }
+          }
+          List<Recipe> recipeList = [];
+          for (var i=0; i<sRecipeList.length; i++) {
+            recipeList.add(
+                Recipe(name: sRecipeList[i], imageURL: "")
+            );
+          }
+          widget.dispRecipes.clear();
+          widget.allRecipes.forEach((item) {
+            if(item.contains(query)) {
+              widget.dispRecipes.add(item);
             }
-            // Search all existing data
-            //widget.allRecipes.forEach((item) {
-            //  if(item.contains(query)) {
-            //    widget.dispRecipes.add(item);
-            //  }
-            //});
-            widget.dispRecipes = await getRecipeImages();
+          });
+
+          // Update the display
+          widget.allRecipes.addAll(recipeList);
+          widget.dispRecipes.addAll(recipeList);
+          widget.dispRecipes = await getRecipeImages();
+
+          // Searching
+          searchRecipeWithInput(query).then((futureRecipeTitle) {
+            List<Recipe> dummyListData = <Recipe>[];
+            setState(() async {
+              if (futureRecipeTitle is List) {
+                for (var i=0; i<futureRecipeTitle.length; i++) {
+                  dummyListData.add(Recipe(
+                      name: futureRecipeTitle[i].toString(), imageURL: await fetchImageUrl(futureRecipeTitle[i].toString())));
+                };
+                widget.allRecipes.addAll(dummyListData);
+                widget.dispRecipes.addAll(dummyListData);
+              }
+              widget.dispRecipes = await getRecipeImages();
+            });
           });
         });
+      });
     } else {
       setState(() async {
         widget.dispRecipes.clear();