instaui 0.1.2__py3-none-any.whl → 0.1.3__py3-none-any.whl

instaui/components/html/select.py

@@ -7,10 +7,10 @@ from typing import (
     List,
     Literal,
     Optional,
-    Self,
     Union,
     overload,
 )
+from typing_extensions import Self
 
 from instaui.vars import Ref
 from instaui.components.value_element import ValueElement

instaui/consts.py

@@ -8,11 +8,15 @@ _STATIC_DIR = _THIS_DIR.joinpath("static")
 INDEX_TEMPLATE_PATH = _TEMPLATES_DIR.joinpath("index.html")
 APP_IIFE_JS_PATH = _STATIC_DIR.joinpath("insta-ui.iife.js")
 APP_ES_JS_PATH = _STATIC_DIR.joinpath("insta-ui.esm-browser.prod.js")
+APP_ES_JS_MAP_PATH = _STATIC_DIR.joinpath("insta-ui.js.map")
 APP_CSS_PATH = _STATIC_DIR.joinpath("insta-ui.css")
 VUE_IIFE_JS_PATH = _STATIC_DIR.joinpath("vue.global.prod.js")
 VUE_ES_JS_PATH = _STATIC_DIR.joinpath("vue.esm-browser.prod.js")
 VUE_ES_RUNTIME_JS_PATH = _STATIC_DIR.joinpath("vue.runtime.esm-browser.prod.js")
 TAILWIND_JS_PATH = _STATIC_DIR.joinpath("tailwindcss.min.js")
+FAVICON_PATH = _STATIC_DIR.joinpath("insta-ui.ico")
+
+PAGE_TITLE = "insta-ui"
 
 _T_App_Mode = Literal["zero", "web", "webview"]
 TModifier = Literal["trim", "number", "lazy"]

instaui/fastapi_server/resource.py

@@ -1,6 +1,5 @@
 from pathlib import Path
 from typing import Dict
-from urllib.parse import quote as urllib_quote
 from instaui.systems import file_system
 from instaui.version import __version__ as _INSTA_VERSION
 
@@ -25,11 +24,11 @@ def record_resource(path: Path):
     return url
 
 
-def generate_static_url(file_path: Path):
-    return urllib_quote(f"{URL}/{_generate_hash_part(file_path)}")
+def _generate_hash_part(path: Path):
+    path = Path(path).resolve()
+    is_file = path.is_file()
 
+    if is_file:
+        return f"{file_system.generate_hash_name_from_path(path.parent)}/{path.name}"
 
-def _generate_hash_part(file_path: Path):
-    file_path = Path(file_path).resolve()
-    hash_name = file_system.generate_hash_name_from_path(file_path)
-    return f"{hash_name}/{file_path.name}"
+    return file_system.generate_hash_name_from_path(path)

instaui/fastapi_server/server.py

@@ -9,6 +9,8 @@ import __main__
 
 from fastapi import FastAPI
 from fastapi import Request
+from fastapi.staticfiles import StaticFiles
+
 from fastapi.responses import HTMLResponse
 import uvicorn
 from uvicorn.supervisors import ChangeReload
@@ -31,13 +33,18 @@ from . import debug_mode_router
 from .middlewares import RequestContextMiddleware
 from ._uvicorn import UvicornServer
 from . import resource
+from instaui.version import __version__ as _INSTA_VERSION
 
 APP_IMPORT_STRING = "instaui.fastapi_server.server:Server._instance.app"
 
