restiny 0.1.2__tar.gz → 0.2.0__tar.gz

{restiny-0.1.2 → restiny-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: restiny
-Version: 0.1.2
+Version: 0.2.0
 Summary: A minimalist HTTP client, no bullshit
 Author-email: Kalebe Chimanski de Almeida <kalebe.chi.almeida@gmail.com>
 License:                                  Apache License
@@ -220,6 +220,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Operating System :: POSIX :: Linux
 Classifier: Operating System :: MacOS
 Classifier: Operating System :: Microsoft :: Windows :: Windows 10
@@ -230,14 +231,14 @@ Classifier: Natural Language :: English
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: textual<6.3,>=6.2
+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
 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-blue)
+![Python versions](https://img.shields.io/badge/Python-3.10%20|%203.11%20|%203.12%20|%203.13%20|%203.14-blue)
 
 
 - [RESTiny](#restiny)
@@ -253,7 +254,7 @@ Dynamic: license-file
 
 _A minimal, elegant HTTP client for Python — with a TUI interface powered by [Textual](https://github.com/Textualize/textual)._
 
-<img width="1905" alt="image" src="https://github.com/user-attachments/assets/e6f0c03a-e98e-40cd-af1d-38489d650fb1" />
+![image](https://github.com/user-attachments/assets/e6f0c03a-e98e-40cd-af1d-38489d650fb1)
 
 ## How to install
 

{restiny-0.1.2 → restiny-0.2.0}/README.md

@@ -1,5 +1,5 @@
 ![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-blue)
+![Python versions](https://img.shields.io/badge/Python-3.10%20|%203.11%20|%203.12%20|%203.13%20|%203.14-blue)
 
 
 - [RESTiny](#restiny)
@@ -15,7 +15,7 @@
 
 _A minimal, elegant HTTP client for Python — with a TUI interface powered by [Textual](https://github.com/Textualize/textual)._
 
-<img width="1905" alt="image" src="https://github.com/user-attachments/assets/e6f0c03a-e98e-40cd-af1d-38489d650fb1" />
+![image](https://github.com/user-attachments/assets/e6f0c03a-e98e-40cd-af1d-38489d650fb1)
 
 ## How to install
 

{restiny-0.1.2 → restiny-0.2.0}/pyproject.toml

@@ -14,7 +14,7 @@ readme = "README.md"
 license = { file = "LICENSE" }
 requires-python = ">=3.10"
 dependencies = [
-  "textual>=6.2,<6.3",
+  "textual>=6.3,<6.4",
   "textual[syntax]",
   "httpx>=0.28,<0.29",
   "pyperclip>=1.9,<1.10",
@@ -31,6 +31,7 @@ classifiers = [
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
     "Operating System :: POSIX :: Linux",
     "Operating System :: MacOS",
     "Operating System :: Microsoft :: Windows :: Windows 10",
@@ -63,11 +64,11 @@ restiny = ["assets/**/*"]
 ##########
 [tool.ruff]
 line-length = 79
-target-version = "py313"
+target-version = "py314"
 
 [tool.ruff.lint]
 select = ["E", "F", "B", "I", "UP"]
-ignore = ["E501", "B006"]
+ignore = ["E501", "B006", "UP037"]
 
 [tool.ruff.format]
 quote-style = "single"

restiny-0.2.0/restiny/__about__.py

@@ -0,0 +1 @@
+__version__ = '0.2.0'

{restiny-0.1.2 → restiny-0.2.0}/restiny/core/app.py

@@ -237,10 +237,11 @@ class RESTinyApp(App, inherit_bindings=False):
                         )
                     elif request_area_data.body.type == BodyMode.FILE:
                         file = request_area_data.body.payload
-                        headers['content-type'] = (
-                            mimetypes.guess_type(file.name)[0]
-                            or 'application/octet-stream'
-                        )
+                        if 'content-type' not in headers:
+                            headers['content-type'] = (
+                                mimetypes.guess_type(file.name)[0]
+                                or 'application/octet-stream'
+                            )
                         request = http_client.build_request(
                             method=url_area_data.method,
                             url=url_area_data.url,

{restiny-0.1.2 → restiny-0.2.0}/restiny/core/request_area.py

@@ -1,4 +1,3 @@
-import mimetypes
 from dataclasses import dataclass
 from pathlib import Path
 
@@ -19,10 +18,11 @@ from textual.widgets import (
 from restiny.enums import BodyMode, BodyRawLanguage
 from restiny.widgets import (
     CustomTextArea,
-    DynamicField,
     DynamicFields,
     PathChooser,
+    TextDynamicField,
 )
+from restiny.widgets.dynamic_fields import TextOrFileDynamicField
 
 
 @dataclass
@@ -98,12 +98,12 @@ class RequestArea(Static):
         with TabbedContent():
             with TabPane('Headers'):
                 yield DynamicFields(
-                    fields=[DynamicField(enabled=False, key='', value='')],
+                    fields=[TextDynamicField(enabled=False, key='', value='')],
                     id='headers',
                 )
             with TabPane('Query params'):
                 yield DynamicFields(
-                    fields=[DynamicField(enabled=False, key='', value='')],
+                    fields=[TextDynamicField(enabled=False, key='', value='')],
                     id='params',
                 )
             with TabPane('Body'):
@@ -114,7 +114,7 @@ class RequestArea(Static):
                             ('Raw', BodyMode.RAW),
                             ('File', BodyMode.FILE),
                             ('Form (urlencoded)', BodyMode.FORM_URLENCODED),
-                            # ('Form (multipart)', BodyMode.FORM_MULTIPART)
+                            ('Form (multipart)', BodyMode.FORM_MULTIPART),
                         ),
                         allow_blank=False,
                         tooltip='Body type',
@@ -149,9 +149,24 @@ class RequestArea(Static):
                         id='body-mode-form-urlencoded', classes='h-auto mt-1'
                     ):
                         yield DynamicFields(
-                            [DynamicField(enabled=False, key='', value='')],
+                            [
+                                TextDynamicField(
+                                    enabled=False, key='', value=''
+                                )
+                            ],
                             id='body-form-urlencoded',
                         )
+                    with Horizontal(
+                        id='body-mode-form-multipart', classes='h-auto mt-1'
+                    ):
+                        yield DynamicFields(
+                            [
+                                TextOrFileDynamicField(
+                                    enabled=False, key='', value=''
+                                )
+                            ],
+                            id='body-form-multipart',
+                        )
 
             with TabPane('Options'):
                 with Horizontal(classes='h-auto'):
@@ -187,6 +202,9 @@ class RequestArea(Static):
         self.body_form_urlencoded_fields = self.query_one(
             '#body-form-urlencoded', DynamicFields
         )
+        self.body_form_multipart_fields = self.query_one(
+            '#body-form-multipart', DynamicFields
+        )
 
         self.options_timeout_input = self.query_one('#options-timeout', Input)
         self.options_follow_redirects_switch = self.query_one(
@@ -204,6 +222,8 @@ class RequestArea(Static):
             self.body_mode_switcher.current = 'body-mode-raw'
         elif message.value == BodyMode.FORM_URLENCODED:
             self.body_mode_switcher.current = 'body-mode-form-urlencoded'
+        elif message.value == BodyMode.FORM_MULTIPART:
+            self.body_mode_switcher.current = 'body-mode-form-multipart'
 
     @on(Select.Changed, '#body-raw-language')
     def on_change_body_text_language(self, message: Select.Changed) -> None:
@@ -225,30 +245,6 @@ class RequestArea(Static):
         else:
             self.body_enabled_switch.value = True
 
-    @on(PathChooser.Changed)
-    async def on_change_file(self, message: PathChooser.Changed) -> None:
-        content_type_header_field: DynamicField | None = None
-        for header_field in self.header_fields.fields:
-            if header_field.key.lower() == 'content-type':
-                content_type_header_field = header_field
-                break
-
-        content_type: str | None = mimetypes.guess_type(str(message.path))[0]
-        if not content_type:
-            return
-
-        if content_type_header_field:
-            content_type_header_field.value = content_type
-            return
-
-        empty_field = self.header_fields.empty_fields[0]
-        empty_field.enabled = True
-        empty_field.key = 'Content-Type'
-        empty_field.value = content_type
-        await self.header_fields.add_field(
-            field=DynamicField(enabled=False, key='', value='')
-        )
-
     @on(Input.Changed, '#options-timeout')
     def on_change_timeout(self, message: Input.Changed) -> None:
         new_value = message.value
@@ -303,6 +299,16 @@ class RequestArea(Static):
                             value=form_item['value'],
                         )
                     )
+            elif body_type == BodyMode.FORM_MULTIPART:
+                payload = []
+                for form_item in self.body_form_multipart_fields.values:
+                    payload.append(
+                        FormMultipartField(
+                            enabled=form_item['enabled'],
+                            key=form_item['key'],
+                            value=form_item['value'],
+                        )
+                    )
 
             return RequestAreaData.Body(
                 enabled=body_send,
@@ -330,6 +336,3 @@ class RequestArea(Static):
             body=get_body(),
             options=get_options(),
         )
-
-    def set_content_type() -> None:
-        raise NotImplementedError()

{restiny-0.1.2 → restiny-0.2.0}/restiny/enums.py

@@ -39,6 +39,5 @@ class ContentType(StrEnum):
     JSON = 'application/json'
     YAML = 'application/x-yaml'
     XML = 'application/xml'
-
     FORM_URLENCODED = 'application/x-www-form-urlencoded'
     FORM_MULTIPART = 'multipart/form-data'

{restiny-0.1.2 → restiny-0.2.0}/restiny/widgets/__init__.py

@@ -4,11 +4,11 @@ This module contains reusable widgets used in the DataFox interface.
 
 from restiny.widgets.custom_directory_tree import CustomDirectoryTree
 from restiny.widgets.custom_text_area import CustomTextArea
-from restiny.widgets.dynamic_fields import DynamicField, DynamicFields
+from restiny.widgets.dynamic_fields import DynamicFields, TextDynamicField
 from restiny.widgets.path_chooser import PathChooser
 
 __all__ = [
-    'DynamicField',
+    'TextDynamicField',
     'DynamicFields',
     'CustomDirectoryTree',
     'CustomTextArea',

restiny-0.2.0/restiny/widgets/dynamic_fields.py

@@ -0,0 +1,540 @@
+from abc import abstractmethod
+from enum import StrEnum
+from pathlib import Path
+
+from textual import on
+from textual.app import ComposeResult
+from textual.containers import VerticalScroll
+from textual.message import Message
+from textual.widgets import (
+    Button,
+    ContentSwitcher,
+    Input,
+    RadioButton,
+    RadioSet,
+    Static,
+    Switch,
+)
+
+from restiny.widgets.path_chooser import PathChooser
+
+
+class DynamicField(Static):
+    @abstractmethod
+    def compose(self) -> ComposeResult: ...
+
+    @property
+    @abstractmethod
+    def enabled(self) -> bool: ...
+
+    @enabled.setter
+    @abstractmethod
+    def enabled(self, value: bool) -> None: ...
+
+    @property
+    @abstractmethod
+    def key(self) -> str: ...
+
+    @key.setter
+    @abstractmethod
+    def key(self, value: str) -> None: ...
+
+    @property
+    @abstractmethod
+    def value(self) -> str | Path | None: ...
+
+    @value.setter
+    @abstractmethod
+    def value(self, value: str | Path | None) -> None: ...
+
+    @property
+    @abstractmethod
+    def is_empty(self) -> bool: ...
+
+    @property
+    @abstractmethod
+    def is_filled(self) -> bool: ...
+
+    class Enabled(Message):
+        """
+        Sent when the user enables the field.
+        """
+
+        def __init__(self, field: 'DynamicField') -> None:
+            super().__init__()
+            self.field = field
+
+        @property
+        def control(self) -> 'DynamicField':
+            return self.field
+
+    class Disabled(Message):
+        """
+        Sent when the user disables the field.
+        """
+
+        def __init__(self, field: 'DynamicField') -> None:
+            super().__init__()
+            self.field = field
+
+        @property
+        def control(self) -> 'DynamicField':
+            return self.field
+
+    class Empty(Message):
+        """
+        Sent when the key input and value input is empty.
+        """
+
+        def __init__(self, field: 'DynamicField') -> None:
+            super().__init__()
+            self.field = field
+
+        @property
+        def control(self) -> 'DynamicField':
+            return self.field
+
+    class Filled(Message):
+        """
+        Sent when the key input or value input is filled.
+        """
+
+        def __init__(self, field: 'DynamicField') -> None:
+            super().__init__()
+            self.field = field
+
+        @property
+        def control(self) -> 'DynamicField':
+            return self.field
+
+    class RemoveRequested(Message):
+        """
+        Sent when the user clicks the remove button.
+        The listener of this event decides whether
+        to actually remove the field or not.
+        """
+
+        def __init__(self, field: 'DynamicField') -> None:
+            super().__init__()
+            self.field = field
+
+        @property
+        def control(self) -> 'DynamicField':
+            return self.field
+
+
+class TextDynamicField(DynamicField):
+    """
+    Enableable and removable field
+    """
+
+    DEFAULT_CSS = """
+    TextDynamicField {
+        layout: grid;
+        grid-size: 4 1;
+        grid-columns: auto 1fr 2fr auto; /* Set 1:2 ratio between Inputs */
+    }
+    """
+
+    def __init__(
+        self, enabled: bool, key: str, value: str, *args, **kwargs
+    ) -> None:
+        super().__init__(*args, **kwargs)
+
+        # Store initial values temporarily; applied after mounting.
+        self._enabled = enabled
+        self._key = key
+        self._value = value
+
+    def compose(self) -> ComposeResult:
+        yield Switch(value=self._enabled, tooltip='Send this field?')
+        yield Input(value=self._key, placeholder='Key', id='key')
+        yield Input(value=self._value, placeholder='Value', id='value')
+        yield Button(label='➖', tooltip='Remove field')
+
+    def on_mount(self) -> None:
+        self.enabled_switch: Switch = self.query_one(Switch)
+        self.key_input: Input = self.query_one('#key', Input)
+        self.value_input: Input = self.query_one('#value', Input)
+        self.remove_button: Button = self.query_one(Button)
+
+    @property
+    def enabled(self) -> bool:
+        return self.enabled_switch.value
+
+    @enabled.setter
+    def enabled(self, value: bool) -> None:
+        self.enabled_switch.value = value
+
+    @property
+    def key(self) -> str:
+        return self.key_input.value
+
+    @key.setter
+    def key(self, value: str) -> None:
+        self.key_input.value = value
+
+    @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 is_filled(self) -> bool:
+        return len(self.key_input.value) > 0 or len(self.value_input.value) > 0
+
+    @property
+    def is_empty(self) -> bool:
+        return not self.is_filled
+
+    @on(Switch.Changed)
+    def on_enabled_or_disabled(self, message: Switch.Changed) -> None:
+        if message.value is True:
+            self.post_message(self.Enabled(field=self))
+        elif message.value is False:
+            self.post_message(message=self.Disabled(field=self))
+
+    @on(Input.Changed)
+    def on_input_changed(self, message: Input.Changed) -> None:
+        self.enabled_switch.value = True
+
+        if self.is_empty:
+            self.post_message(message=self.Empty(field=self))
+        elif self.is_filled:
+            self.post_message(message=self.Filled(field=self))
+
+    @on(Button.Pressed)
+    def on_remove_requested(self, message: Button.Pressed) -> None:
+        self.post_message(self.RemoveRequested(field=self))
+
+
+class _ValueMode(StrEnum):
+    TEXT = 'text'
+    FILE = 'file'
+
+
+class TextOrFileDynamicField(DynamicField):
+    DEFAULT_CSS = """
+    TextOrFileDynamicField {
+        width: 100%;
+        height: auto;
+        layout: grid;
+        grid-size: 5 1;
+        grid-columns: auto auto 1fr 2fr auto; /* Set 1:2 ratio between Inputs */
+    }
+
+    TextOrFileDynamicField > RadioSet > RadioButton.-selected {
+        background: $surface;
+    }
+
+    TextOrFileDynamicField > ContentSwitcher > PathChooser{
+        margin-right: 1;
+    }
+    """
+
+    def __init__(
+        self,
+        enabled: bool = False,
+        key: str = '',
+        value: str | Path | None = '',
+        value_mode: _ValueMode = 'text',
+        *args,
+        **kwargs,
+    ) -> None:
+        super().__init__(*args, **kwargs)
+        self._enabled = enabled
+        self._key = key
+        self._value = value
+        self._value_mode = value_mode
+
+    def compose(self) -> ComposeResult:
+        with RadioSet(id='value-mode', compact=True):
+            yield RadioButton(
+                label=_ValueMode.TEXT,
+                value=bool(self._value_mode == _ValueMode.TEXT),
+                id='value-mode-text',
+            )
+            yield RadioButton(
+                label=_ValueMode.FILE,
+                value=bool(self._value_mode == _ValueMode.FILE),
+                id='value-mode-file',
+            )
+        yield Switch(
+            value=self._enabled,
+            tooltip='Send this field?',
+            id='enabled',
+        )
+        yield Input(value=self._key, placeholder='Key', id='key')
+        with ContentSwitcher(
+            initial='value-text'
+            if self._value_mode == _ValueMode.TEXT
+            else 'value-file',
+            id='value-mode-switcher',
+        ):
+            yield Input(
+                value=self._value
+                if self._value_mode == _ValueMode.TEXT
+                else '',
+                placeholder='Value',
+                id='value-text',
+            )
+            yield PathChooser.file(
+                path=self._value
+                if self._value_mode == _ValueMode.FILE
+                else None,
+                id='value-file',
+            )
+        yield Button(label='➖', tooltip='Remove field', id='remove')
+
+    def on_mount(self) -> None:
+        self.value_mode_switcher = self.query_one(
+            '#value-mode-switcher', ContentSwitcher
+        )
+
+        self.value_mode_radioset = self.query_one('#value-mode', RadioSet)
+        self.value_mode_text_radio_button = self.query_one(
+            '#value-mode-text', RadioButton
+        )
+        self.value_mode_file_radio_button = self.query_one(
+            '#value-mode-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.value_file_input = self.query_one('#value-file', PathChooser)
+        self.remove_button = self.query_one('#remove', Button)
+
+    @property
+    def enabled(self) -> bool:
+        return self.enabled_switch.value
+
+    @enabled.setter
+    def enabled(self, value: bool) -> None:
+        self.enabled_switch.value = value
+
+    @property
+    def key(self) -> str:
+        return self.key_input.value
+
+    @key.setter
+    def key(self, value: str) -> None:
+        self.key_input.value = value
+
+    @property
+    def value(self) -> str | Path | None:
+        if self.value_mode == _ValueMode.TEXT:
+            return self.value_text_input.value
+        elif self.value_mode == _ValueMode.FILE:
+            return self.value_file_input.path
+
+    @value.setter
+    def value(self, value: str | Path) -> None:
+        if isinstance(value, str):
+            self.value_text_input.value = value
+        elif isinstance(value, Path):
+            self.value_file_input.path = value
+
+    @property
+    def value_mode(self) -> _ValueMode:
+        return _ValueMode(self.value_mode_radioset.pressed_button.label)
+
+    @value_mode.setter
+    def value_mode(self, value: _ValueMode) -> None:
+        if value == _ValueMode.TEXT:
+            self.value_mode_switcher.current = 'value-text'
+            self.value_mode_text_radio_button.value = True
+        elif value == _ValueMode.FILE:
+            self.value_mode_switcher.current = 'value-file'
+            self.value_mode_file_radio_button.value = True
+
+    @property
+    def is_filled(self) -> bool:
+        if len(self.key_input.value) > 0:
+            return True
+        elif (
+            self.value_mode == _ValueMode.TEXT
+            and len(self.value_text_input.value) > 0
+        ):
+            return True
+        elif (
+            self.value_mode == _ValueMode.FILE
+            and self.value_file_input.path is not None
+        ):
+            return True
+        else:
+            return False
+
+    @property
+    def is_empty(self) -> bool:
+        return not self.is_filled
+
+    @on(RadioSet.Changed, '#value-mode')
+    def on_value_mode_changed(self, message: RadioSet.Changed) -> None:
+        self.value_mode = _ValueMode(message.pressed.label)
+
+    @on(Switch.Changed, '#enabled')
+    def on_enabled_or_disabled(self, message: Switch.Changed) -> None:
+        if message.value is True:
+            self.post_message(self.Enabled(field=self))
+        elif message.value is False:
+            self.post_message(message=self.Disabled(field=self))
+
+    @on(Input.Changed, '#key')
+    @on(Input.Changed, '#value-text')
+    @on(PathChooser.Changed, '#value-file')
+    def on_input_changed(
+        self, message: Input.Changed | PathChooser.Changed
+    ) -> None:
+        self.enabled_switch.value = True
+
+        if self.is_empty:
+            self.post_message(message=self.Empty(field=self))
+        elif self.is_filled:
+            self.post_message(message=self.Filled(field=self))
+
+    @on(Button.Pressed, '#remove')
+    def on_remove_requested(self, message: Button.Pressed) -> None:
+        self.post_message(self.RemoveRequested(field=self))
+
+
+class DynamicFields(Static):
+    """
+    Enableable and removable fields
+    """
+
+    class FieldEmpty(Message):
+        """
+        Sent when one of the fields becomes empty.
+        """
+
+        def __init__(
+            self, fields: 'DynamicFields', field: DynamicField
+        ) -> None:
+            super().__init__()
+            self.fields = fields
+            self.field = field
+
+        @property
+        def control(self) -> 'DynamicFields':
+            return self.fields
+
+    class FieldFilled(Message):
+        """
+        Sent when one of the fields becomes filled.
+        """
+
+        def __init__(
+            self, fields: 'DynamicFields', field: DynamicField
+        ) -> None:
+            super().__init__()
+            self.fields = fields
+            self.field = field
+
+        @property
+        def control(self) -> 'DynamicFields':
+            return self.fields
+
+    def __init__(
+        self,
+        fields: list[DynamicField],
+        *args,
+        **kwargs,
+    ) -> None:
+        super().__init__(*args, **kwargs)
+        self._fields = fields
+
+    def compose(self) -> ComposeResult:
+        yield VerticalScroll()
+
+    async def on_mount(self) -> None:
+        self.fields_container = self.query_one(VerticalScroll)
+
+        # Set initial_fields
+        for field in self._fields:
+            await self.add_field(field=field)
+
+    @property
+    def fields(self) -> list[DynamicField]:
+        return list(self.query(DynamicField))
+
+    @property
+    def empty_fields(self) -> list[DynamicField]:
+        return [field for field in self.fields if field.is_empty]
+
+    @property
+    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]]:
+        return [
+            {
+                'enabled': field.enabled,
+                'key': field.key,
+                'value': field.value,
+            }
+            for field in self.fields
+        ]
+
+    @on(DynamicField.Empty)
+    async def on_field_is_empty(self, message: DynamicField.Empty) -> None:
+        await self.remove_field(field=message.control)
+        self.post_message(
+            message=self.FieldEmpty(fields=self, field=message.control)
+        )
+
+    @on(DynamicField.Filled)
+    async def on_field_is_filled(self, message: DynamicField.Filled) -> None:
+        if len(self.empty_fields) == 0:
+            last_field = self.fields[-1]
+            if isinstance(last_field, TextDynamicField):
+                await self.add_field(
+                    TextDynamicField(enabled=False, key='', value='')
+                )
+            elif isinstance(last_field, TextOrFileDynamicField):
+                await self.add_field(
+                    TextOrFileDynamicField(
+                        enabled=False,
+                        key='',
+                        value='',
+                        value_mode=_ValueMode.TEXT,
+                    )
+                )
+
+        self.post_message(
+            message=self.FieldFilled(fields=self, field=message.control)
+        )
+
+    @on(DynamicField.RemoveRequested)
+    async def on_field_remove_requested(
+        self, message: DynamicField.RemoveRequested
+    ) -> None:
+        await self.remove_field(field=message.control)
+
+    async def add_field(self, field: DynamicField) -> None:
+        await self.fields_container.mount(field)
+
+    async def remove_field(self, field: DynamicField) -> None:
+        if len(self.fields) == 1:
+            self.app.bell()
+            return
+        elif self.fields[-1] is field:  # Last field
+            self.app.bell()
+            return
+
+        if self.fields[0] is field:  # First field
+            self.app.screen.focus_next()
+            self.app.screen.focus_next()
+            self.app.screen.focus_next()
+            self.app.screen.focus_next()
+        elif self.fields[-2] is field:  # Penultimate field
+            self.app.screen.focus_previous()
+            self.app.screen.focus_previous()
+            self.app.screen.focus_previous()
+            self.app.screen.focus_previous()
+
+        field.add_class('hidden')
+        await field.remove()  # Maybe the `await` is unnecessary

{restiny-0.1.2 → restiny-0.2.0}/restiny/widgets/path_chooser.py

@@ -184,30 +184,42 @@ class DirectoryChooserScreen(PathChooserScreen):
 class PathChooser(Widget):
     DEFAULT_CSS = """
     PathChooser {
+        width: 1fr;
         height: auto;
-        width: auto;
+        layout: grid;
+        grid-size: 2 1;
+        grid-columns: 1fr auto;
     }
 
-    Input {
-        width: 1fr;
+    PathChooser > Input {
+        margin-right: 0;
+        border-right: none;
     }
 
-    Button {
-        width: auto;
+    PathChooser > Button {
+        margin-left: 0;
+        border-left: none;
     }
     """
 
-    path: Reactive[Path | None] = Reactive(None, init=True)
+    path: Reactive[Path | None] = Reactive(None)
 
     class Changed(Message):
         """
         Sent when the user change the selected path.
         """
 
-        def __init__(self, path: Path | None) -> None:
+        def __init__(
+            self, path_chooser: PathChooser, path: Path | None
+        ) -> None:
             super().__init__()
+            self.path_chooser = path_chooser
             self.path = path
 
+        @property
+        def control(self) -> 'PathChooser':
+            return self.path_chooser
+
     @classmethod
     def file(cls, *args, **kwargs) -> 'PathChooser':
         return cls(*args, **kwargs, path_type='file')
@@ -217,20 +229,32 @@ class PathChooser(Widget):
         return cls(*args, **kwargs, path_type='directory')
 
     def __init__(
-        self, path_type: Literal['file', 'directory'], *args, **kwargs
+        self,
+        path_type: Literal['file', 'directory'],
+        path: Path | None = None,
+        *args,
+        **kwargs,
     ) -> None:
         super().__init__(*args, **kwargs)
+        self._path = path
         self.path_type = path_type
 
     def compose(self) -> ComposeResult:
-        with Horizontal():
-            yield Input(placeholder='--empty--', disabled=True)
-            yield Button(f'  Choose {self.path_type}  ')
+        button_label = ''
+        if self.path_type == 'file':
+            button_label = ' 📄 '
+        elif self.path_type == 'directory':
+            button_label = ' 🗂 '
+
+        yield Input(placeholder='--empty--', disabled=True)
+        yield Button(button_label, tooltip=f'Choose {self.path_type}')
 
     def on_mount(self) -> None:
         self.input = self.query_one(Input)
         self.button = self.query_one(Button)
 
+        self.path = self._path
+
     @on(Button.Pressed)
     def open_path_chooser(self) -> None:
         def set_path(path: Path | None = None) -> None:
@@ -250,4 +274,4 @@ class PathChooser(Widget):
     def watch_path(self, value: Path | None) -> None:
         self.input.value = str(value) if value else ''
         self.input.tooltip = str(value) if value else ''
-        self.post_message(message=self.Changed(path=value))
+        self.post_message(message=self.Changed(path_chooser=self, path=value))

{restiny-0.1.2 → restiny-0.2.0}/restiny.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: restiny
-Version: 0.1.2
+Version: 0.2.0
 Summary: A minimalist HTTP client, no bullshit
 Author-email: Kalebe Chimanski de Almeida <kalebe.chi.almeida@gmail.com>
 License:                                  Apache License
@@ -220,6 +220,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Operating System :: POSIX :: Linux
 Classifier: Operating System :: MacOS
 Classifier: Operating System :: Microsoft :: Windows :: Windows 10
@@ -230,14 +231,14 @@ Classifier: Natural Language :: English
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: textual<6.3,>=6.2
+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
 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-blue)
+![Python versions](https://img.shields.io/badge/Python-3.10%20|%203.11%20|%203.12%20|%203.13%20|%203.14-blue)
 
 
 - [RESTiny](#restiny)
@@ -253,7 +254,7 @@ Dynamic: license-file
 
 _A minimal, elegant HTTP client for Python — with a TUI interface powered by [Textual](https://github.com/Textualize/textual)._
 
-<img width="1905" alt="image" src="https://github.com/user-attachments/assets/e6f0c03a-e98e-40cd-af1d-38489d650fb1" />
+![image](https://github.com/user-attachments/assets/e6f0c03a-e98e-40cd-af1d-38489d650fb1)
 
 ## How to install
 

{restiny-0.1.2 → restiny-0.2.0}/restiny.egg-info/SOURCES.txt

@@ -15,9 +15,6 @@ restiny.egg-info/requires.txt
 restiny.egg-info/top_level.txt
 restiny/assets/__init__.py
 restiny/assets/style.tcss
-restiny/assets/__pycache__/__init__.cpython-310.pyc
-restiny/assets/__pycache__/__init__.cpython-313.pyc
-restiny/assets/__pycache__/__init__.cpython-314.pyc
 restiny/core/__init__.py
 restiny/core/app.py
 restiny/core/request_area.py

{restiny-0.1.2 → restiny-0.2.0}/restiny.egg-info/requires.txt

@@ -1,4 +1,4 @@
-textual<6.3,>=6.2
+textual<6.4,>=6.3
 textual[syntax]
 httpx<0.29,>=0.28
 pyperclip<1.10,>=1.9

restiny-0.1.2/restiny/__about__.py

@@ -1 +0,0 @@
-__version__ = '0.1.2'

restiny-0.1.2/restiny/widgets/dynamic_fields.py

@@ -1,287 +0,0 @@
-from textual import on
-from textual.app import ComposeResult
-from textual.containers import VerticalScroll
-from textual.message import Message
-from textual.widgets import Button, Input, Static, Switch
-
-
-class DynamicField(Static):
-    """
-    Enableable and removable field
-    """
-
-    DEFAULT_CSS = """
-    DynamicField {
-        layout: grid;
-        grid-size: 4 1;
-        grid-columns: auto 1fr 2fr auto; /* Set 1:2 ratio between Inputs */
-    }
-    """
-
-    class Enabled(Message):
-        """
-        Sent when the user enables the field.
-        """
-
-        def __init__(self, control: 'DynamicField') -> None:
-            super().__init__()
-            self._control = control
-
-        def control(self) -> 'DynamicField':
-            return self._control
-
-    class Disabled(Message):
-        """
-        Sent when the user disables the field.
-        """
-
-        def __init__(self, control: 'DynamicField') -> None:
-            super().__init__()
-            self._control = control
-
-        @property
-        def control(self) -> 'DynamicField':
-            return self._control
-
-    class Empty(Message):
-        """
-        Sent when the key input and value input is empty.
-        """
-
-        def __init__(self, control: 'DynamicField') -> None:
-            super().__init__()
-            self._control = control
-
-        @property
-        def control(self) -> 'DynamicField':
-            return self._control
-
-    class Filled(Message):
-        """
-        Sent when the key input or value input is filled.
-        """
-
-        def __init__(self, control: 'DynamicField') -> None:
-            super().__init__()
-            self._control = control
-
-        @property
-        def control(self) -> 'DynamicField':
-            return self._control
-
-    class RemoveRequested(Message):
-        """
-        Sent when the user clicks the remove button.
-        The listener of this event decides whether
-        to actually remove the field or not.
-        """
-
-        def __init__(self, control: 'DynamicField') -> None:
-            super().__init__()
-            self._control = control
-
-        @property
-        def control(self) -> 'DynamicField':
-            return self._control
-
-    def __init__(
-        self, enabled: bool, key: str, value: str, *args, **kwargs
-    ) -> None:
-        super().__init__(*args, **kwargs)
-
-        # Store initial values temporarily; applied after mounting.
-        self._initial_enabled = enabled
-        self._initial_key = key
-        self._initial_value = value
-
-    def compose(self) -> ComposeResult:
-        yield Switch(value=self._initial_enabled, tooltip='Send this field?')
-        yield Input(value=self._initial_key, placeholder='Key', id='input-key')
-        yield Input(
-            value=self._initial_value, placeholder='Value', id='input-value'
-        )
-        yield Button(label='➖', tooltip='Remove field')
-
-    def on_mount(self) -> None:
-        self.enabled_switch: Switch = self.query_one(Switch)
-        self.key_input: Input = self.query_one('#input-key')
-        self.value_input: Input = self.query_one('#input-value')
-        self.remove_button: Button = self.query_one(Button)
-
-    @property
-    def enabled(self) -> bool:
-        return self.enabled_switch.value
-
-    @enabled.setter
-    def enabled(self, value: bool) -> None:
-        self.enabled_switch.value = value
-
-    @property
-    def key(self) -> str:
-        return self.key_input.value
-
-    @key.setter
-    def key(self, value: str) -> None:
-        self.key_input.value = value
-
-    @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 is_empty(self) -> bool:
-        return (
-            len(self.key_input.value) == 0 and len(self.value_input.value) == 0
-        )
-
-    @property
-    def is_filled(self) -> bool:
-        return len(self.key_input.value) > 0 or len(self.value_input.value) > 0
-
-    @on(Switch.Changed)
-    def on_enabled_or_disabled(self, message: Switch.Changed) -> None:
-        if message.value is True:
-            self.post_message(self.Enabled(control=self))
-        elif message.value is False:
-            self.post_message(message=self.Disabled(control=self))
-
-    @on(Input.Changed)
-    def on_input_changed(self, message: Input.Changed) -> None:
-        self.enabled_switch.value = True
-
-        if self.is_empty:
-            self.post_message(message=self.Empty(control=self))
-        elif self.is_filled:
-            self.post_message(message=self.Filled(control=self))
-
-    @on(Button.Pressed)
-    def on_remove_requested(self, message: Button.Pressed) -> None:
-        self.post_message(self.RemoveRequested(control=self))
-
-
-class DynamicFields(Static):
-    """
-    Enableable and removable fields
-    """
-
-    class FieldEmpty(Message):
-        """
-        Sent when one of the fields becomes empty.
-        """
-
-        def __init__(
-            self, control: 'DynamicFields', field: DynamicField
-        ) -> None:
-            super().__init__()
-            self._control = control
-            self.field = field
-
-        @property
-        def control(self) -> 'DynamicFields':
-            return self._control
-
-    class FieldFilled(Message):
-        """
-        Sent when one of the fields becomes filled.
-        """
-
-        def __init__(
-            self, control: 'DynamicFields', field: DynamicField
-        ) -> None:
-            super().__init__()
-            self._control = control
-            self.field = field
-
-        @property
-        def control(self) -> 'DynamicFields':
-            return self._control
-
-    def __init__(self, fields: list[DynamicField], *args, **kwargs) -> None:
-        super().__init__(*args, **kwargs)
-        self._initial_fields = fields
-
-    def compose(self) -> ComposeResult:
-        yield VerticalScroll()
-
-    async def on_mount(self) -> None:
-        self.fields_container: VerticalScroll = self.query_one(VerticalScroll)
-
-        # Set initial_fields
-        for field in self._initial_fields:
-            await self.add_field(field=field)
-
-    @property
-    def fields(self) -> list[DynamicField]:
-        return list(self.query(DynamicField))
-
-    @property
-    def empty_fields(self) -> list[DynamicField]:
-        return [field for field in self.query(DynamicField) if field.is_empty]
-
-    @property
-    def filled_fields(self) -> list[DynamicField]:
-        return [field for field in self.query(DynamicField) if field.is_filled]
-
-    @property
-    def values(self) -> list[dict[str, str | bool]]:
-        return [
-            {
-                'enabled': field.enabled,
-                'key': field.key,
-                'value': field.value,
-            }
-            for field in self.fields
-        ]
-
-    @on(DynamicField.Empty)
-    async def on_field_is_empty(self, message: DynamicField.Empty) -> None:
-        await self.remove_field(field=message.control)
-        self.post_message(
-            message=self.FieldEmpty(control=self, field=message.control)
-        )
-
-    @on(DynamicField.Filled)
-    async def on_field_is_filled(self, message: DynamicField.Filled) -> None:
-        if len(self.empty_fields) == 0:
-            await self.add_field(
-                field=DynamicField(enabled=False, key='', value='')
-            )
-
-        self.post_message(
-            message=self.FieldFilled(control=self, field=message.control)
-        )
-
-    @on(DynamicField.RemoveRequested)
-    async def on_field_remove_requested(
-        self, message: DynamicField.RemoveRequested
-    ) -> None:
-        await self.remove_field(field=message.control)
-
-    async def add_field(self, field: DynamicField) -> None:
-        await self.fields_container.mount(field)
-
-    async def remove_field(self, field: DynamicField) -> None:
-        if len(self.fields) == 1:
-            self.app.bell()
-            return
-        elif self.fields[-1] is field:  # Last field
-            self.app.bell()
-            return
-
-        if self.fields[0] is field:  # First field
-            self.app.screen.focus_next()
-            self.app.screen.focus_next()
-            self.app.screen.focus_next()
-            self.app.screen.focus_next()
-        elif self.fields[-2] is field:  # Penultimate field
-            self.app.screen.focus_previous()
-            self.app.screen.focus_previous()
-            self.app.screen.focus_previous()
-            self.app.screen.focus_previous()
-
-        field.add_class('hidden')
-        await field.remove()  # Maybe the `await` is unnecessary