solara-ui 1.51.0__py3-none-any.whl → 1.52.0__py3-none-any.whl

solara/__init__.py

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

solara/__main__.py

@@ -13,7 +13,7 @@ import rich
 import rich_click as click
 import uvicorn
 from rich import print as rprint
-from uvicorn.main import LEVEL_CHOICES, LOOP_CHOICES
+from uvicorn.main import LEVEL_CHOICES
 
 import solara
 from solara.server import settings
@@ -242,9 +242,9 @@ if "SOLARA_MODE" in os.environ:
 @click.argument("app")
 @click.option(
     "--loop",
-    type=LOOP_CHOICES,
+    type=str,
     default="auto",
-    help="Event loop implementation.",
+    help="Event loop implementation (see uvicorn documentation for possible values).",
     show_default=True,
 )
 @click.option(

solara/components/component_vue.py

@@ -12,17 +12,32 @@ import solara
 
 P = typing_extensions.ParamSpec("P")
 
-
-def _widget_from_signature(classname, base_class: Type[widgets.Widget], func: Callable[..., None], event_prefix: str) -> Type[widgets.Widget]:
+default_to_json = widgets.widget_serialization["to_json"]
+default_from_json = widgets.widget_serialization["from_json"]
+
+
+def _widget_from_signature(
+    classname,
+    base_class: Type[widgets.Widget],
+    func: Callable[..., None],
+    event_prefix: str,
+    tags: Dict[str, Any],
+    to_json: Dict[str, Callable[[Any, widgets.Widget], Any]],
+    from_json: Dict[str, Callable[[Any, widgets.Widget], Any]],
+) -> Type[widgets.Widget]:
     classprops: Dict[str, Any] = {}
 
     parameters = inspect.signature(func).parameters
     for name, param in parameters.items():
         if name.startswith("event_"):
             event_name = name[6:]
+            event_name_full = name  # LLM's are quick stubborn in wanting to call `event_foo` instead of `foo`
 
             def event_handler(self, data, buffers=None, event_name=event_name, param=param):
                 callback = self._event_callbacks.get(event_name, param.default)
+                if not callback:
+                    # support 'event_foo'
+                    callback = self._event_callbacks.get(event_name_full, None)
                 if callback:
                     if buffers:
                         callback(data, buffers)
@@ -30,6 +45,7 @@ def _widget_from_signature(classname, base_class: Type[widgets.Widget], func: Ca
                         callback(data)
 
             classprops[f"vue_{event_name}"] = event_handler
+            classprops[f"vue_{event_name_full}"] = event_handler
         elif name.startswith("on_") and name[3:] in parameters:
             # callback, will be handled by reacton
             continue
@@ -38,7 +54,9 @@ def _widget_from_signature(classname, base_class: Type[widgets.Widget], func: Ca
                 trait = traitlets.Any()
             else:
                 trait = traitlets.Any(default_value=param.default)
-            classprops[name] = trait.tag(sync=True, **widgets.widget_serialization)
+            tag = dict(sync=True, to_json=to_json.get(name, default_to_json), from_json=from_json.get(name, default_from_json))
+            tag.update(**tags.get(name, {}))
+            classprops[name] = trait.tag(**tag)
     # maps event_foo to a callable
     classprops["_event_callbacks"] = traitlets.Dict(default_value={})
 
@@ -46,7 +64,13 @@ def _widget_from_signature(classname, base_class: Type[widgets.Widget], func: Ca
     return widget_class
 
 
-def _widget_vue(vue_path: str, vuetify=True) -> Callable[[Callable[P, None]], Type[v.VuetifyTemplate]]:
+def _widget_vue(
+    vue_path: str,
+    vuetify=True,
+    to_json: Dict[str, Callable[[Any, widgets.Widget], Any]] = {},
+    from_json: Dict[str, Callable[[Any, widgets.Widget], Any]] = {},
+    tags: Dict[str, Any] = {},
+) -> Callable[[Callable[P, None]], Type[v.VuetifyTemplate]]:
     def decorator(func: Callable[P, None]):
         class VuetifyWidgetSolara(v.VuetifyTemplate):
             template_file = (os.path.abspath(inspect.getfile(func)), vue_path)
@@ -55,14 +79,20 @@ def _widget_vue(vue_path: str, vuetify=True) -> Callable[[Callable[P, None]], Ty
             template_file = (os.path.abspath(inspect.getfile(func)), vue_path)
 
         base_class = VuetifyWidgetSolara if vuetify else VueWidgetSolara
-        widget_class = _widget_from_signature("VueWidgetSolaraSub", base_class, func, "vue_")
+        widget_class = _widget_from_signature("VueWidgetSolaraSub", base_class, func, "vue_", to_json=to_json, from_json=from_json, tags=tags)
 
         return widget_class
 
     return decorator
 
 
-def component_vue(vue_path: str, vuetify=True) -> Callable[[Callable[P, None]], Callable[P, solara.Element]]:
+def component_vue(
+    vue_path: str,
+    vuetify=True,
+    tags: Dict[str, Any] = {},
+    to_json: Dict[str, Callable[[Any, widgets.Widget], Any]] = {},
+    from_json: Dict[str, Callable[[Any, widgets.Widget], Any]] = {},
+) -> Callable[[Callable[P, None]], Callable[P, solara.Element]]:
     """Decorator to create a component backed by a Vue template.
 
     Although many components can be made from the Python side, sometimes it is easier to write components using Vue directly.
@@ -74,14 +104,22 @@ def component_vue(vue_path: str, vuetify=True) -> Callable[[Callable[P, None]],
     are assumed by refer to the same vue property, with `on_foo` being the event handler when `foo` changes from
     the vue template.
 
-    Arguments or the form `event_foo` should be callbacks that can be called from the vue template. They are
-    available as the function `foo` in the vue template.
+    Arguments of the form `event_foo` should be callbacks that can be called from the vue template. They are
+    available as the function `foo` and `event_foo` in the vue template.
+
+    Note that `foo` was kept for backwards compatibility, but LLM's have a tendency to use `event_foo`, so this was
+    changed to `event_foo`.
 
     [See the vue v2 api](https://v2.vuejs.org/v2/api/) for more information on how to use Vue, like `watch`,
     `methods` and lifecycle hooks such as `mounted` and `destroyed`.
 
     See the [Vue component example](/documentation/examples/general/vue_component) for an example of how to use this decorator.
 
+    The underlying trait can be passed extra arguments by passing a dictionary to the `tags` argument.
+    The most common case is to pass a custom serializer and deserializer for the trait, for which we added the
+    strictly typed `to_json` and `from_json` arguments.
+    Otherwise pass a dictionary to the `tags` argument, see the example below for more details.
+
 
     ## Examples
 
@@ -105,6 +143,28 @@ def component_vue(vue_path: str, vuetify=True) -> Callable[[Callable[P, None]],
         pass
     ```
 
+    ## Example with custom serializer and deserializer
+
+    ```python
+    import solara
+
+    def to_json_datetime(value: datetime.date, widget: widgets.Widget) -> str:
+        return value.isoformat()
+
+    def from_json_datetime(value: str, widget: widgets.Widget) -> datetime.date:
+        return datetime.date.fromisoformat(value)
+
+    @solara.component_vue("my_date_component.vue", to_json={"month": to_json_datetime}, from_json={"month": from_json_datetime})
+    def MyDateComponent(month: datetime.date, event_date_clicked: Callable):
+        pass
+
+    # the following will be the same, except that it is less strictly typed
+    @solara.component_vue("my_date_component.vue", tags={"month": {"to_json": to_json_datetime, "from_json": from_json_datetime}})
+    def MyDateComponentSame(month: datetime.date, event_date_clicked: Callable):
+        pass
+
+    ```
+
     ## Arguments
 
      * `vue_path`: The path to the Vue template file.
@@ -113,7 +173,7 @@ def component_vue(vue_path: str, vuetify=True) -> Callable[[Callable[P, None]],
     """
 
     def decorator(func: Callable[P, None]):
-        VueWidgetSolaraSub = _widget_vue(vue_path, vuetify=vuetify)(func)
+        VueWidgetSolaraSub = _widget_vue(vue_path, vuetify=vuetify, to_json=to_json, from_json=from_json, tags=tags)(func)
 
         def wrapper(*args, **kwargs):
             event_callbacks = {}

solara/server/patch.py

@@ -280,7 +280,7 @@ def WidgetContextAwareThread__init__(self, *args, **kwargs):
     self.current_context = None
     # if we do this for the dummy threads, we got into a recursion
     # since threading.current_thread will call the _DummyThread constructor
-    if not ("name" in kwargs and "Dummy-" in kwargs["name"]):
+    if not ("name" in kwargs and kwargs["name"] is not None and "Dummy-" in kwargs["name"]):
         try:
             self.current_context = kernel_context.get_current_context()
         except RuntimeError:

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

{solara_ui-1.51.0.dist-info → solara_ui-1.52.0.dist-info}/METADATA

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

{solara_ui-1.51.0.dist-info → solara_ui-1.52.0.dist-info}/RECORD

@@ -1,7 +1,7 @@
 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=Zu6LSrb1qgfl7PM3VPEd1douEumLCzgLPZYpG8ZctT8,3647
-solara/__main__.py,sha256=pm79jfba-0ZapLR0PtwZfMeiTHrLz8kEt79EygRyXxQ,24828
+solara/__init__.py,sha256=jGGWxx4nmYVpvRhmbrndn2DjhoXKRW2YzMlbR4K2WqE,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
 solara/autorouting.py,sha256=iQ-jP5H-kdu1uZyLEFeiHG1IsOLZLzwKVtQPyXSgGSM,23093
@@ -33,7 +33,7 @@ solara/components/checkbox.py,sha256=MLQ9Hxvtv5aKLj4XO3ILWtGc6nKOUH560A2bBt0Z030
 solara/components/code_highlight_css.py,sha256=J0fZHuEu8jeEKAq_HKbzgiMR1-VwMVnKA4dAOKE0AQU,235
 solara/components/code_highlight_css.vue,sha256=UX4jtEetV1W25Uvu8xQ-TbEaBzbp_7DlXtXDO9SdZfY,5776
 solara/components/columns.py,sha256=zC4PVGMivHMn2jCaQoV_mmRBzaF12gRTeMqyuWANMyo,5544
-solara/components/component_vue.py,sha256=iFjmklw3uKkGPxnf5Hn6JQQ1Nw6sfAICLmkPYJEmbbE,5068
+solara/components/component_vue.py,sha256=feGM37HKJoZn4j0pQSAF14VIMjNaqsAatnrLVB7RisI,7675
 solara/components/cross_filter.py,sha256=Q5vOkerWXNCtRbSboHjXcnjoys8bHv5b7G_fH1A1lio,13663
 solara/components/dataframe.py,sha256=F-FdIjCj_rovstOVvZd3bwypKfshq3RXAF7FT2HLDVw,21032
 solara/components/datatable.py,sha256=CO3gutSQU8tc1AfvWVlZ5pQN3r1W-e3zXRc_dlP0AaA,8015
@@ -114,7 +114,7 @@ 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/patch.py,sha256=-00MlyWGIBw9tcDK9Cn0y-kWCI8LKP8sEsz-GAFKbgE,19871
+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
 solara/server/server.py,sha256=YbOVCeho_tmYC2xcrJTzDe62H_xTpwiMuqsBWvgN_2A,17125
@@ -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=ipORZbxyK8a73g8vTWiAjj2NbWY2hwoi83zRmMpuShQ,3195
+solara/server/static/solara_bootstrap.py,sha256=6YKf4K-kWml7p-4kMf-Np_0t0J5sy-iykgKjLBy4Ttc,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
@@ -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=7fkX-4_YSnnMIPUMKMvQVVEzrmhY9BFAYvHMqZqTXpI,4790
 solara/widgets/vue/vegalite.vue,sha256=zhocRsUCNIRQCEbD16er5sYnuHU0YThatRHnorA3P18,4596
-solara_ui-1.51.0.data/data/etc/jupyter/jupyter_notebook_config.d/solara.json,sha256=3UhTBQi6z7F7pPjmqXxfddv79c8VGR9H7zStDLp6AwY,115
-solara_ui-1.51.0.data/data/etc/jupyter/jupyter_server_config.d/solara.json,sha256=D9J-rYxAzyD5GOqWvuPjacGUVFHsYtTfZ4FUbRzRvIA,113
-solara_ui-1.51.0.dist-info/METADATA,sha256=Rov3kdktbmJl6EUOQ4vhpfN49M6xt5COtnu5cjoqb-g,7459
-solara_ui-1.51.0.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-solara_ui-1.51.0.dist-info/licenses/LICENSE,sha256=fFJUz-CWzZ9nEc4QZKu44jMEoDr5fEW-SiqljKpD82E,1086
-solara_ui-1.51.0.dist-info/RECORD,,
+solara_ui-1.52.0.data/data/etc/jupyter/jupyter_notebook_config.d/solara.json,sha256=3UhTBQi6z7F7pPjmqXxfddv79c8VGR9H7zStDLp6AwY,115
+solara_ui-1.52.0.data/data/etc/jupyter/jupyter_server_config.d/solara.json,sha256=D9J-rYxAzyD5GOqWvuPjacGUVFHsYtTfZ4FUbRzRvIA,113
+solara_ui-1.52.0.dist-info/METADATA,sha256=YF-I_zRKcTcOWk1SHMNA87shS-54AP6rne0AzXiCgto,7459
+solara_ui-1.52.0.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
+solara_ui-1.52.0.dist-info/licenses/LICENSE,sha256=fFJUz-CWzZ9nEc4QZKu44jMEoDr5fEW-SiqljKpD82E,1086
+solara_ui-1.52.0.dist-info/RECORD,,