solverforge 0.2.2__tar.gz → 0.2.3__tar.gz

{solverforge-0.2.2 → solverforge-0.2.3}/Cargo.lock

@@ -1507,7 +1507,7 @@ dependencies = [
 
 [[package]]
 name = "solverforge"
-version = "0.2.2"
+version = "0.2.3"
 dependencies = [
  "solverforge-core",
  "solverforge-derive",
@@ -1516,7 +1516,7 @@ dependencies = [
 
 [[package]]
 name = "solverforge-core"
-version = "0.2.2"
+version = "0.2.3"
 dependencies = [
  "base64",
  "indexmap",
@@ -1532,7 +1532,7 @@ dependencies = [
 
 [[package]]
 name = "solverforge-derive"
-version = "0.2.2"
+version = "0.2.3"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1544,7 +1544,7 @@ dependencies = [
 
 [[package]]
 name = "solverforge-python"
-version = "0.2.2"
+version = "0.2.3"
 dependencies = [
  "log",
  "pyo3",
@@ -1557,7 +1557,7 @@ dependencies = [
 
 [[package]]
 name = "solverforge-service"
-version = "0.2.2"
+version = "0.2.3"
 dependencies = [
  "base64",
  "chrono",

{solverforge-0.2.2 → solverforge-0.2.3}/Cargo.toml

@@ -3,7 +3,7 @@ members = ["solverforge-core", "solverforge-python"]
 resolver = "2"
 
 [workspace.package]
-version = "0.2.2"
+version = "0.2.3"
 edition = "2021"
 license = "Apache-2.0"
 repository = "https://github.com/solverforge/solverforge"

{solverforge-0.2.2 → solverforge-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: solverforge
-Version: 0.2.2
+Version: 0.2.3
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: 3

{solverforge-0.2.2 → solverforge-0.2.3}/pyproject.toml

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

{solverforge-0.2.2 → solverforge-0.2.3}/python/solverforge/__init__.py

@@ -35,6 +35,36 @@ from solverforge._solverforge import (
     build_domain_model,
     DomainClass,
     DomainModel,
+    constraint_provider,
+    ConstraintProvider,
+    # Solver runtime
+    TerminationConfig,
+    DiminishedReturnsConfig,
+    EnvironmentMode,
+    MoveThreadCount,
+    SolverConfig,
+    SolveHandle,
+    SolveState,
+    ScoreDto,
+    SolveStatus,
+    SolveResponse,
+    SolverFactory,
+    Solver,
+    # Constraint streams
+    ConstraintFactory,
+    UniConstraintStream,
+    BiConstraintStream,
+    TriConstraintStream,
+    UniConstraintBuilder,
+    BiConstraintBuilder,
+    TriConstraintBuilder,
+    Constraint,
+    # Joiners
+    Joiner,
+    Joiners,
+    # Collectors
+    Collector,
+    ConstraintCollectors,
 )
 
 __all__ = [
@@ -62,4 +92,34 @@ __all__ = [
     "build_domain_model",
     "DomainClass",
     "DomainModel",
+    "constraint_provider",
+    "ConstraintProvider",
+    # Solver runtime
+    "TerminationConfig",
+    "DiminishedReturnsConfig",
+    "EnvironmentMode",
+    "MoveThreadCount",
+    "SolverConfig",
+    "SolveHandle",
+    "SolveState",
+    "ScoreDto",
+    "SolveStatus",
+    "SolveResponse",
+    "SolverFactory",
+    "Solver",
+    # Constraint streams
+    "ConstraintFactory",
+    "UniConstraintStream",
+    "BiConstraintStream",
+    "TriConstraintStream",
+    "UniConstraintBuilder",
+    "BiConstraintBuilder",
+    "TriConstraintBuilder",
+    "Constraint",
+    # Joiners
+    "Joiner",
+    "Joiners",
+    # Collectors
+    "Collector",
+    "ConstraintCollectors",
 ]

{solverforge-0.2.2 → solverforge-0.2.3}/solverforge-python/python/solverforge/__init__.py

@@ -35,6 +35,36 @@ from solverforge._solverforge import (
     build_domain_model,
     DomainClass,
     DomainModel,
+    constraint_provider,
+    ConstraintProvider,
+    # Solver runtime
+    TerminationConfig,
+    DiminishedReturnsConfig,
+    EnvironmentMode,
+    MoveThreadCount,
+    SolverConfig,
+    SolveHandle,
+    SolveState,
+    ScoreDto,
+    SolveStatus,
+    SolveResponse,
+    SolverFactory,
+    Solver,
+    # Constraint streams
+    ConstraintFactory,
+    UniConstraintStream,
+    BiConstraintStream,
+    TriConstraintStream,
+    UniConstraintBuilder,
+    BiConstraintBuilder,
+    TriConstraintBuilder,
+    Constraint,
+    # Joiners
+    Joiner,
+    Joiners,
+    # Collectors
+    Collector,
+    ConstraintCollectors,
 )
 
 __all__ = [
@@ -62,4 +92,34 @@ __all__ = [
     "build_domain_model",
     "DomainClass",
     "DomainModel",
+    "constraint_provider",
+    "ConstraintProvider",
+    # Solver runtime
+    "TerminationConfig",
+    "DiminishedReturnsConfig",
+    "EnvironmentMode",
+    "MoveThreadCount",
+    "SolverConfig",
+    "SolveHandle",
+    "SolveState",
+    "ScoreDto",
+    "SolveStatus",
+    "SolveResponse",
+    "SolverFactory",
+    "Solver",
+    # Constraint streams
+    "ConstraintFactory",
+    "UniConstraintStream",
+    "BiConstraintStream",
+    "TriConstraintStream",
+    "UniConstraintBuilder",
+    "BiConstraintBuilder",
+    "TriConstraintBuilder",
+    "Constraint",
+    # Joiners
+    "Joiner",
+    "Joiners",
+    # Collectors
+    "Collector",
+    "ConstraintCollectors",
 ]

solverforge-0.2.3/solverforge-python/src/lib.rs

@@ -0,0 +1,148 @@
+//! Python bindings for SolverForge constraint solver
+//!
+//! This crate provides Python bindings using PyO3, offering a 1:1 compatible API
+//! with Timefold's Python bindings.
+
+use pyo3::prelude::*;
+
+mod annotations;
+mod bridge;
+mod collectors;
+mod decorators;
+mod joiners;
+mod lambda_analyzer;
+mod score;
+mod solver;
+mod stream;
+
+pub use annotations::{
+    PyDeepPlanningClone, PyInverseRelationShadowVariable, PyPlanningEntityCollectionProperty,
+    PyPlanningEntityProperty, PyPlanningId, PyPlanningListVariable, PyPlanningPin, PyPlanningScore,
+    PyPlanningVariable, PyProblemFactCollectionProperty, PyProblemFactProperty,
+    PyValueRangeProvider,
+};
+pub use bridge::{PyBridge, PythonBridge};
+pub use collectors::{PyCollector, PyConstraintCollectors};
+pub use decorators::{PyConstraintProvider, PyDomainClass, PyDomainModel};
+pub use joiners::{PyJoiner, PyJoiners};
+pub use lambda_analyzer::{analyze_lambda, generate_lambda_name, LambdaInfo};
+pub use score::{PyHardMediumSoftScore, PyHardSoftScore, PySimpleScore};
+pub use solver::{
+    PyDiminishedReturnsConfig, PyEnvironmentMode, PyMoveThreadCount, PySolveHandle,
+    PySolveResponse, PySolveStatus, PySolver, PySolverConfig, PySolverFactory, PyTerminationConfig,
+};
+pub use stream::{
+    PyBiConstraintBuilder, PyBiConstraintStream, PyConstraint, PyConstraintFactory,
+    PyTriConstraintBuilder, PyTriConstraintStream, PyUniConstraintBuilder, PyUniConstraintStream,
+};
+
+/// SolverForge Python module
+///
+/// Provides constraint solving capabilities with an API compatible with Timefold.
+#[pymodule]
+fn _solverforge(m: &Bound<'_, PyModule>) -> PyResult<()> {
+    // Version info
+    m.add("__version__", env!("CARGO_PKG_VERSION"))?;
+
+    // Bridge for Python-Rust object interop
+    m.add_class::<PyBridge>()?;
+
+    // Annotation marker classes
+    annotations::register_annotations(m)?;
+
+    // Score types
+    score::register_scores(m)?;
+
+    // Decorators
+    decorators::register_decorators(m)?;
+
+    // Constraint streams
+    stream::register_streams(m)?;
+
+    // Joiners
+    joiners::register_joiners(m)?;
+
+    // Collectors
+    collectors::register_collectors(m)?;
+
+    // Solver
+    solver::register_solver(m)?;
+
+    Ok(())
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    /// Verify that all solver runtime types are accessible from lib.rs exports
+    #[test]
+    fn test_solver_runtime_types_exported() {
+        // These type assertions verify the types are publicly re-exported
+        fn assert_type<T>() {}
+
+        assert_type::<PySolverConfig>();
+        assert_type::<PyTerminationConfig>();
+        assert_type::<PySolverFactory>();
+        assert_type::<PySolver>();
+        assert_type::<PySolveHandle>();
+        assert_type::<PySolveResponse>();
+        assert_type::<PySolveStatus>();
+        assert_type::<PyEnvironmentMode>();
+        assert_type::<PyMoveThreadCount>();
+        assert_type::<PyDiminishedReturnsConfig>();
+    }
+
+    /// Verify that all constraint stream types are accessible
+    #[test]
+    fn test_constraint_stream_types_exported() {
+        fn assert_type<T>() {}
+
+        assert_type::<PyConstraintFactory>();
+        assert_type::<PyUniConstraintStream>();
+        assert_type::<PyBiConstraintStream>();
+        assert_type::<PyTriConstraintStream>();
+        assert_type::<PyUniConstraintBuilder>();
+        assert_type::<PyBiConstraintBuilder>();
+        assert_type::<PyTriConstraintBuilder>();
+        assert_type::<PyConstraint>();
+    }
+
+    /// Verify that joiner types are accessible
+    #[test]
+    fn test_joiner_types_exported() {
+        fn assert_type<T>() {}
+
+        assert_type::<PyJoiner>();
+        assert_type::<PyJoiners>();
+    }
+
+    /// Verify that collector types are accessible
+    #[test]
+    fn test_collector_types_exported() {
+        fn assert_type<T>() {}
+
+        assert_type::<PyCollector>();
+        assert_type::<PyConstraintCollectors>();
+    }
+
+    /// Verify that decorator types are accessible
+    #[test]
+    fn test_decorator_types_exported() {
+        fn assert_type<T>() {}
+
+        assert_type::<PyConstraintProvider>();
+        assert_type::<PyDomainClass>();
+        assert_type::<PyDomainModel>();
+    }
+
+    /// Verify that score types are accessible
+    #[test]
+    fn test_score_types_exported() {
+        fn assert_type<T>() {}
+
+        assert_type::<PySimpleScore>();
+        assert_type::<PyHardSoftScore>();
+        assert_type::<PyHardMediumSoftScore>();
+    }
+}

solverforge-0.2.2/solverforge-python/src/lib.rs

@@ -1,72 +0,0 @@
-//! Python bindings for SolverForge constraint solver
-//!
-//! This crate provides Python bindings using PyO3, offering a 1:1 compatible API
-//! with Timefold's Python bindings.
-
-use pyo3::prelude::*;
-
-mod annotations;
-mod bridge;
-mod collectors;
-mod decorators;
-mod joiners;
-mod lambda_analyzer;
-mod score;
-mod solver;
-mod stream;
-
-pub use annotations::{
-    PyDeepPlanningClone, PyInverseRelationShadowVariable, PyPlanningEntityCollectionProperty,
-    PyPlanningEntityProperty, PyPlanningId, PyPlanningListVariable, PyPlanningPin, PyPlanningScore,
-    PyPlanningVariable, PyProblemFactCollectionProperty, PyProblemFactProperty,
-    PyValueRangeProvider,
-};
-pub use bridge::{PyBridge, PythonBridge};
-pub use collectors::{PyCollector, PyConstraintCollectors};
-pub use decorators::{PyConstraintProvider, PyDomainClass, PyDomainModel};
-pub use joiners::{PyJoiner, PyJoiners};
-pub use lambda_analyzer::{analyze_lambda, generate_lambda_name, LambdaInfo};
-pub use score::{PyHardMediumSoftScore, PyHardSoftScore, PySimpleScore};
-pub use solver::{
-    PyDiminishedReturnsConfig, PyEnvironmentMode, PyMoveThreadCount, PySolveHandle,
-    PySolveResponse, PySolveStatus, PySolver, PySolverConfig, PySolverFactory, PyTerminationConfig,
-};
-pub use stream::{
-    PyBiConstraintBuilder, PyBiConstraintStream, PyConstraint, PyConstraintFactory,
-    PyTriConstraintBuilder, PyTriConstraintStream, PyUniConstraintBuilder, PyUniConstraintStream,
-};
-
-/// SolverForge Python module
-///
-/// Provides constraint solving capabilities with an API compatible with Timefold.
-#[pymodule]
-fn _solverforge(m: &Bound<'_, PyModule>) -> PyResult<()> {
-    // Version info
-    m.add("__version__", env!("CARGO_PKG_VERSION"))?;
-
-    // Bridge for Python-Rust object interop
-    m.add_class::<PyBridge>()?;
-
-    // Annotation marker classes
-    annotations::register_annotations(m)?;
-
-    // Score types
-    score::register_scores(m)?;
-
-    // Decorators
-    decorators::register_decorators(m)?;
-
-    // Constraint streams
-    stream::register_streams(m)?;
-
-    // Joiners
-    joiners::register_joiners(m)?;
-
-    // Collectors
-    collectors::register_collectors(m)?;
-
-    // Solver
-    solver::register_solver(m)?;
-
-    Ok(())
-}