solara-ui 1.47.0__py3-none-any.whl → 1.48.0__py3-none-any.whl

solara/__init__.py

@@ -1,6 +1,6 @@
 """Build webapps using IPywidgets"""
 
-__version__ = "1.47.0"
+__version__ = "1.48.0"
 github_url = "https://github.com/widgetti/solara"
 git_branch = "master"
 

solara/components/file_drop.vue

@@ -19,7 +19,7 @@
 <script>
 module.exports = {
   mounted() {
-    this.chunk_size = 2 * 1024 * 1024;
+    this.chunk_size = 1 * 1024 * 1024;
     this.$refs.dropzone.addEventListener('dragover', event => {
       event.preventDefault();
     });

solara/server/app.py

@@ -136,7 +136,7 @@ class AppScript:
             routes = solara.generate_routes_directory(self.path)
 
             if any(name for name in sys.modules.keys() if name.startswith(self.name)):
-                logger.warn(
+                logger.warning(
                     f"Directory {self.name} is also used as a package. This can cause modules to be loaded twice, and might "
                     "cause unexpected behavior. If you run solara from a different directory (e.g. the parent directory) you "
                     "can avoid this ambiguity."

solara/server/static/solara_bootstrap.py

@@ -119,7 +119,7 @@ async def main():
     ]
     for dep in requirements:
         await micropip.install(dep, keep_going=True)
-    await micropip.install("/wheels/solara-1.47.0-py2.py3-none-any.whl", keep_going=True)
+    await micropip.install("/wheels/solara-1.48.0-py2.py3-none-any.whl", keep_going=True)
     import solara
 
     el = solara.Warning("lala")

solara/tasks.py

@@ -6,6 +6,7 @@ import functools
 import inspect
 import logging
 import threading
+import warnings
 from enum import Enum
 import typing
 from typing import (
@@ -536,6 +537,7 @@ def task(
     f: None = None,
     *,
     prefer_threaded: bool = ...,
+    check_for_render_context: bool = ...,
 ) -> Callable[[Callable[P, R]], Task[P, R]]: ...
 
 
@@ -544,6 +546,7 @@ def task(
     f: Callable[P, Union[Coroutine[Any, Any, R], R]],
     *,
     prefer_threaded: bool = ...,
+    check_for_render_context: bool = ...,
 ) -> Task[P, R]: ...
 
 
@@ -551,6 +554,7 @@ def task(
     f: Union[None, Callable[P, Union[Coroutine[Any, Any, R], R]]] = None,
     *,
     prefer_threaded: bool = True,
+    check_for_render_context: bool = True,
 ) -> Union[Callable[[Callable[P, R]], Task[P, R]], Task[P, R]]:
     """Decorator to turn a function or coroutine function into a task.
 
@@ -764,12 +768,76 @@ def task(
         This ensures that even when a coroutine functions calls a blocking function the UI is still responsive.
         On platform where threads are not supported (like Pyodide / WASM / Emscripten / PyScript), a coroutine
         function will always run in the current event loop.
+    - `check_for_render_context` - bool: If true, we will check if we are in a render context, and if so, we will
+        warn you that you should probably be using `use_task` instead of `task`.
 
     ```
 
     """
 
+    def check_if_we_should_use_use_task():
+        import reacton.core
+
+        in_reacton_context = reacton.core.get_render_context(required=False) is not None
+        if not in_reacton_context:
+            # We are not in a reacton context, so we should not (and cannot) use use_task
+            return
+        from .toestand import _find_outside_solara_frame
+
+        frame = _find_outside_solara_frame()
+        if frame is None:
+            # We cannot determine which frame we are in, just skip this check
+            return
+        import inspect
+
+        tb = inspect.getframeinfo(frame)
+        msg = """You are calling task(...) from a component, while you should probably be using use_task.
+
+Reason:
+- task(...) creates a new task object on every render, and should only be used outside of a component.
+- use_task(...) returns the same task object on every render, and should be used inside a component.
+
+Example:
+@solara.component
+def Page():
+    @task  # This is wrong, this creates a new task object on every render
+    def my_task():
+        ...
+
+Instead, you should do:
+@solara.component
+def Page():
+    @use_task
+    def my_task():
+        ...
+
+"""
+        if tb:
+            if tb.code_context:
+                code = tb.code_context[0]
+            else:
+                code = "<No code context available>"
+            msg += f"This warning was triggered from:\n{tb.filename}:{tb.lineno}\n{code.strip()}"
+
+        # Check if the call is within a use_memo context by inspecting the call stack
+        if frame:
+            caller_frame = frame.f_back
+            # Check a few frames up the stack (e.g., up to 5) for 'use_memo'
+            for _ in range(5):
+                if caller_frame is None:
+                    break
+                func_name = caller_frame.f_code.co_name
+                module_name = caller_frame.f_globals.get("__name__", "")
+                if func_name == "use_memo" and (module_name.startswith("solara.") or module_name.startswith("reacton.")):
+                    # We are in a use_memo (or a context that should not trigger the warning)
+                    return
+                caller_frame = caller_frame.f_back
+
+        warnings.warn(msg)
+
     def wrapper(f: Union[None, Callable[P, Union[Coroutine[Any, Any, R], R]]]) -> Task[P, R]:
+        if check_for_render_context:
+            check_if_we_should_use_use_task()
         # we use wraps to make the key of the reactive variable more unique
         # and less likely to mixup during hot reloads
         assert f is not None
@@ -800,46 +868,46 @@ def use_task(
     dependencies: Literal[None] = ...,
     raise_error=...,
     prefer_threaded=...,
-) -> Callable[[Callable[[], R]], "Task[[], R]"]: ...
+) -> Callable[[Callable[P, R]], "Task[P, R]"]: ...
 
 
 @overload
 def use_task(
-    f: Callable[[], R],
+    f: None = None,
     *,
-    dependencies: Literal[None] = ...,
+    dependencies: List = ...,
     raise_error=...,
     prefer_threaded=...,
-) -> "Task[[], R]": ...
+) -> Callable[[Callable[[], R]], "Task[[], R]"]: ...
 
 
 @overload
 def use_task(
-    f: None = None,
+    f: Callable[[], R],
     *,
     dependencies: List = ...,
     raise_error=...,
     prefer_threaded=...,
-) -> Callable[[Callable[[], R]], "Task[[], R]"]: ...
+) -> "Task[[], R]": ...
 
 
 @overload
 def use_task(
-    f: Callable[[], R],
+    f: Callable[P, R],
     *,
-    dependencies: List = ...,
+    dependencies: Literal[None] = ...,
     raise_error=...,
     prefer_threaded=...,
-) -> "Task[[], R]": ...
+) -> "Task[P, R]": ...
 
 
 def use_task(
-    f: Union[None, Callable[[], R]] = None,
+    f: Union[None, Callable[P, R]] = None,
     *,
     dependencies: Union[None, List] = [],
     raise_error=True,
     prefer_threaded=True,
-) -> Union[Callable[[Callable[[], R]], "Task[[], R]"], "Task[[], R]"]:
+) -> Union[Callable[[Callable[P, R]], "Task[P, R]"], "Task[P, R]"]:
     """A hook that runs a function or coroutine function as a task and returns the result.
 
     Allows you to run code in the background, with the UI available to the user. This is useful for long running tasks,
@@ -919,7 +987,7 @@ def use_task(
 
     def wrapper(f):
         def create_task() -> "Task[[], R]":
-            return task(f, prefer_threaded=prefer_threaded)
+            return task(f, prefer_threaded=prefer_threaded, check_for_render_context=False)
 
         task_instance = solara.use_memo(create_task, dependencies=[])
         # we always update the function so we do not have stale data in the function

solara/toestand.py

@@ -343,6 +343,7 @@ def _is_internal_module(file_name: str):
     return (
         file_name_parts[-2:] == ["solara", "toestand.py"]
         or file_name_parts[-2:] == ["solara", "reactive.py"]
+        or file_name_parts[-2:] == ["solara", "tasks.py"]
         or file_name_parts[-2:] == ["solara", "_stores.py"]
         or file_name_parts[-3:] == ["solara", "hooks", "use_reactive.py"]
         or file_name_parts[-2:] == ["reacton", "core.py"]

solara/widgets/vue/gridlayout.vue

@@ -3,8 +3,8 @@
     <div v-if="gridlayout_loaded" style="padding: 0px; width: 100%;">
        <grid-layout
             :layout.sync="grid_layout"
-            :col-num="12"
-            :row-height="30"
+            :col-num="col_num"
+            :row-height="row_height"
             :is-draggable="draggable"
             :is-resizable="resizable"
             :is-mirrored="false"

solara/widgets/widgets.py

@@ -53,6 +53,8 @@ class GridLayout(v.VuetifyTemplate):
     resizable = traitlets.CBool(True).tag(sync=True)
     cdn = traitlets.Unicode(None, allow_none=True).tag(sync=True)
     on_layout_updated = traitlets.traitlets.Callable(None, allow_none=True)
+    col_num = traitlets.Int(12).tag(sync=True)
+    row_height = traitlets.Int(30).tag(sync=True)
 
     def vue_layout_updated(self, *args):
         if self.on_layout_updated is not None:

{solara_ui-1.47.0.dist-info → solara_ui-1.48.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: solara-ui
-Version: 1.47.0
+Version: 1.48.0
 Dynamic: Summary
 Project-URL: Home, https://www.github.com/widgetti/solara
 Project-URL: Documentation, https://solara.dev

{solara_ui-1.47.0.dist-info → solara_ui-1.48.0.dist-info}/RECORD

@@ -1,6 +1,6 @@
 prefix/etc/jupyter/jupyter_notebook_config.d/solara.json,sha256=3UhTBQi6z7F7pPjmqXxfddv79c8VGR9H7zStDLp6AwY,115
 prefix/etc/jupyter/jupyter_server_config.d/solara.json,sha256=D9J-rYxAzyD5GOqWvuPjacGUVFHsYtTfZ4FUbRzRvIA,113
-solara/__init__.py,sha256=jBYuG7OuKcvsz7an94e3Q-_v9wxV3LotKgn69jDdWgI,3647
+solara/__init__.py,sha256=8GsgAErkS5dA1fa2M7LKzN6p6qy9IyZYYBcU0mS8yuo,3647
 solara/__main__.py,sha256=pm79jfba-0ZapLR0PtwZfMeiTHrLz8kEt79EygRyXxQ,24828
 solara/_stores.py,sha256=N2Ec-61XNFXwigBx8f5QYPx7gDXenCOBdmLPXiJB45E,12320
 solara/alias.py,sha256=9vfLzud77NP8in3OID9b5mmIO8NyrnFjN2_aE0lSb1k,216
@@ -20,8 +20,8 @@ solara/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 solara/reactive.py,sha256=KN0PJl-ivxjgQj008zyPGnORo5bTNaY77uASsSW0mFQ,3430
 solara/routing.py,sha256=G_iZKozdVoUuD-qSMyuPV6jeN4qBqujAUvekw036f88,9143
 solara/settings.py,sha256=FED5SYfw1W88U8SPk9iXSgSSvMHgPkU1auONSdk5cNs,2688
-solara/tasks.py,sha256=eAMwY80dHg_GRiQniaoLG2fJz6GjKZ-v3S1LQs2MgGo,34556
-solara/toestand.py,sha256=kVyGgmUcgRKK70FZKrf1VqbE1-tW5fAOG7zoR66jD94,33439
+solara/tasks.py,sha256=uaauVf5zuVROWlU5KD_uoBEjy81YcpUtJhxcxX_Rs88,37197
+solara/toestand.py,sha256=-ddVhZGmFR4qia_skg4f15xAdNaiB_9drpS-qxrQDaQ,33497
 solara/util.py,sha256=UUO3BfhXb3tGP-uj8UuTYMx6kuph6PiDp4XXm-f6uyg,9697
 solara/validate_hooks.py,sha256=F0CYDOVF_23O1apJBIk9lZMq11JmkoE3BrVVT8QvZWI,9999
 solara/components/__init__.py,sha256=j5Tv0tyzs80Bsl5hvTIF_x-RQyAvr3ooqIXnABamW44,3214
@@ -46,7 +46,7 @@ solara/components/figure_altair.py,sha256=t4EEwXrdoisrbV5j2MS-HBlPc5HSFCK5r4mRXv
 solara/components/file_browser.py,sha256=701vg4_c0au9va206sx3pQDX6NL1VFqs7ewQ0RAbn6k,7331
 solara/components/file_download.py,sha256=Lil0qyiozU_Pxyb_HgnJXOumrxMeDwwavEmZZw6kAs8,7475
 solara/components/file_drop.py,sha256=BA53EZsCzzPCS8i2ZH_S1NAkmmQlTOvNEoXAt0_1l4A,5239
-solara/components/file_drop.vue,sha256=ywQvWjqLIRNMAL6ZrdLpHCK4ZprrVbh0n2AJFanVlR8,2243
+solara/components/file_drop.vue,sha256=7V6YjHhoqOCVDMVPtObNwfHz2MdXLCFlNEqK1brl3zI,2243
 solara/components/file_list_widget.vue,sha256=atp-FO9tBjvyCQ_32NqeB9Rcehg03vPLD1eIROgBDDU,1860
 solara/components/head.py,sha256=QZRTbwaUH0trfce3ntEcOqmLjw74CbSHpuMt9gGj7oA,648
 solara/components/head_tag.py,sha256=xPj_ug0TUAZF4yN6ypKlmLcsHORIHU8zfIZgEDNi4PQ,1591
@@ -106,7 +106,7 @@ solara/lab/utils/headers.py,sha256=RMo8JUdztRePrdNfYCX1QEhrfyF6ktodr4v6tIREKbs,2
 solara/scope/__init__.py,sha256=0sP3B6L4Aai0b6nadPtEETb8XqdGmSFKvQusNH0-yvY,2987
 solara/scope/types.py,sha256=HTf_wnkpkhhtGaeFsB690KBP623CUuqiMssd72-u9yg,1540
 solara/server/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-solara/server/app.py,sha256=Ro_-V9RIVCGOubm8aW8eCVfW1A6peD0DKaqmim1--ZE,22134
+solara/server/app.py,sha256=vYUyqucwz2KZwH5RCCJtQDGPJdSLYqB5dAULudSqm74,22137
 solara/server/cdn_helper.py,sha256=mjdDWL1jVed40rEagP9L5CfZwFB77yUKqcFg--u2eds,3250
 solara/server/esm.py,sha256=dX9pzTJQ6kd6qNHQgzC938O5LTowLhuATXO0Q1paz44,2951
 solara/server/fastapi.py,sha256=qVIHn0_Kxr6zWqcBWySu5nnJ6pNTSDqb4EHIh-cqH_8,93
@@ -146,7 +146,7 @@ solara/server/static/highlight-dark.css,sha256=xO8-vta9vG4s1OfJNHXWqiLWzx_gM03jo
 solara/server/static/highlight.css,sha256=k8ZdT5iwrGQ5tXTQHAXuxvZrSUq3kwCdEpy3mlFoZjs,2637
 solara/server/static/main-vuetify.js,sha256=R3qM4xMlstMpRUdRaul78p34z_Av2ONSTXksg2V9TqQ,9503
 solara/server/static/main.js,sha256=mcx4JNQ4Lg4pNdUIqMoZos1mZyYFS48yd_JNFFJUqIE,5679
-solara/server/static/solara_bootstrap.py,sha256=ildevVHVjvZI43tKpjjCcTLDdAv4ept91zCTLtOxAQU,3195
+solara/server/static/solara_bootstrap.py,sha256=Vsr4ZZQFyG6LDNyYOGEK84uIlP3-_eYF6IDcFv36-gE,3195
 solara/server/static/sun.svg,sha256=jEKBAGCr7b9zNYv0VUb7lMWKjnU2dX69_Ye_DZWGXJI,6855
 solara/server/static/webworker.js,sha256=cjAFz7-SygStHJnYlJUlJs-gE_7YQeQ-WBDcmKYyjvo,1372
 solara/server/templates/index.html.j2,sha256=JXQo1M-STFHLBOFetgG7509cAq8xUP0VAEtYDzz35fY,31
@@ -451,14 +451,14 @@ solara/website/public/social/github.svg,sha256=XGlfnNccpMHYjfji25r5UW9FvS9pYPR1H
 solara/website/public/social/twitter.svg,sha256=3Ub5a29H_NM2g7ed3689rKHU-K66PA8r3hWExpzGmdQ,430
 solara/website/templates/index.html.j2,sha256=NYBuEHmKeSju-b3apY0h3FEJ-tnGDhrnkY-0cZ92Rro,4358
 solara/widgets/__init__.py,sha256=D3RfEez9dllmst64_nyzzII-NZXoNMEPDnEog4ov3VE,43
-solara/widgets/widgets.py,sha256=RTB6RR8UFQ31U3_7740c-2St3xM4NlJc__d7-0onjvU,2659
-solara/widgets/vue/gridlayout.vue,sha256=YlDJohAV8gvoZCEdABbFm6uXcy2tfCMfH8GQqPW9M7o,3571
+solara/widgets/widgets.py,sha256=pog0XbqRxyWxLdjsthvM3G_6mIPTUaT6ZErb1POQXJg,2756
+solara/widgets/vue/gridlayout.vue,sha256=LZk-YlqM7nv_7Y5TTq2xqfH1j2SLP1QOH5eiz7G0ayo,3584
 solara/widgets/vue/html.vue,sha256=48K5rjp0AdJDeRV6F3nOHW3J0WXPeHn55r5pGClK2fU,112
 solara/widgets/vue/navigator.vue,sha256=7fkX-4_YSnnMIPUMKMvQVVEzrmhY9BFAYvHMqZqTXpI,4790
 solara/widgets/vue/vegalite.vue,sha256=zhocRsUCNIRQCEbD16er5sYnuHU0YThatRHnorA3P18,4596
-solara_ui-1.47.0.data/data/etc/jupyter/jupyter_notebook_config.d/solara.json,sha256=3UhTBQi6z7F7pPjmqXxfddv79c8VGR9H7zStDLp6AwY,115
-solara_ui-1.47.0.data/data/etc/jupyter/jupyter_server_config.d/solara.json,sha256=D9J-rYxAzyD5GOqWvuPjacGUVFHsYtTfZ4FUbRzRvIA,113
-solara_ui-1.47.0.dist-info/METADATA,sha256=vo9lBZKU-TY9kjVktWpUs9vqg-MkPE-PDvcU5xNFFHE,7459
-solara_ui-1.47.0.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-solara_ui-1.47.0.dist-info/licenses/LICENSE,sha256=fFJUz-CWzZ9nEc4QZKu44jMEoDr5fEW-SiqljKpD82E,1086
-solara_ui-1.47.0.dist-info/RECORD,,
+solara_ui-1.48.0.data/data/etc/jupyter/jupyter_notebook_config.d/solara.json,sha256=3UhTBQi6z7F7pPjmqXxfddv79c8VGR9H7zStDLp6AwY,115
+solara_ui-1.48.0.data/data/etc/jupyter/jupyter_server_config.d/solara.json,sha256=D9J-rYxAzyD5GOqWvuPjacGUVFHsYtTfZ4FUbRzRvIA,113
+solara_ui-1.48.0.dist-info/METADATA,sha256=89gyWKym-70PtLtlRfc7Wre6bWfW5He78idYwUoM1hM,7459
+solara_ui-1.48.0.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
+solara_ui-1.48.0.dist-info/licenses/LICENSE,sha256=fFJUz-CWzZ9nEc4QZKu44jMEoDr5fEW-SiqljKpD82E,1086
+solara_ui-1.48.0.dist-info/RECORD,,