Skip to content

Commit e2de612

Browse files
authored
Merge pull request #571 from bigbio/dev
Fixing the bug for big datasets.
2 parents 99acaf7 + c9703e7 commit e2de612

File tree

8 files changed

+45
-10
lines changed

8 files changed

+45
-10
lines changed

CITATION.cff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ authors:
4242
repository-code: "https://github.com/bigbio/pmultiqc"
4343
url: "https://github.com/bigbio/pmultiqc"
4444
license: MIT
45-
version: 0.0.40
45+
version: 0.0.41
4646
identifiers:
4747
- type: doi
4848
value: 10.1101/2025.11.02.685980

README.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,12 @@ pmultiqc supports the following data sources:
6060
- `*.mzid`: Identification results
6161
- `*.mzML` or `*.mgf`: Corresponding spectra files
6262

63-
6. **[FragPipe](https://fragpipe.nesvilab.org)** files:
64-
- `psm.tsv`: FragPipe report files
63+
6. **[FragPipe](https://fragpipe.nesvilab.org)** main report files:
64+
- `psm.tsv`: FDR-filtered PSMs
65+
- `ion.tsv`: FDR-filtered ions
66+
- `combined_ion.tsv`: FDR-filtered ions
67+
- `combined_peptide.tsv`: FDR-filtered peptides
68+
- `combined_protein.tsv`: FDR-filtered proteins
6569

6670
## Installation
6771

docs/README.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,11 @@ pmultiqc supports the following data sources:
8181
- `*.mzML` or `*.mgf`: Corresponding spectra files
8282

8383
### 6. [FragPipe](https://fragpipe.nesvilab.org) files:
84-
- `psm.tsv`: FragPipe report file
84+
- `psm.tsv`: FDR-filtered PSMs
85+
- `ion.tsv`: FDR-filtered ions
86+
- `combined_ion.tsv`: FDR-filtered ions
87+
- `combined_peptide.tsv`: FDR-filtered peptides
88+
- `combined_protein.tsv`: FDR-filtered proteins
8589

8690
## 💾 Installation
8791

pmultiqc/modules/common/common_utils.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -595,6 +595,9 @@ def aggregate_general_stats(
595595
sdrf_file_df
596596
):
597597

598+
if not ms1_general_stats:
599+
return None
600+
598601
if sdrf_file_df.empty:
599602

600603
rows_by_group = dict()

pmultiqc/modules/common/dia_utils.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import itertools
22
import numpy as np
33
import pandas as pd
4-
import os
54
import re
65
from collections import OrderedDict
76
from sdrf_pipelines.openms.openms import UnimodDatabase

pmultiqc/modules/common/plots/id.py

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -857,10 +857,35 @@ def draw_identi_num(
857857

858858
def draw_modifications(sub_section, modified_data):
859859

860-
if isinstance(modified_data["plot_data"], list):
860+
plot_data = modified_data.get("plot_data", None)
861+
if not plot_data:
862+
return
863+
864+
if isinstance(plot_data, dict):
865+
iterable = [plot_data]
866+
plot_label = ["by Run"]
867+
elif isinstance(plot_data, list):
868+
iterable = plot_data
861869
plot_label = ["by Run", "by Sample"]
862870
else:
863-
plot_label = ["by Run"]
871+
log.warning(
872+
f"draw_modifications: Unsupported plot_data type: {type(plot_data)}, skipping plot."
873+
)
874+
return
875+
876+
modified_values = [
877+
value
878+
for item in iterable
879+
if isinstance(item, dict)
880+
for subdict in item.values()
881+
if isinstance(subdict, dict)
882+
for value in subdict.values()
883+
if isinstance(value, (int, float))
884+
]
885+
886+
if not any(modified_values):
887+
log.warning("draw_modifications: All plot_data values are zero, skipping plot.")
888+
return
864889

865890
draw_config = {
866891
"id": "modifications",
@@ -875,7 +900,7 @@ def draw_modifications(sub_section, modified_data):
875900
}
876901

877902
bar_html = bargraph.plot(
878-
data=modified_data["plot_data"], cats=modified_data["cats"], pconfig=draw_config
903+
data=plot_data, cats=modified_data["cats"], pconfig=draw_config
879904
)
880905
bar_html = plot_html_check(bar_html)
881906

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name = "pmultiqc"
33
description = "Python package for quality control of proteomics datasets, based on multiqc package"
44
readme = "README.md"
55
license = "MIT"
6-
version = "0.0.40"
6+
version = "0.0.41"
77
authors = [
88
"Yasset Perez-Riverol <[email protected]>",
99
"Dai Chengxin <[email protected]>",

recipe/meta.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# recipe/meta.yaml
22
{% set name = "pmultiqc" %}
3-
{% set version = "0.0.40" %}
3+
{% set version = "0.0.41" %}
44

55
package:
66
name: {{ name }}

0 commit comments

Comments
 (0)