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

restiny/__about__.py

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

restiny/__main__.py

@@ -2,26 +2,38 @@ import sys
 from pathlib import Path
 
 
-def prepare_to_run_app() -> None:
-    def adjust_python_path() -> None:
-        """
-        Hack to prepares the environment for running the app with `textual run --dev` command.
-        """
-        MODULE_PARENT_DIR = Path(__file__).parent.parent
-        if str(MODULE_PARENT_DIR) not in sys.path:
-            sys.path.append(str(MODULE_PARENT_DIR))
-
-    adjust_python_path()
+def prepare_textual_dev_run() -> None:
+    """
+    Prepares the environment for running the app with `textual run --dev`
+    """
+    MODULE_PARENT_DIR = Path(__file__).parent.parent
+    if str(MODULE_PARENT_DIR) not in sys.path:
+        sys.path.append(str(MODULE_PARENT_DIR))
 
 
 def run_app() -> None:
-    from restiny.core.app import RESTinyApp
-
-    RESTinyApp().run()
+    from restiny.consts import CONF_DIR, DB_FILE
+    from restiny.data.db import DBManager
+    from restiny.data.repos import (
+        FoldersSQLRepo,
+        RequestsSQLRepo,
+        SettingsSQLRepo,
+    )
+    from restiny.ui.app import RESTinyApp
+
+    CONF_DIR.mkdir(exist_ok=True)
+    DB_FILE.touch(exist_ok=True)
+    db_manager = DBManager(db_url=f'sqlite:///{DB_FILE}')
+    db_manager.run_migrations()
+    RESTinyApp(
+        folders_repo=FoldersSQLRepo(db_manager=db_manager),
+        requests_repo=RequestsSQLRepo(db_manager=db_manager),
+        settings_repo=SettingsSQLRepo(db_manager=db_manager),
+    ).run()
 
 
 def main() -> None:
-    prepare_to_run_app()
+    prepare_textual_dev_run()
     run_app()
 
 

restiny/assets/style.tcss

@@ -3,6 +3,10 @@ Button {
     max-width: 100%;
 }
 
+Input {
+    width: 1fr;
+}
+
 .hidden {
     display: none;
 }
@@ -19,6 +23,22 @@ Button {
     width: 2fr;
 }
 
+.w-3fr {
+    width: 3fr;
+}
+
+.w-4fr {
+    width: 4fr;
+}
+
+.w-5fr {
+    width: 5fr;
+}
+
+.w-6fr {
+    width: 6fr;
+}
+
 .h-auto {
     height: auto;
 }
