Skip to content

Refactor worker to use post_comment helper#22

Merged
leynos merged 5 commits intomainfrom
codex/add-post_comment-function-and-integrate
Aug 1, 2025
Merged

Refactor worker to use post_comment helper#22
leynos merged 5 commits intomainfrom
codex/add-post_comment-function-and-integrate

Conversation

@leynos
Copy link
Copy Markdown
Owner

@leynos leynos commented Jul 29, 2025

Summary

  • create post_comment helper for posting a PR comment
  • use the helper from run_worker

Testing

  • make fmt
  • make lint
  • make test

https://chatgpt.com/codex/tasks/task_e_6888f81980dc8322b0b8b666190c3a7a

Summary by Sourcery

Extract PR comment posting into a reusable helper and update the worker to use it

Enhancements:

  • Add post_comment helper that wraps GitHub API calls with a 10-second timeout
  • Refactor run_worker to call post_comment and remove inline timeout logic

@sourcery-ai
Copy link
Copy Markdown

sourcery-ai Bot commented Jul 29, 2025

Reviewer's Guide

Introduced a dedicated post_comment helper to centralize GitHub comment posting with timeout management, and refactored run_worker to leverage this helper for cleaner, DRY implementation.

Class diagram for post_comment helper and run_worker refactor

classDiagram
    class Octocrab {
    }
    class CommentRequest {
        +String owner
        +String repo
        +u64 pr_number
        +String body
    }
    class Daemon {
        +post_comment(octocrab: &Octocrab, request: &CommentRequest) Result<()>  
        +run_worker(...)
    }
    Octocrab <.. Daemon : uses
    CommentRequest <.. Daemon : uses
Loading

Flow diagram for posting a comment using the new helper

flowchart TD
    A[run_worker receives CommentRequest] --> B[Call post_comment helper]
    B --> C{Success?}
    C -- Yes --> D[Commit guard]
    C -- No --> E[Log error]
    D --> F[Sleep cooldown]
    E --> F[Sleep cooldown]
Loading

File-Level Changes

Change Details Files
Extracted post_comment helper for GitHub comments
  • Added post_comment function signature with Octocrab and CommentRequest parameters
  • Implemented 10-second timeout around issues.create_comment call
  • Mapped success and timeout/error cases to Result<()>
crates/comenqd/src/daemon.rs
Refactored run_worker to use post_comment helper
  • Removed inline issues.create_comment and manual timeout match block
  • Replaced with a single call to post_comment(&octocrab, &request).await
  • Simplified error handling by collapsing timeout and API errors into one branch
crates/comenqd/src/daemon.rs

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented Jul 29, 2025

Summary by CodeRabbit

  • Documentation

    • Improved module and function documentation for greater clarity on daemon responsibilities and comment posting behaviour.
  • Refactor

    • Streamlined comment posting logic for better error handling and maintainability.
    • Enhanced error reporting to distinguish between API failures and timeouts when posting comments.

Walkthrough

Refactor the daemon module to extract the comment-posting logic with timeout into a dedicated async function, introduce a new error enum for distinguishing API and timeout errors, and update the worker loop to use this function and handle errors more specifically. Update module-level documentation accordingly.

Changes

Cohort / File(s) Change Summary
Daemon Refactor & Error Handling
crates/comenqd/src/daemon.rs
Update module docs, introduce PostCommentError enum, extract posting logic to post_comment function, refactor run_worker to use new error handling and function.

Sequence Diagram(s)

sequenceDiagram
    participant Worker
    participant Octocrab
    participant GitHubAPI

    Worker->>Worker: Receive comment request
    Worker->>post_comment: Call with octocrab & request (with timeout)
    post_comment->>Octocrab: Attempt to post comment
    Octocrab->>GitHubAPI: Send comment
    GitHubAPI-->>Octocrab: Response (success or error)
    Octocrab-->>post_comment: Result (Ok or Error)
    post_comment-->>Worker: Result (Ok, Api error, or Timeout)
    Worker->>Worker: Log result and continue loop
Loading

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~8 minutes

Possibly related PRs

Poem

Refactor the daemon, let errors be clear,
With timeouts and enums, the intent is sincere.
Now posting a comment is tidy and neat,
Each error distinguished, no more tangled defeat.
Logs sing the story, the worker moves on—
The codebase is cleaner, the bugs nearly gone!


📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: ASSERTIVE
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between bb0e1c4 and 40aedec.

📒 Files selected for processing (1)
  • crates/comenqd/src/daemon.rs (7 hunks)
🧰 Additional context used
📓 Path-based instructions (1)
**/*.rs

⚙️ CodeRabbit Configuration File

**/*.rs: * Seek to keep the cyclomatic complexity of functions no more than 12.

  • Adhere to single responsibility and CQRS

  • Place function attributes after doc comments.

  • Do not use return in single-line functions.

  • Move conditionals with >2 branches into a predicate function.

  • Avoid unsafe unless absolutely necessary.

  • Every module must begin with a //! doc comment that explains the module's purpose and utility.

  • Comments and docs must follow en-GB-oxendict (-ize / -our) spelling and grammar

  • Lints must not be silenced except as a last resort.

    • #[allow] is forbidden.
    • Only narrowly scoped #[expect(lint, reason = "...")] is allowed.
    • No lint groups, no blanket or file-wide suppression.
    • Include FIXME: with link if a fix is expected.
  • Use rstest fixtures for shared setup and to avoid repetition between tests.

  • Replace duplicated tests with #[rstest(...)] parameterised cases.

  • Prefer mockall for mocks/stubs.

  • Prefer .expect() over .unwrap()

  • Ensure that any API or behavioural changes are reflected in the documentation in docs/

  • Ensure that any completed roadmap steps are recorded in the appropriate roadmap in docs/

  • Files must not exceed 400 lines in length

    • Large modules must be decomposed
    • Long match statements or dispatch tables should be decomposed by domain and collocated with targets
    • Large blocks of inline data (e.g., test fixtures, constants or templates) must be moved to external files and inlined at compile-time or loaded at run-time.

