Skip to content

Commit 7ad2fcf

Browse files
committed
[TYPING](ALL): Fix typing errors
1 parent 14f7e2e commit 7ad2fcf

15 files changed

+32
-17
lines changed

biobb_structure_utils/utils/cat_pdb.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
"""Module containing the CatPDB class and the command line interface."""
44
import argparse
5+
from typing import Optional
56
from biobb_common.configuration import settings
67
from biobb_common.generic.biobb_object import BiobbObject
78
from biobb_common.tools.file_utils import launchlogger
@@ -114,7 +115,7 @@ def launch(self) -> int:
114115
return self.return_code
115116

116117

117-
def cat_pdb(input_structure1: str, input_structure2: str, output_structure_path: str, properties: dict = None, **kwargs) -> int:
118+
def cat_pdb(input_structure1: str, input_structure2: str, output_structure_path: str, properties: Optional[dict] = None, **kwargs) -> int:
118119
"""Execute the :class:`CatPDB <utils.cat_pdb.CatPDB>` class and
119120
execute the :meth:`launch() <utils.cat_pdb.CatPDB.launch>` method."""
120121

biobb_structure_utils/utils/closest_residues.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
"""Module containing the ClosestResidues class and the command line interface."""
44
import argparse
5+
from typing import Optional
56
import Bio.PDB
67
from biobb_common.configuration import settings
78
from biobb_common.generic.biobb_object import BiobbObject
@@ -171,7 +172,7 @@ def launch(self) -> int:
171172
return self.return_code
172173

173174

174-
def closest_residues(input_structure_path: str, output_residues_path: str, properties: dict = None, **kwargs) -> int:
175+
def closest_residues(input_structure_path: str, output_residues_path: str, properties: Optional[dict] = None, **kwargs) -> int:
175176
"""Execute the :class:`ClosestResidues <utils.closest_residues.ClosestResidues>` class and
176177
execute the :meth:`launch() <utils.closest_residues.ClosestResidues.launch>` method."""
177178

biobb_structure_utils/utils/extract_atoms.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
"""Module containing the ExtractAtoms class and the command line interface."""
44
import argparse
5+
from typing import Optional
56
import re
67
from pathlib import Path
78
from biobb_common.configuration import settings
@@ -124,7 +125,7 @@ def launch(self) -> int:
124125
return self.return_code
125126

126127

127-
def extract_atoms(input_structure_path: str, output_structure_path: str, properties: dict = None, **kwargs) -> int:
128+
def extract_atoms(input_structure_path: str, output_structure_path: str, properties: Optional[dict] = None, **kwargs) -> int:
128129
"""Execute the :class:`ExtractAtoms <utils.extract_atoms.ExtractAtoms>` class and
129130
execute the :meth:`launch() <utils.extract_atoms.ExtractAtoms.launch>` method."""
130131

biobb_structure_utils/utils/extract_chain.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
"""Module containing the ExtractChain class and the command line interface."""
44
import argparse
5+
from typing import Optional
56
import shutil
67
from biobb_common.configuration import settings
78
from biobb_common.generic.biobb_object import BiobbObject
@@ -137,7 +138,7 @@ def check_format_chains(chains, out_log):
137138
return ','.join(chains)
138139

139140

140-
def extract_chain(input_structure_path: str, output_structure_path: str, properties: dict = None, **kwargs) -> int:
141+
def extract_chain(input_structure_path: str, output_structure_path: str, properties: Optional[dict] = None, **kwargs) -> int:
141142
"""Execute the :class:`ExtractChain <utils.extract_chain.ExtractChain>` class and
142143
execute the :meth:`launch() <utils.extract_chain.ExtractChain.launch>` method."""
143144

biobb_structure_utils/utils/extract_heteroatoms.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
"""Module containing the ExtractHeteroAtoms class and the command line interface."""
44
import argparse
5+
from typing import Optional
56
from biobb_common.configuration import settings
67
from biobb_common.generic.biobb_object import BiobbObject
78
from biobb_common.tools import file_utils as fu
@@ -142,7 +143,7 @@ def launch(self) -> int:
142143
return self.return_code
143144

144145

145-
def extract_heteroatoms(input_structure_path: str, output_heteroatom_path: str, properties: dict = None, **kwargs) -> int:
146+
def extract_heteroatoms(input_structure_path: str, output_heteroatom_path: str, properties: Optional[dict] = None, **kwargs) -> int:
146147
"""Execute the :class:`ExtractHeteroAtoms <utils.extract_heteroatoms.ExtractHeteroAtoms>` class and
147148
execute the :meth:`launch() <utils.extract_heteroatoms.ExtractHeteroAtoms.launch>` method."""
148149

