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

Don't require pipeline updates when setting output schema #5181

Merged
merged 2 commits into from
Nov 23, 2024

Conversation

brimoor
Copy link
Contributor

@brimoor brimoor commented Nov 22, 2024

On develop, running a delegated operation with an output schema like this one would fail on MongoDB <5 with the following error:

pymongo.errors.OperationFailure: Invalid $set :: caused by :: an empty object is not a valid value. Found empty object at path metadata.outputs_schema.type.properties, full error: {'ok': 0.0, 'errmsg': 'Invalid $set :: caused by :: an empty object is not a valid value. Found empty object at path metadata.outputs_schema.type.properties', 'code': 40180, 'codeName': 'Location40180'}

The reason was because line 337 was attempting an update aggregation like this:

[
    {
        '$set': {
            'run_state': 'completed',
            'completed_at': datetime.datetime(2024, 11, 22, 21, 16, 17, 69660),
            'updated_at': datetime.datetime(2024, 11, 22, 21, 16, 17, 69663),
            'result': {
                'result': None,
                'executor': None,
                'error': None,
                'error_message': None,
                'delegated': False,
                'validation_ctx': None,
            },
            'metadata.outputs_schema': {
                'type': {'name': 'Object', 'properties': {}},
                'default': None,
                'required': False,
                'choices': None,
                'invalid': False,
                'error_message': '',
                'on_change': None,
                'view': {
                    'name': 'View',
                    'label': 'Request complete',
                    'description': None,
                    'caption': None,
                    'space': None,
                    'placeholder': None,
                    'read_only': None,
                    'component': None,
                    'componentsProps': None,
                    'container': None,
                },
            },
        },
    },
]

and sadly this part:

'type': {'name': 'Object', 'properties': {}},

is not supported on MongoDB < 5.

The solution is to ensure that the metadata key always exists. Then we don't need the needs_pipeline_update flag! 🎉

Summary by CodeRabbit

  • New Features

    • Enhanced handling of metadata in queued operations, ensuring it defaults to an empty dictionary.
    • Streamlined logic for updating run states, simplifying the process without altering core functionality.
  • Bug Fixes

    • Improved error handling in the queue operation method for better dataset ID resolution.
  • Tests

    • Updated unit tests to reflect changes in metadata handling, ensuring consistency in expectations.
    • Removed outdated tests related to null metadata handling.

@brimoor brimoor added the bug Bug fixes label Nov 22, 2024
@brimoor brimoor requested a review from swheaton November 22, 2024 22:18
Copy link
Contributor

coderabbitai bot commented Nov 22, 2024

Walkthrough

The changes in this pull request focus on the DelegatedOperationRepo and its subclass MongoDelegatedOperationRepo within the fiftyone library. Key modifications include the initialization of the metadata attribute in the queue_operation method, which now defaults to an empty dictionary. The update_run_state method has been simplified by removing unnecessary logic and enhancing error handling. Additionally, unit tests have been updated to reflect these changes, ensuring that the tests now expect an empty dictionary for the metadata attribute instead of None.

Changes

File Path Change Summary
fiftyone/factory/repos/delegated_operation.py - Updated queue_operation to initialize metadata to an empty dictionary.
- Simplified update_run_state by removing needs_pipeline_update logic. Enhanced error handling for dataset_id.
tests/unittests/operators/delegated_tests.py - Updated assertions in tests to check for an empty dictionary {} for metadata instead of None.
- Removed test_output_schema_null_metadata method.

Possibly related PRs

Suggested reviewers

  • swheaton
  • ritch

🐇 In the code we hop and play,
Metadata's here to stay!
With tests that check and logic bright,
Our functions now feel just right.
So let’s rejoice, both day and night! 🌟


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.

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.

Base automatically changed from fix/do-from-sdk to release/v1.1.0 November 23, 2024 01:08
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 (1)
fiftyone/factory/repos/delegated_operation.py (1)

187-188: Simplify metadata initialization

Instead of using setattr with a constant value, use direct assignment for better readability.

-        else:
-            setattr(op, "metadata", {})
+        else:
+            op.metadata = {}
🧰 Tools
🪛 Ruff (0.7.0)

188-188: Do not call setattr with a constant attribute value. It is not any safer than normal property access.

Replace setattr with assignment

(B010)

📜 Review details

Configuration used: .coderabbit.yaml
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between 03c4e84 and 4e0a5bb.

📒 Files selected for processing (2)
  • fiftyone/factory/repos/delegated_operation.py (1 hunks)
  • tests/unittests/operators/delegated_tests.py (1 hunks)
🧰 Additional context used
🪛 Ruff (0.7.0)
fiftyone/factory/repos/delegated_operation.py

