syntaxmatrix 2.2.7__tar.gz → 2.2.9__tar.gz

{syntaxmatrix-2.2.7 → syntaxmatrix-2.2.9}/PKG-INFO

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

{syntaxmatrix-2.2.7 → syntaxmatrix-2.2.9}/SyntaxMatrix.egg-info/PKG-INFO

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

{syntaxmatrix-2.2.7 → syntaxmatrix-2.2.9}/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.7",
+    version="2.2.9",
     author="Bob Nti",
     author_email="bob.nti@syntaxmatrix.com",
     description="SyntaxMUI: A customizable framework for Python AI Assistant Projects.",

{syntaxmatrix-2.2.7 → syntaxmatrix-2.2.9}/syntaxmatrix/__init__.py

@@ -59,6 +59,6 @@ stream_write = _app_instance.stream_write
 enable_stream = _app_instance.enable_stream
 stream = _app_instance.stream
 get_stream_args = _app_instance.get_stream_args
-# set_stream_args = _app_instance.set_stream_args
 
-app = _app_instance.app
+
+app = _app_instance.app

syntaxmatrix-2.2.9/syntaxmatrix/project_root.py

@@ -0,0 +1,135 @@
+# syntaxmatrix/project_root.py 
+import os
+import inspect
+from pathlib import Path
+import syntaxmatrix
+
+def scandir() -> Path:
+    framework_dir = Path(syntaxmatrix.__file__).resolve().parent
+    for frame in inspect.stack():
+        fname = frame.filename
+        if not fname or not isinstance(fname, str):
+            continue
+        p = Path(fname)
+        try:
+            if p.is_file() and framework_dir not in p.parents:
+                return p.parent
+        except Exception:
+            continue
+    return framework_dir
+
+def _writable(p: Path) -> bool:
+    try:
+        p.mkdir(parents=True, exist_ok=True)
+        test = p / ".smx_write_test"
+        with open(test, "w", encoding="utf-8") as f:
+            f.write("ok")
+        test.unlink(missing_ok=True)
+        return True
+    except Exception:
+        return False
+
+def detect_project_root() -> Path:
+    """
+    Return the consumer project's 'syntaxmatrixdir' folder, creating it if necessary.
+    Resolution order:
+      1) SMX_CLIENT_DIR (if set and writable)
+      2) ./syntaxmatrixdir under current working dir (if writable)
+      3) GCS Fuse standard mounts (if present & writable)
+      4) /tmp/syntaxmatrixdir (always writable on Cloud Run)
+      5) Fallback near the first non-framework caller (if writable)
+    """
+
+    # 1) Explicit override (keeps your local stable; handy in Cloud Run)
+    env = os.environ.get("SMX_CLIENT_DIR")
+    if env:
+        p = Path(env)
+        if _writable(p):
+            return p
+
+    # 2) CWD-based
+    cwd = Path.cwd()
+    p = cwd / "syntaxmatrixdir"
+    if _writable(p):
+        return p
+
+    # 3) Common GCS Fuse mount points (Gen2)
+    for candidate in [Path("/mnt/gcs/syntaxmatrixdir"),
+                      Path("/mnt/disks/gcs/syntaxmatrixdir")]:
+        if _writable(candidate):
+            return candidate
+
+    # 4) Cloud Run safe default
+    tmp = Path("/tmp/syntaxmatrixdir")
+    if _writable(tmp):
+        return tmp
+
+    # 5) Fallback alongside caller
+    fallback = scandir() / "syntaxmatrixdir"
+    if _writable(fallback):
+        return fallback
+
+    # Last resort: return /tmp anyway (avoids import-time crashes)
+    return tmp
+
+
+
+# import os
+# import inspect
+# from pathlib import Path
+# import syntaxmatrix
+
+
+# def scandir() -> Path:
+#     """
+#     Find the first stack frame outside of the syntaxmatrix package
+#     whose filename is a real .py file on disk, and return its parent dir.
+#     """
+#     framework_dir = Path(syntaxmatrix.__file__).resolve().parent
+
+#     for frame in inspect.stack():
+#         fname = frame.filename
+
+#         # 1) skip internal frames (<frozen ...>) or empty names
+#         if not fname or fname.startswith("<"):
+#             continue
+
+#         candidate = Path(fname)
+
+#         # 2) skip non-.py or non-existent paths
+#         if candidate.suffix != ".py" or not candidate.exists():
+#             continue
+
+#         try:
+#             candidate = candidate.resolve()
+#         except (OSError, RuntimeError):
+#             # if for some reason resolve() fails, skip it
+#             continue
+
+#         # 3) skip anything inside the framework itself
+#         if framework_dir in candidate.parents:
+#             continue
+
+#         # FOUND: a user file (e.g. app.py, manage.py, etc.)
+#         return candidate.parent
+
+#     # fallback: whatever cwd() is
+#     return Path(os.getcwd()).resolve()
+
+
+# def detect_project_root() -> Path:
+#     """
+#     Returns the consumer project's syntaxmatrixdir folder, creating it if necessary.
+#     All framework data & uploads live here.
+#     """
+#     # 1) First check the CWD (where your app:app is running)
+#     cwd = Path.cwd()
+#     candidate = cwd / "syntaxmatrixdir"
+#     if candidate.exists():
+#         return candidate
+
+#     # 2) Otherwise fall back to the old logic (e.g. inside site-packages)
+#     proj_root = scandir()
+#     fw_root = proj_root / "syntaxmatrixdir"
+#     fw_root.mkdir(exist_ok=True)
+#     return fw_root

