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

restiny/__about__.py

@@ -1 +1 @@
-__version__ = '0.2.0'
+__version__ = '0.2.1'

restiny/core/app.py

@@ -1,6 +1,7 @@
 import asyncio
 import json
 import mimetypes
+from http import HTTPStatus
 from pathlib import Path
 
 import httpx
@@ -15,7 +16,14 @@ from textual.widgets import Footer, Header
 
 from restiny.__about__ import __version__
 from restiny.assets import STYLE_TCSS
-from restiny.core import RequestArea, ResponseArea, URLArea
+from restiny.core import (
+    RequestArea,
+    RequestAreaData,
+    ResponseArea,
+    URLArea,
+    URLAreaData,
+)
+from restiny.core.response_area import ResponseAreaData
 from restiny.enums import BodyMode, BodyRawLanguage, ContentType
 from restiny.utils import build_curl_cmd
 
@@ -67,25 +75,6 @@ class RESTinyApp(App, inherit_bindings=False):
         self.request_area = self.query_one(RequestArea)
         self.response_area = self.query_one(ResponseArea)
 
-    @on(DescendantFocus)
-    def on_focus(self, event: DescendantFocus) -> None:
-        self.last_focused_widget = event.widget
-        last_focused_maximizable_area = self.find_maximizable_area_by_widget(
-            widget=event.widget
-        )
-        if last_focused_maximizable_area:
-            self.last_focused_maximizable_area = last_focused_maximizable_area
-
-    @on(URLArea.SendRequest)
-    def on_send_request(self, message: URLArea.SendRequest) -> None:
-        self.response_area.reset_response()
-        self.current_request = asyncio.create_task(self.send_request())
-
-    @on(URLArea.CancelRequest)
-    def on_cancel_request(self, message: URLArea.CancelRequest) -> None:
-        if self.current_request and not self.current_request.done():
-            self.current_request.cancel()
-
     def action_maximize_or_minimize_area(self) -> None:
         if self.screen.maximized:
             self.screen.minimize()
@@ -144,39 +133,55 @@ class RESTinyApp(App, inherit_bindings=False):
             form_multipart=form_multipart,
             files=files,
         )
-        self.app.copy_to_clipboard(curl_cmd)
-        pyperclip.copy(curl_cmd)
+        self.copy_to_clipboard(curl_cmd)
         self.notify(
-            f'Command cURL copied to clipboard: `{curl_cmd}`',
+            'Command CURL copied to clipboard',
             severity='information',
         )
 
-    def find_maximizable_area_by_widget(self, widget: Widget) -> Widget | None:
-        maximizable_areas: list[str] = [
-            URLArea.__name__,
-            RequestArea.__name__,
-            ResponseArea.__name__,
-        ]
+    def copy_to_clipboard(self, text: str) -> None:
+        super().copy_to_clipboard(text)
+        try:
+            # Also copy to the system clipboard (outside of the app)
+            pyperclip.copy(text)
+        except Exception:
+            pass
+
+    @on(DescendantFocus)
+    def _on_focus(self, event: DescendantFocus) -> None:
+        self.last_focused_widget = event.widget
+        last_focused_maximizable_area = self._find_maximizable_area_by_widget(
+            widget=event.widget
+        )
+        if last_focused_maximizable_area:
+            self.last_focused_maximizable_area = last_focused_maximizable_area
+
+    @on(URLArea.SendRequest)
+    def _on_send_request(self, message: URLArea.SendRequest) -> None:
+        self.current_request = asyncio.create_task(self._send_request())
+
+    @on(URLArea.CancelRequest)
+    def _on_cancel_request(self, message: URLArea.CancelRequest) -> None:
+        if self.current_request and not self.current_request.done():
+            self.current_request.cancel()
+
+    def _find_maximizable_area_by_widget(
+        self, widget: Widget
+    ) -> Widget | None:
         while widget is not None:
