Merge branch 'main' into patch-3

.github/workflows/build-docs.yml

@@ -13,7 +13,7 @@ on:
 
 env:
   MKDOCS_SOCIAL_CARDS: ${{ vars.MKDOCS_SOCIAL_CARDS }}
-  MKDOCS_MATERIAL_INSIDERS_REPO_RO: ${{ secrets.MKDOCS_MATERIAL_INSIDERS_REPO_RO }}
+  MKDOCS_MATERIAL_INSIDERS_CONTENTS_RO: ${{ secrets.MKDOCS_MATERIAL_INSIDERS_CONTENTS_RO }}
 
 permissions:
   contents: write
@@ -34,7 +34,7 @@ jobs:
         run: pip install -U uv && uv venv
 
       - name: Install Material Insiders
-        run: pip install git+https://oauth:${MKDOCS_MATERIAL_INSIDERS_REPO_RO}@github.com/PrefectHQ/mkdocs-material-insiders.git
+        run: pip install git+https://oauth:${MKDOCS_MATERIAL_INSIDERS_CONTENTS_RO}@github.com/PrefectHQ/mkdocs-material-insiders.git
 
       # for now, only install mkdocs. In the future may need to install Marvin itself.
       - name: Install dependencies for MKDocs Material
@@ -47,4 +47,4 @@ jobs:
           cairosvg
       - name: Build docs
         run: |
-          mkdocs build --config-file mkdocs.insiders.yml
+          mkdocs build --config-file mkdocs.insiders.yml

.github/workflows/publish-docs.yml

@@ -8,7 +8,7 @@ on:
 
 env:
   MKDOCS_SOCIAL_CARDS: ${{ vars.MKDOCS_SOCIAL_CARDS }}
-  MKDOCS_MATERIAL_INSIDERS_REPO_RO: ${{ secrets.MKDOCS_MATERIAL_INSIDERS_REPO_RO }}
+  MKDOCS_MATERIAL_INSIDERS_REPO_RO: ${{ secrets.MKDOCS_MATERIAL_INSIDERS_CONTENTS_RO }}
 
 permissions:
   contents: write

cookbook/slackbot/start.py

@@ -19,6 +19,7 @@
 )
 from marvin.utilities.strings import count_tokens, slice_tokens
 from prefect import flow, task
+from prefect.blocks.notifications import SlackWebhook
 from prefect.states import Completed
 from prefect.variables import Variable
 from tools import (
@@ -126,7 +127,16 @@ async def handle_message(payload: SlackPayload):
 
 @app.post("/chat")
 async def chat_endpoint(request: Request):
-    payload = SlackPayload(**await request.json())
+    try:
+        payload = SlackPayload(**await request.json())
+    except Exception as e:
+        logger.error(f"Error parsing Slack payload: {e}")
+        slack_webhook = await SlackWebhook.load("marvin-bot-pager")
+        await slack_webhook.notify(  # type: ignore
+            body=f"Error parsing Slack payload: {e}",
+            subject="Slackbot Error",
+        )
+        raise HTTPException(400, "Invalid event type")
     match payload.type:
         case "event_callback":
             options = dict(
@@ -146,6 +156,7 @@ async def chat_endpoint(request: Request):
 
 if __name__ == "__main__":
     if not os.getenv("OPENAI_API_KEY", None):  # TODO: Remove this
-        os.environ["OPENAI_API_KEY"] = marvin.settings.openai.api_key.get_secret_value()
+        assert (api_key := marvin.settings.openai.api_key), "OPENAI_API_KEY not set"
+        os.environ["OPENAI_API_KEY"] = api_key.get_secret_value()
 
     uvicorn.run(app, host="0.0.0.0", port=4200)

src/marvin/utilities/slack.py

@@ -2,10 +2,10 @@
 
 import os
 import re
-from typing import List, Optional, Union
+from typing import Any, Dict, List, Optional, Union
 
 import httpx
-from pydantic import BaseModel, field_validator
+from pydantic import BaseModel, ValidationInfo, field_validator, model_validator
 
 import marvin
 
@@ -31,7 +31,7 @@ class SlackEvent(BaseModel):
     client_msg_id: Optional[str] = None
     type: str
     text: Optional[str] = None
-    user: Optional[str] = None
+    user: Union[str, Dict[str, Any], None] = None
     ts: Optional[str] = None
     team: Optional[str] = None
     channel: Optional[str] = None
@@ -40,6 +40,13 @@ class SlackEvent(BaseModel):
     parent_user_id: Optional[str] = None
     blocks: Optional[List[EventBlock]] = None
 
+    @model_validator(mode="before")
+    @classmethod
+    def extract_user_id(cls, data: Dict[str, Any]) -> Dict[str, Any]:
+        if isinstance(data.get("user"), dict):
+            data["user"] = data["user"].get("id")
+        return data
+
 
 class EventAuthorization(BaseModel):
     enterprise_id: Optional[str] = None
@@ -63,8 +70,10 @@ class SlackPayload(BaseModel):
     challenge: Optional[str] = None
 
     @field_validator("event")
-    def validate_event(cls, v: Optional[SlackEvent]) -> Optional[SlackEvent]:
-        if v.type != "url_verification" and v is None:
+    def validate_event(
+        cls, v: Optional[SlackEvent], info: ValidationInfo
+    ) -> Optional[SlackEvent]:
+        if v is None and info.data.get("type") != "url_verification":
             raise ValueError("event is required")
         return v