{syntaxmatrix-2.2.7 → syntaxmatrix-2.2.9}/syntaxmatrix/routes.py

@@ -45,15 +45,14 @@ except Exception:
     _HAVE_PYGMENTS = False
 
 
-# _CLIENT_DIR = detect_project_root()
-_CLIENT_DIR = Path(os.environ.get("SMX_CLIENT_DIR", "/app/syntaxmatrixdir"))
+_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")
-os.makedirs(MLEARNING_OUTPUTS, exist_ok=True)
+# # store per-client so it stays alongside uploads
+# MLEARNING_OUTPUTS = os.path.join(_CLIENT_DIR, "mlearning_outputs")
+# os.makedirs(MLEARNING_OUTPUTS, exist_ok=True)
 
 # single, reused formatter: inline styles, padding, rounded corners, scroll
 _FMT = _HtmlFmt(
@@ -5389,30 +5388,13 @@ def setup_routes(smx):
                     # 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"""
-                      <button type="button"
-                              class="btn"
-                              style="margin:14px 0;padding:8px 12px;border:1px solid #0b6;border-radius:6px;background:#fff;color:#0b6;cursor:pointer;"
-                              onclick="(async function(btn) {{
-                                  try {{
-                                      btn.disabled = true;
-                                      const orig = btn.textContent;
-                                      btn.textContent = 'Saving…';
-                                      const resp = await fetch('{download_url}', {{
-                                          method: 'POST',
-                                          headers: {{ 'X-Requested-With': 'fetch' }}
-                                      }});
-                                      const data = await resp.json();
-                                      if (!resp.ok || !data.ok) throw new Error(data.error || 'Save failed');
-                                      btn.textContent = 'Saved to MLEARNING_OUTPUTS';
-                                  }} catch (err) {{
-                                      console.error(err);
-                                      alert('Could not save. Please try again.');
-                                  }} finally {{
-                                      btn.disabled = false;
-                                  }}
-                              }})(this)">
-                        Download
-                      </button>
+                      <a href="{download_url}">
+                        <button type="button"
+                                class="btn"
+                                style="margin:14px 0;padding:8px 12px;border:1px solid #0b6;border-radius:6px;background:#fff;color:#0b6;cursor:pointer;">
+                          Download
+                        </button>
+                      </a>
                     """
                     ai_outputs.append(Markup(dl_html))
 
@@ -5490,26 +5472,29 @@ def setup_routes(smx):
           data_cells=data_cells,
           session_id=session_id,
         )
+    
 
-
-    @smx.app.route("/download/result/html/<session_id>", methods=["POST"])
+    @smx.app.route("/download/result/html/<session_id>", methods=["GET"])
     def download_result_html(session_id):
-        """Send the last-built result HTML as a download (only when user clicks)."""
-        os.makedirs(MLEARNING_OUTPUTS, exist_ok=True)
-        stamp = datetime.now().strftime("%Y%m%d-%H%M%S-%f") 
-        filename = f"result_{session_id}_{stamp}.html"
-        path = os.path.join(MLEARNING_OUTPUTS, filename)
-
+        """Stream the last-built result HTML as a browser download (no server save)."""
         html_doc = _last_result_html.get(session_id)
         if not html_doc:
-            return jsonify({"ok": False, "error": "No result available."}), 404
-        with open(path, "w", encoding="utf-8") as f:
-            f.write(html_doc)
+            return ("No result available.", 404)
 
-        # free memory for this session copy (optional)
+        buf = io.BytesIO(html_doc.encode("utf-8"))
+        buf.seek(0)
+
+        # keep a copy if you wish, or free it:
         _last_result_html.pop(session_id, None)
 
-        return jsonify({"ok": True, "path": path})
+        stamp = datetime.now().strftime("%Y%m%d-%H%M%S-%f")
+        filename = f"result_{session_id}_{stamp}.html"
+        return send_file(
+            buf,
+            mimetype="text/html; charset=utf-8",
+            as_attachment=True,
+            download_name=filename
+        )
         
     # ── UPLOAD DATASET --------------------------------------
     @smx.app.route("/dashboard/upload", methods=["POST"])

syntaxmatrix-2.2.7/syntaxmatrix/project_root.py

@@ -1,72 +0,0 @@
-# syntaxmatrix/project_root.py
-
-import os
-import inspect
-from pathlib import Path
-import syntaxmatrix
-
-
-def _is_writable(d: Path) -> bool:
-    """
-    Try to create the directory and a tiny test file, then remove it.
-    Returns True if writes work on this path (expected for a GCS mount).
-    """
-    try:
-        d.mkdir(parents=True, exist_ok=True)
-        probe = d / ".smx_write_probe"
-        with open(probe, "w", encoding="utf-8") as f:
-            f.write("ok")
-        try:
-            probe.unlink()
-        except Exception:
-            pass
-        return True
-    except Exception:
-        return False
-
-
-def _caller_project_dir() -> Path:
-    """
-    Find the first stack frame outside the syntaxmatrix package and
-    return its parent folder (best local fallback for dev).
-    """
-    framework_dir = Path(syntaxmatrix.__file__).resolve().parent
-    for frame in inspect.stack():
-        fn = frame.filename or ""
-        p = Path(fn).resolve()
-        try:
-            p.relative_to(framework_dir)
-            continue  # skip framework files
-        except Exception:
-            pass
-        if p.exists() and p.suffix == ".py":
-            return p.parent
-    return Path.cwd()
-
-
-def detect_project_root() -> Path:
-    """
-    Choose the single source-of-truth for all framework data (uploads, db, media):
-      1) Honour SMX_CLIENT_DIR if provided (Cloud Run: set to /app/syntaxmatrixdir).
-      2) If not set, prefer the standard Cloud Run mount path /app/syntaxmatrixdir.
-      3) Otherwise fall back to a local 'syntaxmatrixdir' beside the caller (dev only).
-
-    NOTE: We intentionally avoid using any other container paths to keep all I/O
-    on the bucket mount when running on Cloud Run.
-    """
-    # 1) Explicit environment override
-    env_dir = os.environ.get("SMX_CLIENT_DIR", "").strip()
-    if env_dir:
-        d = Path(env_dir).expanduser().resolve()
-        if _is_writable(d):
-            return d
-
-    # 2) Default Cloud Run mount path (as used in your deploy script)
-    cloud_run_mount = Path("/app/syntaxmatrixdir")
-    if _is_writable(cloud_run_mount):
-        return cloud_run_mount
-
-    # 3) Dev fallback: a local folder next to the app
-    local_dir = _caller_project_dir() / "syntaxmatrixdir"
-    local_dir.mkdir(parents=True, exist_ok=True)
-    return local_dir