solverforge 0.7.1__tar.gz → 0.8.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.
- {solverforge-0.7.1 → solverforge-0.8.1}/Cargo.lock +19 -149
- {solverforge-0.7.1 → solverforge-0.8.1}/Cargo.toml +9 -20
- {solverforge-0.7.1 → solverforge-0.8.1}/PKG-INFO +30 -15
- {solverforge-0.7.1 → solverforge-0.8.1}/README.md +29 -14
- {solverforge-0.7.1 → solverforge-0.8.1}/pyproject.toml +1 -1
- {solverforge-0.7.1 → solverforge-0.8.1}/python/solverforge/__init__.py +1 -1
- {solverforge-0.7.1 → solverforge-0.8.1}/python/solverforge/model.py +15 -1
- {solverforge-0.7.1 → solverforge-0.8.1}/src/bindings.rs +1 -0
- {solverforge-0.7.1 → solverforge-0.8.1}/src/constraints/compiled_dispatch_tests.rs +1 -0
- {solverforge-0.7.1 → solverforge-0.8.1}/src/constraints/state.rs +65 -0
- {solverforge-0.7.1 → solverforge-0.8.1}/src/error.rs +18 -1
- {solverforge-0.7.1 → solverforge-0.8.1}/src/manager/candidate_trace.rs +6 -3
- {solverforge-0.7.1 → solverforge-0.8.1}/src/manager/events.rs +10 -26
- {solverforge-0.7.1 → solverforge-0.8.1}/src/manager/jobs.rs +8 -12
- {solverforge-0.7.1 → solverforge-0.8.1}/src/manager/provenance.rs +1 -3
- {solverforge-0.7.1 → solverforge-0.8.1}/src/runtime/candidate_metric.rs +2 -2
- {solverforge-0.7.1 → solverforge-0.8.1}/src/runtime/dynamic_assignment_group.rs +2 -1
- {solverforge-0.7.1 → solverforge-0.8.1}/src/runtime/dynamic_provider.rs +1 -1
- {solverforge-0.7.1 → solverforge-0.8.1}/src/schema/parse.rs +15 -0
- {solverforge-0.7.1 → solverforge-0.8.1}/src/schema/runtime_plan.rs +0 -13
- {solverforge-0.7.1 → solverforge-0.8.1}/src/schema/types.rs +5 -0
- {solverforge-0.7.1 → solverforge-0.8.1}/src/solver/api.rs +4 -12
- solverforge-0.8.1/src/solver/solvable.rs +109 -0
- {solverforge-0.7.1 → solverforge-0.8.1}/src/state/solution.rs +1 -0
- solverforge-0.7.1/src/solver/solvable.rs +0 -58
- {solverforge-0.7.1 → solverforge-0.8.1}/LICENSE +0 -0
- {solverforge-0.7.1 → solverforge-0.8.1}/python/solverforge/_native.pyi +0 -0
- {solverforge-0.7.1 → solverforge-0.8.1}/python/solverforge/config.py +0 -0
- {solverforge-0.7.1 → solverforge-0.8.1}/python/solverforge/console.py +0 -0
- {solverforge-0.7.1 → solverforge-0.8.1}/python/solverforge/constraints.py +0 -0
- {solverforge-0.7.1 → solverforge-0.8.1}/python/solverforge/decorators.py +0 -0
- {solverforge-0.7.1 → solverforge-0.8.1}/python/solverforge/errors.py +0 -0
- {solverforge-0.7.1 → solverforge-0.8.1}/python/solverforge/events.py +0 -0
- {solverforge-0.7.1 → solverforge-0.8.1}/python/solverforge/fields.py +0 -0
- {solverforge-0.7.1 → solverforge-0.8.1}/python/solverforge/groups.py +0 -0
- {solverforge-0.7.1 → solverforge-0.8.1}/python/solverforge/joiner.py +0 -0
- {solverforge-0.7.1 → solverforge-0.8.1}/python/solverforge/manager.py +0 -0
- {solverforge-0.7.1 → solverforge-0.8.1}/python/solverforge/py.typed +0 -0
- {solverforge-0.7.1 → solverforge-0.8.1}/python/solverforge/score.py +0 -0
- {solverforge-0.7.1 → solverforge-0.8.1}/python/solverforge/solver.py +0 -0
- {solverforge-0.7.1 → solverforge-0.8.1}/python/solverforge/typing.py +0 -0
- {solverforge-0.7.1 → solverforge-0.8.1}/python/solverforge/ui.py +0 -0
- {solverforge-0.7.1 → solverforge-0.8.1}/rust-toolchain.toml +0 -0
- {solverforge-0.7.1 → solverforge-0.8.1}/src/callbacks/call.rs +0 -0
- {solverforge-0.7.1 → solverforge-0.8.1}/src/callbacks/mod.rs +0 -0
- {solverforge-0.7.1 → solverforge-0.8.1}/src/callbacks/registry.rs +0 -0
- {solverforge-0.7.1 → solverforge-0.8.1}/src/callbacks/threading.rs +0 -0
- {solverforge-0.7.1 → solverforge-0.8.1}/src/config.rs +0 -0
- {solverforge-0.7.1 → solverforge-0.8.1}/src/constraints/compiled.rs +0 -0
- {solverforge-0.7.1 → solverforge-0.8.1}/src/constraints/evaluate.rs +0 -0
- {solverforge-0.7.1 → solverforge-0.8.1}/src/constraints/incremental.rs +0 -0
- {solverforge-0.7.1 → solverforge-0.8.1}/src/constraints/list_precedence.rs +0 -0
- {solverforge-0.7.1 → solverforge-0.8.1}/src/constraints/list_precedence_tests.rs +0 -0
- {solverforge-0.7.1 → solverforge-0.8.1}/src/constraints/matches.rs +0 -0
- {solverforge-0.7.1 → solverforge-0.8.1}/src/constraints/mod.rs +0 -0
- {solverforge-0.7.1 → solverforge-0.8.1}/src/constraints/stream_plan.rs +0 -0
- {solverforge-0.7.1 → solverforge-0.8.1}/src/descriptor/extractor.rs +0 -0
- {solverforge-0.7.1 → solverforge-0.8.1}/src/descriptor/mod.rs +0 -0
- {solverforge-0.7.1 → solverforge-0.8.1}/src/descriptor/variable.rs +0 -0
- {solverforge-0.7.1 → solverforge-0.8.1}/src/intern.rs +0 -0
- {solverforge-0.7.1 → solverforge-0.8.1}/src/lib.rs +0 -0
- {solverforge-0.7.1 → solverforge-0.8.1}/src/manager/mod.rs +0 -0
- {solverforge-0.7.1 → solverforge-0.8.1}/src/proxy/entity.rs +0 -0
- {solverforge-0.7.1 → solverforge-0.8.1}/src/proxy/list.rs +0 -0
- {solverforge-0.7.1 → solverforge-0.8.1}/src/proxy/mod.rs +0 -0
- {solverforge-0.7.1 → solverforge-0.8.1}/src/proxy/solution.rs +0 -0
- {solverforge-0.7.1 → solverforge-0.8.1}/src/runtime/list_slots.rs +0 -0
- {solverforge-0.7.1 → solverforge-0.8.1}/src/runtime/mod.rs +0 -0
- {solverforge-0.7.1 → solverforge-0.8.1}/src/runtime/scalar_slots.rs +0 -0
- {solverforge-0.7.1 → solverforge-0.8.1}/src/schema/build.rs +0 -0
- {solverforge-0.7.1 → solverforge-0.8.1}/src/schema/compiled.rs +0 -0
- {solverforge-0.7.1 → solverforge-0.8.1}/src/schema/mod.rs +0 -0
- {solverforge-0.7.1 → solverforge-0.8.1}/src/schema/python.rs +0 -0
- {solverforge-0.7.1 → solverforge-0.8.1}/src/schema/validate.rs +0 -0
- {solverforge-0.7.1 → solverforge-0.8.1}/src/score.rs +0 -0
- {solverforge-0.7.1 → solverforge-0.8.1}/src/solver/console.rs +0 -0
- {solverforge-0.7.1 → solverforge-0.8.1}/src/solver/mod.rs +0 -0
- {solverforge-0.7.1 → solverforge-0.8.1}/src/solver/progress.rs +0 -0
- {solverforge-0.7.1 → solverforge-0.8.1}/src/solver/result.rs +0 -0
- {solverforge-0.7.1 → solverforge-0.8.1}/src/state/callback_view.rs +0 -0
- {solverforge-0.7.1 → solverforge-0.8.1}/src/state/clone.rs +0 -0
- {solverforge-0.7.1 → solverforge-0.8.1}/src/state/entity_table.rs +0 -0
- {solverforge-0.7.1 → solverforge-0.8.1}/src/state/marshal.rs +0 -0
- {solverforge-0.7.1 → solverforge-0.8.1}/src/state/mod.rs +0 -0
- {solverforge-0.7.1 → solverforge-0.8.1}/src/state/variables.rs +0 -0
- {solverforge-0.7.1 → solverforge-0.8.1}/src/ui.rs +0 -0
- {solverforge-0.7.1 → solverforge-0.8.1}/src/value.rs +0 -0
|
@@ -80,12 +80,6 @@ version = "0.8.21"
|
|
|
80
80
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
81
81
|
checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
|
|
82
82
|
|
|
83
|
-
[[package]]
|
|
84
|
-
name = "diff"
|
|
85
|
-
version = "0.1.13"
|
|
86
|
-
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
87
|
-
checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
|
|
88
|
-
|
|
89
83
|
[[package]]
|
|
90
84
|
name = "either"
|
|
91
85
|
version = "1.16.0"
|
|
@@ -283,25 +277,6 @@ version = "1.13.1"
|
|
|
283
277
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
284
278
|
checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49"
|
|
285
279
|
|
|
286
|
-
[[package]]
|
|
287
|
-
name = "ppv-lite86"
|
|
288
|
-
version = "0.2.21"
|
|
289
|
-
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
290
|
-
checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
|
|
291
|
-
dependencies = [
|
|
292
|
-
"zerocopy",
|
|
293
|
-
]
|
|
294
|
-
|
|
295
|
-
[[package]]
|
|
296
|
-
name = "pretty_assertions"
|
|
297
|
-
version = "1.4.1"
|
|
298
|
-
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
299
|
-
checksum = "3ae130e2f271fbc2ac3a40fb1d07180839cdbbe443c7a27e1e3c13c5cac0116d"
|
|
300
|
-
dependencies = [
|
|
301
|
-
"diff",
|
|
302
|
-
"yansi",
|
|
303
|
-
]
|
|
304
|
-
|
|
305
280
|
[[package]]
|
|
306
281
|
name = "proc-macro2"
|
|
307
282
|
version = "1.0.106"
|
|
@@ -398,16 +373,6 @@ dependencies = [
|
|
|
398
373
|
"rand_core",
|
|
399
374
|
]
|
|
400
375
|
|
|
401
|
-
[[package]]
|
|
402
|
-
name = "rand_chacha"
|
|
403
|
-
version = "0.10.0"
|
|
404
|
-
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
405
|
-
checksum = "3e6af7f3e25ded52c41df4e0b1af2d047e45896c2f3281792ed68a1c243daedb"
|
|
406
|
-
dependencies = [
|
|
407
|
-
"ppv-lite86",
|
|
408
|
-
"rand_core",
|
|
409
|
-
]
|
|
410
|
-
|
|
411
376
|
[[package]]
|
|
412
377
|
name = "rand_core"
|
|
413
378
|
version = "0.10.1"
|
|
@@ -466,12 +431,6 @@ version = "1.0.22"
|
|
|
466
431
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
467
432
|
checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
|
|
468
433
|
|
|
469
|
-
[[package]]
|
|
470
|
-
name = "ryu"
|
|
471
|
-
version = "1.0.23"
|
|
472
|
-
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
473
|
-
checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f"
|
|
474
|
-
|
|
475
434
|
[[package]]
|
|
476
435
|
name = "scopeguard"
|
|
477
436
|
version = "1.2.0"
|
|
@@ -530,19 +489,6 @@ dependencies = [
|
|
|
530
489
|
"serde_core",
|
|
531
490
|
]
|
|
532
491
|
|
|
533
|
-
[[package]]
|
|
534
|
-
name = "serde_yaml"
|
|
535
|
-
version = "0.9.34+deprecated"
|
|
536
|
-
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
537
|
-
checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
|
|
538
|
-
dependencies = [
|
|
539
|
-
"indexmap",
|
|
540
|
-
"itoa",
|
|
541
|
-
"ryu",
|
|
542
|
-
"serde",
|
|
543
|
-
"unsafe-libyaml",
|
|
544
|
-
]
|
|
545
|
-
|
|
546
492
|
[[package]]
|
|
547
493
|
name = "sharded-slab"
|
|
548
494
|
version = "0.1.7"
|
|
@@ -560,9 +506,9 @@ checksum = "8ed6a63f02c8539c91a8685a86f4099661ba3da017932f6ebbea6de3f0fa7c90"
|
|
|
560
506
|
|
|
561
507
|
[[package]]
|
|
562
508
|
name = "solverforge-bridge"
|
|
563
|
-
version = "0.
|
|
509
|
+
version = "0.31.2"
|
|
564
510
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
565
|
-
checksum = "
|
|
511
|
+
checksum = "83cea0f44f27af9773fd925d4e6bd8b7ee0b2f131c3596139a33e4a4b747db06"
|
|
566
512
|
dependencies = [
|
|
567
513
|
"solverforge-config",
|
|
568
514
|
"solverforge-core",
|
|
@@ -572,22 +518,20 @@ dependencies = [
|
|
|
572
518
|
|
|
573
519
|
[[package]]
|
|
574
520
|
name = "solverforge-config"
|
|
575
|
-
version = "0.
|
|
521
|
+
version = "0.31.2"
|
|
576
522
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
577
|
-
checksum = "
|
|
523
|
+
checksum = "b454194b3d8864d3a4a449c34ae3da9b94fa01a2274f58d9b229bd626dcd3317"
|
|
578
524
|
dependencies = [
|
|
579
525
|
"serde",
|
|
580
|
-
"serde_yaml",
|
|
581
|
-
"solverforge-core",
|
|
582
526
|
"thiserror",
|
|
583
|
-
"toml
|
|
527
|
+
"toml",
|
|
584
528
|
]
|
|
585
529
|
|
|
586
530
|
[[package]]
|
|
587
531
|
name = "solverforge-console"
|
|
588
|
-
version = "0.
|
|
532
|
+
version = "0.31.2"
|
|
589
533
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
590
|
-
checksum = "
|
|
534
|
+
checksum = "1fbe83503f56e2b698ab2cc08a51d4fa06f7d504ea80aa5fe24f2d256a06bbf3"
|
|
591
535
|
dependencies = [
|
|
592
536
|
"num-format",
|
|
593
537
|
"owo-colors",
|
|
@@ -597,63 +541,56 @@ dependencies = [
|
|
|
597
541
|
|
|
598
542
|
[[package]]
|
|
599
543
|
name = "solverforge-core"
|
|
600
|
-
version = "0.
|
|
544
|
+
version = "0.31.2"
|
|
601
545
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
602
|
-
checksum = "
|
|
546
|
+
checksum = "43a01ad328f39a85d62029a4ec79550d88cf334dcb4c0e5705ed92755cfb03c5"
|
|
603
547
|
dependencies = [
|
|
604
548
|
"thiserror",
|
|
605
549
|
]
|
|
606
550
|
|
|
607
551
|
[[package]]
|
|
608
552
|
name = "solverforge-scoring"
|
|
609
|
-
version = "0.
|
|
553
|
+
version = "0.31.2"
|
|
610
554
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
611
|
-
checksum = "
|
|
555
|
+
checksum = "00928283f0a943b8c41731c4c67b85cd66dfb249421a963cb9d6296ddbbd355d"
|
|
612
556
|
dependencies = [
|
|
613
557
|
"solverforge-core",
|
|
614
|
-
"thiserror",
|
|
615
558
|
]
|
|
616
559
|
|
|
617
560
|
[[package]]
|
|
618
561
|
name = "solverforge-solver"
|
|
619
|
-
version = "0.
|
|
562
|
+
version = "0.31.2"
|
|
620
563
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
621
|
-
checksum = "
|
|
564
|
+
checksum = "82f3a19a6bd0a8ced9d91b13203d59529e54e93bf3643bcfd2352c5e07889c61"
|
|
622
565
|
dependencies = [
|
|
623
566
|
"rand",
|
|
624
|
-
"rand_chacha",
|
|
625
567
|
"rayon",
|
|
626
568
|
"serde",
|
|
627
569
|
"smallvec",
|
|
628
570
|
"solverforge-config",
|
|
629
571
|
"solverforge-core",
|
|
630
572
|
"solverforge-scoring",
|
|
631
|
-
"thiserror",
|
|
632
573
|
"tokio",
|
|
633
574
|
"tracing",
|
|
634
575
|
]
|
|
635
576
|
|
|
636
577
|
[[package]]
|
|
637
578
|
name = "solverforge-ui"
|
|
638
|
-
version = "0.9.
|
|
579
|
+
version = "0.9.1"
|
|
639
580
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
640
|
-
checksum = "
|
|
581
|
+
checksum = "4ac56d6fcfc1854033505eb94dde42c7af6f82030d7e710449a4be900abf4b37"
|
|
641
582
|
dependencies = [
|
|
642
583
|
"include_dir",
|
|
643
584
|
]
|
|
644
585
|
|
|
645
586
|
[[package]]
|
|
646
587
|
name = "solverforge_py"
|
|
647
|
-
version = "0.
|
|
588
|
+
version = "0.8.1"
|
|
648
589
|
dependencies = [
|
|
649
|
-
"indexmap",
|
|
650
|
-
"once_cell",
|
|
651
590
|
"parking_lot",
|
|
652
|
-
"pretty_assertions",
|
|
653
591
|
"pyo3",
|
|
654
592
|
"serde",
|
|
655
593
|
"serde_json",
|
|
656
|
-
"smallvec",
|
|
657
594
|
"solverforge-bridge",
|
|
658
595
|
"solverforge-config",
|
|
659
596
|
"solverforge-console",
|
|
@@ -661,11 +598,6 @@ dependencies = [
|
|
|
661
598
|
"solverforge-scoring",
|
|
662
599
|
"solverforge-solver",
|
|
663
600
|
"solverforge-ui",
|
|
664
|
-
"thiserror",
|
|
665
|
-
"tokio",
|
|
666
|
-
"toml 0.9.12+spec-1.1.0",
|
|
667
|
-
"tracing",
|
|
668
|
-
"tracing-subscriber",
|
|
669
601
|
]
|
|
670
602
|
|
|
671
603
|
[[package]]
|
|
@@ -723,21 +655,6 @@ dependencies = [
|
|
|
723
655
|
"pin-project-lite",
|
|
724
656
|
]
|
|
725
657
|
|
|
726
|
-
[[package]]
|
|
727
|
-
name = "toml"
|
|
728
|
-
version = "0.9.12+spec-1.1.0"
|
|
729
|
-
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
730
|
-
checksum = "cf92845e79fc2e2def6a5d828f0801e29a2f8acc037becc5ab08595c7d5e9863"
|
|
731
|
-
dependencies = [
|
|
732
|
-
"indexmap",
|
|
733
|
-
"serde_core",
|
|
734
|
-
"serde_spanned",
|
|
735
|
-
"toml_datetime 0.7.5+spec-1.1.0",
|
|
736
|
-
"toml_parser",
|
|
737
|
-
"toml_writer",
|
|
738
|
-
"winnow 0.7.15",
|
|
739
|
-
]
|
|
740
|
-
|
|
741
658
|
[[package]]
|
|
742
659
|
name = "toml"
|
|
743
660
|
version = "1.1.2+spec-1.1.0"
|
|
@@ -747,19 +664,10 @@ dependencies = [
|
|
|
747
664
|
"indexmap",
|
|
748
665
|
"serde_core",
|
|
749
666
|
"serde_spanned",
|
|
750
|
-
"toml_datetime
|
|
667
|
+
"toml_datetime",
|
|
751
668
|
"toml_parser",
|
|
752
669
|
"toml_writer",
|
|
753
|
-
"winnow
|
|
754
|
-
]
|
|
755
|
-
|
|
756
|
-
[[package]]
|
|
757
|
-
name = "toml_datetime"
|
|
758
|
-
version = "0.7.5+spec-1.1.0"
|
|
759
|
-
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
760
|
-
checksum = "92e1cfed4a3038bc5a127e35a2d360f145e1f4b971b551a2ba5fd7aedf7e1347"
|
|
761
|
-
dependencies = [
|
|
762
|
-
"serde_core",
|
|
670
|
+
"winnow",
|
|
763
671
|
]
|
|
764
672
|
|
|
765
673
|
[[package]]
|
|
@@ -777,7 +685,7 @@ version = "1.1.2+spec-1.1.0"
|
|
|
777
685
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
778
686
|
checksum = "a2abe9b86193656635d2411dc43050282ca48aa31c2451210f4202550afb7526"
|
|
779
687
|
dependencies = [
|
|
780
|
-
"winnow
|
|
688
|
+
"winnow",
|
|
781
689
|
]
|
|
782
690
|
|
|
783
691
|
[[package]]
|
|
@@ -859,12 +767,6 @@ version = "0.2.4"
|
|
|
859
767
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
860
768
|
checksum = "7264e107f553ccae879d21fbea1d6724ac785e8c3bfc762137959b5802826ef3"
|
|
861
769
|
|
|
862
|
-
[[package]]
|
|
863
|
-
name = "unsafe-libyaml"
|
|
864
|
-
version = "0.2.11"
|
|
865
|
-
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
866
|
-
checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861"
|
|
867
|
-
|
|
868
770
|
[[package]]
|
|
869
771
|
name = "valuable"
|
|
870
772
|
version = "0.1.1"
|
|
@@ -886,44 +788,12 @@ dependencies = [
|
|
|
886
788
|
"windows-link",
|
|
887
789
|
]
|
|
888
790
|
|
|
889
|
-
[[package]]
|
|
890
|
-
name = "winnow"
|
|
891
|
-
version = "0.7.15"
|
|
892
|
-
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
893
|
-
checksum = "df79d97927682d2fd8adb29682d1140b343be4ac0f08fd68b7765d9c059d3945"
|
|
894
|
-
|
|
895
791
|
[[package]]
|
|
896
792
|
name = "winnow"
|
|
897
793
|
version = "1.0.3"
|
|
898
794
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
899
795
|
checksum = "0592e1c9d151f854e6fd382574c3a0855250e1d9b2f99d9281c6e6391af352f1"
|
|
900
796
|
|
|
901
|
-
[[package]]
|
|
902
|
-
name = "yansi"
|
|
903
|
-
version = "1.0.1"
|
|
904
|
-
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
905
|
-
checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"
|
|
906
|
-
|
|
907
|
-
[[package]]
|
|
908
|
-
name = "zerocopy"
|
|
909
|
-
version = "0.8.52"
|
|
910
|
-
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
911
|
-
checksum = "ce1022995ff5ff5d841ad7d994facc23098cd40152f2c1d11cd607c6f530653f"
|
|
912
|
-
dependencies = [
|
|
913
|
-
"zerocopy-derive",
|
|
914
|
-
]
|
|
915
|
-
|
|
916
|
-
[[package]]
|
|
917
|
-
name = "zerocopy-derive"
|
|
918
|
-
version = "0.8.52"
|
|
919
|
-
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
920
|
-
checksum = "1ae7f38b72ec2a254e2b87ef277cf2cd4fb97cbebf944faa6f33354da0867930"
|
|
921
|
-
dependencies = [
|
|
922
|
-
"proc-macro2",
|
|
923
|
-
"quote",
|
|
924
|
-
"syn",
|
|
925
|
-
]
|
|
926
|
-
|
|
927
797
|
[[package]]
|
|
928
798
|
name = "zmij"
|
|
929
799
|
version = "1.0.21"
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
[package]
|
|
2
2
|
name = "solverforge_py"
|
|
3
|
-
version = "0.
|
|
3
|
+
version = "0.8.1"
|
|
4
4
|
edition = "2021"
|
|
5
5
|
license = "Apache-2.0"
|
|
6
6
|
rust-version = "1.95"
|
|
@@ -26,32 +26,21 @@ name = "solverforge_py"
|
|
|
26
26
|
crate-type = ["cdylib", "rlib"]
|
|
27
27
|
|
|
28
28
|
[package.metadata.solverforge]
|
|
29
|
-
version = "0.
|
|
29
|
+
version = "0.31.2"
|
|
30
30
|
|
|
31
31
|
[dependencies]
|
|
32
|
-
indexmap = "2.12.1"
|
|
33
|
-
once_cell = "1.21.3"
|
|
34
32
|
parking_lot = "0.12.5"
|
|
35
33
|
pyo3 = "0.27.1"
|
|
36
34
|
serde = { version = "1.0.228", features = ["derive"] }
|
|
37
35
|
serde_json = "1.0.145"
|
|
38
|
-
smallvec = "1.15.1"
|
|
39
|
-
thiserror = "2.0.18"
|
|
40
|
-
tokio = { version = "1.48.0", default-features = false, features = ["sync"] }
|
|
41
|
-
toml = "0.9.8"
|
|
42
|
-
tracing = "0.1.44"
|
|
43
|
-
tracing-subscriber = { version = "0.3.23", features = ["env-filter"] }
|
|
44
36
|
|
|
45
|
-
solverforge-config = { version = "=0.
|
|
46
|
-
solverforge-bridge = { version = "=0.
|
|
47
|
-
solverforge-console = { version = "=0.
|
|
48
|
-
solverforge-core = { version = "=0.
|
|
49
|
-
solverforge-scoring = { version = "=0.
|
|
50
|
-
solverforge-solver = { version = "=0.
|
|
51
|
-
solverforge-ui = { version = "=0.9.
|
|
52
|
-
|
|
53
|
-
[dev-dependencies]
|
|
54
|
-
pretty_assertions = "1.4.1"
|
|
37
|
+
solverforge-config = { version = "=0.31.2" }
|
|
38
|
+
solverforge-bridge = { version = "=0.31.2" }
|
|
39
|
+
solverforge-console = { version = "=0.31.2", features = ["verbose-logging"] }
|
|
40
|
+
solverforge-core = { version = "=0.31.2" }
|
|
41
|
+
solverforge-scoring = { version = "=0.31.2" }
|
|
42
|
+
solverforge-solver = { version = "=0.31.2" }
|
|
43
|
+
solverforge-ui = { version = "=0.9.1", default-features = false }
|
|
55
44
|
|
|
56
45
|
[features]
|
|
57
46
|
extension-module = ["pyo3/extension-module"]
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: solverforge
|
|
3
|
-
Version: 0.
|
|
3
|
+
Version: 0.8.1
|
|
4
4
|
Classifier: Development Status :: 3 - Alpha
|
|
5
5
|
Classifier: Intended Audience :: Developers
|
|
6
6
|
Classifier: Intended Audience :: Science/Research
|
|
@@ -40,8 +40,8 @@ clone, mutate, and snapshot solutions safely. Python callbacks are the single
|
|
|
40
40
|
constraint authoring surface.
|
|
41
41
|
|
|
42
42
|
The package targets CPython 3.14 and Rust 1.95.0. This release-preparation
|
|
43
|
-
checkout pins the six published SolverForge Rust dependencies to `0.
|
|
44
|
-
`solverforge-ui` to `0.9.
|
|
43
|
+
checkout pins the six published SolverForge Rust dependencies to `0.31.2` and
|
|
44
|
+
`solverforge-ui` to `0.9.1` through exact crates.io requirements in
|
|
45
45
|
`Cargo.toml` and registry checksums in `Cargo.lock`. There is no local path or
|
|
46
46
|
Git dependency override. The `solverforge` `0.6.x` line is the current dynamic
|
|
47
47
|
binding architecture and intentionally supersedes the older incompatible
|
|
@@ -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.
|
|
55
|
-
the published and registry-locked SolverForge Rust `0.
|
|
54
|
+
The package version prepared by this checkout is `solverforge` `0.8.1`, targeting
|
|
55
|
+
the published and registry-locked SolverForge Rust `0.31.2` 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.
|
|
59
|
+
python3.14 -m pip install "solverforge==0.8.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.
|
|
79
|
+
package once `0.8.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.
|
|
84
|
+
python -m pip install "solverforge[examples]==0.8.1"
|
|
85
85
|
python examples/nqueens.py
|
|
86
86
|
python -m examples.solverforge_hospital
|
|
87
87
|
python -m examples.solverforge_deliveries
|
|
@@ -180,7 +180,18 @@ Run `make help` for focused targets such as `make test-hospital`,
|
|
|
180
180
|
top-level plus phase-level termination fields match upstream SolverForge:
|
|
181
181
|
`seconds_spent_limit`, `minutes_spent_limit`, `best_score_limit`,
|
|
182
182
|
`step_count_limit`, `unimproved_step_count_limit`, and
|
|
183
|
-
`unimproved_seconds_spent_limit`.
|
|
183
|
+
`unimproved_seconds_spent_limit`. Every configured solver-level criterion
|
|
184
|
+
applies, combined with OR, and a zero time limit means zero rather than no
|
|
185
|
+
limit. There is no implicit time limit: a solve without any criterion runs its
|
|
186
|
+
phases to their end, so an explicit local-search phase without a limit runs
|
|
187
|
+
until cancelled. Upstream validates the rest of the config before solving;
|
|
188
|
+
for example a zero `selected_count_limit` or `max_nearby` is a configuration
|
|
189
|
+
error rather than an empty neighborhood.
|
|
190
|
+
- `score_director.constraint_provider` selects the solution's constraint
|
|
191
|
+
provider by the `__name__` of the function passed to
|
|
192
|
+
`@planning_solution(constraints=...)`. A name the solution does not declare,
|
|
193
|
+
or any name on a solution without constraints, fails before solving: a direct
|
|
194
|
+
solve raises and a retained job enters `FAILED`.
|
|
184
195
|
- Synchronous and retained scalar/list construction solves use one upstream
|
|
185
196
|
compiled runtime runner. Ordinary dynamic scalar construction supports
|
|
186
197
|
`first_fit` and `cheapest_insertion`. A declared assignment group additionally
|
|
@@ -213,9 +224,11 @@ Run `make help` for focused targets such as `make test-hospital`,
|
|
|
213
224
|
`phases` list with one entry per phase started so far, in execution order:
|
|
214
225
|
phase type, index, step/move/score counters, `moves_speculative`, and
|
|
215
226
|
generation/evaluation time. The last entry of a progress event is the phase
|
|
216
|
-
still running.
|
|
217
|
-
`
|
|
218
|
-
|
|
227
|
+
still running. Run totals also carry `problem_changes_applied`.
|
|
228
|
+
`telemetry_detail(job_id)` returns one atomic `status` with detailed
|
|
229
|
+
telemetry (selector, move, and applied-move records, plus the
|
|
230
|
+
`resolved_phase_plan` tree once the solve has ended) and an optional
|
|
231
|
+
`candidate_trace`; ordinary status/event polling remains compact.
|
|
219
232
|
- Candidate tracing is an opt-in retained-job diagnostic configured as
|
|
220
233
|
`candidate_trace = { max_entries = N }`, where `N` must be non-zero. The core
|
|
221
234
|
records the total pull count after the bounded identity prefix is full and
|
|
@@ -442,9 +455,11 @@ Set `{"move_thread_count": {"count": 4}}` in a config dict, or
|
|
|
442
455
|
`move_thread_count = { count = 4 }` in `solver.toml`, to run each step's trials
|
|
443
456
|
on up to four evaluators while one coordinator keeps the sequential acceptance
|
|
444
457
|
order. Upstream SolverForge bounds the count by the solve's Rayon threads and by
|
|
445
|
-
32, the size of one evaluation window. `"none"` disables parallel evaluation
|
|
446
|
-
|
|
447
|
-
|
|
458
|
+
32, the size of one evaluation window. `"none"` disables parallel evaluation.
|
|
459
|
+
The default, `"auto"`, picks sequential evaluation or parallel windows per step
|
|
460
|
+
from measured trial, window, and replica costs, on up to four evaluators, so
|
|
461
|
+
scoring callbacks can run concurrently even without an explicit count.
|
|
462
|
+
Construction and variable neighborhood descent phases always run sequentially.
|
|
448
463
|
|
|
449
464
|
Every evaluator owns its own constraint set, built from the same compiled
|
|
450
465
|
schema and callbacks as the working solution, and scores a replica of the
|
|
@@ -9,8 +9,8 @@ clone, mutate, and snapshot solutions safely. Python callbacks are the single
|
|
|
9
9
|
constraint authoring surface.
|
|
10
10
|
|
|
11
11
|
The package targets CPython 3.14 and Rust 1.95.0. This release-preparation
|
|
12
|
-
checkout pins the six published SolverForge Rust dependencies to `0.
|
|
13
|
-
`solverforge-ui` to `0.9.
|
|
12
|
+
checkout pins the six published SolverForge Rust dependencies to `0.31.2` and
|
|
13
|
+
`solverforge-ui` to `0.9.1` through exact crates.io requirements in
|
|
14
14
|
`Cargo.toml` and registry checksums in `Cargo.lock`. There is no local path or
|
|
15
15
|
Git dependency override. The `solverforge` `0.6.x` line is the current dynamic
|
|
16
16
|
binding architecture and intentionally supersedes the older incompatible
|
|
@@ -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.
|
|
24
|
-
the published and registry-locked SolverForge Rust `0.
|
|
23
|
+
The package version prepared by this checkout is `solverforge` `0.8.1`, targeting
|
|
24
|
+
the published and registry-locked SolverForge Rust `0.31.2` 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.
|
|
28
|
+
python3.14 -m pip install "solverforge==0.8.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.
|
|
48
|
+
package once `0.8.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.
|
|
53
|
+
python -m pip install "solverforge[examples]==0.8.1"
|
|
54
54
|
python examples/nqueens.py
|
|
55
55
|
python -m examples.solverforge_hospital
|
|
56
56
|
python -m examples.solverforge_deliveries
|
|
@@ -149,7 +149,18 @@ Run `make help` for focused targets such as `make test-hospital`,
|
|
|
149
149
|
top-level plus phase-level termination fields match upstream SolverForge:
|
|
150
150
|
`seconds_spent_limit`, `minutes_spent_limit`, `best_score_limit`,
|
|
151
151
|
`step_count_limit`, `unimproved_step_count_limit`, and
|
|
152
|
-
`unimproved_seconds_spent_limit`.
|
|
152
|
+
`unimproved_seconds_spent_limit`. Every configured solver-level criterion
|
|
153
|
+
applies, combined with OR, and a zero time limit means zero rather than no
|
|
154
|
+
limit. There is no implicit time limit: a solve without any criterion runs its
|
|
155
|
+
phases to their end, so an explicit local-search phase without a limit runs
|
|
156
|
+
until cancelled. Upstream validates the rest of the config before solving;
|
|
157
|
+
for example a zero `selected_count_limit` or `max_nearby` is a configuration
|
|
158
|
+
error rather than an empty neighborhood.
|
|
159
|
+
- `score_director.constraint_provider` selects the solution's constraint
|
|
160
|
+
provider by the `__name__` of the function passed to
|
|
161
|
+
`@planning_solution(constraints=...)`. A name the solution does not declare,
|
|
162
|
+
or any name on a solution without constraints, fails before solving: a direct
|
|
163
|
+
solve raises and a retained job enters `FAILED`.
|
|
153
164
|
- Synchronous and retained scalar/list construction solves use one upstream
|
|
154
165
|
compiled runtime runner. Ordinary dynamic scalar construction supports
|
|
155
166
|
`first_fit` and `cheapest_insertion`. A declared assignment group additionally
|
|
@@ -182,9 +193,11 @@ Run `make help` for focused targets such as `make test-hospital`,
|
|
|
182
193
|
`phases` list with one entry per phase started so far, in execution order:
|
|
183
194
|
phase type, index, step/move/score counters, `moves_speculative`, and
|
|
184
195
|
generation/evaluation time. The last entry of a progress event is the phase
|
|
185
|
-
still running.
|
|
186
|
-
`
|
|
187
|
-
|
|
196
|
+
still running. Run totals also carry `problem_changes_applied`.
|
|
197
|
+
`telemetry_detail(job_id)` returns one atomic `status` with detailed
|
|
198
|
+
telemetry (selector, move, and applied-move records, plus the
|
|
199
|
+
`resolved_phase_plan` tree once the solve has ended) and an optional
|
|
200
|
+
`candidate_trace`; ordinary status/event polling remains compact.
|
|
188
201
|
- Candidate tracing is an opt-in retained-job diagnostic configured as
|
|
189
202
|
`candidate_trace = { max_entries = N }`, where `N` must be non-zero. The core
|
|
190
203
|
records the total pull count after the bounded identity prefix is full and
|
|
@@ -411,9 +424,11 @@ Set `{"move_thread_count": {"count": 4}}` in a config dict, or
|
|
|
411
424
|
`move_thread_count = { count = 4 }` in `solver.toml`, to run each step's trials
|
|
412
425
|
on up to four evaluators while one coordinator keeps the sequential acceptance
|
|
413
426
|
order. Upstream SolverForge bounds the count by the solve's Rayon threads and by
|
|
414
|
-
32, the size of one evaluation window. `"none"` disables parallel evaluation
|
|
415
|
-
|
|
416
|
-
|
|
427
|
+
32, the size of one evaluation window. `"none"` disables parallel evaluation.
|
|
428
|
+
The default, `"auto"`, picks sequential evaluation or parallel windows per step
|
|
429
|
+
from measured trial, window, and replica costs, on up to four evaluators, so
|
|
430
|
+
scoring callbacks can run concurrently even without an explicit count.
|
|
431
|
+
Construction and variable neighborhood descent phases always run sequentially.
|
|
417
432
|
|
|
418
433
|
Every evaluator owns its own constraint set, built from the same compiled
|
|
419
434
|
schema and callbacks as the working solution, and scores a replica of the
|
|
@@ -201,6 +201,18 @@ def _constraint_plans(
|
|
|
201
201
|
return [plan.to_native() for plan in plans]
|
|
202
202
|
|
|
203
203
|
|
|
204
|
+
def _constraint_provider_name(provider: Callable[..., object] | None) -> str | None:
|
|
205
|
+
"""Name `score_director.constraint_provider` selects the provider by."""
|
|
206
|
+
|
|
207
|
+
if provider is None:
|
|
208
|
+
return None
|
|
209
|
+
name = getattr(provider, "__name__", None)
|
|
210
|
+
if not isinstance(name, str) or not name:
|
|
211
|
+
msg = f"constraint provider {provider!r} has no __name__"
|
|
212
|
+
raise ModelValidationError(msg)
|
|
213
|
+
return name
|
|
214
|
+
|
|
215
|
+
|
|
204
216
|
def _scalar_groups(callbacks: object) -> list[dict[str, object]]:
|
|
205
217
|
groups: list[dict[str, object]] = []
|
|
206
218
|
names: set[str] = set()
|
|
@@ -297,7 +309,8 @@ def build_schema(solution: object) -> dict[str, Any]:
|
|
|
297
309
|
msg = f"{type(solution).__name__} is not marked with @planning_solution"
|
|
298
310
|
raise ModelValidationError(msg)
|
|
299
311
|
score_family = cast(str, solution_meta["score_family"])
|
|
300
|
-
|
|
312
|
+
provider = solution_meta.get("constraints")
|
|
313
|
+
constraints = _constraint_plans(provider, score_family)
|
|
301
314
|
return {
|
|
302
315
|
"solution_type": solution_meta["type_name"],
|
|
303
316
|
"score_family": score_family,
|
|
@@ -305,6 +318,7 @@ def build_schema(solution: object) -> dict[str, Any]:
|
|
|
305
318
|
"entities": _infer_entity_collections(solution),
|
|
306
319
|
"facts": _infer_fact_collections(solution),
|
|
307
320
|
"constraints": constraints,
|
|
321
|
+
"constraint_provider": _constraint_provider_name(provider),
|
|
308
322
|
"scalar_groups": _scalar_groups(solution_meta.get("scalar_groups")),
|
|
309
323
|
"conflict_repairs": _conflict_repairs(solution_meta.get("conflict_repairs")),
|
|
310
324
|
"candidate_metrics": _candidate_metrics(solution_meta.get("candidate_metrics")),
|
|
@@ -12,6 +12,7 @@ fn init_console() {
|
|
|
12
12
|
|
|
13
13
|
#[pymodule(gil_used = false)]
|
|
14
14
|
fn _native(py: Python<'_>, module: &Bound<'_, PyModule>) -> PyResult<()> {
|
|
15
|
+
crate::error::install_callback_panic_hook();
|
|
15
16
|
module.add(
|
|
16
17
|
"NativeSolverError",
|
|
17
18
|
py.get_type::<crate::error::NativeSolverError>(),
|
|
@@ -47,6 +47,7 @@ fn fixture(py: Python<'_>, mixed: bool) -> PyResult<PyDynamicSolution> {
|
|
|
47
47
|
}],
|
|
48
48
|
facts: Vec::new(),
|
|
49
49
|
constraints,
|
|
50
|
+
constraint_provider: None,
|
|
50
51
|
scalar_groups: PyList::empty(py).into_any().unbind(),
|
|
51
52
|
assignment_scalar_groups: Vec::new(),
|
|
52
53
|
conflict_repairs: PyList::empty(py).into_any().unbind(),
|