data-sourcerer 0.3.0__py3-none-any.whl → 0.5.0__py3-none-any.whl

sourcerer/presentation/screens/preview_content/main.py

@@ -1,52 +1,194 @@
+import contextlib
+import re
+from dataclasses import dataclass
 from pathlib import Path
+from typing import ClassVar
 
+import humanize
 from dependency_injector.wiring import Provide
 from rich.syntax import Syntax
-from textual import on
+from textual import events, on
 from textual.app import ComposeResult
+from textual.binding import Binding, BindingType
 from textual.containers import Container, Horizontal
-from textual.screen import ModalScreen
-from textual.widgets import LoadingIndicator, RichLog
+from textual.css.query import NoMatches
+from textual.document._document import Selection
+from textual.message import Message
+from textual.reactive import reactive
+from textual.widgets import Input, Label, LoadingIndicator, Rule, TextArea
 
 from sourcerer.infrastructure.access_credentials.services import CredentialsService
 from sourcerer.infrastructure.storage_provider.exceptions import (
     ReadStorageItemsError,
 )
 from sourcerer.presentation.di_container import DiContainer
+from sourcerer.presentation.screens.preview_content.text_area_style import (
+    SOURCERER_THEME_NAME,
+    sourcerer_text_area_theme,
+)
+from sourcerer.presentation.screens.shared.modal_screens import ExitBoundModalScreen
 from sourcerer.presentation.screens.shared.widgets.button import Button
 from sourcerer.presentation.utils import get_provider_service_by_access_uuid
+from sourcerer.settings import PREVIEW_LENGTH_LIMIT, PREVIEW_LIMIT_SIZE
+
+
+@dataclass
+class HighlightResult(Message):
+    line: int
+    start: int
+    end: int
+
+
+@dataclass
+class HideSearchBar(Message):
+    pass
+
+
+class ClickableLabel(Label):
+    @dataclass
+    class Click(Message):
+        name: str
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+    def on_click(self, _: events.Click) -> None:
+        self.post_message(self.Click(name=self.name))  # type: ignore
+
+
+class Search(Container):
+    total = reactive(0, recompose=False)
+    current = reactive(0, recompose=False)
+    content = reactive("", recompose=False)
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.search_result_lines = []
+        self.search_value = ""
+
+    def compose(self) -> ComposeResult:
+        with Horizontal():
+            with Horizontal(id="left"):
+                yield Label("Search:")
+                yield Input(placeholder="...")
+
+            with Horizontal(id="right"):
+                yield ClickableLabel(
+                    "◀", id="previous", name="previous", classes="search-button"
+                )
+                yield Label(f"{self.current}/{self.total}", id="search-result")
+                yield ClickableLabel(
+                    "▶", id="next", name="next", classes="search-button"
+                )
+                yield ClickableLabel(
+                    "❌", id="hide", name="hide", classes="search-button"
+                )
+        yield Rule()
+
+    @on(Input.Submitted)
+    def on_input_submitted(self, event: Input.Submitted) -> None:
+        """Handle input submitted events."""
+        if not event.value or not self.content:
+            self.total = 0
+            self.current = 0
+            self.search_value = ""
+            self.search_result_lines = []
+            return
+        if event.value == self.search_value:
+            self._increment_current()
+            return
+
+        self.search_value = event.value
+        lines = self.content.split("\n")
+        search_pattern = event.value.lower()
 
+        self.search_result_lines = [
+            (line_n, index)
+            for line_n, line in enumerate(lines)
+            if search_pattern in line.lower()
+            for index in [
+                match.start()
+                for match in re.finditer(rf"(?i){re.escape(search_pattern)}", line)
+            ]
+        ]
 
