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

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'):
@@ -159,6 +174,7 @@ class RequestArea(Static):
                     yield Input(
                         '5.5',
                         placeholder='5.5',
+                        select_on_focus=False,
                         id='options-timeout',
                         classes='w-1fr',
                     )
@@ -187,6 +203,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(
@@ -196,61 +215,47 @@ class RequestArea(Static):
             '#options-verify-ssl', Switch
         )
 
+    def get_data(self) -> RequestAreaData:
+        return RequestAreaData(
+            headers=self._get_headers(),
+            query_params=self._get_query_params(),
+            body=self._get_body(),
+            options=self._get_options(),
+        )
+
     @on(Select.Changed, '#body-mode')
-    def on_change_body_type(self, message: Select.Changed) -> None:
+    def _on_change_body_type(self, message: Select.Changed) -> None:
         if message.value == BodyMode.FILE:
             self.body_mode_switcher.current = 'body-mode-file'
         elif message.value == BodyMode.RAW:
             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:
+    def _on_change_body_raw_language(self, message: Select.Changed) -> None:
         self.body_raw_editor.language = message.value
 
     @on(DynamicFields.FieldFilled, '#body-form-urlencoded')
-    def on_form_filled(self, message: DynamicFields.FieldFilled) -> None:
+    def _on_form_filled(self, message: DynamicFields.FieldFilled) -> None:
         self.body_enabled_switch.value = True
 
     @on(DynamicFields.FieldEmpty, '#body-form-urlencoded')
-    def on_form_empty(self, message: DynamicFields.FieldEmpty) -> None:
+    def _on_form_empty(self, message: DynamicFields.FieldEmpty) -> None:
         if not message.control.filled_fields:
             self.body_enabled_switch.value = False
 
     @on(CustomTextArea.Changed, '#body-raw')
-    def on_change_body_text(self, message: CustomTextArea.Changed) -> None:
+    def _on_change_body_raw(self, message: CustomTextArea.Changed) -> None:
         if self.body_raw_editor.text == '':
             self.body_enabled_switch.value = False
         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:
+    def _on_change_timeout(self, message: Input.Changed) -> None:
         new_value = message.value
 
         if new_value == '':
@@ -263,73 +268,70 @@ class RequestArea(Static):
                 self.options_timeout_input.value[:-1]
             )
 
