updates to examples

README.md

@@ -21,8 +21,8 @@ Check out the configuration reference at https://huggingface.co/docs/hub/spaces-
 
 - [x] Fix it for the new models e.g. Llama and others
 
-- [ ] Add the space secrets to have it running online
-  - [ ] Fix the google application json file
+- [x] Add the space secrets to have it running online
+  - [x] Fix the google application json file
 
 - [ ] Make the space public
 
@@ -32,4 +32,5 @@ Check out the configuration reference at https://huggingface.co/docs/hub/spaces-
 - [ ] Adapt the gradio examples to the right format
 - [x] UI refactoring
 - [ ] Log the different queries and the results
-- [x] Clear does not clear the country
+- [x] Clear does not clear the country
+- [ ] Text formatting of the output

app.py

@@ -6,6 +6,7 @@ from src.ui.components.inputs import main_component
 from src.ui.components.static import load_buttons, load_examples, model_settings
 from src.ui.setup import load_html_from_file
 from src.text_generation.vertexai_setup import initialize_vertexai_params
+
 sys.path.append("./src")
 
 
@@ -17,21 +18,22 @@ def create_ui():
     # Create the Gradio HTML component
     html_content = load_html_from_file(html_file_path)
 
-    with gr.Blocks(theme=gr.themes.Default(primary_hue=gr.themes.colors.green, secondary_hue=gr.themes.colors.blue)) as app:
+    with gr.Blocks(
+            theme=gr.themes.Default(primary_hue=gr.themes.colors.green, secondary_hue=gr.themes.colors.blue)) as app:
         gr.HTML(html_content)
         country, starting_point, query, sustainable, model = main_component()
         output = gr.Textbox(label="Generated Results", lines=4)
         max_new_tokens, temperature = model_settings()
 
         # Load the buttons for the interface
