Major update

app.py

@@ -7,17 +7,27 @@ import random
 checkpoint = "mistralai/Mixtral-8x7B-Instruct-v0.1"
 client = InferenceClient(checkpoint)
 
+
 def format_prompt(raw_Prompt):
     better_prompt = f"[INST] {raw_Prompt} [/INST]"
     return better_prompt
 
 
-def findShops(target_platform, target_region, target_field, target_rangeFrom, target_rangeTo, target_crossSelling, target_similarArticles, target_amount,accessKey):
+def findShops(target_platform, target_region, target_field, target_rangeFrom, target_rangeTo, target_crossSelling, target_similarArticles, target_amount, accessKey):
     if accessKey != 'Kuchen':
         return 'You are not authorized to use this software.'
-    requestPrompt = f"""
-    Search for {target_amount} Shops that use the platform {target_platform}.
+    if target_platform == 'All':
+        basePrompt = f"""
+        Search for {target_amount} Shops with a website.
+        """
+    else:
+        basePrompt = f"""
+        Search for {target_amount} Shops that use the platform {target_platform}.
+        """
+    regionPrompt = f"""
     Make sure the recommended shops are located in {target_region}.
+    """
+    rangePrompt = f"""
     The websites of the recommended shops should have between {target_rangeFrom} and {target_rangeTo} monthly visitors."""
     crossSellingPrompt = """
     The recommended shops should be potential customers for a software that improves the cross-selling on their website."""
@@ -26,10 +36,17 @@ def findShops(target_platform, target_region, target_field, target_rangeFrom, ta
     fieldPrompt = f"""
     Focus on shops that have a focus on the topic'{target_field}'."""
     stylePrompt = """
-    Leave an empty line between your recommendations.
-    Present your results in a list with the names of the shops as the headings.
-    Make sure to include a link to the corresponding websites which can be used directly by clicking it."""
-    fullPrompt = requestPrompt
+    Your response must be a list in markdown format.
+    Each element of the list must follow these rules:
+    - The title for each element must be the name of the shop.
+    - The information coming after the title must each start in a new line.
+    - The first information for each element must be a link to the website.
+    - The next information must always be the number of monthly website visitors.
+    - The next information must always be a summary of what is sold in the shop.
+   """
+    fullPrompt = basePrompt
+    fullPrompt += regionPrompt
+    fullPrompt += rangePrompt
     if target_crossSelling:
         fullPrompt += crossSellingPrompt
     if target_similarArticles:
@@ -66,7 +83,7 @@ with gr.Blocks(title="Shop finder",
     with gr.Group():
         gr.Markdown("**FILTERS**")
         with gr.Column():
-            platform = gr.Dropdown(choices=['Shopware', 'Shopify'],
+            platform = gr.Dropdown(choices=['All', 'Shopware', 'Shopify'],
                                    value='Shopware',
                                    interactive=True,
                                    label="PLATFORM")
@@ -112,22 +129,21 @@ with gr.Blocks(title="Shop finder",
     btn = gr.Button("FIND")
     with gr.Group():
         gr.Markdown("**RESULTS**")
-        out = gr.Textbox(lines=10,
-                         max_lines=100,
-                         label='POTENTIAL SHOPS')
+        out = gr.Markdown(value=' <br /> <br /> <br /> <br /> <br /> <br />',
+                          label='POTENTIAL SHOPS')
     with gr.Group():
         gr.Markdown("*ACCESS SECRET*")
         loginKey = gr.Textbox(max_lines=1,
-                                 interactive=True,
-                                 type='password',
-                                 show_label=False)
+                              interactive=True,
+                              type='password',
+                              show_label=False)
     btn.click(fn=findShops,
               inputs=[platform, region, field,
                       range_from, range_to,
                       opt_crossSelling,
                       opt_similarArticles,
                       numberOfShops,
-                     loginKey],
+                      loginKey],
               outputs=out)
 
 demo.launch(show_api=False)