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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ommx_python_mip_adapter
-Version: 3.0.0a4
+Version: 3.0.0a7
 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.0a4
+Requires-Dist: ommx<4.0.0,>=3.0.0a7
 Requires-Dist: mip<2.0.0,>=1.17.0
 Requires-Dist: cffi<2.0.0,>=1.15.0
 

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

@@ -6,6 +6,7 @@ import mip
 from opentelemetry import trace
 
 from ommx.adapter import (
+    DiagnosticsSink,
     SolverAdapter,
     InfeasibleDetected,
     UnboundedDetected,
@@ -72,6 +73,8 @@ class OMMXPythonMIPAdapter(SolverAdapter):
         ommx_instance: Instance,
         relax: bool = False,
         verbose: bool = False,
+        *,
+        diagnostics: DiagnosticsSink | None = None,
     ) -> Solution:
         """
         Solve the given ommx.v1.Instance using Python-MIP, returning an ommx.v1.Solution.
@@ -181,11 +184,14 @@ class OMMXPythonMIPAdapter(SolverAdapter):
                 1.0
 
         """
-        adapter = cls(ommx_instance, relax=relax, verbose=verbose)
-        model = adapter.solver_input
-        with _tracer.start_as_current_span("solve"):
-            model.optimize(relax=relax)
-        return adapter.decode(model)
+        _ = diagnostics
+        with _tracer.start_as_current_span("solve") as span:
+            span.set_attribute("adapter", f"{cls.__module__}.{cls.__qualname__}")
+            adapter = cls(ommx_instance, relax=relax, verbose=verbose)
+            model = adapter.solver_input
+            with _tracer.start_as_current_span("call"):
+                model.optimize(relax=relax)
+            return adapter.decode(model)
 
     @property
     def solver_input(self) -> mip.Model:

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ommx_python_mip_adapter
-Version: 3.0.0a4
+Version: 3.0.0a7
 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.0a4
+Requires-Dist: ommx<4.0.0,>=3.0.0a7
 Requires-Dist: mip<2.0.0,>=1.17.0
 Requires-Dist: cffi<2.0.0,>=1.15.0
 

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

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

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ommx_python_mip_adapter"
-version = "3.0.0a4"
+version = "3.0.0a7"
 
 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.0a4, < 4.0.0",
+  "ommx >= 3.0.0a7, < 4.0.0",
   "mip >= 1.17.0, < 2.0.0",
   "cffi >= 1.15.0, < 2.0.0",
 ]

{ommx_python_mip_adapter-3.0.0a4 → ommx_python_mip_adapter-3.0.0a7}/tests/test_tracing.py

@@ -16,9 +16,10 @@ def test_solve_emits_convert_solve_decode_spans():
     with capture_trace() as result:
         OMMXPythonMIPAdapter.solve(instance)
 
-    names = [s.name for s in result.spans]
-    assert "convert" in names
+    names = [span.name for span in result.spans]
     assert "solve" in names
+    assert "convert" in names
+    assert "call" in names
     assert "decode" in names
 
 
@@ -37,6 +38,6 @@ def test_manual_flow_emits_convert_and_decode_spans():
         model.optimize()
         adapter.decode(model)
 
-    names = [s.name for s in result.spans]
+    names = [span.name for span in result.spans]
     assert "convert" in names
     assert "decode" in names