Spaces:

10gen
/

deepsearchitv2

Runtime error

App Files Files Community

Guiyom commited on Feb 16, 2025

Commit

9978a7a

verified ·

1 Parent(s): 167be5f

Update app.py

Browse files

Files changed (1) hide show

app.py +19 -22

app.py CHANGED Viewed

@@ -39,7 +39,7 @@ def replace_focus_placeholders(report_html: str, context: str, initial_query: st
         try:
             focus_html = generate_focus_snippet(instructions, context, initial_query, crumbs)
             # Wrap the entire focus placeholder in a single div to preserve block-level grouping.
-            return f'<!-- Focus {placeholder_num} Start --><div class="focus-placeholder" style="background: #ede8e8; border: 1px solid black; padding: 10px; margin: 10px 0;">\n{focus_html}\n</div><!-- Focus {placeholder_num} End -->'
         except Exception as e:
             logging.error(f"Focus {placeholder_num} failed: {str(e)}")
             return f'<!-- ERROR GENERATING FOCUS {placeholder_num} -->'
@@ -838,17 +838,19 @@ class ReportGenerator:
 <head>
     <meta charset="utf-8" />
     <style>
-        body {{ font-family: Helvetica, sans-serif; margin: 40px; background: white; }}
-        h1 {{ font-size: 24pt; margin-bottom: 12px; text-align: left; }}
-        h2 {{ font-size: 20pt; margin-bottom: 10px; text-align: left; }}
-        h3 {{ font-size: 18pt; margin-bottom: 8px; text-align: left; }}
-        p {{ font-size: 11pt; line-height: 1.5; margin-bottom: 10px; }}
-        ol, ul {{ font-size: 11pt; margin-left: 20px; line-height: 1.5; }}
-        hr {{ border: 1px solid #ccc; margin: 20px 0; }}
-        table {{ border-collapse: collapse; width: 100%; margin-bottom: 10px; }}
-        th, td {{ border: 1px solid #ccc; padding: 8px; text-align: left; }}
-        th {{ background-color: #f2f2f2; }}
-        .page-break {{ page-break-before: always; }}
     </style>
     <script>
         console.log("Report loaded successfully.");
@@ -879,7 +881,7 @@ class ReportGenerator:
         driver = webdriver.Chrome(options=options)
         try:
             driver.get(f"data:text/html;charset=utf-8,{html_content}")
-            time.sleep(2)
             screenshot_png = driver.get_screenshot_as_png()
             return screenshot_png
         finally:
@@ -920,11 +922,6 @@ class ReportGenerator:
                  svg { max-width: 100% !important; height: auto !important; }
             }
             """)
-        # Wrap the alignment assessment (if present) in a div to control overflow.
-        html_report = html_report.replace(
-            "<p><b>Report alignment assessment:</b>",
-            "<div style='max-width:100%; word-wrap: break-word;'><p><b>Report alignment assessment:</b>"
-        )
         # Ensure closing tag for the added div.
         html_report = html_report.replace("</body>", "</div></body>")
@@ -1131,10 +1128,10 @@ def iterative_deep_research_gen(initial_query: str, reportstyle: str, breadth: i
     final_report = replace_focus_placeholders(final_report, combined_context, initial_query, aggregated_crumbs)
     alignment_assessment = assess_report_alignment(final_report, initial_query, followup_clarifications)
-    final_report += f"""
-    <p><b>Report alignment assessment:</b>
-    {alignment_assessment}</p>"""
     logging.info("iterative_deep_research_gen: Final report generated.")
     yield ("", final_report, process_log, crumbs_list)

         try:
             focus_html = generate_focus_snippet(instructions, context, initial_query, crumbs)
             # Wrap the entire focus placeholder in a single div to preserve block-level grouping.
+            return f'<!-- Focus {placeholder_num} Start --><div class="focus-placeholder" style="background: #ede8e8; border: 1px solid black; padding: 10px; margin: 10px 0; font-size: 7pt;">\n">\n{focus_html}\n</div><!-- Focus {placeholder_num} End -->'
         except Exception as e:
             logging.error(f"Focus {placeholder_num} failed: {str(e)}")
             return f'<!-- ERROR GENERATING FOCUS {placeholder_num} -->'
 <head>
     <meta charset="utf-8" />
     <style>
+      body {{ font-family: Helvetica, sans-serif; margin: 40px; background: white; }}
+      h1 {{ font-size: 24pt; margin-bottom: 12px; text-align: left; }}
+      h2 {{ font-size: 20pt; margin-bottom: 10px; text-align: left; }}
+      h3 {{ font-size: 18pt; margin-bottom: 8px; text-align: left; }}
+      /* Force paragraphs to have a white background */
+      p {{ font-size: 11pt; line-height: 1.5; margin-bottom: 10px; background-color: white !important; }}
+      ol, ul {{ font-size: 11pt; margin-left: 20px; line-height: 1.5; }}
+      h2 + ol {{ line-height: 1 !important; }}
+      hr {{ border: 1px solid #ccc; margin: 20px 0; }}
+      table {{ border-collapse: collapse; width: 100%; margin-bottom: 10px; }}
+      th, td {{ border: 1px solid #ccc; padding: 8px; text-align: left; }}
+      th {{ background-color: #f2f2f2; }}
+      .page-break {{ page-break-before: always; }}
     </style>
     <script>
         console.log("Report loaded successfully.");
         driver = webdriver.Chrome(options=options)
         try:
             driver.get(f"data:text/html;charset=utf-8,{html_content}")
+            time.sleep(10)
             screenshot_png = driver.get_screenshot_as_png()
             return screenshot_png
         finally:
                  svg { max-width: 100% !important; height: auto !important; }
             }
             """)
         # Ensure closing tag for the added div.
         html_report = html_report.replace("</body>", "</div></body>")
     final_report = replace_focus_placeholders(final_report, combined_context, initial_query, aggregated_crumbs)
     alignment_assessment = assess_report_alignment(final_report, initial_query, followup_clarifications)
+    final_report = final_report.replace(
+        "</body>",
+        f"<p><b>Report alignment assessment:</b> {alignment_assessment}</p></body>"
+    )
     logging.info("iterative_deep_research_gen: Final report generated.")
     yield ("", final_report, process_log, crumbs_list)