marvin 3.2.2__tar.gz → 3.2.3__tar.gz

{marvin-3.2.2 → marvin-3.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: marvin
-Version: 3.2.2
+Version: 3.2.3
 Summary: a simple and powerful tool to get things done with AI
 License:                                  Apache License
                                    Version 2.0, January 2004
@@ -209,7 +209,7 @@ Requires-Dist: aiosqlite>=0.20.0
 Requires-Dist: alembic>=1.12.0
 Requires-Dist: jinja2>=3.1.4
 Requires-Dist: partial-json-parser>=0.2.1.1.post5
-Requires-Dist: pydantic-ai>=0.7.2
+Requires-Dist: pydantic-ai>=1.9.0
 Requires-Dist: pydantic-settings>=2.6.1
 Requires-Dist: pydantic[email]>=2.10.6
 Requires-Dist: rich>=13.9.4

{marvin-3.2.2 → marvin-3.2.3}/examples/slackbot/src/slackbot/api.py

@@ -279,12 +279,7 @@ async def handle_message(payload: SlackPayload, db: Database):
                 channel_id=event.channel,
                 thread_ts=thread_ts,
             )
-            # Still return completed so we don't retry
-            return Completed(
-                message="Error during agent execution",
-                name="ERROR_HANDLED",
-                data=dict(error=str(e), user_context=user_context),
-            )
+            raise
         finally:
             try:
                 await mark_thread_completed(db, message_ts)

{marvin-3.2.2 → marvin-3.2.3}/examples/slackbot/src/slackbot/github/models.py

@@ -18,7 +18,7 @@ class GitHubLabel(BaseModel):
 
     name: str = Field(default="")
     color: str = Field(default="")
-    description: str = Field(default="")
+    description: str | None = Field(default="")
 
 
 class GitHubComment(BaseModel):

{marvin-3.2.2 → marvin-3.2.3}/examples/slackbot/src/slackbot/research_agent.py

@@ -42,7 +42,7 @@ def create_research_agent(
     """Create a specialized research agent for thorough information gathering."""
 
     agent = Agent[ResearchContext, ResearchFindings](
-        model=model or "openai:gpt-4o",
+        model=model or "anthropic:claude-haiku-4-5",
         deps_type=ResearchContext,
         output_type=ResearchFindings,
         system_prompt="""You are a specialized research agent for Prefect documentation and knowledge.

{marvin-3.2.2 → marvin-3.2.3}/examples/timeseries.py

@@ -2,9 +2,9 @@ import json
 import re
 from typing import Any, TypedDict
 
-from atproto import Client
+from atproto import Client, models
 from atproto.exceptions import BadRequestError
-from atproto_client.models.app.bsky.feed.defs import ThreadViewPost
+from pydantic import field_validator
 from pydantic_ai import ImageUrl
 from pydantic_settings import BaseSettings, SettingsConfigDict
 
@@ -21,6 +21,15 @@ class Settings(BaseSettings):
 
     bsky_handle: str
     bsky_password: str
+    atproto_pds_url: str = "https://bsky.social"
+
+    @field_validator("atproto_pds_url")
+    @classmethod
+    def ensure_url_protocol(cls, v: str) -> str:
+        """Ensure the PDS URL has a protocol"""
+        if not v.startswith(("http://", "https://")):
+            return f"https://{v}"
+        return v
 
 
 class Snapshot(TypedDict):
@@ -48,7 +57,7 @@ def extract_post_id(bluesky_url: str) -> tuple[str, str]:
     return match.group(1), match.group(2)
 
 
-def build_context(thread: ThreadViewPost) -> dict[str, Any]:
+def build_context(thread: models.AppBskyFeedDefs.ThreadViewPost) -> dict[str, Any]:
     context: dict[str, Any] = {}
     if thread and thread.post:
         context["bsky post"] = {
@@ -65,7 +74,7 @@ def build_context(thread: ThreadViewPost) -> dict[str, Any]:
             image_description_result = visual_extraction_agent.run(
                 [
                     "summarize this image concisely, include direct quotes from the image",
-                    ImageUrl(url=img.fullsize),
+                    ImageUrl(url=img.fullsize, media_type="image/jpeg"),
                 ]
             )
             context["bsky post"]["embed"] = image_description_result
@@ -80,7 +89,10 @@ def build_context(thread: ThreadViewPost) -> dict[str, Any]:
                             "embed": visual_extraction_agent.run(
                                 "summarize this image concisely, include direct quotes from the image",
                                 attachments=[
-                                    ImageUrl(url=reply_post.embed.images[0].fullsize),
+                                    ImageUrl(
+                                        url=reply_post.embed.images[0].fullsize,
+                                        media_type="image/jpeg",
+                                    ),
                                 ],
                             )
                         }
@@ -99,7 +111,7 @@ def build_context(thread: ThreadViewPost) -> dict[str, Any]:
 def explain_bsky_post(
     bsky_post_url: str, details: dict[str, Any] | None = None
 ) -> None:
-    client = Client()
+    client = Client(base_url=settings.atproto_pds_url)
     client.login(settings.bsky_handle, settings.bsky_password)
 
     try:
@@ -111,7 +123,7 @@ def explain_bsky_post(
         logger.error(f"Error fetching thread: {e}")
         return
 
-    assert isinstance(thread, ThreadViewPost)
+    assert isinstance(thread, models.AppBskyFeedDefs.ThreadViewPost)
     context = build_context(thread)
 
     if details:

{marvin-3.2.2 → marvin-3.2.3}/pyproject.toml

@@ -10,7 +10,7 @@ dependencies = [
     "alembic>=1.12.0",
     "jinja2>=3.1.4",
     "partial-json-parser>=0.2.1.1.post5",
-    "pydantic-ai>=0.7.2",
+    "pydantic-ai>=1.9.0",
     "pydantic-settings>=2.6.1",
     "pydantic[email]>=2.10.6",
     "rich>=13.9.4",

{marvin-3.2.2 → marvin-3.2.3}/src/marvin/engine/streaming.py

@@ -10,6 +10,7 @@ from pydantic_ai.messages import (
     FunctionToolResultEvent,
     ModelResponsePart,
     PartDeltaEvent,
+    PartEndEvent,
     PartStartEvent,
     RetryPromptPart,
     TextPartDelta,
@@ -236,6 +237,13 @@ def _process_pydantic_event(
                 tool_call_id=snapshot.tool_call_id if snapshot else None,
                 tool=tools_map.get(event.part.tool_name),
             )
+    # Handle Part End Events
+    elif isinstance(event, PartEndEvent):
+        # Part end events signal that a part is complete. We don't need to
+        # emit a Marvin event for this since we handle completion via other
+        # events (FunctionToolCallEvent, FinalResultEvent, etc.)
+        return None
+
     # Handle Part Delta Events
     elif isinstance(event, PartDeltaEvent):
         # Process a delta update to an existing part