-    def get_data(self) -> RequestAreaData:
-        def get_headers() -> list[HeaderField]:
-            return [
-                HeaderField(
-                    enabled=header_field['enabled'],
-                    key=header_field['key'],
-                    value=header_field['value'],
-                )
-                for header_field in self.header_fields.values
-            ]
-
-        def get_query_params() -> list[QueryParamField]:
-            return [
-                QueryParamField(
-                    enabled=query_param_field['enabled'],
-                    key=query_param_field['key'],
-                    value=query_param_field['value'],
+    def _get_headers(self) -> list[HeaderField]:
+        return [
+            HeaderField(
+                enabled=header_field['enabled'],
+                key=header_field['key'],
+                value=header_field['value'],
+            )
+            for header_field in self.header_fields.values
+        ]
+
+    def _get_query_params(self) -> list[QueryParamField]:
+        return [
+            QueryParamField(
+                enabled=query_param_field['enabled'],
+                key=query_param_field['key'],
+                value=query_param_field['value'],
+            )
+            for query_param_field in self.param_fields.values
+        ]
+
+    def _get_body(self) -> RequestAreaData.Body:
+        body_send: bool = self.body_enabled_switch.value
+        body_type: str = BodyMode(self.body_mode_select.value)
+
+        payload = None
+        if body_type == BodyMode.RAW:
+            payload = self.body_raw_editor.text
+        elif body_type == BodyMode.FILE:
+            payload = self.body_file_path_chooser.path
+        elif body_type == BodyMode.FORM_URLENCODED:
+            payload = []
+            for form_item in self.body_form_urlencoded_fields.values:
+                payload.append(
+                    FormUrlEncodedField(
+                        enabled=form_item['enabled'],
+                        key=form_item['key'],
+                        value=form_item['value'],
+                    )
                 )
-                for query_param_field in self.param_fields.values
-            ]
-
-        def get_body() -> RequestAreaData.Body:
-            body_send: bool = self.body_enabled_switch.value
-            body_type: str = BodyMode(self.body_mode_select.value)
-
-            payload = None
-            if body_type == BodyMode.RAW:
-                payload = self.body_raw_editor.text
-            elif body_type == BodyMode.FILE:
-                payload = self.body_file_path_chooser.path
-            elif body_type == BodyMode.FORM_URLENCODED:
-                payload = []
-                for form_item in self.body_form_urlencoded_fields.values:
-                    payload.append(
-                        FormUrlEncodedField(
-                            enabled=form_item['enabled'],
-                            key=form_item['key'],
-                            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,
-                raw_language=BodyRawLanguage(
-                    self.body_raw_language_select.value
-                ),
-                type=body_type,
-                payload=payload,
-            )
+        return RequestAreaData.Body(
+            enabled=body_send,
+            raw_language=BodyRawLanguage(self.body_raw_language_select.value),
+            type=body_type,
+            payload=payload,
+        )
 
-        def get_options() -> RequestAreaData.Options:
-            timeout = None
-            if self.options_timeout_input.value:
-                timeout = float(self.options_timeout_input.value)
+    def _get_options(self) -> RequestAreaData.Options:
+        timeout = None
+        if self.options_timeout_input.value:
+            timeout = float(self.options_timeout_input.value)
 
-            return RequestAreaData.Options(
-                timeout=timeout,
-                follow_redirects=self.options_follow_redirects_switch.value,
-                verify_ssl=self.options_verify_ssl_switch.value,
-            )
-
-        return RequestAreaData(
-            headers=get_headers(),
-            query_params=get_query_params(),
-            body=get_body(),
-            options=get_options(),
+        return RequestAreaData.Options(
+            timeout=timeout,
+            follow_redirects=self.options_follow_redirects_switch.value,
+            verify_ssl=self.options_verify_ssl_switch.value,
         )
-
-    def set_content_type() -> None:
-        raise NotImplementedError()

restiny/core/response_area.py

@@ -1,6 +1,9 @@
+from dataclasses import dataclass
+from http import HTTPStatus
+
 from textual import on
 from textual.app import ComposeResult
-from textual.reactive import Reactive
+from textual.containers import VerticalScroll
 from textual.widgets import (
     ContentSwitcher,
     DataTable,
@@ -15,6 +18,16 @@ from restiny.enums import BodyRawLanguage
 from restiny.widgets import CustomTextArea
 
 
+@dataclass
+class ResponseAreaData:
+    status: HTTPStatus
+    size: int
+    elapsed_time: float | int
+    headers: dict
+    body_raw_language: BodyRawLanguage
+    body_raw: str
+
+
 # TODO: Implement 'Trace' tab pane
 class ResponseArea(Static):
     ALLOW_MAXIMIZE = True
@@ -38,8 +51,6 @@ class ResponseArea(Static):
 
     """
 
-    has_response: bool = Reactive(False, layout=True, init=True)
-
     def compose(self) -> ComposeResult:
         with ContentSwitcher(id='response-switcher', initial='no-content'):
             yield Label(
@@ -49,7 +60,8 @@ class ResponseArea(Static):
 
             with TabbedContent(id='content'):
                 with TabPane('Headers'):
-                    yield DataTable(show_cursor=False, id='headers')
+                    with VerticalScroll():
+                        yield DataTable(show_cursor=False, id='headers')
                 with TabPane('Body'):
                     yield Select(
                         (
@@ -60,11 +72,11 @@ class ResponseArea(Static):
                             ('XML', BodyRawLanguage.XML),
                         ),
                         allow_blank=False,
-                        tooltip='Body type',
-                        id='body-type',
+                        tooltip='Syntax highlighting for the response body',
+                        id='body-raw-language',
                     )
                     yield CustomTextArea.code_editor(
-                        id='body', read_only=True, classes='mt-1'
+                        id='body-raw', read_only=True, classes='mt-1'
                     )
 
     def on_mount(self) -> None:
@@ -73,25 +85,46 @@ class ResponseArea(Static):
         )
 
         self.headers_data_table = self.query_one('#headers', DataTable)
-        self.body_type_select = self.query_one('#body-type', Select)
-        self.body_text_area = self.query_one('#body', CustomTextArea)
+        self.body_raw_language_select = self.query_one(
+            '#body-raw-language', Select
+        )
+        self.body_raw_editor = self.query_one('#body-raw', CustomTextArea)
 
         self.headers_data_table.add_columns('Key', 'Value')
 
-    @on(Select.Changed, '#body-type')
-    def on_body_type_changed(self, message: Select.Changed) -> None:
-        self.body_text_area.language = self.body_type_select.value
+    def set_data(self, data: ResponseAreaData | None) -> None:
+        self.border_title = self.BORDER_TITLE
+        self.border_subtitle = ''
+        self.headers_data_table.clear()
+        self.body_raw_language_select.value = BodyRawLanguage.PLAIN
+        self.body_raw_editor.clear()
 
-    def watch_has_response(self, value: bool) -> None:
+        if data is None:
+            return
+
+        self.border_title = f'Response - {data.status} {data.status.phrase}'
+        self.border_subtitle = (
+            f'{data.size} bytes in {data.elapsed_time} seconds'
+        )
+        for header_key, header_value in data.headers.items():
+            self.headers_data_table.add_row(header_key, header_value)
+        self.body_raw_language_select.value = data.body_raw_language
+        self.body_raw_editor.text = data.body_raw
+
+    @property
+    def is_showing_response(self) -> bool:
+        if self._response_switcher.current == 'content':
+            return True
+        elif self._response_switcher.current == 'no-content':
+            return False
+
+    @is_showing_response.setter
+    def is_showing_response(self, value: bool) -> None:
         if value is True:
             self._response_switcher.current = 'content'
         elif value is False:
             self._response_switcher.current = 'no-content'
-            self.reset_response()
 
-    def reset_response(self) -> None:
-        self.border_title = self.BORDER_TITLE
-        self.border_subtitle = ''
-        self.headers_data_table.clear()
-        self.body_type_select.value = BodyRawLanguage.PLAIN
-        self.body_text_area.clear()
+    @on(Select.Changed, '#body-raw-language')
+    def _on_body_raw_language_changed(self, message: Select.Changed) -> None:
+        self.body_raw_editor.language = self.body_raw_language_select.value

restiny/core/url_area.py

@@ -3,7 +3,6 @@ from dataclasses import dataclass
 from textual import on
 from textual.app import ComposeResult
 from textual.message import Message
-from textual.reactive import Reactive
 from textual.widgets import Button, ContentSwitcher, Input, Select, Static
 
 from restiny.enums import HTTPMethod
@@ -29,8 +28,6 @@ class URLArea(Static):
     }
     """
 
-    request_pending = Reactive(False)
-
     class SendRequest(Message):
         """
         Sent when the user send a request.
@@ -47,11 +44,15 @@ class URLArea(Static):
         def __init__(self) -> None:
             super().__init__()
 
+    def __init__(self, *args, **kwargs) -> None:
+        super().__init__(*args, **kwargs)
+        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', id='url')
+        yield Input(placeholder='Enter URL', select_on_focus=False, id='url')
         with ContentSwitcher(
             id='request-button-switcher', initial='send-request'
         ):
@@ -78,9 +79,28 @@ class URLArea(Static):
         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
+
+    @request_pending.setter
+    def request_pending(self, value: bool) -> None:
+        if value is True:
+            self._request_button_switcher.current = 'cancel-request'
+        elif value is False:
+            self._request_button_switcher.current = 'send-request'
+
+        self._request_pending = value
+
     @on(Button.Pressed, '#send-request')
-    @on(Input.Submitted)
-    def on_send_request(
+    @on(Input.Submitted, '#url')
+    def _on_send_request(
         self, message: Button.Pressed | Input.Submitted
     ) -> None:
         if self.request_pending:
@@ -88,22 +108,10 @@ class URLArea(Static):
 
         self.post_message(message=self.SendRequest())
 
-    @on(Input.Submitted)
     @on(Button.Pressed, '#cancel-request')
-    def on_cancel_request(self, message: Button.Pressed) -> None:
+    @on(Input.Submitted, '#url')
+    def _on_cancel_request(self, message: Button.Pressed) -> None:
         if not self.request_pending:
             return
 
         self.post_message(message=self.CancelRequest())
-
-    def watch_request_pending(self, value: bool) -> None:
-        if value is True:
-            self._request_button_switcher.current = 'cancel-request'
-        elif value is False:
-            self._request_button_switcher.current = 'send-request'
-
-    def get_data(self) -> URLAreaData:
-        return URLAreaData(
-            method=self.method_select.value,
-            url=self.url_input.value,
-        )

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/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',