python-fx 0.3.2__py3-none-any.whl → 0.4.0__py3-none-any.whl

pyfx/__version__.py

@@ -1 +1 @@
-__version__ = "0.3.2"
+__version__ = "0.4.0"

pyfx/app.py

@@ -10,7 +10,8 @@ from pyfx.config import parse
 from pyfx.config import themes_path
 from pyfx.config.config_parser import load
 from pyfx.error import PyfxException
-from pyfx.model import Model
+from pyfx.model.model_manager import ModelManager
+from pyfx.model.model_manager import ModelResult
 from pyfx.service.client import Client
 from pyfx.service.dispatcher import Dispatcher
 from pyfx.view import View
@@ -53,10 +54,12 @@ class PyfxApp:
 
         # backend part
         self._dispatcher = Dispatcher()
-        # model
-        self._model = Model(self._data)
-        self._dispatcher.register("query", self._model.query)
-        self._dispatcher.register("complete", self._model.complete)
+        # model manager
+        self._model_manager = ModelManager(
+            result_callback=self.__handle_model_result,
+            progress_callback=None)
+        self._dispatcher.register("query", self._model_manager.query)
+        self._dispatcher.register("complete", self._model_manager.complete)
 
         # UI part
         self._keymapper = self.__convert_keymap(self._config.ui.keymap)
@@ -194,9 +197,19 @@ class PyfxApp:
                       "exit with {}", e)
         finally:
             self._thread_pool_executor.shutdown(wait=True)
+            self._model_manager.shutdown(wait=True)
             self._screen.clear()
 
-    def __init(self):
+    def process_input(self, keys):
+        """
+        Test-used method to process a list of keypress with proper model initialization
+        """
+        init_success = self.__init(blocking=True)
+        if not init_success:
+            return False, "Model failed to load within timeout"
+        return self.__process_input(keys)
+
+    def __init(self, blocking=False):
         """Post-initializes Pyfx, it must be called before `__run()`.
 
         .. note::
@@ -207,13 +220,22 @@ class PyfxApp:
            processing data to construct essential widgets.
         """
         logger.debug("Initializing Pyfx...")
-        self._json_browser.refresh_view(self._data)
+        # Start async model loading
+        self._model_manager.load(self._data)
+        if not blocking:
+            return True
+        return self._model_manager.wait_until_ready(timeout=5.0)
 
     def __run(self):
         """Starts the UI loop."""
         logger.debug("Running Pyfx...")
         self._view.run()
 
