debugger-help 4.2.1__tar.gz → 4.2.3__tar.gz

{debugger_help-4.2.1 → debugger_help-4.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: debugger-help
-Version: 4.2.1
+Version: 4.2.3
 Summary: debugger.help VPS Agent — Deep system monitoring for logs, GPU, PM2, Docker, and more
 Author: debugger.help
 License: MIT

{debugger_help-4.2.1 → debugger_help-4.2.3}/debugger_help/__init__.py

@@ -1,2 +1,2 @@
 """debugger.help VPS Agent — Deep system monitoring + ComfyUI workflow management."""
-__version__ = "4.2.1"
+__version__ = "4.2.2"

{debugger_help-4.2.1 → debugger_help-4.2.3}/debugger_help/agent.py

@@ -79,7 +79,7 @@ INGEST_URL = os.environ.get("DEBUGGER_INGEST_URL", "")
 SOURCE_NAME = os.environ.get("DEBUGGER_SOURCE", "vps-{}".format(socket.gethostname()))
 PLATFORM = os.environ.get("DEBUGGER_PLATFORM", "Python (VPS)")
 INTERVAL = int(os.environ.get("DEBUGGER_INTERVAL", "10"))
-VERSION = "4.2.0"
+VERSION = "4.2.3"
 
 # Derive poll-commands URL from ingest URL
 POLL_COMMANDS_URL = INGEST_URL.replace("/ingest", "/poll-commands") if INGEST_URL else ""
@@ -226,17 +226,30 @@ class StreamCapture(io.TextIOBase):
         self._sending = False
         self._recent_hashes = deque(maxlen=200)
 
+    # Patterns that identify the agent's own log output — never re-send these
+    _SELF_PATTERNS = ("debugger-agent", "debugger_agent", "[info]", "[warning]", "[error]",
+                      "send failed", "send error", "command poll", "executing action",
+                      "action ", "main loop error")
+
     def write(self, text):
         self.original.write(text)
-        if text.strip() and not self._sending:
-            msg_hash = hash(text.strip()[:200])
+        stripped = text.strip()
+        if stripped and not self._sending:
+            lower = stripped.lower()
+            # Filter out the agent's own log lines to prevent feedback loops
+            if any(p in lower for p in self._SELF_PATTERNS):
+                self.buffer.append(stripped)
+                return len(text)
+
+            # Normalize: strip timestamps/numbers for smarter dedup
+            normalized = re.sub(r'\d{2,4}[:\-/\.]\d{2}[:\-/\.]\d{2,4}[\sT]?\d{0,2}:?\d{0,2}:?\d{0,2}\.?\d*|\b\d{4,}\b', '_', stripped[:300])
+            msg_hash = hash(normalized)
             with self.lock:
-                # Deduplicate: skip if we've seen this exact message recently
+                # Deduplicate: skip if we've seen a similar message recently
                 if msg_hash in self._recent_hashes:
                     return len(text)
                 self._recent_hashes.append(msg_hash)
-                self.buffer.append(text.strip())
-                lower = text.lower()
+                self.buffer.append(stripped)
                 detected_level = self.level
                 if any(kw in lower for kw in [
                     "error", "exception", "traceback", "failed", "critical",
@@ -245,7 +258,7 @@ class StreamCapture(io.TextIOBase):
                     detected_level = "error"
                 elif any(kw in lower for kw in ["warning", "warn", "deprecat"]):
                     detected_level = "warn"
-                self.pending.append((detected_level, text.strip()[:2000]))
+                self.pending.append((detected_level, stripped[:2000]))
         return len(text)
 
     def flush(self):
@@ -713,11 +726,20 @@ def get_firewall_rules():
 # =============================================================================
 
 class LogFileWatcher(threading.Thread):
+    # Normalize timestamps/numbers for smarter dedup
+    _NORMALIZE_RE = re.compile(r'\d{2,4}[:\-/\.]\d{2}[:\-/\.]\d{2,4}[\sT]?\d{0,2}:?\d{0,2}:?\d{0,2}\.?\d*|\b\d{4,}\b')
+
     def __init__(self, files):
         super().__init__(daemon=True)
         self.files = files
         self.positions = {}
         self._recent_hashes = deque(maxlen=500)
+        self._file_rate = {}          # filepath -> (last_send_time, skip_count)
+        self._MIN_INTERVAL = 10       # min seconds between sends per file for similar content
+
+    def _normalize(self, text):
+        """Strip timestamps and long numbers so similar lines produce the same hash."""
+        return self._NORMALIZE_RE.sub("_", text.strip()[:300])
 
     def run(self):
         for f in self.files:
@@ -737,12 +759,20 @@ class LogFileWatcher(threading.Thread):
                             self.positions[filepath] = fh.tell()
 
                         if new_lines.strip():
-                            # Deduplicate
-                            msg_hash = hash(new_lines.strip()[:300])
+                            # Deduplicate with normalized content (ignores timestamps)
+                            normalized = self._normalize(new_lines)
+                            msg_hash = hash(normalized)
                             if msg_hash in self._recent_hashes:
                                 continue
                             self._recent_hashes.append(msg_hash)
 
+                            # Per-file rate limiting — max 1 log per file per 10s
+                            now = time.time()
+                            last_send, skip_count = self._file_rate.get(filepath, (0, 0))
+                            if now - last_send < self._MIN_INTERVAL:
+                                self._file_rate[filepath] = (last_send, skip_count + 1)
+                                continue
+
                             level = "info"
                             lower = new_lines.lower()
                             if any(kw in lower for kw in ["error", "exception", "traceback", "failed", "critical"]):
@@ -750,13 +780,19 @@ class LogFileWatcher(threading.Thread):
                             elif "warn" in lower:
                                 level = "warn"
 
+                            msg = new_lines.strip()[:2000]
+                            if skip_count > 0:
+                                msg = "[+{} similar skipped] {}".format(skip_count, msg)
+
+                            self._file_rate[filepath] = (now, 0)
+
                             send({
                                 "type": "log",
                                 "source": SOURCE_NAME,
                                 "platform": PLATFORM,
                                 "version": VERSION,
                                 "level": level,
-                                "message": "[file:{}] {}".format(os.path.basename(filepath), new_lines.strip()[:2000]),
+                                "message": "[file:{}] {}".format(os.path.basename(filepath), msg),
                                 "context": {"capturedFrom": "file_watcher", "file": filepath},
                             })
                     elif size < self.positions.get(filepath, 0):

{debugger_help-4.2.1 → debugger_help-4.2.3}/debugger_help.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: debugger-help
-Version: 4.2.1
+Version: 4.2.3
 Summary: debugger.help VPS Agent — Deep system monitoring for logs, GPU, PM2, Docker, and more
 Author: debugger.help
 License: MIT

{debugger_help-4.2.1 → debugger_help-4.2.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "debugger-help"
-version = "4.2.1"
+version = "4.2.3"
 description = "debugger.help VPS Agent — Deep system monitoring for logs, GPU, PM2, Docker, and more"
 readme = "README.md"
 license = {text = "MIT"}