Fix used ram count (#27)

Author: alejoe91

entrypoint.py

@@ -11,7 +11,7 @@
 
 # 1. Run setup (replaces --setup flag)
 from aind_ephys_portal.setup import *  # noqa: F401,F403
-from aind_ephys_portal.panel.logging import list_gui_sessions, get_max_number_of_gui_sessions, get_container_total_memory, LOG_DIR  # noqa: F401
+from aind_ephys_portal.panel.logging import list_gui_sessions, get_max_number_of_gui_sessions, get_container_total_memory, get_container_used_memory, LOG_DIR  # noqa: F401
 
 
 TARGET_MEMORY_TRIGGER_PERCENT = 70
@@ -80,7 +80,7 @@ def get(self):
             if _tmp_arr is None and not _tmp_array_triggered:
                 _tmp_array_triggered = True
                 total_memory = get_container_total_memory()
-                used_memory = psutil.virtual_memory().used
+                used_memory = get_container_used_memory()
                 target_memory = total_memory * TARGET_MEMORY_TRIGGER_PERCENT / 100
                 array_size = int((target_memory - used_memory) / 8)  # assuming float64 (8 bytes)
                 if array_size > 0:

src/aind_ephys_portal/ephys_monitor_app.py

@@ -1,18 +1,18 @@
 import psutil
 import panel as pn
 
-from aind_ephys_portal.panel.logging import list_sessions, remove_session, get_container_total_memory
+from aind_ephys_portal.panel.logging import list_sessions, remove_session, get_container_total_memory, get_container_used_memory
 
 pn.extension()
 
 
 # --- Memory info ---
 def get_mem_info():
-    mem = psutil.virtual_memory()
     container_total = get_container_total_memory()
-    used_gb = mem.used / (1024**3)
+    container_used = get_container_used_memory()
+    used_gb = container_used / (1024**3)
     total_gb = container_total / (1024**3)
-    percent = mem.used / container_total * 100
+    percent = container_used / container_total * 100
     return used_gb, total_gb, percent
 
 

src/aind_ephys_portal/panel/logging.py

@@ -108,6 +108,27 @@ def get_container_total_memory():
     return psutil.virtual_memory().total
 
 
+def get_container_used_memory():
+    """Return the container's current memory usage in bytes, falling back to host used.
+
+    Must read from the same cgroup as get_container_total_memory() — psutil reads
+    host-level /proc/meminfo, which produces the wrong array size in the inflation calc.
+    """
+    # cgroups v2
+    try:
+        with open("/sys/fs/cgroup/memory.current") as f:
+            return int(f.read().strip())
+    except (FileNotFoundError, ValueError):
+        pass
+    # cgroups v1
+    try:
+        with open("/sys/fs/cgroup/memory/memory.usage_in_bytes") as f:
+            return int(f.read().strip())
+    except (FileNotFoundError, ValueError):
+        pass
+    return psutil.virtual_memory().used
+
+
 def get_max_number_of_gui_sessions():
     # Estimate number of sessions per worker for health check.
     SESSION_AVG_RAM_USAGE_GB = 2