biobb_structure_utils/utils/extract_model.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
"""Module containing the ExtractModel class and the command line interface."""
44
import argparse
5+
from typing import Optional
56
import shutil
67
from biobb_common.configuration import settings
78
from biobb_common.generic.biobb_object import BiobbObject
@@ -149,7 +150,7 @@ def check_format_models(models, out_log):
149150
return models
150151

151152

152-
def extract_model(input_structure_path: str, output_structure_path: str, properties: dict = None, **kwargs) -> int:
153+
def extract_model(input_structure_path: str, output_structure_path: str, properties: Optional[dict] = None, **kwargs) -> int:
153154
"""Execute the :class:`ExtractModel <utils.extract_model.ExtractModel>` class and
154155
execute the :meth:`launch() <utils.extract_model.ExtractModel.launch>` method."""
155156

biobb_structure_utils/utils/extract_molecule.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
"""Module containing the ExtractMolecule class and the command line interface."""
44
import argparse
5+
from typing import Optional
56
from biobb_common.configuration import settings
67
from biobb_common.generic.biobb_object import BiobbObject
78
from biobb_common.tools.file_utils import launchlogger
@@ -123,7 +124,7 @@ def launch(self) -> int:
123124

124125
# Remove temporal files
125126
self.tmp_files.extend([
126-
self.stage_io_dict.get("unique_dir"),
127+
self.stage_io_dict.get("unique_dir", ""),
127128
tmp_folder
128129
])
129130
self.remove_tmp_files()
@@ -133,7 +134,7 @@ def launch(self) -> int:
133134
return self.return_code
134135

135136

136-
def extract_molecule(input_structure_path: str, output_molecule_path: str, properties: dict = None, **kwargs) -> int:
137+
def extract_molecule(input_structure_path: str, output_molecule_path: str, properties: Optional[dict] = None, **kwargs) -> int:
137138
"""Execute the :class:`ExtractMolecule <utils.extract_molecule.ExtractMolecule>` class and
138139
execute the :meth:`launch() <utils.extract_molecule.ExtractMolecule.launch>` method."""
139140

biobb_structure_utils/utils/extract_residues.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
"""Module containing the ExtractResidues class and the command line interface."""
44
import argparse
5+
from typing import Optional
56
from biobb_common.configuration import settings
67
from biobb_common.generic.biobb_object import BiobbObject
78
from biobb_common.tools import file_utils as fu
@@ -133,7 +134,7 @@ def launch(self) -> int:
133134
return self.return_code
134135

135136

136-
def extract_residues(input_structure_path: str, output_residues_path: str, properties: dict = None, **kwargs) -> int:
137+
def extract_residues(input_structure_path: str, output_residues_path: str, properties: Optional[dict] = None, **kwargs) -> int:
137138
"""Execute the :class:`ExtractResidues <utils.extract_residues.ExtractResidues>` class and
138139
execute the :meth:`launch() <utils.extract_residues.ExtractResidues.launch>` method."""
139140

biobb_structure_utils/utils/remove_ligand.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
"""Module containing the RemoveLigand class and the command line interface."""
44
import argparse
5+
from typing import Optional
56
from pathlib import Path
67
from biobb_common.configuration import settings
78
from biobb_common.generic.biobb_object import BiobbObject
@@ -110,7 +111,7 @@ def launch(self) -> int:
110111
return self.return_code
111112

112113

113-
def remove_ligand(input_structure_path: str, output_structure_path: str, properties: dict = None, **kwargs) -> int:
114+
def remove_ligand(input_structure_path: str, output_structure_path: str, properties: Optional[dict] = None, **kwargs) -> int:
114115
"""Execute the :class:`RemoveLigand <utils.remove_ligand.RemoveLigand>` class and
115116
execute the :meth:`launch() <utils.remove_ligand.RemoveLigand.launch>` method."""
116117

biobb_structure_utils/utils/remove_molecules.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
"""Module containing the RemoveMolecules class and the command line interface."""
44
import argparse
5+
from typing import Optional
56
from biobb_common.configuration import settings
67
from biobb_common.generic.biobb_object import BiobbObject
78
from biobb_common.tools import file_utils as fu
@@ -138,7 +139,7 @@ def launch(self) -> int:
138139
return self.return_code
139140

140141

141-
def remove_molecules(input_structure_path: str, output_molecules_path: str, properties: dict = None, **kwargs) -> int:
142+
def remove_molecules(input_structure_path: str, output_molecules_path: str, properties: Optional[dict] = None, **kwargs) -> int:
142143
"""Execute the :class:`RemoveMolecules <utils.remove_molecules.RemoveMolecules>` class and
143144
execute the :meth:`launch() <utils.remove_molecules.RemoveMolecules.launch>` method."""
144145

biobb_structure_utils/utils/remove_pdb_water.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
"""Module containing the RemovePdbWater class and the command line interface."""
44
import argparse
5+
from typing import Optional
56
from biobb_common.configuration import settings
67
from biobb_common.generic.biobb_object import BiobbObject
78
from biobb_common.tools.file_utils import launchlogger
@@ -92,7 +93,7 @@ def launch(self) -> int:
9293
return self.return_code
9394

