Skip to content

Commit f31b1c9

Browse files
committed
more updates to use the new plugin model
1 parent bdb1ab9 commit f31b1c9

7 files changed

Lines changed: 34 additions & 20 deletions

File tree

‎paths_cli/parsing/cvs.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from .topology import build_topology
66
from .errors import InputError
77
from paths_cli.utils import import_thing
8-
from paths_cli.parsing.plugins import CVParserPlugin
8+
from paths_cli.parsing.plugins import CVParserPlugin, ParserPlugin
99

1010

1111
class AllowedPackageHandler:
@@ -57,4 +57,5 @@ def cv_kwargs_remapper(dct):
5757
'mdtraj': MDTRAJ_CV_PLUGIN,
5858
}
5959

60+
CV_PARSER = ParserPlugin(CVParserPlugin, aliases=['cvs'])
6061
cv_parser = Parser(TYPE_MAPPING, label="CVs")

‎paths_cli/parsing/engines.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from .topology import build_topology
2-
from .core import Parser, InstanceBuilder, custom_eval, Builder
2+
from .core import Parser, custom_eval, Builder
33
from paths_cli.parsing.core import Parameter
44
from .tools import custom_eval_int
55
from paths_cli.parsing.plugins import EngineParserPlugin, ParserPlugin

‎paths_cli/parsing/networks.py‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
from paths_cli.parsing.tools import custom_eval
55
from paths_cli.parsing.volumes import volume_parser
66
from paths_cli.parsing.cvs import cv_parser
7+
from paths_cli.parsing.plugins import NetworkParserPlugin, ParserPlugin
78

89
build_interface_set = InstanceBuilder(
910
builder=Builder('openpathsampling.VolumeInterfaceSet'),
@@ -13,7 +14,7 @@
1314
Parameter('minvals', custom_eval), # TODO fill in JSON types
1415
Parameter('maxvals', custom_eval), # TODO fill in JSON types
1516
],
16-
name='volume-interface-set'
17+
name='interface-set'
1718
)
1819

1920
def mistis_trans_info(dct):
@@ -41,7 +42,7 @@ def tis_trans_info(dct):
4142
'interfaces': interface_set}]
4243
return mistis_trans_info(dct)
4344