188-188: Do not call setattr with a constant attribute value. It is not any safer than normal property access.

Replace setattr with assignment

(B010)

🔇 Additional comments (3)
fiftyone/factory/repos/delegated_operation.py (1)

Line range hint 301-304: Verify MongoDB compatibility for empty schema

The code now sets metadata.outputs_schema directly. Let's verify this works with MongoDB < 5.

✅ Verification successful

Empty schema update is safe for MongoDB < 5

The code change to directly set metadata.outputs_schema as an empty object ({}) is safe for all MongoDB versions. The codebase shows consistent handling of empty objects across MongoDB operations, and there's no version-specific handling required for this case.

Key observations:

  • The code has a fallback that ensures outputs_schema is always an empty object ({}) if no schema is available
  • Empty objects are a fundamental MongoDB data type supported since the earliest versions
  • The codebase already uses empty objects in other MongoDB operations without version checks
🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Check MongoDB version and test empty object handling

# Check MongoDB version
mongosh --eval "db.version()" --quiet

# Test empty object handling
mongosh --eval '
  try {
    db.test.insertOne({"metadata": {"outputs_schema": {}}});
    print("Empty object test passed");
  } catch (e) {
    print("Empty object test failed:", e.message);
  }
' --quiet

Length of output: 443


Script:

#!/bin/bash
# Let's analyze the MongoDB interaction code to understand compatibility requirements

# Search for MongoDB version checks or compatibility handling
rg -A 5 "mongodb" --glob "*.py"

# Look for MongoDB client initialization and version handling
ast-grep --pattern 'MongoClient($$$)'

# Search for MongoDB schema validation or outputs_schema handling
rg -A 5 "outputs_schema" --glob "*.py"

Length of output: 70252

🧰 Tools
🪛 Ruff (0.7.0)

180-180: Use kwargs.get("delegation_target") instead of kwargs.get("delegation_target", None)

Replace kwargs.get("delegation_target", None) with kwargs.get("delegation_target")

(SIM910)


182-182: Do not call setattr with a constant attribute value. It is not any safer than normal property access.

Replace setattr with assignment

(B010)


184-184: Use kwargs.get("metadata") instead of kwargs.get("metadata", None)

Replace kwargs.get("metadata", None) with kwargs.get("metadata")

(SIM910)


186-186: Do not call setattr with a constant attribute value. It is not any safer than normal property access.

Replace setattr with assignment

(B010)


188-188: Do not call setattr with a constant attribute value. It is not any safer than normal property access.

Replace setattr with assignment

(B010)

tests/unittests/operators/delegated_tests.py (2)

215-215: LGTM! Test assertion aligns with MongoDB compatibility changes.

The updated assertion validates that metadata defaults to an empty dictionary instead of None, which aligns with the PR's goal of ensuring compatibility with MongoDB versions below 5.

Let's verify that all similar assertions in the test file are consistent:

✅ Verification successful

All metadata assertions in the test file are consistent with the changes

The verification shows that all metadata-related assertions in the test file are properly aligned with the MongoDB compatibility changes:

  • One assertion verifies empty metadata: self.assertEqual(doc.metadata, {})
  • Another assertion verifies custom metadata: self.assertEqual(doc2.metadata, doc2_metadata)

There are no remaining assertions expecting None for metadata, confirming that the changes are consistent throughout the test file.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Check for any remaining assertions that might expect None for metadata
rg -A 2 -B 2 'assert.*metadata.*None' tests/unittests/operators/delegated_tests.py

Length of output: 84


Script:

#!/bin/bash
# Let's check all metadata-related assertions in the test file
rg -A 2 -B 2 'assert.*metadata' tests/unittests/operators/delegated_tests.py

# Also check for any other metadata comparisons
rg -A 2 -B 2 'metadata.*==' tests/unittests/operators/delegated_tests.py

Length of output: 633


Line range hint 1-1: Verify the intentional removal of test_output_schema_null_metadata.

The removal of the test method aligns with the new behavior where metadata is never None. However, this represents a breaking change in the API.

Let's check if this change is documented:

Consider documenting this breaking change in the changelog or migration guide to help users update their code that might be explicitly setting metadata to None.

Copy link
Contributor

@swheaton swheaton left a comment

Choose a reason for hiding this comment

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

🚢

@brimoor brimoor merged commit 99ee8af into release/v1.1.0 Nov 23, 2024
13 checks passed
@brimoor brimoor deleted the fix/outputs-schema branch November 23, 2024 02:47
@coderabbitai coderabbitai bot mentioned this pull request Feb 4, 2025
7 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Bug fixes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants