solverforge 0.7.0__tar.gz → 0.7.1__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (86) hide show
  1. {solverforge-0.7.0 → solverforge-0.7.1}/Cargo.lock +1 -1
  2. {solverforge-0.7.0 → solverforge-0.7.1}/Cargo.toml +1 -1
  3. {solverforge-0.7.0 → solverforge-0.7.1}/PKG-INFO +5 -5
  4. {solverforge-0.7.0 → solverforge-0.7.1}/README.md +4 -4
  5. {solverforge-0.7.0 → solverforge-0.7.1}/pyproject.toml +1 -1
  6. {solverforge-0.7.0 → solverforge-0.7.1}/python/solverforge/__init__.py +1 -1
  7. {solverforge-0.7.0 → solverforge-0.7.1}/src/runtime/dynamic_provider.rs +24 -15
  8. {solverforge-0.7.0 → solverforge-0.7.1}/src/score.rs +1 -1
  9. {solverforge-0.7.0 → solverforge-0.7.1}/src/state/callback_view.rs +3 -5
  10. {solverforge-0.7.0 → solverforge-0.7.1}/LICENSE +0 -0
  11. {solverforge-0.7.0 → solverforge-0.7.1}/python/solverforge/_native.pyi +0 -0
  12. {solverforge-0.7.0 → solverforge-0.7.1}/python/solverforge/config.py +0 -0
  13. {solverforge-0.7.0 → solverforge-0.7.1}/python/solverforge/console.py +0 -0
  14. {solverforge-0.7.0 → solverforge-0.7.1}/python/solverforge/constraints.py +0 -0
  15. {solverforge-0.7.0 → solverforge-0.7.1}/python/solverforge/decorators.py +0 -0
  16. {solverforge-0.7.0 → solverforge-0.7.1}/python/solverforge/errors.py +0 -0
  17. {solverforge-0.7.0 → solverforge-0.7.1}/python/solverforge/events.py +0 -0
  18. {solverforge-0.7.0 → solverforge-0.7.1}/python/solverforge/fields.py +0 -0
  19. {solverforge-0.7.0 → solverforge-0.7.1}/python/solverforge/groups.py +0 -0
  20. {solverforge-0.7.0 → solverforge-0.7.1}/python/solverforge/joiner.py +0 -0
  21. {solverforge-0.7.0 → solverforge-0.7.1}/python/solverforge/manager.py +0 -0
  22. {solverforge-0.7.0 → solverforge-0.7.1}/python/solverforge/model.py +0 -0
  23. {solverforge-0.7.0 → solverforge-0.7.1}/python/solverforge/py.typed +0 -0
  24. {solverforge-0.7.0 → solverforge-0.7.1}/python/solverforge/score.py +0 -0
  25. {solverforge-0.7.0 → solverforge-0.7.1}/python/solverforge/solver.py +0 -0
  26. {solverforge-0.7.0 → solverforge-0.7.1}/python/solverforge/typing.py +0 -0
  27. {solverforge-0.7.0 → solverforge-0.7.1}/python/solverforge/ui.py +0 -0
  28. {solverforge-0.7.0 → solverforge-0.7.1}/rust-toolchain.toml +0 -0
  29. {solverforge-0.7.0 → solverforge-0.7.1}/src/bindings.rs +0 -0
  30. {solverforge-0.7.0 → solverforge-0.7.1}/src/callbacks/call.rs +0 -0
  31. {solverforge-0.7.0 → solverforge-0.7.1}/src/callbacks/mod.rs +0 -0
  32. {solverforge-0.7.0 → solverforge-0.7.1}/src/callbacks/registry.rs +0 -0
  33. {solverforge-0.7.0 → solverforge-0.7.1}/src/callbacks/threading.rs +0 -0
  34. {solverforge-0.7.0 → solverforge-0.7.1}/src/config.rs +0 -0
  35. {solverforge-0.7.0 → solverforge-0.7.1}/src/constraints/compiled.rs +0 -0
  36. {solverforge-0.7.0 → solverforge-0.7.1}/src/constraints/compiled_dispatch_tests.rs +0 -0
  37. {solverforge-0.7.0 → solverforge-0.7.1}/src/constraints/evaluate.rs +0 -0
  38. {solverforge-0.7.0 → solverforge-0.7.1}/src/constraints/incremental.rs +0 -0
  39. {solverforge-0.7.0 → solverforge-0.7.1}/src/constraints/list_precedence.rs +0 -0
  40. {solverforge-0.7.0 → solverforge-0.7.1}/src/constraints/list_precedence_tests.rs +0 -0
  41. {solverforge-0.7.0 → solverforge-0.7.1}/src/constraints/matches.rs +0 -0
  42. {solverforge-0.7.0 → solverforge-0.7.1}/src/constraints/mod.rs +0 -0
  43. {solverforge-0.7.0 → solverforge-0.7.1}/src/constraints/state.rs +0 -0
  44. {solverforge-0.7.0 → solverforge-0.7.1}/src/constraints/stream_plan.rs +0 -0
  45. {solverforge-0.7.0 → solverforge-0.7.1}/src/descriptor/extractor.rs +0 -0
  46. {solverforge-0.7.0 → solverforge-0.7.1}/src/descriptor/mod.rs +0 -0
  47. {solverforge-0.7.0 → solverforge-0.7.1}/src/descriptor/variable.rs +0 -0
  48. {solverforge-0.7.0 → solverforge-0.7.1}/src/error.rs +0 -0
  49. {solverforge-0.7.0 → solverforge-0.7.1}/src/intern.rs +0 -0
  50. {solverforge-0.7.0 → solverforge-0.7.1}/src/lib.rs +0 -0
  51. {solverforge-0.7.0 → solverforge-0.7.1}/src/manager/candidate_trace.rs +0 -0
  52. {solverforge-0.7.0 → solverforge-0.7.1}/src/manager/events.rs +0 -0
  53. {solverforge-0.7.0 → solverforge-0.7.1}/src/manager/jobs.rs +0 -0
  54. {solverforge-0.7.0 → solverforge-0.7.1}/src/manager/mod.rs +0 -0
  55. {solverforge-0.7.0 → solverforge-0.7.1}/src/manager/provenance.rs +0 -0
  56. {solverforge-0.7.0 → solverforge-0.7.1}/src/proxy/entity.rs +0 -0
  57. {solverforge-0.7.0 → solverforge-0.7.1}/src/proxy/list.rs +0 -0
  58. {solverforge-0.7.0 → solverforge-0.7.1}/src/proxy/mod.rs +0 -0
  59. {solverforge-0.7.0 → solverforge-0.7.1}/src/proxy/solution.rs +0 -0
  60. {solverforge-0.7.0 → solverforge-0.7.1}/src/runtime/candidate_metric.rs +0 -0
  61. {solverforge-0.7.0 → solverforge-0.7.1}/src/runtime/dynamic_assignment_group.rs +0 -0
  62. {solverforge-0.7.0 → solverforge-0.7.1}/src/runtime/list_slots.rs +0 -0
  63. {solverforge-0.7.0 → solverforge-0.7.1}/src/runtime/mod.rs +0 -0
  64. {solverforge-0.7.0 → solverforge-0.7.1}/src/runtime/scalar_slots.rs +0 -0
  65. {solverforge-0.7.0 → solverforge-0.7.1}/src/schema/build.rs +0 -0
  66. {solverforge-0.7.0 → solverforge-0.7.1}/src/schema/compiled.rs +0 -0
  67. {solverforge-0.7.0 → solverforge-0.7.1}/src/schema/mod.rs +0 -0
  68. {solverforge-0.7.0 → solverforge-0.7.1}/src/schema/parse.rs +0 -0
  69. {solverforge-0.7.0 → solverforge-0.7.1}/src/schema/python.rs +0 -0
  70. {solverforge-0.7.0 → solverforge-0.7.1}/src/schema/runtime_plan.rs +0 -0
  71. {solverforge-0.7.0 → solverforge-0.7.1}/src/schema/types.rs +0 -0
  72. {solverforge-0.7.0 → solverforge-0.7.1}/src/schema/validate.rs +0 -0
  73. {solverforge-0.7.0 → solverforge-0.7.1}/src/solver/api.rs +0 -0
  74. {solverforge-0.7.0 → solverforge-0.7.1}/src/solver/console.rs +0 -0
  75. {solverforge-0.7.0 → solverforge-0.7.1}/src/solver/mod.rs +0 -0
  76. {solverforge-0.7.0 → solverforge-0.7.1}/src/solver/progress.rs +0 -0
  77. {solverforge-0.7.0 → solverforge-0.7.1}/src/solver/result.rs +0 -0
  78. {solverforge-0.7.0 → solverforge-0.7.1}/src/solver/solvable.rs +0 -0
  79. {solverforge-0.7.0 → solverforge-0.7.1}/src/state/clone.rs +0 -0
  80. {solverforge-0.7.0 → solverforge-0.7.1}/src/state/entity_table.rs +0 -0
  81. {solverforge-0.7.0 → solverforge-0.7.1}/src/state/marshal.rs +0 -0
  82. {solverforge-0.7.0 → solverforge-0.7.1}/src/state/mod.rs +0 -0
  83. {solverforge-0.7.0 → solverforge-0.7.1}/src/state/solution.rs +0 -0
  84. {solverforge-0.7.0 → solverforge-0.7.1}/src/state/variables.rs +0 -0
  85. {solverforge-0.7.0 → solverforge-0.7.1}/src/ui.rs +0 -0
  86. {solverforge-0.7.0 → solverforge-0.7.1}/src/value.rs +0 -0
