data-sourcerer 0.1.0__py3-none-any.whl → 0.2.0__py3-none-any.whl

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

@@ -5,6 +5,7 @@ including files and folders. It handles file selection, navigation, and content
 display with search functionality.
 """
 
+import contextlib
 import os.path
 from dataclasses import dataclass
 from enum import Enum, auto
@@ -12,17 +13,17 @@ from enum import Enum, auto
 from textual import events, on
 from textual.app import ComposeResult
 from textual.containers import (
-    VerticalScroll,
-    Horizontal,
     Center,
-    Middle,
     Container,
+    Horizontal,
+    Middle,
     Vertical,
+    VerticalScroll,
 )
 from textual.css.query import NoMatches
 from textual.message import Message
 from textual.reactive import reactive
-from textual.widgets import Label, Static, Input, Checkbox
+from textual.widgets import Checkbox, Input, Label, Static
 
 from sourcerer.domain.storage_provider.entities import StorageContent
 from sourcerer.presentation.screens.main.messages.delete_request import DeleteRequest
@@ -40,11 +41,11 @@ from sourcerer.presentation.screens.main.messages.upload_request import UploadRe
 from sourcerer.presentation.screens.shared.widgets.button import Button
 from sourcerer.presentation.settings import NO_DATA_LOGO
 from sourcerer.settings import (
-    UPLOAD_ICON,
-    DOWNLOAD_ICON,
-    PREVIEW_ICON,
     DIRECTORY_ICON,
+    DOWNLOAD_ICON,
     FILE_ICON,
+    PREVIEW_ICON,
+    UPLOAD_ICON,
 )
 
 
@@ -273,10 +274,9 @@ class FileItem(Horizontal):
     def on_click(self, event: events.Click) -> None:
         """Handle click events to toggle file selection."""
         preview_button = None
-        try:
+        with contextlib.suppress(NoMatches):
             preview_button = self.query_one(Button)
-        except NoMatches:
-            pass
+
         if event.widget is preview_button:
             self.post_message(self.Preview(self.file.key))
             return
@@ -491,9 +491,8 @@ class StorageContentContainer(Vertical):
         if not self.storage_content or (
             not self.storage_content.files and not self.storage_content.folders
         ):
-            with Middle():
-                with Center():
-                    yield Static(NO_DATA_LOGO)
+            with Middle(), Center():
+                yield Static(NO_DATA_LOGO)
             return
         with Horizontal(classes="file_list_header"):
             yield FileMetaLabel("Name", classes="file_name")

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

@@ -7,11 +7,10 @@ and selection of storage items.
 
 from collections import namedtuple
 from itertools import groupby
-from typing import Dict, List
 
 from textual import events
 from textual.app import ComposeResult
-from textual.containers import VerticalScroll, Horizontal, Container
+from textual.containers import Container, Horizontal, VerticalScroll
 from textual.reactive import reactive
 from textual.widgets import Label, Rule
 
@@ -25,7 +24,7 @@ from sourcerer.presentation.screens.main.widgets.gradient import GradientWidget
 STORAGE_ICONS = {
     StorageProvider.S3: "🟠",
     StorageProvider.GoogleCloudStorage: "🔵",
-    "azure": "⚪️",
+    StorageProvider.AzureStorage: "⚪️",
 }
 """Mapping of storage provider types to their display icons."""
 
@@ -84,7 +83,8 @@ class StorageListSidebar(VerticalScroll):
         storages: Dictionary mapping provider types to lists of storage instances
     """
 
