Revert Factory changes; clean up some nonsense

pyomo/contrib/appsi/plugins.py

@@ -1,5 +1,5 @@
 from pyomo.common.extensions import ExtensionBuilderFactory
-from pyomo.opt.base.solvers import SolverFactory
+from pyomo.solver.factory import SolverFactory
 from .solvers import Gurobi, Ipopt, Cbc, Cplex, Highs
 from .build import AppsiBuilder
 

pyomo/solver/IPOPT.py

@@ -22,7 +22,7 @@
 from pyomo.repn.plugins.nl_writer import NLWriter, NLWriterInfo
 from pyomo.solver.base import SolverBase
 from pyomo.solver.config import SolverConfig
-from pyomo.opt.base.solvers import SolverFactory
+from pyomo.solver.factory import SolverFactory
 from pyomo.solver.results import (
     Results,
     TerminationCondition,

pyomo/solver/base.py

@@ -21,7 +21,6 @@
 from pyomo.core.base.objective import _GeneralObjectiveData
 from pyomo.common.timing import HierarchicalTimer
 from pyomo.common.errors import ApplicationError
-
 from pyomo.opt.results.results_ import SolverResults as LegacySolverResults
 from pyomo.opt.results.solution import Solution as LegacySolution
 from pyomo.core.kernel.objective import minimize

pyomo/solver/factory.py

@@ -0,0 +1,33 @@
+#  ___________________________________________________________________________
+#
+#  Pyomo: Python Optimization Modeling Objects
+#  Copyright (c) 2008-2022
+#  National Technology and Engineering Solutions of Sandia, LLC
+#  Under the terms of Contract DE-NA0003525 with National Technology and
+#  Engineering Solutions of Sandia, LLC, the U.S. Government retains certain
+#  rights in this software.
+#  This software is distributed under the 3-clause BSD License.
+#  ___________________________________________________________________________
+
+from pyomo.opt.base import SolverFactory as LegacySolverFactory
+from pyomo.common.factory import Factory
+from pyomo.solver.base import LegacySolverInterface
+
+
+class SolverFactoryClass(Factory):
+    def register(self, name, doc=None):
+        def decorator(cls):
+            self._cls[name] = cls
+            self._doc[name] = doc
+
+            # class LegacySolver(LegacySolverInterface, cls):
+            #     pass
+
+            # LegacySolverFactory.register(name, doc)(LegacySolver)
+
+            return cls
+
+        return decorator
+
+
+SolverFactory = SolverFactoryClass()

pyomo/solver/plugins.py

@@ -10,7 +10,7 @@
 #  ___________________________________________________________________________
 
 
-from pyomo.opt.base.solvers import SolverFactory
+from .factory import SolverFactory
 from .IPOPT import IPOPT