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

sourcerer/presentation/screens/critical_error/main.py

@@ -29,7 +29,7 @@ class CriticalErrorScreen(ModalScreen[bool]):
             yield RichLog(highlight=True, markup=True)
             with Horizontal():
                 yield Button("Report", name="report")
-                yield Button("Dismiss", name="dismiss")
+                yield Button("Exit", name="exit")
 
     def on_mount(self) -> None:
         """
@@ -50,8 +50,8 @@ class CriticalErrorScreen(ModalScreen[bool]):
         """
         if event.action == "report":
             webbrowser.open(self._build_github_issue_url(), new=0, autoraise=True)
-        elif event.action == "dismiss":
-            self.dismiss()  # type: ignore
+        elif event.action == "exit":
+            self.app.exit()
 
     def _build_github_issue_url(self) -> str:
         """
@@ -67,7 +67,7 @@ Steps to Reproduce:
 …
 …
 Traceback:
-```{self.traceback}```
+```{self.traceback[-1000:]}```
         """
 
         return (

sourcerer/presentation/screens/file_system_finder/main.py

@@ -155,11 +155,15 @@ class FileSystemNavigationModal(ModalScreen):
         if not event.path:
             return
         try:
-            active_path_label: Static = self.query_one("#active-path")  # type: ignore
+            active_path_label = self.query_one("#active-path", Static)
         except NoMatches:
             return
-        label = str(event.path.relative_to(self.work_dir))
-        if event.path.is_dir():
+        label = str(
+            event.path.relative_to(  # ty: ignore[possibly-unbound-attribute]
+                self.work_dir
+            )
+        )
+        if event.path.is_dir():  # ty: ignore[possibly-unbound-attribute]
             label += "/"
         active_path_label.update(label)
         self.active_path = event.path

sourcerer/presentation/screens/file_system_finder/widgets/file_system_navigator.py

@@ -474,7 +474,7 @@ class FileSystemNavigator(ScrollHorizontalContainerWithNoBindings):
             NoMatches: Silently caught internally if no widget matches the UUID.
         """
         try:
-            return self.query_one(f"#{container_uuid}")  # type: ignore
+            return self.query_one(f"#{container_uuid}", PathListingContainer)
         except NoMatches:
             return None
 

sourcerer/presentation/screens/main/main.py

@@ -24,6 +24,9 @@ from sourcerer.presentation.screens.main.messages.download_request import (
     DownloadRequest,
 )
 from sourcerer.presentation.screens.main.messages.preview_request import PreviewRequest
+from sourcerer.presentation.screens.main.messages.refresh_storages_list_request import (
+    RefreshStoragesListRequest,
+)
 from sourcerer.presentation.screens.main.messages.select_storage_item import (
     SelectStorageItem,
 )
@@ -36,6 +39,7 @@ from sourcerer.presentation.screens.main.mixins.resize_containers_watcher_mixin
 )
 from sourcerer.presentation.screens.main.widgets.resizing_rule import ResizingRule
 from sourcerer.presentation.screens.main.widgets.storage_content import (
+    FileItem,
     StorageContentContainer,
 )
 from sourcerer.presentation.screens.main.widgets.storage_list_sidebar import (
@@ -171,11 +175,19 @@ class Sourcerer(App, ResizeContainersWatcherMixin):
         if not access_credentials:
             return
 
+        self.storage_list_sidebar.is_loading = True
+
         with ThreadPoolExecutor(
             max_workers=MAX_PARALLEL_STORAGE_LIST_OPERATIONS
         ) as executor:
-            for credentials in access_credentials:
+            futures = [
                 executor.submit(self._load_storages, credentials)
+                for credentials in access_credentials
+            ]
+
+            for future in futures:
+                future.result()
+        self.storage_list_sidebar.is_loading = False
 
     @on(SelectStorageItem)
     def on_select_storage_item(self, event: SelectStorageItem):
@@ -236,7 +248,7 @@ class Sourcerer(App, ResizeContainersWatcherMixin):
                 ),
                 path=event.path,
                 keys=[
-                    DownloadKey(display_name=key, uuid=generate_uuid(), path=key)  # type: ignore
+                    DownloadKey(display_name=key, uuid=generate_uuid(), path=key)
                     for key in event.keys
                 ],
                 action="download",
@@ -266,7 +278,8 @@ class Sourcerer(App, ResizeContainersWatcherMixin):
                 ),
                 path=event.path,
                 keys=[
-                    DeleteKey(display_name=key, uuid=generate_uuid(), path=key) for key in event.keys  # type: ignore
+                    DeleteKey(display_name=key, uuid=generate_uuid(), path=key)
+                    for key in event.keys
                 ],
                 action="delete",
             ),
@@ -305,8 +318,8 @@ class Sourcerer(App, ResizeContainersWatcherMixin):
             event (UncheckFilesRequest): The uncheck request event containing file keys
         """
         for key_uuid in event.keys:
-            file_item = self.query_one(f"#{key_uuid}")
-            file_item.uncheck()  # type: ignore
+            file_item = self.query_one(f"#{key_uuid}", FileItem)
+            file_item.uncheck()
         self.storage_content.selected_files = set()
         self.storage_content.selected_files_n = 0
 
@@ -334,6 +347,22 @@ class Sourcerer(App, ResizeContainersWatcherMixin):
             )
         )
 