-    storages: reactive[Dict[str, List[Storage]]] = reactive({}, recompose=True)
+    storages: reactive[dict[str, list[Storage]]] = reactive({})
+    last_update_timestamp: reactive[float] = reactive(0, recompose=True)
 
     DEFAULT_CSS = """
     StorageListSidebar {
@@ -125,7 +125,9 @@ class StorageListSidebar(VerticalScroll):
         ]
         storages = sorted(storages, key=lambda x: x.storage.storage)
 
-        for letter, storages 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"),
@@ -133,7 +135,7 @@ class StorageListSidebar(VerticalScroll):
                     Rule(),
                 )
 
-                for item in storages:
+                for item in storages_group:
                     yield StorageItem(
                         renderable=STORAGE_ICONS.get(item.storage.provider, "")
                         + " "

sourcerer/presentation/screens/preview_content/main.py

@@ -1,13 +1,15 @@
+from pathlib import Path
+
 from rich.syntax import Syntax
 from textual import on
 from textual.app import ComposeResult
 from textual.containers import Container, Horizontal
 from textual.screen import ModalScreen
-from textual.widgets import RichLog, LoadingIndicator
+from textual.widgets import LoadingIndicator, RichLog
 
 from sourcerer.infrastructure.access_credentials.services import CredentialsService
 from sourcerer.infrastructure.storage_provider.exceptions import (
-    ReadStorageItemsException,
+    ReadStorageItemsError,
 )
 from sourcerer.presentation.screens.shared.widgets.button import Button
 from sourcerer.presentation.utils import get_provider_service_by_access_uuid
@@ -42,13 +44,22 @@ class PreviewContentScreen(ModalScreen):
             return
         try:
             content = provider_service.read_storage_item(self.storage_name, self.key)
-        except ReadStorageItemsException:
+        except ReadStorageItemsError:
             self.notify("Could not read file :(", severity="error")
             return
         self.query_one("#loading").remove()
+        if content is None:
+            self.notify("Empty file", severity="warning")
+            return
 
         text_log = self.query_one(RichLog)
-        lexer = Syntax.guess_lexer(self.key, content)
+
+        extension = Path(self.key).suffix
+        match extension:
+            case ".tfstate":
+                lexer = "json"
+            case _:
+                lexer = Syntax.guess_lexer(self.key, content)
         content = Syntax(content, lexer, line_numbers=True, theme="ansi_dark")
         text_log.write(content)
 

sourcerer/presentation/screens/preview_content/styles.tcss

@@ -12,13 +12,14 @@ PreviewContentScreen {
   & > #PreviewContentScreen {
     padding: 1 2 0 2;
     margin: 0 0;
-    width: 90;
+    width: 100;
     height: 40;
     border: solid $secondary-background;
     border-title-color: $primary-lighten-2;
 
     RichLog {
       background: transparent;
+      width: 95;
     }
 
   }

sourcerer/presentation/screens/provider_creds_list/main.py

@@ -7,13 +7,13 @@ 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 Label, Checkbox
+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_registration.main import (
-    ProviderCredsRegistrationScreen,
     ProviderCredentialsEntry,
+    ProviderCredsRegistrationScreen,
 )
 from sourcerer.presentation.screens.shared.widgets.button import Button
 

sourcerer/presentation/screens/provider_creds_registration/main.py

@@ -1,17 +1,19 @@
 from dataclasses import dataclass
 from enum import Enum
-from typing import List
 
 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 Select, Label
+from textual.widgets import Label, Select
 
 from sourcerer.domain.access_credentials.services import (
-    BaseAccessCredentialsService,
     AuthField,
+    BaseAccessCredentialsService,
+)
+from sourcerer.infrastructure.access_credentials.exceptions import (
+    MissingAuthFieldsError,
 )
 from sourcerer.presentation.di_container import DiContainer
 from sourcerer.presentation.screens.shared.widgets.button import Button
@@ -44,10 +46,10 @@ class ProviderCredsRegistrationScreen(ModalScreen):
 
     def __init__(
         self,
+        *args,
         credentials_type_registry=Provide[
             DiContainer.config.access_credential_method_registry
         ],
-        *args,
         **kwargs,
     ):
         super().__init__(*args, **kwargs)
@@ -68,7 +70,7 @@ class ProviderCredsRegistrationScreen(ModalScreen):
                 yield Select(
                     options=(
                         (provider, provider)
-                        for provider in self.provider_credentials_settings.keys()
+                        for provider in self.provider_credentials_settings
                     ),
                     name=self.PROVIDERS_NAME,
                     id=self.PROVIDER_SELECTOR_ID,
@@ -108,7 +110,7 @@ class ProviderCredsRegistrationScreen(ModalScreen):
 
         # If multiple authentication methods exist, display a selection dropdown
         if len(auth_methods) > 1:
-            options = [(auth_type, auth_type) for auth_type in auth_methods.keys()]
+            options = [(auth_type, auth_type) for auth_type in auth_methods]
             await self.query_one(f"#{self.SETTINGS_CONTAINER_ID}").mount(
                 Container(
                     Label("Auth method:", classes="form_label"),
@@ -178,11 +180,22 @@ class ProviderCredsRegistrationScreen(ModalScreen):
         if event.action == ControlsEnum.CANCEL.name:
             self.dismiss()
         elif event.action == ControlsEnum.CREATE.name:
+            if not self.auth_method:
+                self.notify("Please select provider and auth method", severity="error")
+                return
+
             auth_fields = self._get_auth_fields()
             if not auth_fields:
                 self.notify("Please select provider and auth method", severity="error")
-            else:
-                self.dismiss(auth_fields)
+                return
+
+            try:
+                self.auth_method.validate_auth_fields_values(auth_fields.fields)
+            except MissingAuthFieldsError as e:
+                self.notify(str(e), severity="error")
+                return
+
+            self.dismiss(auth_fields)
 
     def _get_auth_fields(self) -> ProviderCredentialsEntry | None:
         """
