syntaxmatrix 2.2.4__tar.gz → 2.2.5__tar.gz

{syntaxmatrix-2.2.4 → syntaxmatrix-2.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: syntaxmatrix
-Version: 2.2.4
+Version: 2.2.5
 Summary: SyntaxMUI: A customizable framework for Python AI Assistant Projects.
 Home-page: https://github.com/bobganti/syntaxmatrix_demo
 Author: Bob Nti

{syntaxmatrix-2.2.4 → syntaxmatrix-2.2.5}/SyntaxMatrix.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: syntaxmatrix
-Version: 2.2.4
+Version: 2.2.5
 Summary: SyntaxMUI: A customizable framework for Python AI Assistant Projects.
 Home-page: https://github.com/bobganti/syntaxmatrix_demo
 Author: Bob Nti

{syntaxmatrix-2.2.4 → syntaxmatrix-2.2.5}/setup.py

@@ -8,7 +8,7 @@ with open(os.path.join(this_directory, "README.md"), encoding="utf-8") as f:
 
 setup(
     name="syntaxmatrix",
-    version="2.2.4",
+    version="2.2.5",
     author="Bob Nti",
     author_email="bob.nti@syntaxmatrix.com",
     description="SyntaxMUI: A customizable framework for Python AI Assistant Projects.",

{syntaxmatrix-2.2.4 → syntaxmatrix-2.2.5}/syntaxmatrix/routes.py

@@ -46,6 +46,7 @@ except Exception:
 _CLIENT_DIR = detect_project_root()
 _stream_q = queue.Queue() 
 _stream_cancelled = {}
+_last_result_html = {}  # { session_id: html_doc }
 
 # store per-client so it stays alongside uploads
 MLEARNING_OUTPUTS = os.path.join(_CLIENT_DIR, "mlearning_outputs")
@@ -5380,18 +5381,37 @@ def setup_routes(smx):
                       "</html>"
                     )
 
-                    html_path = os.path.join(MLEARNING_OUTPUTS, f"result_{session_id}.html")
-                    with open(html_path, "w", encoding="utf-8") as f:
-                        f.write(html_doc)
+                    _last_result_html[session_id] = html_doc
 
-                    # 2.4 Append a single download button (no template edits needed)
+                    # 2.4 Append a single download button (explicit click → fetch → download)
+                    download_url = url_for("download_result_html", session_id=session_id)
                     dl_html = f"""
-                    <div style="margin:14px 0;display:flex;gap:10px;flex-wrap:wrap">
-                      <a class="btn" href="/download/result/html/{session_id}"
-                        style="padding:8px 12px;border:1px solid #0b6;border-radius:6px;text-decoration:none;">
+                      <button type="button"
+                              class="btn"
+                              style="padding:8px 12px;border:1px solid #0b6;border-radius:6px;background:#fff;color:#0b6;cursor:pointer;"
+                              onclick="(function() {{
+                                  fetch('{download_url}', {{
+                                      method: 'POST',
+                                      headers: {{ 'X-Requested-With': 'fetch' }}
+                                  }}).then(function(resp) {{
+                                      if (!resp.ok) throw new Error('Download failed');
+                                      return resp.blob();
+                                  }}).then(function(blob) {{
+                                      const url = window.URL.createObjectURL(blob);
+                                      const a = document.createElement('a');
+                                      a.href = url;
+                                      a.download = 'result.html';
+                                      document.body.appendChild(a);
+                                      a.click();
+                                      a.remove();
+                                      window.URL.revokeObjectURL(url);
+                                  }}).catch(function(err) {{
+                                      console.error(err);
+                                      alert('Could not download the result. Please try again.');
+                                  }});
+                              }})()">
                         Download Result (HTML)
-                      </a>
-                    </div>
+                      </button>
                     """
                     ai_outputs.append(Markup(dl_html))
                 ################################################################
@@ -5469,6 +5489,28 @@ def setup_routes(smx):
           session_id=session_id,
         )
 
