Unfence Focus/Bottleneck and use graphql() helper

Focus and Bottleneck were inside a code fence, which made
them uneditable copy-paste templates. Contributors can't edit
bot comments anyway, so render them as real markdown sections
and tell contributors to reply instead of edit.

Also switch create_discussion() and add_discussion_comment()
to use the shared graphql() helper so they get retry logic
on 403 rate limits.

Author: DanGould

.github/scripts/create_standup_discussion.py

@@ -74,71 +74,50 @@ def get_repo_node_id():
 
 def create_discussion(title, body, repo_node_id):
     """Create a GitHub Discussion via GraphQL and return its node ID and URL."""
-    mutation = """
-    mutation($repoId: ID!, $categoryId: ID!, $title: String!, $body: String!) {
-      createDiscussion(input: {
-        repositoryId: $repoId,
-        categoryId: $categoryId,
-        title: $title,
-        body: $body
-      }) {
-        discussion {
-          id
-          url
+    data = graphql(
+        """
+        mutation($repoId: ID!, $categoryId: ID!, $title: String!, $body: String!) {
+          createDiscussion(input: {
+            repositoryId: $repoId,
+            categoryId: $categoryId,
+            title: $title,
+            body: $body
+          }) {
+            discussion {
+              id
+              url
+            }
+          }
         }
-      }
-    }
-    """
-    resp = requests.post(
-        GRAPHQL,
-        headers=HEADERS,
-        json={
-            "query": mutation,
-            "variables": {
-                "repoId": repo_node_id,
-                "categoryId": CATEGORY_NODE_ID,
-                "title": title,
-                "body": body,
-            },
+        """,
+        {
+            "repoId": repo_node_id,
+            "categoryId": CATEGORY_NODE_ID,
+            "title": title,
+            "body": body,
         },
     )
-    resp.raise_for_status()
-    data = resp.json()
-    if "errors" in data:
-        raise RuntimeError(f"GraphQL errors: {data['errors']}")
-    discussion = data["data"]["createDiscussion"]["discussion"]
+    discussion = data["createDiscussion"]["discussion"]
     return discussion["id"], discussion["url"]
 
 
 def add_discussion_comment(discussion_id, body):
     """Add a threaded comment to a Discussion via GraphQL."""
-    mutation = """
-    mutation($discussionId: ID!, $body: String!) {
-      addDiscussionComment(input: {
-        discussionId: $discussionId,
-        body: $body
-      }) {
-        comment {
-          id
+    graphql(
+        """
+        mutation($discussionId: ID!, $body: String!) {
+          addDiscussionComment(input: {
+            discussionId: $discussionId,
+            body: $body
+          }) {
+            comment {
+              id
+            }
+          }
         }
-      }
-    }
-    """
-    resp = requests.post(
-        GRAPHQL,
-        headers=HEADERS,
-        json={
-            "query": mutation,
-            "variables": {
-                "discussionId": discussion_id,
-                "body": body,
-            },
-        },
+        """,
+        {"discussionId": discussion_id, "body": body},
     )
-    resp.raise_for_status()
-    data = resp.json()
-    if "errors" in data:
-        raise RuntimeError(f"GraphQL errors: {data['errors']}")
 
 
 SEARCH_QUERY = """
@@ -253,30 +232,25 @@ def format_contributor_comment(
             for issue in issues_opened:
                 lines.append(f"- [{issue['title']}]({issue['html_url']})")
     else:
-        lines.append("_No activity found — please edit to add yours._")
+        lines.append("_No activity found — reply to add yours._")
 
-    # Fenced template for contributor to copy-paste and fill in
     lines.append("")
-    lines.append("```")
     lines.append("### Focus")
-    lines.append("What are you working on this week? (please edit)")
+    lines.append("_What are you working on this week? (reply to this thread)_")
     lines.append("")
     lines.append("### Bottleneck")
-    lines.append("")
-    lines.append(
-        "What is the single biggest bottleneck in progress toward your greater goal?"
-    )
     lines.append(
-        "Name your goal. Name the constraint. Name who or what can unblock it."
+        "_What is the single biggest bottleneck in progress toward your "
+        "greater goal? Name your goal. Name the constraint. Name who or "
+        "what can unblock it._"
     )
     lines.append("")
     lines.append(
-        '(There\'s always one. Not just "waiting on review." Example: '
+        '_(There\'s always one. Not just "waiting on review." Example: '
         '"Goal: ship mailroom to production. Bottleneck: I need 30 min '
         "with @X to align on the ohttp-relay migration plan before I can "
-        'write the PR.")'
+        'write the PR.")_'
     )
-    lines.append("```")
     if bottlenecks:
         lines.append("")
         lines.append("_Auto-detected signals:_")
@@ -313,7 +287,7 @@ def main():
     body = (
         "Weekly standup — each contributor has a thread below "
         "with auto-gathered activity.\n\n"
-        "**Please review your thread and edit to add Focus and Bottleneck "
+        "**Please review your thread and reply with your Focus and Bottleneck "
         "by end-of-day Monday (your timezone).**"
     )
     discussion_id, discussion_url = create_discussion(title, body, repo_node_id)