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

restiny/__about__.py

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

restiny/assets/style.tcss

@@ -3,6 +3,10 @@ Button {
     max-width: 100%;
 }
 
+Input {
+    width: 1fr;
+}
+
 .hidden {
     display: none;
 }
@@ -19,6 +23,10 @@ Button {
     width: 2fr;
 }
 
+.w-3fr {
+    width: 3fr;
+}
+
 .h-auto {
     height: auto;
 }
@@ -28,7 +36,11 @@ Button {
 }
 
 .h-2fr {
-    width: 2fr;
+    height: 2fr;
+}
+
+.h-3fr {
+    height: 3fr;
 }
 
 .p-0 {

restiny/core/app.py

@@ -14,6 +14,7 @@ from textual.events import DescendantFocus
 from textual.widget import Widget
 from textual.widgets import Footer, Header
 
+from restiny import httpx_auths
 from restiny.__about__ import __version__
 from restiny.assets import STYLE_TCSS
 from restiny.core import (
@@ -23,6 +24,12 @@ from restiny.core import (
     URLArea,
     URLAreaData,
 )
+from restiny.core.request_area import (
+    APIKeyAuth,
+    BasicAuth,
+    BearerAuth,
+    DigestAuth,
+)
 from restiny.core.response_area import ResponseAreaData
 from restiny.enums import BodyMode, BodyRawLanguage, ContentType
 from restiny.utils import build_curl_cmd
@@ -64,10 +71,8 @@ class RESTinyApp(App, inherit_bindings=False):
             with Horizontal(classes='h-auto'):
                 yield URLArea()
             with Horizontal(classes='h-1fr'):
-                with Vertical():
-                    yield RequestArea()
-                with Vertical():
-                    yield ResponseArea()
+                yield RequestArea()
+                yield ResponseArea()
         yield Footer()
 
     def on_mount(self) -> None:
@@ -96,42 +101,78 @@ class RESTinyApp(App, inherit_bindings=False):
             headers[header.key] = header.value
 
         params = {}
-        for param in request_area_data.query_params:
+        for param in request_area_data.params:
             if not param.enabled:
                 continue
 
             params[param.key] = param.value
 
-        raw_body = None
-        form_urlencoded = {}
-        form_multipart = {}
-        files = None
-        if request_area_data.body.type == BodyMode.RAW:
-            raw_body = request_area_data.body.payload
-        elif request_area_data.body.type == BodyMode.FORM_URLENCODED:
-            form_urlencoded = {
-                form_field.key: form_field.value
-                for form_field in request_area_data.body.payload
-                if form_field.enabled
-            }
-        elif request_area_data.body.type == BodyMode.FORM_MULTIPART:
-            form_multipart = {
-                form_field.key: form_field.value
-                for form_field in request_area_data.body.payload
-                if form_field.enabled
-            }
-        elif request_area_data.body.type == BodyMode.FILE:
-            files = [request_area_data.body.payload]
+        body_raw = None
+        body_form_urlencoded = {}
+        body_form_multipart = {}
+        body_files = None
+        if request_area_data.body.enabled:
+            if request_area_data.body.mode == BodyMode.RAW:
+                body_raw = request_area_data.body.payload
+            elif request_area_data.body.mode == BodyMode.FORM_URLENCODED:
+                body_form_urlencoded = {
+                    form_field.key: form_field.value
+                    for form_field in request_area_data.body.payload
+                    if form_field.enabled
+                }
+            elif request_area_data.body.mode == BodyMode.FORM_MULTIPART:
+                body_form_multipart = {
+                    form_field.key: form_field.value
+                    for form_field in request_area_data.body.payload
+                    if form_field.enabled
+                }
+            elif request_area_data.body.mode == BodyMode.FILE:
+                body_files = [request_area_data.body.payload]
+
+        auth_basic = None
+        auth_bearer = None
+        auth_api_key_header = None
+        auth_api_key_param = None
+        auth_digest = None
+        if request_area_data.auth.enabled:
+            if isinstance(request_area_data.auth.value, BasicAuth):
+                auth_basic = (
+                    request_area_data.auth.value.username,
+                    request_area_data.auth.value.password,
+                )
+            elif isinstance(request_area_data.auth.value, BearerAuth):
+                auth_bearer = request_area_data.auth.value.token
+            elif isinstance(request_area_data.auth.value, APIKeyAuth):
+                if request_area_data.auth.value.where == 'header':
+                    auth_api_key_header = (
+                        request_area_data.auth.value.key,
+                        request_area_data.auth.value.value,
+                    )
+                elif request_area_data.auth.value.where == 'param':
+                    auth_api_key_param = (
+                        request_area_data.auth.value.key,
+                        request_area_data.auth.value.value,
+                    )
+            elif isinstance(request_area_data.auth.value, DigestAuth):
+                auth_digest = (
+                    request_area_data.auth.value.username,
+                    request_area_data.auth.value.password,
+                )
 
         curl_cmd = build_curl_cmd(
             method=method,
             url=url,
             headers=headers,
             params=params,
-            raw_body=raw_body,
-            form_urlencoded=form_urlencoded,
-            form_multipart=form_multipart,
-            files=files,
+            body_raw=body_raw,
+            body_form_urlencoded=body_form_urlencoded,
+            body_form_multipart=body_form_multipart,
+            body_files=body_files,
+            auth_basic=auth_basic,
+            auth_bearer=auth_bearer,
+            auth_api_key_header=auth_api_key_header,
+            auth_api_key_param=auth_api_key_param,
+            auth_digest=auth_digest,
         )
         self.copy_to_clipboard(curl_cmd)
         self.notify(
@@ -195,7 +236,10 @@ class RESTinyApp(App, inherit_bindings=False):
                     url_area_data=url_area_data,
                     request_area_data=request_area_data,
                 )
-                response = await http_client.send(request=request)
+                auth = self._build_auth(
+                    request_area_data=request_area_data,
+                )
+                response = await http_client.send(request=request, auth=auth)
                 self._display_response(response=response)
                 self.response_area.is_showing_response = True
         except httpx.RequestError as error:
@@ -216,18 +260,18 @@ class RESTinyApp(App, inherit_bindings=False):
 
     def _build_request(
         self,
-        http_client: httpx.Client,
+        http_client: httpx.AsyncClient,
         url_area_data: URLAreaData,
         request_area_data: RequestAreaData,
-    ) -> httpx.Request:
+    ) -> tuple[httpx.Request, httpx.Auth | None]:
         headers: dict[str, str] = {
             header.key: header.value
             for header in request_area_data.headers
             if header.enabled
         }
-        query_params: dict[str, str] = {
+        params: dict[str, str] = {
             param.key: param.value
-            for param in request_area_data.query_params
+            for param in request_area_data.params
             if param.enabled
         }
 
@@ -236,10 +280,10 @@ class RESTinyApp(App, inherit_bindings=False):
                 method=url_area_data.method,
                 url=url_area_data.url,
                 headers=headers,
-                params=query_params,
+                params=params,
             )
 
-        if request_area_data.body.type == BodyMode.RAW:
+        if request_area_data.body.mode == BodyMode.RAW:
             raw_language_to_content_type = {
                 BodyRawLanguage.JSON: ContentType.JSON,
                 BodyRawLanguage.YAML: ContentType.YAML,
@@ -262,10 +306,10 @@ class RESTinyApp(App, inherit_bindings=False):
                 method=url_area_data.method,
                 url=url_area_data.url,
                 headers=headers,
-                params=query_params,
+                params=params,
                 content=raw,
             )
-        elif request_area_data.body.type == BodyMode.FILE:
+        elif request_area_data.body.mode == BodyMode.FILE:
             file = request_area_data.body.payload
             if 'content-type' not in headers:
                 headers['content-type'] = (
@@ -276,10 +320,10 @@ class RESTinyApp(App, inherit_bindings=False):
                 method=url_area_data.method,
                 url=url_area_data.url,
                 headers=headers,
-                params=query_params,
+                params=params,
                 content=file.read_bytes(),
             )
-        elif request_area_data.body.type == BodyMode.FORM_URLENCODED:
+        elif request_area_data.body.mode == BodyMode.FORM_URLENCODED:
             form_urlencoded = {
                 form_item.key: form_item.value
                 for form_item in request_area_data.body.payload
@@ -289,10 +333,10 @@ class RESTinyApp(App, inherit_bindings=False):
                 method=url_area_data.method,
                 url=url_area_data.url,
                 headers=headers,
-                params=query_params,
+                params=params,
                 data=form_urlencoded,
             )
-        elif request_area_data.body.type == BodyMode.FORM_MULTIPART:
+        elif request_area_data.body.mode == BodyMode.FORM_MULTIPART:
             form_multipart_str = {
                 form_item.key: form_item.value
                 for form_item in request_area_data.body.payload
@@ -312,11 +356,42 @@ class RESTinyApp(App, inherit_bindings=False):
                 method=url_area_data.method,
                 url=url_area_data.url,
                 headers=headers,
-                params=query_params,
+                params=params,
                 data=form_multipart_str,
                 files=form_multipart_files,
             )
 
+    def _build_auth(
+        self,
+        request_area_data: RequestAreaData,
+    ) -> httpx.Auth | None:
+        auth = request_area_data.auth
+
+        if not auth.enabled:
+            return
+
+        if isinstance(auth.value, BasicAuth):
+            return httpx.BasicAuth(
+                username=auth.value.username,
+                password=auth.value.password,
+            )
+        elif isinstance(auth.value, BearerAuth):
+            return httpx_auths.BearerAuth(token=auth.value.token)
+        elif isinstance(auth.value, APIKeyAuth):
+            if auth.value.where == 'header':
+                return httpx_auths.APIKeyHeaderAuth(
+                    key=auth.value.key, value=auth.value.value
+                )
+            elif auth.value.where == 'param':
+                return httpx_auths.APIKeyParamAuth(
+                    key=auth.value.key, value=auth.value.value
+                )
+        elif isinstance(auth.value, DigestAuth):
+            return httpx.DigestAuth(
+                username=auth.value.username,
+                password=auth.value.password,
+            )
+
     def _display_response(self, response: httpx.Response) -> None:
         status = HTTPStatus(response.status_code)
         size = response.num_bytes_downloaded

restiny/core/request_area.py

@@ -1,5 +1,6 @@
 from dataclasses import dataclass
 from pathlib import Path
+from typing import Literal
 
 from textual import on
 from textual.app import ComposeResult
@@ -15,10 +16,11 @@ from textual.widgets import (
     TabPane,
 )
 
-from restiny.enums import BodyMode, BodyRawLanguage
+from restiny.enums import AuthMode, BodyMode, BodyRawLanguage
 from restiny.widgets import (
     CustomTextArea,
     DynamicFields,
+    PasswordInput,
     PathChooser,
     TextDynamicField,
 )
@@ -33,7 +35,7 @@ class HeaderField:
 
 
 @dataclass
-class QueryParamField:
+class ParamField:
     enabled: bool
     key: str
     value: str
@@ -54,28 +56,64 @@ class FormMultipartField:
 
 
 @dataclass
-class RequestAreaData:
-    @dataclass
-    class Options:
-        timeout: int | float | None
-        follow_redirects: bool
-        verify_ssl: bool
-
-    @dataclass
-    class Body:
-        enabled: bool
-        raw_language: BodyRawLanguage | None
-        type: BodyMode
-        payload: (
-            str
-            | Path
-            | list[FormUrlEncodedField]
-            | list[FormMultipartField]
-            | None
-        )
+class BasicAuth:
+    username: str
+    password: str
+
+
+@dataclass
+class BearerAuth:
+    token: str
+
+
+@dataclass
+class APIKeyAuth:
+    key: str
+    value: str
+    where: Literal['header', 'param']
 
+
+@dataclass
+class DigestAuth:
+    username: str
+    password: str
+
+
+@dataclass
+class Options:
+    timeout: int | float | None
+    follow_redirects: bool
+    verify_ssl: bool
+
+
+@dataclass
+class Body:
+    enabled: bool
+    raw_language: BodyRawLanguage | None
+    mode: BodyMode
+    payload: (
+        str
+        | Path
+        | list[FormUrlEncodedField]
+        | list[FormMultipartField]
+        | None
+    )
+
+
+_AuthType = BasicAuth | BearerAuth | APIKeyAuth | DigestAuth
+
+
+@dataclass
+class Auth:
+    enabled: bool
+    value: _AuthType
+
+
+@dataclass
+class RequestAreaData:
     headers: list[HeaderField]
-    query_params: list[QueryParamField]
+    params: list[ParamField]
+    auth: Auth
     body: Body
     options: Options
 
@@ -101,11 +139,80 @@ class RequestArea(Static):
                     fields=[TextDynamicField(enabled=False, key='', value='')],
                     id='headers',
                 )