-        load_buttons(query, model,
-                     sustainable, country, starting_point,
+        load_buttons(country, starting_point, query, sustainable, model,
                      max_new_tokens, temperature,
                      output,
                      generate_text_fn=generate_text,
                      clear_fn=clear)
         # Load the examples for the interface
-        # load_examples(country, starting_point, query, model, sustainable, output, generate_text)
+        load_examples(country, starting_point, query, sustainable, model, output, generate_text)
+
     return app
 
 

src/ui/components/actions.py

@@ -7,10 +7,12 @@ def clear():
     return None, None, None, None, None, None
 
 
-def generate_text(query_text: str,
-                  model_name: Optional[str],
-                  is_sustainable: Optional[bool],
+def generate_text(
+                  country: Optional[str],
                   starting_point: Optional[str],
+                  query_text: str,
+                  is_sustainable: Optional[bool],
+                  model: Optional[str],
                   max_tokens: Optional[int] = 1024,
                   temp: Optional[float] = 0.49,
                   ):
@@ -20,7 +22,7 @@ def generate_text(query_text: str,
     }
     pipeline_response = pipeline(
         query=query_text,
-        model_name=model_name,
+        model_name=model,
         sustainability=is_sustainable,
         starting_point=starting_point,
         **model_params

src/ui/components/inputs.py

@@ -1,4 +1,4 @@
-from typing import Tuple
+from typing import Tuple, Optional
 
 import gradio as gr
 
@@ -12,11 +12,10 @@ def get_places():
     df = df.sort_values(by=['country', 'city'])
     return df
 
-
-# Function to update the list of cities based on the selected country
 def update_cities(selected_country, df):
+    # Filter cities based on the selected country
     filtered_cities = df[df['country'] == selected_country]['city'].tolist()
-    return gr.Dropdown(choices=filtered_cities, interactive=True)  # Make it interactive as it is not by default
+    return gr.Dropdown(choices=filtered_cities, interactive=True)
 
 
 def main_component() -> Tuple[gr.Dropdown, gr.Dropdown, gr.Textbox, gr.Checkbox, gr.Dropdown]:
@@ -35,15 +34,17 @@ def main_component() -> Tuple[gr.Dropdown, gr.Dropdown, gr.Textbox, gr.Checkbox,
     country_names = list(df.country.unique())
     with gr.Group():
         # Country selection dropdown
-        countries = gr.Dropdown(choices=country_names, multiselect=False, label="Country")
+        country = gr.Dropdown(choices=country_names, multiselect=False, label="Country")
 
         # Starting point selection dropdown
-        starting_point = gr.Dropdown(choices=[], multiselect=False, label="Select your starting point for the trip!")
+        starting_point = gr.Dropdown(choices=[], multiselect=False,
+                                     label="City",
+                                     placeholder="Select a city as your starting point.")
 
         # When a country is selected, update the starting point options
-        countries.select(
+        country.select(
             fn=lambda selected_country: update_cities(selected_country, df),
-            inputs=countries,
+            inputs=country,
             outputs=starting_point
         )
 
@@ -66,4 +67,4 @@ def main_component() -> Tuple[gr.Dropdown, gr.Dropdown, gr.Textbox, gr.Checkbox,
         )
 
     # Return all the components individually
-    return countries, starting_point, query, sustainable, model
+    return country, starting_point, query, sustainable, model

src/ui/components/static.py

@@ -9,55 +9,49 @@ def load_examples(
         country: gr.components.Component,
         starting_point: gr.components.Component,
         query: gr.components.Component,
+        sustainable: gr.components.Component,
         model: gr.components.Component,
-        is_sustainable: gr.components.Component,
         output: gr.components.Component,
         generate_text_fn: Callable[
             [str, Optional[str], Optional[bool], Optional[int], Optional[float], Optional[str]],
             str],
 ) -> gr.Examples:
-
+    # Load the places data
     df = get_places()
-    country_names = list(df.country.unique())
-
-    # Example data
-    country_example = "USA"
-    starting_point_example = "New York"
-    query_example = "What are some top tourist attractions?"
-    sustainable_example = True
-    model_example = "GPT-4"
-
-    # Update the starting point options based on the example country
-    starting_point_choices = update_cities(country_example, df)
-
-    # Set the choices and default value for the starting point dropdown
-    starting_point.choices = starting_point_choices
-    starting_point.value = starting_point_example
-
     # Provide examples
-    examples = [
-        [country_example, starting_point_example, query_example, sustainable_example, model_example]
+    example_data = [
+        ["Austria", "Vienna", "What are some top tourist attractions?", True, "Gemini-1.0-pro"],
+        ["Germany", "Berlin", "Suggest a one week long itinerary for a trip in France.", False, "Gemini-1.5-Pro"],
     ]
+    eg = gr.Examples(
+        examples=example_data,
+        inputs=[country, starting_point, query, sustainable, model],
+        fn=generate_text_fn,
+        outputs=[output],
+        cache_examples=True,
+    )
+    print(f"Examples loaded {eg.dataset.samples}")
 
-    # Create a Gradio Examples component
-    gr.Examples(
-        examples=examples,
-        inputs=[country, starting_point, query, is_sustainable, model],
-        outputs=[]
+    starting_point.change(
+        fn=lambda selected_country: update_cities(selected_country, df),
+        inputs=country,
+        outputs=starting_point
     )
 
+    print("Examples loaded")
+
 
 def load_buttons(
+        country: gr.components.Component,
+        starting_point: gr.components.Component,
         query: gr.components.Component,
         model: gr.components.Component,
         sustainable: gr.components.Component,
-        country: gr.components.Component,
-        starting_point: gr.components.Component,
         max_new_tokens: gr.components.Component,
         temperature: gr.components.Component,
         output: gr.components.Component,
         generate_text_fn: Callable[
-            [str, Optional[str], Optional[bool], Optional[int], Optional[float], Optional[str]],
+            [Optional[str], str, Optional[str], Optional[bool], Optional[int], Optional[float]],
             str],
         clear_fn: Callable[[], None]
 ) -> gr.Group:
@@ -75,6 +69,9 @@ def load_buttons(
 
     Returns:
         Gradio Group component containing the buttons.
+        :param clear_fn:
+        :param generate_text_fn:
+        :param country:
     """
     with gr.Group() as btns:
         with gr.Row():