@@ -644,7 +644,7 @@ dependencies = [
644
644
 
645
645
  [[package]]
646
646
  name = "solverforge_py"
647
- version = "0.7.0"
647
+ version = "0.7.1"
648
648
  dependencies = [
649
649
  "indexmap",
650
650
  "once_cell",
@@ -1,6 +1,6 @@
1
1
  [package]
2
2
  name = "solverforge_py"
3
- version = "0.7.0"
3
+ version = "0.7.1"
4
4
  edition = "2021"
5
5
  license = "Apache-2.0"
6
6
  rust-version = "1.95"
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: solverforge
3
- Version: 0.7.0
3
+ Version: 0.7.1
4
4
  Classifier: Development Status :: 3 - Alpha
5
5
  Classifier: Intended Audience :: Developers
6
6
  Classifier: Intended Audience :: Science/Research
@@ -51,12 +51,12 @@ requirements, and other APIs that are not part of this package.
51
51
 
52
52
  ## Installation
53
53
 
54
- The package version prepared by this checkout is `solverforge` `0.7.0`, targeting
54
+ The package version prepared by this checkout is `solverforge` `0.7.1`, targeting
55
55
  the published and registry-locked SolverForge Rust `0.23.0` dependency base.
56
56
  Install the matching package after its Python release with:
57
57
 
58
58
  ```sh
59
- python3.14 -m pip install "solverforge==0.7.0"
59
+ python3.14 -m pip install "solverforge==0.7.1"
60
60
  ```
61
61
 
62
62
  The installable wheel contains the core `solverforge` package, native extension,
@@ -76,12 +76,12 @@ make deliveries-run PORT=7861
76
76
  ```
77
77
 
78
78
  The same source-checkout examples can be run against the matching published
79
- package once `0.7.0` is released, without `PYTHONPATH` or an editable checkout:
79
+ package once `0.7.1` is released, without `PYTHONPATH` or an editable checkout:
80
80
 
81
81
  ```sh
82
82
  python3.14 -m venv .venv-examples
83
83
  . .venv-examples/bin/activate
84
- python -m pip install "solverforge[examples]==0.7.0"
84
+ python -m pip install "solverforge[examples]==0.7.1"
85
85
  python examples/nqueens.py
86
86
  python -m examples.solverforge_hospital
87
87
  python -m examples.solverforge_deliveries
@@ -20,12 +20,12 @@ requirements, and other APIs that are not part of this package.
20
20
 
21
21
  ## Installation
22
22
 
23
- The package version prepared by this checkout is `solverforge` `0.7.0`, targeting
23
+ The package version prepared by this checkout is `solverforge` `0.7.1`, targeting
24
24
  the published and registry-locked SolverForge Rust `0.23.0` dependency base.
25
25
  Install the matching package after its Python release with:
26
26
 
27
27
  ```sh
28
- python3.14 -m pip install "solverforge==0.7.0"
28
+ python3.14 -m pip install "solverforge==0.7.1"
29
29
  ```
30
30
 
31
31
  The installable wheel contains the core `solverforge` package, native extension,
@@ -45,12 +45,12 @@ make deliveries-run PORT=7861
45
45
  ```
46
46
 
47
47
  The same source-checkout examples can be run against the matching published
48
- package once `0.7.0` is released, without `PYTHONPATH` or an editable checkout:
48
+ package once `0.7.1` is released, without `PYTHONPATH` or an editable checkout:
49
49
 
50
50
  ```sh
51
51
  python3.14 -m venv .venv-examples
52
52
  . .venv-examples/bin/activate
53
- python -m pip install "solverforge[examples]==0.7.0"
53
+ python -m pip install "solverforge[examples]==0.7.1"
54
54
  python examples/nqueens.py
55
55
  python -m examples.solverforge_hospital
56
56
  python -m examples.solverforge_deliveries
@@ -4,7 +4,7 @@ build-backend = "maturin"
4
4
 
5
5
  [project]
6
6
  name = "solverforge"
7
- version = "0.7.0"
7
+ version = "0.7.1"
8
8
  description = "Dynamic Python bindings for the SolverForge constraint solver."
9
9
  readme = "README.md"
10
10
  license = { text = "Apache-2.0" }
@@ -41,7 +41,7 @@ from .manager import JobHandle, SolverManager
41
41
  from .score import HardMediumSoftScore, HardSoftDecimalScore, HardSoftScore, SoftScore
42
42
  from .solver import Solver
43
43
 
44
- __version__ = "0.7.0"
44
+ __version__ = "0.7.1"
45
45
 
46
46
  __all__ = [
47
47
  "CallbackError",
@@ -213,23 +213,20 @@ fn parse_edits(edits_any: &Bound<'_, PyAny>) -> PyResult<Vec<RawProviderEdit>> {
213
213
  fn parse_edit(edit_any: &Bound<'_, PyAny>) -> PyResult<RawProviderEdit> {
214
214
  let edit = edit_any.cast::<PyDict>()?;
215
215
  let entity_object = edit.get_item("entity")?;
216
- let entity_class = optional_dict_str(edit, "entity_class")?
216
+ let entity_class = match optional_dict_str(edit, "entity_class")?
217
217
  .or(optional_dict_str(edit, "entity_type")?)
218
- .or_else(|| {
219
- entity_object
220
- .as_ref()
221
- .and_then(|entity| entity.getattr("_solverforge_entity_class").ok())
222
- .and_then(|value| value.extract::<String>().ok())
223
- });
218
+ {
219
+ Some(class) => Some(class),
220
+ None => entity_marker(entity_object.as_ref(), "_solverforge_entity_class")?
221
+ .and_then(|value| value.extract::<String>().ok()),
222
+ };
224
223
  let variable_name = required_dict_str(edit, "variable_name")?;
225
- let entity_index = optional_dict_usize(edit, "entity_index")?
226
- .or_else(|| {
227
- entity_object
228
- .as_ref()
229
- .and_then(|entity| entity.getattr("_solverforge_entity_index").ok())
230
- .and_then(|value| value.extract::<usize>().ok())
231
- })
232
- .ok_or_else(|| py_err("dynamic compound edit missing `entity_index` or `entity`"))?;
224
+ let entity_index = match optional_dict_usize(edit, "entity_index")? {
225
+ Some(index) => Some(index),
226
+ None => entity_marker(entity_object.as_ref(), "_solverforge_entity_index")?
227
+ .and_then(|value| value.extract::<usize>().ok()),
228
+ }
229
+ .ok_or_else(|| py_err("dynamic compound edit missing `entity_index` or `entity`"))?;
233
230
  let to_value_any = edit
234
231
  .get_item("to_value")?
235
232
  .or(edit.get_item("value")?)
@@ -266,6 +263,18 @@ fn optional_dict_str(dict: &Bound<'_, PyDict>, key: &str) -> PyResult<Option<Str
266
263
  .map(Option::flatten)
267
264
  }
268
265
 
266
+ /// Reads a binding marker off an edit's entity object. A missing attribute
267
+ /// means no marker; any other error (a KeyboardInterrupt) propagates.
268
+ fn entity_marker<'py>(
269
+ entity: Option<&Bound<'py, PyAny>>,
270
+ name: &str,
271
+ ) -> PyResult<Option<Bound<'py, PyAny>>> {
272
+ match entity {
273
+ Some(entity) => entity.getattr_opt(name),
274
+ None => Ok(None),
275
+ }
276
+ }
277
+
269
278
  fn optional_dict_usize(dict: &Bound<'_, PyDict>, key: &str) -> PyResult<Option<usize>> {
270
279
  dict.get_item(key)?
271
280
  .map(|value| {
@@ -20,7 +20,7 @@ pub fn dynamic_score_from_native(value: &Bound<'_, PyAny>) -> PyResult<DynamicSc
20
20
  if let Ok(levels) = value.cast::<PyTuple>() {
21
21
  return dynamic_score_from_sequence(levels.iter());
22
22
  }
23
- if let Ok(method) = value.getattr("to_native") {
23
+ if let Some(method) = value.getattr_opt("to_native")? {
24
24
  let native = method.call0()?;
25
25
  if let Ok(dict) = native.cast::<PyDict>() {
26
26
  return dynamic_score_from_dict(dict);
@@ -535,11 +535,9 @@ impl PythonCallbackView {
535
535
  entity_schema.type_name.as_str(),
536
536
  )?;
537
537
  for (variable_index, variable) in entity_schema.variables.iter().enumerate() {
538
- let attribute_name = if object_bound
539
- .get_type()
540
- .getattr(variable.name.as_str())
541
- .is_ok()
542
- {
538
+ // Only a missing attribute selects the plain name: any other error
539
+ // (a KeyboardInterrupt raised inside a descriptor) must propagate.
540
+ let attribute_name = if object_bound.get_type().hasattr(variable.name.as_str())? {
543
541
  variable.storage_name.as_str()
544
542
  } else {
545
543
  variable.name.as_str()
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes