pyloid 0.23.11__tar.gz → 0.23.13__tar.gz

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

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

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

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

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

@@ -356,7 +356,7 @@ class _BrowserWindow:
             return;
         
         self.rpc.pyloid = self.app.pyloid_wrapper
-        self.rpc.window = self.window_wrapper
+        # self.rpc.window = self.window_wrapper
         
         # RPC 서버 중복 방지
         if self.rpc in self.app.rpc_servers:

{pyloid-0.23.11 → pyloid-0.23.13}/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
@@ -325,7 +322,7 @@ class PyloidRPC:
                 if has_ctx_param and isinstance(params, dict) and 'ctx' not in params:
                     ctx = RPCContext(
                         pyloid=self.pyloid,
-                        window=self.window
+                        window=self.pyloid.get_window_by_id(request_id)
                     )
                     # 딕셔너리 형태로 params 사용할 때
                     params = params.copy()  # 원본 params 복사
@@ -335,12 +332,20 @@ class PyloidRPC:
                 if isinstance(params, list):
                     # 리스트 형태로 params 사용할 때 처리 필요
                     if has_ctx_param:
-                        ctx = RPCContext(pyloid=self.pyloid, window=self.window)
-                        result = await func(ctx, *params)
+                        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)
+                        result = await func(*params, request_id=request_id)
                 else:  # isinstance(params, dict)
-                    result = await func(**params)
+                    internal_window_id = request_id
+                    params = params.copy()
+                    params['_pyloid_window_id'] = internal_window_id
+
+                    # 함수 시그니처에 맞는 인자만 추려서 전달
+                    sig = inspect.signature(func)
+                    allowed_params = set(sig.parameters.keys())
+                    filtered_params = {k: v for k, v in params.items() if k in allowed_params}
+                    result = await func(**filtered_params)
 
                 # 5. Format Success Response (only for non-notification requests)
                 if request_id is not None: # Notifications (id=null or absent) don't get responses