Reverting PyCharm formatting

Author: Michael Ikemann

nicegui/client.py

@@ -97,8 +97,7 @@ def is_auto_index_client(self) -> bool:
     @property
     def ip(self) -> Optional[str]:
         """Return the IP address of the client, or None if the client is not connected."""
-        return self.environ['asgi.scope']['client'][
-            0] if self.environ else None  # pylint: disable=unsubscriptable-object
+        return self.environ['asgi.scope']['client'][0] if self.environ else None  # pylint: disable=unsubscriptable-object
 
     @property
     def has_socket_connection(self) -> bool:
@@ -137,13 +136,12 @@ def build_response(self, request: Request, status_code: int = 200) -> Response:
                 'request': request,
                 'version': __version__,
                 'elements': elements.replace('&', '&')
-                .replace('<', '&lt;')
-                .replace('>', '&gt;')
-                .replace('`', '&#96;')
-                .replace('$', '&#36;'),
+                                    .replace('<', '&lt;')
+                                    .replace('>', '&gt;')
+                                    .replace('`', '&#96;')
+                                    .replace('$', '&#36;'),
                 'head_html': self.head_html,
-                'body_html': '<style>' + '\n'.join(vue_styles) + '</style>\n' + self.body_html + '\n' + '\n'.join(
-                    vue_html),
+                'body_html': '<style>' + '\n'.join(vue_styles) + '</style>\n' + self.body_html + '\n' + '\n'.join(vue_html),
                 'vue_scripts': '\n'.join(vue_scripts),
                 'imports': json.dumps(imports),
                 'js_imports': '\n'.join(js_imports),
@@ -258,7 +256,6 @@ def handle_handshake(self) -> None:
 
     def handle_disconnect(self) -> None:
         """Wait for the browser to reconnect; invoke disconnect handlers if it doesn't."""
-
         async def handle_disconnect() -> None:
             if self.page.reconnect_timeout is not None:
                 delay = self.page.reconnect_timeout
@@ -271,7 +268,6 @@ async def handle_disconnect() -> None:
                 self.safe_invoke(t)
             if not self.shared:
                 self.delete()
-
         self._disconnect_task = background_tasks.create(handle_disconnect())
 
     def handle_event(self, msg: Dict) -> None:
@@ -295,7 +291,6 @@ def safe_invoke(self, func: Union[Callable[..., Any], Awaitable]) -> None:
                 async def func_with_client():
                     with self:
                         await func
-
                 background_tasks.create(func_with_client())
             else:
                 with self:
@@ -304,7 +299,6 @@ async def func_with_client():
                     async def result_with_client():
                         with self:
                             await result
-
                     background_tasks.create(result_with_client())
         except Exception as e:
             core.app.handle_exception(e)
@@ -359,4 +353,4 @@ async def prune_instances(cls) -> None:
             except Exception:
                 # NOTE: make sure the loop doesn't crash
                 log.exception('Error while pruning clients')
-            await asyncio.sleep(10)
+            await asyncio.sleep(10)

nicegui/page.py

@@ -106,7 +106,6 @@ async def decorated(*dec_args, **dec_kwargs) -> Response:
                 async def wait_for_result() -> None:
                     with client:
                         return await result
-
                 task = background_tasks.create(wait_for_result())
                 deadline = time.time() + self.response_timeout
                 while task and not client.is_waiting_for_connection and not task.done():

nicegui/storage.py

@@ -16,14 +16,12 @@
 from .context import get_slot_stack
 from .logging import log
 
-request_contextvar: contextvars.ContextVar[Optional[Request]] = contextvars.ContextVar(
-    'request_var', default=None)
+request_contextvar: contextvars.ContextVar[Optional[Request]] = contextvars.ContextVar('request_var', default=None)
 
 
 class ReadOnlyDict(MutableMapping):
 
-    def __init__(self, data: Dict[Any, Any],
-                 write_error_message: str = 'Read-only dict') -> None:
+    def __init__(self, data: Dict[Any, Any], write_error_message: str = 'Read-only dict') -> None:
         self._data: Dict[Any, Any] = data
         self._write_error_message: str = write_error_message
 
