merge conflict

Author: zzstoatzz

examples/hello_agent.py

@@ -1,7 +1,9 @@
 import os
 from pathlib import Path
 
-from pydantic_ai.models.anthropic import AnthropicModel
+import httpx
+from pydantic_ai.models.openai import OpenAIModel
+from pydantic_ai.providers.openai import OpenAIProvider
 
 import marvin
 
@@ -13,9 +15,16 @@ def write_file(path: str, content: str):
 
 
 writer = marvin.Agent(
-    model=AnthropicModel(
-        model_name="claude-3-5-sonnet-latest",
-        api_key=os.getenv("ANTHROPIC_API_KEY"),
+    model=OpenAIModel(
+        "gpt-4o",
+        provider=OpenAIProvider(
+            api_key=os.getenv("OPENAI_API_KEY", "gonna fail"),
+            base_url="https://api.openai.com/v1",
+            http_client=httpx.AsyncClient(
+                # proxy="http://localhost:8080",
+                # headers={"x-SOME-HEADER": "some-value"},
+            ),
+        ),
     ),
     name="Technical Writer",
     instructions="Write concise, engaging content for developers",

examples/pandas/dataframe.py

@@ -1,7 +1,3 @@
-# /// script
-# dependencies = ["marvin@git+https://github.com/prefecthq/marvin.git", "pandas", "prefect"]
-# ///
-
 """
 fills out a new column in a dataframe, adding values to many columns concurrently
 """

examples/slackbot/core.py

@@ -185,11 +185,12 @@ def create_agent(
     logger = get_run_logger()
     logger.info("Creating new agent")
     ai_model = model or AnthropicModel(
-        cast(
+        provider="anthropic",
+        api_key=Secret.load(settings.claude_key_secret_name, _sync=True).get(),  # type: ignore
+        model=cast(
             str,
             Variable.get("marvin_bot_model", default=settings.model_name, _sync=True),  # type: ignore
         ),
-        api_key=Secret.load(settings.claude_key_secret_name, _sync=True).get(),  # type: ignore
     )
     agent = Agent(
         model=ai_model,
@@ -216,27 +217,23 @@ def personality_and_maybe_notes(ctx: RunContext[UserContext]) -> str:  # type: i
             if ctx.deps["user_notes"]
             else ""
         )
-        logger.debug(f"System prompt: {system_prompt}")
+        print(f"System prompt: {system_prompt}")
         return system_prompt
 
     @agent.tool
     def store_facts_about_user(ctx: RunContext[UserContext], facts: list[str]) -> str:  # type: ignore[reportUnusedFunction]
-        logger = get_run_logger()
-        logger.info(f"Storing {len(facts)} facts about user {ctx.deps['user_id']}")
+        print(f"Storing {len(facts)} facts about user {ctx.deps['user_id']}")
         with TurboPuffer(
             namespace=f"{settings.user_facts_namespace_prefix}{ctx.deps['user_id']}"
         ) as tpuf:
             tpuf.upsert(documents=[Document(text=fact) for fact in facts])
         message = f"Stored {len(facts)} facts about user {ctx.deps['user_id']}"
-        logger.info(message)
+        print(message)
         return message
 
     @agent.tool
     def delete_facts_about_user(ctx: RunContext[UserContext], related_to: str) -> str:  # type: ignore[reportUnusedFunction]
-        logger = get_run_logger()
-        logger.info(
-            f"forgetting stuff about {ctx.deps['user_id']} related to {related_to}"
-        )
+        print(f"forgetting stuff about {ctx.deps['user_id']} related to {related_to}")
         user_id = ctx.deps["user_id"]
         with TurboPuffer(
             namespace=f"{settings.user_facts_namespace_prefix}{user_id}"
@@ -245,7 +242,7 @@ def delete_facts_about_user(ctx: RunContext[UserContext], related_to: str) -> st
             ids = [str(v.id) for v in vector_result.data or []]
             tpuf.delete(ids)
             message = f"Deleted {len(ids)} facts about user {user_id}"
-            logger.info(message)
+            print(message)
             return message
 
     return agent

examples/slackbot/settings.py

@@ -1,4 +1,3 @@
-import os
 from pathlib import Path
 from typing import ClassVar, Literal
 
@@ -61,6 +60,8 @@ def validate_log_level(cls, v: str) -> str:
         default=False, description="Enable test mode with auto-reload"
     )
 
+    slack_api_token: str = Field(default=..., description="Slack API bot user token")
+
     @property
     def model_name(self) -> str:
         return Variable.get(
@@ -69,16 +70,5 @@ def model_name(self) -> str:
             _sync=True,  # type: ignore
         )
 
-    @property
-    def slack_api_token(self) -> str:
-        from prefect.blocks.system import Secret
-
-        if self.test_mode:
-            return Secret.load("test-slack-api-token", _sync=True).get()  # type: ignore
-        else:
-            token = os.getenv("MARVIN_SLACK_API_TOKEN")
-            assert token is not None, "MARVIN_SLACK_API_TOKEN is not set"
-            return token
-
 
 settings = SlackbotSettings()

examples/slackbot/slack.py

@@ -1,13 +1,11 @@
 """Module for Slack-related utilities."""
 
-import os
 import re
 from typing import Any, List, Union
 
 import httpx
 from pydantic import BaseModel, ValidationInfo, field_validator, model_validator
-
-import marvin
+from settings import settings
 
 
 class EventBlockElement(BaseModel):
@@ -78,53 +76,25 @@ def validate_event(
         return v
 
 
-async def get_token() -> str:
-    """Get the Slack bot token from the environment."""
-    try:
-        token = (
-            marvin.settings.slack_api_token
-        )  # set `MARVIN_SLACK_API_TOKEN` in `~/.marvin/.env
-    except AttributeError:
-        if token := os.getenv("MARVIN_SLACK_API_TOKEN"):
-            return token
-        try:  # TODO: clean this up
-            from prefect.blocks.system import Secret
-
-            return (await Secret.load("slack-api-token")).get()
-        except ImportError:
-            pass
-        raise ValueError(
-            "`MARVIN_SLACK_API_TOKEN` not found in environment."
-            " Please set it in `~/.marvin/.env` or as an environment variable."
-        )
-    return token
-
-
-def convert_md_links_to_slack(text) -> str:
+def convert_md_links_to_slack(text: str) -> str:
     md_link_pattern = r"\[(?P<text>[^\]]+)]\((?P<url>[^\)]+)\)"
 
     # converting Markdown links to Slack-style links
-    def to_slack_link(match):
+    def to_slack_link(match: re.Match[str]) -> str:
         return f"<{match.group('url')}|{match.group('text')}>"
 
     # Replace Markdown links with Slack-style links
-    slack_text = re.sub(md_link_pattern, to_slack_link, text)
-
-    slack_text = re.sub(r"\*\*(.*?)\*\*", r"*\1*", slack_text)
-
-    return slack_text
+    return re.sub(
+        r"\*\*(.*?)\*\*", r"*\1*", re.sub(md_link_pattern, to_slack_link, text)
+    )
 
 
 async def post_slack_message(
     message: str,
     channel_id: str,
-    attachments: Union[list[dict[str, Any]], None] = None,
-    thread_ts: Union[str, None] = None,
-    auth_token: Union[str, None] = None,
+    attachments: list[dict[str, Any]] | None = None,
+    thread_ts: str | None = None,
 ) -> httpx.Response:
-    if not auth_token:
-        auth_token = await get_token()
-
     post_data = {
         "channel": channel_id,
         "text": convert_md_links_to_slack(message),
@@ -137,7 +107,7 @@ async def post_slack_message(
     async with httpx.AsyncClient() as client:
         response = await client.post(
             "https://slack.com/api/chat.postMessage",
-            headers={"Authorization": f"Bearer {auth_token}"},
+            headers={"Authorization": f"Bearer {settings.slack_api_token}"},
             json=post_data,
         )
         response_data = response.json()
@@ -147,12 +117,14 @@ async def post_slack_message(
     return response
 
 
-async def get_thread_messages(channel: str, thread_ts: str) -> list:
+async def get_thread_messages(
+    channel: str, thread_ts: str, auth_token: str
+) -> list[dict[str, Any]]:
     """Get all messages from a slack thread."""
     async with httpx.AsyncClient() as client:
         response = await client.get(
             "https://slack.com/api/conversations.replies",
-            headers={"Authorization": f"Bearer {await get_token()}"},
+            headers={"Authorization": f"Bearer {auth_token}"},
             params={"channel": channel, "ts": thread_ts},
         )
     response.raise_for_status()
@@ -161,10 +133,11 @@ async def get_thread_messages(channel: str, thread_ts: str) -> list:
 
 async def get_user_name(user_id: str) -> str:
     async with httpx.AsyncClient() as client:
+        auth_token = settings.slack_api_token
         response = await client.get(
             "https://slack.com/api/users.info",
             params={"user": user_id},
-            headers={"Authorization": f"Bearer {await get_token()}"},  # noqa: E501
+            headers={"Authorization": f"Bearer {auth_token}"},
         )
     return (
         response.json().get("user", {}).get("name", user_id)
@@ -178,7 +151,7 @@ async def get_channel_name(channel_id: str) -> str:
         response = await client.get(
             "https://slack.com/api/conversations.info",
             params={"channel": channel_id},
-            headers={"Authorization": f"Bearer {await get_token()}"},  # noqa: E501
+            headers={"Authorization": f"Bearer {settings.slack_api_token}"},
         )
     return (
         response.json().get("channel", {}).get("name", channel_id)
@@ -193,7 +166,7 @@ async def fetch_current_message_text(channel: str, ts: str) -> str:
         response = await client.get(
             "https://slack.com/api/conversations.replies",
             params={"channel": channel, "ts": ts},
-            headers={"Authorization": f"Bearer {await get_token()}"},  # noqa: E501
+            headers={"Authorization": f"Bearer {settings.slack_api_token}"},
         )
     response.raise_for_status()
     messages = response.json().get("messages", [])
@@ -233,7 +206,7 @@ async def edit_slack_message(
     async with httpx.AsyncClient() as client:
         response = await client.post(
             "https://slack.com/api/chat.update",
-            headers={"Authorization": f"Bearer {await get_token()}"},
+            headers={"Authorization": f"Bearer {settings.slack_api_token}"},
             json={"channel": channel_id, "ts": thread_ts, "text": updated_text},
         )
 
@@ -244,9 +217,8 @@ async def edit_slack_message(
 async def search_slack_messages(
     query: str,
     max_messages: int = 3,
-    channel: Union[str, None] = None,
-    user_auth_token: Union[str, None] = None,
-) -> list:
+    channel: str | None = None,
+) -> list[dict[str, Any]]:
     """
     Search for messages in Slack workspace based on a query.
 
@@ -259,12 +231,9 @@ async def search_slack_messages(
     Returns:
         list: A list of message contents and permalinks matching the query.
     """
-    all_messages = []
+    all_messages: list[dict[str, Any]] = []
     next_cursor = None
 
-    if not user_auth_token:
-        user_auth_token = await get_token()
-
     async with httpx.AsyncClient() as client:
         while len(all_messages) < max_messages:
             params = {
@@ -278,7 +247,7 @@ async def search_slack_messages(
 
             response = await client.get(
                 "https://slack.com/api/search.messages",
-                headers={"Authorization": f"Bearer {user_auth_token}"},
+                headers={"Authorization": f"Bearer {settings.slack_api_token}"},
                 params=params,
             )
 
@@ -302,14 +271,11 @@ async def search_slack_messages(
     return all_messages[:max_messages]
 
 
-async def get_workspace_info(slack_bot_token: Union[str, None] = None) -> dict:
-    if not slack_bot_token:
-        slack_bot_token = await get_token()
-
+async def get_workspace_info() -> dict[str, Any]:
     async with httpx.AsyncClient() as client:
         response = await client.get(
             "https://slack.com/api/team.info",
-            headers={"Authorization": f"Bearer {slack_bot_token}"},
+            headers={"Authorization": f"Bearer {settings.slack_api_token}"},
         )
         response.raise_for_status()
         return response.json().get("team", {})

examples/slackbot/start.py

@@ -1,13 +1,7 @@
 if __name__ == "__main__":
-    import os
-
     import uvicorn
-    from prefect.blocks.system import Secret
     from settings import settings
 
-    os.environ["OPENAI_API_KEY"] = Secret.load("openai-api-key", _sync=True).get()  # type: ignore
-    os.environ["MARVIN_SLACK_API_TOKEN"] = settings.slack_api_token
-
     uvicorn.run(
         "api:app",
         host=settings.host,

examples/timeseries.py

@@ -53,41 +53,44 @@ def build_context(thread: ThreadViewPost) -> dict[str, Any]:
     if thread and thread.post:
         context["bsky post"] = {
             "author": thread.post.author.handle,
-            "text": thread.post.record.text,
+            "text": getattr(thread.post.record, "text", ""),
         }
 
         if hasattr(thread.post.record, "embed") and hasattr(
             thread.post.embed, "images"
         ):
+            assert thread.post.embed and (
+                img := getattr(thread.post.embed, "images", [])[0]
+            )
             image_description_result = visual_extraction_agent.run(
                 [
                     "summarize this image concisely, include direct quotes from the image",
-                    ImageUrl(url=thread.post.embed.images[0].fullsize),
+                    ImageUrl(url=img.fullsize),
                 ]
             )
             context["bsky post"]["embed"] = image_description_result
 
         if hasattr(thread, "replies"):
             context["replies"] = [
                 {
-                    "author": reply.post.author.handle,
-                    "text": reply.post.record.text,
+                    "author": reply_post.author.handle,
+                    "text": reply_post.record.text,
                     **(
                         {
                             "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),
                                 ],
                             )
                         }
-                        if hasattr(reply.post.record, "embed")
-                        and hasattr(reply.post.embed, "images")
+                        if hasattr(reply_post.record, "embed")
+                        and hasattr(reply_post.embed, "images")
                         else {}
                     ),
                 }
                 for reply in thread.replies or []
-                if hasattr(reply, "post")
+                if (reply_post := getattr(reply, "post", None))
             ]
 
     return context
@@ -138,7 +141,7 @@ def explain_bsky_post(
 
     details = {
         "facts": [
-            "@<username> on blue sky will tag someone in a post",
+            "@<username> on bluesky will tag someone in a post",
             "a post embed is an image that goes with a post",
             "jlowin.dev | jeremiah is Prefect's CEO, who is the original poster",
             "zzstoatzz | alternatebuild.dev | nate is an engineer at Prefect",