goose-py 0.9.13__py3-none-any.whl → 0.9.15__py3-none-any.whl

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/_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/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.dist-info → goose_py-0.9.15.dist-info}/METADATA

@@ -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.dist-info → goose_py-0.9.15.dist-info}/RECORD

@@ -1,11 +1,11 @@
 goose/__init__.py,sha256=wjGDgWzKcD6S8loVr0n-rLCpRwg-ZKAixcUaw1wobMc,243
-goose/agent.py,sha256=3T5hobYzro2tmYaUd_kNfIxpmnioLOYy9HaYT0XttIA,632
+goose/agent.py,sha256=u6daAnn4fPgP4Jk9cHANyCEku3RmUqKLdqtyGSr8ljI,510
 goose/errors.py,sha256=-0OyZQJWYTRw5YgnCB2_uorVaUsL6Z0QYQO2FqzCiyg,32
 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=VRDEhBDTpKZS09B6xnWsOqLsxP7D5NHKVGlxwayPdoo,6030
+goose/_internal/agent.py,sha256=x3uyPrV5gezsjslm_9NFuakufkhQhcireY8GkHniZSs,5859
 goose/_internal/conversation.py,sha256=zbMvP4oxhKAzATVEXZfGVKXWfEjh472MYKhmyJzSLgI,1172
 goose/_internal/flow.py,sha256=RShMsxgt49g1fZJ3rlwDHtI1j39lZzewx8hZ7DGN5kg,4124
 goose/_internal/result.py,sha256=-eZJn-2sPo7rHZ38Sz6IAHXqiJ-Ss39esEoFGimJEBI,155
@@ -13,7 +13,7 @@ goose/_internal/state.py,sha256=pI-C37Ybazo7EJPbZklxbiCYFy3u4I031NKBr8Jm_CI,6534
 goose/_internal/store.py,sha256=tWmKfa1-yq1jU6lT3l6kSOmVt2m3H7I1xLMTrxnUDI8,889
 goose/_internal/task.py,sha256=qjpX_wIQ2jKreMjrRy1SVedsuVzLXuOLgcyPstrgWfE,6176
 goose/_internal/types/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-goose/_internal/types/agent.py,sha256=DEDu2BZ4nmiU0J8GqYJtxq_VBjR-aXRjYkjmeSEX9OQ,3013
-goose_py-0.9.13.dist-info/METADATA,sha256=tg0tK_QC2E_GBMA-bh7Wu24GzBu1v-moWe1dZkST-Vw,442
-goose_py-0.9.13.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-goose_py-0.9.13.dist-info/RECORD,,
+goose/_internal/types/agent.py,sha256=g0KD-aPWZlUGBx72AwQd3LeniFxHATeflZ7191QjFZA,2696
+goose_py-0.9.15.dist-info/METADATA,sha256=b87H2JP5nAIuYiit4wb_QXDK9JmZClQy9HlWjYZWRrA,442
+goose_py-0.9.15.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+goose_py-0.9.15.dist-info/RECORD,,