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

restiny/{core → ui}/url_area.py

@@ -1,17 +1,11 @@
-from dataclasses import dataclass
-
 from textual import on
 from textual.app import ComposeResult
+from textual.containers import Horizontal
 from textual.message import Message
-from textual.widgets import Button, ContentSwitcher, Input, Select, Static
+from textual.widgets import Button, ContentSwitcher, Select, Static
 
 from restiny.enums import HTTPMethod
-
-
-@dataclass
-class URLAreaData:
-    method: str
-    url: str
+from restiny.widgets import CustomInput
 
 
 class URLArea(Static):
@@ -20,9 +14,8 @@ class URLArea(Static):
     BORDER_TITLE = 'URL'
     DEFAULT_CSS = """
     URLArea {
-        layout: grid;
-        grid-size: 3 1;
-        grid-columns: 1fr 6fr 1fr;
+        width: 1fr;
+        height: auto;
         border: heavy black;
         border-title-color: gray;
     }
@@ -49,25 +42,34 @@ class URLArea(Static):
         self._request_pending = False
 
     def compose(self) -> ComposeResult:
-        yield Select.from_values(
-            values=HTTPMethod.values(), allow_blank=False, id='method'
-        )
-        yield Input(placeholder='Enter URL', select_on_focus=False, id='url')
-        with ContentSwitcher(
-            id='request-button-switcher', initial='send-request'
-        ):
-            yield Button(
-                label='Send Request',
-                id='send-request',
+        with Horizontal(classes='h-auto'):
+            yield Select.from_values(
+                values=[method.value for method in HTTPMethod],
+                allow_blank=False,
                 classes='w-1fr',
-                variant='default',
+                id='method',
             )
-            yield Button(
-                label='Cancel Request',
-                id='cancel-request',
-                classes='w-1fr',
-                variant='error',
+            yield CustomInput(
+                placeholder='Enter URL',
+                select_on_focus=False,
+                classes='w-5fr',
+                id='url',
             )
+            with ContentSwitcher(
+                id='request-button-switcher', initial='send-request'
+            ):
+                yield Button(
+                    label='Send Request',
+                    id='send-request',
+                    classes='w-1fr',
+                    variant='default',
+                )
+                yield Button(
+                    label='Cancel Request',
+                    id='cancel-request',
+                    classes='w-1fr',
+                    variant='error',
+                )
 
     def on_mount(self) -> None:
         self._request_button_switcher = self.query_one(
@@ -75,16 +77,10 @@ class URLArea(Static):
         )
 
         self.method_select = self.query_one('#method', Select)
-        self.url_input = self.query_one('#url', Input)
+        self.url_input = self.query_one('#url', CustomInput)
         self.send_request_button = self.query_one('#send-request', Button)
         self.cancel_request_button = self.query_one('#cancel-request', Button)
 
-    def get_data(self) -> URLAreaData:
-        return URLAreaData(
-            method=self.method_select.value,
-            url=self.url_input.value,
-        )
-
     @property
     def request_pending(self) -> bool:
         return self._request_pending
@@ -98,10 +94,26 @@ class URLArea(Static):
 
         self._request_pending = value
 
+    @property
+    def method(self) -> HTTPMethod:
+        return self.method_select.value
+
+    @method.setter
+    def method(self, value: HTTPMethod) -> None:
+        self.method_select.value = value
+
+    @property
+    def url(self) -> str:
+        return self.url_input.value
+
+    @url.setter
+    def url(self, value: str) -> None:
+        self.url_input.value = value
+
     @on(Button.Pressed, '#send-request')
-    @on(Input.Submitted, '#url')
+    @on(CustomInput.Submitted, '#url')
     def _on_send_request(
-        self, message: Button.Pressed | Input.Submitted
+        self, message: Button.Pressed | CustomInput.Submitted
     ) -> None:
         if self.request_pending:
             return
@@ -109,7 +121,7 @@ class URLArea(Static):
         self.post_message(message=self.SendRequest())
 
     @on(Button.Pressed, '#cancel-request')
-    @on(Input.Submitted, '#url')
+    @on(CustomInput.Submitted, '#url')
     def _on_cancel_request(self, message: Button.Pressed) -> None:
         if not self.request_pending:
             return

restiny/utils.py

@@ -8,32 +8,43 @@ import httpx
 def build_curl_cmd(
     method: str,
     url: str,
-    headers: dict[str, str] = {},
-    params: dict[str, str] = {},
-    raw_body: str | None = None,
-    form_urlencoded: dict[str, str] = {},
-    form_multipart: dict[str, str | Path] = {},
-    files: list[Path] = [],
+    headers: dict[str, str] | None = None,
+    params: dict[str, str] | None = None,
+    body_raw: str | None = None,
+    body_form_urlencoded: dict[str, str] | None = None,
+    body_form_multipart: dict[str, str | Path] | None = None,
+    body_files: list[Path] | None = None,
+    auth_basic: tuple[str, str] | None = None,
+    auth_bearer: str | None = None,
+    auth_api_key_header: tuple[str, str] | None = None,
+    auth_api_key_param: tuple[str, str] | None = None,
+    auth_digest: tuple[str, str] | None = None,
 ) -> str:
     cmd_parts = ['curl']
+
+    # Method
     cmd_parts.extend(['--request', method])
 
-    url = str(httpx.URL(url).copy_merge_params(params))
+    # URL + Params
+    if params:
+        url = str(httpx.URL(url).copy_merge_params(params))
     cmd_parts.extend(['--url', shlex.quote(url)])
 
+    # Headers
     for header_key, header_value in headers.items():
         header = f'{header_key}: {header_value}'
         cmd_parts.extend(['--header', shlex.quote(header)])
 
-    if raw_body:
-        cmd_parts.extend(['--data', shlex.quote(raw_body)])
-    elif form_urlencoded:
-        for form_key, form_value in form_urlencoded.items():
+    # Body
+    if body_raw:
+        cmd_parts.extend(['--data', shlex.quote(body_raw)])
+    elif body_form_urlencoded:
+        for form_key, form_value in body_form_urlencoded.items():
             cmd_parts.extend(
                 ['--data', shlex.quote(f'{form_key}={form_value}')]
             )
-    elif form_multipart:
-        for form_key, form_value in form_multipart.items():
+    elif body_form_multipart:
+        for form_key, form_value in body_form_multipart.items():
             if isinstance(form_value, str):
                 cmd_parts.extend(
                     ['--form', shlex.quote(f'{form_key}={form_value}')]
@@ -42,10 +53,29 @@ def build_curl_cmd(
                 cmd_parts.extend(
                     ['--form', shlex.quote(f'{form_key}=@{form_value}')]
                 )
-    elif files:
-        for file in files:
+    elif body_files:
+        for file in body_files:
             cmd_parts.extend(['--data', shlex.quote(f'@{file}')])
 
+    # Auth
+    if auth_basic:
+        user, pwd = auth_basic
+        cmd_parts.extend(['--user', shlex.quote(f'{user}:{pwd}')])
+    elif auth_bearer:
+        token = auth_bearer
+        cmd_parts.extend(['--header', shlex.quote(f'Authorization: {token}')])
+    elif auth_api_key_header:
+        key, value = auth_api_key_header
+        cmd_parts.extend(['--header', shlex.quote(f'{key}: {value}')])
+    elif auth_api_key_param:
+        key, value = auth_api_key_param
+        url_arg_index = cmd_parts.index('--url')
+        new_url = str(httpx.URL(url).copy_merge_params({key: value}))
+        cmd_parts[url_arg_index + 1] = shlex.quote(new_url)
+    elif auth_digest:
+        user, pwd = auth_digest
+        cmd_parts.extend(['--digest', '--user', shlex.quote(f'{user}:{pwd}')])
+
     return ' '.join(cmd_parts)
 
 
@@ -102,3 +132,10 @@ def first_char_non_empty(text: str) -> int | None:
 
 def seconds_to_milliseconds(seconds: int | float) -> int:
     return round(seconds * 1000)
+
+
+def shorten_string(value: str, max_lenght: int, elipsis: str = '..') -> str:
+    if len(value) <= max_lenght:
+        return value
+
+    return value[: max_lenght - len(elipsis)] + elipsis

restiny/widgets/__init__.py

@@ -2,15 +2,29 @@
 This module contains reusable widgets used in the DataFox interface.
 """
 
