h2o-wave 1.1.1__py3-none-macosx_10_9_x86_64.whl → 1.5.5__py3-none-macosx_10_9_x86_64.whl

h2o_wave/cli.py

@@ -178,6 +178,8 @@ def run(app: str, no_reload: bool, no_autostart: bool):
 
         if not os.environ.get('H2O_WAVE_WAVED_DIR') and is_auto_started:
             os.environ['H2O_WAVE_WAVED_DIR'] = sys.exec_prefix
+        if not no_reload:
+            os.environ['__H2O_WAVE_DEV_MODE'] = '1'
         reload_exclude = os.environ.get('H2O_WAVE_RELOAD_EXCLUDE', None)
         if reload_exclude:
             reload_exclude = reload_exclude.split(os.pathsep)

h2o_wave/core.py

@@ -43,6 +43,12 @@ BROADCAST = 'broadcast'
 
 def _get_env(key: str, value: Any):
     return os.environ.get(f'H2O_WAVE_{key}', value)
+def _get_timeout(val: str) -> Optional[int]:
+    try:
+        num = int(val)
+        return num if num >= 0 else None
+    except ValueError:
+        raise ValueError(f'Timeout must be numeric, got {val}')
 
 
 _base_url = _get_env('BASE_URL', '/')
@@ -60,6 +66,10 @@ class _Config:
         self.hub_access_key_secret: str = _get_env('ACCESS_KEY_SECRET', 'access_key_secret')
         self.app_access_key_id: str = _get_env('APP_ACCESS_KEY_ID', None) or secrets.token_urlsafe(16)
         self.app_access_key_secret: str = _get_env('APP_ACCESS_KEY_SECRET', None) or secrets.token_urlsafe(16)
+        self.app_connect_timeout: Optional[int] = _get_timeout(_get_env('APP_CONNECT_TIMEOUT', '5'))
+        self.app_read_timeout: Optional[int] = _get_timeout(_get_env('APP_READ_TIMEOUT', '5'))
+        self.app_write_timeout: Optional[int] = _get_timeout(_get_env('APP_WRITE_TIMEOUT', '5'))
+        self.app_pool_timeout: Optional[int] = _get_timeout(_get_env('APP_POOL_TIMEOUT', '5'))
 
 
 _config = _Config()
@@ -640,9 +650,16 @@ class Site:
     """
 
     def __init__(self):
+        timeout = httpx.Timeout(
+            connect=_config.app_connect_timeout,
+            read=_config.app_read_timeout,
+            write=_config.app_write_timeout,
+            pool=_config.app_pool_timeout,
+        )
         self._http = httpx.Client(
             auth=(_config.hub_access_key_id, _config.hub_access_key_secret),
             verify=False,
+            timeout=timeout,
         )
         self.cache = _ServerCache(self._http)
 
@@ -870,9 +887,16 @@ class AsyncSite:
     """
 
     def __init__(self):
+        timeout = httpx.Timeout(
+            connect=_config.app_connect_timeout,
+            read=_config.app_read_timeout,
+            write=_config.app_write_timeout,
+            pool=_config.app_pool_timeout,
+        )
         self._http = httpx.AsyncClient(
             auth=(_config.hub_access_key_id, _config.hub_access_key_secret),
             verify=False,
+            timeout=timeout,
         )
         self.cache = _AsyncServerCache(self._http)
 

h2o_wave/server.py

@@ -77,7 +77,13 @@ class Auth:
         if not self.refresh_token:
             return
 
-        async with httpx.AsyncClient(auth=(_config.hub_access_key_id, _config.hub_access_key_secret), verify=False) as http:
+        timeout = httpx.Timeout(
+            connect=_config.app_connect_timeout,
+            read=_config.app_read_timeout,
+            write=_config.app_write_timeout,
+            pool=_config.app_pool_timeout,
+        )
+        async with httpx.AsyncClient(auth=(_config.hub_access_key_id, _config.hub_access_key_secret), verify=False, timeout=timeout) as http:
             res = await http.get(_config.hub_address + '_auth/refresh', headers={'Wave-Session-ID': self._session_id})
             return self.__extract_tokens(res.headers)
 
@@ -89,7 +95,13 @@ class Auth:
         if not self.refresh_token:
             return
 
-        with httpx.Client(auth=(_config.hub_access_key_id, _config.hub_access_key_secret), verify=False) as http:
+        timeout = httpx.Timeout(
+            connect=_config.app_connect_timeout,
+            read=_config.app_read_timeout,
+            write=_config.app_write_timeout,
+            pool=_config.app_pool_timeout,
+        )
+        with httpx.Client(auth=(_config.hub_access_key_id, _config.hub_access_key_secret), verify=False, timeout=timeout) as http:
             res = http.get(_config.hub_address + '_auth/refresh', headers={'Wave-Session-ID': self._session_id})
             return self.__extract_tokens(res.headers)
 
@@ -215,9 +227,16 @@ WebAppState = Tuple[Expando, Dict[str, Expando], Dict[str, Expando]]
 
 class _Wave:
     def __init__(self):
+        timeout = httpx.Timeout(
+            connect=_config.app_connect_timeout,
+            read=_config.app_read_timeout,
+            write=_config.app_write_timeout,
+            pool=_config.app_pool_timeout,
+        )
         self._http = httpx.AsyncClient(
             auth=(_config.hub_access_key_id, _config.hub_access_key_secret),
             verify=False,
+            timeout=timeout,
         )
 
     async def call(self, method: str, **kwargs):
@@ -378,6 +397,9 @@ class _App:
 
 
 def _is_req_authorized(req: Request) -> bool:
+    if os.environ.get('__H2O_WAVE_DEV_MODE') == '1':
+        return True
+
     basic_auth = req.headers.get("Authorization")
     if basic_auth is None:
         return False