eva-exploit 3.3.4__tar.gz → 3.3.6__tar.gz

{eva_exploit-3.3.4 → eva_exploit-3.3.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eva-exploit
-Version: 3.3.4
+Version: 3.3.6
 Summary: Exploit Vector Agent
 Author: ARCANGEL0
 License: MIT

{eva_exploit-3.3.4 → eva_exploit-3.3.6}/config.py

@@ -10,7 +10,7 @@ from pathlib import Path
 
 # ================= CONFIG =================
 APP_NAME = "EVA"
-APP_VERSION = "3.3.4"
+APP_VERSION = "3.3.6"
 GITHUB_REPO = "arcangel0/EVA"
 PYPI_PACKAGE = "eva-exploit"
 API_ENDPOINT = "NOT_SET"

{eva_exploit-3.3.4 → eva_exploit-3.3.6}/eva_exploit.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eva-exploit
-Version: 3.3.4
+Version: 3.3.6
 Summary: Exploit Vector Agent
 Author: ARCANGEL0
 License: MIT

{eva_exploit-3.3.4 → eva_exploit-3.3.6}/modules/llm.py

@@ -38,6 +38,9 @@ OLLAMA_HISTORY_LIMIT = 6
 LAST_OUTPUT_PROMPT_MAX_CHARS = 2200
 LAST_OUTPUT_CHUNK_TRIGGER = 5000
 LAST_OUTPUT_CHUNK_SIZE = 2800
+OLLAMA_HTTP_CONNECT_TIMEOUT = 5
+OLLAMA_HTTP_READ_TIMEOUT = 240
+OLLAMA_RUN_TIMEOUT = 240
 STREAM_HIDE_MARKERS = [
     "[:::] analysis_output:",
     "output valid json only",
@@ -332,109 +335,56 @@ def _stream_visible_fragment(text, pending, suppress_output):
 
 
 def _ollama_chat(messages, on_stream_start=None):
-    def _extract_chunk_text(item):
-        if isinstance(item, dict):
-            return item.get("message", {}).get("content", "") or item.get("response", "")
-        message = getattr(item, "message", None)
-        if message is not None:
-            return getattr(message, "content", "") or ""
-        return getattr(item, "response", "") or ""
-
     def _ollama_run_stream_fallback(prompt):
-        proc = subprocess.Popen(
-            ["ollama", "run", OLLAMA_MODEL],
-            stdin=subprocess.PIPE,
-            stdout=subprocess.PIPE,
-            stderr=subprocess.STDOUT,
-            text=True,
-            bufsize=1,
-        )
-        collected = []
-        started = False
         try:
-            if proc.stdin:
-                proc.stdin.write(prompt)
-                proc.stdin.flush()
-                proc.stdin.close()
-            while True:
-                ch = proc.stdout.read(1)
-                if ch == "" and proc.poll() is not None:
-                    break
-                if not ch:
-                    continue
-                if not started and on_stream_start:
-                    on_stream_start()
-                    started = True
-                collected.append(ch)
+            proc = subprocess.run(
+                ["ollama", "run", OLLAMA_MODEL],
+                input=prompt,
+                text=True,
+                capture_output=True,
+                timeout=OLLAMA_RUN_TIMEOUT,
+            )
+            raw = proc.stdout or proc.stderr or ""
+            if raw and on_stream_start:
+                on_stream_start()
+            return raw, False
+        except subprocess.TimeoutExpired:
+            return "", False
         except KeyboardInterrupt:
-            proc.terminate()
             raise
-        finally:
-            try:
-                proc.wait(timeout=5)
-            except subprocess.TimeoutExpired:
-                proc.kill()
-                proc.wait(timeout=2)
-        return "".join(collected), False
-
+    payload = {"model": OLLAMA_MODEL, "messages": messages, "stream": False}
     try:
-        from ollama import chat as ollama_chat
-
-        stream = ollama_chat(
-            model=OLLAMA_MODEL,
-            messages=messages,
-            stream=True,
+        r = requests.post(
+            "http://127.0.0.1:11434/api/chat",
+            json=payload,
+            timeout=(OLLAMA_HTTP_CONNECT_TIMEOUT, OLLAMA_HTTP_READ_TIMEOUT),
         )
+        r.raise_for_status()
+        data = r.json()
+        raw = data.get("message", {}).get("content", "") or data.get("response", "")
+        if raw and on_stream_start:
+            on_stream_start()
+        if raw:
+            return raw, False
+    except (requests.RequestException, json.JSONDecodeError):
+        pass
 
-        chunks = []
-        started = False
-        for item in stream:
-            if not started and on_stream_start:
-                on_stream_start()
-                started = True
-            text = _extract_chunk_text(item)
-            if text:
-                chunks.append(text)
-        return "".join(chunks), False
-    except Exception:
-        payload = {"model": OLLAMA_MODEL, "messages": messages, "stream": True}
-        try:
-            r = requests.post(
-                "http://127.0.0.1:11434/api/chat",
-                json=payload,
-                timeout=(5, 20),
-                stream=True,
-            )
-            r.raise_for_status()
-            chunks = []
-            started = False
-            for line in r.iter_lines(decode_unicode=True):
-                if not line:
-                    continue
-                data = json.loads(line)
-                if not started and on_stream_start:
-                    on_stream_start()
-                    started = True
-                chunk = data.get("message", {}).get("content", "") or data.get("response", "")
-                if chunk:
-                    chunks.append(chunk)
-            if chunks:
-                return "".join(chunks), False
-            prompt = messages[-1].get("content", "") if messages else ""
-            return _ollama_run_stream_fallback(prompt)
-        except (requests.RequestException, json.JSONDecodeError):
-            prompt = messages[-1].get("content", "") if messages else ""
-            return _ollama_run_stream_fallback(prompt)
+    prompt = messages[-1].get("content", "") if messages else ""
+    return _ollama_run_stream_fallback(prompt)
 
 
 def _ollama_run_fallback(prompt):
-    p = subprocess.run(
-        ["ollama", "run", OLLAMA_MODEL],
-        input=prompt,
-        text=True,
-        capture_output=True,
-    )
-    return p.stdout
+    try:
+        p = subprocess.run(
+            ["ollama", "run", OLLAMA_MODEL],
+            input=prompt,
+            text=True,
+            capture_output=True,
+            timeout=OLLAMA_RUN_TIMEOUT,
+        )
+        return p.stdout
+    except subprocess.TimeoutExpired:
+        return ""
 
 
 def _query_g4f(history):

{eva_exploit-3.3.4 → eva_exploit-3.3.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "eva-exploit"
-version = "3.3.4"
+version = "3.3.6"
 description = "Exploit Vector Agent"
 readme = "README.md"
 requires-python = ">=3.10"

{eva_exploit-3.3.4 → eva_exploit-3.3.6}/utils/system.py

@@ -20,7 +20,7 @@ from urllib import error, request
 import tomllib
 import config as config_module
 
-from colorama import Fore
+from colorama import Fore, Style
 
 from config import (
     ANTHROPIC_API_KEY,