ommx-python-mip-adapter 3.0.0a2__tar.gz → 3.0.0a4__tar.gz

{ommx_python_mip_adapter-3.0.0a2 → ommx_python_mip_adapter-3.0.0a4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ommx_python_mip_adapter
-Version: 3.0.0a2
+Version: 3.0.0a4
 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
@@ -15,7 +15,7 @@ Classifier: License :: OSI Approved :: Apache Software License
 Classifier: License :: OSI Approved :: MIT License
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
-Requires-Dist: ommx<4.0.0,>=3.0.0a2
+Requires-Dist: ommx<4.0.0,>=3.0.0a4
 Requires-Dist: mip<2.0.0,>=1.17.0
 Requires-Dist: cffi<2.0.0,>=1.15.0
 

{ommx_python_mip_adapter-3.0.0a2 → ommx_python_mip_adapter-3.0.0a4}/ommx_python_mip_adapter/adapter.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 from typing import Optional
 
 import mip
+from opentelemetry import trace
 
 from ommx.adapter import (
     SolverAdapter,
@@ -14,6 +15,8 @@ from ommx.v1 import Instance, Constraint, DecisionVariable, Solution, State, Fun
 
 from .exception import OMMXPythonMIPAdapterError
 
+_tracer = trace.get_tracer("ommx.adapter.python_mip")
+
 
 class OMMXPythonMIPAdapter(SolverAdapter):
     def __init__(
@@ -32,33 +35,36 @@ class OMMXPythonMIPAdapter(SolverAdapter):
         :param solver: Passes a specific solver to the Python-MIP model.
         :param verbose: If True, enable Python-MIP's verbose mode
         """
-        super().__init__(ommx_instance)
-        if ommx_instance.sense == Instance.MAXIMIZE:
-            sense = mip.MAXIMIZE
-        elif ommx_instance.sense == Instance.MINIMIZE:
-            sense = mip.MINIMIZE
-        else:
-            raise OMMXPythonMIPAdapterError(f"Unsupported sense: {ommx_instance.sense}")
-        self.instance = ommx_instance
-        self.model = mip.Model(
-            sense=sense,
-            solver_name=solver_name,
-            solver=solver,
-        )
-        if verbose:
-            self.model.verbose = 1
-        else:
-            self.model.verbose = 0
+        with _tracer.start_as_current_span("convert"):
+            super().__init__(ommx_instance)
+            if ommx_instance.sense == Instance.MAXIMIZE:
+                sense = mip.MAXIMIZE
+            elif ommx_instance.sense == Instance.MINIMIZE:
+                sense = mip.MINIMIZE
+            else:
+                raise OMMXPythonMIPAdapterError(
+                    f"Unsupported sense: {ommx_instance.sense}"
+                )
+            self.instance = ommx_instance
+            self.model = mip.Model(
+                sense=sense,
+                solver_name=solver_name,
+                solver=solver,
+            )
+            if verbose:
+                self.model.verbose = 1
+            else:
+                self.model.verbose = 0
 
-        self._set_decision_variables()
-        self._set_objective()
-        self._set_constraints()
+            self._set_decision_variables()
+            self._set_objective()
+            self._set_constraints()
 
-        if relax:
-            self.model.relax()
-            self._relax = True
-        else:
-            self._relax = False
+            if relax:
+                self.model.relax()
+                self._relax = True
+            else:
+                self._relax = False
 
     @classmethod
     def solve(
@@ -177,7 +183,8 @@ class OMMXPythonMIPAdapter(SolverAdapter):
         """
         adapter = cls(ommx_instance, relax=relax, verbose=verbose)
         model = adapter.solver_input
-        model.optimize(relax=relax)
+        with _tracer.start_as_current_span("solve"):
+            model.optimize(relax=relax)
         return adapter.decode(model)
 
     @property
@@ -234,24 +241,25 @@ class OMMXPythonMIPAdapter(SolverAdapter):
             42.0
 
         """
-        state = self.decode_to_state(data)
-        solution = self.instance.evaluate(state)
-
-        dual_variables = {}
-        for constraint in data.constrs:
-            pi = constraint.pi
-            if pi is not None:
-                id = int(constraint.name)
-                dual_variables[id] = pi
-        for constraint_id, dual_value in dual_variables.items():
-            solution.set_dual_variable(constraint_id, dual_value)
-
-        if data.status == mip.OptimizationStatus.OPTIMAL:
-            solution.optimality = Solution.OPTIMAL
-
-        if self._relax:
-            solution.relaxation = Solution.LP_RELAXED
-        return solution
+        with _tracer.start_as_current_span("decode"):
+            state = self.decode_to_state(data)
+            solution = self.instance.evaluate(state)
+
+            dual_variables = {}
+            for constraint in data.constrs:
+                pi = constraint.pi
+                if pi is not None:
+                    id = int(constraint.name)
+                    dual_variables[id] = pi
+            for constraint_id, dual_value in dual_variables.items():
+                solution.set_dual_variable(constraint_id, dual_value)
+
+            if data.status == mip.OptimizationStatus.OPTIMAL:
+                solution.optimality = Solution.OPTIMAL
+
+            if self._relax:
+                solution.relaxation = Solution.LP_RELAXED
+            return solution
 
     def decode_to_state(self, data: mip.Model) -> State:
         """

{ommx_python_mip_adapter-3.0.0a2 → ommx_python_mip_adapter-3.0.0a4}/ommx_python_mip_adapter.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ommx_python_mip_adapter
-Version: 3.0.0a2
+Version: 3.0.0a4
 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
@@ -15,7 +15,7 @@ Classifier: License :: OSI Approved :: Apache Software License
 Classifier: License :: OSI Approved :: MIT License
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
-Requires-Dist: ommx<4.0.0,>=3.0.0a2
+Requires-Dist: ommx<4.0.0,>=3.0.0a4
 Requires-Dist: mip<2.0.0,>=1.17.0
 Requires-Dist: cffi<2.0.0,>=1.15.0
 

{ommx_python_mip_adapter-3.0.0a2 → ommx_python_mip_adapter-3.0.0a4}/ommx_python_mip_adapter.egg-info/SOURCES.txt

@@ -12,4 +12,5 @@ ommx_python_mip_adapter.egg-info/top_level.txt
 tests/test_adapter.py
 tests/test_constant_constraint.py
 tests/test_integration.py
-tests/test_model_to_instance.py
+tests/test_model_to_instance.py
+tests/test_tracing.py

{ommx_python_mip_adapter-3.0.0a2 → ommx_python_mip_adapter-3.0.0a4}/ommx_python_mip_adapter.egg-info/requires.txt

@@ -1,3 +1,3 @@
-ommx<4.0.0,>=3.0.0a2
+ommx<4.0.0,>=3.0.0a4
 mip<2.0.0,>=1.17.0
 cffi<2.0.0,>=1.15.0

{ommx_python_mip_adapter-3.0.0a2 → ommx_python_mip_adapter-3.0.0a4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ommx_python_mip_adapter"
-version = "3.0.0a2"
+version = "3.0.0a4"
 
 description = "An adapter for the Python-MIP from/to OMMX."
 authors = [{ name = "Jij Inc.", email = "info@j-ij.com" }]
@@ -23,7 +23,7 @@ classifiers = [
 ]
 
 dependencies = [
-  "ommx >= 3.0.0a2, < 4.0.0",
+  "ommx >= 3.0.0a4, < 4.0.0",
   "mip >= 1.17.0, < 2.0.0",
   "cffi >= 1.15.0, < 2.0.0",
 ]

ommx_python_mip_adapter-3.0.0a4/tests/test_tracing.py

@@ -0,0 +1,42 @@
+from ommx.tracing import capture_trace
+from ommx.v1 import DecisionVariable, Instance
+
+from ommx_python_mip_adapter import OMMXPythonMIPAdapter
+
+
+def test_solve_emits_convert_solve_decode_spans():
+    x = [DecisionVariable.binary(i) for i in range(3)]
+    instance = Instance.from_components(
+        decision_variables=x,
+        objective=x[0] + x[1] + x[2],
+        constraints={0: x[0] + x[1] + x[2] <= 2},
+        sense=Instance.MINIMIZE,
+    )
+
+    with capture_trace() as result:
+        OMMXPythonMIPAdapter.solve(instance)
+
+    names = [s.name for s in result.spans]
+    assert "convert" in names
+    assert "solve" in names
+    assert "decode" in names
+
+
+def test_manual_flow_emits_convert_and_decode_spans():
+    x = [DecisionVariable.binary(i) for i in range(3)]
+    instance = Instance.from_components(
+        decision_variables=x,
+        objective=x[0] + x[1] + x[2],
+        constraints={0: x[0] + x[1] + x[2] <= 2},
+        sense=Instance.MINIMIZE,
+    )
+
+    with capture_trace() as result:
+        adapter = OMMXPythonMIPAdapter(instance)
+        model = adapter.solver_input
+        model.optimize()
+        adapter.decode(model)
+
+    names = [s.name for s in result.spans]
+    assert "convert" in names
+    assert "decode" in names