+    @on(RefreshStoragesListRequest)
+    def on_refresh_storages_list_request(self, _: RefreshStoragesListRequest):
+        """
+        Handles requests to refresh the storage list.
+
+        This method is triggered when a RefreshStoragesListRequest event is received.
+        It refreshes the storage list if the storage list sidebar is not currently
+        loading.
+
+        Args:
+            _ (RefreshStoragesListRequest): The refresh request event
+        """
+        if self.storage_list_sidebar.is_loading:
+            return
+        self.refresh_storages()
+
     def reset_storage_content(self):
         """
         Resets the storage content attributes to their default state.
@@ -388,7 +417,9 @@ class Sourcerer(App, ResizeContainersWatcherMixin):
             return
         params = {"storage": storage_name, "path": path or "", "prefix": prefix or ""}
         try:
-            self.storage_content.storage_content = provider_service.list_storage_items(**params)  # type: ignore
+            self.storage_content.storage_content = provider_service.list_storage_items(
+                **params
+            )
         except ListStorageItemsError as e:
             self.notify_error(f"""Could not extract storage content \n{str(e)}""")
 

sourcerer/presentation/screens/main/messages/refresh_storages_list_request.py

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

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

@@ -1,5 +1,6 @@
 from rich.text import Text
-from textual.widgets import Static
+
+from sourcerer.presentation.screens.shared.widgets.button import Button
 
 
 def hex_to_rgb(hex_color: str):
@@ -32,8 +33,7 @@ def generate_gradient_text(text: str, start_color: str, end_color: str) -> Text:
     return gradient_text
 
 
-class GradientWidget(Static):
-
+class GradientWidget(Button):
     def on_mount(self):
         """
         Generate a gradient text effect for the widget's content.

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

@@ -19,7 +19,9 @@ class MoveEvent:
 
 class ResizingRule(Rule, can_focus=True):
     dragging: reactive[bool] = reactive(False)
-    position: reactive[MoveEvent | None] = reactive(None)
+    position: reactive[MoveEvent | None] = reactive(  # ty: ignore[invalid-assignment]
+        None
+    )
 
     def __init__(self, prev_component_id, next_component_id, *args, **kwargs):
         super().__init__(*args, **kwargs)

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

@@ -170,7 +170,7 @@ class FolderItem(Horizontal):
 
     def compose(self):
         """Compose the folder item layout with folder name and icon."""
-        yield Label(f"{DIRECTORY_ICON}{self.folder.key}")
+        yield Label(f"{DIRECTORY_ICON}{self.folder.key}", markup=False)
 
     def on_click(self, _: events.Click) -> None:
         """Handle click events to navigate into the folder."""
