pyproject.toml

@@ -1,31 +1,36 @@
-[build-system]
+    [build-system]
-requires = ["hatchling"]
+    requires = ["hatchling"]
-build-backend = "hatchling.build"
+    build-backend = "hatchling.build"
 
-[project]
-name = "pilgrim"
-version = "0.0.4"
-authors = [
-  { name="Gustavo Henrique Santos Souza de Miranda", email="gustavohssmiranda@gmail.com" }
-]
-description = "Pilgrim's Travel Log"
-readme = "README.md"
-requires-python = ">=3.10"
-classifiers = [
-    "Programming Language :: Python :: 3",
-    "License :: OSI Approved :: BSD License",
-    "Operating System :: OS Independent",
-]
-dependencies = [
-    "sqlalchemy",
-    "textual",
-    "tomli",
-    "tomli_w"
-]
 
-[project.urls]
+    [project]
-Homepage = "https://github.com/gmbrax/Pilgrim/"
+    name = "Pilgrim"
-Issues = "https://github.com/gmbrax/Pilgrim/issues"
+    version = "0.0.4"
+    authors = [
+      { name="Gustavo Henrique Santos Souza de Miranda", email="gustavohssmiranda@gmail.com" }
+    ]
+    description = "Pilgrim's Travel Log"
+    readme = "README.md"
+    requires-python = ">=3.10"
+    classifiers = [
+        "Programming Language :: Python :: 3",
+        "License :: OSI Approved :: BSD License",
+        "Operating System :: OS Independent",
+    ]
+    dependencies = [
+      "sqlalchemy",
+        "textual",
+        "tomli",
+        "tomli_w"
 
-[project.scripts]
+
-pilgrim = "pilgrim.command:main"
+    ]
+    [template.plugins.default]
+    src-layout = true
+    [project.urls]
+    Homepage = "https://github.com/gmbrax/Pilgrim/"
+    Issues = "https://github.com/gmbrax/Pilgrim/issues"
+    [tool.hatch.build.targets.wheel]
+    packages = ["src/pilgrim"]
+    [project.scripts]
+    pilgrim = "pilgrim:main"

src/pilgrim/database.py

@@ -1,5 +1,5 @@
 from sqlalchemy import create_engine
-from sqlalchemy.orm import declarative_base
+from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm import sessionmaker
 from pathlib import Path
 import os

src/pilgrim/models/entry.py

@@ -4,8 +4,7 @@ from pilgrim.models.photo_in_entry import photo_entry_association
 from sqlalchemy import Column, Integer, String, ForeignKey, DateTime
 from sqlalchemy.orm import relationship
 
-from pilgrim.database import Base
+from ..database import Base
-
 
 
 class Entry(Base):

src/pilgrim/models/photo.py

@@ -7,8 +7,7 @@ from sqlalchemy.orm import relationship
 from sqlalchemy.sql.schema import Index
 
 from pilgrim.models.photo_in_entry import photo_entry_association
-from pilgrim.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 pilgrim.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

@@ -3,11 +3,10 @@ from typing import Any
 from sqlalchemy import Column, Integer, String, UniqueConstraint
 from sqlalchemy.orm import relationship
 
-from pilgrim.database import Base
+from .. import database
 
 
-
+class TravelDiary(database.Base):
-class TravelDiary(Base):
     __tablename__ = "travel_diaries"
     id = Column(Integer, primary_key=True)
     name = Column(String, nullable=False)

src/pilgrim/service/entry_service.py

@@ -1,9 +1,9 @@
 from datetime import datetime
 from typing import List
 
-from pilgrim.models.entry import Entry
+from ..models.entry import Entry
-from pilgrim.models.travel_diary import TravelDiary
+from ..models.travel_diary import TravelDiary
-from pilgrim.models.photo import Photo  # ✨ Importe o modelo Photo
+from ..models.photo import Photo  # ✨ Importe o modelo Photo
 
 
 class EntryService:

src/pilgrim/service/travel_diary_service.py

@@ -6,7 +6,7 @@ from pathlib import Path
 from pilgrim.utils import DirectoryManager
 from sqlalchemy.exc import IntegrityError
 
-from pilgrim.models.travel_diary import TravelDiary
+from ..models.travel_diary import TravelDiary
 
 
 class TravelDiaryService: