pyloid 0.23.10__py3-none-any.whl → 0.23.12__py3-none-any.whl

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/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/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)

{pyloid-0.23.10.dist-info → pyloid-0.23.12.dist-info}/METADATA

@@ -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.dist-info → pyloid-0.23.12.dist-info}/RECORD

@@ -1,15 +1,15 @@
 pyloid/__init__.py,sha256=YKwMCSOds1QVi9N7EGfY0Z7BEjJn8j6HGqRblZlZClA,235
 pyloid/api.py,sha256=A61Kmddh8BlpT3LfA6NbPQNzFmD95vQ4WKX53oKsGYU,2419
 pyloid/autostart.py,sha256=K7DQYl4LHItvPp0bt1V9WwaaZmVSTeGvadkcwG-KKrI,3899
-pyloid/browser_window.py,sha256=h0BehbCg8oUW5QGAyG1i1XjAQ020U9VWDTftDrMdwpI,100261
+pyloid/browser_window.py,sha256=4w9xsTzn66YEhRRuVzu4ZXcYGh_-GQL829fYGX6ZXwc,100593
 pyloid/custom/titlebar.py,sha256=itzK9pJbZMQ7BKca9kdbuHMffurrw15UijR6OU03Xsk,3894
 pyloid/filewatcher.py,sha256=3M5zWVUf1OhlkWJcDFC8ZA9agO4Q-U8WdgGpy6kaVz0,4601
 pyloid/js_api/base.py,sha256=XD3sqWYAb1nw6VgY3xXsU4ls5xLGrxpOqmLRJm_vBso,8669
 pyloid/js_api/event_api.py,sha256=w0z1DcmwcmseqfcoZWgsQmFC2iBCgTMVJubTaHeXI1c,957
 pyloid/js_api/window_api.py,sha256=-isphU3m2wGB5U0yZrSuK_4XiBz2mG45HsjYTUq7Fxs,7348
 pyloid/monitor.py,sha256=1mXvHm5deohnNlTLcRx4sT4x-stnOIb0dUQnnxN50Uo,28295
-pyloid/pyloid.py,sha256=gO1wrO_5JX5mUMGGhZ-EKK0K54t9jgfJHrXagjkB9VA,85665
-pyloid/rpc.py,sha256=y62hr2uqkyhwdASDvjryGqY8Bga9Cw6Hda_D6XaU0nQ,17092
+pyloid/pyloid.py,sha256=r70Xa-SKk0yZsJ_d2Kl-adLy7P2VX1yqxymVBVeNNa8,85762
+pyloid/rpc.py,sha256=gILZkC9_SU58VAad15iRp9S2_efddJjZPJYU0iCk4c8,18342
 pyloid/serve.py,sha256=wJIBqiLr1-8FvBdV3yybeBtVXsu94FfWYKjHL0eQ68s,1444
 pyloid/store.py,sha256=p0plJj52hQjjtNMVJhy20eNLXfQ3Qmf7LtGHQk7FiPg,4471
 pyloid/thread_pool.py,sha256=fKOBb8jMfZn_7crA_fJCno8dObBRZE31EIWaNQ759aw,14616
@@ -17,7 +17,7 @@ pyloid/timer.py,sha256=RqMsChFUd93cxMVgkHWiIKrci0QDTBgJSTULnAtYT8M,8712
 pyloid/tray.py,sha256=D12opVEc2wc2T4tK9epaN1oOdeziScsIVNM2uCN7C-A,1710
 pyloid/url_interceptor.py,sha256=AFjPANDELc9-E-1TnVvkNVc-JZBJYf0677dWQ8LDaqw,726
 pyloid/utils.py,sha256=NqB8W-irXDtTGb74rrJ2swU6tgzU0HSE8lGewrStOKc,5685
-pyloid-0.23.10.dist-info/LICENSE,sha256=F96EzotgWhhpnQTW2TcdoqrMDir1jyEo6H915tGQ-QE,11524
-pyloid-0.23.10.dist-info/METADATA,sha256=NQvORTInEGRJqpmqAh_PYZINIHVI7zpM5qsZ679oR88,3198
-pyloid-0.23.10.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-pyloid-0.23.10.dist-info/RECORD,,
+pyloid-0.23.12.dist-info/LICENSE,sha256=F96EzotgWhhpnQTW2TcdoqrMDir1jyEo6H915tGQ-QE,11524
+pyloid-0.23.12.dist-info/METADATA,sha256=3956skq8Asmg8_yLWVtZohJP25YSmFq0Fl2AmXdiok8,3198
+pyloid-0.23.12.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+pyloid-0.23.12.dist-info/RECORD,,