syntaxmatrix 2.2.6__tar.gz → 2.2.7__tar.gz

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

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

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

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

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

syntaxmatrix-2.2.7/syntaxmatrix/project_root.py

@@ -0,0 +1,72 @@
+# 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

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

@@ -34,6 +34,7 @@ from datetime import datetime
 
 import html as _html
 import contextlib
+from pathlib import Path
 
 try:
     from pygments import highlight as _hl
@@ -44,7 +45,8 @@ except Exception:
     _HAVE_PYGMENTS = False
 
 
-_CLIENT_DIR = detect_project_root()
+# _CLIENT_DIR = detect_project_root()
+_CLIENT_DIR = Path(os.environ.get("SMX_CLIENT_DIR", "/app/syntaxmatrixdir"))
 _stream_q = queue.Queue() 
 _stream_cancelled = {}
 _last_result_html = {}  # { session_id: html_doc }

syntaxmatrix-2.2.6/syntaxmatrix/project_root.py

@@ -1,61 +0,0 @@
-# syntaxmatrix/project_root.py
-
-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