@@ -28,7 +48,23 @@ Button {
 }
 
 .h-2fr {
-    width: 2fr;
+    height: 2fr;
+}
+
+.h-3fr {
+    height: 3fr;
+}
+
+.h-4fr {
+    height: 4fr;
+}
+
+.h-5fr {
+    height: 5fr;
+}
+
+.h-6fr {
+    height: 6fr;
 }
 
 .p-0 {
@@ -51,6 +87,11 @@ Button {
     padding-bottom: 1;
 }
 
+.px-1 {
+    padding-left: 1;
+    padding-right: 1;
+}
+
 .m {
     margin: 0;
 }
@@ -71,3 +112,8 @@ Button {
     margin-bottom: 1;
 }
 
+.mx-1 {
+    margin-left: 1;
+    margin-right: 1;
+}
+

restiny/consts.py

@@ -1,9 +1,245 @@
 import sys
 from pathlib import Path
 
+from rich.style import Style
+from textual._text_area_theme import TextAreaTheme
+from textual.theme import Theme
+
+from restiny.enums import CustomThemes
+
 if getattr(sys, 'frozen', False):
     # When running with pyinstaller
     MODULE_DIR = Path(sys._MEIPASS)
 else:
     # When running without pyinstaller
     MODULE_DIR = Path(__file__).resolve().parent
+
+CONF_DIR = Path.home().joinpath('.restiny')
+DB_FILE = CONF_DIR / 'restiny.sqlite3'
+
+# Textual themes
+CUSTOM_THEMES: dict[CustomThemes, dict[Theme | TextAreaTheme]] = {
+    CustomThemes.DARK: {
+        'global': Theme(
+            name='dark',
+            primary='#0178D4',
+            secondary='#004578',
+            accent='#ffa62b',
+            warning='#ffa62b',
+            error='#ba3c5b',
+            success='#4EBF71',
+            foreground='#e0e0e0',
+        ),
+        'text_area': TextAreaTheme(
+            name='dark',
+            base_style=Style(color='#CCCCCC', bgcolor='#1F1F1F'),
+            gutter_style=Style(color='#6E7681', bgcolor='#1F1F1F'),
+            cursor_style=Style(color='#1e1e1e', bgcolor='#f0f0f0'),
+            cursor_line_style=Style(bgcolor='#2b2b2b'),
+            bracket_matching_style=Style(bgcolor='#3a3a3a', bold=True),
+            cursor_line_gutter_style=Style(color='#CCCCCC', bgcolor='#2b2b2b'),
+            selection_style=Style(bgcolor='#264F78'),
+            syntax_styles={
+                'string': Style(color='#ce9178'),
+                'string.documentation': Style(color='#ce9178'),
+                'comment': Style(color='#6A9955'),
+                'heading.marker': Style(color='#6E7681'),
+                'keyword': Style(color='#C586C0'),
+                'operator': Style(color='#CCCCCC'),
+                'conditional': Style(color='#569cd6'),
+                'keyword.function': Style(color='#569cd6'),
+                'keyword.return': Style(color='#569cd6'),
+                'keyword.operator': Style(color='#569cd6'),
+                'repeat': Style(color='#569cd6'),
+                'exception': Style(color='#569cd6'),
+                'include': Style(color='#569cd6'),
+                'number': Style(color='#b5cea8'),
+                'float': Style(color='#b5cea8'),
+                'class': Style(color='#4EC9B0'),
+                'type': Style(color='#EFCB43'),
+                'type.class': Style(color='#4EC9B0'),
+                'type.builtin': Style(color='#9CDCFE'),
+                'function': Style(color='#DCDCAA'),
+                'function.call': Style(color='#DCDCAA'),
+                'method': Style(color='#4EC9B0'),
+                'method.call': Style(color='#4EC9B0'),
+                'constructor': Style(color='#4EC9B0'),
+                'boolean': Style(color='#7DAF9C'),
+                'constant.builtin': Style(color='#7DAF9C'),
+                'json.null': Style(color='#7DAF9C'),
+                'tag': Style(color='#EFCB43'),
+                'yaml.field': Style(color='#569cd6', bold=True),
+                'json.label': Style(color='#569cd6', bold=True),
+                'toml.type': Style(color='#569cd6'),
+                'toml.datetime': Style(color='#C586C0', italic=True),
+                'css.property': Style(color='#569cd6'),
+                'heading': Style(color='#569cd6', bold=True),
+                'bold': Style(bold=True),
+                'italic': Style(italic=True),
+                'strikethrough': Style(strike=True),
+                'link.uri': Style(color='#40A6FF', underline=True),
+                'link.label': Style(color='#569cd6'),
+                'list.marker': Style(color='#6E7681'),
+                'inline_code': Style(color='#ce9178'),
+                'info_string': Style(color='#ce9178', bold=True, italic=True),
+                'punctuation.bracket': Style(color='#CCCCCC'),
+                'punctuation.delimiter': Style(color='#CCCCCC'),
+                'punctuation.special': Style(color='#CCCCCC'),
+            },
+        ),
+    },
+    CustomThemes.DRACULA: {
+        'global': Theme(
+            name='dracula',
+            primary='#BD93F9',
+            secondary='#6272A4',
+            warning='#FFB86C',
+            error='#FF5555',
+            success='#50FA7B',
+            accent='#FF79C6',
+            background='#282A36',
+            surface='#2B2E3B',
+            panel='#313442',
+            foreground='#F8F8F2',
+            variables={
+                'button-color-foreground': '#282A36',
+            },
+        ),
+        'text_area': TextAreaTheme(
+            name='dracula',
+            base_style=Style(color='#f8f8f2', bgcolor='#1E1F35'),
+            gutter_style=Style(color='#6272a4'),
+            cursor_style=Style(color='#282a36', bgcolor='#f8f8f0'),
+            cursor_line_style=Style(bgcolor='#282b45'),
+            cursor_line_gutter_style=Style(
+                color='#c2c2bf', bgcolor='#282b45', bold=True
+            ),
+            bracket_matching_style=Style(
+                bgcolor='#99999d', bold=True, underline=True
+            ),
+            selection_style=Style(bgcolor='#44475A'),
+            syntax_styles={
+                'string': Style(color='#f1fa8c'),
+                'string.documentation': Style(color='#f1fa8c'),
+                'comment': Style(color='#6272a4'),
+                'heading.marker': Style(color='#6272a4'),
+                'keyword': Style(color='#ff79c6'),
+                'operator': Style(color='#f8f8f2'),
+                'repeat': Style(color='#ff79c6'),
+                'exception': Style(color='#ff79c6'),
+                'include': Style(color='#ff79c6'),
+                'keyword.function': Style(color='#ff79c6'),
+                'keyword.return': Style(color='#ff79c6'),
+                'keyword.operator': Style(color='#ff79c6'),
+                'conditional': Style(color='#ff79c6'),
+                'number': Style(color='#bd93f9'),
+                'float': Style(color='#bd93f9'),
+                'class': Style(color='#50fa7b'),
+                'type': Style(color='#ff79c6'),
+                'type.class': Style(color='#50fa7b'),
+                'type.builtin': Style(color='#bd93f9'),
+                'variable.builtin': Style(color='#f8f8f2'),
+                'function': Style(color='#50fa7b'),
+                'function.call': Style(color='#50fa7b'),
+                'method': Style(color='#50fa7b'),
+                'method.call': Style(color='#50fa7b'),
+                'boolean': Style(color='#50fa7b'),
+                'constant.builtin': Style(color='#bd93f9'),
+                'json.null': Style(color='#bd93f9'),
+                'regex.punctuation.bracket': Style(color='#ff79c6'),
+                'regex.operator': Style(color='#ff79c6'),
+                'html.end_tag_error': Style(color='#F83333', underline=True),
+                'tag': Style(color='#ff79c6'),
+                'yaml.field': Style(color='#ff79c6', bold=True),
+                'json.label': Style(color='#ff79c6', bold=True),
+                'toml.type': Style(color='#ff79c6'),
+                'toml.datetime': Style(color='#bd93f9'),
+                'css.property': Style(color='#bd93f9'),
+                'heading': Style(color='#ff79c6', bold=True),
+                'bold': Style(bold=True),
+                'italic': Style(italic=True),
+                'strikethrough': Style(strike=True),
+                'link.label': Style(color='#ff79c6'),
+                'link.uri': Style(color='#bd93f9', underline=True),
+                'list.marker': Style(color='#6272a4'),
+                'inline_code': Style(color='#f1fa8c'),
+                'punctuation.bracket': Style(color='#f8f8f2'),
+                'punctuation.delimiter': Style(color='#f8f8f2'),
+                'punctuation.special': Style(color='#f8f8f2'),
+            },
+        ),
+    },
+    CustomThemes.FOREST: {
+        'global': Theme(
+            name='forest',
+            primary='#58A55C',
+            secondary='#0E1A12',
+            accent='#8BC34A',
+            warning='#C89B3C',
+            error='#C0392B',
+            success='#4CAF50',
+            foreground='#E7F6E7',
+            background='#0B1510',
+            surface='#142019',
+            panel='#1B2A21',
+        ),
+        'text_area': TextAreaTheme(
+            name='forest',
+            base_style=Style(color='#E7F6E7', bgcolor='#0B1510'),
+            gutter_style=Style(color='#8CA694', bgcolor='#142019'),
+            cursor_style=Style(color='#0B1510', bgcolor='#58A55C'),
+            cursor_line_style=Style(bgcolor='#1B2A21'),
+            cursor_line_gutter_style=Style(color='#B5D3C0', bgcolor='#1B2A21'),
+            bracket_matching_style=Style(bgcolor='#284232', bold=True),
+            selection_style=Style(bgcolor='#284232'),
+            syntax_styles={
+                'string': Style(color='#BCEABF'),
+                'string.documentation': Style(color='#BCEABF'),
+                'comment': Style(color='#4A6B59', italic=True),
+                'heading.marker': Style(color='#6C8F7E'),
+                'keyword': Style(color='#8BC34A', bold=True),
+                'operator': Style(color='#E7F6E7'),
+                'conditional': Style(color='#8BC34A'),
+                'keyword.function': Style(color='#8BC34A'),
+                'keyword.return': Style(color='#8BC34A'),
+                'keyword.operator': Style(color='#8BC34A'),
+                'repeat': Style(color='#8BC34A'),
+                'exception': Style(color='#C0392B'),
+                'include': Style(color='#8BC34A'),
+                'number': Style(color='#A4E28F'),
+                'float': Style(color='#A4E28F'),
+                'class': Style(color='#4CAF50'),
+                'type': Style(color='#4CAF50'),
+                'type.class': Style(color='#4CAF50'),
+                'type.builtin': Style(color='#8BC34A'),
+                'variable.builtin': Style(color='#E7F6E7'),
+                'function': Style(color='#58A55C'),
+                'function.call': Style(color='#58A55C'),
+                'method': Style(color='#58A55C'),
+                'method.call': Style(color='#58A55C'),
+                'boolean': Style(color='#9FE6A0'),
+                'constant.builtin': Style(color='#9FE6A0'),
+                'json.null': Style(color='#9FE6A0'),
+                'regex.punctuation.bracket': Style(color='#8BC34A'),
+                'regex.operator': Style(color='#8BC34A'),
+                'tag': Style(color='#8BC34A'),
+                'yaml.field': Style(color='#8BC34A', bold=True),
+                'json.label': Style(color='#8BC34A', bold=True),
+                'toml.type': Style(color='#8BC34A'),
+                'toml.datetime': Style(color='#A4E28F'),
+                'css.property': Style(color='#A4E28F'),
+                'heading': Style(color='#8BC34A', bold=True),
+                'bold': Style(bold=True),
+                'italic': Style(italic=True),
+                'strikethrough': Style(strike=True),
+                'link.label': Style(color='#8BC34A'),
+                'link.uri': Style(color='#A4E28F', underline=True),
+                'list.marker': Style(color='#6C8F7E'),
+                'inline_code': Style(color='#BCEABF'),
+                'punctuation.bracket': Style(color='#E7F6E7'),
+                'punctuation.delimiter': Style(color='#E7F6E7'),
+                'punctuation.special': Style(color='#E7F6E7'),
+            },
+        ),
+    },
+}

restiny/data/db.py

@@ -0,0 +1,60 @@
+from contextlib import contextmanager
+
+from sqlalchemy import create_engine, event, text
+from sqlalchemy.orm import sessionmaker
+
+from restiny.data.sql import SQL_DIR
+
+
+class DBManager:
+    def __init__(self, db_url: str) -> None:
+        self.db_url = db_url
+        self.engine = create_engine(self.db_url, echo=False)
+        self.SessionMaker = sessionmaker(
+            bind=self.engine, autoflush=True, expire_on_commit=False
+        )
+
+        @event.listens_for(self.engine, 'connect')
+        def _set_sqlite_pragmas(dbapi_connection, connection_record):
+            cursor = dbapi_connection.cursor()
+            cursor.execute('PRAGMA foreign_keys=ON')
+            cursor.close()
+
+    @contextmanager
+    def session_scope(self):
+        session = self.SessionMaker()
+        try:
+            yield session
+            session.commit()
+        except Exception:
+            session.rollback()
+            raise
+        finally:
+            session.close()
+
+    def run_migrations(self) -> None:
+        version_in_db = self._get_version()
+
+        for sql_script in sorted(
+            SQL_DIR.glob('[0-9]*_*.sql'),
+            key=lambda path: int(path.stem.split('_', 1)[0]),
+        ):
+            version_in_script = int(sql_script.stem.split('_', 1)[0])
+            if version_in_script <= version_in_db:
+                continue
+
+            self._run_migration(
+                sql_migration=sql_script.read_text(encoding='utf-8'),
+                new_version=version_in_script,
+            )
+
+    def _run_migration(self, sql_migration: str, new_version: int) -> None:
+        with self.session_scope() as session:
+            raw = session.connection().connection
+            raw.executescript(sql_migration)
+            raw.execute(f'PRAGMA user_version = {new_version}')
+
+    def _get_version(self) -> int:
+        with self.session_scope() as session:
+            result = session.execute(text('PRAGMA user_version'))
+            return int(result.scalar_one()) or 0

restiny/data/models.py

@@ -0,0 +1,90 @@
+from datetime import datetime
+
+from sqlalchemy import DateTime, ForeignKey, func
+from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column
+
+
+class SQLModelBase(DeclarativeBase):
+    pass
+
+
+class SQLFolder(SQLModelBase):
+    __tablename__ = 'folders'
+
+    id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
+    name: Mapped[str] = mapped_column()
+    parent_id: Mapped[int | None] = mapped_column(
+        ForeignKey('folders.id'), nullable=True
+    )
+
+    created_at: Mapped[datetime] = mapped_column(
+        DateTime(),
+        default=func.current_timestamp(),
+        nullable=False,
+    )
+
+    updated_at: Mapped[datetime] = mapped_column(
+        DateTime(),
+        default=func.current_timestamp(),
+        onupdate=func.current_timestamp(),
+        nullable=False,
+    )
+
+
+class SQLRequest(SQLModelBase):
+    __tablename__ = 'requests'
+
+    id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
+    folder_id: Mapped[int] = mapped_column(
+        ForeignKey('folders.id'), nullable=False
+    )
+    name: Mapped[str] = mapped_column()
+
+    method: Mapped[str] = mapped_column()
+    url: Mapped[str | None] = mapped_column()
+    headers: Mapped[str | None] = mapped_column()
+    params: Mapped[str | None] = mapped_column()
+
+    body_enabled: Mapped[bool] = mapped_column()
+    body_mode: Mapped[str] = mapped_column()
+    body: Mapped[str | None] = mapped_column()
+
+    auth_enabled: Mapped[bool] = mapped_column()
+    auth_mode: Mapped[str] = mapped_column()
+    auth: Mapped[str | None] = mapped_column()
+
+    option_timeout: Mapped[float | None] = mapped_column()
+    option_follow_redirects: Mapped[bool] = mapped_column()
+    option_verify_ssl: Mapped[bool] = mapped_column()
+
+    created_at: Mapped[datetime] = mapped_column(
+        DateTime(),
+        default=func.current_timestamp(),
+        nullable=False,
+    )
+    updated_at: Mapped[datetime] = mapped_column(
+        DateTime(),
+        default=func.current_timestamp(),
+        onupdate=func.current_timestamp(),
+        nullable=False,
+    )
+
+
+class SQLSettings(SQLModelBase):
+    __tablename__ = 'settings'
+
+    id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
+
+    theme: Mapped[str] = mapped_column(nullable=False)
+
+    created_at: Mapped[datetime] = mapped_column(
+        DateTime(),
+        default=func.current_timestamp(),
+        nullable=False,
+    )
+    updated_at: Mapped[datetime] = mapped_column(
+        DateTime(),
+        default=func.current_timestamp(),
+        onupdate=func.current_timestamp(),
+        nullable=False,
+    )