solara-ui 1.53.0__py3-none-any.whl → 1.55.0__py3-none-any.whl

solara/__init__.py

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

solara/minisettings.py

@@ -101,37 +101,33 @@ class BaseSettings:
         cls = type(self)
         self._values = {**kwargs}
         keys = {k.upper() for k in os.environ.keys()}
-        for key, field in cls.__dict__.items():
-            if key in kwargs:
+
+        for key, field in list(cls.__dict__.items()):
+            if key in kwargs or not isinstance(field, _Field):
                 continue
-            if isinstance(field, _Field):
-                value = field.default
-                if field.default_factory:
-                    value = field.default_factory()
-
-                if field.env:
-                    env_key = field.env.upper()
-                    if env_key in keys:
-                        # do a case-insensitive lookup
-                        for env_var_cased in os.environ.keys():
-                            if env_key.upper() == env_var_cased.upper():
-                                value = convert(field.annotation, os.environ[env_var_cased])
-                self._values[key] = value
+            value = field.default
+            if field.default_factory:
+                value = field.default_factory()
+            if field.env:
+                env_key = field.env.upper()
+                if env_key in keys:
+                    for env_var_cased in os.environ.keys():
+                        if env_key.upper() == env_var_cased.upper():
+                            value = convert(field.annotation, os.environ[env_var_cased])
+            self._values[key] = value
 
     def __init_subclass__(cls) -> None:
         cls.__fields__ = {}
-        for key, field in cls.__dict__.items():
-            if key.startswith("_"):
-                continue
-            if key == "Config":
+        items = list(cls.__dict__.items())
+
+        for key, value in items:
+            if key.startswith("_") or key == "Config" or inspect.isfunction(value):
                 continue
-            if not isinstance(field, _Field):
-                if inspect.isfunction(field):
-                    continue
-                field = Field(field)
-                setattr(cls, key, field)
-                field.__set_name__(cls, key)
-            cls.__fields__[key] = field
+            if not isinstance(value, _Field):
+                value = Field(value)
+                setattr(cls, key, value)
+                value.__set_name__(cls, key)
+            cls.__fields__[key] = value
 
     def dict(self, by_alias=True):
         values = self._values.copy()

solara/server/kernel_context.py

@@ -17,7 +17,7 @@ import threading
 import time
 import typing
 from pathlib import Path
-from typing import Any, Callable, Dict, List, Optional, cast
+from typing import Any, Callable, Dict, List, Optional, Tuple, Union, cast
 
 import ipywidgets as widgets
 import reacton
@@ -39,6 +39,11 @@ class Local(threading.local):
 
 
 local = Local()
+# same idea, but for `async with ...`
+if typing.TYPE_CHECKING:
+    async_stack = contextvars.ContextVar[Union[Tuple[Union[None, "VirtualKernelContext"], ...], None]](name="async_stack", default=None)
+else:
+    async_stack = contextvars.ContextVar("async_stack", default=None)
 
 
 class PageStatus(enum.Enum):
@@ -100,6 +105,23 @@ class VirtualKernelContext:
     def on_close(self, f: Callable[[], None]):
         self._on_close_callbacks.append(f)
 
+    async def __aenter__(self):
+        stack = async_stack.get()
+        if stack is None:
+            stack = ()
+        key = get_current_thread_key()
+        async_stack.set(stack + (current_context.get(key, None),))
+        new_key = get_current_thread_key()
+        current_context[new_key] = self
+
+    async def __aexit__(self, *args):
+        key = get_current_thread_key()
+        assert local.kernel_context_stack is not None
+        stack = async_stack.get()
+        assert stack is not None
+        current_context[key] = stack[-1]
+        async_stack.set(stack[:-1])
+
     def __enter__(self):
         if local.kernel_context_stack is None:
             local.kernel_context_stack = []
@@ -364,6 +386,7 @@ else:
 
 
 def get_current_thread_key() -> str:
+    # consider renaming this to get_current_context_key
     if not solara.server.settings.kernel.threaded:
         if async_context_id is not None:
             try:
