instaui 0.2.0__py2.py3-none-any.whl → 0.2.1__py2.py3-none-any.whl

instaui/arco/components/input.py

@@ -15,7 +15,7 @@ class Input(Element):
         value: typing.Optional[TMaybeRef[str]] = None,
         **kwargs: Unpack[component_types.TInput],
     ):
-        tag = f"a-input{'-'+ self._exten_name if self._exten_name else ''}"
+        tag = f"a-input{'-' + self._exten_name if self._exten_name else ''}"
         super().__init__(tag)
         try_setup_vmodel(self, value)
         self.props(handle_props(kwargs))  # type: ignore

instaui/arco/components/typography.py

@@ -17,7 +17,7 @@ class Typography(Element):
         text: typing.Optional[TMaybeRef[str]] = None,
         **kwargs: Unpack[component_types.TTypography],
     ):
-        tag = f"a-typography{'-'+ self._exten_name if self._exten_name else ''}"
+        tag = f"a-typography{'-' + self._exten_name if self._exten_name else ''}"
         super().__init__(tag)
 
         if text is not None:

instaui/boot_info.py

@@ -11,14 +11,14 @@ _colors = {
 
 
 def zero_boot_info(file: Path):
-    message = f"""{_app_message('zero')}
+    message = f"""{_app_message("zero")}
 {_arrow_right()}file: {_with_color(str(file))}
 """
     print(message)
 
 
 def web_boot_info(ip: str):
-    message = f"""{_app_message('web')}
+    message = f"""{_app_message("web")}
 {_arrow_right()}Local: {_with_color(str(ip), "blue")}
 """
     print(message)

instaui/components/component.py

@@ -11,11 +11,14 @@ from instaui.runtime import (
     check_default_app_slot_or_error,
 )
 from instaui.components.slot import SlotManager
-from instaui.vars.mixin_types.element_binding import ElementBindingMixin
+from instaui.vars.mixin_types.element_binding import (
+    ElementBindingMixin,
+    ElementBindingProtocol,
+)
 
 
 class Component(Jsonable):
-    def __init__(self, tag: Optional[Union[str, ElementBindingMixin]] = None):
+    def __init__(self, tag: Optional[Union[str, ElementBindingProtocol]] = None):
         check_default_app_slot_or_error(
             "Not allowed to create element outside of ui.page"
         )

instaui/components/element.py

@@ -34,7 +34,10 @@ from .slot import SlotManager, Slot
 from instaui import consts
 from instaui.components.component import Component
 
-from instaui.vars.mixin_types.element_binding import ElementBindingMixin
+from instaui.vars.mixin_types.element_binding import (
+    ElementBindingMixin,
+    ElementBindingProtocol,
+)
 
 if TYPE_CHECKING:
     from instaui.event.event_mixin import EventMixin
@@ -79,7 +82,7 @@ class Element(Component):
     _default_classes: ClassVar[List[str]] = []
     _default_style: ClassVar[Dict[str, str]] = {}
 
-    def __init__(self, tag: Optional[Union[str, ElementBindingMixin]] = None):
+    def __init__(self, tag: Optional[Union[str, ElementBindingProtocol]] = None):
         if self.dependency:
             tag = self.dependency.tag_name or ""
 
@@ -100,7 +103,7 @@ class Element(Component):
         self._directives: Dict[Directive, None] = {}
 
         self._slot_manager = SlotManager()
-        self._element_ref: Optional[ElementRef] = None
+        self.__element_ref: Optional[ElementRef] = None
 
     def __init_subclass__(
         cls,
@@ -336,7 +339,7 @@ class Element(Component):
         self._directives[directive] = None
         return self
 
-    def display(self, value: Union[ElementBindingMixin[bool], bool]) -> Self:
+    def display(self, value: Union[ElementBindingProtocol, bool]) -> Self:
         return self.directive(Directive(is_sys=False, name="vshow", value=value))
 
     def event_dataset(self, data: Any, name: str = "event-data") -> Self:
@@ -347,7 +350,7 @@ class Element(Component):
         return self
 
     def element_ref(self, ref: ElementRef):
-        self._element_ref = ref
+        self.__element_ref = ref
         return self
 
     def update_dependencies(
@@ -464,10 +467,10 @@ class Element(Component):
                 app_slot.get_temp_component_dependency(tag_name, self.dependency)
             )
 
-        if self._element_ref:
+        if self.__element_ref:
             scope = get_current_scope()
-            data["eRef"] = self._element_ref._to_element_config()
-            scope.register_element_ref(self._element_ref)
+            data["eRef"] = self.__element_ref._to_element_config()
+            scope.register_element_ref(self.__element_ref)
 
         return data
 

instaui/components/html/range.py

@@ -4,7 +4,7 @@ from instaui.components.element import Element
 from instaui.components.value_element import ValueElement
 from instaui import consts
 from instaui.vars.types import TMaybeRef
-from instaui.vars.mixin_types.element_binding import ElementBindingMixin
+from instaui.vars.mixin_types.element_binding import ElementBindingProtocol
 from ._mixins import InputEventMixin
 
 _T_value = Union[int, float]
@@ -31,7 +31,7 @@ class Range(InputEventMixin, ValueElement[_T_value]):
 
     def vmodel(
         self,
-        value: ElementBindingMixin,
+        value: ElementBindingProtocol,
         modifiers: Union[consts.TModifier, List[consts.TModifier], None] = None,
         *,
         prop_name: str = "value",

instaui/components/html/ul.py

@@ -4,7 +4,7 @@ from instaui.components.element import Element
 from .li import Li
 from instaui.components.vfor import VFor
 
-from instaui.vars.mixin_types.element_binding import ElementBindingMixin
+from instaui.vars.mixin_types.element_binding import ElementBindingProtocol
 
 
 class Ul(Element):
@@ -12,7 +12,7 @@ class Ul(Element):
         super().__init__("ul")
 
     @classmethod
-    def from_list(cls, data: Union[List, ElementBindingMixin[List]]) -> Ul:
+    def from_list(cls, data: Union[List, ElementBindingProtocol]) -> Ul:
         with Ul() as ul:
             with VFor(data) as items:
                 Li(items)

instaui/components/match.py

@@ -4,11 +4,11 @@ import typing
 from instaui.components.component import Component
 from instaui.runtime._app import new_scope
 
-from instaui.vars.mixin_types.element_binding import ElementBindingMixin
+from instaui.vars.mixin_types.element_binding import ElementBindingProtocol
 
 
 class Match(Component):
-    def __init__(self, on: ElementBindingMixin):
+    def __init__(self, on: ElementBindingProtocol):
         super().__init__("match")
         self._on = on
         self._default_case = None

instaui/components/mixins.py

@@ -1,12 +1,16 @@
-from typing import Dict, Protocol
+from __future__ import annotations
+from typing import Any, Dict, Protocol, TYPE_CHECKING, Union
 from typing_extensions import Self
 from instaui.vars.types import TMaybeRef
 
+if TYPE_CHECKING:
+    from instaui.components.element import Element
+
 
 class PropsProtocol(Protocol):
-    def props(self, props: Dict) -> Self: ...
+    def props(self, add: Union[str, Dict[str, Any], TMaybeRef]) -> Self: ...
 
 
 class CanDisabledMixin:
-    def disabled(self: PropsProtocol, disabled: TMaybeRef[bool] = True):
-        return self.props({"disabled": disabled})
+    def disabled(self: PropsProtocol, disabled: TMaybeRef[bool] = True) -> Element:
+        return self.props({"disabled": disabled})  # type: ignore

instaui/components/vfor.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 from typing import (
     Dict,
-    List,
     Literal,
     Mapping,
     Optional,
@@ -17,7 +16,10 @@ from instaui.components.component import Component
 from instaui.vars.vfor_item import VForItem, VForDict, VForWithIndex
 from instaui.runtime._app import get_app_slot, new_scope
 
-from instaui.vars.mixin_types.element_binding import ElementBindingMixin
+from instaui.vars.mixin_types.element_binding import (
+    ElementBindingMixin,
+    ElementBindingProtocol,
+)
 
 _T = TypeVar("_T")
 
@@ -25,7 +27,7 @@ _T = TypeVar("_T")
 class VFor(Component, Generic[_T]):
     def __init__(
         self,
-        data: Union[Sequence[_T], ElementBindingMixin[List[_T]]],
+        data: Union[Sequence[_T], ElementBindingProtocol],
         *,
         key: Union[Literal["item", "index"], str] = "index",
     ):
@@ -117,10 +119,10 @@ class VFor(Component, Generic[_T]):
 
     @overload
     @classmethod
-    def range(cls, end: ElementBindingMixin[int]) -> VFor[int]: ...
+    def range(cls, end: ElementBindingProtocol) -> VFor[int]: ...
 
     @classmethod
-    def range(cls, end: Union[int, ElementBindingMixin[int]]) -> VFor[int]:
+    def range(cls, end: Union[int, ElementBindingProtocol]) -> VFor[int]:
         obj = cls(None)  # type: ignore
 
         num = (  # type: ignore
@@ -135,6 +137,6 @@ class VFor(Component, Generic[_T]):
 
     @classmethod
     def from_dict(
-        cls, data: Union[Mapping, pydantic.BaseModel, ElementBindingMixin[Dict]]
+        cls, data: Union[Mapping, pydantic.BaseModel, ElementBindingProtocol]
     ):
         return VForDict(VFor(data))  # type: ignore

instaui/fastapi_server/_utils.py

@@ -1,12 +1,12 @@
-from typing import Any, Dict, List, Optional
+from typing import Any, Dict, List, Optional, Sequence
 from instaui.runtime._app import get_app_slot
-from instaui.skip import is_skip_output
+from instaui.response import response_data
 import pydantic
 
 
 class ResponseData(pydantic.BaseModel):
     values: Optional[List[Any]] = None
-    skips: Optional[List[int]] = None
+    types: Optional[Sequence[int]] = None
 
 
 def update_app_page_info(data: Dict):
@@ -22,21 +22,5 @@ def update_app_page_info(data: Dict):
         app._query_params = page_info["queryParams"]
 
 
-def response_data(outputs_binding_count: int, result: Any):
-    data = ResponseData()
-    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
+def response_web_data(outputs_binding_count: int, result: Any):
+    return ResponseData(**response_data(outputs_binding_count, result))

instaui/fastapi_server/dependency_router.py

@@ -16,7 +16,11 @@ def _dependency_handler(app: FastAPI):
     def _(hash_part: str, file_name: str) -> FileResponse:
         hash_part_with_extend_paths = hash_part.split("/", maxsplit=1)
         hash_part = hash_part_with_extend_paths[0]
-        extend_path = None if len(hash_part_with_extend_paths) == 1 else hash_part_with_extend_paths[1]
+        extend_path = (
+            None
+            if len(hash_part_with_extend_paths) == 1
+            else hash_part_with_extend_paths[1]
+        )
 
         folder = resource.get_folder_path(hash_part)
         if extend_path:

instaui/fastapi_server/event_router.py

@@ -20,14 +20,14 @@ def _async_handler(app: FastAPI):
         if handler is None:
             return {"error": "event handler not found"}
 
-        assert inspect.iscoroutinefunction(
-            handler.fn
-        ), "handler must be a coroutine function"
+        assert inspect.iscoroutinefunction(handler.fn), (
+            "handler must be a coroutine function"
+        )
 
         _utils.update_app_page_info(data)
 
         result = await handler.fn(*handler.get_handler_args(_get_binds_from_data(data)))
-        return _utils.response_data(handler.outputs_binding_count, result)
+        return _utils.response_web_data(handler.outputs_binding_count, result)
 
 
 def _sync_handler(app: FastAPI):
@@ -41,7 +41,7 @@ def _sync_handler(app: FastAPI):
 
         result = handler.fn(*handler.get_handler_args(_get_binds_from_data(data)))
 
-        return _utils.response_data(handler.outputs_binding_count, result)
+        return _utils.response_web_data(handler.outputs_binding_count, result)
 
     if get_context().debug_mode:
 

instaui/fastapi_server/request_context.py

@@ -3,17 +3,18 @@ from typing import Optional
 from fastapi import Request
 from contextvars import ContextVar, Token
 
-current_request_ctx :ContextVar[Optional[Request]]= ContextVar("current_request", default=None)
+current_request_ctx: ContextVar[Optional[Request]] = ContextVar(
+    "current_request", default=None
+)
 
 
-
-def set_current_request(request: Request) :
+def set_current_request(request: Request):
     return current_request_ctx.set(request)
 
+
 def reset_current_request(token: Token) -> None:
     current_request_ctx.reset(token)
 
 
 def get_current_request() -> Request:
     return current_request_ctx.get()  # type: ignore
-

instaui/fastapi_server/watch_router.py

@@ -24,7 +24,7 @@ def _async_handler(app: FastAPI):
         result = await handler_info.fn(
             *handler_info.get_handler_args(_get_binds_from_data(data))
         )
-        return _utils.response_data(handler_info.outputs_binding_count, result)
+        return _utils.response_web_data(handler_info.outputs_binding_count, result)
 
 
 def _sync_handler(app: FastAPI):
@@ -40,7 +40,7 @@ def _sync_handler(app: FastAPI):
         result = handler_info.fn(
             *handler_info.get_handler_args(_get_binds_from_data(data))
         )
-        return _utils.response_data(handler_info.outputs_binding_count, result)
+        return _utils.response_web_data(handler_info.outputs_binding_count, result)
 
     if get_context().debug_mode:
 

instaui/patch_update.py

@@ -0,0 +1,54 @@
+from typing import Any, Iterable, Sequence, Union
+from instaui.common.jsonable import Jsonable
+
+
+class PatchSetRecord:
+    def __init__(self, *, path: Sequence[Union[str, int]], value: Any):
+        self.path = list(path)
+        self.value = value
+
+
+class PatchSet(Jsonable):
+    def __init__(self, records: Iterable[PatchSetRecord]):
+        self._records = list(records)
+
+    def patch_set(self, *, path: Sequence[Union[str, int]], value: Any):
+        return PatchSet([*self._records, PatchSetRecord(path=path, value=value)])
+
+    def _to_json_dict(self):
+        return [[r.path, r.value] for r in self._records]
+
+
+def patch_set(*, path: Sequence[Union[str, int]], value: Any):
+    """
+    Generates a patch to specify how data should be updated.
+
+    This function is typically used within the return value of functions
+    used in `ui.event` or `ui.watch`, indicating the way data modifications are applied.
+
+    Args:
+        path (Sequence[Union[str, int]]): A sequence representing the path to the item that needs to be updated.
+                                           Each element can either be a string (for dictionary keys) or an integer
+                                           (for list indices).
+        value (Any): The new value to set at the specified path. Can be of any type.
+
+    Example:
+    .. code-block:: python
+
+        data = ui.state(
+            {
+                "v1": ["a", "b", "c"],
+                "v2": ["x", "y", "z"],
+            }
+        )
+
+        @ui.event(outputs=[data])
+        def update_data():
+            # update the second element of "v1" to "foo"
+            return ui.patch_set(path=["v1", 1], value="foo")
+
+        html.button("update data").on_click(update_data)
+        ui.label(data)
+    """
+
+    return PatchSet([PatchSetRecord(path=path, value=value)])

instaui/response.py

@@ -0,0 +1,64 @@
+from typing import Any, List, Sequence, TypedDict
+from enum import IntEnum
+from instaui.common.jsonable import Jsonable
+from instaui.skip import is_skip_output
+from instaui.patch_update import PatchSet
+
+
+class TResponse(TypedDict, total=False):
+    values: List[Any]
+    types: Sequence[int]
+
+
+class ValueType(IntEnum):
+    VALUE = 0
+    SKIP = 1
+    Patch = 2
+
+
+def response_data(outputs_binding_count: int, result: Any):
+    data: TResponse = {}
+    if outputs_binding_count > 0:
+        if not isinstance(result, tuple):
+            result = [result]
+
+        returns_count = len(result)
+
+        # [(value, 1), (value, 0)]
+        result_infos = [
+            (_try_get_value_from_jsonable(r), convert_type(r)) for r in result
+        ]
+
+        if returns_count == 1 and result_infos[0][1] == ValueType.SKIP:
+            return data
+
+        # fill missing values with None
+        if returns_count < outputs_binding_count:
+            result_infos.extend(
+                [(None, ValueType.SKIP)] * (outputs_binding_count - returns_count)
+            )
+
+        data["values"] = [
+            0 if info[1] == ValueType.SKIP else info[0] for info in result_infos
+        ]
+        types = [info[1] for info in result_infos]
+
+        if sum(types) > 0:
+            data["types"] = types
+
+    return data
+
+
+def convert_type(value: Any):
+    if is_skip_output(value):
+        return ValueType.SKIP
+    if isinstance(value, PatchSet):
+        return ValueType.Patch
+    return ValueType.VALUE
+
+
+def _try_get_value_from_jsonable(value: Any) -> Any:
+    if isinstance(value, Jsonable):
+        return value._to_json_dict()
+
+    return value

instaui/spa_router/_file_base_utils.py

@@ -113,7 +113,7 @@ class _model_utils:
             if not self.fn_path:
                 return ""
 
-            return f"from .{self.fn_path.replace(' ','_')} import main as {self.main_fn_name()}"
+            return f"from .{self.fn_path.replace(' ', '_')} import main as {self.main_fn_name()}"
 
         def main_fn_name(self):
             if not self.fn_path: