pyloid 0.23.9__tar.gz → 0.23.11__tar.gz

{pyloid-0.23.9 → pyloid-0.23.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pyloid
-Version: 0.23.9
+Version: 0.23.11
 Summary: 
 Author: aesthetics-of-record
 Author-email: 111675679+aesthetics-of-record@users.noreply.github.com

{pyloid-0.23.9 → pyloid-0.23.11}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyloid"
-version = "0.23.9"
+version = "0.23.11"
 description = ""
 authors = ["aesthetics-of-record <111675679+aesthetics-of-record@users.noreply.github.com>"]
 readme = "README.md"

{pyloid-0.23.9 → pyloid-0.23.11}/src/pyloid/browser_window.py

@@ -42,12 +42,13 @@ from PySide6.QtWebEngineCore import (
     QWebEngineSettings,
     QWebEngineDesktopMediaRequest,
 )
+import threading
 
 # from .url_interceptor import CustomUrlInterceptor
 from .rpc import PyloidRPC
 
 if TYPE_CHECKING:
-    from .pyloid import _Pyloid
+    from .pyloid import _Pyloid, Pyloid
 
 
 class CustomWebPage(QWebEnginePage):
@@ -299,6 +300,7 @@ class _BrowserWindow:
     def __init__(
         self,
         app: "_Pyloid",
+        window_wrapper: "BrowserWindow",
         title: str = "pyloid app",
         width: int = 800,
         height: int = 600,
@@ -315,6 +317,7 @@ class _BrowserWindow:
         self._window = QMainWindow()
         self.web_view = CustomWebEngineView(self)
         
+        
         if rpc:
             self.rpc = rpc
             self.rpc_url = rpc.url
@@ -329,6 +332,7 @@ class _BrowserWindow:
         self._window.closeEvent = self.closeEvent  # Override closeEvent method
         ###########################################################################################
         self.app = app
+        self.window_wrapper = window_wrapper
         self.title = title
         self.width = width
         self.height = height
@@ -346,8 +350,27 @@ class _BrowserWindow:
         self.shortcuts = {}
         self.close_on_load = True
         self.splash_screen = None
-        ###########################################################################################
+        ###########################################################################################       
+        # RPC 서버가 없으면 추가하지 않음
+        if not self.rpc:
+            return;
+        
+        self.rpc.pyloid = self.app.pyloid_wrapper
+        self.rpc.window = self.window_wrapper
+        
+        # RPC 서버 중복 방지
+        if self.rpc in self.app.rpc_servers:
+            return;
+        
+        # RPC 서버 추가
+        self.app.rpc_servers.add(self.rpc)
+        
+        # Start unique RPC servers
+        server_thread = threading.Thread(target=self.rpc.start, daemon=True)
+        server_thread.start()
+        ###########################################################################################   
 
+            
     def _set_custom_frame(
         self,
         use_custom: bool,
@@ -2037,7 +2060,7 @@ class BrowserWindow(QObject):
     ):
         super().__init__()
         self._window = _BrowserWindow(
-            app, title, width, height, x, y, frame, context_menu, dev_tools, rpc
+            app, self, title, width, height, x, y, frame, context_menu, dev_tools, rpc
         )
         self.command_signal.connect(self._handle_command)
 

{pyloid-0.23.9 → pyloid-0.23.11}/src/pyloid/pyloid.py

@@ -87,6 +87,7 @@ class _WindowController(QObject):
 class _Pyloid(QApplication):
     def __init__(
         self,
+        pyloid_wrapper: "Pyloid",
         app_name,
         single_instance=True,
         data=None,
@@ -115,6 +116,8 @@ class _Pyloid(QApplication):
         ```
         """
         super().__init__(sys.argv)
+        
+        self.pyloid_wrapper = pyloid_wrapper
 
         self.data = data
 
@@ -160,6 +163,8 @@ class _Pyloid(QApplication):
         self.styleHints().colorSchemeChanged.connect(self._handle_color_scheme_change)
 
         self.dirs = PlatformDirs(self.app_name, appauthor=False)
+        
+        self.rpc_servers: Set[PyloidRPC] = set()
 
     # def set_theme(self, theme: Literal["system", "dark", "light"]):
     #     """
@@ -328,16 +333,16 @@ class _Pyloid(QApplication):
         ```
         """
         
-        # Collect and deduplicate RPC servers
-        rpc_servers: Set[PyloidRPC] = set()
-        for window in self.windows_dict.values():
-            if window._window.rpc is not None:
-                rpc_servers.add(window._window.rpc)
+        # # Collect and deduplicate RPC servers
+        # rpc_servers: Set[PyloidRPC] = set()
+        # for window in self.windows_dict.values():
+        #     if window._window.rpc is not None:
+        #         rpc_servers.add(window._window.rpc)
         
-        # 고유한 RPC 서버만 시작
-        for rpc in rpc_servers:
-            server_thread = threading.Thread(target=rpc.start, daemon=True)
-            server_thread.start()
+        # # Start unique RPC servers
+        # for rpc in rpc_servers:
+        #     server_thread = threading.Thread(target=rpc.start, daemon=True)
+        #     server_thread.start()
             
         
         if is_production():
@@ -1679,7 +1684,7 @@ class Pyloid(QObject):
 
         self.data = None # 나중에 데이터 필요 시 수정
 
-        self.app = _Pyloid(app_name, single_instance, self.data)
+        self.app = _Pyloid(self, app_name, single_instance, self.data)
 
         self.command_signal.connect(self._handle_command)
 

{pyloid-0.23.9 → pyloid-0.23.11}/src/pyloid/rpc.py

@@ -1,18 +1,38 @@
 import asyncio
 import json
 import logging
+import inspect
 from functools import wraps
 from typing import Any, Callable, Coroutine, Dict, List, Optional, Union
 from .utils import get_free_port
 from aiohttp import web
 import threading
 import time
-import aiohttp_cors  # CORS 지원을 위한 패키지 추가
+import aiohttp_cors
+from typing import TYPE_CHECKING
+if TYPE_CHECKING:
+    from .pyloid import Pyloid
+    from .browser_window import BrowserWindow
 
 # Configure logging
 logging.basicConfig(level=logging.INFO)
 log = logging.getLogger("pyloid.rpc")
 
+class RPCContext:
+    """
+    Class that provides context information when calling RPC methods.
+    
+    Attributes
+    ----------
+    pyloid : Pyloid
+        Pyloid application instance.
+    window : BrowserWindow
+        Current browser window instance.
+    """
+    def __init__(self, pyloid: "Pyloid", window: "BrowserWindow"):
+        self.pyloid: "Pyloid" = pyloid
+        self.window: "BrowserWindow" = window
+
 class RPCError(Exception):
     """
     Custom exception for RPC-related errors.
@@ -109,6 +129,9 @@ class PyloidRPC:
         self._functions: Dict[str, Callable[..., Coroutine[Any, Any, Any]]] = {}
         self._app = web.Application()
         
+        self.pyloid: Optional["Pyloid"] = None
+        self.window: Optional["BrowserWindow"] = None
+        
         # CORS 설정 추가
         cors = aiohttp_cors.setup(self._app, defaults={
             "*": aiohttp_cors.ResourceOptions(
@@ -129,13 +152,15 @@ class PyloidRPC:
 
     def method(self, name: Optional[str] = None) -> Callable:
         """
-        Decorator to register an async function as an RPC method.
+        Use a decorator to register an async function as an RPC method.
+        
+        If there is a 'ctx' parameter, an RPCContext object is automatically injected.
+        This object allows access to the pyloid application and current window.
 
         Parameters
         ----------
         name : Optional[str], optional
-            The name to register the RPC method under. If None, the
-            function's name is used. Defaults to None.
+            Name to register the RPC method. If None, the function name is used. Default is None.
 
         Returns
         -------
@@ -157,7 +182,10 @@ class PyloidRPC:
         rpc = PyloidRPC()
         
         @rpc.method()
-        async def add(a: int, b: int) -> int:
+        async def add(ctx, a: int, b: int) -> int:
+            # Access the application and window through ctx.pyloid and ctx.window
+            if ctx.window:
+                print(f"Window title: {ctx.window.title}")
             return a + b
         ```
         """
@@ -168,13 +196,25 @@ class PyloidRPC:
             if rpc_name in self._functions:
                 raise ValueError(f"RPC function name '{rpc_name}' is already registered.")
 
+            # Analyze function signature
+            sig = inspect.signature(func)
+            has_ctx_param = 'ctx' in sig.parameters
+            
+            # Store the original function
             self._functions[rpc_name] = func
             log.info(f"RPC function registered: {rpc_name}")
 
             @wraps(func)
             async def wrapper(*args, **kwargs):
-                 # This wrapper exists to follow the decorator pattern.
-                 # The actual call uses the original function stored in _functions.
+                # If the function has a 'ctx' parameter and it's not provided, inject the context object
+                if has_ctx_param and 'ctx' not in kwargs:
+                    ctx = RPCContext(
+                        pyloid=self.pyloid,
+                        window=self.window
+                    )
+                    kwargs['ctx'] = ctx
+                
+                # Call the original function
                 return await func(*args, **kwargs)
             return wrapper
         return decorator
@@ -276,10 +316,30 @@ class PyloidRPC:
 
             try:
                 log.debug(f"Executing RPC method: {method_name}(params={params})")
+                
+                # 함수의 서명 분석하여 ctx 매개변수 유무 확인
+                sig = inspect.signature(func)
+                has_ctx_param = 'ctx' in sig.parameters
+                
+                # ctx 매개변수가 있으면 컨텍스트 객체 생성
+                if has_ctx_param and isinstance(params, dict) and 'ctx' not in params:
+                    ctx = RPCContext(
+                        pyloid=self.pyloid,
+                        window=self.window
+                    )
+                    # 딕셔너리 형태로 params 사용할 때
+                    params = params.copy()  # 원본 params 복사
+                    params['ctx'] = ctx
+                
                 # Call the function with positional or keyword arguments
                 if isinstance(params, list):
-                    result = await func(*params)
-                else: # isinstance(params, dict)
+                    # 리스트 형태로 params 사용할 때 처리 필요
+                    if has_ctx_param:
+                        ctx = RPCContext(pyloid=self.pyloid, window=self.window)
+                        result = await func(ctx, *params)
+                    else:
+                        result = await func(*params)
+                else:  # isinstance(params, dict)
                     result = await func(**params)
 
                 # 5. Format Success Response (only for non-notification requests)