restiny 0.2.1__py3-none-any.whl → 0.6.1__py3-none-any.whl

restiny/widgets/dynamic_fields.py

@@ -10,12 +10,12 @@ from textual.widget import Widget
 from textual.widgets import (
     Button,
     ContentSwitcher,
-    Input,
     RadioButton,
     RadioSet,
     Switch,
 )
 
+from restiny.widgets import CustomInput
 from restiny.widgets.path_chooser import PathChooser
 
 
@@ -142,24 +142,24 @@ class TextDynamicField(DynamicField):
         self, enabled: bool, key: str, value: str, *args, **kwargs
     ) -> None:
         super().__init__(*args, **kwargs)
-        self._initial_enabled = enabled
-        self._initial_key = key
-        self._initial_value = value
+        self._enabled = enabled
+        self._key = key
+        self._value = value
 
     def compose(self) -> ComposeResult:
         yield Switch(
-            value=self._initial_enabled,
+            value=self._enabled,
             tooltip='Send this field?',
             id='enabled',
         )
-        yield Input(
-            value=self._initial_key,
+        yield CustomInput(
+            value=self._key,
             placeholder='Key',
             select_on_focus=False,
             id='key',
         )
-        yield Input(
-            value=self._initial_value,
+        yield CustomInput(
+            value=self._value,
             placeholder='Value',
             select_on_focus=False,
             id='value',
@@ -168,8 +168,8 @@ class TextDynamicField(DynamicField):
 
     async def on_mount(self) -> None:
         self.enabled_switch = self.query_one('#enabled', Switch)
-        self.key_input = self.query_one('#key', Input)
-        self.value_input = self.query_one('#value', Input)
+        self.key_input = self.query_one('#key', CustomInput)
+        self.value_input = self.query_one('#value', CustomInput)
         self.remove_button = self.query_one('#remove', Button)
 
     @property
@@ -211,9 +211,9 @@ class TextDynamicField(DynamicField):
         elif message.value is False:
             self.post_message(message=self.Disabled(field=self))
 
-    @on(Input.Changed, '#key')
-    @on(Input.Changed, '#value')
-    def on_input_changed(self, message: Input.Changed) -> None:
+    @on(CustomInput.Changed, '#key')
+    @on(CustomInput.Changed, '#value')
+    def on_input_changed(self, message: CustomInput.Changed) -> None:
         self.enabled_switch.value = True
 
         if self.is_empty:
@@ -260,51 +260,51 @@ class TextOrFileDynamicField(DynamicField):
         **kwargs,
     ) -> None:
         super().__init__(*args, **kwargs)
-        self._initial_enabled = enabled
-        self._initial_key = key
-        self._initial_value = value
-        self._initial_value_kind = value_kind
+        self._enabled = enabled
+        self._key = key
+        self._value = value
+        self._value_kind = value_kind
 
     def compose(self) -> ComposeResult:
         with RadioSet(id='value-kind', compact=True):
             yield RadioButton(
                 label=_ValueKind.TEXT,
-                value=bool(self._initial_value_kind == _ValueKind.TEXT),
+                value=bool(self._value_kind == _ValueKind.TEXT),
                 id='value-kind-text',
             )
             yield RadioButton(
                 label=_ValueKind.FILE,
-                value=bool(self._initial_value_kind == _ValueKind.FILE),
+                value=bool(self._value_kind == _ValueKind.FILE),
                 id='value-kind-file',
             )
         yield Switch(
-            value=self._initial_enabled,
+            value=self._enabled,
             tooltip='Send this field?',
             id='enabled',
         )
-        yield Input(
-            value=self._initial_key,
+        yield CustomInput(
+            value=self._key,
             placeholder='Key',
             select_on_focus=False,
             id='key',
         )
         with ContentSwitcher(
             initial='value-text'
-            if self._initial_value_kind == _ValueKind.TEXT
+            if self._value_kind == _ValueKind.TEXT
             else 'value-file',
             id='value-kind-switcher',
         ):
-            yield Input(
-                value=self._initial_value
-                if self._initial_value_kind == _ValueKind.TEXT
+            yield CustomInput(
+                value=self._value
+                if self._value_kind == _ValueKind.TEXT
                 else '',
                 placeholder='Value',
                 select_on_focus=False,
                 id='value-text',
             )
             yield PathChooser.file(
-                path=self._initial_value
-                if self._initial_value_kind == _ValueKind.FILE
+                path=self._value
+                if self._value_kind == _ValueKind.FILE
                 else None,
                 id='value-file',
             )
@@ -323,8 +323,8 @@ class TextOrFileDynamicField(DynamicField):
             '#value-kind-file', RadioButton
         )
         self.enabled_switch = self.query_one('#enabled', Switch)
-        self.key_input = self.query_one('#key', Input)
-        self.value_text_input = self.query_one('#value-text', Input)
+        self.key_input = self.query_one('#key', CustomInput)
+        self.value_text_input = self.query_one('#value-text', CustomInput)
         self.value_file_input = self.query_one('#value-file', PathChooser)
         self.remove_button = self.query_one('#remove', Button)
 
@@ -403,11 +403,11 @@ class TextOrFileDynamicField(DynamicField):
         elif message.value is False:
             self.post_message(message=self.Disabled(field=self))
 
-    @on(Input.Changed, '#key')
-    @on(Input.Changed, '#value-text')
+    @on(CustomInput.Changed, '#key')
+    @on(CustomInput.Changed, '#value-text')
     @on(PathChooser.Changed, '#value-file')
     def on_input_changed(
-        self, message: Input.Changed | PathChooser.Changed
+        self, message: CustomInput.Changed | PathChooser.Changed
     ) -> None:
         self.enabled_switch.value = True
 
@@ -493,27 +493,41 @@ class DynamicFields(Widget):
     def filled_fields(self) -> list[DynamicField]:
         return [field for field in self.fields if field.is_filled]
 
-    @property
-    def values(self) -> list[dict[str, str | bool | Path | None]]:
-        return [
-            {
-                'enabled': field.enabled,
-                'key': field.key,
-                'value': field.value,
-            }
-            for field in self.fields
-        ]
-
-    async def add_field(self, field: DynamicField) -> None:
-        await self.fields_container.mount(field)
-
-    def remove_field(self, field: DynamicField) -> None:
+    async def add_field(
+        self, field: DynamicField, before_last: bool = False
+    ) -> None:
+        if before_last:
+            await self.fields_container.mount(field, before=self.fields[-1])
+        else:
+            await self.fields_container.mount(field)
+
+    def remove_field(
+        self, field: DynamicField, focus_neighbor: bool = False
+    ) -> None:
+        if len(self.fields) == 1:
+            self.app.bell()
+            return
+        elif field is self.fields[-1]:
+            self.app.bell()
+            return
+
+        if focus_neighbor:
+            field_index = self.fields.index(field)
+
+            neighbor_field = None
+            if field_index == 0:
+                neighbor_field = self.fields[field_index + 1]
+            else:
+                neighbor_field = self.fields[field_index - 1]
+
+            self.app.set_focus(neighbor_field.query_one(CustomInput))
+
         field.add_class('hidden')
         field.remove()
 
     @on(DynamicField.Empty)
     def _on_field_is_empty(self, message: DynamicField.Empty) -> None:
-        self._focus_neighbor_field_then_remove(field=message.field)
+        self.remove_field(field=message.field, focus_neighbor=True)
         self.post_message(
             message=self.FieldEmpty(fields=self, field=message.field)
         )
@@ -544,23 +558,4 @@ class DynamicFields(Widget):
     def _on_field_remove_requested(
         self, message: DynamicField.RemoveRequested
     ) -> None:
-        self._focus_neighbor_field_then_remove(field=message.field)
-
-    def _focus_neighbor_field_then_remove(self, field: DynamicField) -> None:
-        if len(self.fields) == 1:
-            self.app.bell()
-            return
-        elif field is self.fields[-1]:
-            self.app.bell()
-            return
-
-        field_index = self.fields.index(field)
-
-        neighbor_field = None
-        if field_index == 0:
-            neighbor_field = self.fields[field_index + 1]
-        else:
-            neighbor_field = self.fields[field_index - 1]
-
-        self.app.set_focus(neighbor_field.query_one(Input))
-        self.remove_field(field=field)
+        self.remove_field(field=message.field, focus_neighbor=True)

restiny/widgets/password_input.py

@@ -0,0 +1,161 @@
+from enum import StrEnum
+
+from textual import on
+from textual.app import ComposeResult
+from textual.containers import Horizontal
+from textual.message import Message
+from textual.widget import Widget
+from textual.widgets import Button
+
+from restiny.widgets import CustomInput
+
+
+class _Icon(StrEnum):
+    SHOW = ' 🔓 '
+    HIDE = ' 🔒 '
+
+
+class _Tooltip(StrEnum):
+    SHOW = 'Show'
+    HIDE = 'Hide'
+
+
+class PasswordInput(Widget):
+    DEFAULT_CSS = """
+    PasswordInput {
+        width: 1fr;
+        height: auto;
+    }
+
+    PasswordInput > Horizontal {
+        width: auto;
+        height: auto;
+    }
+
+    PasswordInput CustomInput {
+        width: 1fr;
+        margin-right: 0;
+        border-right: none;
+    }
+
+    PasswordInput CustomInput:focus {
+        border-right: none;
+    }
+
+
+    PasswordInput Button {
+        width: auto;
+        margin-left: 0;
+        border-left: none;
+    }
+
+    """
+
+    class Changed(Message):
+        """
+        Sent when value changed.
+        """
+
+        def __init__(self, input: 'PasswordInput', value: str):
+            super().__init__()
+            self.input = input
+            self.value = value
+
+        @property
+        def control(self) -> 'PasswordInput':
+            return self.input
+
+    class Shown(Message):
+        """
+        Sent when the value becomes visible.
+        """
+
+        def __init__(self, input: 'PasswordInput') -> None:
+            super().__init__()
+            self.input = input
+
+        @property
+        def control(self) -> 'PasswordInput':
+            return self.input
+
+    class Hidden(Message):
+        """
+        Sent when the value becomes hidden.
+        """
+
+        def __init__(self, input: 'PasswordInput') -> None:
+            super().__init__()
+            self.input = input
+
+        @property
+        def control(self) -> 'PasswordInput':
+            return self.input
+
+    def __init__(self, *args, **kwargs) -> None:
+        super().__init__(
+            id=kwargs.pop('id', None), classes=kwargs.pop('classes', None)
+        )
+        kwargs.pop('password', None)
+        self._input_args = args
+        self._input_kwargs = kwargs
+
+    def compose(self) -> ComposeResult:
+        with Horizontal():
+            yield CustomInput(
+                *self._input_args,
+                **self._input_kwargs,
+                password=True,
+                id='value',
+            )
+            yield Button(
+                _Icon.SHOW, tooltip=_Tooltip.SHOW, id='toggle-visibility'
+            )
+
+    def on_mount(self) -> None:
+        self.value_input = self.query_one('#value', CustomInput)
+        self.toggle_visibility_button = self.query_one(
+            '#toggle-visibility', Button
+        )
+
+    def show(self) -> None:
+        self.value_input.password = False
+        self.toggle_visibility_button.label = _Icon.HIDE
+        self.toggle_visibility_button.tooltip = _Tooltip.HIDE
+        self.post_message(message=self.Hidden(input=self))
+
+    def hide(self) -> None:
+        self.value_input.password = True
+        self.toggle_visibility_button.label = _Icon.SHOW
+        self.toggle_visibility_button.tooltip = _Tooltip.SHOW
+        self.post_message(message=self.Shown(input=self))
+
+    @property
+    def value(self) -> str:
+        return self.value_input.value
+
+    @value.setter
+    def value(self, value: str) -> None:
+        self.value_input.value = value
+
+    @property
+    def shown(self) -> bool:
+        return self.value_input.password is False
+
+    @property
+    def hidden(self) -> bool:
+        return not self.shown
+
+    @on(CustomInput.Changed, '#value')
+    def _on_value_changed(self, message: CustomInput.Changed) -> None:
+        self.post_message(
+            message=self.Changed(input=self, value=message.value)
+        )
+
+    @on(Button.Pressed, '#toggle-visibility')
+    def _on_toggle_visibility(self, message: Button.Pressed) -> None:
+        if self.value_input.password is False:
+            self.hide()
+        elif self.value_input.password is True:
+            self.show()
+
+        self.value_input.focus()

restiny/widgets/path_chooser.py

@@ -9,10 +9,10 @@ from textual.message import Message
 from textual.reactive import Reactive
 from textual.screen import ModalScreen
 from textual.widget import Widget
-from textual.widgets import Button, Input, Label, Switch
+from textual.widgets import Button, Label, Switch
 
 from restiny.utils import filter_paths
-from restiny.widgets import CustomDirectoryTree
+from restiny.widgets import CustomDirectoryTree, CustomInput
 
 
 class PathChooserScreen(ModalScreen):
@@ -53,7 +53,7 @@ class PathChooserScreen(ModalScreen):
                 yield CustomDirectoryTree(path='/')
 
             with Horizontal(classes='w-auto h-auto mt-1'):
-                yield Input(
+                yield CustomInput(
                     placeholder='--empty--',
                     select_on_focus=False,
                     disabled=True,
@@ -74,7 +74,7 @@ class PathChooserScreen(ModalScreen):
             '#option-show-hidden-dirs'
         )
         self.directory_tree = self.query_one(CustomDirectoryTree)
-        self.input = self.query_one(Input)
+        self.input = self.query_one(CustomInput)
         self.btn_cancel = self.query_one('#cancel')
         self.btn_confirm = self.query_one('#choose')
 
@@ -197,7 +197,7 @@ class PathChooser(Widget):
         grid-columns: 1fr auto;
     }
 
-    PathChooser > Input {
+    PathChooser > CustomInput {
         margin-right: 0;
         border-right: none;
     }
@@ -214,7 +214,7 @@ class PathChooser(Widget):
         """
 
         def __init__(
-            self, path_chooser: PathChooser, path: Path | None
+            self, path_chooser: 'PathChooser', path: Path | None
         ) -> None:
             super().__init__()
             self.path_chooser = path_chooser
@@ -241,7 +241,7 @@ class PathChooser(Widget):
     ) -> None:
         super().__init__(*args, **kwargs)
         self.path_type = path_type
-        self._initial_path = path
+        self._path = path
 
     def compose(self) -> ComposeResult:
         icon = ''
@@ -250,8 +250,8 @@ class PathChooser(Widget):
         elif self.path_type == _PathType.DIR:
             icon = ' 🗂 '
 
-        yield Input(
-            self._initial_path,
+        yield CustomInput(
+            str(self._path) if self._path else '',
             placeholder='--empty--',
             select_on_focus=False,
             disabled=True,
@@ -260,7 +260,7 @@ class PathChooser(Widget):
         yield Button(icon, tooltip=f'Choose {self.path_type}', id='choose')
 
     def on_mount(self) -> None:
-        self.path_input = self.query_one('#path', Input)
+        self.path_input = self.query_one('#path', CustomInput)
         self.choose_button = self.query_one('#choose', Button)
 
     @property
@@ -275,8 +275,8 @@ class PathChooser(Widget):
         self.path_input.value = value
         self.path_input.tooltip = value
 
-    @on(Input.Changed, '#path')
-    def _on_path_changed(self, message: Input.Changed) -> None:
+    @on(CustomInput.Changed, '#path')
+    def _on_path_changed(self, message: CustomInput.Changed) -> None:
         self.post_message(
             message=self.Changed(path_chooser=self, path=self.path)
         )

{restiny-0.2.1.dist-info → restiny-0.6.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: restiny
-Version: 0.2.1
+Version: 0.6.1
 Summary: A minimalist HTTP client, no bullshit
 Author-email: Kalebe Chimanski de Almeida <kalebe.chi.almeida@gmail.com>
 License:                                  Apache License
@@ -216,7 +216,6 @@ Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Environment :: Console
 Classifier: Typing :: Typed
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
@@ -228,17 +227,20 @@ Classifier: Operating System :: Microsoft :: Windows :: Windows 11
 Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
 Classifier: Natural Language :: English
-Requires-Python: >=3.10
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: textual<6.4,>=6.3
 Requires-Dist: textual[syntax]
 Requires-Dist: httpx<0.29,>=0.28
 Requires-Dist: pyperclip<1.10,>=1.9
+Requires-Dist: sqlalchemy<3.0,>=2.0
+Requires-Dist: pydantic<2.13,>=2.12
 Dynamic: license-file
 
 ![OS support](https://img.shields.io/badge/OS-macOS%20Linux%20Windows-red)
-![Python versions](https://img.shields.io/badge/Python-3.10%20|%203.11%20|%203.12%20|%203.13%20|%203.14-blue)
+![Python versions](https://img.shields.io/badge/Python-3.11%20|%203.12%20|%203.13%20|%203.14-blue)
+
 
 
 - [RESTiny](#restiny)
@@ -254,7 +256,7 @@ Dynamic: license-file
 
 _A minimal, elegant HTTP client for Python — with a TUI interface powered by [Textual](https://github.com/Textualize/textual)._
 
-![image](https://github.com/user-attachments/assets/e6f0c03a-e98e-40cd-af1d-38489d650fb1)
+![image](https://github.com/user-attachments/assets/798c994f-af7e-4be6-8f8c-87157dcf94e0)
 
 ## How to install
 

restiny-0.6.1.dist-info/RECORD

@@ -0,0 +1,38 @@
+restiny/__about__.py,sha256=gd3s3RotD0_KL90Tua-YkOr60Jm2C2_wvlEhAT08068,22
+restiny/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+restiny/__main__.py,sha256=XkZbw04fLAFImx-T5me4CcZRsKdr33eUaWUKZ2kZPR8,1165
+restiny/consts.py,sha256=LMwWVmOrOwZAKcnpZkBs-duMDE6QWTWD4un9y6hcVEc,11319
+restiny/entities.py,sha256=ibQLSNxBj_mqTPyrkI_VnOVCpUETK6sZMAXhNKBDo4c,14232
+restiny/enums.py,sha256=57KQPeY1YFNr15Ykr8ZglkEKdez6Djqnfzm0YaBPGfQ,996
+restiny/httpx_auths.py,sha256=FqwO6W2AYNhmG5OEbQBusumH-zVvel4A8Oa7c4cbm-4,1295
+restiny/utils.py,sha256=ktXrnlujBYxrPi-nDYor94r1cmJ07xyezesuZESswOc,4493
+restiny/assets/__init__.py,sha256=JL1KARlToF6ZR7KeUjlDAHgwwVM2qXYaIl4wHeFW2zU,93
+restiny/assets/style.tcss,sha256=bpPEiBcKFE5eREae_f4VbGrhdObqrtiYcDROROGiLCI,978
+restiny/data/db.py,sha256=aRYrjv0ecFWToj5Y0XBJ_o4QPLPY2qzRKvgUgbzG98E,1990
+restiny/data/models.py,sha256=BlwQNS2X6t5Fkt9ioowXpWYKgm3_joYvOWgp69BILJ0,3392
+restiny/data/repos.py,sha256=Bn-zH2UwNG_hbxnPfZzyiCg3O7nMe5O__b37pRtXsoY,15840
+restiny/data/sql/__init__.py,sha256=4Erfs-MC_ctZ53lXqe_FQwJDRd8SrxGrZ3_rG8o7VCU,81
+restiny/ui/__init__.py,sha256=ak-HZ1y5w5E1s2ojBAicdP2GwBwjz9PRDdegusf5ZpE,439
+restiny/ui/app.py,sha256=nhE7kp9_SP2TifVGmFTzJVmk0L3kWYqXt0TTo9h95xw,20931
+restiny/ui/collections_area.py,sha256=Vk8WSP8zP0hRj4K46zPxziDqMK2kpc2pr87_b8uAFwk,19451
+restiny/ui/environments_screen.py,sha256=rcKymFxWYP9vxLIPwwq2cxPnI1idueDVB3fLQMClHeA,9573
+restiny/ui/request_area.py,sha256=xHsyaJ2P5CsMDRspuNjefJCI3KNdZxWs0ir9eLoZXjA,21668
+restiny/ui/response_area.py,sha256=3KHqFADeCWttd5WKbqA4l_6q9AiKTKbQXt2FMAUvsw4,4246
+restiny/ui/settings_screen.py,sha256=L_i2WFqqrCFkucZLXeg-kVXLzP7jZ-CTS65T1bdq3ZU,2249
+restiny/ui/top_bar_area.py,sha256=6vKhlx_eJpgpH3EeConKxky03RRmGizMGwgPrG0DkkU,1583
+restiny/ui/url_area.py,sha256=PIcH9ef0q7gEfLZ149CNtTr2NgAeKESLuIl0e5Pt4hg,3868
+restiny/widgets/__init__.py,sha256=RaU2JkRWAoJULG3rpPtMNUarPU6Yu6gJwzAsSad2hgg,895
+restiny/widgets/collections_tree.py,sha256=UVtG6km49G-DjklpXHoADaTvj0L1-FWOLkz7gijGU2g,2144
+restiny/widgets/confirm_prompt.py,sha256=1xdCaJZUDzV4-fQ1ztbe7uX9hJ6ZZUBghtwgReBHz9w,2147
+restiny/widgets/custom_directory_tree.py,sha256=sNTaI0DBAO56MyOy6qMZPgWXiTUQbBrJdn1GtOdxrDc,1268
+restiny/widgets/custom_input.py,sha256=W6gE9jbTl_R1uLSA5Dz9eBX7aNID2-rYZP3j2oNi4SA,466
+restiny/widgets/custom_text_area.py,sha256=ykmG-6MiMhz6BqNzP8f14jUTWWKjsCOIEhgciP-01Y8,14032
+restiny/widgets/dynamic_fields.py,sha256=S2epm-_QOsHEGhVFwDlOvIqOQkUgpGnh6pK3_JoTQ1g,16104
+restiny/widgets/password_input.py,sha256=xXOfiStcUCbP_cnrS2Rz0-GmsvmOsen4G41zOpmjLD8,4057
+restiny/widgets/path_chooser.py,sha256=FdG9fdgY2qD8o-7aBn8F005f8H91kbYtyF99RRGLRas,9273
+restiny-0.6.1.dist-info/licenses/LICENSE,sha256=Z190MKguypkrjaCldiorEbMmBQp7ylvx09oyE4oDCTs,11361
+restiny-0.6.1.dist-info/METADATA,sha256=OO4PshKvwwwyCx62RfI112o1qnIiP7bE1lLWde0E_H8,16137
+restiny-0.6.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+restiny-0.6.1.dist-info/entry_points.txt,sha256=F9zW8bAPAwIihltqjzYow4ahmH_B6VkAHzQFA-8QOn4,50
+restiny-0.6.1.dist-info/top_level.txt,sha256=1MQ_Q-fV1Dwbu4zU3g1Eg-CfRgC412X-mvMIrEdrlbk,8
+restiny-0.6.1.dist-info/RECORD,,

restiny/core/__init__.py

@@ -1,15 +0,0 @@
-"""
-This module contains the specific sections of the DataFox user interface (UI).
-"""
-
-from restiny.core.request_area import RequestArea, RequestAreaData
-from restiny.core.response_area import ResponseArea
-from restiny.core.url_area import URLArea, URLAreaData
-
-__all__ = [
-    'RequestArea',
-    'RequestAreaData',
-    'ResponseArea',
-    'URLArea',
-    'URLAreaData',
-]