@@ -206,6 +206,9 @@ class FileItem(Horizontal):
         background: $secondary;
         color: $panel;
     }
+    .file_size {
+        color: $primary
+    }
     Checkbox {
         border: none;
         padding: 0 0;
@@ -255,11 +258,13 @@ class FileItem(Horizontal):
 
     def compose(self):
         yield Checkbox()
-        yield FileMetaLabel(f"{FILE_ICON} {self.file.key}", classes="file_name")
         yield FileMetaLabel(
-            f"[$primary]{self.file.size}[/$primary]", classes="file_size"
+            f"{FILE_ICON} {self.file.key}", classes="file_name", markup=False
+        )
+        yield FileMetaLabel(f"{self.file.size}", classes="file_size", markup=False)
+        yield FileMetaLabel(
+            str(self.file.date_modified), classes="file_date", markup=False
         )
-        yield FileMetaLabel(str(self.file.date_modified), classes="file_date")
         if self.file.is_text:
             yield Button(f"{PREVIEW_ICON}", name="preview", classes="download")
 
@@ -318,11 +323,21 @@ class StorageContentContainer(Vertical):
         selected_files_n: Number of selected files
     """
 
-    storage: reactive[str | None] = reactive(None, recompose=True)
-    path: reactive[str | None] = reactive(None, recompose=False)
-    search_prefix: reactive[str | None] = reactive(None, recompose=False)
-    access_credentials_uuid: reactive[str | None] = reactive("", recompose=False)
-    storage_content: reactive[StorageContent | None] = reactive(None, recompose=True)
+    storage: reactive[str | None] = reactive(  # ty: ignore[invalid-assignment]
+        None, recompose=True
+    )
+    path: reactive[str | None] = reactive(  # ty: ignore[invalid-assignment]
+        None, recompose=False
+    )
+    search_prefix: reactive[str | None] = reactive(  # ty: ignore[invalid-assignment]
+        None, recompose=False
+    )
+    access_credentials_uuid: reactive[  # ty: ignore[invalid-assignment]
+        str | None
+    ] = reactive("", recompose=False)
+    storage_content: reactive[  # ty: ignore[invalid-assignment]
+        StorageContent | None
+    ] = reactive(None, recompose=True)
     selected_files: reactive[set] = reactive(set(), recompose=False)
     selected_files_n: reactive[int] = reactive(0, recompose=False)
 
@@ -361,6 +376,15 @@ class StorageContentContainer(Vertical):
         height: auto;
         border-bottom: solid $secondary;
         margin: 1 0;
+
+        PathSelector {
+            &.primary_color {
+                color: $primary;
+            }
+            &.secondary_color {
+                color: $secondary;
+            }
+        }
     }
     .storage_path_item {
         padding: 0 0;
@@ -462,13 +486,14 @@ class StorageContentContainer(Vertical):
             with Horizontal():
                 yield Label("Current Path: ", classes="storage_path_item")
                 for index, breadcrumb in enumerate(breadcrumbs):
-                    color = "$primary" if index == 0 else "$secondary"
+                    color_classes = "primary" if index == 0 else "secondary"
                     yield PathSelector(
-                        renderable=f"[{color}]{breadcrumb}[/]",
+                        renderable=breadcrumb,
                         storage=self.storage,
                         path="/".join(breadcrumbs[1 : index + 1]),
                         access_credentials_uuid=self.access_credentials_uuid,
-                        classes="storage_path_item",
+                        classes=f"storage_path_item {color_classes}_color",
+                        markup=False,
                     )
                     yield Label("/", classes="storage_path_item")
             with Horizontal():
@@ -630,15 +655,15 @@ class StorageContentContainer(Vertical):
                 )
             )
         elif action_type == ActionType.DELETE:
-            self.post_message(DeleteRequest(**params))
+            self.post_message(DeleteRequest(**params))  # ty: ignore[missing-argument]
         elif action_type == ActionType.DOWNLOAD:
-            self.post_message(DownloadRequest(**params))
+            self.post_message(DownloadRequest(**params))  # ty: ignore[missing-argument]
         elif action_type == ActionType.UNCHECK_ALL:
             self.post_message(
                 UncheckFilesRequest(
                     keys=[
                         item.uuid
-                        for item in self.storage_content.files  # type: ignore
+                        for item in getattr(self.storage_content, "files", [])
                         if item.key in self.selected_files
                     ]
                 )
@@ -654,14 +679,14 @@ class StorageContentContainer(Vertical):
         """
         try:
             selected_actions = self.query_one("#selected_actions")
-            counter = self.query_one("#selected_n")
+            counter = self.query_one("#selected_n", Label)
         except NoMatches:
             return
 
         if self.selected_files_n > 0:
             if not selected_actions.has_class("-visible"):
                 selected_actions.add_class("-visible")
-            counter.update(f"❌Selected: {self.selected_files_n}")  # type: ignore
+            counter.update(f"❌Selected: {self.selected_files_n}")
         else:
             selected_actions.remove_class("-visible")
             self.query_one("#content").remove_class("-visible")
@@ -682,7 +707,7 @@ class StorageContentContainer(Vertical):
         self.search_prefix = value
         self.post_message(
             SelectStorageItem(
-                self.storage,  # type: ignore
+                self.storage,
                 self.path,
                 self.access_credentials_uuid,
                 value,

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

@@ -8,7 +8,7 @@ and selection of storage items.
 from collections import namedtuple
 from itertools import groupby
 
-from textual import events
+from textual import events, on
 from textual.app import ComposeResult
 from textual.containers import Container, Horizontal, VerticalScroll
 from textual.reactive import reactive
@@ -16,10 +16,15 @@ from textual.widgets import Label, Rule
 
 from sourcerer.domain.shared.entities import StorageProvider
 from sourcerer.domain.storage_provider.entities import Storage
+from sourcerer.presentation.screens.main.messages.refresh_storages_list_request import (
+    RefreshStoragesListRequest,
+)
 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.widgets.button import Button
+from sourcerer.presentation.screens.shared.widgets.loader import Loader
 
 STORAGE_ICONS = {
     StorageProvider.S3: "🟠",
@@ -83,8 +88,11 @@ class StorageListSidebar(VerticalScroll):
         storages: Dictionary mapping provider types to lists of storage instances
     """
 
+    is_loading: reactive[bool] = reactive(False, recompose=True)
     storages: reactive[dict[str, list[Storage]]] = reactive({})
-    last_update_timestamp: reactive[float] = reactive(0, recompose=True)
+    last_update_timestamp: reactive[float] = reactive(  # ty: ignore[invalid-assignment]
+        0.0, recompose=True
+    )
 
     DEFAULT_CSS = """
     StorageListSidebar {
@@ -96,14 +104,14 @@ class StorageListSidebar(VerticalScroll):
             #rule-left {
                 width: 1;
             }
-            
+
             Horizontal {
                 height: auto;
             }
             Rule.-horizontal {
                 height: 1;
                 margin: 0 0;
-                    
+
             }
             .storage-letter {
                 color: $secondary;
@@ -112,11 +120,29 @@ class StorageListSidebar(VerticalScroll):
 
         }
     }
+    #header {
+        width: 100%;
+
+        GradientWidget {
+            width: auto;
+        }
+
+        Loader {
+            width: 5%;
+        }
+    }
     """
 
     def compose(self) -> ComposeResult:
-        with Container(id="header"):
-            yield GradientWidget("🧙SOURCERER", id="left-middle")
+        with Horizontal(id="header"):
+            if self.is_loading:
+                yield Loader()
+            yield GradientWidget(
+                " SOURCERER" if self.is_loading else "🧙SOURCERER",
+                id="left-middle",
+                name="header_click",
+            )
+
         StorageData = namedtuple("Storage", ["access_credentials_uuid", "storage"])
         storages = [
             StorageData(access_credentials_uuid, storage)
@@ -143,3 +169,9 @@ class StorageListSidebar(VerticalScroll):
                         storage_name=item.storage.storage,
                         access_credentials_uuid=item.access_credentials_uuid,
                     )
+
+    @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())

sourcerer/presentation/screens/preview_content/main.py

@@ -55,11 +55,11 @@ class PreviewContentScreen(ModalScreen):
         text_log = self.query_one(RichLog)
 
         extension = Path(self.key).suffix
-        match extension:
-            case ".tfstate":
-                lexer = "json"
-            case _:
-                lexer = Syntax.guess_lexer(self.key, content)
+
+        lexer = (
+            "json" if extension == ".tfstate" else Syntax.guess_lexer(self.key, content)
+        )
+
         content = Syntax(content, lexer, line_numbers=True, theme="ansi_dark")
         text_log.write(content)
 

sourcerer/presentation/screens/provider_creds_list/main.py

@@ -11,10 +11,14 @@ from textual.widgets import Checkbox, Label
 
 from sourcerer.domain.access_credentials.entities import Credentials
 from sourcerer.infrastructure.access_credentials.services import CredentialsService
+from sourcerer.presentation.screens.provider_creds_list.messages.reload_credentials_request import (
+    ReloadCredentialsRequest,
+)
 from sourcerer.presentation.screens.provider_creds_registration.main import (
     ProviderCredentialsEntry,
     ProviderCredsRegistrationScreen,
 )
+from sourcerer.presentation.screens.question.main import QuestionScreen
 from sourcerer.presentation.screens.shared.widgets.button import Button
 
 
@@ -39,6 +43,7 @@ class ProviderCredentialsRow(Horizontal):
         yield Label(self.row.name, classes="credentials_name")
         yield Label(self.row.provider, classes="credentials_provider")
         yield Label(self.row.credentials_type, classes="credentials_auth_method")
+        yield Button("❌", name="delete", classes="credentials_auth_delete")
 
     def on_mouse_move(self, _) -> None:
         """Change background color when hovered."""
@@ -59,6 +64,34 @@ class ProviderCredentialsRow(Horizontal):
         self.row.active = event.value
         self.post_message(self.ChangeActiveStatus(self.row.uuid, self.row.active))
 
+    @on(Button.Click)
+    def on_delete_button_click(self, _: Button.Click):
+        """
+        Handle delete button click events by deleting the associated credentials using the credentials service.
+
+        Args:
+            _ (Button.Click): The button click event.
+        """
+        self.app.push_screen(
+            QuestionScreen(
+                f"Are you sure you want to delete {self.row.provider} {self.row.name} credentials?"
+            ),
+            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
+        credentials_service = CredentialsService()
+        credentials_service.delete(self.row.uuid)
+        self.post_message(ReloadCredentialsRequest())
+
 
 class ProviderCredsListScreen(ModalScreen):
     CSS_PATH = "styles.tcss"
@@ -94,6 +127,7 @@ class ProviderCredsListScreen(ModalScreen):
                     yield Label("Name", classes="credentials_name")
                     yield Label("Provider", classes="credentials_provider")
                     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")
             with Horizontal(id="controls"):
@@ -162,3 +196,13 @@ class ProviderCredsListScreen(ModalScreen):
         else:
             self.credentials_service.deactivate(event.uuid)
         self.refresh_credentials_list()
+
+    @on(ReloadCredentialsRequest)
+    def on_reload_credentials_request(self, _: ReloadCredentialsRequest):
+        """
+        Handle reload credentials request events by refreshing the credentials list.
+
+        Args:
+            _ (ReloadCredentialsRequest): The reload credentials request event.
+        """
+        self.refresh_credentials_list()

sourcerer/presentation/screens/provider_creds_list/messages/reload_credentials_request.py

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

sourcerer/presentation/screens/provider_creds_list/styles.tcss

@@ -43,23 +43,23 @@ ProviderCredsListScreen {
     }
 
     .credentials_name {
-      width: 30%;
+      width: 20%;
     }
 
     .credentials_provider {
-      width: 30%;
+      width: 25%;
     }
 
     .credentials_auth_method {
       width: 30%;
     }
 
+    .credentials_auth_delete {
+      width: 10%;
+    }
 
     & > Select {
       margin-bottom: 1;
     }
   }
 }
-
-
-

sourcerer/presentation/screens/provider_creds_registration/main.py

@@ -15,6 +15,7 @@ from sourcerer.domain.access_credentials.services import (
 from sourcerer.infrastructure.access_credentials.exceptions import (
     MissingAuthFieldsError,
 )
+from sourcerer.infrastructure.utils import generate_unique_name
 from sourcerer.presentation.di_container import DiContainer
 from sourcerer.presentation.screens.shared.widgets.button import Button
 from sourcerer.presentation.screens.shared.widgets.labeled_input import LabeledInput
@@ -155,7 +156,7 @@ class ProviderCredsRegistrationScreen(ModalScreen):
         if event.control.name == self.PROVIDERS_NAME:
             await self._process_selected_provider(str(event.value))
         elif event.control.name == self.AUTH_METHODS_NAME:
-            provider = self.query_one(f"#{self.PROVIDER_SELECTOR_ID}").selection  # type: ignore
+            provider = self.query_one(f"#{self.PROVIDER_SELECTOR_ID}", Select).selection
             await self._process_selected_provider_auth_method(
                 provider, str(event.value)
             )
@@ -215,7 +216,10 @@ class ProviderCredsRegistrationScreen(ModalScreen):
             if isinstance(input_field, LabeledInput) and input_field.get().value
         }
 
-        auth_name = self.query_one("#auth_name").get().value or "default"  # type: ignore
+        auth_name = (
+            self.query_one("#auth_name", LabeledInput).get().value
+            or generate_unique_name()
+        )
 
         return ProviderCredentialsEntry(
             name=auth_name,

sourcerer/presentation/screens/question/main.py

@@ -1,8 +1,9 @@
+from rich.text import Text
 from textual import on
 from textual.app import ComposeResult
 from textual.containers import Container, Horizontal
 from textual.screen import ModalScreen
-from textual.widgets import Label
+from textual.widgets import Static
 
 from sourcerer.presentation.screens.shared.widgets.button import Button
 
@@ -18,7 +19,7 @@ class QuestionScreen(ModalScreen[bool]):
 
     def compose(self) -> ComposeResult:
         with Container():
-            yield Label(self.question)
+            yield Static(Text(self.question, style="bold"), id="question_label")
             with Horizontal():
                 yield Button("Yes", name="yes")
                 yield Button("No", name="no")
@@ -28,4 +29,4 @@ class QuestionScreen(ModalScreen[bool]):
         """
         Handle button click events.
         """
-        self.dismiss(event.action)  # type: ignore
+        self.dismiss(event.action == "yes")  # type: ignore

sourcerer/presentation/screens/question/styles.tcss

@@ -2,8 +2,6 @@ QuestionScreen {
   align: center middle;
   content-align: center top;
 
-
-
   & > Container {
     padding: 1 2 0 2;
     margin: 0 0;
@@ -11,11 +9,10 @@ QuestionScreen {
     height: 8;
     border: solid $warning-darken-1;
 
-    & > Label {
+    & > Static {
       margin: 1;
       text-align: center;
-      column-span: 2;
-      width: auto;
+      text-wrap: wrap;
     }
 
     & > Horizontal {
@@ -28,6 +25,3 @@ QuestionScreen {
   }
 
 }
-
-
-

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

@@ -41,7 +41,7 @@ class Button(Label):
             ValueError: If 'name' is not included in the keyword arguments.
         """
         super().__init__(*args, **kwargs)
-        if "name" not in kwargs:
+        if "name" not in kwargs or not kwargs["name"]:
             raise ValueError("Name is required attribute for button")
 
     def on_click(self, _: events.Click) -> None: