Skip to content

Commit bdb1ab9

Browse files
committed
proof of principle for plugin registration
1 parent e513680 commit bdb1ab9

5 files changed

Lines changed: 31 additions & 12 deletions

File tree

‎paths_cli/parsing/core.py‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import yaml
55

66
from collections import namedtuple, abc
7+
import warnings
78

89
import logging
910

@@ -217,7 +218,10 @@ def __call__(self, dct):
217218

218219
class Parser:
219220
"""Generic parse class; instances for each category"""
221+
error_on_duplicate = False # TODO: temporary
220222
def __init__(self, type_dispatch, label):
223+
if type_dispatch is None:
224+
type_dispatch = {}
221225
self.type_dispatch = type_dispatch
222226
self.label = label
223227
self.named_objs = {}
@@ -253,8 +257,12 @@ def register_object(self, obj, name):
253257

254258
def register_builder(self, builder, name):
255259
if name in self.type_dispatch:
256-
raise RuntimeError(f"'{builder.name}' is already registered "
257-
f"with {self.label}")
260+
msg = (f"'{builder.name}' is already registered "
261+
f"with {self.label}")
262+
if self.error_on_duplicate:
263+
raise RuntimeError(msg)
264+
else:
265+
warnings.warn(msg)
258266
self.type_dispatch[name] = builder
259267

260268
def parse(self, dct):

‎paths_cli/parsing/networks.py‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
"for this interface set"),
1313
Parameter('minvals', custom_eval), # TODO fill in JSON types
1414
Parameter('maxvals', custom_eval), # TODO fill in JSON types
15-
]
15+
],
16+
name='volume-interface-set'
1617
)
1718

1819
def mistis_trans_info(dct):
@@ -47,17 +48,20 @@ def tis_trans_info(dct):
4748
description="initial states for this transition"),
4849
Parameter('final_states', volume_parser,
4950
description="final states for this transition")
50-
]
51+
],
52+
name='tps'
5153
)
5254

5355
build_mistis_network = InstanceBuilder(
5456
parameters=[Parameter('trans_info', mistis_trans_info)],
5557
builder=Builder('openpathsampling.MISTISNetwork'),
58+
name='mistis'
5659
)
5760

5861
build_tis_network = InstanceBuilder(
5962
builder=Builder('openpathsampling.MISTISNetwork'),
6063
parameters=[Parameter('trans_info', tis_trans_info)],
64+
name='tis'
6165
)
6266

6367
TYPE_MAPPING = {

‎paths_cli/parsing/root_parser.py‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
from paths_cli.parsing.core import Parser
1+
from paths_cli.parsing.core import Parser, InstanceBuilder
22
from paths_cli.parsing.engines import engine_parser
33
from paths_cli.parsing.cvs import cv_parser
44
from paths_cli.parsing.volumes import volume_parser
55
from paths_cli.parsing.networks import network_parser
66
from paths_cli.parsing.schemes import scheme_parser
7+
from paths_cli.parsing.plugins import ParserPlugin
78

89

910
TYPE_MAPPING = {
@@ -49,7 +50,7 @@ def _get_parser(parser_name):
4950
"""
5051
parser = PARSERS.get(parser_name, None)
5152
if parser is None:
52-
parser = Parser(None, parse_name)
53+
parser = Parser(None, parser_name)
5354
PARSERS[parser_name] = parser
5455
return parser
5556

@@ -62,7 +63,8 @@ def _get_registration_names(plugin):
6263
"""
6364
ordered_names = []
6465
found_names = set([])
65-
for name in [plugin.name] + plugin.aliases:
66+
aliases = [] if plugin.aliases is None else plugin.aliases
67+
for name in [plugin.name] + aliases:
6668
if name not in found_names:
6769
ordered_names.append(name)
6870
found_names.add(name)

‎paths_cli/parsing/schemes.py‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@
2424
Parameter('k_spring', custom_eval),
2525
Parameter('delta_max', custom_eval),
2626
ENGINE_PARAMETER
27-
]
27+
],
28+
name='spring-shooting',
2829
)
2930

3031
class BuildSchemeStrategy:
@@ -56,7 +57,8 @@ def __call__(self, dct):
5657
SP_SELECTOR_PARAMETER,
5758
ENGINE_PARAMETER,
5859
STRATEGIES_PARAMETER,
59-
]
60+
],
61+
name='one-way-shooting',
6062
)
6163

6264
build_scheme = InstanceBuilder(
@@ -65,7 +67,8 @@ def __call__(self, dct):
6567
parameters=[
6668
NETWORK_PARAMETER,
6769
STRATEGIES_PARAMETER,
68-
]
70+
],
71+
name='scheme'
6972
)
7073

7174
scheme_parser = Parser(

‎paths_cli/parsing/shooting.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77

88
build_uniform_selector = InstanceBuilder(
99
builder=Builder('openpathsampling.UniformSelector'),
10-
parameters=[]
10+
parameters=[],
11+
name='uniform',
1112
)
1213

1314
def remapping_gaussian_stddev(dct):
@@ -23,7 +24,8 @@ def remapping_gaussian_stddev(dct):
2324
Parameter('cv', cv_parser),
2425
Parameter('mean', custom_eval),
2526
Parameter('stddev', custom_eval),
26-
]
27+
],
28+
name='gaussian',
2729
)
2830

2931
shooting_selector_parser = Parser(

0 commit comments

Comments
 (0)