9495

95-
def remove_pdb_water(input_pdb_path: str, output_pdb_path: str, properties: dict = None, **kwargs) -> int:
96+
def remove_pdb_water(input_pdb_path: str, output_pdb_path: str, properties: Optional[dict] = None, **kwargs) -> int:
9697
"""Execute the :class:`RemovePdbWater <utils.remove_pdb_water.RemovePdbWater>` class and
9798
execute the :meth:`launch() <utils.remove_pdb_water.RemovePdbWater.launch>` method."""
9899

biobb_structure_utils/utils/renumber_structure.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"""Module containing the RenumberStructure class and the command line interface."""
44
import json
55
import argparse
6+
from typing import Optional
67
from pathlib import Path
78
from biobb_common.configuration import settings
89
from biobb_common.generic.biobb_object import BiobbObject
@@ -149,7 +150,7 @@ def launch(self) -> int:
149150
return self.return_code
150151

151152

152-
def renumber_structure(input_structure_path: str, output_structure_path: str, output_mapping_json_path: str, properties: dict = None, **kwargs) -> int:
153+
def renumber_structure(input_structure_path: str, output_structure_path: str, output_mapping_json_path: str, properties: Optional[dict] = None, **kwargs) -> int:
153154
"""Execute the :class:`RenumberStructure <utils.renumber_structure.RenumberStructure>` class and
154155
execute the :meth:`launch() <utils.renumber_structure.RenumberStructure.launch>` method."""
155156

biobb_structure_utils/utils/sort_gro_residues.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
"""Module containing the SortGroResidues class and the command line interface."""
44
import argparse
5+
from typing import Optional
56
from biobb_common.configuration import settings
67
from biobb_common.generic.biobb_object import BiobbObject
78
from biobb_common.tools.file_utils import launchlogger
@@ -93,7 +94,7 @@ def launch(self) -> int:
9394
return self.return_code
9495

9596

96-
def sort_gro_residues(input_gro_path: str, output_gro_path: str, properties: dict = None, **kwargs) -> int:
97+
def sort_gro_residues(input_gro_path: str, output_gro_path: str, properties: Optional[dict] = None, **kwargs) -> int:
9798
"""Execute the :class:`SortGroResidues <utils.sort_gro_residues.SortGroResidues>` class and
9899
execute the :meth:`launch() <utils.sort_gro_residues.SortGroResidues.launch>` method."""
99100

biobb_structure_utils/utils/str_check_add_hydrogens.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
"""Module containing the StrCheckAddHydrogens class and the command line interface."""
44
import argparse
5+
from typing import Optional
56
from biobb_common.configuration import settings
67
from biobb_common.generic.biobb_object import BiobbObject
78
from biobb_common.tools.file_utils import launchlogger
@@ -133,7 +134,7 @@ def launch(self) -> int:
133134
return self.return_code
134135

135136

136-
def str_check_add_hydrogens(input_structure_path: str, output_structure_path: str, properties: dict = None, **kwargs) -> int:
137+
def str_check_add_hydrogens(input_structure_path: str, output_structure_path: str, properties: Optional[dict] = None, **kwargs) -> int:
137138
"""Execute the :class:`StrCheckAddHydrogens <utils.str_check_add_hydrogens.StrCheckAddHydrogens>` class and
138139
execute the :meth:`launch() <utils.str_check_add_hydrogens.StrCheckAddHydrogens.launch>` method."""
139140

biobb_structure_utils/utils/structure_check.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
"""Module containing the StructureCheck class and the command line interface."""
44
import argparse
5+
from typing import Optional
56
from biobb_common.configuration import settings
67
from biobb_common.generic.biobb_object import BiobbObject
78
from biobb_common.tools.file_utils import launchlogger
@@ -124,7 +125,7 @@ def launch(self) -> int:
124125

125126
# Remove temporal files
126127
self.tmp_files.extend([
127-
self.stage_io_dict.get("unique_dir"),
128+
self.stage_io_dict.get("unique_dir", ""),
128129
tmp_folder
129130
])
130131
self.remove_tmp_files()
@@ -134,7 +135,7 @@ def launch(self) -> int:
134135
return self.return_code
135136

136137

137-
def structure_check(input_structure_path: str, output_summary_path: str, properties: dict = None, **kwargs) -> int:
138+
def structure_check(input_structure_path: str, output_summary_path: str, properties: Optional[dict] = None, **kwargs) -> int:
138139
"""Execute the :class:`StructureCheck <utils.structure_check.StructureCheck>` class and
139140
execute the :meth:`launch() <utils.structure_check.StructureCheck.launch>` method."""
140141

0 commit comments

Comments
 (0)