From 7b13982391dad6bd66780c75cb6fee67f858c24b Mon Sep 17 00:00:00 2001 From: Gustavo Henrique Santos Souza de Miranda Date: Wed, 25 Jun 2025 22:34:19 -0300 Subject: [PATCH] =?UTF-8?q?Revert=20"=F0=9F=8E=A8refactor:=20move=20module?= =?UTF-8?q?s=20and=20refactor=20import=20statements"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 99eb0a0651fdaa04b41f043f9b6bd6674fc5b0d3. --- src/pilgrim/__init__.py | 8 ++++++++ src/{ => pilgrim}/application.py | 4 ++-- src/{ => pilgrim}/command.py | 2 +- src/{ => pilgrim}/database.py | 1 + src/{ => pilgrim/models}/__init__.py | 0 src/{ => pilgrim}/models/entry.py | 4 ++-- src/{ => pilgrim}/models/photo.py | 6 +++--- src/{ => pilgrim}/models/photo_in_entry.py | 2 +- src/{ => pilgrim}/models/travel_diary.py | 3 +-- src/{models => pilgrim/service}/__init__.py | 0 src/{ => pilgrim}/service/entry_service.py | 4 ++-- src/{ => pilgrim}/service/photo_service.py | 3 +-- src/{ => pilgrim}/service/servicemanager.py | 4 ++-- src/{ => pilgrim}/service/travel_diary_service.py | 2 +- src/service/__init__.py | 0 15 files changed, 25 insertions(+), 18 deletions(-) create mode 100644 src/pilgrim/__init__.py rename src/{ => pilgrim}/application.py (77%) rename src/{ => pilgrim}/command.py (54%) rename src/{ => pilgrim}/database.py (99%) rename src/{ => pilgrim/models}/__init__.py (100%) rename src/{ => pilgrim}/models/entry.py (88%) rename src/{ => pilgrim}/models/photo.py (90%) rename src/{ => pilgrim}/models/photo_in_entry.py (92%) rename src/{ => pilgrim}/models/travel_diary.py (90%) rename src/{models => pilgrim/service}/__init__.py (100%) rename src/{ => pilgrim}/service/entry_service.py (95%) rename src/{ => pilgrim}/service/photo_service.py (95%) rename src/{ => pilgrim}/service/servicemanager.py (79%) rename src/{ => pilgrim}/service/travel_diary_service.py (95%) delete mode 100644 src/service/__init__.py diff --git a/src/pilgrim/__init__.py b/src/pilgrim/__init__.py new file mode 100644 index 0000000..22aad53 --- /dev/null +++ b/src/pilgrim/__init__.py @@ -0,0 +1,8 @@ +from pilgrim.application import Application +from pilgrim.command import main +from pilgrim.database import Database, Base +from pilgrim.models.travel_diary import TravelDiary +from pilgrim.models.entry import Entry +from pilgrim.models.photo import Photo + +__all__ = ["Application", "Database", "TravelDiary", "Entry", "Photo", "main", "Base"] diff --git a/src/application.py b/src/pilgrim/application.py similarity index 77% rename from src/application.py rename to src/pilgrim/application.py index 2dcb79a..61d75ba 100644 --- a/src/application.py +++ b/src/pilgrim/application.py @@ -1,5 +1,5 @@ -from src.database import Database -from src.service.servicemanager import ServiceManager +from pilgrim.database import Database +from pilgrim.service.servicemanager import ServiceManager class Application: diff --git a/src/command.py b/src/pilgrim/command.py similarity index 54% rename from src/command.py rename to src/pilgrim/command.py index 3d23d5a..1af56cc 100644 --- a/src/command.py +++ b/src/pilgrim/command.py @@ -1,4 +1,4 @@ -from src.application import Application +from pilgrim.application import Application def main(): diff --git a/src/database.py b/src/pilgrim/database.py similarity index 99% rename from src/database.py rename to src/pilgrim/database.py index 794d698..389b15b 100644 --- a/src/database.py +++ b/src/pilgrim/database.py @@ -4,6 +4,7 @@ from sqlalchemy.orm import sessionmaker Base = declarative_base() + class Database: def __init__(self): self.engine = create_engine( diff --git a/src/__init__.py b/src/pilgrim/models/__init__.py similarity index 100% rename from src/__init__.py rename to src/pilgrim/models/__init__.py diff --git a/src/models/entry.py b/src/pilgrim/models/entry.py similarity index 88% rename from src/models/entry.py rename to src/pilgrim/models/entry.py index 8775faf..4a1132c 100644 --- a/src/models/entry.py +++ b/src/pilgrim/models/entry.py @@ -3,8 +3,8 @@ from typing import Any from sqlalchemy import Column, Integer, String, ForeignKey from sqlalchemy.orm import relationship -from src.models.photo_in_entry import photo_entry_association -from src.database import Base +from pilgrim.models.photo_in_entry import photo_entry_association +from ..database import Base class Entry(Base): diff --git a/src/models/photo.py b/src/pilgrim/models/photo.py similarity index 90% rename from src/models/photo.py rename to src/pilgrim/models/photo.py index d4eb6a9..f6e0406 100644 --- a/src/models/photo.py +++ b/src/pilgrim/models/photo.py @@ -1,10 +1,10 @@ from typing import Any -from sqlalchemy.orm import relationship from sqlalchemy import Column, Integer, String, ForeignKey +from sqlalchemy.orm import relationship -from src.models.photo_in_entry import photo_entry_association -from src.database import Base +from pilgrim.models.photo_in_entry import photo_entry_association +from ..database import Base class Photo(Base): diff --git a/src/models/photo_in_entry.py b/src/pilgrim/models/photo_in_entry.py similarity index 92% rename from src/models/photo_in_entry.py rename to src/pilgrim/models/photo_in_entry.py index d07d4fa..76f452e 100644 --- a/src/models/photo_in_entry.py +++ b/src/pilgrim/models/photo_in_entry.py @@ -1,6 +1,6 @@ from sqlalchemy import Table, Column, Integer, ForeignKey -from src.database import Base +from ..database import Base photo_entry_association = Table('photo_entry_association', Base.metadata, Column('id', Integer, primary_key=True, autoincrement=True), diff --git a/src/models/travel_diary.py b/src/pilgrim/models/travel_diary.py similarity index 90% rename from src/models/travel_diary.py rename to src/pilgrim/models/travel_diary.py index 15c8579..676b49b 100644 --- a/src/models/travel_diary.py +++ b/src/pilgrim/models/travel_diary.py @@ -1,9 +1,8 @@ from typing import Any -from src.database import Base - from sqlalchemy import Column, String, Integer +from ..database import Base class TravelDiary(Base): __tablename__ = "travel_diaries" diff --git a/src/models/__init__.py b/src/pilgrim/service/__init__.py similarity index 100% rename from src/models/__init__.py rename to src/pilgrim/service/__init__.py diff --git a/src/service/entry_service.py b/src/pilgrim/service/entry_service.py similarity index 95% rename from src/service/entry_service.py rename to src/pilgrim/service/entry_service.py index 2afedd0..f316f97 100644 --- a/src/service/entry_service.py +++ b/src/pilgrim/service/entry_service.py @@ -1,7 +1,7 @@ from typing import List -from src.models.entry import Entry -from src.models.travel_diary import TravelDiary +from ..models.entry import Entry +from ..models.travel_diary import TravelDiary class EntryService: diff --git a/src/service/photo_service.py b/src/pilgrim/service/photo_service.py similarity index 95% rename from src/service/photo_service.py rename to src/pilgrim/service/photo_service.py index 2232ad1..b1086a9 100644 --- a/src/service/photo_service.py +++ b/src/pilgrim/service/photo_service.py @@ -1,8 +1,7 @@ from pathlib import Path from typing import List -from src.models.photo import Photo -from src.models.travel_diary import TravelDiary +from pilgrim import Photo, TravelDiary class PhotoService: diff --git a/src/service/servicemanager.py b/src/pilgrim/service/servicemanager.py similarity index 79% rename from src/service/servicemanager.py rename to src/pilgrim/service/servicemanager.py index 3e9c3a6..b0b0cde 100644 --- a/src/service/servicemanager.py +++ b/src/pilgrim/service/servicemanager.py @@ -1,5 +1,5 @@ -from src.service.entry_service import EntryService -from src.service.travel_diary_service import TravelDiaryService +from pilgrim.service.entry_service import EntryService +from pilgrim.service.travel_diary_service import TravelDiaryService class ServiceManager: diff --git a/src/service/travel_diary_service.py b/src/pilgrim/service/travel_diary_service.py similarity index 95% rename from src/service/travel_diary_service.py rename to src/pilgrim/service/travel_diary_service.py index 846f27d..0be4cc0 100644 --- a/src/service/travel_diary_service.py +++ b/src/pilgrim/service/travel_diary_service.py @@ -1,4 +1,4 @@ -from src.models.travel_diary import TravelDiary +from ..models.travel_diary import TravelDiary class TravelDiaryService: diff --git a/src/service/__init__.py b/src/service/__init__.py deleted file mode 100644 index e69de29..0000000