pyloid 0.23.10__tar.gz → 0.23.12__tar.gz

{pyloid-0.23.10 → pyloid-0.23.12}/PKG-INFO

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

{pyloid-0.23.10 → pyloid-0.23.12}/pyproject.toml

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

{pyloid-0.23.10 → pyloid-0.23.12}/src/pyloid/browser_window.py

@@ -48,7 +48,7 @@ import threading
 from .rpc import PyloidRPC
 
 if TYPE_CHECKING:
-    from .pyloid import _Pyloid
+    from .pyloid import _Pyloid, Pyloid
 
 
 class CustomWebPage(QWebEnginePage):
@@ -300,6 +300,7 @@ class _BrowserWindow:
     def __init__(
         self,
         app: "_Pyloid",
+        window_wrapper: "BrowserWindow",
         title: str = "pyloid app",
         width: int = 800,
         height: int = 600,
@@ -316,6 +317,7 @@ class _BrowserWindow:
         self._window = QMainWindow()
         self.web_view = CustomWebEngineView(self)
         
+        
         if rpc:
             self.rpc = rpc
             self.rpc_url = rpc.url
@@ -330,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
@@ -347,11 +350,14 @@ 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;
@@ -362,6 +368,8 @@ class _BrowserWindow:
         # Start unique RPC servers
         server_thread = threading.Thread(target=self.rpc.start, daemon=True)
         server_thread.start()
+        ###########################################################################################   
+
             
     def _set_custom_frame(
         self,
@@ -2052,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.10 → pyloid-0.23.12}/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
 
@@ -1681,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.10 → pyloid-0.23.12}/src/pyloid/rpc.py

@@ -130,7 +130,7 @@ class PyloidRPC:
         self._app = web.Application()
         
         self.pyloid: Optional["Pyloid"] = None
-        self.window: Optional["BrowserWindow"] = None
+        # self.window: Optional["BrowserWindow"] = None
         
         # CORS 설정 추가
         cors = aiohttp_cors.setup(self._app, defaults={
@@ -177,12 +177,12 @@ class PyloidRPC:
         Examples
         --------
         ```python
-        from pyloid.rpc import PyloidRPC
+        from pyloid.rpc import PyloidRPC, RPCContext
         
         rpc = PyloidRPC()
         
         @rpc.method()
-        async def add(ctx, a: int, b: int) -> int:
+        async def add(ctx: RPCContext, 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}")
@@ -205,16 +205,13 @@ class PyloidRPC:
             log.info(f"RPC function registered: {rpc_name}")
 
             @wraps(func)
-            async def wrapper(*args, **kwargs):
-                # If the function has a 'ctx' parameter and it's not provided, inject the context object
+            async def wrapper(*args, _pyloid_window_id=None, **kwargs):
                 if has_ctx_param and 'ctx' not in kwargs:
                     ctx = RPCContext(
                         pyloid=self.pyloid,
-                        window=self.window
+                        window=self.pyloid.get_window_by_id(_pyloid_window_id)
                     )
                     kwargs['ctx'] = ctx
-                
-                # Call the original function
                 return await func(*args, **kwargs)
             return wrapper
         return decorator
@@ -316,10 +313,33 @@ 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.pyloid.get_window_by_id(request_id)
+                    )
+                    # 딕셔너리 형태로 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.pyloid.get_window_by_id(request_id))
+                        result = await func(ctx, *params, request_id=request_id)
+                    else:
+                        result = await func(*params, request_id=request_id)
+                else:  # isinstance(params, dict)
+                    internal_window_id = request_id  # 기존 request_id에서 이름만 변경
+                    params = params.copy()
+                    params['_pyloid_window_id'] = internal_window_id
                     result = await func(**params)
 
                 # 5. Format Success Response (only for non-notification requests)