difonlib 0.4.0__tar.gz → 0.4.2__tar.gz

{difonlib-0.4.0 → difonlib-0.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: difonlib
-Version: 0.4.0
+Version: 0.4.2
 Summary: python libraries
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown

{difonlib-0.4.0 → difonlib-0.4.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "difonlib"
-version = "0.4.0"
+version = "0.4.2"
 description = "python libraries"
 readme = "README.md"
 requires-python = ">=3.12"

difonlib-0.4.2/src/difonlib/ng_lib.py

@@ -0,0 +1,262 @@
+from nicegui import ui
+import inspect
+import asyncio
+from typing import Any, Callable, Awaitable, Literal
+
+from difonlib.utils import logdbg
+
+dbg = logdbg
+# https://claude.ai/share/227ce46f-f825-4783-8e0e-9e774963ec84
+#         Или точечнее — только ui.label внутри диалога:
+#         python.q-dialog .q-card .q-item__label {
+#             font-size: 20px !important;
+#         }
+#         Либо ещё проще — прямо в коде диалога:
+#         ui.label(text=text).classes("text-xl")
+#         text-xl — это Tailwind, соответствует 1.25rem. Если нужно крупнее — text-2xl, text-3xl.
+ui.add_css(
+    """
+    .q-notification__message {
+    font-size: 20px !important;
+    }
+    .q-dialog .q-card {
+    font-size: 20px !important;
+    }
+    """,
+    shared=True,
+)
+
+
+class DialogBox:
+    async def dialog_ok(self, text: str = "Hello!)") -> None:
+        with ui.dialog().props("persistent") as dialog, ui.card():
+            ui.label(text=text)
+            ui.button("Close", on_click=dialog.close)
+        dialog.open()
+
+    async def dialog_ok_cancel(
+        self,
+        text: str,
+        on_click_ok: Callable,
+        on_click_cancel: Callable = lambda: None,
+        btn_ok: str = "OK",
+        btn_cancel: str = "Cancel",
+    ) -> None:
+        with ui.dialog().props("persistent") as dialog, ui.card():
+            ui.label(text=text)
+            with ui.row():
+                ui.button(
+                    btn_ok,
+                    on_click=lambda: (on_click_ok(), dialog.close()),
+                )
+                ui.button(btn_cancel, on_click=lambda: (on_click_cancel(), dialog.close()))
+        dialog.open()
+
+    async def dialog_confirm(
+        self, text: str = "Are you sure?", btn_ok: str = "Yes", btn_cancel: str = "No"
+    ) -> ui.dialog:
+        with ui.dialog().props("persistent") as dialog, ui.card():
+            ui.label(text=text)
+            with ui.row():
+                ui.button(btn_ok, on_click=lambda: dialog.submit(btn_ok))
+                ui.button(btn_cancel, on_click=lambda: dialog.submit(btn_cancel))
+        return await dialog
+
+    async def dialog_input(
+        self,
+        text: str,
+        input_prefix: str = "",
+        **kwrds: Any,
+    ) -> ui.dialog:
+        with ui.dialog().props("persistent") as dialog, ui.card():
+            ui.label(text=text)
+            with ui.row():
+                inp: ui.input = ui.input(value=input_prefix, **kwrds).on(
+                    "keydown.enter", lambda: dialog.submit(inp.value)
+                )
+                ui.button(text="Enter", on_click=lambda: dialog.submit(inp.value))
+                ui.button(text="Cancel", on_click=dialog.close)
+        return await dialog
+
+
+class CardTable:
+    _current_yes_handler: Callable[[], None | Awaitable[None]] | None = None
+
+    def __init__(
+        self,
+        title: str,
+        columns: list,
+        rows: list[dict] | None = None,
+        selection: Literal["single", "multiple"] | None = None,
+        on_selection_change: list[Callable] | None = None,
+        marked_text_color: str = "yellow",
+        marked_field: str = "_marked",
+    ):
+        self.on_selection_change: list[Callable] = on_selection_change or []
+        self.buttons_on_row_select_changed: list = []
+        self.marked_text_color = marked_text_color
+        self.marked_field = marked_field
+
+        with ui.card().classes("p-4 shadow-lg") as self.card:
+            with ui.row().classes("items-center justify-between w-full mb-2"):
+                with ui.row().classes("gap-2") as self.left_table:
+                    pass
+                ui.label(f"📋 {title}").classes("text-green-700 text-lg font-bold")
+                with ui.row().classes("gap-2") as self.top_table:
+                    pass
+
+            self.table = ui.table(
+                columns=self._normalize_columns(columns),
+                rows=self.enum_data(rows or []),
+                row_key="sn",
+                selection=selection,
+                on_select=self._on_selection_change,
+                column_defaults={
+                    "align": "left",
+                    "headerClasses": "uppercase",
+                },
+            ).classes("w-full shadow-lg bg-black-900 text-gray-200")
+
+            with (
+                ui.dialog().props("persistent") as self.confirm_dialog,
+                ui.card().classes("p-4"),
+            ):
+                self.dialog_title = ui.label().classes("text-lg font-bold mb-4")
+                with ui.row().classes("justify-end w-full gap-2"):
+                    ui.button("No", color="red", on_click=self.confirm_dialog.close)
+                    ui.button("Yes", color="green", on_click=self._on_yes_clicked)
+
+            with (
+                ui.dialog().props("persistent") as self.processing_dialog,
+                ui.card().classes("p-4 items-center justify-center"),
+            ):
+                with ui.row().classes("items-center gap-3"):
+                    self.processing_spinner = ui.spinner(size="md")
+                    self.processing_label = ui.label("Processing...").classes("text-base")
+
+        if self.marked_field:
+            color_class = f"text-{self.marked_text_color}"
+            for column in self.table.columns:
+                cell = column["name"]
+                self.table.add_slot(
+                    f"body-cell-{cell}",
+                    rf"""
+                    <q-td :props="props">
+                    <span :class="props.row.{self.marked_field} ? 'font-bold {color_class}' : ''">
+                    {{{{props.value}}}}
+                    </span>
+                    </q-td>
+                    """,
+                )
+
+    def _normalize_columns(self, columns: list[dict]) -> list[dict]:
+        """Add field 'name', needed for Quasar GUI"""
+        return [{**col, "name": col.get("name", col["field"])} for col in columns]
+
+    def mark_row(self, mark: bool = True, **kwrds: Any) -> list[dict[str, Any]]:
+        """
+        card_table.mark_row(id="123456", name="ANNNNN")
+        card_table.mark_row(ip="192.168.0.18", mark=False)
+        """
+        found = []
+        for row in self.table.rows:
+            if all(row.get(k) == v for k, v in kwrds.items()):
+                row[self.marked_field] = mark
+                found.append(row)
+        if found:
+            self.table.update()
+        return found
+
+    def visible(self, state: bool) -> None:
+        self.table.visible = state
+        self.card.visible = state
+
+    async def _on_selection_change(self, e: Any) -> None:
+        selected = bool(e.selection)
+        for btn in self.buttons_on_row_select_changed:
+            if selected:
+                btn.classes("!bg-blue-500", remove="!bg-gray-500").enable()
+            else:
+                btn.classes("!bg-gray-500", remove="!bg-blue-500").disable()
+        for handler in self.on_selection_change:
+            await handler(e)
+
+    async def _run_with_processing(self, handler: Callable) -> None:
+        self.processing_dialog.open()
+        try:
+            if inspect.iscoroutinefunction(handler):
+                await handler()
+            else:
+                handler()
+            await asyncio.sleep(0.1)
+        finally:
+            self.processing_dialog.close()
+
+    async def _on_yes_clicked(self) -> None:
+        handler, self._current_yes_handler = self._current_yes_handler, None
+        self.confirm_dialog.close()
+        if not handler:
+            return
+        await self._run_with_processing(handler)
+
+    def enum_data(self, rows: list[dict]) -> list[dict]:
+        return [{"sn": i + 1, **row} for i, row in enumerate(rows)]
+
+    def set_rows(self, rows: list[dict]) -> None:
+        self.table.rows = self.enum_data(rows)
+        self.table.update()
+
+    def add_checkbox(
+        self,
+        chbox_txt: str,
+        on_change: Callable,
+        default_enable: bool = False,
+    ) -> ui.checkbox:
+        """
+        card_table.add_checkbox(chbox_txt="Used Only", on_change=lambda v: ui.notify(v))
+        """
+        with self.top_table:
+            chbox = ui.checkbox(chbox_txt, value=default_enable).classes("font-bold")
+
+        async def handle_change(e: Any) -> None:
+            if inspect.iscoroutinefunction(on_change):
+                await on_change(e.sender.value)
+            else:
+                on_change(e.sender.value)
+
+        chbox.on("click", handle_change)
+        setattr(self, f"chbox{chbox_txt.replace(' ', '_')}", chbox)
+        return chbox
+
+    def add_button(
+        self,
+        btn_txt: str,
+        on_click: Callable,
+        default_enable: bool = True,
+        color: str = "blue",
+        active_on_rows_selected: bool = False,
+        use_dialog_confirm: bool = False,
+        confirm_title: str | None = None,
+    ) -> ui.button:
+        with self.top_table:
+            btn = ui.button(btn_txt, color=color)
+
+        if active_on_rows_selected:
+            self.buttons_on_row_select_changed.append(btn)
+
+        if default_enable:
+            btn.classes("!bg-blue-500", remove="!bg-gray-500").enable()
+        else:
+            btn.classes("!bg-gray-500", remove="!bg-blue-500").disable()
+
+        async def handle_click() -> None:
+            if use_dialog_confirm:
+                self.dialog_title.text = confirm_title or f"Confirm {btn_txt}?"
+                self._current_yes_handler = on_click
+                self.confirm_dialog.open()
+            else:
+                await self._run_with_processing(on_click)
+
+        btn.on_click(handle_click)
+        setattr(self, f"btn{btn_txt.replace(' ','_')}", btn)
+        return btn

difonlib-0.4.2/src/difonlib/ng_lib_test3.py

@@ -0,0 +1,77 @@
+from nicegui import ui
+from ng_lib import CardTable, DialogBox
+import functools
+
+from difonlib.bt_utils import logdbg
+
+dbg = logdbg
+
+
+@ui.page("/", dark=True)
+def main() -> None:
+
+    card_table = CardTable(
+        title="Connected Devices",
+        columns=[
+            {"name": "id", "label": "id", "field": "id"},
+            {"name": "name", "label": "Name", "field": "name"},
+            {"name": "ip", "label": "IP Address", "field": "ip"},
+        ],
+        selection="single",
+        rows=[
+            {"id": "123456", "name": "ANNNNN", "ip": "192.168.0.18"},
+            {"id": "987654", "name": "VNNNNN", "ip": "192.168.0.118"},
+            {"id": "123456", "name": "BNNNNN", "ip": "192.168.0.12"},
+            {"id": "003456", "name": "SNNNNN", "ip": "192.168.0.144"},
+            {"id": "129956", "name": "QNNNNN", "ip": "192.168.0.49"},
+        ],
+    )
+
+    found = card_table.mark_row(id="123456", mark=True)
+    print(f"card_table.table.rows:{card_table.table.rows}")  # //Dima
+    found = card_table.mark_row(id="123456", name="ANNNNN", mark=False)
+    found = card_table.mark_row(id="129956")
+    print(f" ==> found: {found}")  # //Dima
+
+    print(f"card_table.table.rows: {card_table.table.rows}")
+
+    card_table.add_checkbox(chbox_txt="Used Only", on_change=lambda v: ui.notify(v))
+
+    dialog_box = DialogBox()
+
+    def btnok() -> None:
+        ui.notify("You press OK")
+
+    def btncancel() -> None:
+        ui.notify("You press Cancel")
+
+    card_table.add_button(
+        "test_ok_cancel",
+        on_click=functools.partial(
+            dialog_box.dialog_ok_cancel,
+            text="OK or Cancel?",
+            on_click_ok=btnok,
+            on_click_cancel=btncancel,
+        ),
+    )
+
+    async def confirm() -> None:
+        result = await dialog_box.dialog_confirm()
+        ui.notify(f"You chose {result}")
+
+    card_table.add_button(
+        "test_confirm",
+        on_click=confirm,
+    )
+
+    async def dialog_input() -> None:
+        inp = await dialog_box.dialog_input("Input IR_KEY_NAME", input_prefix="IR_KEY_")
+        ui.notify(f"Your input: {inp}")
+
+    card_table.add_button(
+        "test_input",
+        on_click=dialog_input,
+    )
+
+
+ui.run(port=1111)

{difonlib-0.4.0 → difonlib-0.4.2}/src/difonlib/tuya_devs.py

@@ -29,6 +29,13 @@ tuya_xml_data_file = Path(
 )
 
 
+class OutletDeviceM(OutletDevice):
+    def toggle(self) -> bool | Any:
+        data = self.status()
+        switch_state: bool = data["dps"]["1"]
+        return self.set_status(not switch_state)["dps"]["1"]
+
+
 class TuyaDevs:
     def __init__(
         self,
@@ -118,7 +125,7 @@ class TuyaDevs:
     #         ]
     #     return con_devs
 
-    def dev_is_connected(self, dev_id: str, timeout: int = 8, rescan: bool = False) -> bool | None:
+    def dev_is_connected(self, dev_id: str, timeout: int = 8, rescan: bool = False) -> bool:
         if rescan:
             # update self.devs_online
             self.scan(timeout=timeout)
@@ -176,7 +183,7 @@ class TuyaDevs:
         odev.turn_off()
         """
         try:
-            dev = OutletDevice(
+            dev = OutletDeviceM(
                 dev_id=dev_id,
                 local_key=local_key,
                 persist=True,

{difonlib-0.4.0 → difonlib-0.4.2}/src/difonlib.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: difonlib
-Version: 0.4.0
+Version: 0.4.2
 Summary: python libraries
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown

{difonlib-0.4.0 → difonlib-0.4.2}/src/difonlib.egg-info/SOURCES.txt

@@ -6,6 +6,7 @@ src/difonlib/bt_utils.py
 src/difonlib/conn_kbd_devs.py
 src/difonlib/input_devs.py
 src/difonlib/ng_lib.py
+src/difonlib/ng_lib_test3.py
 src/difonlib/py.typed
 src/difonlib/remctrl.py
 src/difonlib/tuya_devs.py

difonlib-0.4.0/src/difonlib/ng_lib.py

@@ -1,130 +0,0 @@
-from nicegui import ui
-import inspect
-import asyncio
-from typing import Any, Callable, Awaitable, Literal
-
-from difonlib.utils import logdbg
-
-dbg = logdbg
-
-
-class CardTable:
-    _current_yes_handler: Callable[[], None | Awaitable[None]] | None = None
-
-    def __init__(
-        self,
-        title: str,
-        columns: list,
-        rows: list[dict] | None = None,
-        selection: Literal["single", "multiple"] | None = None,
-        on_selection_change: list[Callable] | None = None,
-    ):
-        self.on_selection_change: list[Callable] = on_selection_change or []
-        self.buttons_on_row_select_changed: list = []
-
-        with ui.card().classes("p-4 shadow-lg") as self.card:
-            with ui.row().classes("items-center justify-between w-full mb-2"):
-                ui.label(f"📋 {title}").classes("text-green-700 text-lg font-bold")
-                with ui.row().classes("gap-2") as self.top_table:
-                    pass
-
-            self.table = ui.table(
-                columns=columns,
-                rows=self.enum_data(rows or []),
-                row_key="sn",
-                selection=selection,
-                on_select=self._on_selection_change,
-                column_defaults={
-                    "align": "left",
-                    "headerClasses": "uppercase",
-                },
-            ).classes("w-full shadow-lg bg-black-900 text-gray-200")
-
-            with (
-                ui.dialog().props("persistent") as self.confirm_dialog,
-                ui.card().classes("p-4"),
-            ):
-                self.dialog_title = ui.label().classes("text-lg font-bold mb-4")
-                with ui.row().classes("justify-end w-full gap-2"):
-                    ui.button("No", color="red", on_click=self.confirm_dialog.close)
-                    ui.button("Yes", color="green", on_click=self._on_yes_clicked)
-
-            with (
-                ui.dialog().props("persistent") as self.processing_dialog,
-                ui.card().classes("p-4 items-center justify-center"),
-            ):
-                with ui.row().classes("items-center gap-3"):
-                    self.processing_spinner = ui.spinner(size="md")
-                    self.processing_label = ui.label("Processing...").classes("text-base")
-
-    def visible(self, state: bool) -> None:
-        self.table.visible = state
-        self.card.visible = state
-
-    async def _on_selection_change(self, e: Any) -> None:
-        selected = bool(e.selection)
-        for btn in self.buttons_on_row_select_changed:
-            if selected:
-                btn.classes("!bg-blue-500", remove="!bg-gray-500").enable()
-            else:
-                btn.classes("!bg-gray-500", remove="!bg-blue-500").disable()
-        for handler in self.on_selection_change:
-            await handler(e)
-
-    async def _run_with_processing(self, handler: Callable) -> None:
-        self.processing_dialog.open()
-        try:
-            if inspect.iscoroutinefunction(handler):
-                await handler()
-            else:
-                handler()
-            await asyncio.sleep(0.5)
-        finally:
-            self.processing_dialog.close()
-
-    async def _on_yes_clicked(self) -> None:
-        handler, self._current_yes_handler = self._current_yes_handler, None
-        self.confirm_dialog.close()
-        if not handler:
-            return
-        await self._run_with_processing(handler)
-
-    def enum_data(self, data: list[dict]) -> list[dict]:
-        return [{"sn": i + 1, **row} for i, row in enumerate(data)]
-
-    def set_rows(self, rows: list[dict]) -> None:
-        self.table.rows = self.enum_data(rows)
-        self.table.update()
-
-    def add_button(
-        self,
-        btn_txt: str,
-        on_click: Callable,
-        default_enable: bool = True,
-        color: str = "blue",
-        active_on_rows_selected: bool = False,
-        use_dialog_confirm: bool = False,
-        confirm_title: str | None = None,
-    ) -> ui.button:
-        with self.top_table:
-            btn = ui.button(btn_txt, color=color)
-
-        if active_on_rows_selected:
-            self.buttons_on_row_select_changed.append(btn)
-
-        if default_enable:
-            btn.classes("!bg-blue-500", remove="!bg-gray-500").enable()
-        else:
-            btn.classes("!bg-gray-500", remove="!bg-blue-500").disable()
-
-        async def handle_click() -> None:
-            if use_dialog_confirm:
-                self.dialog_title.text = confirm_title or f"Confirm {btn_txt}?"
-                self._current_yes_handler = on_click
-                self.confirm_dialog.open()
-            else:
-                await self._run_with_processing(on_click)
-
-        btn.on_click(handle_click)
-        setattr(self, f"btn{btn_txt}", btn)
-        return btn