.get for CVS and STATES immediately returns lists

Author: dwhswenson

paths_cli/cli.py

@@ -51,7 +51,7 @@ def get_command(self, ctx, name):
         return self._get_command.get(name)
 
     def format_commands(self, ctx, formatter):
-        sec_order = ['Simulation', 'Analysis', 'Miscellaneous']
+        sec_order = ['Simulation', 'Analysis', 'Miscellaneous', 'Workflow']
         for sec in sec_order:
             cmds = self._sections.get(sec, [])
             rows = []

paths_cli/commands/strip_snapshots.py

@@ -21,11 +21,10 @@ def strip_snapshots(input_file, output_file, cv, blocksize):
     By giving the --cv option (once for each CV), you can select to only
     save certain CVs. If you do not give that option, all CVs will be saved.
     """
-    loaded_cvs = [CVS.get(cv) for cv in cv]
     return strip_snapshots_main(
         input_storage=INPUT_FILE.get(input_file),
         output_storage=OUTPUT_FILE.get(output_file),
-        cvs=loaded_cvs,
+        cvs=CVS.get(cv),
         blocksize=blocksize
     )
 

paths_cli/parameters.py

@@ -46,13 +46,14 @@ def __init__(self, param, store):
         super(OPSStorageLoadNames, self).__init__(param)
         self.store = store
 
-    def get(self, storage, name):
-        return getattr(storage, self.store)[name]
+    def get(self, storage, names):
+        return [getattr(storage, self.store)[name] for name in names]
 
 
-class OPSStorageLoadSingle(OPSStorageLoadNames):
+class OPSStorageLoadSingle(AbstractLoader):
     def __init__(self, param, store, fallback=None, num_store=None):
-        super(OPSStorageLoadSingle, self).__init__(param, store)
+        super(OPSStorageLoadSingle, self).__init__(param)
+        self.store = store
         self.fallback = fallback
         if num_store is None:
             num_store = store
@@ -99,6 +100,8 @@ def get(self, storage, name):
 
         return result
 
+
+
 def init_traj_fallback(parameter, storage, name):
     result = None
     if isinstance(name, int):

paths_cli/tests/test_parameters.py

@@ -208,23 +208,34 @@ def test_get_file(self):
         pytest.skip()
 
 
-class TestCVS(ParamInstanceTest):
+class MultiParamInstanceTest(ParamInstanceTest):
+    def _getter_test(self, getter):
+        test_file = self.create_file(getter)
+        storage = paths.Storage(self._filename(getter), mode='r')
+        get_arg = self.get_arg[getter]
+        obj_list = self.PARAMETER.get(storage, get_arg)
+        for obj in obj_list:
+            assert obj.__uuid__ == self.obj.__uuid__
+            assert obj == self.obj
+
+
+class TestCVS(MultiParamInstanceTest):
     PARAMETER = CVS
     def setup(self):
         super(TestCVS, self).setup()
-        self.get_arg = {'name': "x", 'number': 0}
+        self.get_arg = {'name': ["x"], 'number': [0]}
         self.obj = self.cv
 
     @pytest.mark.parametrize("getter", ['name', 'number'])
     def test_get(self, getter):
         self._getter_test(getter)
 
 
-class TestSTATES(ParamInstanceTest):
+class TestSTATES(MultiParamInstanceTest):
     PARAMETER = STATES
     def setup(self):
         super(TestSTATES, self).setup()
-        self.get_arg = {'name': "A", 'number': 0}
+        self.get_arg = {'name': ["A"], 'number': [0]}
         self.obj = self.state_A
 
     @pytest.mark.parametrize("getter", ['name', 'number'])
@@ -233,6 +244,6 @@ def test_get(self, getter):
 
     @pytest.mark.parametrize("getter", ['name', 'number'])
     def test_get_other(self, getter):
-        self.get_arg = {'name': 'B', 'number': 1}
+        self.get_arg = {'name': ['B'], 'number': [1]}
         self.obj = self.state_B
         self._getter_test(getter)

setup.cfg

@@ -8,6 +8,7 @@ long_description_content_type = text/markdown
 author = David W.H. Swenson
 author_email = dwhs@hyperblazer.net
 license = MIT
+license-file = LICENSE
 url = https://github.com/openpathsampling/openpathsampling-cli
 classifiers = 
     License :: OSI Approved :: MIT License