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

Clean up #3693

Merged

Conversation

NicholasTurner23
Copy link
Contributor

@NicholasTurner23 NicholasTurner23 commented Oct 19, 2024

Description

Just some clean up.

Summary by CodeRabbit

  • New Features

    • Introduced a new method for consuming messages from specified Kafka topics, enhancing message retrieval capabilities.
  • Improvements

    • Enhanced message publishing process to ensure all messages are sent before closing the producer.
    • Improved error handling for message delivery, providing better visibility into success or failure.
    • Streamlined data processing to include additional device metadata and optimize DataFrame handling.

Copy link
Contributor

coderabbitai bot commented Oct 19, 2024

📝 Walkthrough

Walkthrough

The pull request introduces significant modifications to the MessageBrokerUtils class in the src/workflows/airqo_etl_utils/message_broker_utils.py file. Key changes include the enhancement of message publishing and consumption functionalities, improved error handling, and refined data processing methods. A new method for consuming messages from Kafka topics has been added, while existing methods have been updated to optimize message delivery and data management.

Changes

File Path Change Summary
src/workflows/airqo_etl_utils/message_broker_utils.py - Modified publish_to_topic to use producer.flush() instead of producer.close().
- Added consume_from_topic method for consuming messages from Kafka.
- Enhanced error handling in __send_data with a delivery callback.
- Updated update_hourly_data_topic methods for better device metadata handling.
- Improved chunk generation in _generate_chunks for large datasets.

Possibly related PRs

  • Update/kafka implementations [WIP] #3683: This PR directly modifies the MessageBrokerUtils class in the same file as the main PR, enhancing Kafka interaction and updating the publish_to_topic and consume_from_topic methods, which are also altered in the main PR.

Suggested reviewers

  • Mnoble-19
  • BenjaminSsempala

In the land of code where messages flow,
A new method blooms, making data glow.
With chunks and callbacks, the flow's now refined,
In the Kafka realm, better messages aligned.
So here's to the changes, both bold and bright,
In the world of ETL, we take flight!


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
Contributor

@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: 0

🧹 Outside diff range and nitpick comments (3)
src/workflows/airqo_etl_utils/message_broker_utils.py (3)

Line range hint 360-426: Logical error in loop condition within consume_from_topic

The loop condition in the consume_from_topic method may not behave as expected:

while streaming or (message_count < max_messages if max_messages else True):

When max_messages is None and streaming is False, the condition simplifies to:

while False or True  # which is True

This causes the loop to run indefinitely, even when streaming is False and max_messages is not set. This might not be the intended behavior.

Consider revising the loop condition to properly handle scenarios where max_messages is None:

-        while streaming or (message_count < max_messages if max_messages else True):
+        while streaming or (max_messages is not None and message_count < max_messages):

This adjustment ensures that:

  • If streaming is True, the loop runs indefinitely.
  • If max_messages is specified, the loop runs until message_count reaches max_messages.
  • If neither streaming is True nor max_messages is specified, the loop exits appropriately.

Line range hint 399-407: Incorrect offset assignment when seeking to a specific offset

In the consume_from_topic method, when an offset is provided, the code attempts to assign partitions with the current offsets instead of the specified offset:

partitions = [
    TopicPartition(topic, p.partition, p.offset)
    for p in consumer.assignment()
]

Using p.offset does not set the partitions to the desired offset. This might prevent the consumer from starting at the intended position.

To resolve this, set the offset parameter to the provided offset value:

            if offset is not None:
                logger.info(f"Seeking to offset {offset} for all partitions...")
                partitions = [
-                   TopicPartition(topic, p.partition, p.offset)
+                   TopicPartition(topic, p.partition, offset)
                    for p in consumer.assignment()
                ]
                consumer.assign(partitions)

This change ensures that the consumer begins consuming from the specified offset for all partitions.


Line range hint 388-395: Redundant calls to consumer.seek() after assignment

When from_beginning is True, the code assigns partitions with offset=0 and then calls consumer.seek(partition) for each partition:

consumer.assign(partitions)
for partition in partitions:
    consumer.seek(partition)

However, since the partitions have already been assigned with offset=0, calling consumer.seek(partition) without specifying an offset may overwrite the intended offset or have no effect, depending on the consumer configuration.

It's more reliable to set the desired offset during assignment and omit the seek calls:

            if from_beginning:
                logger.info("Seeking to the beginning of all partitions...")
                partitions = [
                    TopicPartition(topic, p.partition, offset=0)
                    for p in consumer.assignment()
                ]
-               consumer.assign(partitions)
-               for partition in partitions:
-                   consumer.seek(partition)
+               consumer.assign(partitions)

This ensures that the consumer starts from the beginning of each partition without unnecessary redundancy.

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Files that changed from the base of the PR and between 3601d23 and 36c4b89.

📒 Files selected for processing (1)
  • src/workflows/airqo_etl_utils/message_broker_utils.py (1 hunks)
🧰 Additional context used
📓 Learnings (1)
src/workflows/airqo_etl_utils/message_broker_utils.py (1)
Learnt from: NicholasTurner23
PR: airqo-platform/AirQo-api#3683
File: src/workflows/airqo_etl_utils/message_broker_utils.py:271-302
Timestamp: 2024-10-17T21:49:16.098Z
Learning: In the `MessageBrokerUtils` class, messages are flushed in the caller method after invoking `_send_message`, so it's not necessary to call `producer.flush()` within the `_send_message` method.
🔇 Additional comments (1)
src/workflows/airqo_etl_utils/message_broker_utils.py (1)

360-360: Good practice: Flushing the producer to ensure all messages are sent

The addition of producer.flush() at the end of the publish_to_topic method ensures that all buffered messages are sent before the producer is closed. This guarantees that no messages are lost.

@Baalmart Baalmart merged commit 378ee41 into airqo-platform:staging Oct 19, 2024
44 checks passed
@Baalmart Baalmart mentioned this pull request Oct 19, 2024
1 task
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.

2 participants