solverforge 0.6.5__tar.gz → 0.6.6__tar.gz

{solverforge-0.6.5 → solverforge-0.6.6}/Cargo.lock

@@ -560,9 +560,9 @@ checksum = "8ed6a63f02c8539c91a8685a86f4099661ba3da017932f6ebbea6de3f0fa7c90"
 
 [[package]]
 name = "solverforge-bridge"
-version = "0.19.3"
+version = "0.19.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c78f964f79318c3c0ee3161ed3004c708f04c4a751f784fe7d0ccc908194aaa3"
+checksum = "12530829741dfb79552c5cb4ae70ac621503b5e9438947cbf9b50257f712a997"
 dependencies = [
  "solverforge-config",
  "solverforge-core",
@@ -572,9 +572,9 @@ dependencies = [
 
 [[package]]
 name = "solverforge-config"
-version = "0.19.3"
+version = "0.19.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27d4cb13eb5097514c5d18eeddb0f88521e3f3d8d402a0d22ffbbdcd08c90c21"
+checksum = "5cf7440a6bbc97606dfae1be85e55de541d30cc9a25635ba58eb4e78395faf1c"
 dependencies = [
  "serde",
  "serde_yaml",
@@ -585,9 +585,9 @@ dependencies = [
 
 [[package]]
 name = "solverforge-console"
-version = "0.19.3"
+version = "0.19.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f64e369266512f53d2bd335592975193fdc4d8c2d6da99929f152edfd721562"
+checksum = "ccca538afe6f31d83bb699e7d6ec7f679033b9713828b8139a897d81faf2ef9e"
 dependencies = [
  "num-format",
  "owo-colors",
@@ -597,18 +597,18 @@ dependencies = [
 
 [[package]]
 name = "solverforge-core"
-version = "0.19.3"
+version = "0.19.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6118e7d98c3c8ef58646b2779603dd1ab6f9dc9f25481cb104402cbcd06be46"
+checksum = "79b244e1efabe25575798d8d53a1d4d43492167d5bc004bff9c7a9505f5aae1d"
 dependencies = [
  "thiserror",
 ]
 
 [[package]]
 name = "solverforge-scoring"
-version = "0.19.3"
+version = "0.19.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ddf9f9af52b0d2525f581f921e41fac8352dc2f6f1deb7f9100aff9cfedba25"
+checksum = "4c097aee46dd2e6f09be86392e85fe28cb5eeb18c575f835e3c7ce768236ad79"
 dependencies = [
  "solverforge-core",
  "thiserror",
@@ -616,9 +616,9 @@ dependencies = [
 
 [[package]]
 name = "solverforge-solver"
-version = "0.19.3"
+version = "0.19.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19d30aece798a48d08edc630734a181dd2d9bcc1e806de7ec27701f9885989a6"
+checksum = "7cb0d393e0c42c3e6e88c71e0a07a09b245225f20cfca05d4a5a01f1ddda2d8c"
 dependencies = [
  "rand",
  "rand_chacha",
@@ -644,7 +644,7 @@ dependencies = [
 
 [[package]]
 name = "solverforge_py"
-version = "0.6.5"
+version = "0.6.6"
 dependencies = [
  "indexmap",
  "once_cell",

{solverforge-0.6.5 → solverforge-0.6.6}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solverforge_py"
-version = "0.6.5"
+version = "0.6.6"
 edition = "2021"
 license = "Apache-2.0"
 rust-version = "1.95"
@@ -26,7 +26,7 @@ name = "solverforge_py"
 crate-type = ["cdylib", "rlib"]
 
 [package.metadata.solverforge]
-version = "0.19.3"
+version = "0.19.4"
 
 [dependencies]
 indexmap = "2.12.1"
@@ -42,12 +42,12 @@ toml = "0.9.8"
 tracing = "0.1.44"
 tracing-subscriber = { version = "0.3.23", features = ["env-filter"] }
 
-solverforge-config = { version = "=0.19.3" }
-solverforge-bridge = { version = "=0.19.3" }
-solverforge-console = { version = "=0.19.3", features = ["verbose-logging"] }
-solverforge-core = { version = "=0.19.3" }
-solverforge-scoring = { version = "=0.19.3" }
-solverforge-solver = { version = "=0.19.3" }
+solverforge-config = { version = "=0.19.4" }
+solverforge-bridge = { version = "=0.19.4" }
+solverforge-console = { version = "=0.19.4", features = ["verbose-logging"] }
+solverforge-core = { version = "=0.19.4" }
+solverforge-scoring = { version = "=0.19.4" }
+solverforge-solver = { version = "=0.19.4" }
 solverforge-ui = { version = "=0.7.0", default-features = false }
 
 [dev-dependencies]

{solverforge-0.6.5 → solverforge-0.6.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: solverforge
-Version: 0.6.5
+Version: 0.6.6
 Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Science/Research
@@ -39,23 +39,25 @@ The native extension owns the working solution state in Rust so SolverForge can
 clone, mutate, and snapshot solutions safely. Python callbacks are the single
 constraint authoring surface.
 
-The package targets CPython 3.14 and Rust 1.95.0. This checkout targets the
-SolverForge Rust crates `0.19.3` and pins `solverforge-ui` to `0.7.0` through
-exact crates.io versions in `Cargo.toml` and registry checksums in `Cargo.lock`.
-There is no local path or Git dependency override. The `solverforge`
-`0.6.x` line is the current dynamic binding architecture and intentionally
-supersedes the older incompatible `0.2.x` and `0.3.0` artifacts in the same PyPI
-namespace. Those older artifacts exposed `SolverFactory`, `PlanningVariable`,
-Java service requirements, and other APIs that are not part of this package.
+The package targets CPython 3.14 and Rust 1.95.0. This release-preparation
+checkout pins the six published SolverForge Rust dependencies to `0.19.4` and
+`solverforge-ui` to `0.7.0` through exact crates.io requirements in
+`Cargo.toml` and registry checksums in `Cargo.lock`. There is no local path or
+Git dependency override. The `solverforge` `0.6.x` line is the current dynamic
+binding architecture and intentionally supersedes the older incompatible
+`0.2.x` and `0.3.0` artifacts in the same PyPI namespace. Those older artifacts
+exposed `SolverFactory`, `PlanningVariable`, Java service requirements, and
+other APIs that are not part of this package.
 
 ## Installation
 
-The package version prepared by this checkout is `solverforge` `0.6.5`, targeting
-the published and locked SolverForge Rust `0.19.3` registry dependency base.
-Install the matching package after its Python release with:
+The package version prepared by this checkout is `solverforge` `0.6.6`. Its
+release-quality build requires the published and registry-locked SolverForge
+Rust `0.19.4` dependency base. Install the matching package after its Python
+release with:
 
 ```sh
-python3.14 -m pip install "solverforge==0.6.5"
+python3.14 -m pip install "solverforge==0.6.6"
 ```
 
 The installable wheel contains the core `solverforge` package, native extension,
@@ -74,13 +76,13 @@ make hospital-run
 make deliveries-run PORT=7861
 ```
 
-After publication, the same source-checkout examples can be run against the
-installed package without `PYTHONPATH` or an editable checkout:
+The same source-checkout examples can be run against the published package
+without `PYTHONPATH` or an editable checkout:
 
 ```sh
 python3.14 -m venv .venv-examples
 . .venv-examples/bin/activate
-python -m pip install "solverforge[examples]==0.6.5"
+python -m pip install "solverforge[examples]==0.6.6"
 python examples/nqueens.py
 python -m examples.solverforge_hospital
 python -m examples.solverforge_deliveries
@@ -240,8 +242,9 @@ Run `make help` for focused targets such as `make test-hospital`,
   either a Python callback or a row field name. Dual raw-schema sources are
   rejected at compilation, while immutable row metadata can be supplied without
   per-query Python callbacks. Provider-backed value ranges are imported once per
-  variable and shared across rows in Rust-owned state; row candidate callbacks
-  remain row-specific.
+  variable and shared across rows in Rust-owned state. Row candidate callbacks
+  remain row-specific and define move legality throughout construction and local
+  search, including assignment-group swaps and rematches.
 - `scalar_assignment_group(...)` declares assignment-aware scalar groups for
   grouped scalar local search and assignment-group construction. Group metadata
   covers required entities, capacity keys, assignment rules, ordering callbacks,
@@ -252,9 +255,12 @@ Run `make help` for focused targets such as `make test-hospital`,
   metadata, `required_entity_field`, `capacity_key_field`,
   `position_key_field`, and `sequence_key_field` are explicit alternatives to
   their callbacks: required is a row bool, position and sequence are row
-  integers, and capacity is a row list indexed by candidate value. A field
-  alternative is mutually exclusive with its callback and avoids
-  per-candidate Python transitions without caching or changing callback behavior.
+  integers, and capacity is a row list indexed by candidate value.
+  `same_value_conflict_field` is the native alternative for a static
+  `assignment_rule`: each row lists adjacent-sequence entity indexes that
+  cannot hold the same assigned value, and the group still requires sequence
+  metadata. Field alternatives avoid per-candidate Python transitions without
+  caching or changing callback behavior.
   The compiled schema retains one immutable runtime plan (schema, descriptor,
   and model), reused by direct solves, manager jobs, snapshots, and resumes;
   instance rows, callback views, seeds, and moves remain per solve.

{solverforge-0.6.5 → solverforge-0.6.6}/README.md

@@ -8,23 +8,25 @@ The native extension owns the working solution state in Rust so SolverForge can
 clone, mutate, and snapshot solutions safely. Python callbacks are the single
 constraint authoring surface.
 
-The package targets CPython 3.14 and Rust 1.95.0. This checkout targets the
-SolverForge Rust crates `0.19.3` and pins `solverforge-ui` to `0.7.0` through
-exact crates.io versions in `Cargo.toml` and registry checksums in `Cargo.lock`.
-There is no local path or Git dependency override. The `solverforge`
-`0.6.x` line is the current dynamic binding architecture and intentionally
-supersedes the older incompatible `0.2.x` and `0.3.0` artifacts in the same PyPI
-namespace. Those older artifacts exposed `SolverFactory`, `PlanningVariable`,
-Java service requirements, and other APIs that are not part of this package.
+The package targets CPython 3.14 and Rust 1.95.0. This release-preparation
+checkout pins the six published SolverForge Rust dependencies to `0.19.4` and
+`solverforge-ui` to `0.7.0` through exact crates.io requirements in
+`Cargo.toml` and registry checksums in `Cargo.lock`. There is no local path or
+Git dependency override. The `solverforge` `0.6.x` line is the current dynamic
+binding architecture and intentionally supersedes the older incompatible
+`0.2.x` and `0.3.0` artifacts in the same PyPI namespace. Those older artifacts
+exposed `SolverFactory`, `PlanningVariable`, Java service requirements, and
+other APIs that are not part of this package.
 
 ## Installation
 
-The package version prepared by this checkout is `solverforge` `0.6.5`, targeting
-the published and locked SolverForge Rust `0.19.3` registry dependency base.
-Install the matching package after its Python release with:
+The package version prepared by this checkout is `solverforge` `0.6.6`. Its
+release-quality build requires the published and registry-locked SolverForge
+Rust `0.19.4` dependency base. Install the matching package after its Python
+release with:
 
 ```sh
-python3.14 -m pip install "solverforge==0.6.5"
+python3.14 -m pip install "solverforge==0.6.6"
 ```
 
 The installable wheel contains the core `solverforge` package, native extension,
@@ -43,13 +45,13 @@ make hospital-run
 make deliveries-run PORT=7861
 ```
 
-After publication, the same source-checkout examples can be run against the
-installed package without `PYTHONPATH` or an editable checkout:
+The same source-checkout examples can be run against the published package
+without `PYTHONPATH` or an editable checkout:
 
 ```sh
 python3.14 -m venv .venv-examples
 . .venv-examples/bin/activate
-python -m pip install "solverforge[examples]==0.6.5"
+python -m pip install "solverforge[examples]==0.6.6"
 python examples/nqueens.py
 python -m examples.solverforge_hospital
 python -m examples.solverforge_deliveries
@@ -209,8 +211,9 @@ Run `make help` for focused targets such as `make test-hospital`,
   either a Python callback or a row field name. Dual raw-schema sources are
   rejected at compilation, while immutable row metadata can be supplied without
   per-query Python callbacks. Provider-backed value ranges are imported once per
-  variable and shared across rows in Rust-owned state; row candidate callbacks
-  remain row-specific.
+  variable and shared across rows in Rust-owned state. Row candidate callbacks
+  remain row-specific and define move legality throughout construction and local
+  search, including assignment-group swaps and rematches.
 - `scalar_assignment_group(...)` declares assignment-aware scalar groups for
   grouped scalar local search and assignment-group construction. Group metadata
   covers required entities, capacity keys, assignment rules, ordering callbacks,
@@ -221,9 +224,12 @@ Run `make help` for focused targets such as `make test-hospital`,
   metadata, `required_entity_field`, `capacity_key_field`,
   `position_key_field`, and `sequence_key_field` are explicit alternatives to
   their callbacks: required is a row bool, position and sequence are row
-  integers, and capacity is a row list indexed by candidate value. A field
-  alternative is mutually exclusive with its callback and avoids
-  per-candidate Python transitions without caching or changing callback behavior.
+  integers, and capacity is a row list indexed by candidate value.
+  `same_value_conflict_field` is the native alternative for a static
+  `assignment_rule`: each row lists adjacent-sequence entity indexes that
+  cannot hold the same assigned value, and the group still requires sequence
+  metadata. Field alternatives avoid per-candidate Python transitions without
+  caching or changing callback behavior.
   The compiled schema retains one immutable runtime plan (schema, descriptor,
   and model), reused by direct solves, manager jobs, snapshots, and resumes;
   instance rows, callback views, seeds, and moves remain per solve.

{solverforge-0.6.5 → solverforge-0.6.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "solverforge"
-version = "0.6.5"
+version = "0.6.6"
 description = "Dynamic Python bindings for the SolverForge constraint solver."
 readme = "README.md"
 license = { text = "Apache-2.0" }

{solverforge-0.6.5 → solverforge-0.6.6}/python/solverforge/__init__.py

@@ -40,7 +40,7 @@ from .manager import JobHandle, SolverManager
 from .score import HardMediumSoftScore, HardSoftDecimalScore, HardSoftScore, SoftScore
 from .solver import Solver
 
-__version__ = "0.6.5"
+__version__ = "0.6.6"
 
 __all__ = [
     "CallbackError",

{solverforge-0.6.5 → solverforge-0.6.6}/python/solverforge/groups.py

@@ -51,6 +51,7 @@ class ScalarAssignmentGroup:
     capacity_key: Callable[..., object] | None = None
     capacity_key_field: str | None = None
     assignment_rule: Callable[..., object] | None = None
+    same_value_conflict_field: str | None = None
     position_key: Callable[..., object] | None = None
     position_key_field: str | None = None
     sequence_key: Callable[..., object] | None = None
@@ -95,6 +96,20 @@ class ScalarAssignmentGroup:
                 raise TypeError(
                     f"{field_name} must be a non-empty string when provided"
                 )
+        if (
+            self.assignment_rule is not None
+            and self.same_value_conflict_field is not None
+        ):
+            raise TypeError(
+                "assignment_rule and same_value_conflict_field cannot both be configured"
+            )
+        if self.same_value_conflict_field is not None and (
+            not isinstance(self.same_value_conflict_field, str)
+            or not self.same_value_conflict_field
+        ):
+            raise TypeError(
+                "same_value_conflict_field must be a non-empty string when provided"
+            )
 
     def to_native(self) -> dict[str, Any]:
         return {
@@ -107,6 +122,7 @@ class ScalarAssignmentGroup:
             "capacity_key": self.capacity_key,
             "capacity_key_field": self.capacity_key_field,
             "assignment_rule": self.assignment_rule,
+            "same_value_conflict_field": self.same_value_conflict_field,
             "position_key": self.position_key,
             "position_key_field": self.position_key_field,
             "sequence_key": self.sequence_key,
@@ -128,6 +144,7 @@ def scalar_assignment_group(
     capacity_key: Callable[..., object] | None = None,
     capacity_key_field: str | None = None,
     assignment_rule: Callable[..., object] | None = None,
+    same_value_conflict_field: str | None = None,
     position_key: Callable[..., object] | None = None,
     position_key_field: str | None = None,
     sequence_key: Callable[..., object] | None = None,
@@ -145,6 +162,9 @@ def scalar_assignment_group(
     callback transitions while preserving the declared metadata values. The declaration compiles
     into one immutable native runtime plan rather than a Python-side assignment search path. Its
     target variable is exclusively searched through the resulting grouped selector.
+    ``same_value_conflict_field`` names a row list of adjacent-sequence entity indices that may
+    not share the same assigned value, providing a native conflict-graph alternative to
+    ``assignment_rule``.
     """
 
     return ScalarAssignmentGroup(
@@ -156,6 +176,7 @@ def scalar_assignment_group(
         capacity_key=capacity_key,
         capacity_key_field=capacity_key_field,
         assignment_rule=assignment_rule,
+        same_value_conflict_field=same_value_conflict_field,
         position_key=position_key,
         position_key_field=position_key_field,
         sequence_key=sequence_key,

{solverforge-0.6.5 → solverforge-0.6.6}/python/solverforge/model.py

@@ -222,6 +222,16 @@ def _scalar_groups(callbacks: object) -> list[dict[str, object]]:
                     "assignment-rule groups need sequence metadata"
                 )
                 raise ModelValidationError(msg)
+            if (
+                item.same_value_conflict_field is not None
+                and item.sequence_key is None
+                and item.sequence_key_field is None
+            ):
+                msg = (
+                    f"{item!r} declares a same_value_conflict_field but no sequence_key; "
+                    "same-value conflict groups need sequence metadata"
+                )
+                raise ModelValidationError(msg)
             if item.name in names:
                 msg = f"scalar group name `{item.name}` is declared more than once"
                 raise ModelValidationError(msg)

{solverforge-0.6.5 → solverforge-0.6.6}/src/runtime/dynamic_assignment_group.rs

@@ -100,6 +100,18 @@ fn build_assignment_group(
             group.name
         ));
     }
+    if group.assignment_rule.is_some() && group.same_value_conflict_field.is_some() {
+        return Err(format!(
+            "assignment scalar group `{}` cannot declare both assignment_rule and same_value_conflict_field",
+            group.name
+        ));
+    }
+    if group.same_value_conflict_field.is_some() && group.sequence_key.is_none() {
+        return Err(format!(
+            "assignment scalar group `{}` declares same_value_conflict_field but no sequence_key",
+            group.name
+        ));
+    }
 
     let slot = DynamicScalarVariableSlot::new(
         EntityClassId(entity_index),
@@ -368,6 +380,14 @@ impl PyDynamicAssignmentMetadata {
         right_entity: usize,
         right_value: usize,
     ) -> bool {
+        if let Some(field_name) = self.group().same_value_conflict_field.as_deref() {
+            if left_value != right_value {
+                return true;
+            }
+            return !self
+                .same_value_conflicts(solution, field_name, left_entity, right_entity)
+                .unwrap_or_else(panic_with_py_err);
+        }
         self.callback_value(
             solution,
             "assignment_rule",
@@ -377,6 +397,63 @@ impl PyDynamicAssignmentMetadata {
         .unwrap_or_else(panic_with_py_err)
         .unwrap_or(true)
     }
+
+    fn same_value_conflicts(
+        &self,
+        solution: &PyDynamicSolution,
+        field_name: &str,
+        left_entity: usize,
+        right_entity: usize,
+    ) -> PyResult<bool> {
+        Ok(
+            self.row_conflicts_with(solution, field_name, left_entity, right_entity)?
+                || self.row_conflicts_with(solution, field_name, right_entity, left_entity)?,
+        )
+    }
+
+    fn row_conflicts_with(
+        &self,
+        solution: &PyDynamicSolution,
+        field_name: &str,
+        entity_index: usize,
+        other_entity_index: usize,
+    ) -> PyResult<bool> {
+        let value = solution
+            .state
+            .entities
+            .get(self.entity_index)
+            .and_then(|rows| rows.get(entity_index))
+            .and_then(|row| row.fields.get(field_name))
+            .ok_or_else(|| {
+                py_err(format!(
+                    "assignment scalar group `{}` field `{field_name}` is missing on row {entity_index}",
+                    self.group().name
+                ))
+            })?;
+        let DynamicValue::List(conflicts) = value else {
+            return Err(py_err(format!(
+                "assignment scalar group `{}` same_value_conflict_field `{field_name}` must be a list of entity indices",
+                self.group().name
+            )));
+        };
+        let other_entity_index = i64::try_from(other_entity_index).map_err(|_| {
+            py_err(format!(
+                "assignment entity index `{other_entity_index}` does not fit in a field integer"
+            ))
+        })?;
+        for conflict in conflicts {
+            let DynamicValue::Int(conflict) = conflict else {
+                return Err(py_err(format!(
+                    "assignment scalar group `{}` same_value_conflict_field `{field_name}` must contain only entity indices",
+                    self.group().name
+                )));
+            };
+            if *conflict == other_entity_index {
+                return Ok(true);
+            }
+        }
+        Ok(false)
+    }
 }
 
 impl DynamicScalarAssignmentMetadata<PyDynamicSolution> for PyDynamicAssignmentMetadata {
@@ -389,7 +466,8 @@ impl DynamicScalarAssignmentMetadata<PyDynamicSolution> for PyDynamicAssignmentM
             sequence_key: group.sequence_key.is_some(),
             entity_order: group.entity_order.is_some(),
             value_order: group.value_order.is_some(),
-            assignment_rule: group.assignment_rule.is_some(),
+            assignment_rule: group.assignment_rule.is_some()
+                || group.same_value_conflict_field.is_some(),
         }
     }
 

{solverforge-0.6.5 → solverforge-0.6.6}/src/runtime/scalar_slots.rs

@@ -216,7 +216,13 @@ impl DynamicScalarAccess<PyDynamicSolution> for PyDynamicScalarAccess {
             .unwrap_or(&[])
     }
 
-    fn value_is_legal(&self, solution: &PyDynamicSolution, _row: usize, value: usize) -> bool {
+    fn value_is_legal(&self, solution: &PyDynamicSolution, row: usize, value: usize) -> bool {
+        if let Some(candidates) = self
+            .row(solution, row)
+            .and_then(|row| row.candidates_at(self.variable.0))
+        {
+            return candidates.contains(&value);
+        }
         solution
             .state
             .scalar_value_range_at(self.entity.0, self.variable.0)

{solverforge-0.6.5 → solverforge-0.6.6}/src/schema/parse.rs

@@ -159,6 +159,7 @@ fn parse_assignment_scalar_groups(
             )?,
             capacity_key: optional_metadata_source(group, "capacity_key", "capacity_key_field")?,
             assignment_rule: optional_callable(group, "assignment_rule")?,
+            same_value_conflict_field: optional_str(group, "same_value_conflict_field")?,
             position_key: optional_metadata_source(group, "position_key", "position_key_field")?,
             sequence_key: optional_metadata_source(group, "sequence_key", "sequence_key_field")?,
             entity_order: optional_callable(group, "entity_order")?,

{solverforge-0.6.5 → solverforge-0.6.6}/src/schema/types.rs

@@ -200,6 +200,7 @@ pub struct AssignmentScalarGroupSchema {
     pub required_entity: Option<MetadataSourceSchema>,
     pub capacity_key: Option<MetadataSourceSchema>,
     pub assignment_rule: Option<Py<PyAny>>,
+    pub same_value_conflict_field: Option<String>,
     pub position_key: Option<MetadataSourceSchema>,
     pub sequence_key: Option<MetadataSourceSchema>,
     pub entity_order: Option<Py<PyAny>>,

{solverforge-0.6.5 → solverforge-0.6.6}/src/schema/validate.rs

@@ -58,6 +58,28 @@ pub fn validate_dynamic_schema(schema: &DynamicSchema) -> Result<(), pyo3::PyErr
                 group.name
             )));
         }
+        if group.assignment_rule.is_some() && group.same_value_conflict_field.is_some() {
+            return Err(py_err(format!(
+                "assignment scalar group `{}` cannot declare both assignment_rule and same_value_conflict_field",
+                group.name
+            )));
+        }
+        if group
+            .same_value_conflict_field
+            .as_ref()
+            .is_some_and(String::is_empty)
+        {
+            return Err(py_err(format!(
+                "assignment scalar group `{}` has an empty same_value_conflict_field",
+                group.name
+            )));
+        }
+        if group.same_value_conflict_field.is_some() && group.sequence_key.is_none() {
+            return Err(py_err(format!(
+                "assignment scalar group `{}` declares same_value_conflict_field but no sequence_key",
+                group.name
+            )));
+        }
     }
     Ok(())
 }

{solverforge-0.6.5 → solverforge-0.6.6}/src/state/marshal.rs

@@ -436,6 +436,9 @@ fn row_metadata_fields(schema: &DynamicSchema) -> BTreeSet<String> {
                 field_names.insert(field.clone());
             }
         }
+        if let Some(field) = group.same_value_conflict_field.as_ref() {
+            field_names.insert(field.clone());
+        }
     }
     field_names
 }
@@ -499,10 +502,12 @@ fn validate_assignment_group_field_metadata(
             .sequence_key
             .as_ref()
             .and_then(MetadataSourceSchema::row);
+        let same_value_conflict_field = group.same_value_conflict_field.as_deref();
         if required_field.is_none()
             && capacity_field.is_none()
             && position_field.is_none()
             && sequence_field.is_none()
+            && same_value_conflict_field.is_none()
         {
             continue;
         }
@@ -560,6 +565,35 @@ fn validate_assignment_group_field_metadata(
                     )));
                 }
             }
+            if let Some(field) = same_value_conflict_field {
+                let value = assignment_metadata_field(row, &group.name, row_index, field)?;
+                let DynamicValue::List(conflicts) = value else {
+                    return Err(crate::error::py_err(format!(
+                        "assignment scalar group `{}` field `{field}` on row {row_index} must be a list of entity indices",
+                        group.name
+                    )));
+                };
+                for conflict in conflicts {
+                    let DynamicValue::Int(conflict) = conflict else {
+                        return Err(crate::error::py_err(format!(
+                            "assignment scalar group `{}` field `{field}` on row {row_index} must contain only entity indices",
+                            group.name
+                        )));
+                    };
+                    let Ok(conflict) = usize::try_from(*conflict) else {
+                        return Err(crate::error::py_err(format!(
+                            "assignment scalar group `{}` field `{field}` on row {row_index} contains invalid entity index {conflict}",
+                            group.name
+                        )));
+                    };
+                    if conflict >= rows.len() {
+                        return Err(crate::error::py_err(format!(
+                            "assignment scalar group `{}` field `{field}` on row {row_index} contains out-of-range entity index {conflict}",
+                            group.name
+                        )));
+                    }
+                }
+            }
             if let Some(field) = capacity_field {
                 let value = assignment_metadata_field(row, &group.name, row_index, field)?;
                 let DynamicValue::List(values) = value else {

{solverforge-0.6.5 → solverforge-0.6.6}/src/state/solution.rs

@@ -671,10 +671,19 @@ impl DynamicModelBackend for PyDynamicSolution {
     fn scalar_value_is_legal(
         &self,
         entity: EntityClassId,
-        _row: usize,
+        row: usize,
         variable: VariableId,
         value: usize,
     ) -> bool {
+        if let Some(candidates) = self
+            .state
+            .entities
+            .get(entity.0)
+            .and_then(|rows| rows.get(row))
+            .and_then(|row| row.candidates_at(variable.0))
+        {
+            return candidates.contains(&value);
+        }
         self.state
             .scalar_value_range_at(entity.0, variable.0)
             .is_some_and(|values| values.contains(&value))