@@ -375,6 +398,13 @@ def get_current_thread_key() -> str:
     else:
         thread = threading.current_thread()
         key = get_thread_key(thread)
+        # this signals we are using `async with context`, which means we are interested in task-local context
+        stack = async_stack.get()
+        if stack is not None and len(stack) > 0:
+            current_task = asyncio.current_task()
+            if current_task is not None:
+                task_key = current_task.get_name()
+                key = f"{key}-task:{task_key}"
     return key
 
 

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.53.0-py2.py3-none-any.whl", keep_going=True)
+    await micropip.install("/wheels/solara-1.55.0-py2.py3-none-any.whl", keep_going=True)
     import solara
 
     el = solara.Warning("lala")

solara/settings.py

@@ -57,6 +57,7 @@ class MainSettings(BaseSettings):
     allow_reactive_boolean: bool = True
     # TODO: also change default_container in solara/components/__init__.py
     default_container: Optional[str] = "Column"
+    allow_global_context: bool = True
 
     class Config:
         env_prefix = "solara_"

solara/tasks.py

@@ -1,3 +1,4 @@
+import contextvars
 import sys
 import abc
 import asyncio
@@ -267,7 +268,16 @@ class TaskAsyncio(Task[P, R]):
 
         if self.run_in_thread:
             thread_event_loop = asyncio.new_event_loop()
-            self.current_task = current_task = thread_event_loop.create_task(self._async_run(call_event_loop, future, args, kwargs))
+
+            def create_task():
+                # remove the stack, since this thread starts with a fresh stack
+                import solara.server.kernel_context
+
+                solara.server.kernel_context.async_stack.set(None)
+                return thread_event_loop.create_task(self._async_run(call_event_loop, future, args, kwargs))
+
+            new_context = contextvars.copy_context()
+            self.current_task = current_task = new_context.run(create_task)
 
             def runs_in_thread():
                 try:
@@ -298,7 +308,7 @@ class TaskAsyncio(Task[P, R]):
                     raise
 
             self._result.value = TaskResult[R](latest=self._last_value, _state=TaskState.STARTING)
-            thread = threading.Thread(target=runs_in_thread, daemon=True)
+            thread = threading.Thread(target=runs_in_thread, daemon=True, name=f"TaskAsyncio-{self.function.__name__}")
             thread.start()
         else:
             self.current_task = current_task = asyncio.create_task(self._async_run(call_event_loop, future, args, kwargs))
@@ -322,7 +332,6 @@ class TaskAsyncio(Task[P, R]):
 
         task_for_this_call = _get_current_task()
         assert task_for_this_call is not None
-
         if self.is_current():
             self._result.value = TaskResult[R](latest=self._last_value, _state=TaskState.STARTING)
 

solara/test/pytest_plugin.py

@@ -35,7 +35,12 @@ if typing.TYPE_CHECKING:
 
 logger = logging.getLogger("solara.pytest_plugin")
 
-TEST_PORT_START = int(os.environ.get("PORT", "18765")) + 100  # do not interfere with the solara integration tests
+
+# support for pytest-xdist
+worker = os.environ.get("PYTEST_XDIST_WORKER", "gw0")
+# +100 so we do not interfere with the solara integration tests, +1 worker id to avoid port conflicts with other workers
+TEST_PORT_START = int(os.environ.get("PORT", "18765")) + int(worker[2:]) + 100
+
 TEST_HOST = solara.server.settings.main.host
 TIMEOUT = float(os.environ.get("SOLARA_PW_TIMEOUT", "18"))
 PYTEST_IPYWIDGETS_SOLARA_APP_WAIT_TIMEOUT = int(os.environ.get("PYTEST_IPYWIDGETS_SOLARA_APP_WAIT_TIMEOUT", "10"))

solara/toestand.py

@@ -313,6 +313,10 @@ class KernelStore(ValueBase[S], ABC):
 
     def set(self, value: S):
         scope_dict, scope_id = self._get_dict()
+        if not solara.settings.main.allow_global_context and scope_id == "global":
+            raise RuntimeError(
+                f"No kernel context found, and global context is not allowed for task, context key was {solara.server.kernel_context.get_current_thread_key()}"
+            )
         old = self.get()
         if self.equals(old, value):
             return

{solara_ui-1.53.0.dist-info → solara_ui-1.55.0.dist-info}/METADATA

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

{solara_ui-1.53.0.dist-info → solara_ui-1.55.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=PW82ZYvLg6MTedeafdqhKEUYnVYaBHzpcqIJTlt_WwU,3647
+solara/__init__.py,sha256=EOkfX79MWzQHzuZpwOLafmVnS4mN76-eJGAk_ztvw18,3647
 solara/__main__.py,sha256=J_f3D_mgiNicU_ay_I-qn08GOViSXm04Ym0mopqh2Os,24853
 solara/_stores.py,sha256=N2Ec-61XNFXwigBx8f5QYPx7gDXenCOBdmLPXiJB45E,12320
 solara/alias.py,sha256=9vfLzud77NP8in3OID9b5mmIO8NyrnFjN2_aE0lSb1k,216
@@ -15,13 +15,13 @@ solara/express.py,sha256=R0E2ewwL0m09KdoDNhF_ZF5TnC7ytty5rzM8hDykpGk,6919
 solara/kitchensink.py,sha256=RUx3kW6CQAz9PMxB1sPI03IH5xJfsaaXq3w9bBuC6rg,249
 solara/layout.py,sha256=YSsORvn-76LrVSmElS39CBnetyUL9f4hLG_a_SdH_QM,1782
 solara/lifecycle.py,sha256=acUtft_KHj0ZOv2l-X3VcQdma1Tme70jkUp6li8mbH0,1404
-solara/minisettings.py,sha256=Ys0GdWo8i44HU8ILjesZ4PdTXlzkHQdlKxTO42ng8EA,4852
+solara/minisettings.py,sha256=dxhFZxYg-jBhyXzro8tUVjZNpb5Z0Kq_RpYBrn8eCEQ,4699
 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=uaauVf5zuVROWlU5KD_uoBEjy81YcpUtJhxcxX_Rs88,37197
-solara/toestand.py,sha256=NLX0s3D76spZQLQAsCRPZNlGi4DixIeVJTVpB-XKFGA,34068
+solara/settings.py,sha256=VeYkEdWeJePXldFvfdJteiiydWTqsNtpgsYscKm7lrA,2726
+solara/tasks.py,sha256=Wjb-0ExfW2lMbT40sYG3yEzUMLOHKKzHshCahBOELk8,37599
+solara/toestand.py,sha256=2fNxOFAg120yud4EmU2s8-aUx4N1D4T8VvdO6Oqi_4s,34357
 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
@@ -113,7 +113,7 @@ solara/server/fastapi.py,sha256=qVIHn0_Kxr6zWqcBWySu5nnJ6pNTSDqb4EHIh-cqH_8,93
 solara/server/flask.py,sha256=sjhtTMiAUJ7oacZeL0m3Qem6E6B2knJ0ly845Ayyjio,9645
 solara/server/jupytertools.py,sha256=cYFIUjLX7n0uuEXqWVWvmV6sV7R_MNg8ZZlabQgw8vk,1320
 solara/server/kernel.py,sha256=ZIcVI-wYhjDo1o05PBjkd-Am-5wZ8lAlf7luhz5-_L8,13449
-solara/server/kernel_context.py,sha256=C6ZIf7NTzDaQ2Z1tpDt0zcV0ZXsis2nUTKUQJ3F9Fh4,19168
+solara/server/kernel_context.py,sha256=nOgBgchZZmZpHpHtI6_JRpxgJApZ50eKVIOk_EnyXJo,20477
 solara/server/patch.py,sha256=KMoO3IK5sk-BWnwPNXhmGW4MGAgxGosgtUKMFf7oNm0,19902
 solara/server/qt.py,sha256=QdMxX2T0Ol_j3QHYwInDyT5Gy4sOhYljMPYfru5kwLg,3774
 solara/server/reload.py,sha256=BBH7QhrV1-e9RVyNE3uz1oPj1DagC3t_XSqGPNz0nJE,9747
@@ -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=nX3-METI4RU45-HMQwg-mEDxN5CKLTBl0QwILUcnbNU,3195
+solara/server/static/solara_bootstrap.py,sha256=RKkrTWa1-WGsLTkfcLZIZqI1mXHvxRBjlKiF-s4VjXM,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
@@ -179,7 +179,7 @@ solara/template/portal/solara_portal/pages/article/__init__.py,sha256=6PgHyyeK1_
 solara/template/portal/solara_portal/pages/viz/__init__.py,sha256=l65uqBpFJ6Uh5XytXhLMnR-8G4FBnjqJg86OJX7_LO0,2858
 solara/template/portal/solara_portal/pages/viz/overview.py,sha256=GPlzFxUR0LRQhR96a_CVWquGTjHhDehL1PR03Tcm3gs,365
 solara/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-solara/test/pytest_plugin.py,sha256=17waJlD9pHgTWHkCWN-WRzm7ejOLiUtsJui_LE4fX20,30126
+solara/test/pytest_plugin.py,sha256=M7_LQg4vf7ZHi-0HX8dRwbIEOehK-tx9Yz5v7qZLdkQ,30294
 solara/website/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 solara/website/utils.py,sha256=TfoExocZ8ko2hTcA7XDKI5FfKZ4gi3JTc_f9Oi5L7Fs,855
 solara/website/assets/custom.css,sha256=Qw_FZpAmPrus38TgYKmLmSgEYf6djWzO5pm2fF8kutk,9330
@@ -456,9 +456,9 @@ solara/widgets/vue/gridlayout.vue,sha256=LZk-YlqM7nv_7Y5TTq2xqfH1j2SLP1QOH5eiz7G
 solara/widgets/vue/html.vue,sha256=48K5rjp0AdJDeRV6F3nOHW3J0WXPeHn55r5pGClK2fU,112
 solara/widgets/vue/navigator.vue,sha256=3hhh2_sXpnsdM1vrs2nQ0bZHLCB10HhtQeYLS-tO85s,4790
 solara/widgets/vue/vegalite.vue,sha256=zhocRsUCNIRQCEbD16er5sYnuHU0YThatRHnorA3P18,4596
-solara_ui-1.53.0.data/data/etc/jupyter/jupyter_notebook_config.d/solara.json,sha256=3UhTBQi6z7F7pPjmqXxfddv79c8VGR9H7zStDLp6AwY,115
-solara_ui-1.53.0.data/data/etc/jupyter/jupyter_server_config.d/solara.json,sha256=D9J-rYxAzyD5GOqWvuPjacGUVFHsYtTfZ4FUbRzRvIA,113
-solara_ui-1.53.0.dist-info/METADATA,sha256=Ox2JiebnVW2eHcauEF_ps5NMBA0dap4OJGT--IlwoUs,7459
-solara_ui-1.53.0.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-solara_ui-1.53.0.dist-info/licenses/LICENSE,sha256=fFJUz-CWzZ9nEc4QZKu44jMEoDr5fEW-SiqljKpD82E,1086
-solara_ui-1.53.0.dist-info/RECORD,,
+solara_ui-1.55.0.data/data/etc/jupyter/jupyter_notebook_config.d/solara.json,sha256=3UhTBQi6z7F7pPjmqXxfddv79c8VGR9H7zStDLp6AwY,115
+solara_ui-1.55.0.data/data/etc/jupyter/jupyter_server_config.d/solara.json,sha256=D9J-rYxAzyD5GOqWvuPjacGUVFHsYtTfZ4FUbRzRvIA,113
+solara_ui-1.55.0.dist-info/METADATA,sha256=TI1NAM29BE5gmF1oBfwm_775SYrULb4JRuif0B7huWU,7459
+solara_ui-1.55.0.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
+solara_ui-1.55.0.dist-info/licenses/LICENSE,sha256=fFJUz-CWzZ9nEc4QZKu44jMEoDr5fEW-SiqljKpD82E,1086
+solara_ui-1.55.0.dist-info/RECORD,,