cli: Remove old operations command code

Signed-off-by: John Andersen <[email protected]>

Author: pdxjohnny

CHANGELOG.md

@@ -16,6 +16,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   and all their ancestors to check redundancy (a hold over from pre uid days).
   It now correctly only uses the inputs in the parameter set. This fixes a major
   performance issue.
+### Removed
+- CLI command `operations` removed in favor of `dataflow run`
 
 ## [0.3.0] - 2019-10-26
 ### Added

dffml/cli/dataflow.py

@@ -4,8 +4,10 @@
 import contextlib
 
 from ..base import BaseConfig
+from ..df.base import BaseOrchestrator
 from ..df.types import DataFlow, Stage, Operation, Input
 from ..df.memory import (
+    MemoryOrchestrator,
     MemoryInputSet,
     MemoryInputSetConfig,
     StringInputSetContext,
@@ -17,7 +19,8 @@
 from ..util.entrypoint import load
 from ..util.cli.arg import Arg
 from ..util.cli.cmd import CMD
-from ..util.cli.cmds import SourcesCMD, KeysCMD, OrchestratorCMD
+from ..util.cli.cmds import SourcesCMD, KeysCMD
+from ..util.cli.parser import ParseInputsAction
 
 
 class Merge(CMD):
@@ -90,7 +93,7 @@ async def run(self):
                 print((await loader.dumpb(exported)).decode())
 
 
-class RunCMD(OrchestratorCMD, SourcesCMD):
+class RunCMD(SourcesCMD):
 
     arg_sources = SourcesCMD.arg_sources.modify(required=False)
     arg_caching = Arg(
@@ -124,6 +127,29 @@ class RunCMD(OrchestratorCMD, SourcesCMD):
         type=BaseConfigLoader.load,
         default=None,
     )
+    arg_orchestrator = Arg(
+        "-orchestrator", type=BaseOrchestrator.load, default=MemoryOrchestrator
+    )
+    arg_inputs = Arg(
+        "-inputs",
+        nargs="+",
+        action=ParseInputsAction,
+        default=[],
+        help="Other inputs to add under each ctx (repo's src_url will "
+        + "be used as the context)",
+    )
+    arg_repo_def = Arg(
+        "-repo-def",
+        default=False,
+        type=str,
+        help="Definition to be used for repo.src_url."
+        + "If set, repo.src_url will be added to the set of inputs "
+        + "under each context (which is also the repo's src_url)",
+    )
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.orchestrator = self.orchestrator.withconfig(self.extra_config)
 
 
 class RunAllRepos(RunCMD):

dffml/util/cli/cmds.py

@@ -1,53 +1,16 @@
 import os
-import sys
-import ast
-import copy
-import json
-import asyncio
 import inspect
-import logging
-import argparse
-from typing import Optional
 
-from ...repo import Repo
 from ...port import Port
-from ...feature import Feature, Features
 from ...source.source import BaseSource, Sources
 from ...source.json import JSONSource
 from ...source.file import FileSourceConfig
 from ...model import Model
 
-from ...df.types import Operation
-from ...df.base import (
-    Input,
-    BaseInputNetwork,
-    BaseOperationNetwork,
-    BaseLockNetwork,
-    BaseRedundancyChecker,
-    BaseOperationImplementationNetwork,
-    BaseOrchestrator,
-    StringInputSetContext,
-)
-
-from ...df.memory import (
-    MemoryInputNetwork,
-    MemoryOperationNetwork,
-    MemoryLockNetwork,
-    MemoryRedundancyChecker,
-    MemoryOperationImplementationNetwork,
-    MemoryOrchestrator,
-    MemoryInputSet,
-    MemoryInputSetConfig,
-)
 
 from .arg import Arg
 from .cmd import CMD
-from .parser import (
-    list_action,
-    ParseOutputSpecsAction,
-    ParseInputsAction,
-    ParseRemapAction,
-)
+from .parser import list_action
 
 
 class ListEntrypoint(CMD):
@@ -129,58 +92,3 @@ class KeysCMD(CMD):
         nargs="+",
         required=True,
     )
