Skip to content

chore: improve default error handling 1379 1409#1490

Merged
Alexj9837 merged 30 commits intoDiamondLightSource:chore/improve-default-error-handling-1379-1409from
Alexj9837:chore/improve-default-error-handling-1379-1409
Apr 16, 2026
Merged

chore: improve default error handling 1379 1409#1490
Alexj9837 merged 30 commits intoDiamondLightSource:chore/improve-default-error-handling-1379-1409from
Alexj9837:chore/improve-default-error-handling-1379-1409

Conversation

@Alexj9837
Copy link
Copy Markdown

rebased from main to fix merge conflicts

shree-iyengar-dls and others added 29 commits March 18, 2026 16:18
This PR contains the following updates:

| Update | Change |
|---|---|
| lockFileMaintenance | All locks refreshed |

🔧 This Pull Request updates lock files to use the latest dependency
versions.

---

### Configuration

📅 **Schedule**: Branch creation - "before 4am on monday" (UTC),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR is behind base branch, or you tick the
rebase/retry checkbox.

👻 **Immortal**: This PR will be recreated if closed unmerged. Get
[config
help](https://redirect.github.com/renovatebot/renovate/discussions) if
that's undesired.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR was generated by [Mend Renovate](https://mend.io/renovate/).
View the [repository job
log](https://developer.mend.io/github/DiamondLightSource/blueapi).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0My42Ni40IiwidXBkYXRlZEluVmVyIjoiNDMuNjYuNCIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOltdfQ==-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…DiamondLightSource#1442)

This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
|
[ytanikin/pr-conventional-commits](https://redirect.github.com/ytanikin/pr-conventional-commits)
| action | patch | `1.5.1` → `1.5.2` |

---

### Release Notes

<details>
<summary>ytanikin/pr-conventional-commits
(ytanikin/pr-conventional-commits)</summary>

###
[`v1.5.2`](https://redirect.github.com/ytanikin/pr-conventional-commits/releases/tag/1.5.2)

[Compare
Source](https://redirect.github.com/ytanikin/pr-conventional-commits/compare/1.5.1...1.5.2)

#### What's Changed

- fix: build(deps): bump minimatch from 3.1.2 to 3.1.5 by
[@&#8203;dependabot](https://redirect.github.com/dependabot)\[bot] in
[#&#8203;54](https://redirect.github.com/ytanikin/pr-conventional-commits/pull/54)

**Full Changelog**:
<ytanikin/pr-conventional-commits@1.5.1...1.5.2>

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR is behind base branch, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR was generated by [Mend Renovate](https://mend.io/renovate/).
View the [repository job
log](https://developer.mend.io/github/DiamondLightSource/blueapi).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0My42Ni40IiwidXBkYXRlZEluVmVyIjoiNDMuNjYuNCIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOltdfQ==-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…ghtSource#1434)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Zoheb Shaikh <zoheb.shaikh@diamond.ac.uk>
…ightSource#1443)

Fixes DiamondLightSource#1074

Check of version headers in the response has been added to the client
side.

---------

Co-authored-by: Zoheb Shaikh <26975142+ZohebShaikh@users.noreply.github.com>
This PR contains the following updates:

| Update | Change |
|---|---|
| lockFileMaintenance | All locks refreshed |

🔧 This Pull Request updates lock files to use the latest dependency
versions.

---

### Configuration

📅 **Schedule**: Branch creation - "before 4am on monday" (UTC),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR is behind base branch, or you tick the
rebase/retry checkbox.

👻 **Immortal**: This PR will be recreated if closed unmerged. Get
[config
help](https://redirect.github.com/renovatebot/renovate/discussions) if
that's undesired.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR was generated by [Mend Renovate](https://mend.io/renovate/).
View the [repository job
log](https://developer.mend.io/github/DiamondLightSource/blueapi).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0My45NC4xIiwidXBkYXRlZEluVmVyIjoiNDMuOTQuMSIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOltdfQ==-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Adds ci support for using merge queues.
…1463)

Add merge group to ci triggers for conventional commits.
Added missing `DataEvent` import to docs for BlueapiClient
…ondLightSource#1465)

Specify activity trigger type as checks_requested for merge_group ci
event. Currently this is the only supported activity type but this stops
us being surprised by unexpected triggers if they add more.
Allows the logging to be configured from the CLI instead of requiring a
configuration file.

Verbose option increases logging to DEBUG level while quiet reduces it
to ERROR only. If both options are passed, the second option overrides
the first.
This PR contains the following updates:

| Update | Change |
|---|---|
| lockFileMaintenance | All locks refreshed |

🔧 This Pull Request updates lock files to use the latest dependency
versions.

---

### Configuration

📅 **Schedule**: Branch creation - "before 4am on monday" (UTC),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR is behind base branch, or you tick the
rebase/retry checkbox.

👻 **Immortal**: This PR will be recreated if closed unmerged. Get
[config
help](https://redirect.github.com/renovatebot/renovate/discussions) if
that's undesired.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR was generated by [Mend Renovate](https://mend.io/renovate/).
View the [repository job
log](https://developer.mend.io/github/DiamondLightSource/blueapi).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0My4xMDIuMTEiLCJ1cGRhdGVkSW5WZXIiOiI0My4xMDIuMTEiLCJ0YXJnZXRCcmFuY2giOiJtYWluIiwibGFiZWxzIjpbXX0=-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
This PR contains the following updates:

| Update | Change |
|---|---|
| lockFileMaintenance | All locks refreshed |

🔧 This Pull Request updates lock files to use the latest dependency
versions.

---

### Configuration

📅 **Schedule**: (UTC)

- Branch creation
  - "before 4am on monday"
- Automerge
  - At any time (no schedule defined)

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR is behind base branch, or you tick the
rebase/retry checkbox.

👻 **Immortal**: This PR will be recreated if closed unmerged. Get
[config
help](https://redirect.github.com/renovatebot/renovate/discussions) if
that's undesired.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR was generated by [Mend Renovate](https://mend.io/renovate/).
View the [repository job
log](https://developer.mend.io/github/DiamondLightSource/blueapi).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0My4xMTAuMiIsInVwZGF0ZWRJblZlciI6IjQzLjExMC4yIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6W119-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…iamondLightSource#1477)

improve error handling when request receives non-JSON response.

Closes 1472
Poor grammar.

Co-authored-by: Peter Holloway <peter.holloway@diamond.ac.uk>
… having an effect when running plans - you'll still get the Unauthorised request message"
…ore/improve-default-error-handling-1379-1409
@Alexj9837 Alexj9837 changed the title Chore/improve default error handling 1379 1409 Chore: improve default error handling 1379 1409 Apr 16, 2026
@Alexj9837 Alexj9837 changed the title Chore: improve default error handling 1379 1409 chore: improve default error handling 1379 1409 Apr 16, 2026
@codecov
Copy link
Copy Markdown

codecov bot commented Apr 16, 2026

Codecov Report

❌ Patch coverage is 95.45455% with 2 lines in your changes missing coverage. Please review.
⚠️ Please upload report for BASE (chore/improve-default-error-handling-1379-1409@b3cc259). Learn more about missing BASE report.

Files with missing lines Patch % Lines
src/blueapi/client/rest.py 92.59% 2 Missing ⚠️
Additional details and impacted files
@@                                Coverage Diff                                @@
##             chore/improve-default-error-handling-1379-1409    #1490   +/-   ##
=================================================================================
  Coverage                                                  ?   95.24%           
=================================================================================
  Files                                                     ?       43           
  Lines                                                     ?     3154           
  Branches                                                  ?        0           
=================================================================================
  Hits                                                      ?     3004           
  Misses                                                    ?      150           
  Partials                                                  ?        0           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@Alexj9837 Alexj9837 marked this pull request as ready for review April 16, 2026 13:59
@Alexj9837 Alexj9837 requested a review from a team as a code owner April 16, 2026 13:59
@Alexj9837 Alexj9837 merged commit d61ea10 into DiamondLightSource:chore/improve-default-error-handling-1379-1409 Apr 16, 2026
18 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants