pygent 0.1.10__tar.gz → 0.1.11__tar.gz

{pygent-0.1.10 → pygent-0.1.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pygent
-Version: 0.1.10
+Version: 0.1.11
 Summary: Pygent is a minimalist coding assistant that runs commands in a Docker container when available and falls back to local execution. See https://marianochaves.github.io/pygent for documentation and https://github.com/marianochaves/pygent for the source code.
 Author-email: Mariano Chaves <mchaves.software@gmail.com>
 Project-URL: Documentation, https://marianochaves.github.io/pygent

{pygent-0.1.10 → pygent-0.1.11}/pygent/__init__.py

@@ -8,5 +8,6 @@ except _metadata.PackageNotFoundError:  # pragma: no cover - fallback for tests
 
 from .agent import Agent, run_interactive  # noqa: E402,F401, must come after __version__
 from .models import Model, OpenAIModel  # noqa: E402,F401
+from .errors import PygentError, APIError  # noqa: E402,F401
 
-__all__ = ["Agent", "run_interactive", "Model", "OpenAIModel"]
+__all__ = ["Agent", "run_interactive", "Model", "OpenAIModel", "PygentError", "APIError"]

{pygent-0.1.10 → pygent-0.1.11}/pygent/agent.py

@@ -10,6 +10,7 @@ from typing import Any, Dict, List
 
 from rich.console import Console
 from rich.panel import Panel
+from rich.markdown import Markdown
 
 from .runtime import Runtime
 from .tools import TOOL_SCHEMAS, execute_tool
@@ -19,6 +20,10 @@ DEFAULT_MODEL = os.getenv("PYGENT_MODEL", "gpt-4.1-mini")
 SYSTEM_MSG = (
     "You are Pygent, a sandboxed coding assistant.\n"
     "Respond with JSON when you need to use a tool."
+    "If you need to stop, call the `stop` tool.\n"
+    "You can use the following tools:\n"
+    f"{json.dumps(TOOL_SCHEMAS, indent=2)}\n"
+    "You can also use the `continue` tool to continue the conversation.\n"
 )
 
 console = Console()
@@ -46,7 +51,8 @@ class Agent:
                 self.history.append({"role": "tool", "content": output, "tool_call_id": call.id})
                 console.print(Panel(output, title=f"tool:{call.function.name}"))
         else:
-            console.print(assistant_msg.content)
+            markdown_response = Markdown(assistant_msg.content)
+            console.print(Panel(markdown_response, title="Resposta do Agente", title_align="left", border_style="cyan"))
         return assistant_msg
 
     def run_until_stop(self, user_msg: str, max_steps: int = 10) -> None:
@@ -56,7 +62,7 @@ class Agent:
         for _ in range(max_steps):
             assistant_msg = self.step(msg)
             calls = assistant_msg.tool_calls or []
-            if any(c.function.name == "stop" for c in calls):
+            if any(c.function.name in ("stop", "continue") for c in calls):
                 break
             msg = "continue"
 
@@ -66,9 +72,9 @@ def run_interactive(use_docker: bool | None = None) -> None:  # pragma: no cover
     console.print("[bold green]Pygent[/] iniciado. (digite /exit para sair)")
     try:
         while True:
-            user_msg = console.input("[cyan]vc> [/]" )
+            user_msg = console.input("[cyan]user> [/]" )
             if user_msg.strip() in {"/exit", "quit", "q"}:
                 break
-            agent.step(user_msg)
+            agent.run_until_stop(user_msg)
     finally:
         agent.runtime.cleanup()

pygent-0.1.11/pygent/errors.py

@@ -0,0 +1,6 @@
+class PygentError(Exception):
+    """Base error for the Pygent package."""
+
+
+class APIError(PygentError):
+    """Raised when the OpenAI API call fails."""

{pygent-0.1.10 → pygent-0.1.11}/pygent/models.py

@@ -10,6 +10,7 @@ except ModuleNotFoundError:  # pragma: no cover - fallback to bundled client
     from . import openai_compat as openai
 
 from .openai_compat import Message
+from .errors import APIError
 
 
 class Model(Protocol):
@@ -24,10 +25,13 @@ class OpenAIModel:
     """Default model using the OpenAI-compatible API."""
 
     def chat(self, messages: List[Dict[str, Any]], model: str, tools: Any) -> Message:
-        resp = openai.chat.completions.create(
-            model=model,
-            messages=messages,
-            tools=tools,
-            tool_choice="auto",
-        )
-        return resp.choices[0].message
+        try:
+            resp = openai.chat.completions.create(
+                model=model,
+                messages=messages,
+                tools=tools,
+                tool_choice="auto",
+            )
+            return resp.choices[0].message
+        except Exception as exc:
+            raise APIError(str(exc)) from exc

{pygent-0.1.10 → pygent-0.1.11}/pygent/openai_compat.py

@@ -2,7 +2,9 @@ import os
 import json
 from dataclasses import dataclass
 from typing import Any, Dict, List
-from urllib import request
+from urllib import request, error
+
+from .errors import APIError
 
 OPENAI_BASE_URL = os.getenv("OPENAI_BASE_URL", "https://api.openai.com/v1")
 OPENAI_API_KEY = os.getenv("OPENAI_API_KEY", "")
@@ -39,8 +41,15 @@ def _post(path: str, payload: Dict[str, Any]) -> Dict[str, Any]:
     if OPENAI_API_KEY:
         headers["Authorization"] = f"Bearer {OPENAI_API_KEY}"
     req = request.Request(f"{OPENAI_BASE_URL}{path}", data=data, headers=headers)
-    with request.urlopen(req) as resp:
-        return json.loads(resp.read().decode())
+    try:
+        with request.urlopen(req) as resp:
+            return json.loads(resp.read().decode())
+    except error.HTTPError as exc:  # pragma: no cover - network dependent
+        raise APIError(f"HTTP error {exc.code}: {exc.reason}") from exc
+    except error.URLError as exc:  # pragma: no cover - network dependent
+        raise APIError(f"Connection error: {exc.reason}") from exc
+    except Exception as exc:  # pragma: no cover - fallback
+        raise APIError(str(exc)) from exc
 
 
 class _ChatCompletions:

{pygent-0.1.10 → pygent-0.1.11}/pygent/runtime.py

@@ -54,29 +54,37 @@ class Runtime:
         caller can display what was run.
         """
         if self._use_docker and self.container is not None:
-            res = self.container.exec_run(
+            try:
+                res = self.container.exec_run(
+                    cmd,
+                    workdir="/workspace",
+                    demux=True,
+                    tty=False,
+                    stdin=False,
+                    timeout=timeout,
+                )
+                stdout, stderr = (
+                    res.output if isinstance(res.output, tuple) else (res.output, b"")
+                )
+                output = (stdout or b"").decode() + (stderr or b"").decode()
+                return f"$ {cmd}\n{output}"
+            except Exception as exc:
+                return f"$ {cmd}\n[error] {exc}"
+        try:
+            proc = subprocess.run(
                 cmd,
-                workdir="/workspace",
-                demux=True,
-                tty=False,
-                stdin=False,
+                shell=True,
+                cwd=self.base_dir,
+                capture_output=True,
+                text=True,
+                stdin=subprocess.DEVNULL,
                 timeout=timeout,
             )
-            stdout, stderr = (
-                res.output if isinstance(res.output, tuple) else (res.output, b"")
-            )
-            output = (stdout or b"").decode() + (stderr or b"").decode()
-            return f"$ {cmd}\n{output}"
-        proc = subprocess.run(
-            cmd,
-            shell=True,
-            cwd=self.base_dir,
-            capture_output=True,
-            text=True,
-            stdin=subprocess.DEVNULL,
-            timeout=timeout,
-        )
-        return f"$ {cmd}\n{proc.stdout + proc.stderr}"
+            return f"$ {cmd}\n{proc.stdout + proc.stderr}"
+        except subprocess.TimeoutExpired:
+            return f"$ {cmd}\n[timeout after {timeout}s]"
+        except Exception as exc:
+            return f"$ {cmd}\n[error] {exc}"
 
     def write_file(self, path: Union[str, Path], content: str) -> str:
         p = self.base_dir / path

{pygent-0.1.10 → pygent-0.1.11}/pygent/tools.py

@@ -43,6 +43,14 @@ TOOL_SCHEMAS = [
             "parameters": {"type": "object", "properties": {}},
         },
     },
+    {
+        "type": "function",
+        "function": {
+            "name": "continue",
+            "description": "Continue the conversation.",
+            "parameters": {"type": "object", "properties": {}},
+        },
+    },
 ]
 
 # --------------- dispatcher ---------------
@@ -57,4 +65,6 @@ def execute_tool(call: Any, rt: Runtime) -> str:  # pragma: no cover, Any→open
         return rt.write_file(**args)
     if name == "stop":
         return "Stopping."
+    if name == "continue":
+        return "Continuing the conversation."
     return f"⚠️ unknown tool {name}"

{pygent-0.1.10 → pygent-0.1.11}/pygent.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pygent
-Version: 0.1.10
+Version: 0.1.11
 Summary: Pygent is a minimalist coding assistant that runs commands in a Docker container when available and falls back to local execution. See https://marianochaves.github.io/pygent for documentation and https://github.com/marianochaves/pygent for the source code.
 Author-email: Mariano Chaves <mchaves.software@gmail.com>
 Project-URL: Documentation, https://marianochaves.github.io/pygent

{pygent-0.1.10 → pygent-0.1.11}/pygent.egg-info/SOURCES.txt

@@ -5,6 +5,7 @@ pygent/__init__.py
 pygent/__main__.py
 pygent/agent.py
 pygent/cli.py
+pygent/errors.py
 pygent/models.py
 pygent/openai_compat.py
 pygent/py.typed
@@ -19,6 +20,7 @@ pygent.egg-info/requires.txt
 pygent.egg-info/top_level.txt
 tests/test_autorun.py
 tests/test_custom_model.py
+tests/test_error_handling.py
 tests/test_runtime.py
 tests/test_tools.py
 tests/test_version.py

{pygent-0.1.10 → pygent-0.1.11}/pyproject.toml

@@ -1,11 +1,11 @@
 [project]
 name = "pygent"
-version = "0.1.10"
+version = "0.1.11"
 description = "Pygent is a minimalist coding assistant that runs commands in a Docker container when available and falls back to local execution. See https://marianochaves.github.io/pygent for documentation and https://github.com/marianochaves/pygent for the source code."
 authors = [ { name = "Mariano Chaves", email = "mchaves.software@gmail.com" } ]
 requires-python = ">=3.9"
 dependencies = [
-    "rich>=13.7.0",      # colored output (optional)
+    "rich>=13.7.0",
     "openai>=1.0.0",
 ]
 

{pygent-0.1.10 → pygent-0.1.11}/tests/test_autorun.py

@@ -4,14 +4,25 @@ import types
 
 sys.modules.setdefault('openai', types.ModuleType('openai'))
 sys.modules.setdefault('docker', types.ModuleType('docker'))
+
+# --- Início da correção ---
 rich_mod = types.ModuleType('rich')
 console_mod = types.ModuleType('console')
-console_mod.Console = lambda *a, **k: type('C', (), {'print': lambda *a, **k: None})()
 panel_mod = types.ModuleType('panel')
+markdown_mod = types.ModuleType('markdown') # Novo mock para rich.markdown
+syntax_mod = types.ModuleType('syntax')     # Novo mock para rich.syntax
+
+console_mod.Console = lambda *a, **k: type('C', (), {'print': lambda *a, **k: None})()
 panel_mod.Panel = lambda *a, **k: None
+markdown_mod.Markdown = lambda *a, **k: None # Mock para rich.markdown.Markdown
+syntax_mod.Syntax = lambda *a, **k: None     # Mock para rich.syntax.Syntax
+
 sys.modules.setdefault('rich', rich_mod)
 sys.modules.setdefault('rich.console', console_mod)
 sys.modules.setdefault('rich.panel', panel_mod)
+sys.modules.setdefault('rich.markdown', markdown_mod) # Adicionado
+sys.modules.setdefault('rich.syntax', syntax_mod)     # Adicionado
+# --- Fim da correção ---
 
 sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..')))
 
@@ -67,3 +78,4 @@ def test_run_until_stop():
                for msg in ag.history
                if hasattr(msg, 'tool_calls') and msg.tool_calls
                for call in msg.tool_calls)
+

{pygent-0.1.10 → pygent-0.1.11}/tests/test_custom_model.py

@@ -4,14 +4,25 @@ import types
 
 sys.modules.setdefault('openai', types.ModuleType('openai'))
 sys.modules.setdefault('docker', types.ModuleType('docker'))
+
+# --- Início da correção ---
 rich_mod = types.ModuleType('rich')
 console_mod = types.ModuleType('console')
-console_mod.Console = lambda *a, **k: type('C', (), {'print': lambda *a, **k: None})()
 panel_mod = types.ModuleType('panel')
+markdown_mod = types.ModuleType('markdown') # Novo mock para rich.markdown
+syntax_mod = types.ModuleType('syntax')     # Novo mock para rich.syntax
+
+console_mod.Console = lambda *a, **k: type('C', (), {'print': lambda *a, **k: None})()
 panel_mod.Panel = lambda *a, **k: None
+markdown_mod.Markdown = lambda *a, **k: None # Mock para rich.markdown.Markdown
+syntax_mod.Syntax = lambda *a, **k: None     # Mock para rich.syntax.Syntax
+
 sys.modules.setdefault('rich', rich_mod)
 sys.modules.setdefault('rich.console', console_mod)
 sys.modules.setdefault('rich.panel', panel_mod)
+sys.modules.setdefault('rich.markdown', markdown_mod) # Adicionado
+sys.modules.setdefault('rich.syntax', syntax_mod)     # Adicionado
+# --- Fim da correção ---
 
 sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..')))
 
@@ -26,3 +37,4 @@ def test_custom_model():
     ag = Agent(model=DummyModel())
     ag.step('hi')
     assert ag.history[-1].content == 'ok'
+

pygent-0.1.11/tests/test_error_handling.py

@@ -0,0 +1,41 @@
+import os
+import sys
+import types
+import pytest
+
+# Stub external dependencies
+sys.modules.setdefault('docker', types.ModuleType('docker'))
+rich_mod = types.ModuleType('rich')
+console_mod = types.ModuleType('console')
+console_mod.Console = lambda *a, **k: None
+panel_mod = types.ModuleType('panel')
+panel_mod.Panel = lambda *a, **k: None
+sys.modules.setdefault('rich', rich_mod)
+sys.modules.setdefault('rich.console', console_mod)
+sys.modules.setdefault('rich.panel', panel_mod)
+
+
+def test_openai_model_error():
+    openai_mod = types.ModuleType('openai')
+    class ChatComp:
+        def create(*a, **k):
+            raise RuntimeError('boom')
+    chat_mod = types.ModuleType('chat')
+    chat_mod.completions = ChatComp()
+    openai_mod.chat = chat_mod
+    sys.modules['openai'] = openai_mod
+
+    from pygent.models import OpenAIModel
+    from pygent.errors import APIError
+
+    model = OpenAIModel()
+    with pytest.raises(APIError):
+        model.chat([], 'gpt', None)
+
+
+def test_bash_timeout():
+    from pygent.runtime import Runtime
+    rt = Runtime(use_docker=False)
+    out = rt.bash('sleep 5', timeout=0)
+    rt.cleanup()
+    assert '[timeout' in out

pygent-0.1.11/tests/test_runtime.py

@@ -0,0 +1,41 @@
+import os
+import sys
+import types
+
+# Stub external dependencies
+sys.modules.setdefault('openai', types.ModuleType('openai'))
+sys.modules.setdefault('docker', types.ModuleType('docker'))
+
+# --- Início da correção ---
+# Criação de módulos mock para rich e seus submódulos
+rich_mod = types.ModuleType('rich')
+console_mod = types.ModuleType('console')
+panel_mod = types.ModuleType('panel')
+markdown_mod = types.ModuleType('markdown') # Novo mock para rich.markdown
+syntax_mod = types.ModuleType('syntax')     # Novo mock para rich.syntax
+
+# Mocks para as classes e funções usadas de rich
+console_mod.Console = lambda *a, **k: type('C', (), {'print': lambda *a, **k: None})()
+panel_mod.Panel = lambda *a, **k: None
+markdown_mod.Markdown = lambda *a, **k: None # Mock para rich.markdown.Markdown
+syntax_mod.Syntax = lambda *a, **k: None     # Mock para rich.syntax.Syntax
+
+# Definindo os módulos mock no sys.modules
+sys.modules.setdefault('rich', rich_mod)
+sys.modules.setdefault('rich.console', console_mod)
+sys.modules.setdefault('rich.panel', panel_mod)
+sys.modules.setdefault('rich.markdown', markdown_mod) # Adicionado
+sys.modules.setdefault('rich.syntax', syntax_mod)     # Adicionado
+# --- Fim da correção ---
+
+sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..')))
+
+from pygent.runtime import Runtime
+
+
+def test_bash_includes_command():
+    rt = Runtime(use_docker=False)
+    out = rt.bash('echo hi')
+    rt.cleanup()
+    assert out.startswith('$ echo hi\n')
+

{pygent-0.1.10 → pygent-0.1.11}/tests/test_tools.py

@@ -4,14 +4,25 @@ import types
 
 sys.modules.setdefault('openai', types.ModuleType('openai'))
 sys.modules.setdefault('docker', types.ModuleType('docker'))
+
+# --- Início da correção ---
 rich_mod = types.ModuleType('rich')
 console_mod = types.ModuleType('console')
-console_mod.Console = lambda *a, **k: None
 panel_mod = types.ModuleType('panel')
+markdown_mod = types.ModuleType('markdown') # Novo mock para rich.markdown
+syntax_mod = types.ModuleType('syntax')     # Novo mock para rich.syntax
+
+console_mod.Console = lambda *a, **k: None
 panel_mod.Panel = lambda *a, **k: None
+markdown_mod.Markdown = lambda *a, **k: None # Mock para rich.markdown.Markdown
+syntax_mod.Syntax = lambda *a, **k: None     # Mock para rich.syntax.Syntax
+
 sys.modules.setdefault('rich', rich_mod)
 sys.modules.setdefault('rich.console', console_mod)
 sys.modules.setdefault('rich.panel', panel_mod)
+sys.modules.setdefault('rich.markdown', markdown_mod) # Adicionado
+sys.modules.setdefault('rich.syntax', syntax_mod)     # Adicionado
+# --- Fim da correção ---
 
 sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..')))
 
@@ -41,3 +52,4 @@ def test_execute_write_file():
         })
     })()
     assert tools.execute_tool(call, DummyRuntime()) == 'wrote foo.txt'
+

{pygent-0.1.10 → pygent-0.1.11}/tests/test_version.py

@@ -5,15 +5,26 @@ import types
 # Stub external dependencies so the package can be imported without network
 sys.modules.setdefault('openai', types.ModuleType('openai'))
 sys.modules.setdefault('docker', types.ModuleType('docker'))
+
+# --- Início da correção ---
 rich_mod = types.ModuleType('rich')
 console_mod = types.ModuleType('console')
-console_mod.Console = lambda *a, **k: None
 panel_mod = types.ModuleType('panel')
+markdown_mod = types.ModuleType('markdown') # Novo mock para rich.markdown
+syntax_mod = types.ModuleType('syntax')     # Novo mock para rich.syntax
+
+console_mod.Console = lambda *a, **k: None
 panel_mod.Panel = lambda *a, **k: None
+markdown_mod.Markdown = lambda *a, **k: None # Mock para rich.markdown.Markdown
+syntax_mod.Syntax = lambda *a, **k: None     # Mock para rich.syntax.Syntax
+
 sys.modules.setdefault('rich', rich_mod)
 sys.modules.setdefault('rich.console', console_mod)
 sys.modules.setdefault('rich.panel', panel_mod)
+sys.modules.setdefault('rich.markdown', markdown_mod)
+sys.modules.setdefault('rich.syntax', syntax_mod)
 
 def test_version_string():
     pkg = importlib.import_module('pygent')
     assert isinstance(pkg.__version__, str)
+

pygent-0.1.10/tests/test_runtime.py

@@ -1,25 +0,0 @@
-import os
-import sys
-import types
-
-sys.modules.setdefault('openai', types.ModuleType('openai'))
-sys.modules.setdefault('docker', types.ModuleType('docker'))
-rich_mod = types.ModuleType('rich')
-console_mod = types.ModuleType('console')
-console_mod.Console = lambda *a, **k: None
-panel_mod = types.ModuleType('panel')
-panel_mod.Panel = lambda *a, **k: None
-sys.modules.setdefault('rich', rich_mod)
-sys.modules.setdefault('rich.console', console_mod)
-sys.modules.setdefault('rich.panel', panel_mod)
-
-sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..')))
-
-from pygent.runtime import Runtime
-
-
-def test_bash_includes_command():
-    rt = Runtime(use_docker=False)
-    out = rt.bash('echo hi')
-    rt.cleanup()
-    assert out.startswith('$ echo hi\n')