+from restiny.widgets.collections_tree import CollectionsTree
+from restiny.widgets.confirm_prompt import ConfirmPrompt, ConfirmPromptResult
 from restiny.widgets.custom_directory_tree import CustomDirectoryTree
+from restiny.widgets.custom_input import CustomInput
 from restiny.widgets.custom_text_area import CustomTextArea
-from restiny.widgets.dynamic_fields import DynamicFields, TextDynamicField
+from restiny.widgets.dynamic_fields import (
+    DynamicFields,
+    TextDynamicField,
+    TextOrFileDynamicField,
+)
+from restiny.widgets.password_input import PasswordInput
 from restiny.widgets.path_chooser import PathChooser
 
 __all__ = [
     'TextDynamicField',
+    'TextOrFileDynamicField',
     'DynamicFields',
     'CustomDirectoryTree',
     'CustomTextArea',
     'PathChooser',
+    'PasswordInput',
+    'CustomInput',
+    'CollectionsTree',
+    'ConfirmPrompt',
+    'ConfirmPromptResult',
 ]

restiny/widgets/collections_tree.py

@@ -0,0 +1,70 @@
+from textual.widgets import Tree
+from textual.widgets.tree import TreeNode
+
+from restiny.enums import HTTPMethod
+
+
+class CollectionsTree(Tree):
+    show_root = False
+
+    def on_mount(self) -> None:
+        self.node_by_id: dict[int | None, TreeNode] = {}
+        self.node_by_id[None] = self.root
+        self.root.data = {'name': '/', 'id': None}
+
+    @property
+    def current_parent_folder(self) -> TreeNode:
+        if not self.cursor_node:
+            return self.root
+
+        return self.cursor_node.parent
+
+    @property
+    def current_folder(self) -> TreeNode:
+        if not self.cursor_node:
+            return self.root
+
+        if self.cursor_node.allow_expand:
+            return self.cursor_node
+        else:
+            return self.cursor_node.parent
+
+    def add_folder(
+        self, parent_node: TreeNode | None, name: str, id: int
+    ) -> TreeNode:
+        parent_node = parent_node or self.root
+
+        node = parent_node.add(label=name)
+        node.data = {
+            'name': name,
+            'id': id,
+        }
+        self.node_by_id[id] = node
+        return node
+
+    def add_request(
+        self, parent_node: TreeNode | None, method: str, name: str, id: int
+    ) -> TreeNode:
+        parent_node = parent_node or self.root
+
+        method_to_color = {
+            HTTPMethod.GET: '#00cc66',  # green
+            HTTPMethod.POST: '#ffcc00',  # yellow
+            HTTPMethod.PUT: '#3388ff',  # blue
+            HTTPMethod.PATCH: '#00b3b3',  # teal
+            HTTPMethod.DELETE: '#ff3333',  # red
+            HTTPMethod.HEAD: '#808080',  # gray
+            HTTPMethod.OPTIONS: '#cc66ff',  # magenta
+            HTTPMethod.CONNECT: '#ff9966',  # orange
+            HTTPMethod.TRACE: '#6666ff',  # violet
+        }
+        node = parent_node.add_leaf(
+            label=f'[{method_to_color[method]}]{method}[/] {name}'
+        )  # noqa
+        node.data = {
+            'method': method,
+            'name': name,
+            'id': id,
+        }
+        self.node_by_id[id] = node
+        return node

