From 06ee08b2018a21f14a50eac7d02322089f3e98c1 Mon Sep 17 00:00:00 2001 From: Gustavo Henrique Santos Souza de Miranda Date: Sun, 20 Jul 2025 02:46:46 -0300 Subject: [PATCH 1/4] Fix all imports to be absolute and not relative --- src/pilgrim/database.py | 4 ++++ src/pilgrim/models/entry.py | 3 ++- src/pilgrim/models/photo.py | 3 ++- src/pilgrim/models/photo_in_entry.py | 2 +- src/pilgrim/models/travel_diary.py | 5 +++-- src/pilgrim/service/entry_service.py | 6 +++--- src/pilgrim/service/travel_diary_service.py | 2 +- 7 files changed, 16 insertions(+), 9 deletions(-) diff --git a/src/pilgrim/database.py b/src/pilgrim/database.py index 8d472af..a7b2a28 100644 --- a/src/pilgrim/database.py +++ b/src/pilgrim/database.py @@ -29,6 +29,10 @@ class Database: self._session_maker = sessionmaker(bind=self.engine, autoflush=False, autocommit=False) def create(self): + # ADICIONE ESTAS 3 LINHAS AQUI + print("\n--- [DIAGNÓSTICO DA APLICAÇÃO] ---") + print("Tabelas que a Base conhece:", sorted(list(Base.metadata.tables.keys()))) + print("----------------------------------") Base.metadata.create_all(self.engine) def session(self): diff --git a/src/pilgrim/models/entry.py b/src/pilgrim/models/entry.py index dac87b0..a9984aa 100644 --- a/src/pilgrim/models/entry.py +++ b/src/pilgrim/models/entry.py @@ -4,7 +4,8 @@ from pilgrim.models.photo_in_entry import photo_entry_association from sqlalchemy import Column, Integer, String, ForeignKey, DateTime from sqlalchemy.orm import relationship -from ..database import Base +from pilgrim.database import Base + class Entry(Base): diff --git a/src/pilgrim/models/photo.py b/src/pilgrim/models/photo.py index 3a1ac9b..971cb2a 100644 --- a/src/pilgrim/models/photo.py +++ b/src/pilgrim/models/photo.py @@ -7,7 +7,8 @@ from sqlalchemy.orm import relationship from sqlalchemy.sql.schema import Index from pilgrim.models.photo_in_entry import photo_entry_association -from ..database import Base +from pilgrim.database import Base + class Photo(Base): diff --git a/src/pilgrim/models/photo_in_entry.py b/src/pilgrim/models/photo_in_entry.py index 76f452e..8e9d677 100644 --- a/src/pilgrim/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 ..database import Base +from pilgrim.database import Base photo_entry_association = Table('photo_entry_association', Base.metadata, Column('id', Integer, primary_key=True, autoincrement=True), diff --git a/src/pilgrim/models/travel_diary.py b/src/pilgrim/models/travel_diary.py index 1164bc4..0be4463 100644 --- a/src/pilgrim/models/travel_diary.py +++ b/src/pilgrim/models/travel_diary.py @@ -3,10 +3,11 @@ from typing import Any from sqlalchemy import Column, Integer, String, UniqueConstraint from sqlalchemy.orm import relationship -from .. import database +from pilgrim.database import Base -class TravelDiary(database.Base): + +class TravelDiary(Base): __tablename__ = "travel_diaries" id = Column(Integer, primary_key=True) name = Column(String, nullable=False) diff --git a/src/pilgrim/service/entry_service.py b/src/pilgrim/service/entry_service.py index 040f5a8..5826c31 100644 --- a/src/pilgrim/service/entry_service.py +++ b/src/pilgrim/service/entry_service.py @@ -1,9 +1,9 @@ from datetime import datetime from typing import List -from ..models.entry import Entry -from ..models.travel_diary import TravelDiary -from ..models.photo import Photo # ✨ Importe o modelo Photo +from pilgrim.models.entry import Entry +from pilgrim.models.travel_diary import TravelDiary +from pilgrim.models.photo import Photo # ✨ Importe o modelo Photo class EntryService: diff --git a/src/pilgrim/service/travel_diary_service.py b/src/pilgrim/service/travel_diary_service.py index 34136e7..e1aa6e6 100644 --- a/src/pilgrim/service/travel_diary_service.py +++ b/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 ..models.travel_diary import TravelDiary +from pilgrim.models.travel_diary import TravelDiary class TravelDiaryService: From eed16f34c1c3f3de76801a86b96909a9f6a70453 Mon Sep 17 00:00:00 2001 From: Gustavo Henrique Santos Souza de Miranda Date: Sun, 20 Jul 2025 02:47:05 -0300 Subject: [PATCH 2/4] Simplify the pyproject.toml --- pyproject.toml | 61 +++++++++++++++++++++++--------------------------- 1 file changed, 28 insertions(+), 33 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 0a1b086..e6b6187 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,36 +1,31 @@ - [build-system] - requires = ["hatchling"] - build-backend = "hatchling.build" +[build-system] +requires = ["hatchling"] +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] - 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] +Homepage = "https://github.com/gmbrax/Pilgrim/" +Issues = "https://github.com/gmbrax/Pilgrim/issues" - - ] - [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" +[project.scripts] +pilgrim = "pilgrim.command:main" \ No newline at end of file From 2ba1cbd0a663b2c85895315e5906329063c8ee57 Mon Sep 17 00:00:00 2001 From: Gustavo Henrique Santos Souza de Miranda Date: Sun, 20 Jul 2025 03:10:13 -0300 Subject: [PATCH 3/4] Fix the declarative_base import to the newer way --- src/pilgrim/database.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pilgrim/database.py b/src/pilgrim/database.py index a7b2a28..9eefcd0 100644 --- a/src/pilgrim/database.py +++ b/src/pilgrim/database.py @@ -1,5 +1,5 @@ from sqlalchemy import create_engine -from sqlalchemy.ext.declarative import declarative_base +from sqlalchemy.orm import declarative_base from sqlalchemy.orm import sessionmaker from pathlib import Path import os From e1add845372149ccb9ea95167e8430d155a8f57a Mon Sep 17 00:00:00 2001 From: Gustavo Henrique Miranda Date: Sun, 20 Jul 2025 03:23:37 -0300 Subject: [PATCH 4/4] Update src/pilgrim/database.py Remove Debug message Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --- src/pilgrim/database.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/pilgrim/database.py b/src/pilgrim/database.py index 9eefcd0..44ca8e9 100644 --- a/src/pilgrim/database.py +++ b/src/pilgrim/database.py @@ -29,10 +29,6 @@ class Database: self._session_maker = sessionmaker(bind=self.engine, autoflush=False, autocommit=False) def create(self): - # ADICIONE ESTAS 3 LINHAS AQUI - print("\n--- [DIAGNÓSTICO DA APLICAÇÃO] ---") - print("Tabelas que a Base conhece:", sorted(list(Base.metadata.tables.keys()))) - print("----------------------------------") Base.metadata.create_all(self.engine) def session(self):