-class PreviewContentScreen(ModalScreen):
+        if not self.search_result_lines:
+            self.notify("No matches found", severity="warning")
+            self.total, self.current = 0, 0
+            return
+
+        self.total = len(self.search_result_lines)
+        self.current = 1
+
+    @on(ClickableLabel.Click)
+    def on_click(self, event: ClickableLabel.Click) -> None:
+        if event.name == "next":
+            self._increment_current()
+        elif event.name == "previous":
+            self._decrement_current()
+        elif event.name == "hide":
+            self.post_message(HideSearchBar())
+
+    def _increment_current(self):
+        self.current = self.current + 1 if self.current < self.total else 1
+
+    def _decrement_current(self):
+        self.current = self.current - 1 if self.current > 1 else self.total
+
+    def watch_current(self):
+        with contextlib.suppress(NoMatches):
+            search_result = self.query_one("#search-result", Label)
+            search_result.update(f"{self.current}/{self.total}")
+        if not self.search_result_lines:
+            return
+        line, start = self.search_result_lines[self.current - 1]
+        self.post_message(
+            HighlightResult(line, start=start, end=start + len(self.search_value))
+        )
+
+
+class PreviewContentScreen(ExitBoundModalScreen):
     CSS_PATH = "styles.tcss"
 
+    BINDINGS: ClassVar[list[BindingType]] = [
+        Binding("escape", "cancel", "Close the screen"),
+    ]
+
     def __init__(
         self,
         storage_name,
         key,
+        file_size,
         access_credentials_uuid,
         *args,
         credentials_service: CredentialsService = Provide[
             DiContainer.credentials_repository
         ],
-        **kwargs
+        **kwargs,
     ):
         super().__init__(*args, **kwargs)
 
         self.storage_name = storage_name
         self.key = key
+        self.file_size = file_size
         self.access_credentials_uuid = access_credentials_uuid
         self.credentials_service = credentials_service
+        self.content = None
 
     def compose(self) -> ComposeResult:
         with Container(id="PreviewContentScreen"):
+            yield Search(id="search-bar")
             yield LoadingIndicator(id="loading")
-            yield RichLog(highlight=True, markup=True, auto_scroll=False)
+            yield TextArea(read_only=True, show_line_numbers=True)
             with Horizontal(id="controls"):
                 yield Button("Close", name="cancel")
 
     def on_mount(self) -> None:
         """Called when the DOM is ready."""
+        search = self.query_one(Search)
+        text_log = self.query_one(TextArea)
+        text_log.register_theme(sourcerer_text_area_theme)
+        text_log.theme = SOURCERER_THEME_NAME
 
         provider_service = get_provider_service_by_access_uuid(
             self.access_credentials_uuid, self.credentials_service
@@ -55,28 +197,73 @@ class PreviewContentScreen(ModalScreen):
             self.notify("Could not read file :(", severity="error")
             return
         try:
-            content = provider_service.read_storage_item(self.storage_name, self.key)
+            self.content = provider_service.read_storage_item(
+                self.storage_name, self.key
+            )
+            if self.file_size > PREVIEW_LIMIT_SIZE:
+                self.content = self.content[:PREVIEW_LENGTH_LIMIT]
+                self.notify(
+                    f"The file size {humanize.naturalsize(self.file_size)} "
+                    f"exceeds {humanize.naturalsize(PREVIEW_LIMIT_SIZE)} preview limit. "
+                    f"The content is truncated to {PREVIEW_LENGTH_LIMIT} characters.",
+                    severity="warning",
+                )
+            search.content = self.content
         except ReadStorageItemsError:
             self.notify("Could not read file :(", severity="error")
             return
         self.query_one("#loading").remove()
-        if content is None:
+        if self.content is None:
             self.notify("Empty file", severity="warning")
             return
 
-        text_log = self.query_one(RichLog)
-
         extension = Path(self.key).suffix
 
         lexer = (
-            "json" if extension == ".tfstate" else Syntax.guess_lexer(self.key, content)
+            "json"
+            if extension == ".tfstate"
+            else Syntax.guess_lexer(self.key, self.content)
         )
-
-        content = Syntax(content, lexer, line_numbers=True, theme="ansi_dark")
-        text_log.write(content)
+        if lexer in text_log.available_languages:
+            text_log.language = lexer
+        else:
+            text_log.language = "python"
+        text_log.blur()
+        text_log.load_text(self.content)
 
     @on(Button.Click)
     def on_button_click(self, event: Button.Click) -> None:
         """Handle button click events."""
         if event.action == "cancel":
-            self.dismiss()
+            self.action_cancel_screen()
+
+    @on(HideSearchBar)
+    def on_hide_search_bar(self, _: HideSearchBar) -> None:
+        """Handle hide search bar events."""
+        search_bar = self.query_one("#search-bar", Search)
+        search_bar.remove_class("-visible")
+        search_bar.query_one(Input).value = ""
+        search_bar.total = 0
+        search_bar.current = 0
+        search_bar.search_result_lines = []
+        search_bar.search_value = ""
+
+    @on(HighlightResult)
+    def on_highlight_result(self, event: HighlightResult) -> None:
+        """Handle highlight result events."""
+
+        text_area = self.query_one(TextArea)
+        text_area.selection = Selection(
+            start=(event.line, event.start), end=(event.line, event.end)
+        )
+
+    def action_find(self):
+        self.query_one("#search-bar").add_class("-visible")
+        self.query_one(Input).focus()
+
+    def action_cancel(self):
+        self.action_cancel_screen()
+
+    def on_key(self, event: events.Key) -> None:
+        if event.key in ("ctrl+f", "super+f"):
+            self.action_find()

sourcerer/presentation/screens/preview_content/styles.tcss

@@ -12,16 +12,51 @@ PreviewContentScreen {
   & > #PreviewContentScreen {
     padding: 1 2 0 2;
     margin: 0 0;
-    width: 100;
+    width: 70%;
     height: 40;
     border: solid $secondary-background;
     border-title-color: $primary-lighten-2;
 
-    RichLog {
+
+    #search-bar {
+      height: auto;
+      display: none;
+
+      &.-visible {
+        display: block;
+      }
+    }
+
+    Horizontal{
+      height: auto;
+
+      & > Static {
+        width: auto;
+      }
+
+      #left {
+        align: left middle;
+        width: 90%;
+      }
+      #right {
+          align: right middle;
+          width: 10%;
+      }
+    }
+
+    Input {
+      height: 1;
+      border: none;
       background: transparent;
-      width: 95;
+      width: 78%;
     }
 
