ollaagent 0.1.2__tar.gz → 0.1.4__tar.gz

ollaagent-0.1.4/CHANGELOG.md

@@ -0,0 +1,62 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+Format: [Keep a Changelog](https://keepachangelog.com/en/1.1.0/)
+Versioning: [Semantic Versioning](https://semver.org/spec/v2.0.0.html)
+
+---
+
+## [0.1.4] - 2026-03-22
+
+### Added
+- `--version` / `-v` 플래그 지원 (`ollaagent --version`)
+- `--model` / `-m` CLI 인수 지원 (config 기본값 오버라이드)
+- `--host` CLI 인수 지원 (env/config보다 우선)
+
+---
+
+## [0.1.3] - 2026-03-22
+
+### Fixed
+- `tool_calls: null`, `message: null`, `content: null`, `thinking: null` 등 실제 API 응답의 null 필드로 인한 `TypeError` 방어 처리 (`agent.py`)
+- `entries: null`, `messages: null` JSON 필드로 인한 memory 로드 오류 방어 처리 (`memory.py`)
+
+### Tests
+- `_make_chunk` 헬퍼에 `null_*` 플래그 추가 — 실제 API null 응답 재현 가능
+- null API 응답 엣지 케이스 5종 추가 (138 → 143 tests)
+
+---
+
+## [0.1.2] - 2026-03-22
+
+### Fixed
+- `_accumulate_tool_calls`에서 `tool_calls` 키가 존재하지만 값이 `null`인 경우 `TypeError` 발생 수정
+  - `msg.get("tool_calls", [])` → `msg.get("tool_calls") or []`
+
+---
+
+## [0.1.1] - 2026-03-22
+
+### Added
+- `AgentConfig`에 `ollama_host`, `cf_access_client_id`, `cf_access_client_secret` 필드 추가
+- `~/.agents/config.yaml`만으로 `.env` 없이 원격 ollama 서버 접속 가능
+- `.env.sample` 생성 (용도별 주석 포함)
+
+### Fixed
+- `OLLAMA_HOST` 하드코딩 제거 → `os.getenv("OLLAMA_HOST") or agent_config.ollama_host` 우선순위 적용
+- README / README_ko 환경변수명 오류 수정: `CF_CLIENT_ID` → `CF_ACCESS_CLIENT_ID`
+
+---
+
+## [0.1.0] - 2026-03-22
+
+### Added
+- 최초 릴리즈
+- 에이전트 루프 (`run_python`, `run_bash`, `read_file`, `write_file`, `list_files`)
+- JSON 기반 영구 메모리 (`/memory add/list/search/clear`)
+- 플랜 모드 (`/plan`)
+- 병렬 서브에이전트 (`/subagent`, `multiprocessing.Pool`)
+- 권한 제어 (`allow/deny` 패턴)
+- Cloudflare Access 헤더 지원
+- YAML 계층 설정 (`global < project < local`)

{ollaagent-0.1.2 → ollaagent-0.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ollaagent
-Version: 0.1.2
+Version: 0.1.4
 Summary: Local LLM agent powered by ollama — memory, plan mode, subagents
 License-File: LICENSE
 Requires-Python: >=3.11

{ollaagent-0.1.2 → ollaagent-0.1.4}/ollaAgent/agent.py

@@ -1,3 +1,4 @@
+import argparse
 import glob as glob_module
 import json
 import os
@@ -8,6 +9,8 @@ from functools import partial
 from pathlib import Path
 from typing import Any, NamedTuple
 
+__version__ = "0.1.4"
+
 from dotenv import load_dotenv
 from ollama import Client
 from rich.console import Console
@@ -358,7 +361,7 @@ def _accumulate_tool_calls(msg: dict[str, Any], accumulated: dict[int, dict]) ->
         idx = tc.get("index", len(accumulated))
         if idx not in accumulated:
             accumulated[idx] = {"name": "", "arguments": ""}
-        fn = tc.get("function", {})
+        fn = tc.get("function") or {}
         accumulated[idx]["name"] += fn.get("name", "")
         raw_args = fn.get("arguments", "")
         if isinstance(raw_args, dict):
@@ -403,11 +406,11 @@ def _stream_response(stream: Any) -> tuple[str, str, dict[int, dict], int]:
 
     with Live(console=console, refresh_per_second=10) as live:
         for chunk in stream:
-            msg = chunk.get("message", {})
-            thinking = msg.get("thinking", "")
+            msg = chunk.get("message") or {}
+            thinking = msg.get("thinking") or ""
             if thinking:
                 thinking_content += thinking
-            content = msg.get("content", "")
+            content = msg.get("content") or ""
             if content:
                 assistant_content += content
                 live.update(Markdown(assistant_content))
@@ -638,14 +641,27 @@ def _auto_save_session(messages: list[dict]) -> None:
 
 def main() -> None:
     """대화형 agentic loop 진입점."""
+    parser = argparse.ArgumentParser(prog="ollaagent", add_help=False)
+    parser.add_argument("--version", "-v", action="store_true", help="버전 출력")
+    parser.add_argument("--model", "-m", type=str, default=None)
+    parser.add_argument("--host", type=str, default=None)
+    args, _ = parser.parse_known_args()
+
+    if args.version:
+        print(f"ollaagent {__version__}")
+        return
+
     agent_config = load_config()
     console.print(
         f"[dim][Config] model={agent_config.model} | "
         f"mode={agent_config.permission_mode.value} | "
         f"threshold={agent_config.token_threshold:,}[/]"
     )
+    if args.model:
+        agent_config.model = args.model
+
     conn = ConnectionInfo(
-        host=os.getenv("OLLAMA_HOST") or agent_config.ollama_host,
+        host=args.host or os.getenv("OLLAMA_HOST") or agent_config.ollama_host,
         cf_client_id=os.getenv("CF_ACCESS_CLIENT_ID")
         or agent_config.cf_access_client_id,
         cf_client_secret=os.getenv("CF_ACCESS_CLIENT_SECRET")

{ollaagent-0.1.2 → ollaagent-0.1.4}/ollaAgent/memory.py

@@ -49,7 +49,7 @@ class SessionMemory:
         try:
             with self._path.open(encoding="utf-8") as fh:
                 data = json.load(fh)
-            self._entries = [MemoryEntry(**e) for e in data.get("entries", [])]
+            self._entries = [MemoryEntry(**e) for e in (data.get("entries") or [])]
         except (json.JSONDecodeError, KeyError, ValueError):
             self._entries = []
 
@@ -125,6 +125,6 @@ def load_session(path: Path) -> list[dict]:
     try:
         with path.open(encoding="utf-8") as fh:
             data = json.load(fh)
-        return data.get("messages", [])
+        return data.get("messages") or []
     except (json.JSONDecodeError, KeyError):
         return []

{ollaagent-0.1.2 → ollaagent-0.1.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ollaagent"
-version = "0.1.2"
+version = "0.1.4"
 description = "Local LLM agent powered by ollama — memory, plan mode, subagents"
 readme = "README.md"
 requires-python = ">=3.11"

{ollaagent-0.1.2 → ollaagent-0.1.4}/tests/test_agent.py

@@ -1,10 +1,12 @@
 from unittest.mock import MagicMock, patch
 
-import ollaAgent.agent as agent
 import pytest
+
+import ollaAgent.agent as agent
 from ollaAgent.agent import (_is_model_available, _parse_subagent_input,
-                        build_dispatch, execute_tool, list_available_models,
-                        run_agentic_loop, trim_by_tokens, trim_messages)
+                             build_dispatch, execute_tool,
+                             list_available_models, run_agentic_loop,
+                             trim_by_tokens, trim_messages)
 from ollaAgent.permissions import PermissionConfig, PermissionMode
 
 _TEST_DISPATCH = build_dispatch(PermissionConfig(mode=PermissionMode.AUTO))
@@ -169,14 +171,28 @@ class TestTrimMessages:
 
 
 def _make_chunk(
-    content="", tool_calls=None, thinking="", done=False, prompt_eval_count=0
+    content="",
+    tool_calls=None,
+    thinking="",
+    done=False,
+    prompt_eval_count=0,
+    null_tool_calls=False,
+    null_message=False,
+    null_content=False,
+    null_thinking=False,
 ):
+    """테스트용 stream chunk 생성.
+
+    null_* 플래그: 키는 존재하지만 값이 null인 실제 API 응답 재현용.
+    """
+    if null_message:
+        return {"message": None}
     msg = {}
-    if content:
-        msg["content"] = content
-    if thinking:
-        msg["thinking"] = thinking
-    if tool_calls:
+    msg["content"] = None if null_content else (content or None)
+    msg["thinking"] = None if null_thinking else (thinking or None)
+    if null_tool_calls:
+        msg["tool_calls"] = None  # 실제 API: "tool_calls": null
+    elif tool_calls:
         msg["tool_calls"] = tool_calls
     chunk = {"message": msg}
     if done:
@@ -295,6 +311,42 @@ class TestAgenticLoop:
         assert "최종 답변입니다." in result
         assert "내부적으로 생각 중..." not in result
 
+    def test_null_tool_calls_in_stream_does_not_raise(self):
+        """실제 API가 tool_calls: null 반환 시 TypeError 없이 정상 처리"""
+        mock_client = MagicMock()
+        mock_client.chat.return_value = _make_stream(
+            _make_chunk(null_tool_calls=True),
+            _make_chunk(content="응답입니다."),
+        )
+
+        messages = [{"role": "user", "content": "안녕"}]
+        result = run_agentic_loop(messages, mock_client, _TEST_DISPATCH)
+        assert "응답입니다." in result
+
+    def test_null_message_in_stream_does_not_raise(self):
+        """실제 API가 message: null 반환 시 정상 처리"""
+        mock_client = MagicMock()
+        mock_client.chat.return_value = _make_stream(
+            _make_chunk(null_message=True),
+            _make_chunk(content="응답입니다."),
+        )
+
+        messages = [{"role": "user", "content": "안녕"}]
+        result = run_agentic_loop(messages, mock_client, _TEST_DISPATCH)
+        assert "응답입니다." in result
+
+    def test_null_content_and_thinking_in_stream_does_not_raise(self):
+        """content, thinking이 null인 chunk 정상 처리"""
+        mock_client = MagicMock()
+        mock_client.chat.return_value = _make_stream(
+            _make_chunk(null_content=True, null_thinking=True),
+            _make_chunk(content="정상 응답."),
+        )
+
+        messages = [{"role": "user", "content": "테스트"}]
+        result = run_agentic_loop(messages, mock_client, _TEST_DISPATCH)
+        assert "정상 응답." in result
+
 
 # ──────────────────────────────────────────
 # Unit Tests: write_file

{ollaagent-0.1.2 → ollaagent-0.1.4}/tests/test_memory.py

@@ -1,7 +1,9 @@
 import json
 
 import pytest
-from ollaAgent.memory import MemoryEntry, SessionMemory, load_session, save_session
+
+from ollaAgent.memory import (MemoryEntry, SessionMemory, load_session,
+                              save_session)
 
 # ──────────────────────────────────────────
 # Unit Tests: MemoryEntry
@@ -119,6 +121,13 @@ class TestSessionMemoryPersistence:
         mem = SessionMemory(path=path)
         assert mem.all() == []
 
+    def test_null_entries_key_gives_empty(self, tmp_path):
+        """JSON에 entries: null 포함 시 빈 리스트로 처리"""
+        path = tmp_path / "null_entries.json"
+        path.write_text(json.dumps({"entries": None}))
+        mem = SessionMemory(path=path)
+        assert mem.all() == []
+
 
 class TestSessionMemoryContextString:
 
@@ -174,6 +183,13 @@ class TestSaveLoadSession:
         result = load_session(path)
         assert result == []
 
+    def test_load_null_messages_key_returns_empty(self, tmp_path):
+        """JSON에 messages: null 포함 시 빈 리스트 반환"""
+        path = tmp_path / "null_messages.json"
+        path.write_text(json.dumps({"messages": None}))
+        result = load_session(path)
+        assert result == []
+
     def test_save_creates_parent_dirs(self, tmp_path):
         path = tmp_path / "a" / "b" / "c" / "sess.json"
         save_session([{"role": "user", "content": "x"}], path)

{ollaagent-0.1.2 → ollaagent-0.1.4}/uv.lock

@@ -187,7 +187,7 @@ wheels = [
 
 [[package]]
 name = "ollaagent"
-version = "0.1.1"
+version = "0.1.3"
 source = { editable = "." }
 dependencies = [
     { name = "ollama" },