@@ -193,13 +206,15 @@ class ProviderCredsRegistrationScreen(ModalScreen):
         """
         if not self.auth_method:
             return
+
         fields = {
             input_field.get().name: input_field.get().value
             for input_field in self.query_one(
                 f"#{self.CREDENTIALS_FIELDS_CONTAINER_ID}"
             ).children
-            if isinstance(input_field, LabeledInput)
+            if isinstance(input_field, LabeledInput) and input_field.get().value
         }
+
         auth_name = self.query_one("#auth_name").get().value or "default"  # type: ignore
 
         return ProviderCredentialsEntry(
@@ -235,13 +250,13 @@ class ProviderCredsRegistrationScreen(ModalScreen):
             self.auth_method = provider_auth_class
             await self._mount_credentials_fields(provider_auth_class.auth_fields())
 
-    async def _mount_credentials_fields(self, fields: List[AuthField]) -> None:
+    async def _mount_credentials_fields(self, fields: list[AuthField]) -> None:
         """
         Mounts a container of labeled input fields for credentials onto the settings container
         and sets focus on the first input field.
 
         Args:
-            fields (List[AuthField]): A list of AuthField objects containing key, label, and required attributes.
+            fields (list[AuthField]): A list of AuthField objects containing key, label, and required attributes.
 
         Returns:
             None

sourcerer/presentation/screens/question/main.py

@@ -1,6 +1,6 @@
 from textual import on
 from textual.app import ComposeResult
-from textual.containers import Horizontal, Container
+from textual.containers import Container, Horizontal
 from textual.screen import ModalScreen
 from textual.widgets import Label
 

sourcerer/presentation/screens/shared/containers.py

@@ -1,4 +1,4 @@
-from textual.containers import ScrollableContainer, HorizontalScroll, VerticalScroll
+from textual.containers import HorizontalScroll, ScrollableContainer, VerticalScroll
 
 
 class ScrollableContainerWithNoBindings(ScrollableContainer, inherit_bindings=False):

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

@@ -2,7 +2,7 @@ from dataclasses import dataclass
 
 from textual.app import ComposeResult
 from textual.containers import Container
-from textual.widgets import Label, Input, TextArea
+from textual.widgets import Input, Label, TextArea
 
 
 class LabeledInput(Container):

sourcerer/presentation/screens/storage_action_progress/main.py

@@ -1,19 +1,23 @@
+import contextlib
 import os
 from concurrent.futures import ThreadPoolExecutor, as_completed
 from dataclasses import dataclass
 from pathlib import Path
-from typing import List
 
 from rich.text import Text
 from textual import on
 from textual.app import ComposeResult
 from textual.color import Gradient
-from textual.containers import Container, VerticalScroll, Horizontal, Center
+from textual.containers import Center, Container, Horizontal, VerticalScroll
 from textual.css.query import NoMatches
+from textual.reactive import reactive
 from textual.screen import ModalScreen
-from textual.widgets import ProgressBar, Label, Rule
+from textual.widgets import Label, ProgressBar, Rule
 
 from sourcerer.domain.storage_provider.services import BaseStorageProviderService
+from sourcerer.infrastructure.storage_provider.exceptions import (
+    UploadStorageItemsError,
+)
 from sourcerer.presentation.screens.question.main import QuestionScreen
 from sourcerer.presentation.screens.shared.widgets.button import Button
 from sourcerer.settings import MAX_PARALLEL_DOWNLOADS
@@ -96,12 +100,14 @@ class StorageActionProgressScreen(ModalScreen):
 
     CSS_PATH = "styles.tcss"
 
