instaui 0.1.5__py3-none-any.whl → 0.1.6__py3-none-any.whl

instaui/static/templates/debug/sse.html

@@ -91,7 +91,7 @@
           toggleMessageBox(false)
           console.log('debug-sse connection opened');
           if (retryCount > 0) {
-            location.reload(true);
+            window.location.reload(true);
           }
         }
 

instaui/tailwind/_index.py

@@ -8,12 +8,12 @@ _V3_JS = _STATIC_DIR / "tailwindcss-v3.min.js"
 _V4_JS = _STATIC_DIR / "tailwindcss-v4.min.js"
 
 
-def use_tailwind(value=True, *, version: Literal["v3", "v4"] = "v4"):
+def use_tailwind(value=True, *, version: Literal["v3", "v4"] = "v3"):
     """Enable or disable Tailwind CSS.
 
     Args:
         value (bool, optional): Whether to enable or disable Tailwind CSS. Defaults to True.
-        version (Literal["v3", "v4"], optional): The version of Tailwind CSS to use. Defaults to "v4".
+        version (Literal["v3", "v4"], optional): The version of Tailwind CSS to use. Defaults to "v3".
     """
     js_file = _V3_JS if version == "v3" else _V4_JS
 

instaui/ui_functions/ui_page.py

@@ -2,7 +2,7 @@ from typing import Callable
 from instaui.launch_collector import get_launch_collector, PageInfo
 
 
-def page(url: str):
+def page(url: str = "/"):
     """Register a page route.
 
     Args:

instaui/vars/data.py

@@ -5,6 +5,7 @@ from typing import (
 )
 
 from instaui.common.jsonable import Jsonable
+from instaui.runtime._app import get_current_scope
 from instaui.vars.path_var import PathVar
 
 from .mixin_types.var_type import VarMixin
@@ -12,7 +13,6 @@ from .mixin_types.py_binding import CanInputMixin, CanOutputMixin
 from .mixin_types.element_binding import ElementBindingMixin
 from .mixin_types.pathable import CanPathPropMixin
 from .mixin_types.str_format_binding import StrFormatBindingMixin
-from . import _utils
 
 
 class ConstData(
@@ -25,18 +25,19 @@ class ConstData(
     StrFormatBindingMixin,
     ElementBindingMixin,
 ):
-    VAR_TYPE = "data"
+    BIND_TYPE = "var"
 
     def __init__(self, value: Any = None) -> None:
         self.value = value  # type: ignore
 
-        sid, id = _utils.register_var(self)
-        self._sid = sid
-        self._id = id
+        scope = get_current_scope()
+        scope.register_data(self)
+        self._sid = scope.id
+        self._id = scope.generate_vars_id()
 
     def __to_binding_config(self):
         return {
-            "type": self.VAR_TYPE,
+            "type": self.BIND_TYPE,
             "id": self._id,
             "sid": self._sid,
         }
@@ -60,7 +61,6 @@ class ConstData(
         data = super()._to_json_dict()
         data["sid"] = self._sid
         data["id"] = self._id
-        data["type"] = self.VAR_TYPE
 
         return data
 

instaui/vars/element_ref.py

@@ -6,12 +6,10 @@ from instaui.vars.mixin_types.py_binding import CanOutputMixin
 
 class ElementRef(Jsonable, CanOutputMixin):
     def __init__(self) -> None:
-        self._id = None
+        scope = get_current_scope()
+        self._id = scope.generate_element_ref_id()
         self.__sid = get_current_scope().id
 
-    def _set_id(self, id: str):
-        self._id = id
-
     def __to_binding_config(
         self,
     ):

instaui/vars/js_computed.py

@@ -3,6 +3,7 @@ import typing
 
 from instaui.common.jsonable import Jsonable
 
+from instaui.runtime._app import get_current_scope
 from instaui.vars.path_var import PathVar
 from instaui.vars.mixin_types.var_type import VarMixin
 from instaui.vars.mixin_types.element_binding import ElementBindingMixin
@@ -13,8 +14,6 @@ from instaui.vars.mixin_types.observable import ObservableMixin
 from instaui.vars.mixin_types.common_type import TObservableInput
 from instaui._helper import observable_helper
 
-from . import _utils
-
 
 class JsComputed(
     Jsonable,
@@ -26,8 +25,7 @@ class JsComputed(
     StrFormatBindingMixin,
     ElementBindingMixin,
 ):
-    VAR_TYPE = "jsComputed"
-    BIND_TYPE = "computed"
+    BIND_TYPE = "var"
 
     def __init__(
         self,
@@ -38,9 +36,10 @@ class JsComputed(
     ) -> None:
         self.code = code
 
-        sid, id = _utils.register_var(self)
-        self._sid = sid
-        self._id = id
+        scope = get_current_scope()
+        scope.register_js_computed(self)
+        self._sid = scope.id
+        self._id = scope.generate_vars_id()
 
         self._inputs, self._is_slient_inputs, self._is_data = (
             observable_helper.analyze_observable_inputs(list(inputs or []))
@@ -75,7 +74,6 @@ class JsComputed(
 
         data["sid"] = self._sid
         data["id"] = self._id
-        data["type"] = self.VAR_TYPE
 
         if self._inputs:
             data["inputs"] = self._inputs

instaui/vars/ref.py

@@ -9,6 +9,7 @@ from typing import (
 )
 
 from instaui.common.jsonable import Jsonable
+from instaui.runtime._app import get_current_scope
 from instaui.vars.path_var import PathVar
 
 from .mixin_types.var_type import VarMixin
@@ -17,7 +18,6 @@ from .mixin_types.observable import ObservableMixin
 from .mixin_types.element_binding import ElementBindingMixin
 from .mixin_types.pathable import CanPathPropMixin
 from .mixin_types.str_format_binding import StrFormatBindingMixin
-from . import _utils
 
 
 _T_Value = TypeVar("_T_Value")
@@ -35,14 +35,15 @@ class Ref(
     ElementBindingMixin[_T_Value],
     Generic[_T_Value],
 ):
-    VAR_TYPE = "ref"
+    VAR_TYPE = "var"
 
     def __init__(self, value: Optional[_T_Value] = None) -> None:
         self.value = value  # type: ignore
+        scope = get_current_scope()
+        scope.register_ref(self)
 
-        sid, id = _utils.register_var(self)
-        self._sid = sid
-        self._id = id
+        self._sid = scope.id
+        self._id = scope.generate_vars_id()
         self._debounced = None
 
     def debounced(self, secounds: float):
@@ -78,7 +79,6 @@ class Ref(
         data = super()._to_json_dict()
         data["sid"] = self._sid
         data["id"] = self._id
-        data["type"] = self.VAR_TYPE
 
         if self._debounced is not None:
             data["debounced"] = self._debounced

instaui/vars/vue_computed.py

@@ -3,6 +3,7 @@ from typing import Any, Dict, Mapping, Optional, Union
 
 from instaui.common.jsonable import Jsonable
 
+from instaui.runtime._app import get_current_scope
 from instaui.vars.path_var import PathVar
 from instaui.vars.mixin_types.var_type import VarMixin
 from instaui.vars.mixin_types.element_binding import ElementBindingMixin
@@ -10,7 +11,6 @@ from instaui.vars.mixin_types.py_binding import CanInputMixin
 from instaui.vars.mixin_types.pathable import CanPathPropMixin
 from instaui.vars.mixin_types.str_format_binding import StrFormatBindingMixin
 from instaui.vars.mixin_types.observable import ObservableMixin
-from . import _utils
 
 
 class VueComputed(
@@ -23,8 +23,7 @@ class VueComputed(
     StrFormatBindingMixin,
     ElementBindingMixin,
 ):
-    VAR_TYPE = "vComputed"
-    BIND_TYPE = "computed"
+    BIND_TYPE = "var"
 
     def __init__(
         self,
@@ -32,10 +31,11 @@ class VueComputed(
         bindings: Optional[Mapping[str, Union[ElementBindingMixin, Any]]] = None,
     ) -> None:
         self.code = fn_code
+        scope = get_current_scope()
+        scope.register_vue_computed(self)
 
-        sid, id = _utils.register_var(self)
-        self._sid = sid
-        self._id = id
+        self._sid = scope.id
+        self._id = scope.generate_vars_id()
 
         if bindings:
             const_bind = []
@@ -75,7 +75,6 @@ class VueComputed(
         data = super()._to_json_dict()
         data["sid"] = self._sid
         data["id"] = self._id
-        data["type"] = self.VAR_TYPE
         return data
 
 

instaui/vars/web_computed.py

@@ -41,7 +41,7 @@ class WebComputed(
     ElementBindingMixin[R],
     Generic[P, R],
 ):
-    VAR_TYPE = "webComputed"
+    BIND_TYPE = "var"
 
     def __init__(
         self,
@@ -84,7 +84,6 @@ class WebComputed(
 
         data["id"] = self._id
         data["sid"] = self._sid
-        data["type"] = self.VAR_TYPE
 
         if self._inputs:
             data["inputs"] = self._inputs
@@ -114,7 +113,7 @@ class WebComputed(
 
     def __to_binding_config(self):
         return {
-            "type": self.VAR_TYPE,
+            "type": self.BIND_TYPE,
             "id": self._id,
             "sid": self._sid,
         }

instaui/watch/vue_watch.py

@@ -33,17 +33,33 @@ class VueWatch(Jsonable):
 
         self.code = callback
 
-        if isinstance(sources, Sequence):
-            self.on = [
-                cast(ObservableMixin, varObj)._to_observable_config()
-                for varObj in sources
-            ]
-        else:
-            self.on = cast(ObservableMixin, sources)._to_observable_config()
+        if not isinstance(sources, Sequence):
+            sources = [sources]
+
+        onData = [int(not isinstance(varObj, ObservableMixin)) for varObj in sources]
+
+        if sum(onData) > 0:
+            self.onData = onData
+
+        self.on = [
+            cast(ObservableMixin, varObj)._to_observable_config()
+            if isinstance(varObj, ObservableMixin)
+            else varObj
+            for varObj in sources
+        ]
 
         if bindings:
+            bindData = [
+                int(not isinstance(v, ObservableMixin)) for v in bindings.values()
+            ]
+
+            if sum(bindData) > 0:
+                self.bindData = bindData
+
             self.bind = {
                 k: cast(ObservableMixin, v)._to_observable_config()
+                if isinstance(v, ObservableMixin)
+                else v
                 for k, v in bindings.items()
             }
 

instaui/zero/scope.py

@@ -45,7 +45,7 @@ class Wrapper:
 
 
 def _create_debug_report(model: ZeroTemplateModel, result_html_str: str):
-    from instaui import ui, html, daisyui as daisy
+    from instaui import ui, html, arco
 
     no_exists_path_class = "ex-no-exists-path"
 
@@ -53,7 +53,7 @@ def _create_debug_report(model: ZeroTemplateModel, result_html_str: str):
         return "" if path.exists() else no_exists_path_class
 
     ui.use_tailwind()
-    daisy.use()
+
     ui.add_style(rf".{no_exists_path_class} {{background-color: red;color: white;}}")
 
     html_size = len(result_html_str.encode("utf-8")) / 1024 / 1024
@@ -78,24 +78,7 @@ def _create_debug_report(model: ZeroTemplateModel, result_html_str: str):
             if isinstance(url, Path) and url.is_file():
                 rows.append([name, str(url)])
 
-        daisy.table(columns=["name", "path"], rows=rows)
-
-        # with ui.grid(columns="auto 1fr").classes(box_style):
-        #     html.span("name")
-        #     html.span("path")
-
-        #     html.span("vue")
-        #     html.span(str(model.vue_js_code))
-
-        #     html.span("instaui")
-        #     html.span(str(model.instaui_js_code))
-
-        #     for name, url in model.extra_import_maps.items():
-        #         if isinstance(url, Path) and url.is_file():
-        #             html.span(name)
-        #             html.span(str(url.resolve().absolute())).classes(
-        #                 _path_exists_class(url)
-        #             )
+        arco.table(columns=["name", "path"], data=rows)
 
         # css links
         html.paragraph("css links")

{instaui-0.1.5.dist-info → instaui-0.1.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: instaui
-Version: 0.1.5
+Version: 0.1.6
 Summary: insta-ui is a Python-based UI library for rapidly building user interfaces.
 License: MIT
 Author: CrystalWindSnake
@@ -16,15 +16,16 @@ Classifier: Programming Language :: Python :: 3.12
 Provides-Extra: all
 Provides-Extra: web
 Provides-Extra: webview
-Requires-Dist: fastapi ; extra == "web"
+Requires-Dist: fastapi[standard] ; extra == "all"
+Requires-Dist: fastapi[standard] ; extra == "web"
 Requires-Dist: jinja2 (>=3.1.4,<4.0.0)
 Requires-Dist: orjson (>=3.10.15,<4.0.0)
 Requires-Dist: pydantic (>=2.10.6,<3.0.0)
+Requires-Dist: pywebview ; extra == "all"
 Requires-Dist: pywebview ; extra == "webview"
 Requires-Dist: typing-extensions (>=4.12.2,<5.0.0)
+Requires-Dist: uvicorn ; extra == "all"
 Requires-Dist: uvicorn ; extra == "web"
-Requires-Dist: web ; extra == "all"
-Requires-Dist: webview ; extra == "all"
 Description-Content-Type: text/markdown
 
 # insta-ui