SWE-agent takes a GitHub issue and tries to automatically fix it, using your LM of choice. It can also be employed for offensive cybersecurity or competitive coding challenges. [NeurIPS 2024]
Enh: support claude thinking blocks (#1239)
edend2cf5529cb27
diff --git a/sweagent/agent/agents.py b/sweagent/agent/agents.pyindex 45220045..4844aeb7 100644--- a/sweagent/agent/agents.py+++ b/sweagent/agent/agents.py@@ -722,6 +722,7 @@ class DefaultAgent(AbstractAgent):"agent": self.name,"tool_calls": step.tool_calls,"message_type": "action",+ "thinking_blocks": step.thinking_blocks,},)@@ -1042,6 +1043,7 @@ class DefaultAgent(AbstractAgent):step.output = output["message"]# todo: Can't I override the parser in __init__?step.thought, step.action = self.tools.parse_actions(output)+ step.thinking_blocks = output.get("thinking_blocks", [])if output.get("tool_calls") is not None:step.tool_call_ids = [call["id"] for call in output["tool_calls"]]step.tool_calls = output["tool_calls"]diff --git a/sweagent/agent/hooks/abstract.py b/sweagent/agent/hooks/abstract.pyindex 57da5ba1..3b049763 100644--- a/sweagent/agent/hooks/abstract.py+++ b/sweagent/agent/hooks/abstract.py@@ -116,6 +116,7 @@ class CombinedAgentHook(AbstractAgentHook):action: str = "",tool_calls: list[dict[str, str]] | None = None,tool_call_ids: list[str] | None = None,+ thinking_blocks: list[dict[str, str]] | None = None,):for hook in self.hooks:hook.on_query_message_added(diff --git a/sweagent/agent/models.py b/sweagent/agent/models.pyindex 97e505e6..3f8369c3 100644--- a/sweagent/agent/models.py+++ b/sweagent/agent/models.py@@ -685,6 +685,8 @@ class LiteLLMModel(AbstractModel):for message in messages_no_cache_control:if "cache_control" in message:del message["cache_control"]+ if "thinking_blocks" in message:+ del message["thinking_blocks"]input_tokens: int = litellm.utils.token_counter(messages=messages_no_cache_control,model=self.custom_tokenizer["identifier"] if self.custom_tokenizer is not None else self.config.name,@@ -732,7 +734,7 @@ class LiteLLMModel(AbstractModel):raiseself.logger.debug(f"Response: {response}")try:- cost = litellm.cost_calculator.completion_cost(response)+ cost = litellm.cost_calculator.completion_cost(response, model=self.config.name)except Exception as e:self.logger.debug(f"Error calculating cost: {e}, setting cost to 0.")if self.config.per_instance_cost_limit > 0 or self.config.total_cost_limit > 0:@@ -759,6 +761,11 @@ class LiteLLMModel(AbstractModel):if self.tools.use_function_calling:if response.choices[i].message.tool_calls: # type: ignoretool_calls = [call.to_dict() for call in response.choices[i].message.tool_calls] # type: ignore+ if (+ hasattr(response.choices[i].message, "thinking_blocks")+ and response.choices[i].message.thinking_blocks+ ): # type: ignore+ output_dict["thinking_blocks"] = response.choices[i].message.thinking_blocks # type: ignoreelse:tool_calls = []output_dict["tool_calls"] = tool_calls@@ -846,6 +853,8 @@ class LiteLLMModel(AbstractModel):}elif (tool_calls := history_item.get("tool_calls")) is not None:message = {"role": role, "content": history_item["content"], "tool_calls": tool_calls}+ if thinking_blocks := history_item.get("thinking_blocks"):+ message["thinking_blocks"] = thinking_blockselse:message = {"role": role, "content": history_item["content"]}if "cache_control" in history_item:diff --git a/sweagent/types.py b/sweagent/types.pyindex 17c6b957..cfd1c1d3 100644--- a/sweagent/types.py+++ b/sweagent/types.py@@ -25,6 +25,8 @@ class StepOutput(BaseModel):state: dict[str, str] = {}tool_calls: list[dict[str, Any]] | None = Nonetool_call_ids: list[str] | None = None+ thinking_blocks: list[dict[str, Any]] | None = None+"""State of the environment at the end of the step"""extra_info: dict[str, Any] = {}@@ -67,6 +69,8 @@ class HistoryItem(_HistoryItem, total=False):tool_call_ids: list[str] | Nonetags: list[str]cache_control: dict[str, Any] | None+ thinking_blocks: list[dict[str, Any]] | None+"""HistoryProcessors can add these tags to enable special processing"""