Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

util: Fix decoding msgpack encoded error responses #571

Merged
merged 1 commit into from
Oct 1, 2024
Merged

Conversation

lmars
Copy link
Member

@lmars lmars commented Sep 29, 2024

This updates AblyException.raise_for_response to handle msgpack encoded responses, much like Response.to_native:

content_type = self.__response.headers.get('content-type')
if isinstance(content_type, str):
if content_type.startswith('application/x-msgpack'):
return msgpack.unpackb(content)
elif content_type.startswith('application/json'):
return self.__response.json()
raise ValueError("Unsupported content type")

Fixes #569.

Summary by CodeRabbit

  • New Features

    • Introduced a centralized method for decoding error responses, enhancing flexibility in handling different content types.
  • Bug Fixes

    • Improved error handling logic to better manage responses that may not conform to expected formats.

@lmars lmars requested a review from umair-ably September 29, 2024 22:25
Copy link

coderabbitai bot commented Sep 29, 2024

Walkthrough

The changes introduced in the ably/util/exceptions.py file include the addition of a static method, decode_error_response, which enhances the error response handling by determining the appropriate decoding method based on the response's content type. The existing raise_for_response function has been updated to use this new method, improving the overall organization and flexibility of error handling within the codebase.

Changes

Files Change Summary
ably/util/exceptions.py Added method decode_error_response(response) to handle error response decoding based on content type. Modified raise_for_response to utilize the new method. Updated error handling logic and debug logging.

Assessment against linked issues

Objective Addressed Explanation
Correctly decode and return the 40010 error (569)
Ensure other error codes are decoded appropriately Unclear if other error codes were tested.

🐇 In the land of code where errors play,
A new method hops in to save the day.
With JSON and MessagePack, it takes its stance,
Decoding errors, giving them a chance!
So let’s cheer for the changes, oh what a sight,
Our SDK now shines, all errors in light! 🌟


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 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.
    • Generate unit testing code for this file.
    • 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 generate unit testing code for this file.
    • @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 generate unit testing code.
    • @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.

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 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

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 2

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Files that changed from the base of the PR and between 4066ce3 and de91d21.

📒 Files selected for processing (1)
  • ably/util/exceptions.py (3 hunks)
🧰 Additional context used
🪛 Ruff
ably/util/exceptions.py

44-46: Within an except clause, raise exceptions with raise ... from err or raise ... from None to distinguish them from errors in exception handling

(B904)

🔇 Additional comments (2)
ably/util/exceptions.py (2)

41-44: 🛠️ Refactor suggestion

Use exception chaining to preserve the original exception context

Capturing the exception as e and using exception chaining with from e retains the original traceback, which aids in debugging.

Apply this diff to modify the exception handling:

 except Exception:
     log.debug("Response not json or msgpack: %d %s",
               response.status_code,
               response.text)
-    raise AblyException(message=response.text,
-                        status_code=response.status_code,
-                        code=response.status_code * 100)
+    raise AblyException(message=response.text,
+                        status_code=response.status_code,
+                        code=response.status_code * 100) from e

Likely invalid or redundant comment.


3-3: Ensure 'msgpack' is included in the project dependencies

Since msgpack is being imported, please verify that it is listed in the project's dependencies to avoid import errors.

Run the following script to check if msgpack is included in setup.py or requirements.txt:

✅ Verification successful

'msgpack' is successfully listed in the project dependencies within pyproject.toml.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Verify that 'msgpack' is listed in the project dependencies.

# Test: Search for 'msgpack' in dependency files. Expect: 'msgpack' should be listed.
grep -H 'msgpack' setup.py requirements.txt

Length of output: 135


Script:

#!/bin/bash
# Description: Verify that 'msgpack' is listed in the project dependencies across various dependency files.

# Define an array of potential dependency files
dependency_files=("pyproject.toml" "Pipfile" "environment.yml" "tox.ini" "setup.cfg")

# Initialize a flag to track if 'msgpack' is found
found=0

# Iterate over each dependency file and search for 'msgpack'
for file in "${dependency_files[@]}"; do
  if [ -f "$file" ]; then
    echo "Searching in $file:"
    grep -i 'msgpack' "$file" && found=1
  fi
done

# If 'msgpack' was not found in any of the files
if [ $found -eq 0 ]; then
  echo "'msgpack' not found in any recognized dependency files."
fi

Length of output: 646

ably/util/exceptions.py Show resolved Hide resolved
ably/util/exceptions.py Show resolved Hide resolved
Copy link

@umair-ably umair-ably left a comment

Choose a reason for hiding this comment

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

hero - thank you!

@sacOO7
Copy link
Collaborator

sacOO7 commented Oct 1, 2024

We should also take a look at coderabbit suggestions

@lmars lmars merged commit b072909 into main Oct 1, 2024
8 of 9 checks passed
@lmars lmars deleted the fix-error-decoding branch October 1, 2024 18:04
@sacOO7
Copy link
Collaborator

sacOO7 commented Oct 1, 2024

Forgot to comment, we should have added integration test for this

@lmars
Copy link
Member Author

lmars commented Oct 1, 2024

@sacOO7

we should have added integration test for this

Existing tests were failing, so this is already covered, it's just that the tests don't run regularly, so no one noticed they started to fail.

@sacOO7
Copy link
Collaborator

sacOO7 commented Oct 1, 2024

@sacOO7

we should have added integration test for this

Existing tests were failing, so this is already covered, it's just that the tests don't run regularly, so no one noticed they started to fail.

Ohkay, got it, thanks !

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

Decoding issue for 40010 Error (Invalid Channel Name)
3 participants