WIP

binding/python/raftify.pyi

@@ -2,6 +2,7 @@ import abc
 from dataclasses import dataclass
 from typing import Any, Callable, Final, Optional
 
+# TODO: Make these abstract types available in the Python side.
 class AbstractLogEntry(metaclass=abc.ABCMeta):
     @abc.abstractmethod
     def encode(self) -> bytes:
@@ -18,13 +19,19 @@ class AbstractStateMachine(metaclass=abc.ABCMeta):
     """
 
     @abc.abstractmethod
-    async def apply(self, message: bytes) -> bytes:
+    def apply(self, message: bytes) -> bytes:
         raise NotImplementedError
     @abc.abstractmethod
-    async def snapshot(self) -> bytes:
+    def snapshot(self) -> bytes:
         raise NotImplementedError
     @abc.abstractmethod
-    async def restore(self, snapshot: bytes) -> None:
+    def restore(self, snapshot: bytes) -> None:
+        raise NotImplementedError
+    @abc.abstractmethod
+    def encode(self) -> bytes:
+        raise NotImplementedError
+    @classmethod
+    def decode(cls, packed: bytes) -> "AbstractStateMachine":
         raise NotImplementedError
 
 class Raft:

binding/python/src/bindings/config.rs

@@ -4,30 +4,18 @@ use raftify::Config;
 use super::raft_rs::config::PyRaftConfig;
 
 #[derive(Clone)]
-#[pyclass(name = "Config")]
+#[pyclass(get_all, set_all, name = "Config")]
 pub struct PyConfig {
-    #[pyo3(get, set)]
     pub raft_config: PyRaftConfig,
-
-    #[pyo3(get, set)]
     pub log_dir: String,
-    #[pyo3(get, set)]
     pub save_compacted_logs: bool,
-    #[pyo3(get, set)]
     pub compacted_log_dir: String,
-    #[pyo3(get, set)]
     pub compacted_log_size_threshold: u64,
-    #[pyo3(get, set)]
     pub snapshot_interval: f32,
-    #[pyo3(get, set)]
     pub tick_interval: f32,
-    #[pyo3(get, set)]
     pub lmdb_map_size: u64,
-    #[pyo3(get, set)]
     pub cluster_id: String,
-    #[pyo3(get, set)]
     pub terminate_on_remove: bool,
-    #[pyo3(get, set)]
     pub conf_change_request_timeout: f32,
 }
 

binding/python/src/bindings/state_machine.rs

@@ -4,7 +4,7 @@ use pyo3::{prelude::*, types::PyBytes};
 use raftify::{AbstractLogEntry, AbstractStateMachine, Error, Result};
 use std::{fmt, sync::Mutex};
 
-use super::errors::{ApplyError, DecodingError, RestoreError, SnapshotError};
+use super::errors::{ApplyError, RestoreError, SnapshotError};
 use super::utils::get_python_repr;
 
 pub static ENTRY_LOG_ENTRY_DESERIALIZE_CB: Lazy<Mutex<Option<PyObject>>> =
@@ -22,7 +22,7 @@ pub fn set_fsm_deserializer(cb: PyObject) {
 }
 
 #[derive(Clone)]
-#[pyclass(name = "AbstractLogEntry")]
+#[pyclass]
 pub struct PyLogEntry {
     pub log_entry: Py<PyAny>,
 }
@@ -88,17 +88,11 @@ impl PyLogEntry {
 }
 
 #[derive(Clone)]
-#[pyclass(name = "AbstractStateMachine")]
+#[pyclass]
 pub struct PyFSM {
     pub store: Py<PyAny>,
 }
 
-impl PyFSM {
-    pub fn new(store: Py<PyAny>) -> Self {
-        Self { store }
-    }
-}
-
 impl fmt::Debug for PyFSM {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         Python::with_gil(|py| {
@@ -125,6 +119,11 @@ impl fmt::Display for PyFSM {
 
 #[pymethods]
 impl PyFSM {
+    #[new]
+    pub fn new(store: Py<PyAny>) -> Self {
+        Self { store }
+    }
+
     fn __getattr__(&self, py: Python, attr: &str) -> PyResult<PyObject> {
         let store: &PyAny = self.store.as_ref(py);
         let attr_value = store.getattr(attr)?;

binding/python/src/lib.rs

@@ -10,7 +10,6 @@ mod bindings;
 fn raftify(py: Python, m: &PyModule) -> PyResult<()> {
     m.add_class::<bindings::config::PyConfig>()?;
     m.add_class::<bindings::raft_rs::config::PyRaftConfig>()?;
-    m.add_class::<bindings::state_machine::PyFSM>()?;
     m.add_class::<bindings::raft_facade::PyRaftFacade>()?;
     m.add_class::<bindings::peers::PyPeers>()?;
     m.add_class::<bindings::raft_client::PyRaftServiceClient>()?;