Skip to content

Commit 9e50434

Browse files
authored
Merge pull request #186 from MannLabs/185-fix-psm-reader-register
#185 transfer GUI only supports best supported psm_readers
2 parents 0154483 + d6b701e commit 9e50434

File tree

9 files changed

+28
-35
lines changed

9 files changed

+28
-35
lines changed

.gitignore

+8-16
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
# User defined:
2+
peptdeep/logs
3+
*.DS_Store
4+
*sandbox*
5+
*installed_models*
6+
*.last_checked*
7+
*mono_crash.*.blob
8+
19
# Byte-compiled / optimized / DLL files
210
__pycache__/
311
*.py[cod]
@@ -128,19 +136,3 @@ dmypy.json
128136

129137
# Pyre type checker
130138
.pyre/
131-
132-
# User defined:
133-
peptdeep/logs
134-
*.DS_Store
135-
*sandbox*
136-
*installed_models*
137-
*.last_checked*
138-
139-
# nbdev2
140-
*.gitattributes
141-
_docs*
142-
# *_quarto.yml
143-
# *sidebar.yml
144-
*_proc*
145-
# .gitconfig is now autogenerated
146-
.gitconfig

peptdeep/_modidx.py

-1
This file was deleted.

peptdeep/constants/default_settings.yaml

+1-2
Original file line numberDiff line numberDiff line change
@@ -265,10 +265,9 @@ library:
265265
max_precursor_mz: 2000.0
266266
decoy: None
267267
decoy_choices:
268-
- protein_reverse
268+
- None
269269
- pseudo_reverse
270270
- diann
271-
- None
272271
max_frag_charge: 2
273272
frag_types:
274273
- b

peptdeep/webui/__init__.py

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Starting the gui will raise by OpenMP in LLVM package
2+
# `OMP: Error #15: Initializing libomp.dylib, but found libomp.dylib already initialized.`
3+
# This is a quick fix, and it will only affect the GUI rather than the kernel.
4+
import os
5+
6+
os.environ["KMP_DUPLICATE_LIB_OK"] = "True"

peptdeep/webui/rescore_ui.py

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
import streamlit as st
2-
import pandas as pd
32
import os
4-
import time
53

64
from .ui_utils import files_in_folder_pandas
75
from peptdeep.settings import global_settings

peptdeep/webui/server.py

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import time
22
import os
3-
import sys
43
import shutil
54
import multiprocessing as mp
65

peptdeep/webui/server_ui.py

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import streamlit as st
22
import os
33
import psutil
4-
import time
54

65
from alphabase.yaml_utils import load_yaml
76

peptdeep/webui/settings_ui.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,9 @@
99
from peptdeep.settings import (
1010
update_settings,
1111
add_user_defined_modifications,
12+
global_settings,
1213
)
1314

14-
from peptdeep.settings import global_settings
15-
1615
global_ui_settings = global_settings
1716

1817

peptdeep/webui/transfer_ui.py

+12-10
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import streamlit as st
22
import pandas as pd
33
import os
4-
import time
54
from datetime import datetime
65

76
from alphabase.yaml_utils import save_yaml
@@ -140,6 +139,16 @@ def _clear_user_mods():
140139

141140

142141
def show():
142+
psm_type_to_ext_dict = {
143+
"alphapept": ".ms_data.hdf",
144+
"pfind": ".spectra",
145+
"maxquant": "msms.txt",
146+
"diann": "tsv",
147+
"speclib_tsv": "tsv",
148+
"msfragger_pepxml": "pepxml",
149+
}
150+
used_psm_types = list(psm_type_to_ext_dict.keys())
151+
143152
st.write("# Transfer learning")
144153

145154
model_output_folder = st.text_input(
@@ -159,20 +168,13 @@ def show():
159168
st_key="select_psm_type",
160169
default_type=global_ui_settings["model_mgr"]["transfer"]["psm_type"],
161170
monitor_files=global_ui_settings["model_mgr"]["transfer"]["psm_files"],
162-
choices=global_ui_settings["model_mgr"]["transfer"]["psm_type_choices"],
163-
index=global_ui_settings["model_mgr"]["transfer"]["psm_type_choices"].index(
171+
choices=used_psm_types,
172+
index=used_psm_types.index(
164173
global_ui_settings["model_mgr"]["transfer"]["psm_type"]
165174
),
166175
)
167176
global_ui_settings["model_mgr"]["transfer"]["psm_type"] = psm_type
168177

169-
psm_type_to_ext_dict = {
170-
"alphapept": ".ms_data.hdf",
171-
"pfind": ".spectra",
172-
"maxquant": "msms.txt",
173-
"diann": "tsv",
174-
"speclib_tsv": "tsv",
175-
}
176178
global_ui_settings["model_mgr"]["transfer"]["psm_type"] = psm_type
177179
select_files(
178180
global_ui_settings["model_mgr"]["transfer"]["psm_files"],

0 commit comments

Comments
 (0)