+    files_has_been_processed = reactive(False)
+
     def __init__(
         self,
         storage_name: str,
         path: str,
         provider_service: BaseStorageProviderService | None,
-        keys: List[UploadKey | DownloadKey | DeleteKey],
+        keys: list[UploadKey | DownloadKey | DeleteKey],
         action: str,
         *args,
         **kwargs,
@@ -113,7 +119,7 @@ class StorageActionProgressScreen(ModalScreen):
             storage_name (str): Name of the storage being operated on
             path (str): Path within the storage
             provider_service (BaseStorageProviderService | None): Service for interacting with the storage provider
-            keys (List[Key]): List of keys representing files/folders to process
+            keys (list[Key]): List of keys representing files/folders to process
             action (str): Type of action being performed ('download', 'upload', or 'delete')
             *args: Additional positional arguments to pass to parent class
             **kwargs: Additional keyword arguments to pass to parent class
@@ -124,7 +130,6 @@ class StorageActionProgressScreen(ModalScreen):
         self.action = action
         self.path = path
         self.keys = keys
-        self.files_has_been_processed = False
         self.active_worker = None
         self.active_executor = None
 
@@ -401,12 +406,19 @@ class StorageActionProgressScreen(ModalScreen):
         for key in self.keys:
             source_path = Path(key.path)
             if source_path.is_file():
-                self.provider_service.upload_storage_item(
-                    storage=self.storage_name,
-                    source_path=key.path,
-                    dest_path=str(Path(self.path) / key.dest_path) if self.path else key.dest_path,  # type: ignore
-                )
-                self.files_has_been_processed = True
+                try:
+                    self.provider_service.upload_storage_item(
+                        storage=self.storage_name,
+                        storage_path=self.path,
+                        source_path=key.path,
+                        dest_path=key.dest_path,  # type: ignore
+                    )
+                    progress_bar = self.query_one(f"#progress_bar_{key.uuid}")
+                    progress_bar.advance(1)  # type: ignore
+                except UploadStorageItemsError as e:
+                    self.notify(f"Failed to upload {key.path}: {e}", severity="error")
+                finally:
+                    self.files_has_been_processed = True
             elif source_path.is_dir():
 
                 files_n = len([i for i in source_path.rglob("*") if i.is_file()])
@@ -457,20 +469,22 @@ class StorageActionProgressScreen(ModalScreen):
             return
         progress_bar = self.query_one(f"#progress_bar_{uuid}")
         details_container = None
-        try:
+        with contextlib.suppress(NoMatches):
             details_container = self.query_one(f"#progress_file_details_{uuid}")
-        except NoMatches:
-            pass
         if details_container:
             details_container.update(Text(f"({rel_source})", overflow="ellipsis"))  # type: ignore
         try:
             self.provider_service.upload_storage_item(
                 storage=self.storage_name,
+                storage_path=self.path,
                 source_path=source,
-                dest_path=(
-                    str(Path(self.path) / destination) if self.path else destination
-                ),
+                dest_path=destination,
             )
             progress_bar.advance(1)  # type: ignore
-        except Exception:
-            self.notify(f"Failed to upload {source}", severity="error")
+        except UploadStorageItemsError as e:
+            self.notify(f"Failed to upload {source}: {e}", severity="error")
+
+    def watch_files_has_been_processed(self):
+        if self.files_has_been_processed:
+            self.notify(f"{self.action.capitalize()} operation is completed")
+            self.query_one("#StorageActionProgress").add_class("success")

sourcerer/presentation/screens/storage_action_progress/styles.tcss

@@ -9,6 +9,17 @@ StorageActionProgressScreen {
   content-align: center top;
 
 
+  & > #StorageActionProgress.success {
+    border: solid $success;
+
+    #controls {
+      Button {
+        border: solid $success;
+      }
+
+    }
+  }
+
   & > #StorageActionProgress {
     padding: 1 2 0 2;
     margin: 0 0;

sourcerer/presentation/utils.py

@@ -6,6 +6,7 @@ particularly for retrieving and initializing storage provider services.
 """
 
 from sourcerer.domain.storage_provider.services import BaseStorageProviderService
+from sourcerer.infrastructure.access_credentials.exceptions import CredentialsAuthError
 from sourcerer.infrastructure.access_credentials.registry import (
     access_credential_method_registry,
 )
@@ -57,13 +58,16 @@ def get_provider_service_by_access_credentials(
     )
 
     if not credentials_service:
-        return
+        return None
 
     provider_service_class = storage_provider_registry.get_by_provider(
         credentials.provider
     )
     if not provider_service_class:
-        return
+        return None
 
-    auth_credentials = credentials_service().authenticate(credentials.credentials)
+    try:
+        auth_credentials = credentials_service().authenticate(credentials.credentials)
+    except CredentialsAuthError:
+        return None
     return provider_service_class(auth_credentials)

sourcerer/settings.py

@@ -23,6 +23,8 @@ DB_NAME = "sourcerer.db"
 
 ENCRYPTION_KEY = get_encryption_key(APP_DIR)
 
+MAX_PARALLEL_STORAGE_LIST_OPERATIONS = 3
+
 # Maximum number of parallel download operations
 MAX_PARALLEL_DOWNLOADS = 8
 
@@ -66,6 +68,8 @@ TEXT_EXTENSIONS = {
     ".cpp",
     ".go",
     ".rs",
+    ".tfstate",
+    ".tf",
 }
 
 

sourcerer/utils.py

@@ -17,7 +17,7 @@ def get_encryption_key(path: Path):
 
     # If key file exists, read the key from it
     if os.path.exists(key_file_path):
-        with open(key_file_path, "r") as f:
+        with open(key_file_path, encoding="utf-8") as f:
             return f.read().strip()
 
     # Otherwise, generate a new key and store it
@@ -26,7 +26,7 @@ def get_encryption_key(path: Path):
     os.makedirs(os.path.dirname(key_file_path), exist_ok=True)
 
     new_key = str(uuid.uuid4())
-    with open(key_file_path, "w") as f:
+    with open(key_file_path, "w", encoding="utf-8") as f:
         f.write(new_key)
 
     return new_key