restiny/widgets/confirm_prompt.py

@@ -0,0 +1,76 @@
+from dataclasses import dataclass
+
+from textual import on
+from textual.app import ComposeResult
+from textual.binding import Binding
+from textual.containers import Horizontal, Vertical
+from textual.screen import ModalScreen
+from textual.widgets import Button, Label
+
+
+@dataclass
+class ConfirmPromptResult:
+    confirmed: bool
+
+
+class ConfirmPrompt(ModalScreen):
+    DEFAULT_CSS = """
+    ConfirmPrompt {
+        align: center middle;
+    }
+
+    #modal-content {
+        border: heavy black;
+        border-title-color: gray;
+        background: $surface;
+        width: auto;
+        height: auto;
+        max-width: 40%;
+        text-align: center;
+    }
+
+    Horizontal {
+        align: center middle;
+    }
+
+    #message {
+    }
+    """
+    AUTO_FOCUS = '#confirm'
+
+    BINDINGS = [
+        Binding(
+            key='escape',
+            action='dismiss',
+            description='Quit the screen',
+            show=False,
+        ),
+    ]
+
+    def __init__(self, message: str = 'Are you sure?') -> None:
+        super().__init__()
+        self._message = message
+
+    def compose(self) -> ComposeResult:
+        with Vertical(id='modal-content'):
+            with Horizontal(classes='w-1fr h-auto mt-1'):
+                yield Label(self._message, id='message')
+            with Horizontal(classes='w-1fr h-auto mt-1'):
+                yield Button(label='Cancel', classes='w-1fr', id='cancel')
+                yield Button(label='Confirm', classes='w-1fr', id='confirm')
+
+    def on_mount(self) -> None:
+        self.modal_content = self.query_one('#modal-content', Vertical)
+        self.message_label = self.query_one('#message', Label)
+        self.cancel_button = self.query_one('#cancel', Button)
+        self.confirm_button = self.query_one('#confirm', Button)
+
+        self.modal_content.border_title = 'Confirm'
+
+    @on(Button.Pressed, '#cancel')
+    def _on_cancel(self, message: Button.Pressed) -> None:
+        self.dismiss(result=ConfirmPromptResult(confirmed=False))
+
+    @on(Button.Pressed, '#confirm')
+    def _on_confirm(self, message: Button.Pressed) -> None:
+        self.dismiss(result=ConfirmPromptResult(confirmed=True))

restiny/widgets/custom_input.py

@@ -0,0 +1,20 @@
+from textual import on
+from textual.binding import Binding
+from textual.events import Blur
+from textual.widgets import Input
+
+
+class CustomInput(Input):
+    BINDINGS = [
+        Binding(
+            key='ctrl+a',
+            action='select_all',
+            description='Select all text',
+            show=False,
+        ),
+    ]
+
+    @on(Blur)
+    def on_blur(self, event: Blur) -> None:
+        self.selection = 0, 0
+        self.cursor_position = len(self.value)

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)