Files:

  • crates/comenqd/src/daemon.rs
🔇 Additional comments (6)
crates/comenqd/src/daemon.rs (6)

1-5: Excellent module documentation enhancement.

The updated module documentation clearly explains both the Unix socket listener and worker functionality, with specific mention of the timeout and cooldown features. This aligns perfectly with the coding guidelines requirement for //! module documentation.


22-31: Well-designed error enum with proper error handling.

The PostCommentError enum effectively distinguishes between API errors and timeouts, using thiserror::Error appropriately. The #[from] attribute on the Api variant provides clean conversion from octocrab::Error, and the timeout variant has a clear error message.


63-78: Clean extraction of comment posting logic with timeout.

The post_comment function properly encapsulates the GitHub API call with a 10-second timeout. The implementation correctly handles both success and error cases, mapping API errors and timeouts to the appropriate PostCommentError variants.


253-274: Improved error handling and logging in worker function.

The refactored run_worker function now uses the extracted post_comment helper and provides distinct error logging for API failures versus timeouts. This addresses the previous concern about conflating different error types in logs. The match pattern correctly handles both error variants with appropriate context logging.


33-46: Enhanced function documentation follows best practices.

The detailed documentation for build_octocrab includes proper parameter descriptions, return value explanation, and follows the established documentation style. Good improvement in code maintainability.


221-243: Comprehensive documentation update for run_worker.

The enhanced documentation clearly explains the worker's behaviour, including the cooldown mechanism, error handling strategy, and queue management. The example code provides useful context for users of this function.

✨ Finishing Touches
  • 📝 Generate Docstrings
🧪 Generate unit tests
  • Create PR with unit tests
  • Post copyable unit tests in a comment
  • Commit unit tests in branch codex/add-post_comment-function-and-integrate

🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Explain this complex logic.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai explain this code block.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and explain its main purpose.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR.
  • @coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
  • @coderabbitai generate unit tests to generate unit tests for this PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link
Copy Markdown

@sourcery-ai sourcery-ai Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey @leynos - I've reviewed your changes and found some issues that need to be addressed.

Prompt for AI Agents
Please address the comments from this code review:
## Individual Comments

### Comment 1
<location> `crates/comenqd/src/daemon.rs:144` </location>
<code_context>
-        let post = issues.create_comment(request.pr_number, &request.body);
-        match tokio::time::timeout(Duration::from_secs(10), post).await {
-            Ok(Ok(_)) => {
+        match post_comment(&octocrab, &request).await {
+            Ok(_) => {
                 guard.commit()?;
</code_context>

<issue_to_address>
Error logging now conflates API errors and timeouts.

If monitoring or debugging requires distinguishing between timeouts and API errors, consider using separate log messages or error types.
</issue_to_address>

### Comment 2
<location> `crates/comenqd/src/daemon.rs:42` </location>
<code_context>
 }

+/// Post a comment to GitHub with a 10 second timeout.
+async fn post_comment(octocrab: &Octocrab, request: &CommentRequest) -> Result<()> {
+    let issues = octocrab.issues(&request.owner, &request.repo);
+    let fut = issues.create_comment(request.pr_number, &request.body);
</code_context>

<issue_to_address>
The module is missing a `//!` comment at the top as required by the review instructions.

Please add a `//!` module-level comment at the very top of the file to describe its purpose, as per the project guidelines.
</issue_to_address>

Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

Comment thread crates/comenqd/src/daemon.rs
Comment thread crates/comenqd/src/daemon.rs Outdated
@leynos
Copy link
Copy Markdown
Owner Author

leynos commented Aug 1, 2025

@coderabbitai review

@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented Aug 1, 2025

✅ Actions performed

Review triggered.

Note: CodeRabbit is an incremental review system and does not re-review already reviewed commits. This command is applicable only when automatic reviews are paused.

coderabbitai Bot added a commit that referenced this pull request Aug 1, 2025
Docstrings generation was requested by @leynos.

* #22 (comment)

The following files were modified:

* `crates/comenqd/src/daemon.rs`
@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented Aug 1, 2025

Note

Generated docstrings for this pull request at #30

)

* 📝 Add docstrings to `codex/add-post_comment-function-and-integrate`

Docstrings generation was requested by @leynos.

* #22 (comment)

The following files were modified:

* `crates/comenqd/src/daemon.rs`

* Remove examples from non-public functions

---------

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Co-authored-by: Leynos <leynos@troubledskies.net>
@leynos
Copy link
Copy Markdown
Owner Author

leynos commented Aug 1, 2025

@coderabbitai review

@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented Aug 1, 2025

✅ Actions performed

Review triggered.

Note: CodeRabbit is an incremental review system and does not re-review already reviewed commits. This command is applicable only when automatic reviews are paused.

@leynos
Copy link
Copy Markdown
Owner Author

leynos commented Aug 1, 2025

@coderabbitai review

@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented Aug 1, 2025

✅ Actions performed

Review triggered.

Note: CodeRabbit is an incremental review system and does not re-review already reviewed commits. This command is applicable only when automatic reviews are paused.

@leynos leynos merged commit a090de5 into main Aug 1, 2025
1 check passed
@leynos leynos deleted the codex/add-post_comment-function-and-integrate branch August 1, 2025 20:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant