10
10
import idom
11
11
from idom .core .element import AbstractElement , ElementConstructor
12
12
from idom .server .sanic import SanicRenderServer , PerClientStateServer
13
- from idom .server .prefab import hotswap_server , multiview_server , MultiViewMount
13
+ from idom .widgets .utils import MultiViewMount
14
+ from idom .server .prefab import hotswap_server , multiview_server
14
15
from idom .server .utils import find_available_port
15
16
from idom .utils import Ref
16
17
17
18
18
19
DisplayFunction = Callable [[Union [ElementConstructor , AbstractElement ], str ], None ]
20
+ DisplayFunctionContext = Callable [[], "AbstractContextManager[DisplayFunction]" ]
19
21
20
22
21
23
@contextmanager
22
24
def open_selenium_chrome_driver_and_display_context (
23
25
headless : bool , driver_timeout : float = 3.0 , wait_for_server_start : float = 1.0
24
- ) -> Iterator [Tuple [Chrome , DisplayFunction ]]:
26
+ ) -> Iterator [Tuple [Chrome , DisplayFunctionContext ]]:
25
27
host = "127.0.0.1"
26
28
port = find_available_port (host )
27
29
server_url = f"http://{ host } :{ port } "
@@ -48,7 +50,7 @@ def create_selenium_page_get_and_display_context(
48
50
server : "SanicRenderServerWithLastError" ,
49
51
server_url : str ,
50
52
element_mount_function : Callable [..., None ],
51
- ) -> Tuple [Callable [[str ], None ], "AbstractContextManager[DisplayFunction]" ]:
53
+ ) -> Tuple [Callable [[str ], None ], DisplayFunctionContext ]:
52
54
display_id = Ref (0 )
53
55
54
56
def get_page (query : str = "" ) -> None :
@@ -80,7 +82,7 @@ def display_function(
80
82
return None
81
83
82
84
@contextmanager
83
- def display_context ():
85
+ def display_context () -> Iterator [ DisplayFunction ] :
84
86
server .last_server_error_for_idom_testing .current = None
85
87
try :
86
88
yield display_function
@@ -97,7 +99,7 @@ def create_sanic_multiview_mount_and_server(
97
99
port : int ,
98
100
debug : bool = False ,
99
101
app : Optional [Sanic ] = None ,
100
- ) -> Tuple [MultiViewMount , SanicRenderServer ]:
102
+ ) -> Tuple [MultiViewMount , "SanicRenderServerWithLastError" ]:
101
103
return multiview_server (
102
104
create_sanic_server_type_for_testing (server_type ),
103
105
host ,
@@ -115,7 +117,7 @@ def create_sanic_hotswap_mount_and_server(
115
117
sync_views : bool = False ,
116
118
debug : bool = False ,
117
119
app : Optional [Sanic ] = None ,
118
- ) -> Tuple [Callable [..., None ], SanicRenderServer ]:
120
+ ) -> Tuple [Callable [..., None ], "SanicRenderServerWithLastError" ]:
119
121
120
122
return hotswap_server (
121
123
create_sanic_server_type_for_testing (server_type ),
0 commit comments