+    def __process_input(self, keys):
+        """Test-used method to process a list of keypress with proper model initialization."""
+        logger.debug("Running Pyfx...")
+        return self._view.process_input(keys)
+
     def __init_logger(self, is_debug_mode):
         logger.configure(
             handlers=[{
@@ -266,3 +288,14 @@ class PyfxApp:
             # avoid potential error during e2e test
             pass
         return screen
+
+    def __handle_model_result(self, result: ModelResult):
+        """Handle async model results"""
+        if not result.success:
+            logger.error("Model operation failed: {}", result.error)
+            return
+
+        if result.operation_name == "Load":
+            logger.debug("Model loading completed, refreshing view")
+            # Use urwid alarm to safely update UI from background thread
+            self._mediator.notify('backend', 'refresh', 'json_browser', result.data)

pyfx/model/model.py

@@ -13,10 +13,16 @@ class Model:
      * performs auto-completion with given JSONPath query
     """
 
-    def __init__(self, data):
+    def __init__(self):
+        self._data = None
+        self._current = None
+
+    def load(self, data):
         self._data = data
         self._current = data
 
+        return self._current
+
     def query(self, text):
         if self._data is None:
             logger.debug("Data is None.")

pyfx/model/model_manager.py

@@ -0,0 +1,210 @@
+import threading
+import queue
+from typing import Any, Optional, Callable
+from concurrent.futures import ThreadPoolExecutor, Future
+from dataclasses import dataclass
+from enum import Enum
+from loguru import logger
+
+from pyfx.model import Model
+
+
+class ModelState(Enum):
+    CREATED = "created"
+    LOADING = "loading"
+    READY = "ready"
+    SHUTDOWN = "shutdown"
+
+
+@dataclass
+class ModelResult:
+    """Result wrapper for threaded model operations"""
+
+    success: bool
+    operation_name: str
+    data: Any = None
+    error: Optional[str] = None
+    operation_id: Optional[str] = None
+
+
+@dataclass
+class ProgressUpdate:
+    """Progress update for long-running operations"""
+
+    operation_id: str
+    progress: float  # 0.0 to 1.0
+    message: str
+    completed: bool = False
+
+
+class ModelManager:
+    """
+    Thread-safe wrapper around Model that runs operations in background thread.
+
+    Provides async interface for JSON processing while maintaining thread safety
+    between model operations and UI updates.
+    """
+
+    def __init__(self, result_callback, progress_callback, max_workers: int = 2):
+        self._executor = ThreadPoolExecutor(
+            max_workers=max_workers, thread_name_prefix="pyfx-model"
+        )
+
+        # Thread-safe communication
+        self._result_queue = queue.Queue()
+        self._progress_queue = queue.Queue()
+        self._operation_counter = 0
+        self._operation_lock = threading.Lock()
+
+        # Callbacks for UI updates
+        self._result_callback: Optional[Callable[[ModelResult], None]] = result_callback
+        self._progress_callback: Optional[Callable[[ProgressUpdate], None]] = progress_callback
+
+        # Current operation tracking
+        self._current_futures: dict[str, Future] = {}
+
+        self._state = ModelState.CREATED
+        self._model: Model = Model()
+
+    def load(self, data: Any) -> str:
+        """Load data asynchronously"""
+
+        def _load_task(operation_id, operation_name):
+            try:
+                self._report_progress(operation_id, 0.0, "Initializing model...")
+
+                self._state = ModelState.LOADING
+                result = self._model.load(data)
+
+                self._state = ModelState.READY
+                self._report_progress(operation_id, 1.0, "Model ready", completed=True)
+
+                model_result = ModelResult(
+                    operation_id=operation_id,
+                    operation_name=operation_name,
+                    success=True,
+                    data=result,
+                )
+                self._report_result(model_result)
+            except Exception as e:
+                logger.opt(exception=True).error("Load task failed: {}", e)
+                self._state = ModelState.SHUTDOWN
+                raise
+
+        return self._submit_task("Load", _load_task)
+
+    def query(self, text: str):
+        """Execute JSONPath query synchronously"""
+        if self._state != ModelState.READY:
+            logger.warning(
+                "Model not ready for queries, current state: {}", self._state
+            )
+            return None
+
+        return self._model.query(text)
+
+    def complete(self, text: str):
+        """Execute autocompletion synchronously"""
+        if self._state != ModelState.READY:
+            logger.warning(
+                "Model not ready for completion, current state: {}", self._state
+            )
+            return False, "", []
+
+        return self._model.complete(text)
+
+    def cancel_operation(self, task_id: str) -> bool:
+        """Cancel a running operation"""
+        if task_id not in self._current_futures:
+            return False
+
+        future = self._current_futures[task_id]
+        if not future.cancel():
+            return False
+
+        del self._current_futures[task_id]
+        return True
+
+    def wait_until_ready(self, timeout: float = 10.0) -> bool:
+        """Block until model is ready or timeout occurs"""
+        import time
+        start_time = time.time()
+
+        while self._state != ModelState.READY:
+            if time.time() - start_time > timeout:
+                logger.warning("Model loading timeout after {}s", timeout)
+                return False
+
+            time.sleep(0.01)  # Small sleep to avoid busy waiting
+
+        return True
+
+    def shutdown(self, wait: bool = True):
+        """Shutdown the model manager"""
+        self._state = ModelState.SHUTDOWN
+
+        # Cancel all pending operations
+        for operation_id in list(self._current_futures.keys()):
+            self.cancel_operation(operation_id)
+
+        # Shutdown executor
+        self._executor.shutdown(wait=wait)
+
+    def _submit_task(self, task_name, task):
+        task_id = self.__generate_task_id()
+
+        def wrapped_task():
+            try:
+                task(task_id, task_name)
+            except Exception as e:
+                logger.opt(exception=True).error("{} failed: {}", task_name, e)
+                self._report_error(
+                    task_id, task_name, f"{task_name} failed: {str(e)}"
+                )
+
+        future = self._executor.submit(wrapped_task)
+        self._current_futures[task_id] = future
+        return task_id
+
+    def __generate_task_id(self) -> str:
+        """Generate unique operation ID"""
+        with self._operation_lock:
+            self._operation_counter += 1
+            return f"op_{self._operation_counter}"
+
+    def _report_progress(
+        self, operation_id: str, progress: float, message: str, completed: bool = False
+    ):
+        """Report progress update"""
+        update = ProgressUpdate(
+            operation_id=operation_id,
+            progress=progress,
+            message=message,
+            completed=completed,
+        )
+
+        try:
+            self._progress_queue.put_nowait(update)
+            if self._progress_callback:
+                self._progress_callback(update)
+        except queue.Full:
+            logger.warning("Progress queue full, dropping update")
+
+    def _report_result(self, result: ModelResult):
+        """Report operation result"""
+        try:
+            self._result_queue.put_nowait(result)
+            if self._result_callback:
+                self._result_callback(result)
+        except queue.Full:
+            logger.warning("Result queue full, dropping result")
+
+    def _report_error(self, operation_id: str, operation_name: str, error_msg: str):
+        """Report operation error"""
+        result = ModelResult(
+            operation_id=operation_id,
+            success=False,
+            operation_name=operation_name,
+            error=error_msg,
+        )
+        self._report_result(result)

pyfx/view/common/frame.py

@@ -62,7 +62,7 @@ class Frame(urwid.Widget, urwid.WidgetContainerMixin):
             `current_mini_buffer`(string): the key of current focused widget
                 for mini buffer in mini buffers.
         """
-        self.__super.__init__()
+        super().__init__()
 
         self._screen = screen
 

pyfx/view/view_manager.py

@@ -48,11 +48,9 @@ class View:
             for index, key in enumerate(keys):
                 # work around for urwid.MainLoop#process_input does not apply
                 # input filter
-                key = self._loop.input_filter([key], None)
+                key = self._loop.input_filter([key], [])
 
-                if len(key) == 0:
-                    continue
-                elif self._loop.process_input(key):
+                if len(key) == 0 or self._loop.process_input(key):
                     continue
 
                 return False, f"keys[{index}]: {key} is not handled"

{python_fx-0.3.2.dist-info → python_fx-0.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: python-fx
-Version: 0.3.2
+Version: 0.4.0
 Summary: A python-native fx-alike terminal JSON viewer.
 Author-email: Yutian Wu <yutianwu@umich.edu>
 License: MIT
@@ -13,32 +13,32 @@ Classifier: Operating System :: POSIX
 Classifier: Operating System :: MacOS :: MacOS X
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Topic :: Utilities
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
-Requires-Dist: antlr4-python3-runtime==4.13.2
-Requires-Dist: first==2.0.2
-Requires-Dist: jsonpath-ng==1.6.1
-Requires-Dist: ply==3.11
-Requires-Dist: pyperclip==1.9.0
-Requires-Dist: wcwidth==0.2.13
-Requires-Dist: loguru==0.7.2; python_version >= "3.5"
-Requires-Dist: dacite==1.8.1; python_version >= "3.6"
-Requires-Dist: overrides==7.7.0; python_version >= "3.6"
-Requires-Dist: click==8.1.7; python_version >= "3.7"
-Requires-Dist: asciimatics==1.15.0; python_version >= "3.8"
-Requires-Dist: pillow==10.4.0; python_version >= "3.8"
-Requires-Dist: pyyaml==6.0.2; python_version >= "3.8"
-Requires-Dist: typing-extensions==4.12.2; python_version >= "3.8"
-Requires-Dist: urwid==2.6.15; python_version >= "3.8"
-Requires-Dist: yamale==5.2.1; python_version >= "3.8"
-Requires-Dist: pyfiglet==1.0.2; python_version >= "3.9"
+Requires-Dist: antlr4-python3-runtime<5,>=4.13
+Requires-Dist: asciimatics<2,>=1.15
+Requires-Dist: click<9,>=8.1.7
+Requires-Dist: first<3,==2.0
+Requires-Dist: dacite<2,==1.8
+Requires-Dist: jsonpath-ng<2,==1.6
+Requires-Dist: loguru<0.8,>=0.7.2
+Requires-Dist: overrides<8,>=7.7.0
+Requires-Dist: pillow<11,>=10.4
+Requires-Dist: ply<4,>=3.11
+Requires-Dist: pyfiglet<2,>=1.0
+Requires-Dist: pyperclip>=1.9
+Requires-Dist: pyyaml<7,>=6.0.2
+Requires-Dist: typing-extensions<5,>=4.12.2
+Requires-Dist: urwid<3,>=2.6
+Requires-Dist: wcwidth<0.3,>=0.2.13
+Requires-Dist: yamale<6,>=5.2
+Dynamic: license-file
 
 # Pyfx
 ![Build Status](https://github.com/cielong/pyfx/actions/workflows/ci.yml/badge.svg?branch=main)
 ![Documentation Status](https://readthedocs.org/projects/python-fx/badge/?version=latest)
 ![PyPI version](https://badge.fury.io/py/python-fx.svg)
-![Python](https://img.shields.io/badge/python-3.8-green.svg)
 ![Python](https://img.shields.io/badge/python-3.9-green.svg)
 ![Python](https://img.shields.io/badge/python-3.10-green.svg)
 ![Python](https://img.shields.io/badge/python-3.11-green.svg)
@@ -69,7 +69,7 @@ A python-native JSON Viewer TUI, inspired by [fx](https://github.com/antonmedv/f
 
 ## Prerequisites
 * OS: MacOS / Linux
-* python: >= 3.8
+* python: >= 3.9
 * pip
 
 ## Installation

{python_fx-0.3.2.dist-info → python_fx-0.4.0.dist-info}/RECORD

@@ -1,6 +1,6 @@
 pyfx/__init__.py,sha256=KU0-7SWHjuFrvQ3UJHeUcUG41-IpwGBSCjIibDD52H8,25
-pyfx/__version__.py,sha256=vNiWJ14r_cw5t_7UDqDQIVZvladKFGyHH2avsLpN7Vg,22
-pyfx/app.py,sha256=DyDjKTPZszHEEABMu02DrU2n6FUpl9VJwwNeL7bpivk,10699
+pyfx/__version__.py,sha256=42STGor_9nKYXumfeV5tiyD_M8VdcddX7CEexmibPBk,22
+pyfx/app.py,sha256=WwpjxneQY0lBf6tI9l9HdA2LjUmsLyav9f9tfmX__L4,12143
 pyfx/cli.py,sha256=9mi8kOiZFcY4RCN1TUV5aCeKmuoDwZm-1kVRdF7vbNE,2135
 pyfx/cli_utils.py,sha256=TLF-242Twi54i8URozwxmZVfEibvmwDWDE5AFyWqC58,1243
 pyfx/error.py,sha256=9AQ7q3zJQJEvvWGv_39Ep17KoN3eSiRgeqhh4_-7Mqg,96
@@ -17,7 +17,8 @@ pyfx/config/yaml/keymaps/vim.yml,sha256=sNW6AsUXHxUNrF9u_EXXlU92WYbay1X94XfcA4ZK
 pyfx/config/yaml/themes/__init__.py,sha256=CY_rp0Unst3ZQ9npKe6cxdwrs9yrbsMdeQGH-q2W7iM,30
 pyfx/config/yaml/themes/basic.yml,sha256=lffeUU4ABZ57-eL7-tXTCuXqtqrXDv12V_Qk0AmhpxQ,1217
 pyfx/model/__init__.py,sha256=TrL7n4E7ZA7EmNhk6Pp-YtMPxOl90vyEd9jymd143eI,246
-pyfx/model/model.py,sha256=8lh9tf-67nPTruDmPRkGHVt2y9Ufz1fP0OJ0ciwut00,1224
+pyfx/model/model.py,sha256=-pIOgdP32dTA3mzjSVRlmLoyhvRQbISa5FGlrmus1nU,1330
+pyfx/model/model_manager.py,sha256=YmKXLxsj300_u3CEwH98KjX725zToUKxteX8CyiFNj4,6614
 pyfx/model/autocomplete/__init__.py,sha256=PPKRsvPcvJQcJL-Y74BEs0_26haxlnvnBxa_sqbXF6U,517
 pyfx/model/autocomplete/autocomplete_listener.py,sha256=SrQ5WlMfSVwcjOPf08_bZUqNya5hX3JNefkYB0SNbqk,11667
 pyfx/model/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -37,10 +38,10 @@ pyfx/view/__init__.py,sha256=XZG19brgFnZcARuPifl9PqwNXgPc3drJHq6NwNjol3s,198
 pyfx/view/keys.py,sha256=GgW1yX68OscZr_WPzzc8MnsUmFo7TKbV4BYvI78FgTc,3242
 pyfx/view/themes.py,sha256=mXo2_ywvMxAedj8a2LzbGIyP2mWt8zZSjvfqrYqWEhk,1840
 pyfx/view/view_frame.py,sha256=zdSgN_CYGmxp2PgWM5q8qPOGVWcprmy6-ugsbswX-yQ,2476
-pyfx/view/view_manager.py,sha256=wjVegAkMpw6cbLs2Alp2a37KCeUzUmh_rKku-7juRf0,1856
+pyfx/view/view_manager.py,sha256=-jftt-aoKBjqTyw41X0XQYNZJNrIbBP36VwNFI14nr8,1806
 pyfx/view/view_mediator.py,sha256=mY1-IT77Xi7DwtLW-hyrSE4NdFCPNXffnaFHztnL53s,1137
 pyfx/view/common/__init__.py,sha256=yD8y941cJ_fR8XYbSmKzOIAUhRt3eSA60pU1PRYfyZY,137
-pyfx/view/common/frame.py,sha256=TM-YNoqsjEuXkADPJDI5TjZ6o-g8LYvMAfDDoAhPN6A,11601
+pyfx/view/common/frame.py,sha256=7IjKe6-BOc6CGlj6lL2EfC5z7bSnGhSTVtc1DxhISRk,11596
 pyfx/view/common/popup.py,sha256=P6MyMMpR_Mvqz7SvsTQN-wjIe2DgFeomSy4j4X3s0bU,1835
 pyfx/view/common/selectable_text.py,sha256=vg70CrO8495RztSsdw45JDgtH5zBQAO7DesHSiQ9yqg,490
 pyfx/view/components/__init__.py,sha256=W1jwydHqN8Yfbh46sujZnNML2Pfs7opfNe0edADwh5U,352
@@ -78,9 +79,9 @@ pyfx/view/json_lib/primitive/integer.py,sha256=C-xOeR3deeVobAkvEoIfGYFu0koNIMsGk
 pyfx/view/json_lib/primitive/null.py,sha256=BL9CuFTGmHt6tmXjIvuOwxIEwpesp0Df4J88aMj8rgM,775
 pyfx/view/json_lib/primitive/numeric.py,sha256=DYI8eZULo2gKSeyzDtnXk4fgtgBYyoVH_ARGaEJ5YXI,868
 pyfx/view/json_lib/primitive/string.py,sha256=oBFzZKhrKoKLLdiVg6ivkryB2cJDDs34B-xGXf63F9E,839
-python_fx-0.3.2.dist-info/LICENSE.txt,sha256=KxdNyEebr0IyALPixRsvD-2puJr9WxSePEe1UsjxPlA,1066
-python_fx-0.3.2.dist-info/METADATA,sha256=g4uTV1GZ6-TdexhWYOfTyIv_X_rH6t8tWjX7_nmK7kA,10342
-python_fx-0.3.2.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-python_fx-0.3.2.dist-info/entry_points.txt,sha256=8Veumj2a-mijrFP-07Rph2IRrR78XjTLLFc_gD1U-mE,39
-python_fx-0.3.2.dist-info/top_level.txt,sha256=X4zR7lGFzBoSu_P2ocvTC0t50kHygVjqbMA4twR1WZ0,5
-python_fx-0.3.2.dist-info/RECORD,,
+python_fx-0.4.0.dist-info/licenses/LICENSE.txt,sha256=KxdNyEebr0IyALPixRsvD-2puJr9WxSePEe1UsjxPlA,1066
+python_fx-0.4.0.dist-info/METADATA,sha256=tCtrBPSiRQ6ni1ne87Gi0kb9LYmn5aSGMcLH4q9Cry8,10060
+python_fx-0.4.0.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+python_fx-0.4.0.dist-info/entry_points.txt,sha256=8Veumj2a-mijrFP-07Rph2IRrR78XjTLLFc_gD1U-mE,39
+python_fx-0.4.0.dist-info/top_level.txt,sha256=X4zR7lGFzBoSu_P2ocvTC0t50kHygVjqbMA4twR1WZ0,5
+python_fx-0.4.0.dist-info/RECORD,,

{python_fx-0.3.2.dist-info → python_fx-0.4.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (72.1.0)
+Generator: setuptools (82.0.1)
 Root-Is-Purelib: true
 Tag: py3-none-any