Changed the names of the files to conform the python convection and also added photo_in_entry.py to diminish the cyclic import error in pylint

src/Pilgrim/__init__.py

@@ -1,8 +0,0 @@
-from Pilgrim.Application import Application
-from Pilgrim.command import main
-from Pilgrim.Database import Database, Base
-from Pilgrim.Models.TravelDiary import TravelDiary
-from Pilgrim.Models.Entry import Entry
-from Pilgrim.Models.Photo import Photo
-
-__all__ = ["Application", "Database", "TravelDiary", "Entry", "Photo", "main", "Base"]

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,4 +1,4 @@
-from Pilgrim.Database import Database
+from pilgrim.database import Database
 
 
 class Application:

src/pilgrim/command.py

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

src/pilgrim/database.py

@@ -12,10 +12,10 @@ class Database:
             echo=False,
             connect_args={"check_same_thread": False},
         )
-        self.Session = sessionmaker(bind=self.engine, autoflush=False, autocommit=False)
+        self.session = sessionmaker(bind=self.engine, autoflush=False, autocommit=False)
 
     def create(self):
         Base.metadata.create_all(self.engine)
 
     def get_db(self):
-        return self.Session()
+        return self.session()

src/pilgrim/models/entry.py

@@ -1,13 +1,8 @@
-from sqlalchemy import Column, Integer, String, ForeignKey, Table
+from sqlalchemy import Column, Integer, String, ForeignKey
 from sqlalchemy.orm import relationship
 
-from Pilgrim import Base
-
-
-photo_entry_association = Table('photo_entry_association', Base.metadata,
-Column('id', Integer, primary_key=True, autoincrement=True),
-    Column('fk_Photo_id', Integer, ForeignKey('photo.id')),
-    Column('fk_Entry_id', Integer, ForeignKey('Entry.id')))
+from pilgrim.models.photo_in_entry import photo_entry_association
+from ..database import Base
 
 
 class Entry(Base):

src/pilgrim/models/photo.py

@@ -1,8 +1,8 @@
 from sqlalchemy import Column, Integer, String
 from sqlalchemy.orm import relationship
 
-from Pilgrim import Base
-from Pilgrim.Models.Entry import photo_entry_association
+from pilgrim.models.photo_in_entry import photo_entry_association
+from ..database import Base
 
 
 class Photo(Base):
@@ -16,4 +16,4 @@ class Photo(Base):
         "Entry",
         secondary=photo_entry_association,
         back_populates="photos"
-    )
+    )

src/pilgrim/models/photo_in_entry.py

@@ -0,0 +1,8 @@
+from sqlalchemy import Table, Column, Integer, ForeignKey
+
+from ..database import Base
+
+photo_entry_association = Table('photo_entry_association', Base.metadata,
+Column('id', Integer, primary_key=True, autoincrement=True),
+    Column('fk_Photo_id', Integer, ForeignKey('photo.id')),
+    Column('fk_Entry_id', Integer, ForeignKey('Entry.id')))

src/pilgrim/models/travel_diary.py

@@ -1,7 +1,6 @@
 from sqlalchemy import Column, String, Integer
 
-from Pilgrim import Application, Base
-
+from ..database import Base
 
 class TravelDiary(Base):
     __tablename__ = "TravelDiary"