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

sourcerer/presentation/screens/main/widgets/storage_list_sidebar.py

@@ -7,10 +7,12 @@ and selection of storage items.
 
 from collections import namedtuple
 from itertools import groupby
+from typing import Self
 
 from textual import events, on
 from textual.app import ComposeResult
-from textual.containers import Container, Horizontal, VerticalScroll
+from textual.containers import Horizontal, Vertical
+from textual.css.query import NoMatches
 from textual.reactive import reactive
 from textual.widgets import Label, Rule
 
@@ -23,8 +25,12 @@ from sourcerer.presentation.screens.main.messages.select_storage_item import (
     SelectStorageItem,
 )
 from sourcerer.presentation.screens.main.widgets.gradient import GradientWidget
+from sourcerer.presentation.screens.shared.containers import (
+    ScrollVerticalContainerWithNoBindings,
+)
 from sourcerer.presentation.screens.shared.widgets.button import Button
-from sourcerer.presentation.screens.shared.widgets.loader import Loader
+from sourcerer.presentation.screens.shared.widgets.spinner import Spinner
+from sourcerer.presentation.settings import KeyBindings
 
 STORAGE_ICONS = {
     StorageProvider.S3: "🟠",
@@ -41,6 +47,9 @@ class StorageItem(Label):
     selection and visual feedback on hover.
     """
 
+    can_focus = True
+    selected = reactive(False, recompose=True, toggle_class="selected")
+
     DEFAULT_CSS = """
     StorageItem {
         width: 90%;
@@ -51,7 +60,17 @@ class StorageItem(Label):
         text-wrap: nowrap;
 
         & > :hover {
-            background: $warning;
+            background: $primary-lighten-2;
+            color: $panel;
+        }
+
+        & > :focus {
+            background: $primary-lighten-2;
+            color: $panel;
+        }
+
+        &.selected {
+            background: $primary;
             color: $panel;
         }
     }
@@ -71,6 +90,38 @@ class StorageItem(Label):
 
     def on_click(self, _: events.Click) -> None:
         """Handle click events to select the storage item."""
+        self._select_storage()
+
+    def on_key(self, event: events.Key) -> None:
+        """Handle key events to select the storage item."""
+        if event.key == KeyBindings.ENTER.value:
+            self._select_storage()
+            return
+        storages = [
+            component
+            for component in self.screen.focus_chain
+            if isinstance(component, StorageItem)
+        ]
+        if not storages:
+            return
+        if event.key == KeyBindings.ARROW_DOWN.value:
+            if self.screen.focused == storages[-1]:
+                storages[0].focus()
+                return
+            self.screen.focus_next(StorageItem)
+        elif event.key == KeyBindings.ARROW_UP.value:
+            if self.screen.focused == storages[0]:
+                storages[-1].focus()
+                return
+            self.screen.focus_previous(StorageItem)
+
+    def _select_storage(self):
+        """
+        Select the storage item and notify the application.
+        This method posts a message to select the storage item based on its
+        name and access credentials UUID.
+
+        """
         self.post_message(
             SelectStorageItem(
                 self.storage_name, access_credentials_uuid=self.access_credentials_uuid
@@ -78,7 +129,7 @@ class StorageItem(Label):
         )
 
 
-class StorageListSidebar(VerticalScroll):
+class StorageListSidebar(Vertical):
     """Sidebar widget for displaying the list of storage providers.
 
     This widget manages the display of storage providers grouped by their type,
@@ -98,27 +149,29 @@ class StorageListSidebar(VerticalScroll):
     StorageListSidebar {
         padding-right:  0;
         margin-right: 0;
-        & > .storage-group {
+        height: 100%;
+        margin-bottom: 1;
+        #rule-left {
+            width: 1;
+        }
+
+        ScrollVerticalContainerWithNoBindings{
+            height: 95%;
+        }
+
+        Horizontal {
             height: auto;
-            margin-bottom: 1;
-            #rule-left {
-                width: 1;
-            }
-
-            Horizontal {
-                height: auto;
-            }
-            Rule.-horizontal {
-                height: 1;
-                margin: 0 0;
-
-            }
-            .storage-letter {
-                color: $secondary;
-                padding: 0 1;
-            }
+        }
+        Rule.-horizontal {
+            height: 1;
+            margin: 0 0;
 
         }
+        .storage-letter {
+            color: $secondary;
+            padding: 0 1;
+        }
+
     }
     #header {
         width: 100%;
@@ -127,7 +180,7 @@ class StorageListSidebar(VerticalScroll):
             width: auto;
         }
 
-        Loader {
+        Spinner {
             width: 5%;
         }
     }
@@ -136,7 +189,7 @@ class StorageListSidebar(VerticalScroll):
     def compose(self) -> ComposeResult:
         with Horizontal(id="header"):
             if self.is_loading:
-                yield Loader()
+                yield Spinner()
             yield GradientWidget(
                 " SOURCERER" if self.is_loading else "🧙SOURCERER",
                 id="left-middle",
@@ -150,11 +203,11 @@ class StorageListSidebar(VerticalScroll):
             for storage in storages
         ]
         storages = sorted(storages, key=lambda x: x.storage.storage)
+        with ScrollVerticalContainerWithNoBindings():
+            for letter, storages_group in groupby(
+                storages, key=lambda x: x.storage.storage[0]
+            ):
 
-        for letter, storages_group in groupby(
-            storages, key=lambda x: x.storage.storage[0]
-        ):
-            with Container(id=f"group-{letter}", classes="storage-group"):
                 yield Horizontal(
                     Rule(id="rule-left"),
                     Label(letter.upper(), classes="storage-letter"),
@@ -163,15 +216,30 @@ class StorageListSidebar(VerticalScroll):
 
                 for item in storages_group:
                     yield StorageItem(
-                        renderable=STORAGE_ICONS.get(item.storage.provider, "")
-                        + " "
-                        + item.storage.storage,
+                        renderable=f'{STORAGE_ICONS.get(item.storage.provider, "")} {item.storage.storage}',
                         storage_name=item.storage.storage,
                         access_credentials_uuid=item.access_credentials_uuid,
                     )
 
+    def focus(self, scroll_visible: bool = True) -> Self:
+        try:
+            content = self.query_one(StorageItem)
+        except NoMatches:
+            return self
+        content.focus()
+        return self
+
     @on(Button.Click)
     def on_button_click(self, event: Button.Click) -> None:
         """Handle button click events to refresh the storage list."""
         if event.action == "header_click":
             self.post_message(RefreshStoragesListRequest())
+
+    @on(SelectStorageItem)
+    def on_select_storage_item(self, event: SelectStorageItem) -> None:
+        """Handle selection of a storage item."""
+        for child in self.query(StorageItem):
+            child.selected = (
+                child.storage_name == event.name
+                and child.access_credentials_uuid == event.access_credentials_uuid
+            )

sourcerer/presentation/screens/preview_content/main.py

@@ -1,5 +1,6 @@
 from pathlib import Path
 
+from dependency_injector.wiring import Provide
 from rich.syntax import Syntax
 from textual import on
 from textual.app import ComposeResult
@@ -11,6 +12,7 @@ from sourcerer.infrastructure.access_credentials.services import CredentialsServ
 from sourcerer.infrastructure.storage_provider.exceptions import (
     ReadStorageItemsError,
 )
+from sourcerer.presentation.di_container import DiContainer
 from sourcerer.presentation.screens.shared.widgets.button import Button
 from sourcerer.presentation.utils import get_provider_service_by_access_uuid
 
@@ -18,12 +20,23 @@ from sourcerer.presentation.utils import get_provider_service_by_access_uuid
 class PreviewContentScreen(ModalScreen):
     CSS_PATH = "styles.tcss"
 
-    def __init__(self, storage_name, key, access_credentials_uuid, *args, **kwargs):
+    def __init__(
+        self,
+        storage_name,
+        key,
+        access_credentials_uuid,
+        *args,
+        credentials_service: CredentialsService = Provide[
+            DiContainer.credentials_repository
+        ],
+        **kwargs
+    ):
         super().__init__(*args, **kwargs)
 
         self.storage_name = storage_name
         self.key = key
         self.access_credentials_uuid = access_credentials_uuid
+        self.credentials_service = credentials_service
 
     def compose(self) -> ComposeResult:
         with Container(id="PreviewContentScreen"):
@@ -35,9 +48,8 @@ class PreviewContentScreen(ModalScreen):
     def on_mount(self) -> None:
         """Called when the DOM is ready."""
 
-        credentials_service = CredentialsService()
         provider_service = get_provider_service_by_access_uuid(
-            self.access_credentials_uuid, credentials_service
+            self.access_credentials_uuid, self.credentials_service
         )
         if not provider_service:
             self.notify("Could not read file :(", severity="error")

sourcerer/presentation/screens/provider_creds_list/main.py

@@ -1,6 +1,7 @@
 from dataclasses import dataclass
 from enum import Enum
 
+from dependency_injector.wiring import Provide
 from textual import on
 from textual.app import ComposeResult
 from textual.containers import Container, Horizontal, VerticalScroll
@@ -10,7 +11,9 @@ from textual.screen import ModalScreen
 from textual.widgets import Checkbox, Label
 
 from sourcerer.domain.access_credentials.entities import Credentials
+from sourcerer.domain.access_credentials.repositories import BaseCredentialsRepository
 from sourcerer.infrastructure.access_credentials.services import CredentialsService
+from sourcerer.presentation.di_container import DiContainer
 from sourcerer.presentation.screens.provider_creds_list.messages.reload_credentials_request import (
     ReloadCredentialsRequest,
 )
@@ -32,9 +35,12 @@ class ProviderCredentialsRow(Horizontal):
         uuid: str
         active: bool
 
-    def __init__(self, row: Credentials, *args, **kwargs):
+    def __init__(
+        self, row: Credentials, credentials_service: CredentialsService, *args, **kwargs
+    ):
         super().__init__(*args, **kwargs)
         self.row = row
+        self.credentials_service = credentials_service
 
     def compose(self) -> ComposeResult:
         yield Checkbox(
@@ -88,8 +94,7 @@ class ProviderCredentialsRow(Horizontal):
         """
         if not result:
             return
-        credentials_service = CredentialsService()
-        credentials_service.delete(self.row.uuid)
+        self.credentials_service.delete(self.row.uuid)
         self.post_message(ReloadCredentialsRequest())
 
 
@@ -107,9 +112,16 @@ class ProviderCredsListScreen(ModalScreen):
 
     credentials_list = reactive([], recompose=True)
 
-    def __init__(self, *args, **kwargs):
+    def __init__(
+        self,
+        credentials_service: CredentialsService = Provide[
+            DiContainer.credentials_service
+        ],
+        *args,
+        **kwargs,
+    ):
         super().__init__(*args, **kwargs)
-        self.credentials_service = CredentialsService()
+        self.credentials_service = credentials_service
 
     def compose(self) -> ComposeResult:
         with Container(id=self.MAIN_CONTAINER_ID):
@@ -129,7 +141,9 @@ class ProviderCredsListScreen(ModalScreen):
                     yield Label("Auth method", classes="credentials_auth_method")
                     yield Label("Delete", classes="credentials_auth_delete")
                 for row in self.credentials_list:
-                    yield ProviderCredentialsRow(row, classes="credentials_row")
+                    yield ProviderCredentialsRow(
+                        row, self.credentials_service, classes="credentials_row"
+                    )
             with Horizontal(id="controls"):
                 yield Button(ControlsEnum.CANCEL.value, name=ControlsEnum.CANCEL.name)
 
@@ -146,7 +160,11 @@ class ProviderCredsListScreen(ModalScreen):
         self.credentials_list = self.credentials_service.list()
 
     def create_provider_creds_registration(
-        self, credentials_entry: ProviderCredentialsEntry
+        self,
+        credentials_entry: ProviderCredentialsEntry,
+        credentials_repo: BaseCredentialsRepository = Provide[
+            DiContainer.credentials_repository
+        ],
     ):
         """
         Create a new provider credentials registration.
@@ -155,10 +173,13 @@ class ProviderCredsListScreen(ModalScreen):
 
         Args:
             credentials_entry (ProviderCredentialsEntry): The credentials entry to register.
+            credentials_repo (BaseCredentialsRepository): The repository to store the credentials.
         """
         if not credentials_entry:
             return
-        service = credentials_entry.cloud_storage_provider_credentials_service()  # type: ignore
+        service = credentials_entry.cloud_storage_provider_credentials_service(
+            credentials_repo
+        )
         service.store(credentials_entry.name, credentials_entry.fields)
         self.refresh_credentials_list()
 

sourcerer/presentation/screens/provider_creds_registration/main.py

@@ -15,6 +15,9 @@ from sourcerer.domain.access_credentials.services import (
 from sourcerer.infrastructure.access_credentials.exceptions import (
     MissingAuthFieldsError,
 )
+from sourcerer.infrastructure.access_credentials.registry import (
+    AccessCredentialsRegistry,
+)
 from sourcerer.infrastructure.utils import generate_unique_name
 from sourcerer.presentation.di_container import DiContainer
 from sourcerer.presentation.screens.shared.widgets.button import Button
@@ -48,8 +51,8 @@ class ProviderCredsRegistrationScreen(ModalScreen):
     def __init__(
         self,
         *args,
-        credentials_type_registry=Provide[
-            DiContainer.config.access_credential_method_registry
+        credentials_type_registry: AccessCredentialsRegistry = Provide[  # type: ignore
+            DiContainer.config.access_credential_method_registry  # type: ignore
         ],
         **kwargs,
     ):
@@ -123,7 +126,7 @@ class ProviderCredsRegistrationScreen(ModalScreen):
 
         # If only one authentication method exists, set it and mount its fields
         self.auth_method = next(iter(auth_methods.values()))
-        cls: BaseAccessCredentialsService = self.auth_method
+        cls: type[BaseAccessCredentialsService] = self.auth_method
         await self._mount_credentials_fields(cls.auth_fields())
 
     @on(Select.Changed)
@@ -206,7 +209,7 @@ class ProviderCredsRegistrationScreen(ModalScreen):
             ProviderCredentialsEntry: An object containing the authentication name, method, and fields.
         """
         if not self.auth_method:
-            return
+            return None
 
         fields = {
             input_field.get().name: input_field.get().value

sourcerer/presentation/screens/shared/widgets/spinner.py

@@ -0,0 +1,57 @@
+from collections.abc import Iterator
+from enum import Enum
+from itertools import cycle
+
+from textual.app import RenderResult
+from textual.widgets import Static
+
+
+class SpinnerType(Enum):
+    """Enumeration of various spinner animations."""
+
+    dots_1 = "⣷⣯⣟⡿⢿⣻⣽⣾"
+    dots_2 = "⠋⠙⠹⠸⠼⠴⠦⠧⠇⠏"
+    dots_3 = "⠋⠙⠚⠞⠖⠦⠴⠲⠳⠓"
+    dots_4 = "⠄⠆⠇⠋⠙⠸⠰⠠⠰⠸⠙⠋⠇⠆"
+    dots_5 = "⠈⠐⠠⢀⡀⠄⠂⠁"
+    dots_6 = "⋯⋱⋮⋰"
+    circles = "◐◓◑◒"
+    angles = "┐┤┘┴└├┌┬"
+    arrows = "←↖↑↗→↘↓↙"
+    moon = "🌑🌒🌓🌔🌕🌖🌗🌘"
+    clock = "🕛🕐🕑🕒🕓🕔🕕🕖🕗🕘🕙🕚"
+    histogram = "▁▃▄▅▆▇█▇▆▅▄▃"
+    shade = "░▒▓█▓▒░"
+    colors = "🟨🟨🟧🟧🟥🟥🟦🟦🟪🟪🟩🟩"
+    triangles = "◢◣◤◥"
+
+
+class Spinner(Static):
+    """A loading spinner widget for Textual apps."""
+
+    DEFAULT_CSS = """
+    Spinner {
+        color: #9E53E0;
+    }
+    """
+
+    def __init__(
+        self, spinner: SpinnerType = SpinnerType.dots_1, interval: float = 0.1, **kwargs
+    ):
+        """
+        Initialize the Loader widget.
+
+        Args:
+            spinner (SpinnerType): The spinner animation type.
+            interval (float): Time in seconds between frames.
+            **kwargs: Additional keyword arguments for Static.
+        """
+        super().__init__(**kwargs)
+        self._frames: Iterator[str] = cycle(spinner.value)
+        self._interval = interval
+
+    def render(self) -> RenderResult:
+        return next(self._frames)
+
+    def on_mount(self) -> None:
+        self.auto_refresh = self._interval

sourcerer/presentation/screens/storage_action_progress/main.py

@@ -298,7 +298,7 @@ class StorageActionProgressScreen(ModalScreen):
                 progress_bar.total = file_size
             except Exception as ex:
                 self.notify(
-                    f"Failed to get file size for {key}: {str(ex)}", severity="error"
+                    f"Failed to get file size for {key}: {ex}", severity="error"
                 )
                 self.log.error(f"Error getting file size: {ex}")
                 return
@@ -311,7 +311,7 @@ class StorageActionProgressScreen(ModalScreen):
                     lambda chunk: progress_callback(progress_bar, chunk),
                 )
             except Exception as ex:
-                self.notify(f"Failed to download {key}: {str(ex)}", severity="error")
+                self.notify(f"Failed to download {key}: {ex}", severity="error")
                 self.log.error(f"Error downloading file: {ex}")
                 return
 
@@ -324,9 +324,7 @@ class StorageActionProgressScreen(ModalScreen):
                     # Non-critical error, continue execution
         except Exception as ex:
             # Catch any unexpected exceptions
-            self.notify(
-                f"Unexpected error downloading {key}: {str(ex)}", severity="error"
-            )
+            self.notify(f"Unexpected error downloading {key}: {ex}", severity="error")
             self.log.error(f"Unexpected error: {ex}")
         finally:
             main_progress_bar.advance(1)

sourcerer/presentation/screens/storages_list/main.py

@@ -0,0 +1,180 @@
+import datetime
+import uuid
+from enum import Enum
+
+from dependency_injector.wiring import Provide
+from textual import on
+from textual.app import ComposeResult
+from textual.containers import Container, Horizontal, VerticalScroll
+from textual.reactive import reactive
+from textual.screen import ModalScreen
+from textual.widgets import Label
+
+from sourcerer.domain.storage.entities import Storage
+from sourcerer.infrastructure.access_credentials.services import CredentialsService
+from sourcerer.infrastructure.storage.services import StoragesService
+from sourcerer.presentation.di_container import DiContainer
+from sourcerer.presentation.screens.question.main import QuestionScreen
+from sourcerer.presentation.screens.shared.widgets.button import Button
+from sourcerer.presentation.screens.storages_list.messages.reload_storages_request import (
+    ReloadStoragesRequest,
+)
+from sourcerer.presentation.screens.storages_registration.main import (
+    StorageEntry,
+    StoragesRegistrationScreen,
+)
+
+
+class ControlsEnum(Enum):
+    CANCEL = "Cancel"
+    ADD_STORAGE = "Add Storage"
+
+
+class StorageRow(Horizontal):
+    def __init__(
+        self, storage: Storage, storages_service: StoragesService, *args, **kwargs
+    ):
+        super().__init__(*args, **kwargs)
+        self.storage = storage
+        self.storages_service = storages_service
+
+    def compose(self):
+        yield Label(self.storage.name, classes="storage_name")
+        yield Label(self.storage.credentials_name or "🚫", classes="credentials_name")
+        yield Button(
+            "❌",
+            name="delete_storage",
+            classes="storage_delete",
+        )
+
+    @on(Button.Click)
+    def on_button_click(self, _: Button.Click):
+        """
+        Handle delete button click events by showing a confirmation dialog for storage deletion.
+        Args:
+            _ (Button.Click): The button click event.
+        """
+        self.app.push_screen(
+            QuestionScreen(
+                f"Are you sure you want to delete {self.storage.credentials_name} {self.storage.name} storage?"
+            ),
+            callback=self.delete_callback,  # type: ignore
+        )
+
+    def delete_callback(self, result: bool):
+        """
+        Callback function to handle the result of the confirmation screen.
+
+        Args:
+            result (bool): True if the user confirmed, False otherwise.
+        """
+        if not result:
+            return
+        self.storages_service.delete(self.storage.uuid)
+        self.post_message(ReloadStoragesRequest())
+
+
+class StoragesListScreen(ModalScreen):
+    CSS_PATH = "styles.tcss"
+
+    MAIN_CONTAINER_ID = "StoragesListScreen"
+    SETTINGS_CONTAINER_ID = "settings"
+
+    storages_list = reactive([], recompose=True)
+
+    def __init__(
+        self,
+        credentials_service: CredentialsService = Provide[
+            DiContainer.credentials_service
+        ],
+        storages_service: StoragesService = Provide[DiContainer.storages_service],
+        *args,
+        **kwargs,
+    ):
+        super().__init__(*args, **kwargs)
+        self.storage_service = storages_service
+        self.credentials_service = credentials_service
+
+    def compose(self) -> ComposeResult:
+        with Container(id=self.MAIN_CONTAINER_ID):
+            yield Container(
+                Button(
+                    "+Add new storage",
+                    name=ControlsEnum.ADD_STORAGE.name,
+                    classes="add_storage_button",
+                ),
+                id="right-top",
+            )
+            with VerticalScroll(id=self.SETTINGS_CONTAINER_ID):
+                with Horizontal():
+                    yield Label("Storage Name", classes="storage_name")
+                    yield Label("Credentials Name", classes="credentials_name")
+                    yield Label("Delete", classes="storage_delete")
+                for storage in self.storages_list:
+                    yield StorageRow(storage, self.storage_service)
+            with Horizontal(id="controls"):
+                yield Button(ControlsEnum.CANCEL.value, name=ControlsEnum.CANCEL.name)
+
+    def on_compose(self):
+        """
+        Initialize the screen by refreshing the credentials list when the screen is composed.
+        """
+        self.refresh_storages_list()
+
+    def refresh_storages_list(self):
+        """
+        Refresh the storages list by retrieving the latest storages from the storage service.
+        """
+        self.storages_list = self.storage_service.list()
+
+    @on(ReloadStoragesRequest)
+    def on_reload_storages_request(self, _: ReloadStoragesRequest):
+        """
+        Handle the reload storages request by refreshing the storages list.
+
+        Args:
+            _: ReloadStoragesRequest: The reload storages request message.
+        """
+        self.refresh_storages_list()
+
+    @on(Button.Click)
+    def on_control_button_click(self, event: Button.Click):
+        """
+        Handle click events for control buttons.
+
+        Dismisses the screen if the cancel button is clicked, or opens the provider credentials registration screen if
+        the add registration button is clicked.
+
+        Args:
+            event (Button.Click): The button click event.
+        """
+        if event.action == ControlsEnum.CANCEL.name:
+            self.dismiss()
+        if event.action == ControlsEnum.ADD_STORAGE.name:
+            self.app.push_screen(
+                StoragesRegistrationScreen(),
+                callback=self.create_storage_entry,  # type: ignore
+            )
+
+    def create_storage_entry(self, storage: StorageEntry | None):
+        """
+        Create a new storage entry.
+
+        Creates a new storage entry using the provided data and refreshes the storage list.
+        """
+        if storage is None:
+            return
+
+        credentials = self.credentials_service.get(storage.credentials_uuid)
+        if not credentials:
+            self.notify("Credentials not found", severity="error")
+            return
+        self.storage_service.create(
+            Storage(
+                uuid=str(uuid.uuid4()),
+                name=storage.name,
+                credentials_id=credentials.id,
+                date_created=datetime.datetime.now(),
+            )
+        )
+        self.refresh_storages_list()

sourcerer/presentation/screens/storages_list/messages/reload_storages_request.py

@@ -0,0 +1,8 @@
+from dataclasses import dataclass
+
+from textual.message import Message
+
+
+@dataclass
+class ReloadStoragesRequest(Message):
+    pass