44-
build_tps_network = InstanceBuilder(
45+
build_tps_network = NetworkParserPlugin(
4546
builder=Builder('openpathsampling.TPSNetwork'),
4647
parameters=[
4748
Parameter('initial_states', volume_parser,
@@ -52,13 +53,13 @@ def tis_trans_info(dct):
5253
name='tps'
5354
)
5455

55-
build_mistis_network = InstanceBuilder(
56+
build_mistis_network = NetworkParserPlugin(
5657
parameters=[Parameter('trans_info', mistis_trans_info)],
5758
builder=Builder('openpathsampling.MISTISNetwork'),
5859
name='mistis'
5960
)
6061

61-
build_tis_network = InstanceBuilder(
62+
build_tis_network = NetworkParserPlugin(
6263
builder=Builder('openpathsampling.MISTISNetwork'),
6364
parameters=[Parameter('trans_info', tis_trans_info)],
6465
name='tis'
@@ -70,4 +71,5 @@ def tis_trans_info(dct):
7071
'mistis': build_mistis_network,
7172
}
7273

74+
NETWORK_PARSER = ParserPlugin(NetworkParserPlugin, aliases=['networks'])
7375
network_parser = Parser(TYPE_MAPPING, label="networks")

‎paths_cli/parsing/plugins.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
class ParserPlugin(OPSPlugin):
55
"""
6-
Parser plugins only need to be made for top-level
6+
Parser plugins only need to be made for top-level
77
"""
88
error_on_duplicate = False # TODO: temporary
99
def __init__(self, plugin_class, aliases=None, requires_ops=(1, 0),

‎paths_cli/parsing/root_parser.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def parser_for(parser_name):
4141
the name of the parser to use
4242
"""
4343
def load_and_call_parser(*args, **kwargs):
44-
return PARSER[parser_name](*args, **kwargs)
44+
return PARSERS[parser_name](*args, **kwargs)
4545
return load_and_call_parser
4646

4747
def _get_parser(parser_name):

‎paths_cli/parsing/schemes.py‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
from paths_cli.parsing.strategies import (
99
strategy_parser, SP_SELECTOR_PARAMETER
1010
)
11+
from paths_cli.parsing.plugins import SchemeParserPlugin, ParserPlugin
1112

1213

1314
NETWORK_PARAMETER = Parameter('network', network_parser)
@@ -17,7 +18,7 @@
1718
STRATEGIES_PARAMETER = Parameter('strategies', strategy_parser, default=None)
1819

1920

20-
build_spring_shooting_scheme = InstanceBuilder(
21+
build_spring_shooting_scheme = SchemeParserPlugin(
2122
builder=Builder('openpathsampling.SpringShootingMoveScheme'),
2223
parameters=[
2324
NETWORK_PARAMETER,
@@ -49,7 +50,7 @@ def __call__(self, dct):
4950
return scheme
5051

5152

52-
build_one_way_shooting_scheme = InstanceBuilder(
53+
build_one_way_shooting_scheme = SchemeParserPlugin(
5354
builder=BuildSchemeStrategy('openpathsampling.OneWayShootingMoveScheme',
5455
default_global_strategy=False),
5556
parameters=[
@@ -61,7 +62,7 @@ def __call__(self, dct):
6162
name='one-way-shooting',
6263
)
6364

64-
build_scheme = InstanceBuilder(
65+
build_scheme = SchemeParserPlugin(
6566
builder=BuildSchemeStrategy('openpathsampling.MoveScheme',
6667
default_global_strategy=True),
6768
parameters=[
@@ -71,6 +72,7 @@ def __call__(self, dct):
7172
name='scheme'
7273
)
7374

75+
SCHEME_PARSER = ParserPlugin(SchemeParserPlugin, aliases=['schemes'])
7476
scheme_parser = Parser(
7577
type_dispatch={
7678
'one-way-shooting': build_one_way_shooting_scheme,

‎paths_cli/parsing/strategies.py‎

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
from paths_cli.parsing.core import (
2-
InstanceBuilder, Parser, Builder, Parameter
2+
Parser, Builder, Parameter
33
)
44
from paths_cli.parsing.shooting import shooting_selector_parser
55
from paths_cli.parsing.engines import engine_parser
6+
from paths_cli.parsing.plugins import StrategyParserPlugin, ParserPlugin
67

78
def _strategy_name(class_name):
89
return f"openpathsampling.strategies.{class_name}"
@@ -27,17 +28,18 @@ def _group_parameter(group_name):
2728

2829

2930

30-
build_one_way_shooting_strategy = InstanceBuilder(
31+
build_one_way_shooting_strategy = StrategyParserPlugin(
3132
builder=Builder(_strategy_name("OneWayShootingStrategy")),
3233
parameters=[
3334
SP_SELECTOR_PARAMETER,
3435
ENGINE_PARAMETER,
3536
SHOOTING_GROUP_PARAMETER,
3637
Parameter('replace', bool, default=True)
3738
],
39+
name='one-way-shooting',
3840
)
3941

40-
build_two_way_shooting_strategy = InstanceBuilder(
42+
build_two_way_shooting_strategy = StrategyParserPlugin(
4143
builder=Builder(_strategy_name("TwoWayShootingStrategy")),
4244
parameters = [
4345
Parameter('modifier', ...),
@@ -46,50 +48,57 @@ def _group_parameter(group_name):
4648
SHOOTING_GROUP_PARAMETER,
4749
REPLACE_TRUE_PARAMETER,
4850
],
51+
name='two-way-shooting',
4952
)
5053

51-
build_nearest_neighbor_repex_strategy = InstanceBuilder(
54+
build_nearest_neighbor_repex_strategy = StrategyParserPlugin(
5255
builder=Builder(_strategy_name("NearestNeighborRepExStrategy")),
5356
parameters=[
5457
REPEX_GROUP_PARAMETER,
5558
REPLACE_TRUE_PARAMETER
5659
],
60+
name='nearest-neighbor=repex',
5761
)
5862

59-
build_all_set_repex_strategy = InstanceBuilder(
63+
build_all_set_repex_strategy = StrategyParserPlugin(
6064
builder=Builder(_strategy_name("AllSetRepExStrategy")),
6165
parameters=[
6266
REPEX_GROUP_PARAMETER,
6367
REPLACE_TRUE_PARAMETER
6468
],
69+
name='all-set-repex',
6570
)
6671

67-
build_path_reversal_strategy = InstanceBuilder(
72+
build_path_reversal_strategy = StrategyParserPlugin(
6873
builder=Builder(_strategy_name("PathReversalStrategy")),
6974
parameters=[
7075
_group_parameter('pathreversal'),
7176
REPLACE_TRUE_PARAMETER,
72-
]
77+
],
78+
name='path-reversal',
7379
)
7480

75-
build_minus_move_strategy = InstanceBuilder(
81+
build_minus_move_strategy = StrategyParserPlugin(
7682
builder=Builder(_strategy_name("MinusMoveStrategy")),
7783
parameters=[
7884
ENGINE_PARAMETER,
7985
MINUS_GROUP_PARAMETER,
8086
REPLACE_TRUE_PARAMETER,
8187
],
88+
name='minus',
8289
)
8390

84-
build_single_replica_minus_move_strategy = InstanceBuilder(
91+
build_single_replica_minus_move_strategy = StrategyParserPlugin(
8592
builder=Builder(_strategy_name("SingleReplicaMinusMoveStrategy")),
8693
parameters=[
8794
ENGINE_PARAMETER,
8895
MINUS_GROUP_PARAMETER,
8996
REPLACE_TRUE_PARAMETER,
9097
],
98+
name='single-replica-minus',
9199
)
92100

101+
STRATEGY_PARSER = ParserPlugin(StrategyParserPlugin, aliases=['strategies'])
93102
strategy_parser = Parser(
94103
type_dispatch={
95104
'one-way-shooting': build_one_way_shooting_strategy,

0 commit comments

Comments
 (0)