mxbiflow 0.1.1__tar.gz → 0.1.2__tar.gz

{mxbiflow-0.1.1 → mxbiflow-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: mxbiflow
-Version: 0.1.1
+Version: 0.1.2
 Summary: mxbiflow is a toolkit based on pygame and pymxbi
 Author: HuYang
 Author-email: HuYang <huyangcommit@gmail.com>

{mxbiflow-0.1.1 → mxbiflow-0.1.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mxbiflow"
-version = "0.1.1"
+version = "0.1.2"
 description = "mxbiflow is a toolkit based on pygame and pymxbi"
 readme = "README.md"
 authors = [{ name = "HuYang", email = "huyangcommit@gmail.com" }]

mxbiflow-0.1.2/src/mxbiflow/__init__.py

@@ -0,0 +1,12 @@
+from .mxbi import build_mxbi
+from .mxbiflow import MXBIFlow, get_mxbiflow
+from .ui.utils import config_wizard
+from .utils.init_session import init_session
+
+__all__ = [
+    "MXBIFlow",
+    "get_mxbiflow",
+    "config_wizard",
+    "build_mxbi",
+    "init_session",
+]

mxbiflow-0.1.2/src/mxbiflow/default/__init__.py

@@ -0,0 +1,3 @@
+from .idle.idle import IDLE
+
+__all__ = ["IDLE"]

{mxbiflow-0.1.1 → mxbiflow-0.1.2}/src/mxbiflow/default/idle/idle.py

@@ -5,7 +5,6 @@ from random import choice
 from pygame import Event, Rect, Surface, image, transform
 
 from mxbiflow import get_mxbiflow
-from mxbiflow.scene.scene_protocol import SceneProtocol
 
 ASSETS_PATH = Path(__file__).parent / "assets"
 

{mxbiflow-0.1.1 → mxbiflow-0.1.2}/src/mxbiflow/models/session.py

@@ -143,3 +143,4 @@ class Options(BaseModel):
     mxbis: list[str] = Field(default_factory=list, frozen=True)
     experimenter: list[str] = Field(default_factory=list, frozen=True)
     animals: dict[str, str] = Field(default_factory=dict, frozen=True)
+    stages: list[str] = Field(default_factory=list)

mxbiflow-0.1.2/src/mxbiflow/mxbi.py

@@ -0,0 +1,19 @@
+import pymxbi
+from loguru import logger
+from pymxbi import MXBI, MXBIModel
+
+from .config_store import ConfigStore
+from .models.session import SessionConfig
+
+
+def build_mxbi(mxbi_config_path, session_config_path) -> MXBI:
+
+    mxbi_config = ConfigStore(mxbi_config_path, MXBIModel).value
+    session_config = ConfigStore(session_config_path, SessionConfig).value
+
+    mxbi = pymxbi.build_mxbi(mxbi_config, logger)
+    mxbi.register_animal(
+        {animal.rfid_id: animal.name for animal in session_config.animals}
+    )
+
+    return mxbi

{mxbiflow-0.1.1 → mxbiflow-0.1.2}/src/mxbiflow/path.py

@@ -31,10 +31,6 @@ MOUNT_SERVICE_PATH = SERVICE_DIR_PATH / MOUNT_SERVICE_NAME
 SYNC_SERVICE_NAME = "sync.service"
 SYNC_SERVICE_PATH = SERVICE_DIR_PATH / SYNC_SERVICE_NAME
 
-MXBI_CONFIG_PATH = CONFIG_DIR_PATH / "mxbi.json"
-SESSION_CONFIG_PATH = CONFIG_DIR_PATH / "session.json"
-OPTIONS_PATH = CONFIG_DIR_PATH / "options.json"
-STAGE_PATH = CONFIG_DIR_PATH / "stage.json"
 SESSION_COUNTER_PATH = CONFIG_DIR_PATH / "session_counter.json"
 
 ASSETS_DIR_PATH = ROOT_DIR_PATH / "assets"

{mxbiflow-0.1.1 → mxbiflow-0.1.2}/src/mxbiflow/scene/__init__.py

@@ -1,8 +1,7 @@
-from .scene_manager import SceneManager, Scenes
+from .scene_manager import SceneManager
 from .scene_protocol import SceneProtocol
 
 __all__ = [
     "SceneManager",
-    "Scenes",
     "SceneProtocol",
 ]

{mxbiflow-0.1.1 → mxbiflow-0.1.2}/src/mxbiflow/scene/scene_manager.py

@@ -1,34 +1,39 @@
 from pathlib import Path
 
-from pydantic import RootModel
 from pygame import Event, Surface
 
+from ..config_store import ConfigStore
+from ..models.session import Options
 from .scene_protocol import SceneProtocol
 
 
-class Scenes(RootModel):
-    root: list[str]
-
-
 class SceneManager:
-    scenes: dict[str, type[SceneProtocol]] = {}
+    _scenes: dict[str, type[SceneProtocol]] = {}
 
     def __init__(self) -> None:
         self.current: SceneProtocol | None = None
         self._pending: SceneProtocol | None = None
 
     def persist(self, path: Path) -> None:
-        scenes = Scenes(root=list(self.scenes.keys()))
-        json_data = scenes.model_dump_json()
-
-        with path.open("w") as f:
-            f.write(json_data)
-
-    def register(self, scene: type[SceneProtocol], name: str | None = None) -> None:
-        if name is None:
-            name = scene.__name__.lower()
+        options_store = ConfigStore(path, Options)
+
+        options_store.value.stages = list(self._scenes.keys())
+        options_store.save()
+
+    def register(
+        self, scene: dict[str, type[SceneProtocol]] | list[type[SceneProtocol]]
+    ) -> None:
+        if isinstance(scene, dict):
+            self._scenes.update(scene)
+        elif isinstance(scene, list):
+            for s in scene:
+                self._scenes[s.__name__.lower()] = s
+        else:
+            raise ValueError("Invalid scene type")
 
-        self.scenes[name] = scene
+    @property
+    def scenes(self) -> dict[str, type[SceneProtocol]]:
+        return self._scenes
 
     def switch(self, scene: type[SceneProtocol], defer: bool = True) -> None:
         if defer:

{mxbiflow-0.1.1 → mxbiflow-0.1.2}/src/mxbiflow/ui/components/animal.py

@@ -1,17 +1,15 @@
 from PySide6.QtCore import Qt, Signal
 from PySide6.QtWidgets import QComboBox, QFormLayout, QLabel, QLineEdit, QMenu
 
-from ...config_store import ConfigStore
 from ...models.animal import AnimalConfig
-from ...path import STAGE_PATH
-from ...scene import Scenes
+from ...models.session import Options
 from .card import CardFrame
 
 
 class AnimalCard(CardFrame):
     remove_requested = Signal()
 
-    def __init__(self, parent, animals: dict[str, str]):
+    def __init__(self, parent, animals: dict[str, str], options: Options):
         super().__init__(parent=parent, object_name="card")
         self.setContextMenuPolicy(Qt.ContextMenuPolicy.CustomContextMenu)
         self.customContextMenuRequested.connect(self._on_context_menu)
@@ -36,9 +34,9 @@ class AnimalCard(CardFrame):
         layout.addRow(lable_animal_id, self.line_animal_id)
 
         label_stage = QLabel("stage", self)
-        items = ConfigStore(STAGE_PATH, Scenes).value
+        items = options.stages
         self.combo_stage = QComboBox(self)
-        self.combo_stage.addItems([i for i in items.root])
+        self.combo_stage.addItems(items)
         self.combo_stage.setCurrentText("idle")
         layout.addRow(label_stage, self.combo_stage)
 

{mxbiflow-0.1.1 → mxbiflow-0.1.2}/src/mxbiflow/ui/components/experiment_groups.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from PySide6.QtCore import Qt
 from PySide6.QtWidgets import (
     QComboBox,
@@ -12,7 +10,7 @@ from PySide6.QtWidgets import (
 )
 
 from ...models.animal import AnimalConfig
-from ...models.session import RewardEnum, SessionConfig
+from ...models.session import Options, RewardEnum, SessionConfig
 from .animal import AnimalCard
 
 
@@ -51,10 +49,11 @@ class ExperimentConfigGroup(QGroupBox):
 
 
 class ExperimentAnimalsGroup(QGroupBox):
-    def __init__(self, parent=None, *, animals: dict[str, str]):
+    def __init__(self, parent=None, *, animals: dict[str, str], options: Options):
         super().__init__("Animals", parent)
 
         self._animals = animals
+        self._options = options
         self.layout_animals = QGridLayout(self)
         self.setLayout(self.layout_animals)
 
@@ -68,7 +67,7 @@ class ExperimentAnimalsGroup(QGroupBox):
         menu.exec(self.mapToGlobal(pos))
 
     def _on_add_animal(self):
-        animal_card = AnimalCard(self, self._animals)
+        animal_card = AnimalCard(self, self._animals, self._options)
         animal_card.remove_requested.connect(
             lambda _card=animal_card: self._on_remove_animal(_card)
         )
@@ -103,7 +102,7 @@ class ExperimentAnimalsGroup(QGroupBox):
 
     def load_config(self, config: SessionConfig):
         for animal_configs in config.animals:
-            animal_card = AnimalCard(self, self._animals)
+            animal_card = AnimalCard(self, self._animals, self._options)
             animal_card.load_config(animal_configs)
             animal_card.remove_requested.connect(
                 lambda _card=animal_card: self._on_remove_animal(_card)

{mxbiflow-0.1.1 → mxbiflow-0.1.2}/src/mxbiflow/ui/experiment_panel.py

@@ -1,6 +1,7 @@
+from pathlib import Path
+
 from PySide6.QtCore import Signal
 from PySide6.QtWidgets import (
-    QApplication,
     QHBoxLayout,
     QMainWindow,
     QPushButton,
@@ -10,17 +11,16 @@ from PySide6.QtWidgets import (
 
 from ..config_store import ConfigStore
 from ..models.session import Options, SessionConfig
-from ..path import OPTIONS_PATH, SESSION_CONFIG_PATH
 from .components.experiment_groups import ExperimentAnimalsGroup, ExperimentConfigGroup
 
 
 class ExperimentPanel(QMainWindow):
     accepted = Signal()
 
-    def __init__(self, parent=None):
-        super().__init__(parent)
-        self._config = ConfigStore(SESSION_CONFIG_PATH, SessionConfig)
-        self._options = ConfigStore(OPTIONS_PATH, Options)
+    def __init__(self, session_config_path: Path, options_path: Path):
+        super().__init__()
+        self._config = ConfigStore(session_config_path, SessionConfig)
+        self._options = ConfigStore(options_path, Options)
 
         self.setWindowTitle("Experiment Panel")
 
@@ -36,7 +36,7 @@ class ExperimentPanel(QMainWindow):
         layout_main.addWidget(self.group_config)
 
         self.group_animals = ExperimentAnimalsGroup(
-            self, animals=self._options.value.animals
+            self, animals=self._options.value.animals, options=self._options.value
         )
         layout_main.addWidget(self.group_animals)
 
@@ -80,12 +80,3 @@ class ExperimentPanel(QMainWindow):
         self._on_save()
         self.close()
         self.accepted.emit()
-
-
-if __name__ == "__main__":
-    import sys
-
-    app = QApplication(sys.argv)
-    experiment_panel = ExperimentPanel()
-    experiment_panel.show()
-    sys.exit(app.exec())

{mxbiflow-0.1.1 → mxbiflow-0.1.2}/src/mxbiflow/ui/mxbi_panel.py

@@ -1,9 +1,10 @@
+from pathlib import Path
+
 from pymxbi import MXBIModel
 from pymxbi.detector import DetectorEnum, DetectorModel
 from pymxbi.rewarder import RewarderEnum, RewarderModel
 from PySide6.QtCore import Signal
 from PySide6.QtWidgets import (
-    QApplication,
     QHBoxLayout,
     QMainWindow,
     QPushButton,
@@ -13,7 +14,6 @@ from PySide6.QtWidgets import (
 
 from ..config_store import ConfigStore
 from ..models.session import Options
-from ..path import MXBI_CONFIG_PATH, OPTIONS_PATH
 from .components.baseconfig import BaseConfig
 from .components.device_card import (
     BeambreakDetectorCard,
@@ -44,10 +44,10 @@ class MXBIPanel(QMainWindow):
     # Lifecycle / Init
     # -----------------------------
 
-    def __init__(self):
+    def __init__(self, mxbi_config_path: Path, options_path: Path):
         super().__init__()
-        self._config = ConfigStore(MXBI_CONFIG_PATH, MXBIModel)
-        self._options = ConfigStore(OPTIONS_PATH, Options)
+        self._config = ConfigStore(mxbi_config_path, MXBIModel)
+        self._options = ConfigStore(options_path, Options)
 
         self._build_ui()
         self._load_from_config()
@@ -141,12 +141,3 @@ class MXBIPanel(QMainWindow):
 
     def _on_cancel(self) -> None:
         self.close()
-
-
-if __name__ == "__main__":
-    import sys
-
-    app = QApplication(sys.argv)
-    window = MXBIPanel()
-    window.show()
-    sys.exit(app.exec())

mxbiflow-0.1.2/src/mxbiflow/ui/utils.py

@@ -0,0 +1,25 @@
+from pathlib import Path
+
+from .experiment_panel import ExperimentPanel
+from .mxbi_panel import MXBIPanel
+
+
+def config_wizard(
+    mxbi_config_path: Path,
+    session_config_path: Path,
+    options_path: Path,
+):
+    import sys
+
+    from PySide6.QtWidgets import QApplication
+
+    app = QApplication(sys.argv)
+
+    mxbi_panel = MXBIPanel(mxbi_config_path, options_path)
+    experiment_panel = ExperimentPanel(session_config_path, options_path)
+    mxbi_panel.accepted.connect(experiment_panel.show)
+    experiment_panel.accepted.connect(app.quit)
+
+    mxbi_panel.show()
+
+    app.exec()

mxbiflow-0.1.2/src/mxbiflow/utils/init_session.py

@@ -0,0 +1,35 @@
+from pathlib import Path
+
+from ..config_store import ConfigStore
+from ..models.animal import Animal, StageState
+from ..models.session import DailySessionIdStore, Session, SessionConfig
+
+
+def init_session(session_config_path: Path, session_counter_path: Path) -> Session:
+    session_config = ConfigStore(session_config_path, SessionConfig).value
+    store = DailySessionIdStore(session_counter_path)
+
+    animal_dict: dict[str, Animal] = {}
+    for animal_config in session_config.animals:
+        train_state = StageState(
+            stage_name=animal_config.stage, level=animal_config.level
+        )
+        animal_state = Animal(
+            rfid_id=animal_config.rfid_id,
+            name=animal_config.name,
+        )
+        animal_state.set_current_stage(train_state)
+        animal_dict[animal_config.name] = animal_state
+
+    session = Session(
+        session_id=store.session_id,
+        experimenter=session_config.experimenter,
+        reward_type=session_config.reward_type,
+        send_email=False,
+        sync_data=False,
+        note=session_config.note,
+        animals=animal_dict,
+    )
+    session.start()
+
+    return session

mxbiflow-0.1.1/src/mxbiflow/__init__.py

@@ -1,3 +0,0 @@
-from .mxbiflow import MXBIFlow, get_mxbiflow
-
-__all__ = ["MXBIFlow", "get_mxbiflow"]

mxbiflow-0.1.1/src/mxbiflow/default/__init__.py

@@ -1,4 +0,0 @@
-from .habituation.habituarion import Habituarion
-from .idle.idle import IDLE
-
-__all__ = ["Habituarion", "IDLE"]

mxbiflow-0.1.1/src/mxbiflow/main.py

@@ -1,106 +0,0 @@
-from pymxbi import MXBI
-
-from .game import Game
-from .models.session import Session
-
-
-def main():
-    run_config()
-
-    mxbi = build_mxbi()
-
-    session = init_session()
-
-    game = init_mxbiflow(mxbi, session)
-    game.play()
-
-
-def run_config():
-    import sys
-
-    from PySide6.QtWidgets import QApplication
-
-    from .ui.experiment_panel import ExperimentPanel
-    from .ui.mxbi_panel import MXBIPanel
-
-    app = QApplication(sys.argv)
-
-    mxbi_panel = MXBIPanel()
-    experiment_panel = ExperimentPanel()
-    mxbi_panel.accepted.connect(experiment_panel.show)
-    experiment_panel.accepted.connect(app.quit)
-
-    mxbi_panel.show()
-
-    app.exec()
-
-
-def build_mxbi() -> MXBI:
-    from loguru import logger
-    from pymxbi import MXBIModel, build_mxbi
-
-    from .config_store import ConfigStore
-    from .models.session import SessionConfig
-    from .path import MXBI_CONFIG_PATH, SESSION_CONFIG_PATH
-
-    mxbi_config = ConfigStore(MXBI_CONFIG_PATH, MXBIModel).value
-    session_config = ConfigStore(SESSION_CONFIG_PATH, SessionConfig).value
-
-    mxbi = build_mxbi(mxbi_config, logger)
-    mxbi.register_animal(
-        {animal.rfid_id: animal.name for animal in session_config.animals}
-    )
-
-    return mxbi
-
-
-def init_session() -> Session:
-    from .config_store import ConfigStore
-    from .models.animal import Animal, StageState
-    from .models.session import DailySessionIdStore, Session, SessionConfig
-    from .path import SESSION_CONFIG_PATH, SESSION_COUNTER_PATH
-
-    session_config = ConfigStore(SESSION_CONFIG_PATH, SessionConfig).value
-    store = DailySessionIdStore(SESSION_COUNTER_PATH)
-
-    animal_dict: dict[str, Animal] = {}
-    for animal_config in session_config.animals:
-        train_state = StageState(
-            stage_name=animal_config.stage, level=animal_config.level
-        )
-        animal_state = Animal(
-            rfid_id=animal_config.rfid_id,
-            name=animal_config.name,
-        )
-        animal_state.set_current_stage(train_state)
-        animal_dict[animal_config.name] = animal_state
-
-    session = Session(
-        session_id=store.session_id,
-        experimenter=session_config.experimenter,
-        reward_type=session_config.reward_type,
-        send_email=False,
-        sync_data=False,
-        note=session_config.note,
-        animals=animal_dict,
-    )
-    session.start()
-    print(session.session_id)
-
-    return session
-
-
-def init_mxbiflow(mxbi, session) -> Game:
-    from .default import IDLE, Habituarion
-    from .detector_bridge import DetectorBridge
-    from .GNGSiD import SizeReduction
-    from .path import STAGE_PATH
-    from .scene import SceneManager
-
-    scene_manager = SceneManager()
-    scene_manager.register(Habituarion)
-    scene_manager.register(IDLE)
-    scene_manager.register(SizeReduction)
-    scene_manager.persist(STAGE_PATH)
-    detector_bridge = DetectorBridge(mxbi.detector)
-    return Game(session, scene_manager, detector_bridge, mxbi)