+    TextArea {
+      background-tint: $background;
+
+      &:focus {
+        border: tall $border-blurred;
+      }
+    }
   }
 }
-

sourcerer/presentation/screens/preview_content/text_area_style.py

@@ -0,0 +1,60 @@
+from rich.style import Style
+from textual._text_area_theme import TextAreaTheme
+
+SOURCERER_THEME_NAME = "sourcerer"
+# Terraform theme for the text area.
+sourcerer_text_area_theme = TextAreaTheme(
+    name=SOURCERER_THEME_NAME,
+    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="#FFA656"),
+    syntax_styles={
+        "string": Style(color="#79C0FF"),
+        "string.documentation": Style(color="#79C0FF"),
+        "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="#F97970"),
+        "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="#FFA656"),
+        "type.builtin": Style(color="#CDD9E5"),
+        "function": Style(color="#CCB0EA"),
+        "function.call": Style(color="#CCB0EA"),
+        "method": Style(color="#CCB0EA"),
+        "method.call": Style(color="#CCB0EA"),
+        "constructor": Style(color="#DCBDFB"),
+        "boolean": Style(color="#7DAF9C"),
+        "constant.builtin": Style(color="#7DAF9C"),
+        "json.null": Style(color="#FDA556"),
+        "tag": Style(color="#EFCB43"),
+        "yaml.field": Style(color="#569cd6", bold=True),
+        "json.label": Style(color="#8EDB8C", 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"),
+    },
+)

sourcerer/presentation/screens/provider_creds_list/main.py

@@ -1,13 +1,14 @@
 from dataclasses import dataclass
 from enum import Enum
+from typing import ClassVar
 
 from dependency_injector.wiring import Provide
 from textual import on
 from textual.app import ComposeResult
+from textual.binding import Binding, BindingType
 from textual.containers import Container, Horizontal, VerticalScroll
 from textual.message import Message
 from textual.reactive import reactive
-from textual.screen import ModalScreen
 from textual.widgets import Checkbox, Label
 
 from sourcerer.domain.access_credentials.entities import Credentials
@@ -22,6 +23,9 @@ from sourcerer.presentation.screens.provider_creds_registration.main import (
     ProviderCredsRegistrationScreen,
 )
 from sourcerer.presentation.screens.question.main import QuestionScreen