-            with TabPane('Query params'):
+            with TabPane('Params'):
                 yield DynamicFields(
                     fields=[TextDynamicField(enabled=False, key='', value='')],
                     id='params',
                 )
+            with TabPane('Auth'):
+                with Horizontal(classes='h-auto'):
+                    yield Switch(tooltip='Enabled', id='auth-enabled')
+                    yield Select(
+                        (
+                            ('Basic', AuthMode.BASIC),
+                            ('Bearer', AuthMode.BEARER),
+                            ('API Key', AuthMode.API_KEY),
+                            ('Digest', AuthMode.DIGEST),
+                        ),
+                        allow_blank=False,
+                        tooltip='Auth mode',
+                        id='auth-mode',
+                    )
+                with ContentSwitcher(
+                    initial='auth-basic', id='auth-mode-switcher'
+                ):
+                    with Horizontal(id='auth-basic', classes='mt-1'):
+                        yield Input(
+                            placeholder='Username',
+                            select_on_focus=False,
+                            classes='w-1fr',
+                            id='auth-basic-username',
+                        )
+                        yield PasswordInput(
+                            placeholder='Password',
+                            select_on_focus=False,
+                            classes='w-2fr',
+                            id='auth-basic-password',
+                        )
+                    with Horizontal(id='auth-bearer', classes='mt-1'):
+                        yield PasswordInput(
+                            placeholder='Token',
+                            select_on_focus=False,
+                            id='auth-bearer-token',
+                        )
+                    with Horizontal(id='auth-api-key', classes='mt-1'):
+                        yield Select(
+                            (('Header', 'header'), ('Param', 'param')),
+                            allow_blank=False,
+                            tooltip='Where',
+                            classes='w-1fr',
+                            id='auth-api-key-where',
+                        )
+                        yield Input(
+                            placeholder='Key',
+                            classes='w-2fr',
+                            id='auth-api-key-key',
+                        )
+                        yield PasswordInput(
+                            placeholder='Value',
+                            classes='w-3fr',
+                            id='auth-api-key-value',
+                        )
+
+                    with Horizontal(id='auth-digest', classes='mt-1'):
+                        yield Input(
+                            placeholder='Username',
+                            select_on_focus=False,
+                            classes='w-1fr',
+                            id='auth-digest-username',
+                        )
+                        yield PasswordInput(
+                            placeholder='Password',
+                            select_on_focus=False,
+                            classes='w-2fr',
+                            id='auth-digest-password',
+                        )
+
             with TabPane('Body'):
                 with Horizontal(classes='h-auto'):
                     yield Switch(id='body-enabled', tooltip='Send body?')
@@ -117,7 +224,7 @@ class RequestArea(Static):
                             ('Form (multipart)', BodyMode.FORM_MULTIPART),
                         ),
                         allow_blank=False,
-                        tooltip='Body type',
+                        tooltip='Body mode',
                         id='body-mode',
                     )
                 with ContentSwitcher(
@@ -175,8 +282,10 @@ class RequestArea(Static):
                         '5.5',
                         placeholder='5.5',
                         select_on_focus=False,
-                        id='options-timeout',
+                        type='number',
+                        valid_empty=True,
                         classes='w-1fr',
+                        id='options-timeout',
                     )
                 with Horizontal(classes='mt-1 h-auto'):
                     yield Switch(id='options-follow-redirects')
@@ -190,6 +299,36 @@ class RequestArea(Static):
 
         self.param_fields = self.query_one('#params', DynamicFields)
 
+        self.auth_enabled_switch = self.query_one('#auth-enabled', Switch)
+        self.auth_mode_switcher = self.query_one(
+            '#auth-mode-switcher', ContentSwitcher
+        )
+        self.auth_mode_select = self.query_one('#auth-mode', Select)
+        self.auth_basic_username_input = self.query_one(
+            '#auth-basic-username', Input
+        )
+        self.auth_basic_password_input = self.query_one(
+            '#auth-basic-password', PasswordInput
+        )
+        self.auth_bearer_token_input = self.query_one(
+            '#auth-bearer-token', PasswordInput
+        )
+        self.auth_api_key_key_input = self.query_one(
+            '#auth-api-key-key', Input
+        )
+        self.auth_api_key_value_input = self.query_one(
+            '#auth-api-key-value', PasswordInput
+        )
+        self.auth_api_key_where_select = self.query_one(
+            '#auth-api-key-where', Select
+        )
+        self.auth_digest_username_input = self.query_one(
+            '#auth-digest-username', Input
+        )
+        self.auth_digest_password_input = self.query_one(
+            '#auth-digest-password', PasswordInput
+        )
+
         self.body_enabled_switch = self.query_one('#body-enabled', Switch)
         self.body_mode_select = self.query_one('#body-mode', Select)
         self.body_mode_switcher = self.query_one(
@@ -218,13 +357,25 @@ class RequestArea(Static):
     def get_data(self) -> RequestAreaData:
         return RequestAreaData(
             headers=self._get_headers(),
-            query_params=self._get_query_params(),
+            params=self._get_params(),
+            auth=self._get_auth(),
             body=self._get_body(),
             options=self._get_options(),
         )
 
+    @on(Select.Changed, '#auth-mode')
+    def _on_change_auth_mode(self, message: Select.Changed) -> None:
+        if message.value == 'basic':
+            self.auth_mode_switcher.current = 'auth-basic'
+        elif message.value == 'bearer':
+            self.auth_mode_switcher.current = 'auth-bearer'
+        elif message.value == 'api_key':
+            self.auth_mode_switcher.current = 'auth-api-key'
+        elif message.value == 'digest':
+            self.auth_mode_switcher.current = 'auth-digest'
+
     @on(Select.Changed, '#body-mode')
-    def _on_change_body_type(self, message: Select.Changed) -> None:
+    def _on_change_body_mode(self, message: Select.Changed) -> None:
         if message.value == BodyMode.FILE:
             self.body_mode_switcher.current = 'body-mode-file'
         elif message.value == BodyMode.RAW:
@@ -254,20 +405,6 @@ class RequestArea(Static):
         else:
             self.body_enabled_switch.value = True
 
-    @on(Input.Changed, '#options-timeout')
-    def _on_change_timeout(self, message: Input.Changed) -> None:
-        new_value = message.value
-
-        if new_value == '':
-            return
-
-        try:
-            float(new_value)
-        except Exception:
-            self.options_timeout_input.value = (
-                self.options_timeout_input.value[:-1]
-            )
-
     def _get_headers(self) -> list[HeaderField]:
         return [
             HeaderField(
@@ -278,26 +415,58 @@ class RequestArea(Static):
             for header_field in self.header_fields.values
         ]
 
-    def _get_query_params(self) -> list[QueryParamField]:
+    def _get_params(self) -> list[ParamField]:
         return [
-            QueryParamField(
-                enabled=query_param_field['enabled'],
-                key=query_param_field['key'],
-                value=query_param_field['value'],
+            ParamField(
+                enabled=param_field['enabled'],
+                key=param_field['key'],
+                value=param_field['value'],
             )
-            for query_param_field in self.param_fields.values
+            for param_field in self.param_fields.values
         ]
 
-    def _get_body(self) -> RequestAreaData.Body:
+    def _get_auth(self) -> _AuthType:
+        if self.auth_mode_select.value == AuthMode.BASIC:
+            return Auth(
+                enabled=self.auth_enabled_switch.value,
+                value=BasicAuth(
+                    username=self.auth_basic_username_input.value,
+                    password=self.auth_basic_password_input.value,
+                ),
+            )
+        elif self.auth_mode_select.value == AuthMode.BEARER:
+            return Auth(
+                enabled=self.auth_enabled_switch.value,
+                value=BearerAuth(token=self.auth_bearer_token_input.value),
+            )
+        elif self.auth_mode_select.value == AuthMode.API_KEY:
+            return Auth(
+                enabled=self.auth_enabled_switch.value,
+                value=APIKeyAuth(
+                    key=self.auth_api_key_key_input.value,
+                    value=self.auth_api_key_value_input.value,
+                    where=self.auth_api_key_where_select.value,
+                ),
+            )
+        elif self.auth_mode_select.value == AuthMode.DIGEST:
+            return Auth(
+                enabled=self.auth_enabled_switch.value,
+                value=DigestAuth(
+                    username=self.auth_digest_username_input.value,
+                    password=self.auth_digest_password_input.value,
+                ),
+            )
+
+    def _get_body(self) -> Body:
         body_send: bool = self.body_enabled_switch.value
-        body_type: str = BodyMode(self.body_mode_select.value)
+        body_mode: str = BodyMode(self.body_mode_select.value)
 
         payload = None
-        if body_type == BodyMode.RAW:
+        if body_mode == BodyMode.RAW:
             payload = self.body_raw_editor.text
-        elif body_type == BodyMode.FILE:
+        elif body_mode == BodyMode.FILE:
             payload = self.body_file_path_chooser.path
-        elif body_type == BodyMode.FORM_URLENCODED:
+        elif body_mode == BodyMode.FORM_URLENCODED:
             payload = []
             for form_item in self.body_form_urlencoded_fields.values:
                 payload.append(
@@ -307,7 +476,7 @@ class RequestArea(Static):
                         value=form_item['value'],
                     )
                 )
-        elif body_type == BodyMode.FORM_MULTIPART:
+        elif body_mode == BodyMode.FORM_MULTIPART:
             payload = []
             for form_item in self.body_form_multipart_fields.values:
                 payload.append(
@@ -318,19 +487,20 @@ class RequestArea(Static):
                     )
                 )
 
-        return RequestAreaData.Body(
+        return Body(
             enabled=body_send,
             raw_language=BodyRawLanguage(self.body_raw_language_select.value),
-            type=body_type,
+            mode=body_mode,
             payload=payload,
         )
 
-    def _get_options(self) -> RequestAreaData.Options:
-        timeout = None
-        if self.options_timeout_input.value:
+    def _get_options(self) -> Options:
+        try:
             timeout = float(self.options_timeout_input.value)
+        except ValueError:
+            timeout = None
 
-        return RequestAreaData.Options(
+        return Options(
             timeout=timeout,
             follow_redirects=self.options_follow_redirects_switch.value,
             verify_ssl=self.options_verify_ssl_switch.value,

restiny/enums.py

@@ -41,3 +41,10 @@ class ContentType(StrEnum):
     XML = 'application/xml'
     FORM_URLENCODED = 'application/x-www-form-urlencoded'
     FORM_MULTIPART = 'multipart/form-data'
+
+
+class AuthMode(StrEnum):
+    BASIC = 'basic'
+    BEARER = 'bearer'
+    API_KEY = 'api_key'
+    DIGEST = 'digest'

restiny/httpx_auths.py

@@ -0,0 +1,52 @@
+from collections.abc import Generator
+
+import httpx
+
+
+class BearerAuth(httpx.Auth):
+    """
+    Adds a Bearer token to the Authorization header of each request.
+    """
+
+    def __init__(self, token: str) -> None:
+        self._token = token
+
+    def auth_flow(
+        self, request: httpx.Request
+    ) -> Generator[httpx.Request, httpx.Response]:
+        request.headers['authorization'] = f'Bearer {self._token}'
+        yield request
+
+
+class APIKeyHeaderAuth(httpx.Auth):
+    """
+    Adds an API key to the request headers.
+    """
+
+    def __init__(self, key: str, value: str) -> None:
+        self._key = key
+        self._value = value
+
+    def auth_flow(
+        self, request: httpx.Request
+    ) -> Generator[httpx.Request, httpx.Response]:
+        request.headers[self._key] = self._value
+        yield request
+
+
+class APIKeyParamAuth(httpx.Auth):
+    """
+    Adds an API key as a query parameter to the request URL.
+    """
+
+    def __init__(self, key: str, value: str) -> None:
+        self._key = key
+        self._value = value
+
+    def auth_flow(
+        self, request: httpx.Request
+    ) -> Generator[httpx.Request, httpx.Response]:
+        request.url = request.url.copy_with(
+            params=request.url.params.set(self._key, self._value)
+        )
+        yield request

restiny/test.py

@@ -0,0 +1,13 @@
+import random
+
+
+def test(aaa={}):
+    aaa[random.randint(1, 10)] = random.randint(1, 10)
+    print(aaa)
+
+
+test()
+test()
+test()
+test()
+test()

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)
 
 

restiny/widgets/__init__.py

@@ -5,6 +5,7 @@ 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 DynamicFields, TextDynamicField
+from restiny.widgets.password_input import PasswordInput
 from restiny.widgets.path_chooser import PathChooser
 
 __all__ = [
@@ -13,4 +14,5 @@ __all__ = [
     'CustomDirectoryTree',
     'CustomTextArea',
     'PathChooser',
+    'PasswordInput',
 ]

restiny/widgets/password_input.py

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: restiny
-Version: 0.2.1
+Version: 0.3.0
 Summary: A minimalist HTTP client, no bullshit
 Author-email: Kalebe Chimanski de Almeida <kalebe.chi.almeida@gmail.com>
 License:                                  Apache License
@@ -254,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)._
 
-![image](https://github.com/user-attachments/assets/e6f0c03a-e98e-40cd-af1d-38489d650fb1)
+![image](https://github.com/user-attachments/assets/798c994f-af7e-4be6-8f8c-87157dcf94e0)
 
 ## How to install
 

restiny-0.3.0.dist-info/RECORD

@@ -0,0 +1,27 @@
+restiny/__about__.py,sha256=3wVEs2QD_7OcTlD97cZdCeizd2hUbJJ0GeIO8wQIjrk,22
+restiny/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+restiny/__main__.py,sha256=omMWZ9xgxXbDE6nyVhE8AnVkohPaXhTAn6cYx6OeRMk,609
+restiny/consts.py,sha256=brPBT5j_Yf7lVPo6mVRPPNUHxGnfDfkLWC4Xr_y3UWo,237
+restiny/enums.py,sha256=IMUMubaZaKpF-7_IAX6XqnumtXrjkK2MNYZRJrB0gH0,988
+restiny/httpx_auths.py,sha256=FqwO6W2AYNhmG5OEbQBusumH-zVvel4A8Oa7c4cbm-4,1295
+restiny/test.py,sha256=ibamS6hhuCg4BYX4NuhtwmelsdnkIdYaFtQr-uC_3GE,141
+restiny/utils.py,sha256=RD_2Q1UPtx9uUN0SPRR6BH0Jk0cm_QFgec-bvCdRSe8,4303
+restiny/assets/__init__.py,sha256=JL1KARlToF6ZR7KeUjlDAHgwwVM2qXYaIl4wHeFW2zU,93
+restiny/assets/style.tcss,sha256=wEHSgnl-gKUFEGahXCQ8Rf7GkvtUR5G8XDqJhehol-4,648
+restiny/core/__init__.py,sha256=qEyvxrQifEiazkiGoaaJwVhKgbXqVu-Y75M-2HWG73U,373
+restiny/core/app.py,sha256=Sw_iXfp8sLTUnsCyLqcs__vXVLdL0xa8NsnvYlgtagA,15618
+restiny/core/request_area.py,sha256=X1RFyyRCQNGzsxAzV-mrzjvoevQIp5-LzANzdviIzV8,17667
+restiny/core/response_area.py,sha256=Rzq82muK9gXWHIHdLqetFG403n7JdE65Rka0Siw339I,4195
+restiny/core/url_area.py,sha256=-DIiNrBSUsIPDMb7TZI_PiG-fM-Karhwv-vwui89g8I,3298
+restiny/widgets/__init__.py,sha256=uWSOTW_3zIbvdkdO-UCzAMFBNn4gF2AsUmuVjyn5V18,542
+restiny/widgets/custom_directory_tree.py,sha256=sNTaI0DBAO56MyOy6qMZPgWXiTUQbBrJdn1GtOdxrDc,1268
+restiny/widgets/custom_text_area.py,sha256=ykmG-6MiMhz6BqNzP8f14jUTWWKjsCOIEhgciP-01Y8,14032
+restiny/widgets/dynamic_fields.py,sha256=tqRE8PkfqTQnYA7RwjFIWpTINryp2NqXqWbmtRYlcvE,16283
+restiny/widgets/password_input.py,sha256=UAGj7nZUKBCPsWhBCcujY-nvwdMWo2zADJgfqDUuiTU,3987
+restiny/widgets/path_chooser.py,sha256=hW7KdKOisxwsMSKDLRn7aEj2-7VXLyzDGdN6m6JR7cI,9212
+restiny-0.3.0.dist-info/licenses/LICENSE,sha256=Z190MKguypkrjaCldiorEbMmBQp7ylvx09oyE4oDCTs,11361
+restiny-0.3.0.dist-info/METADATA,sha256=uQSqnxN32MEPOWWOJ4pxuJzbfwmo0mhdx1thhiLHKCE,16126
+restiny-0.3.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+restiny-0.3.0.dist-info/entry_points.txt,sha256=F9zW8bAPAwIihltqjzYow4ahmH_B6VkAHzQFA-8QOn4,50
+restiny-0.3.0.dist-info/top_level.txt,sha256=1MQ_Q-fV1Dwbu4zU3g1Eg-CfRgC412X-mvMIrEdrlbk,8
+restiny-0.3.0.dist-info/RECORD,,

restiny-0.2.1.dist-info/RECORD

@@ -1,24 +0,0 @@
-restiny/__about__.py,sha256=PmcQ2PI2oP8irnLtJLJby2YfW6sBvLAmL-VpABzTqwc,22
-restiny/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-restiny/__main__.py,sha256=omMWZ9xgxXbDE6nyVhE8AnVkohPaXhTAn6cYx6OeRMk,609
-restiny/consts.py,sha256=brPBT5j_Yf7lVPo6mVRPPNUHxGnfDfkLWC4Xr_y3UWo,237
-restiny/enums.py,sha256=24ApCF1KoGfu-0XpIT_dbZrnOQx7SjmUKFbt5aMa_dg,873
-restiny/utils.py,sha256=AD8mtM-AuWhcXbTk3-j9gZWs8SoVnI5SbbUw0cnYEUw,3113
-restiny/assets/__init__.py,sha256=JL1KARlToF6ZR7KeUjlDAHgwwVM2qXYaIl4wHeFW2zU,93
-restiny/assets/style.tcss,sha256=qq8kLab6TuaDNk7V3El9FzAVb1tjVr3JzYSjBbKwPzM,563
-restiny/core/__init__.py,sha256=qEyvxrQifEiazkiGoaaJwVhKgbXqVu-Y75M-2HWG73U,373
-restiny/core/app.py,sha256=_chnNKCcuJ0U6XIlvTxotVZM0AYprHaSO-qBy4x1L_Q,12591
-restiny/core/request_area.py,sha256=aeWFRZ49h33bxeWt7-XNmQGrxpTnO2cEQ4fewseLm6Q,11570
-restiny/core/response_area.py,sha256=Rzq82muK9gXWHIHdLqetFG403n7JdE65Rka0Siw339I,4195
-restiny/core/url_area.py,sha256=-DIiNrBSUsIPDMb7TZI_PiG-fM-Karhwv-vwui89g8I,3298
-restiny/widgets/__init__.py,sha256=ncQ1uFdIoSuQ2DYmsMxGdu3D4Sf9mMiM1VweDHJuDNQ,464
-restiny/widgets/custom_directory_tree.py,sha256=sNTaI0DBAO56MyOy6qMZPgWXiTUQbBrJdn1GtOdxrDc,1268
-restiny/widgets/custom_text_area.py,sha256=ykmG-6MiMhz6BqNzP8f14jUTWWKjsCOIEhgciP-01Y8,14032
-restiny/widgets/dynamic_fields.py,sha256=tqRE8PkfqTQnYA7RwjFIWpTINryp2NqXqWbmtRYlcvE,16283
-restiny/widgets/path_chooser.py,sha256=hW7KdKOisxwsMSKDLRn7aEj2-7VXLyzDGdN6m6JR7cI,9212
-restiny-0.2.1.dist-info/licenses/LICENSE,sha256=Z190MKguypkrjaCldiorEbMmBQp7ylvx09oyE4oDCTs,11361
-restiny-0.2.1.dist-info/METADATA,sha256=n9GcZmgSaPmnl5Us-CUJVslSIddoGB3WrYdpz_VBnHI,16126
-restiny-0.2.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-restiny-0.2.1.dist-info/entry_points.txt,sha256=F9zW8bAPAwIihltqjzYow4ahmH_B6VkAHzQFA-8QOn4,50
-restiny-0.2.1.dist-info/top_level.txt,sha256=1MQ_Q-fV1Dwbu4zU3g1Eg-CfRgC412X-mvMIrEdrlbk,8
-restiny-0.2.1.dist-info/RECORD,,