patchpal 0.4.2__tar.gz → 0.4.4__tar.gz

{patchpal-0.4.2/patchpal.egg-info → patchpal-0.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: patchpal
-Version: 0.4.2
+Version: 0.4.4
 Summary: A lean Claude Code clone in pure  Python
 Author: PatchPal Contributors
 License-Expression: Apache-2.0

{patchpal-0.4.2 → patchpal-0.4.4}/patchpal/__init__.py

@@ -1,6 +1,6 @@
 """PatchPal - An open-source Claude Code clone implemented purely in Python."""
 
-__version__ = "0.4.2"
+__version__ = "0.4.4"
 
 from patchpal.agent import create_agent
 from patchpal.tools import (

{patchpal-0.4.2 → patchpal-0.4.4}/patchpal/agent.py

@@ -714,8 +714,8 @@ def _supports_prompt_caching(model_id: str) -> bool:
     # Anthropic models support caching (direct API or via Bedrock)
     if "anthropic" in model_id.lower() or "claude" in model_id.lower():
         return True
-    # Bedrock with Anthropic models
-    if model_id.startswith("bedrock/") and "anthropic" in model_id.lower():
+    # Bedrock Nova models support caching
+    if model_id.startswith("bedrock/") and "amazon.nova" in model_id.lower():
         return True
     return False
 
@@ -738,11 +738,13 @@ def _apply_prompt_caching(messages: List[Dict[str, Any]], model_id: str) -> List
         return messages
 
     # Determine cache marker format based on provider
-    if model_id.startswith("bedrock/"):
-        # Bedrock uses cachePoint
-        cache_marker = {"cachePoint": {"type": "ephemeral"}}
+    # Anthropic models (direct or via Bedrock) use cache_control
+    # Other Bedrock models (Nova, etc.) use cachePoint
+    if model_id.startswith("bedrock/") and "anthropic" not in model_id.lower():
+        # Non-Anthropic Bedrock models (Nova, etc.) use cachePoint
+        cache_marker = {"cachePoint": {"type": "default"}}
     else:
-        # Direct Anthropic API uses cache_control
+        # Anthropic models (direct or via Bedrock) use cache_control
         cache_marker = {"cache_control": {"type": "ephemeral"}}
 
     # Find system messages (usually at the start)
@@ -756,13 +758,52 @@ def _apply_prompt_caching(messages: List[Dict[str, Any]], model_id: str) -> List
 
     # Apply caching to system messages (first 2)
     for idx in system_messages[:2]:
-        if "cache_control" not in messages[idx] and "cachePoint" not in messages[idx]:
-            messages[idx] = {**messages[idx], **cache_marker}
+        msg = messages[idx]
+        # Skip if already has cache marker at content block level
+        if isinstance(msg.get("content"), list):
+            # Already structured - check if any block has cache_control/cachePoint
+            has_cache = any(
+                "cache_control" in block or "cachePoint" in block
+                for block in msg["content"]
+                if isinstance(block, dict)
+            )
+            if not has_cache and msg["content"]:
+                # Add cache marker to the last content block
+                last_block = msg["content"][-1]
+                if isinstance(last_block, dict):
+                    last_block.update(cache_marker)
+        else:
+            # Convert simple string content to structured format with cache marker
+            content_text = msg.get("content", "")
+            messages[idx] = {
+                **msg,
+                "content": [{"type": "text", "text": content_text, **cache_marker}],
+            }
 
     # Apply caching to last 2 messages
     for idx in last_two_indices:
-        if "cache_control" not in messages[idx] and "cachePoint" not in messages[idx]:
-            messages[idx] = {**messages[idx], **cache_marker}
+        msg = messages[idx]
+        # Skip if already has cache marker at content block level
+        if isinstance(msg.get("content"), list):
+            # Already structured - check if any block has cache_control/cachePoint
+            has_cache = any(
+                "cache_control" in block or "cachePoint" in block
+                for block in msg["content"]
+                if isinstance(block, dict)
+            )
+            if not has_cache and msg["content"]:
+                # Add cache marker to the last content block
+                last_block = msg["content"][-1]
+                if isinstance(last_block, dict):
+                    last_block.update(cache_marker)
+        else:
+            # Convert simple string content to structured format with cache marker
+            content_text = msg.get("content", "")
+            if content_text:  # Only convert non-empty content
+                messages[idx] = {
+                    **msg,
+                    "content": [{"type": "text", "text": content_text, **cache_marker}],
+                }
 
     return messages
 

{patchpal-0.4.2 → patchpal-0.4.4/patchpal.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: patchpal
-Version: 0.4.2
+Version: 0.4.4
 Summary: A lean Claude Code clone in pure  Python
 Author: PatchPal Contributors
 License-Expression: Apache-2.0

{patchpal-0.4.2 → patchpal-0.4.4}/tests/test_agent.py

@@ -422,7 +422,11 @@ def test_prompt_caching_detection():
     assert _supports_prompt_caching("bedrock/anthropic.claude-sonnet-4-5-v1:0")
     assert _supports_prompt_caching("bedrock/anthropic.claude-v2")
 
-    # Non-Anthropic models should not support caching
+    # Bedrock Nova models should support caching
+    assert _supports_prompt_caching("bedrock/amazon.nova-pro-v1:0")
+    assert _supports_prompt_caching("bedrock/amazon.nova-lite-v1:0")
+
+    # Non-Anthropic/Nova models should not support caching
     assert not _supports_prompt_caching("openai/gpt-4o")
     assert not _supports_prompt_caching("ollama_chat/llama3.1")
 
@@ -441,17 +445,21 @@ def test_prompt_caching_application_anthropic():
     # Test with direct Anthropic API
     cached_messages = _apply_prompt_caching(messages.copy(), "anthropic/claude-sonnet-4-5")
 
-    # System message should have cache_control
-    assert "cache_control" in cached_messages[0]
-    assert cached_messages[0]["cache_control"] == {"type": "ephemeral"}
+    # System message should have cache_control inside content block
+    assert isinstance(cached_messages[0]["content"], list)
+    assert cached_messages[0]["content"][0]["type"] == "text"
+    assert "cache_control" in cached_messages[0]["content"][0]
+    assert cached_messages[0]["content"][0]["cache_control"] == {"type": "ephemeral"}
 
-    # Last 2 messages should have cache_control
-    assert "cache_control" in cached_messages[-1]  # Last user message
-    assert "cache_control" in cached_messages[-2]  # Last assistant message
+    # Last 2 messages should have cache_control inside content blocks
+    assert isinstance(cached_messages[-1]["content"], list)  # Last user message
+    assert "cache_control" in cached_messages[-1]["content"][0]
+    assert isinstance(cached_messages[-2]["content"], list)  # Last assistant message
+    assert "cache_control" in cached_messages[-2]["content"][0]
 
 
-def test_prompt_caching_application_bedrock():
-    """Test that prompt caching markers use correct format for Bedrock."""
+def test_prompt_caching_application_bedrock_anthropic():
+    """Test that prompt caching markers use cache_control for Bedrock Anthropic models."""
     from patchpal.agent import _apply_prompt_caching
 
     messages = [
@@ -461,18 +469,49 @@ def test_prompt_caching_application_bedrock():
         {"role": "user", "content": "How are you?"},
     ]
 
-    # Test with Bedrock
+    # Test with Bedrock Anthropic model - should use cache_control (same as direct Anthropic)
     cached_messages = _apply_prompt_caching(
         messages.copy(), "bedrock/anthropic.claude-sonnet-4-5-v1:0"
     )
 
-    # System message should have cachePoint (Bedrock format)
-    assert "cachePoint" in cached_messages[0]
-    assert cached_messages[0]["cachePoint"] == {"type": "ephemeral"}
+    # System message should have cache_control inside content block (NOT cachePoint)
+    assert isinstance(cached_messages[0]["content"], list)
+    assert cached_messages[0]["content"][0]["type"] == "text"
+    assert "cache_control" in cached_messages[0]["content"][0]
+    assert cached_messages[0]["content"][0]["cache_control"] == {"type": "ephemeral"}
+
+    # Last 2 messages should have cache_control inside content blocks
+    assert isinstance(cached_messages[-1]["content"], list)
+    assert "cache_control" in cached_messages[-1]["content"][0]
+    assert isinstance(cached_messages[-2]["content"], list)
+    assert "cache_control" in cached_messages[-2]["content"][0]
 
-    # Last 2 messages should have cachePoint
-    assert "cachePoint" in cached_messages[-1]
-    assert "cachePoint" in cached_messages[-2]
+
+def test_prompt_caching_application_bedrock_nova():
+    """Test that prompt caching markers use cachePoint for Bedrock Nova models."""
+    from patchpal.agent import _apply_prompt_caching
+
+    messages = [
+        {"role": "system", "content": "You are a helpful assistant."},
+        {"role": "user", "content": "Hello"},
+        {"role": "assistant", "content": "Hi there!"},
+        {"role": "user", "content": "How are you?"},
+    ]
+
+    # Test with Bedrock Nova model - should use cachePoint
+    cached_messages = _apply_prompt_caching(messages.copy(), "bedrock/amazon.nova-pro-v1:0")
+
+    # System message should have cachePoint inside content block
+    assert isinstance(cached_messages[0]["content"], list)
+    assert cached_messages[0]["content"][0]["type"] == "text"
+    assert "cachePoint" in cached_messages[0]["content"][0]
+    assert cached_messages[0]["content"][0]["cachePoint"] == {"type": "default"}
+
+    # Last 2 messages should have cachePoint inside content blocks
+    assert isinstance(cached_messages[-1]["content"], list)
+    assert "cachePoint" in cached_messages[-1]["content"][0]
+    assert isinstance(cached_messages[-2]["content"], list)
+    assert "cachePoint" in cached_messages[-2]["content"][0]
 
 
 def test_prompt_caching_no_modification_for_unsupported():
@@ -506,5 +545,10 @@ def test_prompt_caching_idempotent():
     cached_once = _apply_prompt_caching(messages.copy(), "anthropic/claude-sonnet-4-5")
     cached_twice = _apply_prompt_caching(cached_once.copy(), "anthropic/claude-sonnet-4-5")
 
-    # Should be the same after second application
-    assert cached_once == cached_twice
+    # Should have the same structure after second application
+    assert cached_once[0]["content"][0] == cached_twice[0]["content"][0]
+    assert cached_once[1]["content"][0] == cached_twice[1]["content"][0]
+
+    # Should only have one cache_control marker per message
+    assert len([k for k in cached_twice[0]["content"][0].keys() if "cache" in k]) == 1
+    assert len([k for k in cached_twice[1]["content"][0].keys() if "cache" in k]) == 1