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

feat: add cyclic check on parent_folder #1388

Merged
merged 1 commit into from
Jan 22, 2025

Conversation

Mohamed-Hacene
Copy link
Collaborator

@Mohamed-Hacene Mohamed-Hacene commented Jan 20, 2025

Summary by CodeRabbit

  • New Features
    • Added validation to prevent cycles in folder graphs
  • Documentation
    • Added error messages in English and French for folder graph cycle prevention

@ab-smith
Copy link
Contributor

@coderabbitai full review

Copy link

coderabbitai bot commented Jan 22, 2025

✅ Actions performed

Full review triggered.

Copy link

coderabbitai bot commented Jan 22, 2025

Walkthrough

The pull request introduces a new validation method validate_parent_folder in the FolderWriteSerializer class to prevent cycle creation in folder graphs. This method checks if a proposed parent folder would create a cyclic relationship, which is not allowed. Corresponding error messages have been added to both English and French translation files to provide clear feedback when such a cycle is attempted.

Changes

File Change Summary
enterprise/backend/enterprise_core/serializers.py Added validate_parent_folder method to FolderWriteSerializer to prevent folder graph cycles
frontend/messages/en.json Added English error message for folder graph cycle prevention
frontend/messages/fr.json Added French error message for folder graph cycle prevention

Sequence Diagram

sequenceDiagram
    participant User
    participant Serializer
    participant Validation
    
    User->>Serializer: Attempt to set parent folder
    Serializer->>Validation: Validate parent folder
    alt Cycle detected
        Validation-->>User: Raise ValidationError
    else No cycle
        Validation-->>Serializer: Allow parent folder
    end
Loading

Poem

🐰 A Rabbit's Graph Theory Ballad 🌳

No loops in my folder tree, oh no!
Cycles are forbidden, this I know
Parent and child must dance just right
With branching paths, both clear and bright
A graph that flows, without a knot
That's the wisdom this rabbit's got! 🌿

✨ Finishing Touches
  • 📝 Generate Docstrings (Beta)

🪧 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 generate docstrings to generate docstrings for this PR. (Beta)
  • @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: 0

🧹 Nitpick comments (1)
enterprise/backend/enterprise_core/serializers.py (1)

23-32: Improve the validation method implementation and documentation.

The validation logic is correct but can be enhanced:

  1. Simplify the nested if statements
  2. Add more details to the docstring

Apply this diff to improve the implementation:

     def validate_parent_folder(self, parent_folder):
         """
         Check that the folders graph will not contain cycles
+
+        Args:
+            parent_folder: The folder to be set as parent
+
+        Returns:
+            The validated parent_folder
+
+        Raises:
+            ValidationError: If setting this parent_folder would create a cycle in the folder graph
         """
         if not self.instance:
             return parent_folder
-        if parent_folder:
-            if parent_folder == self.instance or parent_folder in self.instance.get_sub_folders():
-                raise serializers.ValidationError("errorFolderGraphMustNotContainCycles")
+        if parent_folder and (parent_folder == self.instance or parent_folder in self.instance.get_sub_folders()):
+            raise serializers.ValidationError("errorFolderGraphMustNotContainCycles")
         return parent_folder
🧰 Tools
🪛 Ruff (0.8.2)

29-30: Use a single if statement instead of nested if statements

(SIM102)

📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between 4a0463e and 47831e2.

📒 Files selected for processing (3)
  • enterprise/backend/enterprise_core/serializers.py (1 hunks)
  • frontend/messages/en.json (1 hunks)
  • frontend/messages/fr.json (1 hunks)
🧰 Additional context used
🪛 Ruff (0.8.2)
enterprise/backend/enterprise_core/serializers.py

29-30: Use a single if statement instead of nested if statements

(SIM102)

🔇 Additional comments (2)
frontend/messages/en.json (1)

999-999: LGTM! Error message is clear and consistent.

The error message follows the same pattern as the existing asset graph error message and clearly communicates the validation failure to users.

frontend/messages/fr.json (1)

999-999: LGTM! French translation is accurate and consistent.

The French translation accurately conveys the same meaning as the English message and maintains consistency with the existing asset graph error message pattern.

Copy link
Contributor

@nas-tabchiche nas-tabchiche left a comment

Choose a reason for hiding this comment

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

LGTM. Merging

@nas-tabchiche nas-tabchiche merged commit 5d0a017 into main Jan 22, 2025
18 checks passed
@nas-tabchiche nas-tabchiche deleted the CA-758-prevent-folder-graph-from-being-cyclic branch January 22, 2025 10:54
@github-actions github-actions bot locked and limited conversation to collaborators Jan 22, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants