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

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

@@ -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',
 ]