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

major changes in mztab for large datasets #43

Merged
merged 4 commits into from
Dec 20, 2024
Merged

major changes in mztab for large datasets #43

merged 4 commits into from
Dec 20, 2024

Conversation

ypriverol
Copy link
Member

@ypriverol ypriverol commented Dec 20, 2024

Summary by CodeRabbit

  • New Features

    • Updated version number to 0.0.18.
    • Introduced a new command-line option --enable_diann2mztab for more flexible mzTab conversion control.
  • Documentation

    • Updated documentation for the diann2mztab function to include the new parameter.

Copy link
Contributor

coderabbitai bot commented Dec 20, 2024

Walkthrough

The pull request introduces two main changes: updating the module version number and adding a new command-line option to control mzTab conversion in the diann2mztab function. The version number is incremented from "0.0.17" to "0.0.18" in the __init__.py file. In the diann2mztab.py file, a new parameter enable_diann2mztab is added to the function, allowing users to optionally enable or disable mzTab format conversion.

Changes

File Change Summary
quantmsutils/__init__.py Version number updated from "0.0.17" to "0.0.18"
quantmsutils/diann/diann2mztab.py Added enable_diann2mztab parameter to control mzTab conversion

Sequence Diagram

sequenceDiagram
    participant User
    participant diann2mztab Function
    User->>diann2mztab Function: Call with enable_diann2mztab flag
    alt Flag is True
        diann2mztab Function->>mzTab: Convert to mzTab
    else Flag is False
        diann2mztab Function->>Other Formats: Convert to MSstats/Triqler
    end
Loading

Poem

🐰 A rabbit's tale of version might,
Code evolves with each new height,
mzTab conversion, now with grace,
A flag to control its embrace,
Hopping forward, version takes flight! 🚀

Tip

CodeRabbit's docstrings feature is now available as part of our Early Access Program! Simply use the command @coderabbitai generate docstrings to have CodeRabbit automatically generate docstrings for your pull request. We would love to hear your feedback on Discord.


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

🔭 Outside diff range comments (1)
quantmsutils/diann/diann2mztab.py (1)

Line range hint 1392-1394: Optimize protein coverage calculation for large datasets

The protein coverage calculation could be optimized by using vectorized operations and reducing memory usage.

-    for acc in acc_to_ids:
-        matches = fasta_df[fasta_df["id"].str.contains(acc)]["id"]
+    # Vectorize the operation using pandas str.extract
+    pattern = "|".join(map(re.escape, acc_to_ids.keys()))
+    matches = fasta_df["id"].str.extract(f"({pattern})", expand=False)
+    acc_to_fasta_ids = dict(zip(matches.dropna(), fasta_df.loc[matches.dropna().index, "id"]))

Also applies to: 1401-1403

🧹 Nitpick comments (3)
quantmsutils/diann/diann2mztab.py (3)

48-48: Improve the click option description

The click option could benefit from a more descriptive help message to explain its purpose and default value.

-@click.option("--enable_diann2mztab", "-e", is_flag=True)
+@click.option("--enable_diann2mztab", "-e", is_flag=True, help="Enable conversion to mzTab format. Disabled by default to improve performance for large datasets.")

Line range hint 1024-1025: Consider extracting file finding logic into a separate function

The file finding logic in __find_info could be moved to a utility function as it might be useful in other contexts.

+def find_file_by_pattern(directory: Path, pattern: str) -> Path:
+    """Find a file matching the given pattern in the directory.
+    
+    Args:
+        directory: Directory to search in
+        pattern: File pattern to match
+        
+    Returns:
+        Path to the matched file
+        
+    Raises:
+        ValueError: If no file or multiple files are found
+    """
+    files = list(Path(directory).rglob(pattern))
+    if not files:
+        raise ValueError(f"Could not find file matching pattern {pattern} in {directory}")
+    if len(files) > 1:
+        raise ValueError(f"Found multiple files matching pattern {pattern} in {directory}: {files}")
+    return files[0]
+
 def __find_info(directory, n):
-    files = list(Path(directory).rglob(f"{n}_ms_info.parquet"))
-    if not files:
-        raise ValueError(f"Could not find {n} info file in {directory}")
-    if len(files) > 1:
-        raise ValueError(f"Found multiple {n} info files in {directory}: {files}")
-    return files[0]
+    return find_file_by_pattern(directory, f"{n}_ms_info.parquet")

Also applies to: 1031-1032


Line range hint 1024-1032: Add input validation for directory parameter

The __find_info function should validate the input directory parameter.

 def __find_info(directory, n):
+    if not isinstance(directory, (str, Path)):
+        raise TypeError(f"directory must be a string or Path, got {type(directory)}")
+    directory = Path(directory)
+    if not directory.exists():
+        raise ValueError(f"Directory {directory} does not exist")
     files = list(Path(directory).rglob(f"{n}_ms_info.parquet"))
     if not files:
         raise ValueError(f"Could not find {n} info file in {directory}")
     if len(files) > 1:
         raise ValueError(f"Found multiple {n} info files in {directory}: {files}")
     return files[0]
📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between fb53a7b and 1ee7ee8.

📒 Files selected for processing (2)
  • quantmsutils/__init__.py (1 hunks)
  • quantmsutils/diann/diann2mztab.py (3 hunks)
✅ Files skipped from review due to trivial changes (1)
  • quantmsutils/init.py
🔇 Additional comments (1)
quantmsutils/diann/diann2mztab.py (1)

182-192: LGTM! Well-structured conditional block

The mzTab conversion is properly encapsulated within the conditional block, allowing users to skip this conversion for better performance with large datasets.

Comment on lines +185 to +191
diann_directory.convert_to_mztab(
report=report,
f_table=f_table,
charge=charge,
missed_cleavages=missed_cleavages,
dia_params=dia_params,
out=mztab_out,
Copy link
Contributor

Choose a reason for hiding this comment

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

🛠️ Refactor suggestion

Improve error handling in convert_to_mztab

The function should handle potential errors during file operations and data processing.

 diann_directory.convert_to_mztab(
     report=report,
     f_table=f_table,
     charge=charge,
     missed_cleavages=missed_cleavages,
     dia_params=dia_params,
     out=mztab_out,
+    try:
+        diann_directory.convert_to_mztab(
+            report=report,
+            f_table=f_table,
+            charge=charge,
+            missed_cleavages=missed_cleavages,
+            dia_params=dia_params,
+            out=mztab_out,
+        )
+    except Exception as e:
+        logger.error(f"Failed to convert to mzTab format: {str(e)}")
+        raise

Committable suggestion skipped: line range outside the PR's diff.

@ypriverol ypriverol merged commit 3aa1a35 into main Dec 20, 2024
7 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.

2 participants