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

instaui/template/_utils.py

@@ -0,0 +1,23 @@
+from __future__ import annotations
+import typing
+from pathlib import Path
+from urllib.parse import quote
+import base64
+
+
+_JS_PREFIX = "data:text/javascript;charset=utf-8"
+_CSS_PREFIX = "data:text/css;charset=utf-8"
+_ICON_PREFIX = "data:image/x-icon;base64"
+
+
+def normalize_path_to_dataurl(path: typing.Union[str, Path], prefix: str):
+    if isinstance(path, Path):
+        path = path.read_text(encoding="utf-8")
+
+    return f"{prefix},{quote(path)}"
+
+
+def normalize_path_to_base64_url(path: typing.Optional[Path], prefix: str):
+    if path is None:
+        return None
+    return f"{prefix},{base64.b64encode(path.read_bytes()).decode('utf-8')}"

instaui/template/webview_template.py

@@ -0,0 +1,50 @@
+from __future__ import annotations
+import typing
+from pathlib import Path
+from dataclasses import dataclass, field
+from instaui.common.jsonable import dumps
+from instaui.runtime.dataclass import JsLink
+from .env import env
+
+
+_html_template = env.get_template("webview.html")
+
+
+@dataclass(frozen=True)
+class WebViewVueAppComponent:
+    name: str
+    url: str
+
+
+@dataclass
+class WebViewTemplateModel:
+    vue_js_code: str
+    instaui_js_code: str
+    config_dict: typing.Dict[str, typing.Any] = field(default_factory=dict)
+    extra_import_maps: typing.Dict[str, str] = field(default_factory=dict)
+    css_links: typing.List[str] = field(default_factory=list)
+    style_tags: typing.List[str] = field(default_factory=list)
+    js_links: typing.List[str] = field(default_factory=list)
+    script_tags: typing.List[str] = field(default_factory=list)
+    vue_app_use: typing.List[str] = field(default_factory=list)
+    vue_app_component: typing.List[WebViewVueAppComponent] = field(default_factory=list)
+    title: typing.Optional[str] = None
+    favicon_url: typing.Optional[str] = None
+    on_app_mounted: typing.Optional[typing.Callable] = None
+
+    def add_extra_import_map(self, name: str, code: str):
+        self.extra_import_maps[name] = code
+
+    @property
+    def import_maps_string(self):
+        data = {
+            **self.extra_import_maps,
+            "vue": self.vue_js_code,
+            "instaui": self.instaui_js_code,
+        }
+
+        return dumps(data)
+
+
+def render_wbeview_html(model: WebViewTemplateModel) -> str:
+    return _html_template.render(model=model)

instaui/ui/__init__.py

@@ -61,8 +61,11 @@ __all__ = [
     "str_format",
     "url_location",
     "on_page_request_lifespan",
+    "webview",
     "code",
     "markdown",
+    "echarts",
+    "use_shadcn_classless",
 ]
 
 # -- static imports
@@ -126,5 +129,8 @@ from .events import on_page_request_lifespan
 
 # -- dynamic imports
 from instaui.systems.module_system import LazyModule
-code = LazyModule('instaui.components.highlight_code.code', 'Code')
-markdown = LazyModule('instaui.components.markdown.markdown', 'Markdown')
+code = LazyModule('instaui.components.shiki_code.shiki_code', 'Code')
+markdown = LazyModule('instaui.components.markdown.markdown', 'Markdown')
+webview = LazyModule('instaui.webview', 'WebviewWrapper')
+echarts = LazyModule('instaui.components.echarts.echarts', 'ECharts')
+use_shadcn_classless = LazyModule('instaui.shadcn_classless._index', 'use_shadcn_classless')

instaui/ui/__init__.pyi

@@ -61,8 +61,11 @@ __all__ = [
     "str_format",
     "url_location",
     "on_page_request_lifespan",
+    "webview",
     "code",
     "markdown",
+    "echarts",
+    "use_shadcn_classless",
 ]
 
 # -- static imports
@@ -125,5 +128,8 @@ from instaui.ui_functions.ui_types import TBindable, is_bindable
 from .events import on_page_request_lifespan
 
 # -- dynamic imports
-from instaui.components.highlight_code.code import Code as code
+from instaui.components.shiki_code.shiki_code import Code as code
 from instaui.components.markdown.markdown import Markdown as markdown
+from instaui.webview import WebviewWrapper as webview
+from instaui.components.echarts.echarts import ECharts as echarts
+from instaui.shadcn_classless._index import use_shadcn_classless

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/event_context.py

@@ -30,6 +30,10 @@ class EventContext(Jsonable, CanInputMixin):
     def e():
         return EventContext(":e => e")
 
+    @staticmethod
+    def target_value():
+        return EventContext(":e => e.target.value")
+
 
 class DatasetEventContext(Jsonable, CanInputMixin):
     def __init__(self, event_context: EventContext) -> None:

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

@@ -24,6 +24,9 @@ from instaui.vars.mixin_types.observable import ObservableMixin
 from instaui.vars.mixin_types.common_type import TObservableInput
 from instaui._helper import observable_helper
 
+_SYNC_TYPE = "sync"
+_ASYNC_TYPE = "async"
+
 P = ParamSpec("P")
 R = TypeVar("R")
 
@@ -38,7 +41,7 @@ class WebComputed(
     ElementBindingMixin[R],
     Generic[P, R],
 ):