@@ -65,7 +63,6 @@ def backup(self) -> None:
         async def backup() -> None:
             async with aiofiles.open(self.filepath, 'w', encoding=self.encoding) as f:
                 await f.write(json.dumps(self))
-
         if core.loop:
             background_tasks.create_lazy(backup(), name=self.filepath.stem)
         else:
@@ -74,8 +71,7 @@ async def backup() -> None:
 
 class RequestTrackingMiddleware(BaseHTTPMiddleware):
 
-    async def dispatch(self, request: Request,
-                       call_next: RequestResponseEndpoint) -> Response:
+    async def dispatch(self, request: Request, call_next: RequestResponseEndpoint) -> Response:
         request_contextvar.set(request)
         if 'id' not in request.session:
             request.session['id'] = str(uuid.uuid4())
@@ -100,8 +96,7 @@ class Storage:
     def __init__(self) -> None:
         self.path = Path(os.environ.get('NICEGUI_STORAGE_PATH', '.nicegui')).resolve()
         self.migrate_to_utf8()
-        self._general = PersistentDict(self.path / 'storage-general.json',
-                                       encoding='utf-8')
+        self._general = PersistentDict(self.path / 'storage-general.json', encoding='utf-8')
         self._users: Dict[str, PersistentDict] = {}
 
     @property
@@ -115,11 +110,9 @@ def browser(self) -> Union[ReadOnlyDict, Dict]:
         request: Optional[Request] = request_contextvar.get()
         if request is None:
             if self._is_in_auto_index_context():
-                raise RuntimeError(
-                    'app.storage.browser can only be used with page builder functions '
-                    '(https://nicegui.io/documentation/page)')
-            raise RuntimeError(
-                'app.storage.browser needs a storage_secret passed in ui.run()')
+                raise RuntimeError('app.storage.browser can only be used with page builder functions '
+                                   '(https://nicegui.io/documentation/page)')
+            raise RuntimeError('app.storage.browser needs a storage_secret passed in ui.run()')
         if request.state.responded:
             return ReadOnlyDict(
                 request.session,
@@ -137,27 +130,14 @@ def user(self) -> Dict:
         request: Optional[Request] = request_contextvar.get()
         if request is None:
             if self._is_in_auto_index_context():
-                raise RuntimeError(
-                    'app.storage.user can only be used with page builder functions '
-                    '(https://nicegui.io/documentation/page)')
-            raise RuntimeError(
-                'app.storage.user needs a storage_secret passed in ui.run()')
+                raise RuntimeError('app.storage.user can only be used with page builder functions '
+                                   '(https://nicegui.io/documentation/page)')
+            raise RuntimeError('app.storage.user needs a storage_secret passed in ui.run()')
         session_id = request.session['id']
         if session_id not in self._users:
-            self._users[session_id] = PersistentDict(
-                self.path / f'storage-user-{session_id}.json', encoding='utf-8')
+            self._users[session_id] = PersistentDict(self.path / f'storage-user-{session_id}.json', encoding='utf-8')
         return self._users[session_id]
 
-    @property
-    def session(self) -> Dict:
-        """Volatile client storage that is persisted on the server (where NiceGUI is
-        executed) on a per client/per connection basis.
-
-        Note that this kind of storage can only be used in single page applications
-        where the client connection is preserved between page changes."""
-        client = context.get_client()
-        return client.state
-
     @staticmethod
     def _is_in_auto_index_context() -> bool:
         try:
@@ -170,6 +150,15 @@ def general(self) -> Dict:
         """General storage shared between all users that is persisted on the server (where NiceGUI is executed)."""
         return self._general
 
+    @property
+    def session(self) -> Dict:
+        """Volatile client storage that is persisted on the server (where NiceGUI is
+        executed) on a per client/per connection basis.
+        Note that this kind of storage can only be used in single page applications
+        where the client connection is preserved between page changes."""
+        client = context.get_client()
+        return client.state
+
     def clear(self) -> None:
         """Clears all storage."""
         self._general.clear()
@@ -192,4 +181,4 @@ def migrate_to_utf8(self) -> None:
                 log.warning(f'Could not load storage file {filepath}')
                 data = {}
             filepath.rename(new_filepath)
-            new_filepath.write_text(json.dumps(data), encoding='utf-8')
+            new_filepath.write_text(json.dumps(data), encoding='utf-8')