Revert "🎨refactor: move modules and refactor import statements"

This reverts commit 99eb0a0651.

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"]

src/pilgrim/application.py

@@ -1,5 +1,5 @@
-from src.database import Database
+from pilgrim.database import Database
-from src.service.servicemanager import ServiceManager
+from pilgrim.service.servicemanager import ServiceManager
 
 
 class Application:

src/pilgrim/command.py

@@ -1,4 +1,4 @@
-from src.application import Application
+from pilgrim.application import Application
 
 
 def main():

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(

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 pilgrim.models.photo_in_entry import photo_entry_association
-from src.database import Base
+from ..database import Base
 
 
 class Entry(Base):

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 pilgrim.models.photo_in_entry import photo_entry_association
-from src.database import Base
+from ..database import Base
 
 
 class Photo(Base):

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),

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"

src/pilgrim/service/entry_service.py

@@ -1,7 +1,7 @@
 from typing import List
 
-from src.models.entry import Entry
+from ..models.entry import Entry
-from src.models.travel_diary import TravelDiary
+from ..models.travel_diary import TravelDiary
 
 
 class EntryService:

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 pilgrim import Photo, TravelDiary
-from src.models.travel_diary import TravelDiary
 
 
 class PhotoService:

src/pilgrim/service/servicemanager.py

@@ -1,5 +1,5 @@
-from src.service.entry_service import EntryService
+from pilgrim.service.entry_service import EntryService
-from src.service.travel_diary_service import TravelDiaryService
+from pilgrim.service.travel_diary_service import TravelDiaryService
 
 
 class ServiceManager:

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: