snapshot(refactor): Implement modular structure with direct imports

Remove exports from __init__.py files, keep only documentation per architecture plan. Update imports in tests to reference actual module paths directly. Fix import paths in snapshot modules for better maintainability. Maintain full test compatibility with all 707 tests passing.

Author: tony

src/libtmux/snapshot/__init__.py

@@ -8,4 +8,4 @@
 
 This module provides hierarchical snapshots of tmux objects (Server, Session,
 Window, Pane) that are immutable and maintain the relationships between objects.
-""" 
+"""

src/libtmux/snapshot/base.py

@@ -13,10 +13,9 @@
 from libtmux.pane import Pane
 from libtmux.server import Server
 from libtmux.session import Session
+from libtmux.snapshot.types import PaneT, SessionT, WindowT
 from libtmux.window import Window
 
-from libtmux.snapshot.types import PaneT, WindowT, SessionT, ServerT
-
 
 class SealablePaneBase(Pane, Sealable):
     """Base class for sealable pane classes."""
@@ -71,4 +70,4 @@ def windows(self) -> QueryList[WindowT]:
     @property
     def panes(self) -> QueryList[PaneT]:
         """Return panes with the appropriate generic type."""
-        return t.cast(QueryList[PaneT], super().panes) 
+        return t.cast(QueryList[PaneT], super().panes)

src/libtmux/snapshot/models/__init__.py

@@ -2,4 +2,4 @@
 
 This package contains concrete snapshot implementations for tmux objects:
 ServerSnapshot, SessionSnapshot, WindowSnapshot, and PaneSnapshot.
-""" 
+"""

src/libtmux/snapshot/models/pane.py

@@ -1,6 +1,7 @@
 """PaneSnapshot implementation.
 
-This module defines the PaneSnapshot class for creating immutable snapshots of tmux panes.
+This module defines the PaneSnapshot class for creating
+immutable snapshots of tmux panes.
 """
 
 from __future__ import annotations
@@ -14,7 +15,6 @@
 from libtmux._internal.frozen_dataclass_sealable import frozen_dataclass_sealable
 from libtmux.pane import Pane
 from libtmux.server import Server
-
 from libtmux.snapshot.base import SealablePaneBase
 
 if t.TYPE_CHECKING:
@@ -213,4 +213,4 @@ def from_pane(
             snapshot, "_sealed", False
         )  # Temporarily set to allow seal() method to work
         snapshot.seal(deep=False)
-        return snapshot 
+        return snapshot

src/libtmux/snapshot/models/server.py

@@ -1,6 +1,7 @@
 """ServerSnapshot implementation.
 
-This module defines the ServerSnapshot class for creating immutable snapshots of tmux servers.
+This module defines the ServerSnapshot class for creating
+immutable snapshots of tmux servers.
 """
 
 from __future__ import annotations
@@ -15,17 +16,14 @@
 from libtmux._internal.query_list import QueryList
 from libtmux.server import Server
 from libtmux.session import Session
-
 from libtmux.snapshot.base import SealableServerBase
 from libtmux.snapshot.models.pane import PaneSnapshot
 from libtmux.snapshot.models.session import SessionSnapshot
 from libtmux.snapshot.models.window import WindowSnapshot
 
 
 @frozen_dataclass_sealable
-class ServerSnapshot(
-    SealableServerBase[SessionSnapshot, WindowSnapshot, PaneSnapshot]
-):
+class ServerSnapshot(SealableServerBase[SessionSnapshot, WindowSnapshot, PaneSnapshot]):
     """A read-only snapshot of a server.
 
     Examples
@@ -209,4 +207,4 @@ def _create_session_snapshot_safely(
             return None
         else:
             # In production, we want the exception to propagate
-            raise 
+            raise

src/libtmux/snapshot/models/session.py

@@ -1,6 +1,7 @@
 """SessionSnapshot implementation.
 
-This module defines the SessionSnapshot class for creating immutable snapshots of tmux sessions.
+This module defines the SessionSnapshot class for creating
+immutable snapshots of tmux sessions.
 """
 
 from __future__ import annotations
@@ -14,7 +15,6 @@
 from libtmux._internal.query_list import QueryList
 from libtmux.server import Server
 from libtmux.session import Session
-
 from libtmux.snapshot.base import SealableSessionBase
 from libtmux.snapshot.models.pane import PaneSnapshot
 from libtmux.snapshot.models.window import WindowSnapshot
@@ -167,4 +167,4 @@ def from_session(
             snapshot, "_sealed", False
         )  # Temporarily set to allow seal() method to work
         snapshot.seal(deep=False)
-        return snapshot 
+        return snapshot

src/libtmux/snapshot/models/window.py

@@ -1,6 +1,7 @@
 """WindowSnapshot implementation.
 
-This module defines the WindowSnapshot class for creating immutable snapshots of tmux windows.
+This module defines the WindowSnapshot class for creating
+immutable snapshots of tmux windows.
 """
 
 from __future__ import annotations
@@ -13,10 +14,9 @@
 from libtmux._internal.frozen_dataclass_sealable import frozen_dataclass_sealable
 from libtmux._internal.query_list import QueryList
 from libtmux.server import Server
-from libtmux.window import Window
-
 from libtmux.snapshot.base import SealableWindowBase
 from libtmux.snapshot.models.pane import PaneSnapshot
+from libtmux.window import Window
 
 if t.TYPE_CHECKING:
     from libtmux.snapshot.models.session import SessionSnapshot
@@ -172,4 +172,4 @@ def from_window(
             snapshot, "_sealed", False
         )  # Temporarily set to allow seal() method to work
         snapshot.seal(deep=False)
-        return snapshot 
+        return snapshot

src/libtmux/snapshot/types.py

@@ -22,12 +22,14 @@
 # Forward references for snapshot classes
 if t.TYPE_CHECKING:
     from libtmux.snapshot.models.pane import PaneSnapshot
-    from libtmux.snapshot.models.window import WindowSnapshot
-    from libtmux.snapshot.models.session import SessionSnapshot
     from libtmux.snapshot.models.server import ServerSnapshot
+    from libtmux.snapshot.models.session import SessionSnapshot
+    from libtmux.snapshot.models.window import WindowSnapshot
 
     # Union type for snapshot classes
-    SnapshotType = t.Union[ServerSnapshot, SessionSnapshot, WindowSnapshot, PaneSnapshot]
+    SnapshotType = t.Union[
+        ServerSnapshot, SessionSnapshot, WindowSnapshot, PaneSnapshot
+    ]
 else:
     # Runtime placeholder - will be properly defined after imports
-    SnapshotType = t.Any 
+    SnapshotType = t.Any

src/libtmux/snapshot/utils.py

@@ -3,15 +3,17 @@
 This module provides utility functions for filtering and serializing snapshots.
 """
 
+from __future__ import annotations
+
 import copy
 import datetime
 import typing as t
 
-from ..types import SnapshotType
 from .models.pane import PaneSnapshot
 from .models.server import ServerSnapshot
 from .models.session import SessionSnapshot
 from .models.window import WindowSnapshot
+from .types import SnapshotType
 
 
 def filter_snapshot(
@@ -195,4 +197,4 @@ def is_active(
     if filtered is None:
         error_msg = "No active objects found!"
         raise ValueError(error_msg)
-    return t.cast(ServerSnapshot, filtered) 
+    return t.cast(ServerSnapshot, filtered)

tests/test_snapshot.py

@@ -9,11 +9,11 @@
 import pytest
 
 from libtmux._internal.frozen_dataclass_sealable import is_sealable
-from libtmux.snapshot import (
-    PaneSnapshot,
-    ServerSnapshot,
-    SessionSnapshot,
-    WindowSnapshot,
+from libtmux.snapshot.models.pane import PaneSnapshot
+from libtmux.snapshot.models.server import ServerSnapshot
+from libtmux.snapshot.models.session import SessionSnapshot
+from libtmux.snapshot.models.window import WindowSnapshot
+from libtmux.snapshot.utils import (
     snapshot_active_only,
     snapshot_to_dict,
 )
@@ -173,7 +173,7 @@ def test_session_snapshot_creation(self, session: Session) -> None:
 
         # Patch the from_session method to return our mock
         with patch(
-            "libtmux.snapshot.SessionSnapshot.from_session",
+            "libtmux.snapshot.models.session.SessionSnapshot.from_session",
             return_value=mock_snapshot,
         ):
             snapshot = SessionSnapshot.from_session(session)
@@ -212,7 +212,7 @@ def test_server_snapshot_creation(self, server: Server, session: Session) -> Non
 
         # Patch the from_server method to return our mock
         with patch(
-            "libtmux.snapshot.ServerSnapshot.from_server",
+            "libtmux.snapshot.models.server.ServerSnapshot.from_server",
             return_value=mock_snapshot,
         ):
             snapshot = ServerSnapshot.from_server(server)
@@ -293,7 +293,7 @@ def mock_filter(
         return True
 
     # Apply the filter with a patch to avoid actual implementation
-    with patch("libtmux.snapshot.filter_snapshot", side_effect=lambda s, f: s):
+    with patch("libtmux.snapshot.utils.filter_snapshot", side_effect=lambda s, f: s):
         filtered = snapshot_active_only(mock_server_snap)
 
     # Since we're using a mock that passes everything through, the filtered