data-sourcerer 0.2.3__tar.gz → 0.4.0__tar.gz

{data_sourcerer-0.2.3 → data_sourcerer-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: data-sourcerer
-Version: 0.2.3
+Version: 0.4.0
 Summary: Sourcerer is a terminal cloud storage navigator.
 Author-email: Bohdana Kuzmenko <bohdana.kuzmenko.dev@gmail.com>
 License: MIT
@@ -42,6 +42,8 @@ engineers to view and manage files across multiple cloud providers like
 
 > Your terminal. Your storages. Your control.
 
+[Demo page](https://the-impact-craft.github.io/sourcerer/)
+
 ---
 
 ## ✨ Features

{data_sourcerer-0.2.3 → data_sourcerer-0.4.0}/README.md

@@ -6,6 +6,8 @@ engineers to view and manage files across multiple cloud providers like
 
 > Your terminal. Your storages. Your control.
 
+[Demo page](https://the-impact-craft.github.io/sourcerer/)
+
 ---
 
 ## ✨ Features

{data_sourcerer-0.2.3 → data_sourcerer-0.4.0}/pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 
 name = "data-sourcerer"
-version = "0.2.3"
+version = "0.4.0"
 description = "Sourcerer is a terminal cloud storage navigator."
 requires-python = ">=3.9"
 
@@ -92,8 +92,9 @@ select = [
   "C90",  # mccabe (complexity)
   "B",    # flake8-bugbear
   "SIM",  # flake8-simplify
+  "Q",    #flake8-quotes
+  "RUF",
 ]
-
 # Allow autofix for these rule sets
 fixable = ["ALL"]
 

{data_sourcerer-0.2.3 → data_sourcerer-0.4.0}/sourcerer/__init__.py

@@ -12,4 +12,4 @@ The application is structured using a clean architecture approach with:
 - Presentation layer: User interface components
 """
 
-__version__ = "0.2.3"
+__version__ = "0.4.0"

{data_sourcerer-0.2.3 → data_sourcerer-0.4.0}/sourcerer/domain/access_credentials/entities.py

@@ -4,13 +4,14 @@ Access credentials entity classes.
 This module defines data classes representing access credentials
 used for authentication with various cloud providers.
 """
-
 from datetime import datetime
 
 import boto3
 from azure.identity import ClientSecretCredential
 from msgspec._core import Struct
 
+from sourcerer.domain.storage.entities import Storage
+
 
 class Credentials(Struct):
     """
@@ -35,6 +36,7 @@ class Credentials(Struct):
     active: bool
     created_at: datetime | None = None
     updated_at: datetime | None = None
+    storages: list[Storage] = []  # noqa: RUF012
 
 
 class Boto3Credentials(Struct):

{data_sourcerer-0.2.3 → data_sourcerer-0.4.0}/sourcerer/domain/access_credentials/repositories.py

@@ -56,7 +56,7 @@ class BaseCredentialsRepository(metaclass=ABCMeta):
         raise NotImplementedError
 
     @abstractmethod
-    def list(self, active_only: bool | None = None):
+    def list(self, active_only: bool | None = None) -> list[Credentials]:
         """List all credentials in the repository.
 
         Args:

data_sourcerer-0.4.0/sourcerer/domain/storage/entities.py

@@ -0,0 +1,27 @@
+"""
+Storage provider entity classes.
+
+This module defines data classes representing cloud storage entities
+such as storage containers, files, folders, and permissions.
+"""
+
+from datetime import datetime
+
+from msgspec._core import Struct
+
+
+class Storage(Struct):
+    """
+    Represents a cloud storage container (bucket/container).
+
+    Attributes:
+        credentials_id (int): The ID of the associated credentials
+        name (str): The storage name/identifier (e.g., bucket name)
+        date_created (datetime): When the storage was created
+    """
+
+    name: str
+    uuid: str
+    date_created: datetime
+    credentials_id: int | None = None
+    credentials_name: str | None = None

data_sourcerer-0.4.0/sourcerer/domain/storage/repositories.py

@@ -0,0 +1,31 @@
+from abc import ABCMeta, abstractmethod
+
+from sourcerer.domain.storage.entities import Storage
+
+
+class BaseStoragesRepository(metaclass=ABCMeta):
+    @abstractmethod
+    def create(self, storage: Storage) -> None:
+        """Create a new storage entry in the repository.
+        Args:
+            storage (Storage): The storage object to store
+        """
+        raise NotImplementedError()
+
+    @abstractmethod
+    def list(self, provider_id: int | None = None) -> list[Storage]:
+        """List all storage entries in the repository.
+        Args:
+            provider_id (int | None): The provider ID to filter by. If None, all entries are returned.
+        Returns:
+            List[Storage]: A list of storage entries
+        """
+        raise NotImplementedError()
+
+    @abstractmethod
+    def delete(self, uuid: str) -> None:
+        """Delete a storage entry by UUID.
+        Args:
+            uuid (str): The UUID of the storage entry to delete
+        """
+        raise NotImplementedError()

{data_sourcerer-0.2.3 → data_sourcerer-0.4.0}/sourcerer/domain/storage_provider/entities.py

@@ -63,7 +63,7 @@ class File(Struct):
 
     uuid: str
     key: str
-    size: str
+    size: int
     is_text: bool
     date_modified: datetime | None = None
 

{data_sourcerer-0.2.3 → data_sourcerer-0.4.0}/sourcerer/infrastructure/access_credentials/repositories.py

@@ -46,7 +46,7 @@ class SQLAlchemyCredentialsRepository(BaseCredentialsRepository):
             session.add(credentials)
             session.commit()
 
-    def delete(self, uuid: str):
+    def delete(self, uuid: str) -> None:
         """
         Delete credentials from the database by UUID.
 
@@ -78,7 +78,7 @@ class SQLAlchemyCredentialsRepository(BaseCredentialsRepository):
                 session.query(DBCredentials).filter(DBCredentials.uuid == uuid).first()
             )
 
-    def list(self, active_only: bool | None = None):
+    def list(self, active_only: bool | None = None) -> list[Credentials]:
         """
         List all credentials in the repository.
 
@@ -103,6 +103,7 @@ class SQLAlchemyCredentialsRepository(BaseCredentialsRepository):
                     credentials_type=credential.credentials_type,
                     credentials=credential.credentials,
                     active=credential.active,
+                    storages=credential.storages,
                 )
                 for credential in credentials_query.all()
             ]

{data_sourcerer-0.2.3 → data_sourcerer-0.4.0}/sourcerer/infrastructure/access_credentials/services.py

@@ -10,7 +10,6 @@ from abc import ABC
 
 import boto3
 from azure.identity import ClientSecretCredential
-from dependency_injector.wiring import Provide
 from google.cloud import storage
 
 from sourcerer.domain.access_credentials.entities import (
@@ -33,7 +32,6 @@ from sourcerer.infrastructure.access_credentials.registry import (
     access_credentials_method,
 )
 from sourcerer.infrastructure.utils import generate_uuid
-from sourcerer.presentation.di_container import DiContainer
 
 
 class CredentialsService:
@@ -44,21 +42,16 @@ class CredentialsService:
     and deactivating credentials.
     """
 
-    def __init__(
-        self,
-        credentials_repo: BaseCredentialsRepository = Provide[
-            DiContainer.credentials_repository
-        ],
-    ):
+    def __init__(self, repository: BaseCredentialsRepository):
         """
         Initialize the service with a credentials repository.
 
         Args:
-            credentials_repo (BaseCredentialsRepository): Repository for storing credentials
+            repository (BaseCredentialsRepository): Repository for storing credentials
         """
-        self.credentials_repo = credentials_repo
+        self.credentials_repo = repository
 
-    def list(self, active_only=False):
+    def list(self, active_only=False) -> list[Credentials]:
         """
         List credentials.
 
@@ -119,12 +112,7 @@ class AccessCredentialsService(BaseAccessCredentialsService, ABC):
     access credential service implementations.
     """
 
-    def __init__(
-        self,
-        credentials_repo: BaseCredentialsRepository = Provide[
-            DiContainer.credentials_repository
-        ],
-    ):
+    def __init__(self, credentials_repo: BaseCredentialsRepository):
         """
         Initialize the service with a credentials repository.
 
@@ -408,11 +396,9 @@ class GCPCredentialsService(AccessCredentialsService):
             return storage.Client.from_service_account_info(service_acc_info)
 
         except json.JSONDecodeError as e:
-            raise CredentialsAuthError(f"Invalid credentials format: {str(e)}") from e
+            raise CredentialsAuthError(f"Invalid credentials format: {e}") from e
         except Exception as e:
-            raise CredentialsAuthError(
-                f"Failed to authenticate with GCP: {str(e)}"
-            ) from e
+            raise CredentialsAuthError(f"Failed to authenticate with GCP: {e}") from e
 
     @classmethod
     def auth_fields(cls) -> list[AuthField]:
@@ -484,11 +470,9 @@ class AzureClientSecretCredentialsService(AccessCredentialsService):
             )
 
         except json.JSONDecodeError as e:
-            raise CredentialsAuthError(f"Invalid credentials format: {str(e)}") from e
+            raise CredentialsAuthError(f"Invalid credentials format: {e}") from e
         except Exception as e:
-            raise CredentialsAuthError(
-                f"Failed to authenticate with Azure: {str(e)}"
-            ) from e
+            raise CredentialsAuthError(f"Failed to authenticate with Azure: {e}") from e
 
     @classmethod
     def auth_fields(cls) -> list[AuthField]:

{data_sourcerer-0.2.3 → data_sourcerer-0.4.0}/sourcerer/infrastructure/db/models.py

@@ -7,8 +7,8 @@ and their relationships.
 
 from datetime import datetime
 
-from sqlalchemy import Boolean, Column, DateTime, Integer, String
-from sqlalchemy.orm import declarative_base
+from sqlalchemy import Boolean, Column, DateTime, ForeignKey, Integer, String
+from sqlalchemy.orm import backref, declarative_base, relationship
 from sqlalchemy_utils.types.encrypted.encrypted_type import EncryptedType
 
 from sourcerer.settings import ENCRYPTION_KEY
@@ -45,3 +45,34 @@ class Credentials(Base):
     active = Column(Boolean, default=True)
     created_at = Column(DateTime, default=datetime.utcnow)
     updated_at = Column(DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
+
+
+class Storage(Base):
+    """
+    SQLAlchemy model for storing storage information.
+
+    This model represents the storage table in the database,
+    storing information about different storage containers.
+
+    Attributes:
+        id (int): Primary key
+        uuid (str): Unique identifier for the storage
+        name (str): Name of the storage
+        credentials_id (int): Foreign key referencing the credentials table
+        created_at (datetime): Timestamp when the storage was created
+    """
+
+    __tablename__ = "storages"
+    id = Column(Integer, primary_key=True)
+    uuid = Column(String, unique=True, nullable=False)
+    name = Column(String, nullable=False)
+    credentials_id = Column(
+        Integer, ForeignKey("credentials.id", ondelete="CASCADE"), nullable=False
+    )
+    created_at = Column(DateTime, default=datetime.utcnow)
+
+    credentials = relationship(
+        "Credentials",
+        cascade="save-update",
+        backref=backref("storages", passive_deletes=True),
+    )

data_sourcerer-0.4.0/sourcerer/infrastructure/storage/repositories.py

@@ -0,0 +1,72 @@
+from sourcerer.domain.storage.entities import Storage
+from sourcerer.domain.storage.repositories import BaseStoragesRepository
+from sourcerer.infrastructure.db.models import Storage as DBStorage
+
+
+class SQLAlchemyStoragesRepository(BaseStoragesRepository):
+    def __init__(self, db):
+        """
+        Initialize the repository with a database session factory.
+
+        Args:
+            db: Database session factory
+        """
+        self.db = db
+
+    def create(self, storage: Storage) -> None:
+        """
+        Create a new storage entity in the database.
+
+        Args:
+            storage (Storage): The storage entity to be created
+        """
+        entry = DBStorage(
+            uuid=storage.uuid,
+            name=storage.name,
+            credentials_id=storage.credentials_id,
+            created_at=storage.date_created,
+        )
+        with self.db() as session:
+            session.add(entry)
+            session.commit()
+
+    def list(self, provider_id: int | None = None) -> list[Storage]:
+        """
+        List all storages, optionally filtered by provider ID.
+
+        Args:
+            provider_id (int | None): The ID of the provider to filter by
+
+        Returns:
+            list[Storage]: List of storage entities
+        """
+        with self.db() as session:
+            query = session.query(DBStorage)
+            if provider_id is not None:
+                query = query.filter(DBStorage.credentials_id == provider_id)
+            return [
+                Storage(
+                    name=storage.name,
+                    uuid=storage.uuid,
+                    credentials_id=storage.credentials_id,
+                    date_created=storage.created_at,
+                    credentials_name=storage.credentials and storage.credentials.name,
+                )
+                for storage in query.all()
+            ]
+
+    def delete(self, uuid: str) -> None:
+        """
+        Delete a storage entity by its UUID.
+
+        Args:
+            uuid (str): The UUID of the storage entity to be deleted
+        """
+        with self.db() as session:
+            storage = (
+                session.query(DBStorage).filter(DBStorage.uuid == uuid).one_or_none()
+            )
+            if storage is None:
+                return
+            session.delete(storage)
+            session.commit()

data_sourcerer-0.4.0/sourcerer/infrastructure/storage/services.py

@@ -0,0 +1,37 @@
+from sourcerer.domain.storage.entities import Storage
+from sourcerer.domain.storage.repositories import BaseStoragesRepository
+
+
+class StoragesService:
+    def __init__(
+        self,
+        repository: BaseStoragesRepository,
+    ):
+        self.repository = repository
+
+    def create(self, storage: Storage) -> None:
+        """
+        Create a new storage entity.
+
+        Args:
+            storage (Storage): The storage object to be created
+        """
+        self.repository.create(storage)
+
+    def list(self, provider_id: int | None = None) -> list[Storage]:
+        """
+        List all storage entities.
+
+        Args:
+            provider_id (int|None, optional): If provided, filter storage entities by provider ID
+        """
+        return self.repository.list(provider_id)
+
+    def delete(self, uuid: str) -> None:
+        """
+        Delete a storage entity by its UUID.
+
+        Args:
+            uuid (str): The UUID of the storage entity to be deleted
+        """
+        self.repository.delete(uuid)

{data_sourcerer-0.2.3 → data_sourcerer-0.4.0}/sourcerer/infrastructure/storage_provider/services/azure.py

@@ -10,7 +10,6 @@ from collections.abc import Callable
 from pathlib import Path
 from typing import Any
 
-import humanize
 from azure.mgmt.storage import StorageManagementClient
 from azure.storage.blob import BlobServiceClient
 from platformdirs import user_downloads_dir
@@ -38,7 +37,6 @@ from sourcerer.infrastructure.utils import generate_uuid, is_text_file
 
 @storage_provider(StorageProvider.AzureStorage)
 class AzureStorageProviderService(BaseStorageProviderService):
-
     def __init__(self, credentials: Any):
         """
         Initialize the service with Azure credentials.
@@ -137,7 +135,7 @@ class AzureStorageProviderService(BaseStorageProviderService):
                         File(
                             generate_uuid(),
                             remaining_path,
-                            size=humanize.naturalsize(blob.size),
+                            size=blob.size,
                             date_modified=blob.last_modified,
                             is_text=is_text_file(blob.name),
                         )

{data_sourcerer-0.2.3 → data_sourcerer-0.4.0}/sourcerer/infrastructure/storage_provider/services/gcp.py

@@ -9,7 +9,6 @@ from collections.abc import Callable
 from pathlib import Path
 from typing import Any
 
-import humanize
 from platformdirs import user_downloads_dir
 
 from sourcerer.domain.shared.entities import StorageProvider
@@ -136,7 +135,7 @@ class GCPStorageProviderService(BaseStorageProviderService):
                     File(
                         generate_uuid(),
                         blob.name[len(path) :],
-                        size=humanize.naturalsize(blob.size),
+                        size=blob.size,
                         date_modified=blob.updated.date(),
                         is_text=is_text_file(blob.name),
                     )
@@ -150,7 +149,7 @@ class GCPStorageProviderService(BaseStorageProviderService):
 
         except Exception as ex:
             raise ListStorageItemsError(
-                f"Failed to list items in {storage}: {str(ex)}"
+                f"Failed to list items in {storage}: {ex}"
             ) from ex
 
     def read_storage_item(self, storage: str, key: str) -> str:

{data_sourcerer-0.2.3 → data_sourcerer-0.4.0}/sourcerer/infrastructure/storage_provider/services/s3.py

@@ -10,7 +10,6 @@ from itertools import groupby
 from pathlib import Path
 from typing import Any
 
-import humanize
 from platformdirs import user_downloads_dir
 
 from sourcerer.domain.shared.entities import StorageProvider
@@ -173,7 +172,7 @@ class S3ProviderService(BaseStorageProviderService):
             File(
                 generate_uuid(),
                 i.get("Key").replace(path, ""),
-                humanize.naturalsize(i.get("Size")),
+                i.get("Size"),
                 is_text_file(i.get("Key")),
                 i.get("LastModified"),
             )

{data_sourcerer-0.2.3 → data_sourcerer-0.4.0}/sourcerer/infrastructure/utils.py

@@ -8,6 +8,7 @@ import mimetypes
 import secrets
 import uuid
 from pathlib import Path
+from typing import ClassVar
 
 from sourcerer.settings import TEXT_EXTENSIONS
 
@@ -83,7 +84,7 @@ class Singleton(type):
     Metaclass that implements the singleton pattern, ensuring only one instance of a class exists.
     """
 
-    _instances = {}
+    _instances: ClassVar[dict["Singleton", type]] = {}
 
     def __call__(cls, *args, **kwargs):
         """

{data_sourcerer-0.2.3 → data_sourcerer-0.4.0}/sourcerer/presentation/di_container.py

@@ -13,8 +13,11 @@ from dependency_injector import containers, providers
 from sourcerer.infrastructure.access_credentials.repositories import (
     SQLAlchemyCredentialsRepository,
 )
+from sourcerer.infrastructure.access_credentials.services import CredentialsService
 from sourcerer.infrastructure.db.config import Database
 from sourcerer.infrastructure.file_system.services import FileSystemService
+from sourcerer.infrastructure.storage.repositories import SQLAlchemyStoragesRepository
+from sourcerer.infrastructure.storage.services import StoragesService
 from sourcerer.settings import APP_DIR, DB_NAME
 
 DB_URL = f"sqlite:////{APP_DIR}/{DB_NAME}"
@@ -43,4 +46,16 @@ class DiContainer(containers.DeclarativeContainer):
         SQLAlchemyCredentialsRepository, session_factory
     )
 
+    storages_repository = providers.Factory(
+        SQLAlchemyStoragesRepository, session_factory
+    )
+
+    credentials_service = providers.Factory(
+        CredentialsService, repository=credentials_repository
+    )
+    storages_service = providers.Factory(
+        StoragesService,
+        repository=storages_repository,
+    )
+
     file_system_service = providers.Factory(FileSystemService, Path.home())

{data_sourcerer-0.2.3 → data_sourcerer-0.4.0}/sourcerer/presentation/screens/file_system_finder/main.py

@@ -5,11 +5,9 @@ from pathlib import Path
 from dependency_injector.wiring import Provide
 from textual import on
 from textual.app import ComposeResult
-from textual.binding import Binding
 from textual.containers import Container, Horizontal
 from textual.css.query import NoMatches
 from textual.reactive import reactive
-from textual.screen import ModalScreen
 from textual.widgets import Static
 
 from sourcerer.infrastructure.file_system.services import FileSystemService
@@ -17,6 +15,7 @@ from sourcerer.presentation.di_container import DiContainer
 from sourcerer.presentation.screens.file_system_finder.widgets.file_system_navigator import (
     FileSystemNavigator,
 )
+from sourcerer.presentation.screens.shared.modal_screens import ExitBoundModalScreen
 from sourcerer.presentation.screens.shared.widgets.button import Button
 
 
@@ -26,21 +25,17 @@ class FileSystemSelectionValidationRule:
     error_message: str
 
 
-class FileSystemNavigationModal(ModalScreen):
+class FileSystemNavigationModal(ExitBoundModalScreen):
     CONTAINER_ID = "file_system_view_container"
     CSS_PATH = "styles.tcss"
 
-    BINDINGS = [
-        Binding("escape", "app.pop_screen", "Pop screen"),
-    ]
-
     active_path: reactive[Path] = reactive(Path())
 
     def __init__(
         self,
         *args,
-        file_system_service: FileSystemService = Provide[
-            DiContainer.file_system_service
+        file_system_service: FileSystemService = Provide[  # type: ignore
+            DiContainer.file_system_service  # type: ignore
         ],
         validation_rules: list[FileSystemSelectionValidationRule] | None = None,
         **kwargs,
@@ -125,7 +120,7 @@ class FileSystemNavigationModal(ModalScreen):
             event (Button.Click): The event containing the button that was clicked.
         """
         if event.action == "close":
-            self.on_close()
+            self.action_cancel_screen()
         else:
             self.on_apply()
 

{data_sourcerer-0.2.3 → data_sourcerer-0.4.0}/sourcerer/presentation/screens/file_system_finder/widgets/file_system_navigator.py

@@ -21,6 +21,7 @@ from sourcerer.presentation.screens.shared.containers import (
     ScrollHorizontalContainerWithNoBindings,
     ScrollVerticalContainerWithNoBindings,
 )
+from sourcerer.presentation.settings import KeyBindings
 from sourcerer.settings import DIRECTORY_ICON, DOUBLE_CLICK_THRESHOLD, FILE_ICON
 
 
@@ -48,7 +49,7 @@ class FileSystemWidget(Widget):
             background: $block-cursor-blurred-background;
             text-style: $block-cursor-blurred-text-style;
         }
-        
+
         .folder-name {
             text-overflow: ellipsis;
             text-wrap: nowrap;
@@ -161,7 +162,7 @@ class FileSystemWidget(Widget):
             Calls the `on_click` method if the pressed key is "enter", which may trigger
             folder navigation or file opening depending on the widget's context.
         """
-        if event.key == "enter":
+        if event.key == KeyBindings.ENTER.value:
             self.on_file_select()
 
     def on_file_select(self):
@@ -232,11 +233,13 @@ class FileSystemNavigator(ScrollHorizontalContainerWithNoBindings):
 
     # Consolidate key binding data
     BINDINGS: ClassVar[list[BindingType]] = [
-        Binding("enter", "select_cursor", "Select", show=False),
-        Binding("up", "cursor_up", "Cursor up", show=False),
-        Binding("down", "cursor_down", "Cursor down", show=False),
-        Binding("left", "cursor_left", "Cursor left", show=False),
-        Binding("right", "cursor_right", "Cursor right", show=False),
+        Binding(KeyBindings.ENTER.value, "select_cursor", "Select", show=False),
+        Binding(KeyBindings.ARROW_UP.value, "cursor_up", "Cursor up", show=False),
+        Binding(KeyBindings.ARROW_DOWN.value, "cursor_down", "Cursor down", show=False),
+        Binding(KeyBindings.ARROW_LEFT.value, "cursor_left", "Cursor left", show=False),
+        Binding(
+            KeyBindings.ARROW_RIGHT.value, "cursor_right", "Cursor right", show=False
+        ),
     ]
 
     MAIN_CONTAINER_ID: ClassVar[str] = "dirs_content"
@@ -306,9 +309,9 @@ class FileSystemNavigator(ScrollHorizontalContainerWithNoBindings):
         )
         self._focus_first_child(path_listing_container)
 
-        self.path_listing_containers_uuids[str(self.work_dir)] = (
-            path_listing_container.id
-        )
+        self.path_listing_containers_uuids[
+            str(self.work_dir)
+        ] = path_listing_container.id
 
     def action_cursor_down(self) -> None:
         """
@@ -626,9 +629,9 @@ class FileSystemNavigator(ScrollHorizontalContainerWithNoBindings):
         await self._mount_path_listing_container(path_listing_container)
 
         if str(folder_path) not in self.path_listing_containers_uuids:
-            self.path_listing_containers_uuids[str(folder_path)] = (
-                path_listing_container.id
-            )
+            self.path_listing_containers_uuids[
+                str(folder_path)
+            ] = path_listing_container.id
 
     @on(FileSystemWidget.Focus)
     def on_folder_focus(self, event: FileSystemWidget.Focus):