+
+    @smx.app.route("/download/result/html/<session_id>", methods=["POST"])
+    def download_result_html(session_id):
+        """Send the last-built result HTML as a download (only when user clicks)."""
+        path = os.path.join(MLEARNING_OUTPUTS, f"result_{session_id}.html")
+        # Prefer in-memory result (set during the query render)
+        html_doc = _last_result_html.get(session_id)
+
+        html_doc = _last_result_html.get(session_id)
+        if not html_doc:
+            return jsonify({"ok": False, "error": "No result available."}), 404
+
+        os.makedirs(MLEARNING_OUTPUTS, exist_ok=True)
+        path = os.path.join(MLEARNING_OUTPUTS, f"result_{session_id}.html")
+        with open(path, "w", encoding="utf-8") as f:
+            f.write(html_doc)
+
+        # free memory for this session copy (optional)
+        _last_result_html.pop(session_id, None)
+
+        return jsonify({"ok": True, "path": path})
+        
     # ── UPLOAD DATASET --------------------------------------
     @smx.app.route("/dashboard/upload", methods=["POST"])
     def upload_dataset():
@@ -5504,45 +5546,6 @@ def setup_routes(smx):
         # go back to the dashboard; dashboard() will auto-select the next file
         return redirect(url_for("dashboard"))
 
-    @smx.app.route("/download_result", methods=["POST"])
-    def download_result():
-        """Download the 'Result' block (figures + commentary) as a PDF."""
-        html_fragment = (request.form.get("html") or "").strip()
-        if not html_fragment:
-            return "No content to export.", 400
-
-        # Wrap the fragment into a minimal full HTML doc
-        full_html = f"""<!doctype html>
-        <html>
-          <head>
-            <meta charset="utf-8">
-            <title>Result</title>
-            <style>
-              @page {{ size: A4; margin: 16mm; }}
-              body {{ font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Arial, sans-serif; font-size: 11pt; }}
-              h1,h2,h3 {{ margin: 0 0 8px 0; }}
-              .smx-commentary-card {{ border: 1px solid #e5e7eb; border-radius: 12px; padding: 12px; background: #fafafa; }}
-              img {{ max-width: 100%; height: auto; }}
-              table {{ width: 100%; border-collapse: collapse; }}
-              th, td {{ border: 1px solid #e5e7eb; padding: 4px 6px; }}
-            </style>
-          </head>
-          <body>{html_fragment}</body>
-        </html>"""
-
-        # Try WeasyPrint first
-        if HTML is not None:
-            try:
-                pdf_io = io.BytesIO()
-                HTML(string=full_html, base_url=request.url_root).write_pdf(pdf_io)
-                pdf_io.seek(0)
-                return send_file(pdf_io, as_attachment=True, download_name="result.pdf", mimetype="application/pdf")
-            except Exception as e:
-                #return None
-                smx.logger.exception("WeasyPrint render failed: %s", e)
-
-        # Fallback: build a simple but faithful PDF with ReportLab (works everywhere)
-        return _pdf_fallback_reportlab(full_html)
 
     def _pdf_fallback_reportlab(full_html: str):
         """ReportLab fallback: extract text + base64 <img> and lay them out."""
@@ -5636,19 +5639,4 @@ def setup_routes(smx):
           {footer}
         </body>
         </html>
-      """, error_message=str(e)), 500
-
-    @smx.app.route("/download/result/html/<session_id>")
-    def download_result_html(session_id):
-        path = os.path.join(MLEARNING_OUTPUTS, f"result_{session_id}.html")
-        if not os.path.exists(path):
-            return "No result available to download.", 404
-        return send_file(path, as_attachment=True, download_name="result.html", mimetype="text/html")
-
-    @smx.app.route("/download/result/tables/<session_id>")
-    def download_result_tables(session_id):
-        path = os.path.join(MLEARNING_OUTPUTS, f"result_tables_{session_id}.zip")
-        if not os.path.exists(path):
-            return "No tables found in the last result.", 404
-        return send_file(path, as_attachment=True, download_name="result_tables.zip", mimetype="application/zip")
-
+      """, error_message=str(e)), 500