+from sourcerer.presentation.screens.shared.modal_screens import (
+    RefreshTriggerableModalScreen,
+)
 from sourcerer.presentation.screens.shared.widgets.button import Button
 
 
@@ -98,7 +102,7 @@ class ProviderCredentialsRow(Horizontal):
         self.post_message(ReloadCredentialsRequest())
 
 
-class ProviderCredsListScreen(ModalScreen):
+class ProviderCredsListScreen(RefreshTriggerableModalScreen):
     CSS_PATH = "styles.tcss"
 
     MAIN_CONTAINER_ID = "ProviderCredsListScreen"
@@ -110,6 +114,11 @@ class ProviderCredsListScreen(ModalScreen):
     PROVIDERS_NAME = "providers"
     AUTH_METHODS_NAME = "auth_methods"
 
+    BINDINGS: ClassVar[list[BindingType]] = [
+        *RefreshTriggerableModalScreen.BINDINGS,
+        Binding("ctrl+n", "add_credentials", "Add new credentials"),
+    ]
+
     credentials_list = reactive([], recompose=True)
 
     def __init__(
@@ -151,13 +160,15 @@ class ProviderCredsListScreen(ModalScreen):
         """
         Initialize the screen by refreshing the credentials list when the screen is composed.
         """
-        self.refresh_credentials_list()
+        self.refresh_credentials_list(set_refresh_flag=False)
 
-    def refresh_credentials_list(self):
+    def refresh_credentials_list(self, set_refresh_flag: bool = True):
         """
         Refresh the credentials list by retrieving the latest credentials from the credentials service.
         """
         self.credentials_list = self.credentials_service.list()
+        if set_refresh_flag:
+            self._requires_storage_refresh = True
 
     def create_provider_creds_registration(
         self,
@@ -195,12 +206,9 @@ class ProviderCredsListScreen(ModalScreen):
             event (Button.Click): The button click event.
         """
         if event.action == ControlsEnum.CANCEL.name:
-            self.dismiss()
+            self.action_cancel_screen()
         if event.action == "add_registration":
-            self.app.push_screen(
-                ProviderCredsRegistrationScreen(),
-                callback=self.create_provider_creds_registration,  # type: ignore
-            )
+            self.action_add_credentials()
 
     @on(ProviderCredentialsRow.ChangeActiveStatus)
     def on_change_active_status(self, event: ProviderCredentialsRow.ChangeActiveStatus):
@@ -227,3 +235,9 @@ class ProviderCredsListScreen(ModalScreen):
             _ (ReloadCredentialsRequest): The reload credentials request event.
         """
         self.refresh_credentials_list()
+
+    def action_add_credentials(self):
+        self.app.push_screen(
+            ProviderCredsRegistrationScreen(),
+            callback=self.create_provider_creds_registration,  # type: ignore
+        )

sourcerer/presentation/screens/provider_creds_list/styles.tcss

@@ -23,6 +23,14 @@ ProviderCredsListScreen {
 
       .add_registration_button {
         color: $success-darken-2;
+
+        &:hover {
+            color: $primary;
+        }
+        &:focus {
+            color: $primary;
+        }
+
       }
 
       margin-bottom: 1;
@@ -30,6 +38,7 @@ ProviderCredsListScreen {
 
     ProviderCredentialsRow.active {
       background: $primary-lighten-2;
+      color: $background-darken-3;
     }
 
     ProviderCredentialsRow, Horizontal {

sourcerer/presentation/screens/provider_creds_registration/main.py

@@ -5,7 +5,6 @@ from dependency_injector.wiring import Provide
 from textual import on
 from textual.app import ComposeResult
 from textual.containers import Container, Horizontal, VerticalScroll
-from textual.screen import ModalScreen
 from textual.widgets import Label, Select
 
 from sourcerer.domain.access_credentials.services import (
@@ -20,6 +19,7 @@ from sourcerer.infrastructure.access_credentials.registry import (
 )
 from sourcerer.infrastructure.utils import generate_unique_name
 from sourcerer.presentation.di_container import DiContainer
+from sourcerer.presentation.screens.shared.modal_screens import ExitBoundModalScreen
 from sourcerer.presentation.screens.shared.widgets.button import Button
 from sourcerer.presentation.screens.shared.widgets.labeled_input import LabeledInput
 
@@ -36,7 +36,7 @@ class ProviderCredentialsEntry:
     fields: dict[str, str]
 
 
-class ProviderCredsRegistrationScreen(ModalScreen):
+class ProviderCredsRegistrationScreen(ExitBoundModalScreen):
     CSS_PATH = "styles.tcss"
 
     MAIN_CONTAINER_ID = "ProviderCredsRegistrationScreen"
@@ -182,7 +182,7 @@ class ProviderCredsRegistrationScreen(ModalScreen):
                collected authentication fields.
         """
         if event.action == ControlsEnum.CANCEL.name:
-            self.dismiss()
+            self.action_cancel_screen()
         elif event.action == ControlsEnum.CREATE.name:
             if not self.auth_method:
                 self.notify("Please select provider and auth method", severity="error")

sourcerer/presentation/screens/settings/main.py

@@ -0,0 +1,70 @@
+from textual import on
+from textual.app import ComposeResult
+from textual.containers import Container, Horizontal
+from textual.widgets import Checkbox, Rule, Select, Static
+
+from sourcerer.domain.settings.entities import Settings, SettingsFields
+from sourcerer.presentation.screens.shared.modal_screens import ExitBoundModalScreen
+from sourcerer.presentation.screens.shared.widgets.button import Button
+
+
+class SettingsScreen(ExitBoundModalScreen):
+    """Screen with a parameter."""
+
+    CSS_PATH = "styles.tcss"
+
+    def __init__(self, settings: Settings) -> None:
+        super().__init__()
+        self.settings = settings
+
+    def compose(self) -> ComposeResult:
+        with Container():
+            with Horizontal():
+                yield Static("Theme:")
+                yield Select(
+                    ((theme, theme) for theme in self.app._registered_themes),
+                    id="theme",
+                    value=self.settings.theme,
+                    allow_blank=False,
+                )
+
+            yield Rule()
+            with Horizontal():
+                yield Checkbox(
+                    "Group storage by access credentials",
+                    value=self.settings.group_by_access_credentials,
+                )
+
+            yield Rule()
+            with Horizontal(id="controls"):
+                yield Button("Save", name="save")
+                yield Button("Close", name="close")
+
+    @on(Button.Click)
+    def on_button_clicked(self, event: Button.Click) -> None:
+        """Handle button clicked events."""
+        if event.action == "close":
+            self.action_cancel_screen()
+        elif event.action == "save":
+            self.dismiss(
+                {
+                    SettingsFields.theme: self.query_one("Select#theme", Select).value,
+                    SettingsFields.group_by_access_credentials: self.query_one(
+                        Checkbox
+                    ).value,
+                }
+            )
+
+    def action_cancel_screen(self):
+        self.dismiss(
+            {
+                SettingsFields.theme: self.settings.theme,
+                SettingsFields.group_by_access_credentials: self.settings.group_by_access_credentials,
+            }
+        )
+
+    @on(Select.Changed)
+    def on_select_changed(self, event: Select.Changed) -> None:
+        """Handle select changed events."""
+        if event.select.id == "theme":
+            self.app.theme = event.value  # type: ignore[assignment]

sourcerer/presentation/screens/settings/styles.tcss

@@ -0,0 +1,44 @@
+SettingsScreen {
+  align: center middle;
+  content-align: center top;
+
+  & > Container {
+    padding: 1 2 0 2;
+    margin: 0 0;
+    width: 70%;
+    height: auto;
+    border: solid $border;
+
+    & > Static {
+      text-align: center;
+      text-wrap: wrap;
+    }
+
+    & > Horizontal {
+      align: center bottom;
+      height: auto;
+
+      & > Static {
+        width: 10%;
+        padding-top: 1;
+      }
+
+      & > Checkbox {
+        width: 100%;
+        border: none;
+        background: transparent;
+
+        &:focus {
+          background: transparent;
+
+          & > .toggle--label {
+            color: $text-secondary;
+            background: transparent;
+          }
+        }
+
+      }
+    }
+  }
+
+}