goose-py 0.9.13__tar.gz → 0.9.15__tar.gz

{goose_py-0.9.13 → goose_py-0.9.15}/.stubs/litellm/__init__.pyi

@@ -1,4 +1,5 @@
-from typing import Any, Literal, NotRequired, TypedDict
+from typing import Literal, NotRequired, TypedDict
+from pydantic import BaseModel
 
 _LiteLLMGeminiModel = Literal[
     "vertex_ai/gemini-1.5-flash",
@@ -28,11 +29,6 @@ class _LiteLLMMessage(TypedDict):
     content: list[_LiteLLMTextMessageContent | _LiteLLMMediaMessageContent]
     cache_control: NotRequired[_LiteLLMCacheControl]
 
-class _LiteLLMResponseFormat(TypedDict):
-    type: Literal["json_object"]
-    response_schema: dict[str, Any]  # must be a valid JSON schema
-    enforce_validation: NotRequired[bool]
-
 class _LiteLLMModelResponseChoiceMessage:
     role: Literal["assistant"]
     content: str
@@ -60,7 +56,7 @@ async def acompletion(
     *,
     model: _LiteLLMGeminiModel,
     messages: list[_LiteLLMMessage],
-    response_format: _LiteLLMResponseFormat | None = None,
+    response_format: type[BaseModel] | None = None,
     max_tokens: int | None = None,
     temperature: float = 1.0,
 ) -> ModelResponse: ...

{goose_py-0.9.13 → goose_py-0.9.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: goose-py
-Version: 0.9.13
+Version: 0.9.15
 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

{goose_py-0.9.13 → goose_py-0.9.15}/goose/_internal/agent.py

@@ -153,11 +153,7 @@ class Agent:
             response = await acompletion(
                 model=model.value,
                 messages=rendered_messages,
-                response_format={
-                    "type": "json_object",
-                    "response_schema": response_model.model_json_schema(),
-                    "enforce_validation": True,
-                },
+                response_format=response_model,
             )
             parsed_response = response_model.model_validate_json(response.choices[0].message.content)
 

{goose_py-0.9.13 → goose_py-0.9.15}/goose/_internal/types/agent.py

@@ -1,19 +1,8 @@
 import base64
 from enum import StrEnum
-from typing import Any, Literal, NotRequired, TypedDict
+from typing import Literal, NotRequired, TypedDict
 
-from pydantic import BaseModel, GetCoreSchemaHandler
-from pydantic_core import CoreSchema, core_schema
-
-
-class Base64MediaContent(str):
-    @classmethod
-    def __get_pydantic_core_schema__(cls, source_type: Any, handler: GetCoreSchemaHandler) -> CoreSchema:
-        return core_schema.no_info_after_validator_function(cls, handler(str))
-
-    @classmethod
-    def from_bytes(cls, content: bytes, /) -> "Base64MediaContent":
-        return cls(base64.b64encode(content).decode())
+from pydantic import BaseModel
 
 
 class AIModel(StrEnum):
@@ -30,7 +19,10 @@ class AIModel(StrEnum):
     GEMINI_FLASH_2_0 = "gemini/gemini-2.0-flash"
 
 
-class UserMediaContentType(StrEnum):
+class ContentType(StrEnum):
+    # text
+    TEXT = "text/plain"
+
     # images
     JPEG = "image/jpeg"
     PNG = "image/png"
@@ -64,33 +56,30 @@ class LLMMessage(TypedDict):
     cache_control: NotRequired[CacheControl]
 
 
-class TextMessagePart(BaseModel):
-    text: str
-
-    def render(self) -> LLMTextMessagePart:
-        return {"type": "text", "text": self.text}
-
+class MessagePart(BaseModel):
+    content: str
+    content_type: ContentType = ContentType.TEXT
 
-class MediaMessagePart(BaseModel):
-    content_type: UserMediaContentType
-    content: Base64MediaContent
+    @classmethod
+    def from_media(cls, *, content: bytes, content_type: ContentType) -> "MessagePart":
+        return cls(content=base64.b64encode(content).decode(), content_type=content_type)
 
-    def render(self) -> LLMMediaMessagePart:
-        return {
-            "type": "image_url",
-            "image_url": f"data:{self.content_type};base64,{self.content}",
-        }
+    def render(self) -> LLMTextMessagePart | LLMMediaMessagePart:
+        if self.content_type == ContentType.TEXT:
+            return {"type": "text", "text": self.content}
+        else:
+            return {"type": "image_url", "image_url": f"data:{self.content_type};base64,{self.content}"}
 
 
 class UserMessage(BaseModel):
-    parts: list[TextMessagePart | MediaMessagePart]
+    parts: list[MessagePart]
 
     def render(self) -> LLMMessage:
         content: LLMMessage = {
             "role": "user",
             "content": [part.render() for part in self.parts],
         }
-        if any(isinstance(part, MediaMessagePart) for part in self.parts):
+        if any(part.content_type != ContentType.TEXT for part in self.parts):
             content["cache_control"] = {"type": "ephemeral"}
         return content
 
@@ -103,7 +92,7 @@ class AssistantMessage(BaseModel):
 
 
 class SystemMessage(BaseModel):
-    parts: list[TextMessagePart | MediaMessagePart]
+    parts: list[MessagePart]
 
     def render(self) -> LLMMessage:
         return {

{goose_py-0.9.13 → goose_py-0.9.15}/goose/agent.py

@@ -2,14 +2,12 @@ from ._internal.agent import AgentResponse, IAgentLogger
 from ._internal.types.agent import (
     AIModel,
     AssistantMessage,
-    Base64MediaContent,
+    ContentType,
     LLMMediaMessagePart,
     LLMMessage,
     LLMTextMessagePart,
-    MediaMessagePart,
+    MessagePart,
     SystemMessage,
-    TextMessagePart,
-    UserMediaContentType,
     UserMessage,
 )
 
@@ -18,13 +16,11 @@ __all__ = [
     "AIModel",
     "IAgentLogger",
     "AssistantMessage",
-    "Base64MediaContent",
     "LLMMediaMessagePart",
     "LLMMessage",
     "LLMTextMessagePart",
-    "MediaMessagePart",
     "SystemMessage",
-    "TextMessagePart",
-    "UserMediaContentType",
+    "MessagePart",
+    "ContentType",
     "UserMessage",
 ]

{goose_py-0.9.13 → goose_py-0.9.15}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "goose-py"
-version = "0.9.13"
+version = "0.9.15"
 description = "A tool for AI workflows based on human-computer collaboration and structured output."
 readme = "README.md"
 authors = [

{goose_py-0.9.13 → goose_py-0.9.15}/tests/test_agent.py

@@ -4,7 +4,8 @@ import pytest
 from pytest_mock import MockerFixture
 
 from goose import Agent, FlowArguments, TextResult, flow, task
-from goose.agent import AgentResponse, AIModel, IAgentLogger, TextMessagePart, UserMessage
+from goose._internal.types.agent import MessagePart
+from goose.agent import AgentResponse, AIModel, IAgentLogger, UserMessage
 
 
 class TestFlowArguments(FlowArguments):
@@ -28,7 +29,7 @@ def mock_litellm(mocker: MockerFixture) -> Mock:
 @task
 async def use_agent(*, agent: Agent) -> TextResult:
     return await agent(
-        messages=[UserMessage(parts=[TextMessagePart(text="Hello")])],
+        messages=[UserMessage(parts=[MessagePart(content="Hello")])],
         model=AIModel.GEMINI_FLASH_8B,
         task_name="greet",
     )

{goose_py-0.9.13 → goose_py-0.9.15}/tests/test_refining.py

@@ -6,7 +6,8 @@ import pytest
 from pytest_mock import MockerFixture
 
 from goose import Agent, FlowArguments, Result, flow, task
-from goose.agent import SystemMessage, TextMessagePart, UserMessage
+from goose._internal.types.agent import MessagePart
+from goose.agent import SystemMessage, UserMessage
 from goose.errors import Honk
 
 
@@ -59,8 +60,8 @@ async def test_refining() -> None:
     # imagine this is a new process
     async with sentence.start_run(run_id="1") as second_run:
         await generate_random_word.refine(
-            user_message=UserMessage(parts=[TextMessagePart(text="Change it")]),
-            context=SystemMessage(parts=[TextMessagePart(text="Extra info")]),
+            user_message=UserMessage(parts=[MessagePart(content="Change it")]),
+            context=SystemMessage(parts=[MessagePart(content="Extra info")]),
         )
 
     random_words = second_run.get_all(task=generate_random_word)
@@ -76,6 +77,6 @@ async def test_refining_before_generate_fails() -> None:
     with pytest.raises(Honk):
         async with sentence.start_run(run_id="2"):
             await generate_random_word.refine(
-                user_message=UserMessage(parts=[TextMessagePart(text="Change it")]),
-                context=SystemMessage(parts=[TextMessagePart(text="Extra info")]),
+                user_message=UserMessage(parts=[MessagePart(content="Change it")]),
+                context=SystemMessage(parts=[MessagePart(content="Extra info")]),
             )

{goose_py-0.9.13 → goose_py-0.9.15}/tests/test_state.py

@@ -6,7 +6,7 @@ import pytest
 from pytest_mock import MockerFixture
 
 from goose import Agent, FlowArguments, Result, flow, task
-from goose._internal.types.agent import SystemMessage, TextMessagePart, UserMessage
+from goose._internal.types.agent import MessagePart, SystemMessage, UserMessage
 from goose.errors import Honk
 
 
@@ -74,8 +74,8 @@ async def test_state_undo() -> None:
     async with with_state.start_run(run_id="2"):
         await generate_random_word.refine(
             index=0,
-            user_message=UserMessage(parts=[TextMessagePart(text="Change it")]),
-            context=SystemMessage(parts=[TextMessagePart(text="Extra info")]),
+            user_message=UserMessage(parts=[MessagePart(content="Change it")]),
+            context=SystemMessage(parts=[MessagePart(content="Extra info")]),
         )
 
     async with with_state.start_run(run_id="2") as run:

{goose_py-0.9.13 → goose_py-0.9.15}/uv.lock

@@ -234,7 +234,7 @@ wheels = [
 
 [[package]]
 name = "goose-py"
-version = "0.9.13"
+version = "0.9.15"
 source = { editable = "." }
 dependencies = [
     { name = "jsonpath-ng" },