-VUE_JS_HASH_LINK = resource.record_resource(consts.VUE_ES_JS_PATH)
-INSTAUI_JS_HASH_LINK = resource.record_resource(consts.APP_ES_JS_PATH)
-APP_CSS_LINK = resource.record_resource(consts.APP_CSS_PATH)
-TAILWIND_JS_HASH_LINK = resource.record_resource(consts.TAILWIND_JS_PATH)
+
+INSTAUI_STATIC_URL = f"/_instaui_{_INSTA_VERSION}/static"
+
+VUE_JS_HASH_LINK = f"{INSTAUI_STATIC_URL}/{consts.VUE_ES_JS_PATH.name}"
+INSTAUI_JS_HASH_LINK = f"{INSTAUI_STATIC_URL}/{consts.APP_ES_JS_PATH.name}"
+APP_CSS_LINK = f"{INSTAUI_STATIC_URL}/{consts.APP_CSS_PATH.name}"
+TAILWIND_JS_HASH_LINK = f"{INSTAUI_STATIC_URL}/{consts.TAILWIND_JS_PATH.name}"
+FAVICON_LINK = f"{INSTAUI_STATIC_URL}/{consts.FAVICON_PATH.name}"
 
 
 class Server:
@@ -57,6 +64,8 @@ class Server:
         watch_router.create_router(self.app)
         debug_mode_router.create_router(self.app)
 
+        self.add_instaui_static(self.app)
+
         for page_info in get_launch_collector()._page_router.values():
             self.register_page(page_info)
 
@@ -103,6 +112,18 @@ class Server:
     ):
         config_data = to_config_data()
 
+        system_slot = get_app_slot()
+        default_app_slot = get_default_app_slot()
+        html_resource = system_slot._html_resource
+        default_html_resource = default_app_slot._html_resource
+
+        favicon_url = FAVICON_LINK
+        if html_resource.favicon:
+            favicon_url = resource.record_resource(html_resource.favicon)
+        else:
+            if default_html_resource.favicon:
+                favicon_url = resource.record_resource(default_html_resource.favicon)
+
         model = web_template.WebTemplateModel(
             vue_js_link=VUE_JS_HASH_LINK,
             instaui_js_link=INSTAUI_JS_HASH_LINK,
@@ -110,13 +131,12 @@ class Server:
                 APP_CSS_LINK,
             ],
             config_dict=config_data,
+            favicon_url=favicon_url,
+            title=html_resource.title
+            or default_html_resource.title
+            or consts.PAGE_TITLE,
         )
 
-        system_slot = get_app_slot()
-        default_app_slot = get_default_app_slot()
-        html_resource = system_slot._html_resource
-        default_html_resource = default_app_slot._html_resource
-
         if html_resource.use_tailwind is None:
             if default_html_resource.use_tailwind:
                 model.js_links.append(JsLink(TAILWIND_JS_HASH_LINK))
@@ -250,6 +270,14 @@ class Server:
     def run_with(self, app):
         assert isinstance(app, FastAPI), "app must be a FastAPI instance"
 
+    @staticmethod
+    def add_instaui_static(app: FastAPI):
+        app.mount(
+            INSTAUI_STATIC_URL,
+            StaticFiles(directory=consts._STATIC_DIR),
+            name=INSTAUI_STATIC_URL,
+        )
+
 
 def _split_args(args: str):
     return [a.strip() for a in args.split(",")]

instaui/html_tools.py

@@ -29,6 +29,14 @@ def use_tailwind(value=True):
     get_app_slot()._html_resource.use_tailwind = value
 
 
+def use_page_title(title: str):
+    get_app_slot()._html_resource.title = title
+
+
+def use_favicon(favicon: Path):
+    get_app_slot()._html_resource.favicon = favicon
+
+
 def add_js_code(code: str, *, script_attrs: Optional[Dict[str, Any]] = None):
     get_app_slot()._html_resource.add_script_tag(code, script_attrs=script_attrs)
 

instaui/runtime/resource.py

@@ -6,7 +6,8 @@ from .dataclass import JsLink, VueAppUse, VueAppComponent
 
 class HtmlResource:
     use_tailwind: Optional[bool] = None
-    _title: str = ""
+    title: Optional[str] = None
+    favicon: Optional[Path] = None
 
     def __init__(self) -> None:
         self._css_links: Dict[Union[str, Path], Any] = {}
@@ -16,7 +17,6 @@ class HtmlResource:
         self._vue_app_use: Set[VueAppUse] = set()
         self._vue_app_components: Set[VueAppComponent] = set()
         self._import_maps: Dict[str, str] = {}