-    VAR_TYPE = "webComputed"
+    BIND_TYPE = "var"
 
     def __init__(
         self,
@@ -70,51 +73,47 @@ class WebComputed(
 
         app = get_app_slot()
 
-        if app.mode == "web":
-            hkey = watch_handler.create_handler_key(
-                page_path=app.page_path,
-                handler=self._fn,
-            )
+        hkey = watch_handler.create_handler_key(
+            page_path=app.page_path,
+            handler=self._fn,
+        )
 
-            watch_handler.register_handler(hkey, self._fn, len(self._outputs) + 1)
+        watch_handler.register_handler(hkey, self._fn, len(self._outputs) + 1)
 
-            url = (
-                watch_handler.ASYNC_URL
-                if inspect.iscoroutinefunction(self._fn)
-                else watch_handler.SYNC_URL
-            )
+        # if app.mode == "web":
 
-            data["id"] = self._id
-            data["sid"] = self._sid
-            data["type"] = self.VAR_TYPE
+        data["id"] = self._id
+        data["sid"] = self._sid
 
-            if self._inputs:
-                data["inputs"] = self._inputs
+        if self._inputs:
+            data["inputs"] = self._inputs
 
-            if self._outputs:
-                data["outputs"] = self._outputs
+        if self._outputs:
+            data["outputs"] = self._outputs
 
-            if sum(self._is_slient_inputs) > 0:
-                data["slient"] = self._is_slient_inputs
+        if sum(self._is_slient_inputs) > 0:
+            data["slient"] = self._is_slient_inputs
 
-            if sum(self._is_data) > 0:
-                data["data"] = self._is_data
+        if sum(self._is_data) > 0:
+            data["data"] = self._is_data
 
-            data["url"] = url
-            data["key"] = hkey
-            if self._init_value is not None:
-                data["init"] = self._init_value
+        data["fType"] = (
+            _ASYNC_TYPE if inspect.iscoroutinefunction(self._fn) else _SYNC_TYPE
+        )
+        data["key"] = hkey
+        if self._init_value is not None:
+            data["init"] = self._init_value
 
-            if self._evaluating:
-                data["running"] = self._evaluating._to_output_config()
+        if self._evaluating:
+            data["running"] = self._evaluating._to_output_config()
 
-            return data
+        return data
 
-        return {}
+        # return {}
 
     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/watch/web_watch.py

@@ -13,6 +13,9 @@ from instaui.vars.mixin_types.py_binding import CanOutputMixin
 from instaui.vars.mixin_types.common_type import TObservableInput
 from instaui._helper import observable_helper
 
+_SYNC_TYPE = "sync"
+_ASYNC_TYPE = "async"
+
 P = ParamSpec("P")
 R = typing.TypeVar("R")
 
@@ -59,13 +62,9 @@ class WebWatch(Jsonable, typing.Generic[P, R]):
 
             watch_handler.register_handler(hkey, self._fn, len(self._outputs))
 
-            url = (
-                watch_handler.ASYNC_URL
-                if inspect.iscoroutinefunction(self._fn)
-                else watch_handler.SYNC_URL
+            data["fType"] = (
+                _ASYNC_TYPE if inspect.iscoroutinefunction(self._fn) else _SYNC_TYPE
             )
-
-            data["url"] = url
             data["key"] = hkey
             if self._inputs:
                 data["inputs"] = self._inputs

instaui/webview/__init__.py

@@ -0,0 +1 @@
+from .index import WebviewWrapper

instaui/webview/_utils.py

@@ -0,0 +1,8 @@
+from pathlib import Path
+import shutil
+
+
+def reset_dir(dir_path: Path):
+    if dir_path.exists():
+        shutil.rmtree(dir_path)
+    dir_path.mkdir(exist_ok=True)

instaui/webview/api.py

@@ -0,0 +1,72 @@
+from typing import Any, Dict
+
+
+from instaui.runtime._app import get_app_slot
+from instaui.handlers import watch_handler
+from instaui.handlers import event_handler
+from instaui.skip import is_skip_output
+
+
+class Api:
+    def watch_call(self, data: Dict):
+        hkey = data.pop("key")
+        handler_info = watch_handler.get_handler_info(hkey)
+        if handler_info is None:
+            return {"error": "watch handler not found"}
+
+        update_app_page_info(data)
+
+        result = handler_info.fn(
+            *handler_info.get_handler_args(_get_binds_from_data(data))
+        )
+        return response_data(handler_info.outputs_binding_count, result)
+
+    def event_call(self, data: Dict):
+        handler = event_handler.get_handler(data["hKey"])
+        if handler is None:
+            raise ValueError("event handler not found")
+
+        update_app_page_info(data)
+
+
+        args = [bind for bind in data.get("bind", [])]
+
+        result = handler.fn(*handler.get_handler_args(args))
+        return response_data(handler.outputs_binding_count, result)
+
+
+def update_app_page_info(data: Dict):
+    app = get_app_slot()
+
+    page_info = data.get("page", {})
+    app._page_path = page_info["path"]
+
+    if "params" in page_info:
+        app._page_params = page_info["params"]
+
+    if "queryParams" in page_info:
+        app._query_params = page_info["queryParams"]
+
+
+def _get_binds_from_data(data: Dict):
+    return data.get("input", [])
+
+
+def response_data(outputs_binding_count: int, result: Any):
+    data = {}
+    if outputs_binding_count > 0:
+        if not isinstance(result, tuple):
+            result = [result]
+
+        result_infos = [(r, int(is_skip_output(r))) for r in result]
+
+        if len(result_infos) == 1 and result_infos[0][1] == 1:
+            return data
+
+        data["values"] = [0 if info[1] == 1 else info[0] for info in result_infos]
+        skips = [info[1] for info in result_infos]
+
+        if sum(skips) > 0:
+            data["skips"] = skips
+
+    return data