instaui 0.1.3__py3-none-any.whl → 0.1.5__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/template/zero_template.py

@@ -52,51 +52,52 @@ class ZeroTemplateModel:
         return dumps(data)
 
     def normalize_path_with_self(self):
-        self.vue_js_code = self._normalize_path_to_dataurl(self.vue_js_code, _JS_PREFIX)
-        self.instaui_js_code = self._normalize_path_to_dataurl(
+        self.vue_js_code = _normalize_path_to_dataurl(self.vue_js_code, _JS_PREFIX)
+        self.instaui_js_code = _normalize_path_to_dataurl(
             self.instaui_js_code, _JS_PREFIX
         )
 
         self.css_links = [
-            self._normalize_path_to_dataurl(link, _CSS_PREFIX)
+            _normalize_path_to_dataurl(link, _CSS_PREFIX)
             for link in self.css_links
+            if isinstance(link, str) or (isinstance(link, Path) and link.is_file())
         ]
 
         self.js_links = [
             JsLink(
-                link=self._normalize_path_to_dataurl(link.link, _JS_PREFIX),
+                link=_normalize_path_to_dataurl(link.link, _JS_PREFIX),
                 attrs=link.attrs,
             )
             for link in self.js_links
         ]
 
         self.extra_import_maps = {
-            k: self._normalize_path_to_dataurl(v, _JS_PREFIX)
+            k: _normalize_path_to_dataurl(v, _JS_PREFIX)
             for k, v in self.extra_import_maps.items()
         }
 
         self.vue_app_component = [
             ZeroVueAppComponent(
                 name=component.name,
-                url=self._normalize_path_to_dataurl(component.url, _JS_PREFIX),
+                url=_normalize_path_to_dataurl(component.url, _JS_PREFIX),
             )
             for component in self.vue_app_component
         ]
 
-        self.favicon = self._normalize_path_to_base64_url(self.favicon, _ICON_PREFIX)
+        self.favicon = _normalize_path_to_base64_url(self.favicon, _ICON_PREFIX)  # type: ignore
 
-    @staticmethod
-    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_dataurl(path: typing.Union[str, Path], prefix: str):
+    if isinstance(path, Path):
+        path = path.read_text(encoding="utf-8")
 
-    @staticmethod
-    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')}"
+    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')}"
 
 
 def render_zero_html(model: ZeroTemplateModel) -> str:

instaui/ui/__build_init.py

@@ -0,0 +1,73 @@
+from pathlib import Path
+from typing import List
+
+
+PYI_FILE = Path(__file__).parent / "__init__.pyi"
+INIT_FILE = Path(__file__).parent / "__init__.py"
+
+MARK_ALL = "# -- __all__"
+MARK_STATIC_IMPORTS = "# -- static imports"
+MARK_DYNAMIC_IMPORTS = "# -- dynamic imports"
+
+LAZY_MODULE_IMPORT = "from instaui.systems.module_system import LazyModule"
+
+
+def create_init_file():
+    all_part_lines, static_lines, dynamic_lines = _split_by_marks(
+        PYI_FILE, [MARK_ALL, MARK_STATIC_IMPORTS, MARK_DYNAMIC_IMPORTS]
+    )
+
+    # first line is comment, skip it
+    dynamic_lines = [
+        _conver_dynamic(line) for line in dynamic_lines[1:] if line.strip()
+    ]
+
+    with open(INIT_FILE, "w", encoding="utf-8") as f:
+        f.writelines("\n".join(all_part_lines))
+        f.write("\n")
+        f.writelines("\n".join(static_lines))
+        f.write("\n")
+
+        f.writelines(
+            "\n".join([MARK_DYNAMIC_IMPORTS, LAZY_MODULE_IMPORT, *dynamic_lines])
+        )
+
+    print(f"Create {INIT_FILE} success.")
+
+
+def _split_by_marks(file: Path, marks: List[str]):
+    with open(file, "r", encoding="utf-8") as f:
+        lines = f.read().splitlines()
+
+    marks_index = [lines.index(mark) for mark in marks]
+    marks_index.append(len(lines))
+
+    return [
+        lines[marks_index[i] : marks_index[i + 1]] for i in range(len(marks_index) - 1)
+    ]
+
+
+def _conver_dynamic(dynamic_code: str):
+    # "from instaui.components.highlight_code.code import Code as code" convert to "code = LazyModule('instaui.components.highlight_code.code', 'Code')"
+
+    # instaui.components.highlight_code.code
+    from_part = dynamic_code.split("import")[0][5:].strip()
+
+    # Code as code
+    import_part = dynamic_code.split("import")[1].strip()
+    has_as = " as " in import_part
+
+    member_name = ""
+    alias_name = ""
+
+    if has_as:
+        member_name, alias_name = import_part.split(" as ")
+    else:
+        member_name = import_part
+        alias_name = member_name
+
+    return f"{alias_name} = LazyModule('{from_part}', '{member_name}')"
+
+
+if __name__ == "__main__":
+    create_init_file()

instaui/ui/__init__.py

@@ -1,61 +1,4 @@
-from instaui.version import __version__
-from instaui.vars import TMaybeRef
-from instaui.vars.ref import ref, TRef
-
-from instaui.vars.data import ConstData as data, TConstData
-from instaui.vars.js_computed import JsComputed as js_computed, TJsComputed
-from instaui.vars.vue_computed import VueComputed as vue_computed, TVueComputed
-from instaui.vars.web_computed import web_computed as computed, TComputed
-from instaui.vars.state import state, StateModel
-from instaui.inject import inject_state, provide_state, injection_key
-from instaui.vars.vfor_item import TVForItem, TVForIndex
-from instaui.vars.element_ref import ElementRef as element_ref, run_element_method
-from instaui.html_tools import (
-    to_json,
-    add_css_link,
-    add_js_link,
-    add_style,
-    add_js_code,
-    add_vue_app_use,
-    to_config_data,
-    use_tailwind,
-    use_page_title,
-)
-
-from instaui.components.element import Element as element
-from instaui.components.row import Row as row
-from instaui.components.column import Column as column
-from instaui.components.grid import Grid as grid
-from instaui.components.directive import Directive as directive
-from instaui.components.vfor import VFor as vfor
-from instaui.components.vif import VIf as vif
-from instaui.components.match import Match as match
-from instaui.components.content import Content as content
-
-from instaui.event.web_event import ui_event as event, WebEvent as TEventFn
-from instaui.event.js_event import js_event
-from instaui.vars.event_context import EventContext as event_context
-from instaui.runtime.context import get_context as context
-
-import instaui.js as js
-from instaui.watch.web_watch import watch
-from instaui.watch.vue_watch import VueWatch as vue_watch
-from instaui.watch.js_watch import js_watch
-from instaui.handlers.watch_handler import WatchState as TWatchState
-from instaui.skip import skip_output
-from instaui.ui_functions.input_slient_data import InputSilentData as slient
-from instaui.js.js_output import JsOutput as js_output
-import instaui.experimental as experimental
-
-
-from instaui.ui_functions.server import create_server as server
-from instaui.ui_functions.ui_page import page
-from instaui.ui_functions.url_location import UrlLocation as url_location
-from instaui.ui_functions.str_format import str_format
-from instaui.ui_functions.ui_types import TBindable, is_bindable
-
-from .events import on_page_request_lifespan
-
+# -- __all__
 __all__ = [
     "__version__",
     "TMaybeRef",
@@ -88,6 +31,7 @@ __all__ = [
     "content",
     "add_style",
     "add_css_link",
+    "remove_css_link",
     "add_js_code",
     "add_js_link",
     "add_vue_app_use",
@@ -117,4 +61,76 @@ __all__ = [
     "str_format",
     "url_location",
     "on_page_request_lifespan",
+    "webview",
+    "code",
+    "markdown",
+    "echarts",
+    "use_shadcn_classless",
 ]
+
+# -- static imports
+from instaui.version import __version__
+from instaui.vars import TMaybeRef
+from instaui.vars.ref import ref, TRef
+
+from instaui.vars.data import ConstData as data, TConstData
+from instaui.vars.js_computed import JsComputed as js_computed, TJsComputed
+from instaui.vars.vue_computed import VueComputed as vue_computed, TVueComputed
+from instaui.vars.web_computed import web_computed as computed, TComputed
+from instaui.vars.state import state, StateModel
+from instaui.inject import inject_state, provide_state, injection_key
+from instaui.vars.vfor_item import TVForItem, TVForIndex
+from instaui.vars.element_ref import ElementRef as element_ref, run_element_method
+from instaui.html_tools import (
+    to_json,
+    add_css_link,
+    remove_css_link,
+    add_js_link,
+    add_style,
+    add_js_code,
+    add_vue_app_use,
+    to_config_data,
+    use_tailwind,
+    use_page_title,
+)
+
+from instaui.components.element import Element as element
+from instaui.components.row import Row as row
+from instaui.components.column import Column as column
+from instaui.components.grid import Grid as grid
+from instaui.components.directive import Directive as directive
+from instaui.components.vfor import VFor as vfor
+from instaui.components.vif import VIf as vif
+from instaui.components.match import Match as match
+from instaui.components.content import Content as content
+
+from instaui.event.web_event import ui_event as event, WebEvent as TEventFn
+from instaui.event.js_event import js_event
+from instaui.vars.event_context import EventContext as event_context
+from instaui.runtime.context import get_context as context
+
+import instaui.js as js
+from instaui.watch.web_watch import watch
+from instaui.watch.vue_watch import VueWatch as vue_watch
+from instaui.watch.js_watch import js_watch
+from instaui.handlers.watch_handler import WatchState as TWatchState
+from instaui.skip import skip_output
+from instaui.ui_functions.input_slient_data import InputSilentData as slient
+from instaui.js.js_output import JsOutput as js_output
+import instaui.experimental as experimental
+
+from instaui.ui_functions.server import create_server as server
+from instaui.ui_functions.ui_page import page
+from instaui.ui_functions.url_location import UrlLocation as url_location
+from instaui.ui_functions.str_format import str_format
+from instaui.ui_functions.ui_types import TBindable, is_bindable
+
+from .events import on_page_request_lifespan
+
+# -- dynamic imports
+from instaui.systems.module_system import LazyModule
+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

@@ -0,0 +1,135 @@
+# -- __all__
+__all__ = [
+    "__version__",
+    "TMaybeRef",
+    "TBindable",
+    "is_bindable",
+    "ref",
+    "slient",
+    "data",
+    "TConstData",
+    "TRef",
+    "vue_computed",
+    "TVueComputed",
+    "js_computed",
+    "TJsComputed",
+    "computed",
+    "TComputed",
+    "state",
+    "StateModel",
+    "inject_state",
+    "provide_state",
+    "injection_key",
+    "TVForItem",
+    "TVForIndex",
+    "element_ref",
+    "run_element_method",
+    "to_json",
+    "to_config_data",
+    "element",
+    "vfor",
+    "content",
+    "add_style",
+    "add_css_link",
+    "remove_css_link",
+    "add_js_code",
+    "add_js_link",
+    "add_vue_app_use",
+    "use_tailwind",
+    "use_page_title",
+    "directive",
+    "vif",
+    "page",
+    "event",
+    "js_event",
+    "event_context",
+    "TEventFn",
+    "server",
+    "context",
+    "row",
+    "grid",
+    "js",
+    "watch",
+    "vue_watch",
+    "js_watch",
+    "TWatchState",
+    "match",
+    "column",
+    "experimental",
+    "skip_output",
+    "js_output",
+    "str_format",
+    "url_location",
+    "on_page_request_lifespan",
+    "webview",
+    "code",
+    "markdown",
+    "echarts",
+    "use_shadcn_classless",
+]
+
+# -- static imports
+from instaui.version import __version__
+from instaui.vars import TMaybeRef
+from instaui.vars.ref import ref, TRef
+
+from instaui.vars.data import ConstData as data, TConstData
+from instaui.vars.js_computed import JsComputed as js_computed, TJsComputed
+from instaui.vars.vue_computed import VueComputed as vue_computed, TVueComputed
+from instaui.vars.web_computed import web_computed as computed, TComputed
+from instaui.vars.state import state, StateModel
+from instaui.inject import inject_state, provide_state, injection_key
+from instaui.vars.vfor_item import TVForItem, TVForIndex
+from instaui.vars.element_ref import ElementRef as element_ref, run_element_method
+from instaui.html_tools import (
+    to_json,
+    add_css_link,
+    remove_css_link,
+    add_js_link,
+    add_style,
+    add_js_code,
+    add_vue_app_use,
+    to_config_data,
+    use_tailwind,
+    use_page_title,
+)
+
+from instaui.components.element import Element as element
+from instaui.components.row import Row as row
+from instaui.components.column import Column as column
+from instaui.components.grid import Grid as grid
+from instaui.components.directive import Directive as directive
+from instaui.components.vfor import VFor as vfor
+from instaui.components.vif import VIf as vif
+from instaui.components.match import Match as match
+from instaui.components.content import Content as content
+
+from instaui.event.web_event import ui_event as event, WebEvent as TEventFn
+from instaui.event.js_event import js_event
+from instaui.vars.event_context import EventContext as event_context
+from instaui.runtime.context import get_context as context
+
+import instaui.js as js
+from instaui.watch.web_watch import watch
+from instaui.watch.vue_watch import VueWatch as vue_watch
+from instaui.watch.js_watch import js_watch
+from instaui.handlers.watch_handler import WatchState as TWatchState
+from instaui.skip import skip_output
+from instaui.ui_functions.input_slient_data import InputSilentData as slient
+from instaui.js.js_output import JsOutput as js_output
+import instaui.experimental as experimental
+
+from instaui.ui_functions.server import create_server as server
+from instaui.ui_functions.ui_page import page
+from instaui.ui_functions.url_location import UrlLocation as url_location
+from instaui.ui_functions.str_format import str_format
+from instaui.ui_functions.ui_types import TBindable, is_bindable
+
+from .events import on_page_request_lifespan
+
+# -- dynamic imports
+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/events.py

@@ -8,7 +8,7 @@ def on_page_request_lifespan(fn: Callable):
     Args:
         fn (Callable): A function to be called on each page request.
 
-    Example:
+    Examples:
     .. code-block:: python
         @ui.on_page_request_lifespan
         def _():

instaui/ui_functions/server.py

@@ -1,8 +1,10 @@
+from typing import Union
 from instaui.runtime.context import get_context
 
 
 def create_server(
     debug: bool = True,
+    use_gzip: Union[int, bool] = True,
 ):
     from instaui.fastapi_server.server import Server
 
@@ -10,4 +12,4 @@ def create_server(
     context._app_mode = "web"
     context._debug_mode = debug
 
-    return Server.get_instance()
+    return Server(use_gzip=use_gzip)

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/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")
 
@@ -70,47 +73,44 @@ 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
+        data["type"] = self.VAR_TYPE
 
-            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 {

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)