Make layout narrower

app.py

@@ -54,7 +54,7 @@ def on_submit(criteria, context, user_message, assistant_message, state):
     # result_str = f"Is the {evaluated_component} message harmful based on the risk definition: {result_label}"
     html_str = f"<p>{get_result_description(state['selected_sub_catalog'], state['selected_criteria_name'])} <strong>{result_label}</strong></p>"
     # html_str = f"Is the {evaluated_component} {evaluated_component_adjective}: {result_label}"
-    return [gr.update(value=html_str), gr.update(visible=True), gr.update(visible=True)]
+    return [gr.update(value=html_str, visible=True), gr.update(visible=True)]
 
 def on_show_prompt_click(criteria, context, user_message, assistant_message, state):
     prompt = get_prompt_from_test_case({
@@ -68,7 +68,7 @@ def on_show_prompt_click(criteria, context, user_message, assistant_message, sta
     prompt = json.dumps(prompt, indent=4)
     return gr.Markdown(prompt)
 
-ibm_blue = blue = gr.themes.Color(
+ibm_blue = gr.themes.Color(
     name="ibm-blue",
     c50="#eff6ff",
     c100="#dbeafe",
@@ -83,66 +83,79 @@ ibm_blue = blue = gr.themes.Color(
     c950="#1d3660"
 )
 
+head_style = """
+<style>
+    @media (min-width: 1536px)
+    {
+        .gradio-container {
+            max-width: 1024px !important;
+        }
+    }
+</style>
+"""
+
 with gr.Blocks(
     title='Granite Guardian',
     theme=gr.themes.Soft(
         primary_hue=ibm_blue,
-        font=[gr.themes.GoogleFont("IBM Plex Sans"), gr.themes.GoogleFont('Source Sans 3')]),
+        font=[gr.themes.GoogleFont("IBM Plex Sans"), gr.themes.GoogleFont('Source Sans 3')],
+    ),
+    head=head_style,
+    fill_width=False,
     css='styles.css') as demo:
     
-    with gr.Blocks(elem_classes="roott"):
-
-        state = gr.State(value={
-            'selected_sub_catalog': 'harmful_content_in_user_prompt',
-            'selected_criteria_name': 'general_harm'
-        })
-
-        starting_test_case = [t for sub_catalog_name, sub_catalog in catalog.items() for t in sub_catalog if t['name'] == state.value['selected_criteria_name'] and sub_catalog_name == state.value['selected_sub_catalog']][0]
-        
-        with gr.Row(elem_classes='title-row'):
-            with gr.Column(scale=4):
-                gr.HTML('<h2>IBM Granite Guardian 3.0</h2>', elem_classes='title')
-                gr.HTML(elem_classes='system-description', value='<p>Granite Guardian models are specialized language models in the Granite family that allow you to detect harms and risks in generative AI systems. The Granite Guardian models can be used with any other large language models to make interactions with generative AI systems safe. Select an example in the left panel to see how the model evaluates harms and risks in user prompts, assistant responses, and for hallucinations in retrieval-augmented generation. In this demo, we use granite-guardian-3.0-8B.</p>')
-        with gr.Row(elem_classes='column-gap'):
-            with gr.Column(scale=0, elem_classes='no-gap'):
-                title_display_left = gr.HTML("<h2>Harms & Risks</h2>", elem_classes=['subtitle', 'subtitle-harms'])
-                accordions = []
-                catalog_buttons: dict[str,dict[str,gr.Button]] = {}
-                for i, (sub_catalog_name, sub_catalog) in enumerate(catalog.items()):
-                    with gr.Accordion(to_title_case(sub_catalog_name), open=(i==0), elem_classes='accordion') as accordion:
-                        for test_case in sub_catalog:
-                            elem_classes=['catalog-button']
-                            elem_id=f"{sub_catalog_name}---{test_case['name']}"
-                            if starting_test_case == test_case:
-                                elem_classes.append('selected')
-
-                            if not sub_catalog_name in catalog_buttons:
-                                catalog_buttons[sub_catalog_name] = {}
-
-                            catalog_buttons[sub_catalog_name][test_case['name']] = \
-                                gr.Button(to_title_case(test_case['name']), elem_classes=elem_classes, variant='secondary', size='sm', elem_id=elem_id)
-                            
-                        accordions.append(accordion)
-
-            with gr.Column(visible=True, scale=1) as test_case_content:
-                with gr.Row():
-                    test_case_name = gr.HTML(f'<h2>{to_title_case(starting_test_case["name"])}</h2>', elem_classes='subtitle')
-                    show_propt_button = gr.Button('Show prompt', size='sm', scale=0, min_width=110)
-
-                criteria = gr.Textbox(label="Evaluation Criteria", lines=3, interactive=False, value=starting_test_case['criteria'], elem_classes=['read-only', 'input-box', 'margin-bottom'])
-                gr.HTML(elem_classes=['block', 'content-gap'])
-                context = gr.Textbox(label="Context", lines=3, interactive=True, value=starting_test_case['context'], visible=False, elem_classes=['input-box'])
-                user_message = gr.Textbox(label="User Prompt", lines=3, interactive=True, value=starting_test_case['user_message'], elem_classes=['input-box'])
-                assistant_message = gr.Textbox(label="Assistant Response", lines=3, interactive=True, visible=False, value=starting_test_case['assistant_message'], elem_classes=['input-box'])
-
-                submit_button = gr.Button("Evaluate", variant='primary',icon=os.path.join(os.path.dirname(os.path.abspath(__file__)), 'send-white.png'), elem_classes='submit-button')
-                
-                with gr.Column(elem_classes="result-container", visible=False) as result_container:
-                    evaluation_results_label = gr.HTML("<span>Results</span>", elem_classes='result-title', visible=False)
-                    result_text = gr.HTML(label="Result", elem_classes=['result-text', 'input-box', 'read-only', 'block'], visible=False, value='')
-
-                with Modal(visible=False, elem_classes='modal') as modal:
-                    prompt = gr.Markdown('')
+
+    state = gr.State(value={
+        'selected_sub_catalog': 'harmful_content_in_user_prompt',
+        'selected_criteria_name': 'general_harm'
+    })
+
+    starting_test_case = [t for sub_catalog_name, sub_catalog in catalog.items() for t in sub_catalog if t['name'] == state.value['selected_criteria_name'] and sub_catalog_name == state.value['selected_sub_catalog']][0]
+    
+    with gr.Row(elem_classes='title-row'):
+        with gr.Column(scale=4):
+            gr.HTML('<h2>IBM Granite Guardian 3.0</h2>', elem_classes='title')
+            gr.HTML(elem_classes='system-description', value='<p>Granite Guardian models are specialized language models in the Granite family that allow you to detect harms and risks in generative AI systems. The Granite Guardian models can be used with any other large language models to make interactions with generative AI systems safe. Select an example in the left panel to see how the model evaluates harms and risks in user prompts, assistant responses, and for hallucinations in retrieval-augmented generation. In this demo, we use granite-guardian-3.0-8B.</p>')
+    with gr.Row(elem_classes='column-gap'):
+        with gr.Column(scale=0, elem_classes='no-gap'):
+            title_display_left = gr.HTML("<h2>Harms & Risks</h2>", elem_classes=['subtitle', 'subtitle-harms'])
+            accordions = []
+            catalog_buttons: dict[str,dict[str,gr.Button]] = {}
+            for i, (sub_catalog_name, sub_catalog) in enumerate(catalog.items()):
+                with gr.Accordion(to_title_case(sub_catalog_name), open=(i==0), elem_classes='accordion') as accordion:
+                    for test_case in sub_catalog:
+                        elem_classes=['catalog-button']
+                        elem_id=f"{sub_catalog_name}---{test_case['name']}"
+                        if starting_test_case == test_case:
+                            elem_classes.append('selected')
+
+                        if not sub_catalog_name in catalog_buttons:
+                            catalog_buttons[sub_catalog_name] = {}
+
+                        catalog_buttons[sub_catalog_name][test_case['name']] = \
+                            gr.Button(to_title_case(test_case['name']), elem_classes=elem_classes, variant='secondary', size='sm', elem_id=elem_id)
+                        
+                    accordions.append(accordion)
+
+        with gr.Column(visible=True, scale=1) as test_case_content:
+            with gr.Row():
+                test_case_name = gr.HTML(f'<h2>{to_title_case(starting_test_case["name"])}</h2>', elem_classes='subtitle')
+                show_propt_button = gr.Button('Show prompt', size='sm', scale=0, min_width=110)
+
+            criteria = gr.Textbox(label="Evaluation Criteria", lines=3, interactive=False, value=starting_test_case['criteria'], elem_classes=['read-only', 'input-box', 'margin-bottom'])
+            gr.HTML(elem_classes=['block', 'content-gap'])
+            context = gr.Textbox(label="Context", lines=3, interactive=True, value=starting_test_case['context'], visible=False, elem_classes=['input-box'])
+            user_message = gr.Textbox(label="User Prompt", lines=3, interactive=True, value=starting_test_case['user_message'], elem_classes=['input-box'])
+            assistant_message = gr.Textbox(label="Assistant Response", lines=3, interactive=True, visible=False, value=starting_test_case['assistant_message'], elem_classes=['input-box'])
+
+            submit_button = gr.Button("Evaluate", variant='primary',icon=os.path.join(os.path.dirname(os.path.abspath(__file__)), 'send-white.png'), elem_classes='submit-button')
+            
+            with gr.Column(elem_classes="result-container", visible=False, show_progress=False) as result_container:
+                evaluation_results_label = gr.HTML("<span>Results</span>", elem_classes='result-title', visible=False)
+                result_text = gr.HTML(elem_classes=['result-text', 'input-box', 'read-only', 'block'], visible=False, value='')
+
+            with Modal(visible=False, elem_classes='modal') as modal:
+                prompt = gr.Markdown('')
 
     show_propt_button.click(
         on_show_prompt_click,
@@ -152,13 +165,14 @@ with gr.Blocks(
 
     submit_button \
         .click(
-            lambda: [gr.update(visible=True), gr.update(visible=True)],
+            lambda: [gr.update(visible=True), gr.update(visible=False), gr.update(visible=True, value='')],
             inputs=None,
-            outputs=[result_container, result_text]) \
-        .then(
+            outputs=[result_container, evaluation_results_label, result_text]
+        ).then(
             on_submit,
             inputs=[criteria, context, user_message, assistant_message, state],
-            outputs=[result_text, evaluation_results_label, result_container])
+            outputs=[result_text, evaluation_results_label]
+        )
       
     for button in [t for sub_catalog_name, sub_catalog_buttons in catalog_buttons.items() for t in sub_catalog_buttons.values()]:
         button.click(update_selected_test_case, inputs=[button, state], outputs=[state])\

styles.css

@@ -1,7 +1,3 @@
-.roott {
-    width: 500px !important;
-}
-
 .title-row {
     margin-bottom: 0.75rem;
 }