-        self.title: str = self._title
         self._appConfig = "{}"
 
     def add_css_link(self, link: Union[str, Path]):

instaui/static/templates/debug/sse.html

@@ -10,9 +10,9 @@
       left: 50%;
       transform: translateX(-50%);
       height: 75px;
-      background-color: rgba(186, 230, 253, 0.8);
+      background-color: rgba(104, 184, 93, 0.8);
       border: 1px solid #dee2e6;
-      box-shadow: 0 4px 6px rgba(186, 230, 253, 0.5);
+      box-shadow: 0 4px 6px rgba(104, 184, 93, 0.5);
       border-radius: 4px;
       color: #343a40;
       font-size: 16px;

instaui/systems/file_system.py

@@ -1,8 +1,6 @@
-import uuid
 from pathlib import Path
+import hashlib
 
 
-def generate_hash_name_from_path(file_path: Path):
-    path_str = str(file_path)
-    unique_id = uuid.uuid5(uuid.NAMESPACE_URL, path_str)
-    return str(unique_id)
+def generate_hash_name_from_path(path: Path):
+    return hashlib.sha256(path.as_posix().encode()).hexdigest()[:32]

instaui/template/web_template.py

@@ -23,7 +23,7 @@ class WebTemplateModel:
     vue_app_use: typing.List[str] = field(default_factory=list)
     vue_app_component: typing.List[VueAppComponent] = field(default_factory=list)
     prefix: str = ""
-    title: str = ""
+    title: typing.Optional[str] = None
     favicon_url: str = ""
 
     def add_extra_import_map(self, name: str, url: str):

instaui/template/zero_template.py

@@ -35,8 +35,8 @@ class ZeroTemplateModel:
     vue_app_use: typing.List[str] = field(default_factory=list)
     vue_app_component: typing.List[ZeroVueAppComponent] = field(default_factory=list)
     prefix: str = ""
-    title: str = ""
-    favicon_url: typing.Optional[_TCodeOrPath] = None
+    title: typing.Optional[str] = None
+    favicon: typing.Optional[Path] = None
 
     def add_extra_import_map(self, name: str, url: _TCodeOrPath):
         self.extra_import_maps[name] = url
@@ -83,11 +83,7 @@ class ZeroTemplateModel:
             for component in self.vue_app_component
         ]
 
-        self.favicon_url = (
-            self._normalize_path_to_base64_url(self.favicon_url, _ICON_PREFIX)
-            if self.favicon_url is not None
-            else None
-        )
+        self.favicon = self._normalize_path_to_base64_url(self.favicon, _ICON_PREFIX)
 
     @staticmethod
     def _normalize_path_to_dataurl(path: typing.Union[str, Path], prefix: str):
@@ -97,11 +93,10 @@ class ZeroTemplateModel:
         return f"{prefix},{quote(path)}"
 
     @staticmethod
-    def _normalize_path_to_base64_url(path: typing.Union[str, Path], prefix: str):
-        if isinstance(path, Path):
-            path = path.read_text(encoding="utf-8")
-
-        return f"{prefix},{base64.b64encode(path.encode('utf-8')).decode('utf-8')}"
+    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/__init__.py

@@ -19,6 +19,7 @@ from instaui.html_tools import (
     add_vue_app_use,
     to_config_data,
     use_tailwind,
+    use_page_title,
 )
 
 from instaui.components.element import Element as element
@@ -91,6 +92,7 @@ __all__ = [
     "add_js_link",
     "add_vue_app_use",
     "use_tailwind",
+    "use_page_title",
     "directive",
     "vif",
     "page",

instaui/zero/func.py

@@ -42,6 +42,10 @@ def to_html_str():
             consts.APP_CSS_PATH,
         ],
         config_dict=config_data,
+        favicon=html_resource.favicon
+        or default_html_resource.favicon
+        or consts.FAVICON_PATH,
+        title=html_resource.title or default_html_resource.title or consts.PAGE_TITLE,
     )
 
     if html_resource.use_tailwind is None: