derivation.nix

@@ -7,7 +7,4 @@ buildPythonApplication {
   src = ./.;
   pyproject = true;
   build-system = [setuptools];
-  postInstall = ''
-    install -Dm755 scripts/seed.py $out/bin/seed
-  '';
 }

scripts/seed.py

@@ -1,42 +0,0 @@
-#!/usr/bin/env python
-
-from sqlalchemy.orm import Session
-from src.infra.publication import (
-    PublicationEntryModel,
-    PublicationSequenceModel,
-    PublicationModel,
-    PublicationOrderModel,
-)
-import argparse
-import os
-from src.config.database import Database
-from src.infra.db import get_database
-
-if __name__ == '__main__':
-    arg_parser = argparse.ArgumentParser('seed.py', 'run to load seed data into a database')
-    arg_parser.add_argument('-u', '--url', help='The URL for the database', required=True)
-    arg_parser.add_argument('-d', '--data', help='the directory containing large content files', required=True)
-    args = arg_parser.parse_args()
-
-    with open(os.path.join(args.data, './a-study-in-scarlet.txt')) as infile:
-        text = infile.read()
-
-    db = get_database(Database(url=args.url, echo=True))
-    with Session(db) as session:
-        entry = PublicationEntryModel(text=text)
-        session.add(entry)
-        publication = PublicationModel(
-            title='Sherlock Holmes Canon',
-            description='A collection of detective mystery novels featuring Sherlock Holmes',
-            by_line='Sir Arthur Conan Doyle',
-        )
-        session.flush()
-        order = PublicationOrderModel(title='Published Timeline', publication_id=publication.id)
-        session.flush()
-        sequence = PublicationSequenceModel(
-            position=0,
-            entry_id=entry.id,
-            order_id=order.id,
-            duration=None,
-        )
-        session.commit()

src/infra/publication.py

@@ -12,6 +12,7 @@ class PublicationEntryModel(Base):
 
     id: Mapped[int] = mapped_column(primary_key=True)
     text: Mapped[str] = mapped_column(Text())
+    html: Mapped[str | None] = mapped_column(Text())
 
     sequences: Mapped[list['PublicationSequenceModel']] = relationship(back_populates='entry')
 
@@ -55,7 +56,7 @@ class PublicationModel(Base):
 
 
 def model_to_entry(db_pub_entry: PublicationEntryModel) -> Entry:
-    return Entry(id=db_pub_entry.id, text=db_pub_entry.text)
+    return Entry(id=db_pub_entry.id, text=db_pub_entry.text, html=db_pub_entry.html)
 
 
 def model_to_sequence(db_pub_position: PublicationSequenceModel) -> Sequence:

src/infra/users.py

@@ -6,8 +6,7 @@ from sqlalchemy import String, VARCHAR, Engine, select
 from sqlalchemy.orm import mapped_column, Mapped, Session
 from argon2 import PasswordHasher
 from src.infra.db import Base
-from src.services.users.data import UserDTO, User
-from src.services.users.repo import UserRepo
+from src.services.users import UserRepo, UserDTO, User
 
 
 class UserModel(Base):

src/main.py

@@ -4,7 +4,7 @@ from src.services.router import Router
 from src.services.notifications import NotificationService, get_notification_service
 from src.services.email import EmailService, get_email_service
 from src.services.auth import AuthService
-from src.services.users.service import UserService
+from src.services.users import UserService
 from dataclasses import dataclass
 from src.infra.db import get_database
 from src.infra.users import UserRepoImpl

src/services/auth.py

@@ -7,7 +7,7 @@ from dataclasses import dataclass, asdict
 from cryptography.hazmat.primitives.asymmetric.ed25519 import Ed25519PrivateKey
 import jwt
 
-from src.services.users.data import User
+from src.services.users import User
 from src.config.auth import Auth as AuthConfig
 
 JWT = str

src/services/publications/data.py

@@ -6,6 +6,7 @@ from dataclasses import dataclass, field
 class Entry:
     id: int
     text: str
+    html: str | None = None
 
 
 @dataclass

src/services/users/__init__.py

@@ -0,0 +1,5 @@
+from .data import User, UserProfile, UserDTO, SignupError, LoginError
+from .service import UserService
+from .repo import UserRepo
+
+__all__ = ['User', 'UserProfile', 'UserDTO', 'SignupError', 'LoginError', 'UserService', 'UserRepo']