-
-
-class BaseOrchestratorCMD(CMD):
-    """
-    Data Flow commands
-    """
-
-    arg_orchestrator = Arg(
-        "-orchestrator", type=BaseOrchestrator.load, default=MemoryOrchestrator
-    )
-    arg_output_specs = Arg(
-        "-output-specs", nargs="+", action=ParseOutputSpecsAction, default=[]
-    )
-    arg_inputs = Arg(
-        "-inputs",
-        nargs="+",
-        action=ParseInputsAction,
-        default=[],
-        help="Other inputs to add under each ctx (repo's src_url will "
-        + "be used as the context)",
-    )
-    arg_repo_def = Arg(
-        "-repo-def",
-        default=False,
-        type=str,
-        help="Definition to be used for repo.src_url."
-        + "If set, repo.src_url will be added to the set of inputs "
-        + "under each context (which is also the repo's src_url)",
-    )
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.orchestrator = self.orchestrator.withconfig(self.extra_config)
-
-    # Load all entrypoints which may possibly be selected. Then have them add
-    # their arguments to the DataFlowFacilitator-tots command.
-    @classmethod
-    def add_bases(cls):
-        # TODO Add args() for each loaded class as argparse arguments
-        return cls
-        cls = copy.deepcopy(cls)
-        for base in [
-            BaseInputNetwork,
-            BaseOperationNetwork,
-            BaseLockNetwork,
-            BaseRedundancyChecker,
-            BaseOperationImplementationNetwork,
-            BaseOrchestrator,
-        ]:
-            for loaded in base.load():
-                loaded.args(cls.EXTRA_CONFIG_ARGS)
-        return cls
-
-
-OrchestratorCMD = BaseOrchestratorCMD.add_bases()

dffml/util/cli/parser.py

@@ -1,22 +1,7 @@
 # SPDX-License-Identifier: MIT
 # Copyright (c) 2019 Intel Corporation
-import os
-import sys
 import ast
-import copy
-import json
-import asyncio
-import inspect
-import logging
 import argparse
-from typing import Optional
-
-from ...repo import Repo
-from ...port import Port
-from ...feature import Feature, Features
-from ...source.source import BaseSource, Sources
-
-from ...df.base import Operation, OperationImplementation
 
 from .cmd import ParseLoggingAction
 
@@ -36,7 +21,7 @@ def __call__(self, parser, namespace, values, option_string=None):
     return ParseExpandAction
 
 
-class ParseOutputSpecsAction(argparse.Action):
+class ParseInputsAction(argparse.Action):
     def __call__(self, parser, namespace, values, option_string=None):
         if not isinstance(values, list):
             values = [values]
@@ -48,18 +33,3 @@ def __call__(self, parser, namespace, values, option_string=None):
             for value in values
         ]
         setattr(namespace, self.dest, ouput_specs)
-
-
-ParseInputsAction = ParseOutputSpecsAction
-
-
-class ParseRemapAction(argparse.Action):
-    def __call__(self, parser, namespace, values, option_string=None):
-        if not isinstance(values, list):
-            values = [values]
-        inputs = []
-        for value in values:
-            output_operation, sub = value.split(".", maxsplit=1)
-            sub, feature = sub.split("=", maxsplit=1)
-            inputs.append((output_operation, sub, feature))
-        setattr(namespace, self.dest, inputs)

tests/util/test_cli.py

@@ -21,9 +21,7 @@
 from dffml.util.cli.parser import (
     list_action,
     ParseLoggingAction,
-    ParseOutputSpecsAction,
     ParseInputsAction,
-    ParseRemapAction,
 )
 
 from dffml.util.cli.cmds import ListEntrypoint, ModelCMD
@@ -65,20 +63,6 @@ def test_logging(self):
             action(None, namespace, "WARNING")
             mock_method.assert_called_once_with(level=logging.WARNING)
 
-    def test_output_specs(self):
-        namespace = Namespace(output_specs=False)
-        action = ParseOutputSpecsAction(dest="output_specs", option_strings="")
-        action(None, namespace, ["['result']=get_single_spec"])
-        self.assertEqual(len(namespace.output_specs), 1)
-        self.assertEqual(
-            namespace.output_specs[0], (["result"], "get_single_spec")
-        )
-        action(None, namespace, "['result']=get_single_spec")
-        self.assertEqual(len(namespace.output_specs), 1)
-        self.assertEqual(
-            namespace.output_specs[0], (["result"], "get_single_spec")
-        )
-
     def test_inputs(self):
         namespace = Namespace(inputs=False)
         action = ParseInputsAction(dest="inputs", option_strings="")
@@ -89,20 +73,6 @@ def test_inputs(self):
         self.assertEqual(len(namespace.inputs), 1)
         self.assertEqual(namespace.inputs[0], (["result"], "get_single_spec"))
 
-    def test_remap(self):
-        namespace = Namespace(inputs=False)
-        action = ParseRemapAction(dest="inputs", option_strings="")
-        action(None, namespace, ["get_single.result=string_calculator"])
-        self.assertEqual(len(namespace.inputs), 1)
-        self.assertEqual(
-            namespace.inputs[0], ("get_single", "result", "string_calculator")
-        )
-        action(None, namespace, "get_single.result=string_calculator")
-        self.assertEqual(len(namespace.inputs), 1)
-        self.assertEqual(
-            namespace.inputs[0], ("get_single", "result", "string_calculator")
-        )
-
 
 class TestJSONEncoder(unittest.TestCase):
     def test_default(self):