ommx-python-mip-adapter 0.1.1__tar.gz → 0.3.4__tar.gz

{ommx_python_mip_adapter-0.1.1 → ommx_python_mip_adapter-0.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ommx_python_mip_adapter
-Version: 0.1.1
+Version: 0.3.4
 Summary: An adapter for the Python-MIP from/to OMMX.
 Author-email: "Jij Inc." <info@j-ij.com>
 Project-URL: Repository, https://github.com/Jij-Inc/ommx-python-mip-adapter
@@ -15,9 +15,7 @@ Classifier: License :: OSI Approved :: Apache Software License
 Classifier: License :: OSI Approved :: MIT License
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
-License-File: LICENSE-APACHE
-License-File: LICENSE-MIT
-Requires-Dist: ommx<0.3.0,>=0.2.0
+Requires-Dist: ommx<0.4.0,>=0.3.4
 Requires-Dist: mip
 Provides-Extra: dev
 Requires-Dist: markdown-code-runner; extra == "dev"
@@ -25,16 +23,17 @@ Requires-Dist: mypy; extra == "dev"
 Requires-Dist: numpy; extra == "dev"
 Requires-Dist: pyright; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
+Requires-Dist: ruff; extra == "dev"
 Requires-Dist: sphinx; extra == "dev"
-Requires-Dist: sphinx_rtd_theme; extra == "dev"
-Requires-Dist: sphinx_fontawesome; extra == "dev"
 Requires-Dist: sphinx-autoapi; extra == "dev"
+Requires-Dist: sphinx_fontawesome; extra == "dev"
+Requires-Dist: sphinx_rtd_theme; extra == "dev"
 
-OMMX adaptor for Python-MIP
+OMMX adapter for Python-MIP
 ============================
-![PyPI - Version](https://img.shields.io/pypi/v/ommx-python-mip-adapter)
+[![PyPI - Version](https://img.shields.io/pypi/v/ommx-python-mip-adapter)](https://pypi.org/project/ommx-python-mip-adapter/)
 
-This package provides an adaptor for the [Python-MIP](https://www.python-mip.com/) from/to [OMMX](https://github.com/Jij-Inc/ommx)
+This package provides an adapter for the [Python-MIP](https://www.python-mip.com/) from/to [OMMX](https://github.com/Jij-Inc/ommx)
 
 Python-MIP as a solver in OMMX toolchain
 -----------------------------------------
@@ -78,43 +77,30 @@ Python-MIP can be used through `ommx-python-mip-adapter` by using the following:
 
 ```python markdown-code-runner
 import ommx_python_mip_adapter as adapter
-from ommx.v1.decision_variables_pb2 import DecisionVariable, Bound
-from ommx.v1.instance_pb2 import Instance
-from ommx.v1.function_pb2 import Function
-from ommx.v1.linear_pb2 import Linear
-from ommx.v1.solution_pb2 import SolutionList
-
-ommx_instance = Instance(
-    decision_variables=[
-        DecisionVariable(
-            id=1,
-            kind=DecisionVariable.KIND_INTEGER,
-            bound=Bound(lower=0, upper=5),
-        ),
-    ],
-    objective=Function(
-        linear=Linear(
-            terms=[Linear.Term(id=1, coefficient=1)]
-        ),
-    ),
+from ommx.v1 import Instance, DecisionVariable
+
+x1 = DecisionVariable.integer(1, lower=0, upper=5)
+ommx_instance = Instance.from_components(
+    decision_variables=[x1],
+    objective=x1,
+    constraints=[],
+    sense=Instance.MINIMIZE,
 )
-ommx_instance_bytes = ommx_instance.SerializeToString()
 
 # Convert from `ommx.v1.Instance` to `mip.Model`
-model = adapter.instance_to_model(ommx_instance_bytes)
+model = adapter.instance_to_model(ommx_instance)
 model.optimize()
-# Create `ommx.v1.SolutionList` from Optimized `mip.Model`
-ommx_solutions_bytes = adapter.model_to_solution(
-    model, ommx_instance_bytes
-)
+# Create `ommx.v1.State` from Optimized `mip.Model`
+ommx_solutions = adapter.model_to_solution(model, ommx_instance)
 
-print(SolutionList.FromString(ommx_solutions_bytes))
+print(ommx_solutions)
 ```
+
 You can get `ommx.v1.Instance` from a Python-MIP model as the following:
+
 ```python markdown-code-runner
 import mip
 import ommx_python_mip_adapter as adapter
-from ommx.v1.instance_pb2 import Instance
 
 model = mip.Model()
 x1=model.add_var(name="1", var_type=mip.INTEGER, lb=0, ub=5)
@@ -122,9 +108,9 @@ x2=model.add_var(name="2", var_type=mip.CONTINUOUS, lb=0, ub=5)
 model.objective = - x1 - 2 * x2
 model.add_constr(x1 + x2 - 6 <= 0)
 
-ommx_instance_bytes = adapter.model_to_instance(model)
+ommx_instance = adapter.model_to_instance(model)
 
-print(Instance.FromString(ommx_instance_bytes))
+print(ommx_instance)
 ```
 
 Reference

{ommx_python_mip_adapter-0.1.1 → ommx_python_mip_adapter-0.3.4}/README.md

@@ -1,8 +1,8 @@
-OMMX adaptor for Python-MIP
+OMMX adapter for Python-MIP
 ============================
-![PyPI - Version](https://img.shields.io/pypi/v/ommx-python-mip-adapter)
+[![PyPI - Version](https://img.shields.io/pypi/v/ommx-python-mip-adapter)](https://pypi.org/project/ommx-python-mip-adapter/)
 
-This package provides an adaptor for the [Python-MIP](https://www.python-mip.com/) from/to [OMMX](https://github.com/Jij-Inc/ommx)
+This package provides an adapter for the [Python-MIP](https://www.python-mip.com/) from/to [OMMX](https://github.com/Jij-Inc/ommx)
 
 Python-MIP as a solver in OMMX toolchain
 -----------------------------------------
@@ -46,43 +46,30 @@ Python-MIP can be used through `ommx-python-mip-adapter` by using the following:
 
 ```python markdown-code-runner
 import ommx_python_mip_adapter as adapter
-from ommx.v1.decision_variables_pb2 import DecisionVariable, Bound
-from ommx.v1.instance_pb2 import Instance
-from ommx.v1.function_pb2 import Function
-from ommx.v1.linear_pb2 import Linear
-from ommx.v1.solution_pb2 import SolutionList
-
-ommx_instance = Instance(
-    decision_variables=[
-        DecisionVariable(
-            id=1,
-            kind=DecisionVariable.KIND_INTEGER,
-            bound=Bound(lower=0, upper=5),
-        ),
-    ],
-    objective=Function(
-        linear=Linear(
-            terms=[Linear.Term(id=1, coefficient=1)]
-        ),
-    ),
+from ommx.v1 import Instance, DecisionVariable
+
+x1 = DecisionVariable.integer(1, lower=0, upper=5)
+ommx_instance = Instance.from_components(
+    decision_variables=[x1],
+    objective=x1,
+    constraints=[],
+    sense=Instance.MINIMIZE,
 )
-ommx_instance_bytes = ommx_instance.SerializeToString()
 
 # Convert from `ommx.v1.Instance` to `mip.Model`
-model = adapter.instance_to_model(ommx_instance_bytes)
+model = adapter.instance_to_model(ommx_instance)
 model.optimize()
-# Create `ommx.v1.SolutionList` from Optimized `mip.Model`
-ommx_solutions_bytes = adapter.model_to_solution(
-    model, ommx_instance_bytes
-)
+# Create `ommx.v1.State` from Optimized `mip.Model`
+ommx_solutions = adapter.model_to_solution(model, ommx_instance)
 
-print(SolutionList.FromString(ommx_solutions_bytes))
+print(ommx_solutions)
 ```
+
 You can get `ommx.v1.Instance` from a Python-MIP model as the following:
+
 ```python markdown-code-runner
 import mip
 import ommx_python_mip_adapter as adapter
-from ommx.v1.instance_pb2 import Instance
 
 model = mip.Model()
 x1=model.add_var(name="1", var_type=mip.INTEGER, lb=0, ub=5)
@@ -90,9 +77,9 @@ x2=model.add_var(name="2", var_type=mip.CONTINUOUS, lb=0, ub=5)
 model.objective = - x1 - 2 * x2
 model.add_constr(x1 + x2 - 6 <= 0)
 
-ommx_instance_bytes = adapter.model_to_instance(model)
+ommx_instance = adapter.model_to_instance(model)
 
-print(Instance.FromString(ommx_instance_bytes))
+print(ommx_instance)
 ```
 
 Reference

{ommx_python_mip_adapter-0.1.1 → ommx_python_mip_adapter-0.3.4}/ommx_python_mip_adapter/__init__.py

@@ -8,4 +8,4 @@ __all__ = [
     "instance_to_model",
     "model_to_instance",
     "model_to_solution",
-]
+]

{ommx_python_mip_adapter-0.1.1 → ommx_python_mip_adapter-0.3.4}/ommx_python_mip_adapter/adapter.py

@@ -3,12 +3,11 @@ import typing as tp
 import mip
 
 from mip.exceptions import ParameterNotAvailable
-from ommx.v1.constraint_pb2 import Constraint
-from ommx.v1.decision_variables_pb2 import DecisionVariable, Bound
+from ommx.v1.constraint_pb2 import Constraint, Equality, ConstraintDescription
 from ommx.v1.function_pb2 import Function
-from ommx.v1.instance_pb2 import Instance
 from ommx.v1.linear_pb2 import Linear
-from ommx.v1.solution_pb2 import Solution, SolutionList
+from ommx.v1.solution_pb2 import State
+from ommx.v1 import Instance, DecisionVariable
 
 from ommx_python_mip_adapter.exception import OMMXPythonMIPAdapterError
 
@@ -16,71 +15,65 @@ from ommx_python_mip_adapter.exception import OMMXPythonMIPAdapterError
 class PythonMIPBuilder:
     def __init__(
         self,
-        ommx_instance_bytes: bytes,
+        instance: Instance,
         *,
         sense: str = mip.MINIMIZE,
         solver_name: str = mip.CBC,
         solver: tp.Optional[mip.Solver] = None,
     ):
-        try:
-            self._ommx_instance = Instance.FromString(ommx_instance_bytes)
-        except Exception as e:
-            raise OMMXPythonMIPAdapterError(
-                "Invalid `ommx_instance_bytes` as ommx.v1.Instance."
-            ) from e
-
+        self._ommx_instance = instance.raw
         self._model = mip.Model(
             sense=sense,
             solver_name=solver_name,
             solver=solver,
         )
 
-
     def _set_decision_variables(self):
         for var in self._ommx_instance.decision_variables:
-            if var.kind == DecisionVariable.KIND_BINARY:
+            if var.kind == DecisionVariable.BINARY:
                 self._model.add_var(
                     name=str(var.id),
                     var_type=mip.BINARY,
                 )
-            elif var.kind == DecisionVariable.KIND_INTEGER:
+            elif var.kind == DecisionVariable.INTEGER:
                 self._model.add_var(
                     name=str(var.id),
                     var_type=mip.INTEGER,
-                    lb=var.bound.lower,    # type: ignore
-                    ub=var.bound.upper,    # type: ignore
+                    lb=var.bound.lower,  # type: ignore
+                    ub=var.bound.upper,  # type: ignore
                 )
-            elif var.kind == DecisionVariable.KIND_CONTINUOUS:
+            elif var.kind == DecisionVariable.CONTINUOUS:
                 self._model.add_var(
                     name=str(var.id),
                     var_type=mip.CONTINUOUS,
-                    lb=var.bound.lower,    # type: ignore
-                    ub=var.bound.upper,    # type: ignore
+                    lb=var.bound.lower,  # type: ignore
+                    ub=var.bound.upper,  # type: ignore
                 )
             else:
                 raise OMMXPythonMIPAdapterError(
                     f"Not supported decision variable kind: "
                     f"id: {var.id}, kind: {var.kind}"
                 )
-    
-    
+
     def _make_linear_expr(
         self,
         ommx_function: Function,
-    ) -> mip.LinExpr:        
+    ) -> mip.LinExpr:
         ommx_linear = ommx_function.linear
 
-        return mip.xsum(
-            term.coefficient * self._model.vars[str(term.id)] # type: ignore
-            for term in ommx_linear.terms
-        ) + ommx_linear.constant # type: ignore
+        return (
+            mip.xsum(
+                term.coefficient * self._model.vars[str(term.id)]  # type: ignore
+                for term in ommx_linear.terms
+            )
+            + ommx_linear.constant
+        )  # type: ignore
 
-            
     def _set_objective_function(self):
         ommx_objective = self._ommx_instance.objective
 
         if ommx_objective.HasField("constant"):
-            self._model.objective = ommx_objective.constant    # type: ignore
+            self._model.objective = ommx_objective.constant  # type: ignore
         elif ommx_objective.HasField("linear"):
             self._model.objective = self._make_linear_expr(ommx_objective)
         else:
@@ -88,7 +81,6 @@ class PythonMIPBuilder:
                 "The objective function must be either `constant` or `linear`."
             )
 
-
     def _set_constraints(self):
         ommx_constraints = self._ommx_instance.constraints
 
@@ -102,18 +94,17 @@ class PythonMIPBuilder:
 
             lin_expr = self._make_linear_expr(constraint.function)
 
-            if constraint.equality == Constraint.EQUALITY_EQUAL_TO_ZERO:
-                constr_expr = (lin_expr == 0)
-            elif (constraint.equality == Constraint.EQUALITY_LESS_THAN_OR_EQUAL_TO_ZERO):
-                constr_expr = (lin_expr <= 0)    # type: ignore
+            if constraint.equality == Equality.EQUALITY_EQUAL_TO_ZERO:
+                constr_expr = lin_expr == 0
+            elif constraint.equality == Equality.EQUALITY_LESS_THAN_OR_EQUAL_TO_ZERO:
+                constr_expr = lin_expr <= 0  # type: ignore
             else:
                 raise OMMXPythonMIPAdapterError(
                     f"Not supported constraint equality: "
                     f"id: {constraint.id}, equality: {constraint.equality}"
                 )
-            
-            self._model.add_constr(constr_expr, name=str(constraint.id))
 
+            self._model.add_constr(constr_expr, name=str(constraint.id))
 
     def build(self) -> mip.Model:
         self._set_decision_variables()
@@ -135,11 +126,11 @@ class OMMXInstanceBuilder:
 
         for var in self._model.vars:
             if var.var_type == mip.BINARY:
-                kind = DecisionVariable.KIND_BINARY
+                kind = DecisionVariable.BINARY
             elif var.var_type == mip.INTEGER:
-                kind = DecisionVariable.KIND_INTEGER
+                kind = DecisionVariable.INTEGER
             elif var.var_type == mip.CONTINUOUS:
-                kind = DecisionVariable.KIND_CONTINUOUS
+                kind = DecisionVariable.CONTINUOUS
             else:
                 raise OMMXPythonMIPAdapterError(
                     f"Not supported variable type. "
@@ -147,35 +138,32 @@ class OMMXInstanceBuilder:
                 )
 
             decision_variables.append(
-                DecisionVariable(
-                    id=var.idx,
-                    kind=kind,
-                    bound=Bound(lower=var.lb, upper=var.ub),
-                    description=DecisionVariable.Description(name=var.name)
+                DecisionVariable.of_type(
+                    kind,
+                    var.idx,
+                    lower=var.lb,
+                    upper=var.ub,
+                    description=DecisionVariable.Description(name=var.name),
                 )
             )
 
         return decision_variables
-    
 
     def _make_function_from_lin_expr(
         self,
         lin_expr: mip.LinExpr,
     ) -> Function:
         terms = [
-            Linear.Term(id=var.idx, coefficient=coeff)    # type: ignore
+            Linear.Term(id=var.idx, coefficient=coeff)  # type: ignore
             for var, coeff in lin_expr.expr.items()
         ]
-        constant: float = lin_expr.const    # type: ignore
+        constant: float = lin_expr.const  # type: ignore
 
         # If the terms are empty, the function is a constant.
         if len(terms) == 0:
             return Function(constant=constant)
         else:
-            return Function(
-                linear=Linear(terms=terms, constant=constant)
-            )
-
+            return Function(linear=Linear(terms=terms, constant=constant))
 
     def _objective(self) -> Function:
         # In Python-MIP, it is allowed not to set the objective function.
@@ -186,9 +174,8 @@ class OMMXInstanceBuilder:
             objective = self._model.objective
         except ParameterNotAvailable:
             return Function(constant=0)
-        
-        return self._make_function_from_lin_expr(objective)
 
+        return self._make_function_from_lin_expr(objective)
 
     def _constraints(self) -> tp.List[Constraint]:
         constraints = []
@@ -201,55 +188,53 @@ class OMMXInstanceBuilder:
             if lin_expr.sense == "=":
                 constraint = Constraint(
                     id=id,
-                    equality=Constraint.EQUALITY_EQUAL_TO_ZERO,
+                    equality=Equality.EQUALITY_EQUAL_TO_ZERO,
                     function=self._make_function_from_lin_expr(lin_expr),
-                    description=Constraint.Description(name=name),
+                    description=ConstraintDescription(name=name),
                 )
             elif lin_expr.sense == "<":
                 constraint = Constraint(
                     id=id,
-                    equality=Constraint.EQUALITY_LESS_THAN_OR_EQUAL_TO_ZERO,
+                    equality=Equality.EQUALITY_LESS_THAN_OR_EQUAL_TO_ZERO,
                     function=self._make_function_from_lin_expr(lin_expr),
-                    description=Constraint.Description(name=name),
+                    description=ConstraintDescription(name=name),
                 )
             elif lin_expr.sense == ">":
                 # `ommx.v1.Constraint` does not support `GREATER_THAN_OR_EQUAL_TO_ZERO`.
                 # So multiply the linear expression by -1.
                 constraint = Constraint(
                     id=id,
-                    equality=Constraint.EQUALITY_LESS_THAN_OR_EQUAL_TO_ZERO,
+                    equality=Equality.EQUALITY_LESS_THAN_OR_EQUAL_TO_ZERO,
                     function=self._make_function_from_lin_expr(-lin_expr),
-                    description=Constraint.Description(name=name),
+                    description=ConstraintDescription(name=name),
                 )
             else:
                 raise OMMXPythonMIPAdapterError(
                     f"Not supported constraint sense: "
                     f"name: {constr.name}, sense: {lin_expr.sense}"
                 )
-            
+
             constraints.append(constraint)
 
         return constraints
 
-
     def _sense(self):
         if self._model.sense == mip.MAXIMIZE:
-            return Instance.SENSE_MAXIMIZE
+            return Instance.MAXIMIZE
         else:
-            return Instance.SENSE_MINIMIZE
+            return Instance.MINIMIZE
 
-
-    def build(self) -> bytes:
-        return Instance(
+    def build(self) -> Instance:
+        return Instance.from_components(
             decision_variables=self._decision_variables(),
             objective=self._objective(),
             constraints=self._constraints(),
             sense=self._sense(),
-        ).SerializeToString()
+        )
 
 
 def instance_to_model(
-    ommx_instance_bytes: bytes,
+    instance: Instance,
     *,
     sense: str = mip.MINIMIZE,
     solver_name: str = mip.CBC,
@@ -260,7 +245,7 @@ def instance_to_model(
 
     Args:
         ommx_instance_bytes (bytes): Serialized ommx.v1.Instance.
-        sense (str): mip.MINIMIZE or mip.MAXIMIZE. 
+        sense (str): mip.MINIMIZE or mip.MAXIMIZE.
         solver_name (str): mip.CBC or mip.GUROBI. Searches for which solver is available if not informed.
         solver (mip.Solver): if this argument is provided, solver_name will be ignored.
 
@@ -274,37 +259,25 @@ def instance_to_model(
         The following example of solving an unconstrained linear optimization problem with x1 as the objective function.
 
         >>> import ommx_python_mip_adapter as adapter
-        >>> from ommx.v1.decision_variables_pb2 import DecisionVariable, Bound
-        >>> from ommx.v1.instance_pb2 import Instance
-        >>> from ommx.v1.function_pb2 import Function
-        >>> from ommx.v1.linear_pb2 import Linear
-        >>> from ommx.v1.solution_pb2 import SolutionList
-        >>> ommx_instance = Instance(
-        ...     decision_variables=[
-        ...         DecisionVariable(
-        ...             id=1,
-        ...             kind=DecisionVariable.KIND_INTEGER,
-        ...             bound=Bound(lower=0, upper=5),
-        ...         ),
-        ...     ],
-        ...     objective=Function(
-        ...         linear=Linear(
-        ...             terms=[Linear.Term(id=1, coefficient=1)]
-        ...         ),
-        ...     ),
+        >>> from ommx.v1 import Instance, DecisionVariable
+
+        >>> x1 = DecisionVariable.integer(1, lower=0, upper=5)
+        >>> ommx_instance = Instance.from_components(
+        ...     decision_variables=[x1],
+        ...     objective=x1,
+        ...     constraints=[],
+        ...     sense=Instance.MINIMIZE,
         ... )
-        >>> ommx_instance_bytes = ommx_instance.SerializeToString()
-        >>> model = adapter.instance_to_model(ommx_instance_bytes)
+        >>> model = adapter.instance_to_model(ommx_instance)
         >>> model.optimize()
         <OptimizationStatus.OPTIMAL: 0>
-        >>> ommx_solutions_bytes = adapter.model_to_solution(
-        ...     model, ommx_instance_bytes
-        ... )
-        >>> SolutionList.FromString(ommx_solutions_bytes).solutions[0].entries
+
+        >>> ommx_solutions = adapter.model_to_solution(model, ommx_instance)
+        >>> ommx_solutions.entries
         {1: 0.0}
     """
     builder = PythonMIPBuilder(
-        ommx_instance_bytes,
+        instance,
         sense=sense,
         solver_name=solver_name,
         solver=solver,
@@ -312,13 +285,13 @@ def instance_to_model(
     return builder.build()
 
 
-def model_to_instance(model: mip.Model) -> bytes:
+def model_to_instance(model: mip.Model) -> Instance:
     """
     The function to convert Python-MIP Model to ommx.v1.Instance.
 
     Args:
         model (mip.Model): Python-MIP Model.
-    
+
     Returns:
         bytes: Serialized ommx.v1.Instance.
 
@@ -328,14 +301,12 @@ def model_to_instance(model: mip.Model) -> bytes:
     Examples:
         >>> import mip
         >>> import ommx_python_mip_adapter as adapter
-        >>> from ommx.v1.instance_pb2 import Instance
         >>> model = mip.Model()
         >>> x1=model.add_var(name="1", var_type=mip.INTEGER, lb=0, ub=5)
         >>> x2=model.add_var(name="2", var_type=mip.CONTINUOUS, lb=0, ub=5)
         >>> model.objective = - x1 - 2 * x2
         >>> constr = model.add_constr(x1 + x2 - 6 <= 0)
-        >>> ommx_instance_bytes = adapter.model_to_instance(model)
-        >>> ommx_instance = Instance.FromString(ommx_instance_bytes)
+        >>> ommx_instance = adapter.model_to_instance(model)
     """
     builder = OMMXInstanceBuilder(model)
     return builder.build()
@@ -343,8 +314,8 @@ def model_to_instance(model: mip.Model) -> bytes:
 
 def model_to_solution(
     model: mip.Model,
-    ommx_instance_bytes: bytes,
-) -> bytes:
+    instance: Instance,
+) -> State:
     """
     The function to create ommx.v1.SolutionList from optimized Python-MIP Model.
 
@@ -362,33 +333,21 @@ def model_to_solution(
         The following example of solving an unconstrained linear optimization problem with x1 as the objective function.
 
         >>> import ommx_python_mip_adapter as adapter
-        >>> from ommx.v1.decision_variables_pb2 import DecisionVariable, Bound
-        >>> from ommx.v1.instance_pb2 import Instance
-        >>> from ommx.v1.function_pb2 import Function
-        >>> from ommx.v1.linear_pb2 import Linear
-        >>> from ommx.v1.solution_pb2 import SolutionList
-        >>> ommx_instance = Instance(
-        ...     decision_variables=[
-        ...         DecisionVariable(
-        ...             id=1,
-        ...             kind=DecisionVariable.KIND_INTEGER,
-        ...             bound=Bound(lower=0, upper=5),
-        ...         ),
-        ...     ],
-        ...     objective=Function(
-        ...         linear=Linear(
-        ...             terms=[Linear.Term(id=1, coefficient=1)]
-        ...         ),
-        ...     ),
+        >>> from ommx.v1 import Instance, DecisionVariable
+
+        >>> x1 = DecisionVariable.integer(1, lower=0, upper=5)
+        >>> ommx_instance = Instance.from_components(
+        ...     decision_variables=[x1],
+        ...     objective=x1,
+        ...     constraints=[],
+        ...     sense=Instance.MINIMIZE,
         ... )
-        >>> ommx_instance_bytes = ommx_instance.SerializeToString()
-        >>> model = adapter.instance_to_model(ommx_instance_bytes)
+        >>> model = adapter.instance_to_model(ommx_instance)
         >>> model.optimize()
         <OptimizationStatus.OPTIMAL: 0>
-        >>> ommx_solutions_bytes = adapter.model_to_solution(
-        ...     model, ommx_instance_bytes
-        ... )
-        >>> SolutionList.FromString(ommx_solutions_bytes).solutions[0].entries
+
+        >>> ommx_solutions = adapter.model_to_solution(model, ommx_instance)
+        >>> ommx_solutions.entries
         {1: 0.0}
     """
     if not (
@@ -399,20 +358,9 @@ def model_to_solution(
             "`model.status` must be `OPTIMAL` or `FEASIBLE`."
         )
 
-    try:
-        ommx_instance = Instance.FromString(ommx_instance_bytes)
-    except Exception as e:
-        raise OMMXPythonMIPAdapterError(
-            "Invalid `ommx_instance_bytes` as ommx.v1.Instance."
-        ) from e
-
-    return SolutionList(
-        solutions=[
-            Solution(
-                entries={
-                    var.id: model.var_by_name(str(var.id)).x    # type: ignore
-                    for var in ommx_instance.decision_variables
-                }
-            )
-        ]
-    ).SerializeToString()
+    return State(
+        entries={
+            var.id: model.var_by_name(str(var.id)).x  # type: ignore
+            for var in instance.raw.decision_variables
+        }
+    )