-            if widget.__class__.__name__ in maximizable_areas:
+            if (
+                isinstance(widget, URLArea)
+                or isinstance(widget, RequestArea)
+                or isinstance(widget, ResponseArea)
+            ):
                 return widget
             widget = widget.parent
 
-    async def send_request(self) -> None:
+    async def _send_request(self) -> None:
         url_area_data = self.url_area.get_data()
         request_area_data = self.request_area.get_data()
 
-        headers: dict[str, str] = {
-            header.key: header.value
-            for header in request_area_data.headers
-            if header.enabled
-        }
-        query_params: dict[str, str] = {
-            param.key: param.value
-            for param in request_area_data.query_params
-            if param.enabled
-        }
-
+        self.response_area.set_data(data=None)
         self.response_area.loading = True
         self.url_area.request_pending = True
         try:
@@ -185,115 +190,14 @@ class RESTinyApp(App, inherit_bindings=False):
                 follow_redirects=request_area_data.options.follow_redirects,
                 verify=request_area_data.options.verify_ssl,
             ) as http_client:
-                request = None
-
-                if not request_area_data.body.enabled:
-                    request = http_client.build_request(
-                        method=url_area_data.method,
-                        url=url_area_data.url,
-                        headers=headers,
-                        params=query_params,
-                    )
-                else:
-                    if request_area_data.body.type == BodyMode.RAW:
-                        raw = request_area_data.body.payload
-
-                        if (
-                            request_area_data.body.raw_language
-                            == BodyRawLanguage.JSON
-                        ):
-                            headers['content-type'] = ContentType.JSON
-                            try:
-                                raw = json.dumps(raw)
-                            except Exception:
-                                pass
-                        elif (
-                            request_area_data.body.raw_language
-                            == BodyRawLanguage.YAML
-                        ):
-                            headers['content-type'] = ContentType.YAML
-                        elif (
-                            request_area_data.body.raw_language
-                            == BodyRawLanguage.HTML
-                        ):
-                            headers['content-type'] = ContentType.HTML
-                        elif (
-                            request_area_data.body.raw_language
-                            == BodyRawLanguage.XML
-                        ):
-                            headers['content-type'] = ContentType.XML
-                        elif (
-                            request_area_data.body.raw_language
-                            == BodyRawLanguage.PLAIN
-                        ):
-                            headers['content-type'] = ContentType.TEXT
-
-                        request = http_client.build_request(
-                            method=url_area_data.method,
-                            url=url_area_data.url,
-                            headers=headers,
-                            params=query_params,
-                            content=raw,
-                        )
-                    elif request_area_data.body.type == BodyMode.FILE:
-                        file = request_area_data.body.payload
-                        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,
-                            headers=headers,
-                            params=query_params,
-                            content=file.read_bytes(),
-                        )
-                    elif (
-                        request_area_data.body.type == BodyMode.FORM_URLENCODED
-                    ):
-                        form_urlencoded = {
-                            form_item.key: form_item.value
-                            for form_item in request_area_data.body.payload
-                            if form_item.enabled
-                        }
-                        request = http_client.build_request(
-                            method=url_area_data.method,
-                            url=url_area_data.url,
-                            headers=headers,
-                            params=query_params,
-                            data=form_urlencoded,
-                        )
-                    elif (
-                        request_area_data.body.type == BodyMode.FORM_MULTIPART
-                    ):
-                        form_multipart_str = {
-                            form_item.key: form_item.value
-                            for form_item in request_area_data.body.payload
-                            if form_item.enabled
-                            and isinstance(form_item.value, str)
-                        }
-                        form_multipart_files = {
-                            form_item.key: (
-                                form_item.value.name,
-                                form_item.value.read_bytes(),
-                                mimetypes.guess_type(form_item.value.name)[0]
-                                or 'application/octet-stream',
-                            )
-                            for form_item in request_area_data.body.payload
-                            if form_item.enabled
-                            and isinstance(form_item.value, Path)
-                        }
-                        request = http_client.build_request(
-                            method=url_area_data.method,
-                            url=url_area_data.url,
-                            headers=headers,
-                            params=query_params,
-                            data=form_multipart_str,
-                            files=form_multipart_files,
-                        )
-
+                request = self._build_request(
+                    http_client=http_client,
+                    url_area_data=url_area_data,
+                    request_area_data=request_area_data,
+                )
                 response = await http_client.send(request=request)
+                self._display_response(response=response)
+                self.response_area.is_showing_response = True
         except httpx.RequestError as error:
             error_name = type(error).__name__
             error_message = str(error)
@@ -301,42 +205,144 @@ class RESTinyApp(App, inherit_bindings=False):
                 self.notify(f'{error_name}: {error_message}', severity='error')
             else:
                 self.notify(f'{error_name}', severity='error')
-            self.response_area.has_response = False
+            self.response_area.set_data(data=None)
+            self.response_area.is_showing_response = False
         except asyncio.CancelledError:
-            self.response_area.has_response = False
-        else:
-            self.display_response(response=response)
-            self.response_area.has_response = True
+            self.response_area.set_data(data=None)
+            self.response_area.is_showing_response = False
         finally:
             self.response_area.loading = False
             self.url_area.request_pending = False
 
-    def display_response(self, response: httpx.Response) -> None:
-        def display_status() -> None:
-            self.response_area.border_title = (
-                f'Response - {response.status_code} {response.reason_phrase}'
+    def _build_request(
+        self,
+        http_client: httpx.Client,
+        url_area_data: URLAreaData,
+        request_area_data: RequestAreaData,
+    ) -> httpx.Request:
+        headers: dict[str, str] = {
+            header.key: header.value
+            for header in request_area_data.headers
+            if header.enabled
+        }
+        query_params: dict[str, str] = {
+            param.key: param.value
+            for param in request_area_data.query_params
+            if param.enabled
+        }
+
+        if not request_area_data.body.enabled:
+            return http_client.build_request(
+                method=url_area_data.method,
+                url=url_area_data.url,
+                headers=headers,
+                params=query_params,
             )
 
-        def display_size_and_elapsed_time() -> None:
-            self.response_area.border_subtitle = f'{response.num_bytes_downloaded} bytes in {response.elapsed.total_seconds():.2f} seconds'
+        if request_area_data.body.type == BodyMode.RAW:
+            raw_language_to_content_type = {
+                BodyRawLanguage.JSON: ContentType.JSON,
+                BodyRawLanguage.YAML: ContentType.YAML,
+                BodyRawLanguage.HTML: ContentType.HTML,
+                BodyRawLanguage.XML: ContentType.XML,
+                BodyRawLanguage.PLAIN: ContentType.TEXT,
+            }
+            headers['content-type'] = raw_language_to_content_type.get(
+                request_area_data.body.raw_language, ContentType.TEXT
+            )
 
-        def display_headers() -> None:
-            for header_key, header_value in response.headers.multi_items():
-                self.response_area.headers_data_table.add_row(
-                    header_key, header_value
+            raw = request_area_data.body.payload
+            if headers['content-type'] == ContentType.JSON:
+                try:
+                    raw = json.dumps(raw)
+                except Exception:
+                    pass
+
+            return http_client.build_request(
+                method=url_area_data.method,
+                url=url_area_data.url,
+                headers=headers,
+                params=query_params,
+                content=raw,
+            )
+        elif request_area_data.body.type == BodyMode.FILE:
+            file = request_area_data.body.payload
+            if 'content-type' not in headers:
+                headers['content-type'] = (
+                    mimetypes.guess_type(file.name)[0]
+                    or 'application/octet-stream'
                 )
-
-        def display_body() -> None:
-            resp_content_type: str = response.headers.get('Content-Type', '')
-            body_text_language = resp_content_type.rsplit('/')[1].lower()
-            self.response_area.body_type_select.value = body_text_language
-            self.response_area.body_text_area.language = body_text_language
-            self.response_area.body_text_area.insert(response.text)
-            self.response_area.body_text_area.scroll_home(
-                animate=False, force=True, immediate=True
+            return http_client.build_request(
+                method=url_area_data.method,
+                url=url_area_data.url,
+                headers=headers,
+                params=query_params,
+                content=file.read_bytes(),
+            )
+        elif request_area_data.body.type == BodyMode.FORM_URLENCODED:
+            form_urlencoded = {
+                form_item.key: form_item.value
+                for form_item in request_area_data.body.payload
+                if form_item.enabled
+            }
+            return http_client.build_request(
+                method=url_area_data.method,
+                url=url_area_data.url,
+                headers=headers,
+                params=query_params,
+                data=form_urlencoded,
+            )
+        elif request_area_data.body.type == BodyMode.FORM_MULTIPART:
+            form_multipart_str = {
+                form_item.key: form_item.value
+                for form_item in request_area_data.body.payload
+                if form_item.enabled and isinstance(form_item.value, str)
+            }
+            form_multipart_files = {
+                form_item.key: (
+                    form_item.value.name,
+                    form_item.value.read_bytes(),
+                    mimetypes.guess_type(form_item.value.name)[0]
+                    or 'application/octet-stream',
+                )
+                for form_item in request_area_data.body.payload
+                if form_item.enabled and isinstance(form_item.value, Path)
+            }
+            return http_client.build_request(
+                method=url_area_data.method,
+                url=url_area_data.url,
+                headers=headers,
+                params=query_params,
+                data=form_multipart_str,
+                files=form_multipart_files,
             )
 
-        display_status()
-        display_size_and_elapsed_time()
-        display_headers()
-        display_body()
+    def _display_response(self, response: httpx.Response) -> None:
+        status = HTTPStatus(response.status_code)
+        size = response.num_bytes_downloaded
+        elapsed_time = round(response.elapsed.total_seconds(), 2)
+        headers = {
+            header_key: header_value
+            for header_key, header_value in response.headers.multi_items()
+        }
+        content_type_to_body_language = {
+            ContentType.TEXT: BodyRawLanguage.PLAIN,
+            ContentType.HTML: BodyRawLanguage.HTML,
+            ContentType.JSON: BodyRawLanguage.JSON,
+            ContentType.YAML: BodyRawLanguage.YAML,
+            ContentType.XML: BodyRawLanguage.XML,
+        }
+        body_raw_language = content_type_to_body_language.get(
+            response.headers.get('Content-Type'), BodyRawLanguage.PLAIN
+        )
+        body_raw = response.text
+        self.response_area.set_data(
+            data=ResponseAreaData(
+                status=status,
+                size=size,
+                elapsed_time=elapsed_time,
+                headers=headers,
+                body_raw_language=body_raw_language,
+                body_raw=body_raw,
+            )
+        )

restiny/core/request_area.py

@@ -174,6 +174,7 @@ class RequestArea(Static):
                     yield Input(
                         '5.5',
                         placeholder='5.5',
+                        select_on_focus=False,
                         id='options-timeout',
                         classes='w-1fr',
                     )
@@ -214,8 +215,16 @@ 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:
@@ -226,27 +235,27 @@ class RequestArea(Static):
             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(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 == '':
@@ -259,80 +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'],
-                )
-                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'],
-                        )
+    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'],
                     )
-            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'],
-                        )
+                )
+        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,
-            )
-
-        def get_options() -> RequestAreaData.Options:
-            timeout = None
-            if self.options_timeout_input.value:
-                timeout = float(self.options_timeout_input.value)
+        return RequestAreaData.Body(
+            enabled=body_send,
+            raw_language=BodyRawLanguage(self.body_raw_language_select.value),
+            type=body_type,
+            payload=payload,
+        )
 
-            return RequestAreaData.Options(
-                timeout=timeout,
-                follow_redirects=self.options_follow_redirects_switch.value,
-                verify_ssl=self.options_verify_ssl_switch.value,
-            )
+    def _get_options(self) -> RequestAreaData.Options:
+        timeout = None
+        if self.options_timeout_input.value:
+            timeout = float(self.options_timeout_input.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,
         )