goose-py 0.11.0__py3-none-any.whl → 0.11.2__py3-none-any.whl

goose/_internal/agent.py

@@ -6,10 +6,10 @@ from aikernel import (
     LLMAssistantMessage,
     LLMModel,
     LLMSystemMessage,
+    LLMToolMessage,
     LLMUserMessage,
     llm_structured,
     llm_unstructured,
-    render_message,
 )
 from pydantic import ValidationError
 
@@ -17,6 +17,8 @@ from goose._internal.result import FindReplaceResponse, Result, TextResult
 from goose._internal.types.telemetry import AgentResponse
 from goose.errors import Honk
 
+ExpectedMessage = LLMUserMessage | LLMAssistantMessage | LLMSystemMessage | LLMToolMessage
+
 
 class IAgentLogger(Protocol):
     async def __call__(self, *, response: AgentResponse[Any]) -> None: ...
@@ -43,22 +45,23 @@ class Agent:
         response_model: type[R] = TextResult,
     ) -> R:
         start_time = datetime.now()
+        typed_messages: list[ExpectedMessage] = [*messages]
 
         if response_model is TextResult:
-            response = await llm_unstructured(model=model, messages=messages)
+            response = await llm_unstructured(model=model, messages=typed_messages)
             parsed_response = response_model.model_validate({"text": response.text})
         else:
-            response = await llm_structured(model=model, messages=messages, response_model=response_model)
+            response = await llm_structured(model=model, messages=typed_messages, response_model=response_model)
             parsed_response = response.structured_response
 
         end_time = datetime.now()
 
         if isinstance(messages[0], LLMSystemMessage):
-            system = render_message(messages[0])
-            input_messages = [render_message(message) for message in messages[1:]]
+            system = messages[0].render()
+            input_messages = [message.render() for message in messages[1:]]
         else:
             system = None
-            input_messages = [render_message(message) for message in messages]
+            input_messages = [message.render() for message in messages]
 
         agent_response = AgentResponse(
             response=parsed_response,
@@ -89,15 +92,16 @@ class Agent:
         task_name: str,
     ) -> str:
         start_time = datetime.now()
-        response = await llm_unstructured(model=model, messages=messages)
+        typed_messages: list[ExpectedMessage] = [*messages]
+        response = await llm_unstructured(model=model, messages=typed_messages)
         end_time = datetime.now()
 
         if isinstance(messages[0], LLMSystemMessage):
-            system = render_message(messages[0])
-            input_messages = [render_message(message) for message in messages[1:]]
+            system = messages[0].render()
+            input_messages = [message.render() for message in messages[1:]]
         else:
             system = None
-            input_messages = [render_message(message) for message in messages]
+            input_messages = [message.render() for message in messages]
 
         agent_response = AgentResponse(
             response=response.text,
@@ -129,16 +133,19 @@ class Agent:
         response_model: type[R],
     ) -> R:
         start_time = datetime.now()
-        find_replace_response = await llm_structured(model=model, messages=messages, response_model=FindReplaceResponse)
+        typed_messages: list[ExpectedMessage] = [*messages]
+        find_replace_response = await llm_structured(
+            model=model, messages=typed_messages, response_model=FindReplaceResponse
+        )
         parsed_find_replace_response = find_replace_response.structured_response
         end_time = datetime.now()
 
         if isinstance(messages[0], LLMSystemMessage):
-            system = render_message(messages[0])
-            input_messages = [render_message(message) for message in messages[1:]]
+            system = messages[0].render()
+            input_messages = [message.render() for message in messages[1:]]
         else:
             system = None
-            input_messages = [render_message(message) for message in messages]
+            input_messages = [message.render() for message in messages]
 
         agent_response = AgentResponse(
             response=parsed_find_replace_response,

goose/_internal/state.py

@@ -2,7 +2,7 @@ import json
 from contextvars import ContextVar
 from typing import TYPE_CHECKING, Any, NewType, Self
 
-from aikernel import LLMAssistantMessage, LLMSystemMessage, LLMUserMessage
+from aikernel import LLMAssistantMessage, LLMMessagePart, LLMSystemMessage, LLMUserMessage
 from pydantic import BaseModel, ConfigDict
 
 from goose._internal.agent import Agent, IAgentLogger
@@ -46,15 +46,15 @@ class NodeState(BaseModel):
         overwrite: bool = False,
     ) -> Self:
         if overwrite and len(self.conversation.assistant_messages) > 0:
-            self.conversation.assistant_messages[-1] = LLMAssistantMessage.from_text(result)
+            self.conversation.assistant_messages[-1] = LLMAssistantMessage(parts=[LLMMessagePart(content=result)])
         else:
-            self.conversation.assistant_messages.append(LLMAssistantMessage.from_text(result))
+            self.conversation.assistant_messages.append(LLMAssistantMessage(parts=[LLMMessagePart(content=result)]))
         if new_hash is not None:
             self.last_hash = new_hash
         return self
 
     def add_answer(self, *, answer: str) -> Self:
-        self.conversation.assistant_messages.append(LLMAssistantMessage.from_text(answer))
+        self.conversation.assistant_messages.append(LLMAssistantMessage(parts=[LLMMessagePart(content=answer)]))
         return self
 
     def add_user_message(self, *, message: LLMUserMessage) -> Self:
@@ -68,7 +68,9 @@ class NodeState(BaseModel):
         for message_index, message in enumerate(reversed(self.conversation.assistant_messages)):
             if self.__message_is_result(message):
                 index = len(self.conversation.assistant_messages) - message_index - 1
-                self.conversation.assistant_messages[index] = LLMAssistantMessage.from_text(result)
+                self.conversation.assistant_messages[index] = LLMAssistantMessage(
+                    parts=[LLMMessagePart(content=result)]
+                )
                 return self
 
         raise Honk("Node awaiting response, has no result")

goose/_internal/types/telemetry.py

@@ -5,6 +5,8 @@ from typing import ClassVar, TypedDict
 from aikernel import LiteLLMMessage, LLMModel
 from pydantic import BaseModel, computed_field
 
+from goose.errors import Honk
+
 
 class AgentResponseDump(TypedDict):
     run_id: str
@@ -77,15 +79,18 @@ class AgentResponse[R: BaseModel | str](BaseModel):
     def minimized_dump(self) -> AgentResponseDump:
         if self.system is None:
             minimized_system_message = ""
+        elif self.system["role"] == "tool" or not isinstance(self.system["content"], list):
+            raise Honk("System message cannot use tools")
         else:
-            minimized_system_message = self.system
-            for part in minimized_system_message["content"]:
+            for part in self.system["content"]:
                 if part["type"] == "image_url":
                     part["image_url"] = "__MEDIA__"
-            minimized_system_message = json.dumps(minimized_system_message)
+            minimized_system_message = json.dumps(self.system)
 
         minimized_input_messages = [message for message in self.input_messages]
         for message in minimized_input_messages:
+            if message["role"] == "tool" or not isinstance(message["content"], list):
+                raise Honk("Input messages cannot use tools")
             for part in message["content"]:
                 if part["type"] == "image_url":
                     part["image_url"] = "__MEDIA__"

{goose_py-0.11.0.dist-info → goose_py-0.11.2.dist-info}/METADATA

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: goose-py
-Version: 0.11.0
+Version: 0.11.2
 Summary: A tool for AI workflows based on human-computer collaboration and structured output.
 Author-email: Nash Taylor <nash@chelle.ai>, Joshua Cook <joshua@chelle.ai>, Michael Sankur <michael@chelle.ai>
 Requires-Python: >=3.12
-Requires-Dist: aikernel>=0.1.5
+Requires-Dist: aikernel>=0.1.22
 Requires-Dist: jsonpath-ng>=1.7.0
 Requires-Dist: pydantic>=2.8.2
 Description-Content-Type: text/markdown

{goose_py-0.11.0.dist-info → goose_py-0.11.2.dist-info}/RECORD

@@ -4,15 +4,15 @@ goose/flow.py,sha256=YsZLBa5I1W27_P6LYGWbtFX8ZYx9vJG3KtENYChHm5E,111
 goose/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 goose/runs.py,sha256=ub-r_gzbUbaIzWXX-jc-dncNxEh6zTfzIkmnDfCSbRI,160
 goose/task.py,sha256=95rspdxETJoY12IHBl3KjnVIdqQnf1jDKlnGWNWOTvQ,53
-goose/_internal/agent.py,sha256=hpg8xXo7lhFDE3ezr8C0-BC61xWoXl1KChxu2n9o8Aw,8449
+goose/_internal/agent.py,sha256=qDPPsOuvTkUpaKXV5aVTIn_yWUs_XZyHDPJaIq49YAI,8704
 goose/_internal/conversation.py,sha256=vhJwe1pHk2lV60DaB9Tz9KbpzQo7_thRYInPjbIoUTE,1437
 goose/_internal/flow.py,sha256=8MJxlhHYSAzUHZefpF_sRJc37o532OF0X7l3KRopDmc,4115
 goose/_internal/result.py,sha256=vtJMfBxb9skfl8st2tn4hBmEq6qmXiJTme_B5QTgu2M,538
-goose/_internal/state.py,sha256=jGKKZKeDcKaCY-uqgXLOnMNwyzR5qEH5m9afOtixsLk,7923
+goose/_internal/state.py,sha256=kA116MpsetsQz6nYodsXOqE3uYz37OTgjC9Vcy_3Qvg,8065
 goose/_internal/store.py,sha256=tWmKfa1-yq1jU6lT3l6kSOmVt2m3H7I1xLMTrxnUDI8,889
 goose/_internal/task.py,sha256=X_eRZxZlf6SwyvF1nIyjoneyqD_TISXqESyxluk63mE,6416
 goose/_internal/types/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-goose/_internal/types/telemetry.py,sha256=wDQz1C60KxlftC0aQCXIjswrSYGI1KNaM2wtnlP1Q7k,3823
-goose_py-0.11.0.dist-info/METADATA,sha256=LZvLxXhKOj-edk54qSemq8dxnplsUmSzPRPIrmAxO-w,442
-goose_py-0.11.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-goose_py-0.11.0.dist-info/RECORD,,
+goose/_internal/types/telemetry.py,sha256=xTJCJo-TW9Pd5QK983HMw9CqJ7vw-BLUkYkbantIP30,4075
+goose_py-0.11.2.dist-info/METADATA,sha256=I9TPDZ7ERKKn26HLIWKyWXuyHnjSifMFlxiRloXkDPU,443
+goose_py-0.11.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+goose_py-0.11.2.dist-info/RECORD,,