From 076da9c445b99254d2122b82fc74f44777203046 Mon Sep 17 00:00:00 2001 From: loki Date: Sat, 6 Sep 2025 01:30:54 +0300 Subject: [PATCH 01/34] pre --- blog/domain/__init__.py | 0 blog/domain/category.py | 22 ++++++++ blog/domain/post.py | 35 ++++++++++++ blog/domain/tag.py | 21 +++++++ blog/domain/user.py | 27 +++++++++ blog/repos/__init__.py | 1 + blog/repos/category.py | 85 ++++++++++++++++++++++++++++ blog/repos/post.py | 113 ++++++++++++++++++++++++++++++++++++++ blog/repos/tag.py | 82 +++++++++++++++++++++++++++ blog/repos/user.py | 99 +++++++++++++++++++++++++++++++++ blog/services/__init__.py | 0 blog/services/post.py | 44 +++++++++++++++ 12 files changed, 529 insertions(+) create mode 100644 blog/domain/__init__.py create mode 100644 blog/domain/category.py create mode 100644 blog/domain/post.py create mode 100644 blog/domain/tag.py create mode 100644 blog/domain/user.py create mode 100644 blog/repos/__init__.py create mode 100644 blog/repos/category.py create mode 100644 blog/repos/post.py create mode 100644 blog/repos/tag.py create mode 100644 blog/repos/user.py create mode 100644 blog/services/__init__.py create mode 100644 blog/services/post.py diff --git a/blog/domain/__init__.py b/blog/domain/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/blog/domain/category.py b/blog/domain/category.py new file mode 100644 index 0000000..fd1d78a --- /dev/null +++ b/blog/domain/category.py @@ -0,0 +1,22 @@ +"""Domain models for the Category entity.""" + +from dataclasses import dataclass +import typing + +from blog.post.models import Post + + +@dataclass +class Category: + """Domain model for blog category.""" + + id: int | None = None + title: str = "" + alias: str = "" + template: str | None = None + + posts: list["Post"] | None = None + + @typing.override + def __str__(self): + return f"Category(id={self.id}, title={self.title}, template={self.template})" diff --git a/blog/domain/post.py b/blog/domain/post.py new file mode 100644 index 0000000..591119a --- /dev/null +++ b/blog/domain/post.py @@ -0,0 +1,35 @@ +"""Domain models for the Post entity.""" + +from dataclasses import dataclass +from typing import Optional, List +import datetime + +from blog.category.models import Category +from blog.tags.models import Tag +from blog.user.models import User + + +@dataclass +class Post: + """Domain model for blog post.""" + + id: Optional[int] = None + pagetitle: str = "" + alias: str = "" + content: str = "" + createdon: Optional[datetime.datetime] = None + publishedon: Optional[datetime.datetime] = None + category_id: Optional[int] = None + user_id: Optional[int] = None + + # These would typically be loaded separately in a real implementation + # to avoid circular dependencies + user: Optional[User] = None + category: Optional[Category] = None + tags: Optional[List[Tag]] = None + + def __post_init__(self): + if self.createdon is None: + self.createdon = datetime.datetime.now(datetime.timezone.utc) + if self.publishedon is None: + self.publishedon = datetime.datetime.now(datetime.timezone.utc) diff --git a/blog/domain/tag.py b/blog/domain/tag.py new file mode 100644 index 0000000..e9b48fa --- /dev/null +++ b/blog/domain/tag.py @@ -0,0 +1,21 @@ +"""Domain models for the Tag entity.""" + +from dataclasses import dataclass +import typing + +from blog.post.models import Post + + +@dataclass +class Tag: + """Domain model for blog tag.""" + + id: int | None = None + title: str = "" + alias: str = "" + + posts: list["Post"] | None = None + + @typing.override + def __str__(self): + return f"{self.title}" diff --git a/blog/domain/user.py b/blog/domain/user.py new file mode 100644 index 0000000..5524137 --- /dev/null +++ b/blog/domain/user.py @@ -0,0 +1,27 @@ +"""Domain models for the User entity.""" + +import datetime +import typing +from dataclasses import dataclass + +from blog.post.models import Post + + +@dataclass +class User: + """Domain model for user.""" + + id: int | None = None + name: str = "" + password: str = "" + authenticated: bool = False + createdon: datetime.datetime | None = None + posts: list["Post"] | None = None + + def __post_init__(self): + if self.createdon is None: + self.createdon = datetime.datetime.now(datetime.timezone.utc) + + @typing.override + def __str__(self): + return f"{self.name}" diff --git a/blog/repos/__init__.py b/blog/repos/__init__.py new file mode 100644 index 0000000..1c40bc9 --- /dev/null +++ b/blog/repos/__init__.py @@ -0,0 +1 @@ +"""Repository package for the application.""" diff --git a/blog/repos/category.py b/blog/repos/category.py new file mode 100644 index 0000000..7fd8c3e --- /dev/null +++ b/blog/repos/category.py @@ -0,0 +1,85 @@ +"""Repository for Category entities.""" + +import sqlalchemy as sa +from sqlalchemy.orm import Session + +from blog.extensions import db +from blog.category.models import Category as CategoryORM +from blog.domain.category import Category + + +class CategoryRepository: + """Repository for Category entities.""" + + def __init__(self, session: Session | None = None): + self.session = session or db.session + + def get_by_id(self, category_id: int) -> Category | None: + """Get a category by its ID.""" + stmt = sa.select(CategoryORM).where(CategoryORM.id == category_id) + category_orm = self.session.scalar(stmt) + if category_orm: + return self._to_domain_model(category_orm) + return None + + def get_by_alias(self, alias: str) -> Category | None: + """Get a category by its alias.""" + stmt = sa.select(CategoryORM).where(CategoryORM.alias == alias) + category_orm = self.session.scalar(stmt) + if category_orm: + return self._to_domain_model(category_orm) + return None + + def get_all(self) -> list[Category]: + """Get all categories.""" + stmt = sa.select(CategoryORM) + categories_orm = self.session.scalars(stmt).all() + return [self._to_domain_model(category_orm) for category_orm in categories_orm] + + def get_categories_with_posts(self) -> list[Category]: + """Get all categories with their posts.""" + stmt = sa.select(CategoryORM).options(sa.orm.joinedload(CategoryORM.posts)) + categories_orm = self.session.scalars(stmt).unique().all() + return [self._to_domain_model(category_orm) for category_orm in categories_orm] + + def create(self, category: Category) -> Category: + """Create a new category.""" + category_orm = CategoryORM() + category_orm.title = category.title + category_orm.alias = category.alias + category_orm.template = category.template + self.session.add(category_orm) + self.session.flush() # Get the ID without committing + category.id = category_orm.id + return category + + def update(self, category: Category) -> Category: + """Update an existing category.""" + stmt = sa.select(CategoryORM).where(CategoryORM.id == category.id) + category_orm = self.session.scalar(stmt) + if not category_orm: + raise ValueError(f"Category with id {category.id} not found") + + category_orm.title = category.title + category_orm.alias = category.alias + category_orm.template = category.template + self.session.flush() + return category + + def delete(self, category_id: int) -> bool: + """Delete a category by its ID.""" + stmt = sa.select(CategoryORM).where(CategoryORM.id == category_id) + category_orm = self.session.scalar(stmt) + if category_orm: + self.session.delete(category_orm) + return True + return False + + def _to_domain_model(self, category_orm: CategoryORM) -> Category: + """Convert ORM model to domain model.""" + return Category( + id=category_orm.id, + title=category_orm.title, + alias=category_orm.alias, + template=category_orm.template, + ) diff --git a/blog/repos/post.py b/blog/repos/post.py new file mode 100644 index 0000000..c634ba8 --- /dev/null +++ b/blog/repos/post.py @@ -0,0 +1,113 @@ +"""Repository for Post entities.""" + +from typing import List, Optional + +import sqlalchemy as sa +from sqlalchemy.orm import Session + +from blog.extensions import db +from blog.post.models import Post as PostORM +from blog.domain.post import Post + + +class PostRepository: + """Repository for Post entities.""" + + def __init__(self, session: Optional[Session] = None): + self.session = session or db.session + + def get_by_id(self, post_id: int) -> Optional[Post]: + """Get a post by its ID.""" + stmt = sa.select(PostORM).where(PostORM.id == post_id) + post_orm = self.session.scalar(stmt) + if post_orm: + return self._to_domain_model(post_orm) + return None + + def get_by_alias(self, alias: str) -> Optional[Post]: + """Get a post by its alias.""" + stmt = sa.select(PostORM).where(PostORM.alias == alias) + post_orm = self.session.scalar(stmt) + if post_orm: + return self._to_domain_model(post_orm) + return None + + def get_all(self) -> List[Post]: + """Get all posts.""" + stmt = sa.select(PostORM) + posts_orm = self.session.scalars(stmt).all() + return [self._to_domain_model(post_orm) for post_orm in posts_orm] + + def get_published_posts(self) -> List[Post]: + """Get all published posts ordered by published date.""" + stmt = ( + sa.select(PostORM) + .where( + PostORM.publishedon.isnot(None), + PostORM.category_id.is_(None), + ) + .order_by(PostORM.publishedon.desc()) + ) + posts_orm = self.session.scalars(stmt).all() + return [self._to_domain_model(post_orm) for post_orm in posts_orm] + + def get_page_posts(self, page_category_ids: List[int]) -> List[Post]: + """Get posts that are pages (in specific categories).""" + stmt = sa.select(PostORM).where(PostORM.category_id.in_(page_category_ids)) + posts_orm = self.session.scalars(stmt).all() + return [self._to_domain_model(post_orm) for post_orm in posts_orm] + + def create(self, post: Post) -> Post: + """Create a new post.""" + post_orm = PostORM( + pagetitle=post.pagetitle, + alias=post.alias, + content=post.content, + createdon=post.createdon, + publishedon=post.publishedon, + category_id=post.category_id, + user_id=post.user_id, + ) + self.session.add(post_orm) + self.session.flush() # Get the ID without committing + post.id = post_orm.id + return post + + def update(self, post: Post) -> Post: + """Update an existing post.""" + stmt = sa.select(PostORM).where(PostORM.id == post.id) + post_orm = self.session.scalar(stmt) + if not post_orm: + raise ValueError(f"Post with id {post.id} not found") + + post_orm.pagetitle = post.pagetitle + post_orm.alias = post.alias + post_orm.content = post.content + post_orm.createdon = post.createdon + post_orm.publishedon = post.publishedon + post_orm.category_id = post.category_id + post_orm.user_id = post.user_id + self.session.flush() + return post + + def delete(self, post_id: int) -> bool: + """Delete a post by its ID.""" + stmt = sa.select(PostORM).where(PostORM.id == post_id) + post_orm = self.session.scalar(stmt) + if post_orm: + self.session.delete(post_orm) + return True + return False + + def _to_domain_model(self, post_orm: PostORM) -> Post: + """Convert ORM model to domain model.""" + return Post( + id=post_orm.id, + pagetitle=post_orm.pagetitle, + alias=post_orm.alias, + content=post_orm.content, + createdon=post_orm.createdon, + publishedon=post_orm.publishedon, + category_id=post_orm.category_id, + user_id=post_orm.user_id, + ) diff --git a/blog/repos/tag.py b/blog/repos/tag.py new file mode 100644 index 0000000..6252c3f --- /dev/null +++ b/blog/repos/tag.py @@ -0,0 +1,82 @@ +"""Repository for Tag entities.""" + +from typing import List, Optional + +import sqlalchemy as sa +from sqlalchemy.orm import Session + +from blog.extensions import db +from blog.tags.models import Tag as TagORM +from blog.domain.tag import Tag + + +class TagRepository: + """Repository for Tag entities.""" + + def __init__(self, session: Optional[Session] = None): + self.session = session or db.session + + def get_by_id(self, tag_id: int) -> Optional[Tag]: + """Get a tag by its ID.""" + stmt = sa.select(TagORM).where(TagORM.id == tag_id) + tag_orm = self.session.scalar(stmt) + if tag_orm: + return self._to_domain_model(tag_orm) + return None + + def get_by_alias(self, alias: str) -> Optional[Tag]: + """Get a tag by its alias.""" + stmt = sa.select(TagORM).where(TagORM.alias == alias) + tag_orm = self.session.scalar(stmt) + if tag_orm: + return self._to_domain_model(tag_orm) + return None + + def get_all(self) -> List[Tag]: + """Get all tags.""" + stmt = sa.select(TagORM) + tags_orm = self.session.scalars(stmt).all() + return [self._to_domain_model(tag_orm) for tag_orm in tags_orm] + + def get_tags_with_posts(self) -> List[Tag]: + """Get all tags with their posts.""" + stmt = sa.select(TagORM).options(sa.orm.joinedload(TagORM.posts)) + tags_orm = self.session.scalars(stmt).unique().all() + return [self._to_domain_model(tag_orm) for tag_orm in tags_orm] + + def create(self, tag: Tag) -> Tag: + """Create a new tag.""" + tag_orm = TagORM(title=tag.title, alias=tag.alias) + self.session.add(tag_orm) + self.session.flush() # Get the ID without committing + tag.id = tag_orm.id + return tag + + def update(self, tag: Tag) -> Tag: + """Update an existing tag.""" + stmt = sa.select(TagORM).where(TagORM.id == tag.id) + tag_orm = self.session.scalar(stmt) + if not tag_orm: + raise ValueError(f"Tag with id {tag.id} not found") + + tag_orm.title = tag.title + tag_orm.alias = tag.alias + self.session.flush() + return tag + + def delete(self, tag_id: int) -> bool: + """Delete a tag by its ID.""" + stmt = sa.select(TagORM).where(TagORM.id == tag_id) + tag_orm = self.session.scalar(stmt) + if tag_orm: + self.session.delete(tag_orm) + return True + return False + + def _to_domain_model(self, tag_orm: TagORM) -> Tag: + """Convert ORM model to domain model.""" + return Tag( + id=tag_orm.id, + title=tag_orm.title, + alias=tag_orm.alias, + ) diff --git a/blog/repos/user.py b/blog/repos/user.py new file mode 100644 index 0000000..94236b7 --- /dev/null +++ b/blog/repos/user.py @@ -0,0 +1,99 @@ +"""Repository for User entities.""" + +from typing import List, Optional + +import sqlalchemy as sa +from sqlalchemy.orm import Session + +from blog.extensions import db +from blog.user.models import User as UserORM +from blog.domain.user import User + + +class UserRepository: + """Repository for User entities.""" + + def __init__(self, session: Optional[Session] = None): + self.session = session or db.session + + def get_by_id(self, user_id: int) -> Optional[User]: + """Get a user by its ID.""" + stmt = sa.select(UserORM).where(UserORM.id == user_id) + user_orm = self.session.scalar(stmt) + if user_orm: + return self._to_domain_model(user_orm) + return None + + def get_by_name(self, name: str) -> Optional[User]: + """Get a user by their name.""" + stmt = sa.select(UserORM).where(UserORM.name == name) + user_orm = self.session.scalar(stmt) + if user_orm: + return self._to_domain_model(user_orm) + return None + + def get_all(self) -> List[User]: + """Get all users.""" + stmt = sa.select(UserORM) + users_orm = self.session.scalars(stmt).all() + return [self._to_domain_model(user_orm) for user_orm in users_orm] + + def get_users_with_posts(self) -> List[User]: + """Get all users with their posts.""" + stmt = sa.select(UserORM).options(sa.orm.joinedload(UserORM.posts)) + users_orm = self.session.scalars(stmt).unique().all() + return [self._to_domain_model(user_orm) for user_orm in users_orm] + + def create(self, user: User) -> User: + """Create a new user.""" + user_orm = UserORM( + name=user.name, + password=user.password, + authenticated=user.authenticated, + createdon=user.createdon, + ) + self.session.add(user_orm) + self.session.flush() # Get the ID without committing + user.id = user_orm.id + return user + + def update(self, user: User) -> User: + """Update an existing user.""" + stmt = sa.select(UserORM).where(UserORM.id == user.id) + user_orm = self.session.scalar(stmt) + if not user_orm: + raise ValueError(f"User with id {user.id} not found") + + user_orm.name = user.name + user_orm.password = user.password + user_orm.authenticated = user.authenticated + user_orm.createdon = user.createdon + self.session.flush() + return user + + def delete(self, user_id: int) -> bool: + """Delete a user by its ID.""" + stmt = sa.select(UserORM).where(UserORM.id == user_id) + user_orm = self.session.scalar(stmt) + if user_orm: + self.session.delete(user_orm) + return True + return False + + def authenticate(self, name: str, password: str) -> Optional[User]: + """Authenticate a user by name and password.""" + stmt = sa.select(UserORM).where(UserORM.name == name) + user_orm = self.session.scalar(stmt) + if user_orm and user_orm.check_password(password): + return self._to_domain_model(user_orm) + return None + + def _to_domain_model(self, user_orm: UserORM) -> User: + """Convert ORM model to domain model.""" + return User( + id=user_orm.id, + name=user_orm.name, + password=user_orm.password, + authenticated=user_orm.authenticated, + createdon=user_orm.createdon, + ) diff --git a/blog/services/__init__.py b/blog/services/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/blog/services/post.py b/blog/services/post.py new file mode 100644 index 0000000..479e54e --- /dev/null +++ b/blog/services/post.py @@ -0,0 +1,44 @@ +"""Service layer for Post entities.""" + +from typing import List, Optional +from blog.repos.post import PostRepository +from blog.domain.post import Post + + +class PostService: + """Service layer for Post entities.""" + + def __init__(self, post_repository: PostRepository): + self.post_repository = post_repository + + def get_post_by_id(self, post_id: int) -> Optional[Post]: + """Get a post by its ID.""" + return self.post_repository.get_by_id(post_id) + + def get_post_by_alias(self, alias: str) -> Optional[Post]: + """Get a post by its alias.""" + return self.post_repository.get_by_alias(alias) + + def get_all_posts(self) -> List[Post]: + """Get all posts.""" + return self.post_repository.get_all() + + def get_published_posts(self) -> List[Post]: + """Get all published posts.""" + return self.post_repository.get_published_posts() + + def get_page_posts(self, page_category_ids: List[int]) -> List[Post]: + """Get posts that are pages (in specific categories).""" + return self.post_repository.get_page_posts(page_category_ids) + + def create_post(self, post: Post) -> Post: + """Create a new post.""" + return self.post_repository.create(post) + + def update_post(self, post: Post) -> Post: + """Update an existing post.""" + return self.post_repository.update(post) + + def delete_post(self, post_id: int) -> bool: + """Delete a post by its ID.""" + return self.post_repository.delete(post_id) From d425cb0ddb7107e88d47f40597617d5fbec25efe Mon Sep 17 00:00:00 2001 From: loki Date: Sat, 6 Sep 2025 01:52:44 +0300 Subject: [PATCH 02/34] passing --- blog/category/models.py | 2 +- blog/domain/category.py | 6 +++-- blog/domain/post.py | 25 +++++++++++---------- blog/domain/tag.py | 6 +++-- blog/domain/user.py | 6 +++-- blog/post/models.py | 10 +++++---- blog/repos/category.py | 8 +++++-- blog/repos/post.py | 49 +++++++++++++++++++++++------------------ blog/repos/tag.py | 16 +++++++------- blog/repos/user.py | 41 ++++++++++++++++++++-------------- blog/tags/models.py | 4 ++-- blog/user/models.py | 6 ++--- 12 files changed, 104 insertions(+), 75 deletions(-) diff --git a/blog/category/models.py b/blog/category/models.py index 5c08ef9..7faf1f3 100644 --- a/blog/category/models.py +++ b/blog/category/models.py @@ -18,7 +18,7 @@ class Category(db.Model): title: Mapped[str] = mapped_column(default="") alias: Mapped[str] = mapped_column(unique=True) posts: Mapped[list["Post"]] = relationship() - template: Mapped[str] = mapped_column(nullable=True) + template: Mapped[str | None] = mapped_column(nullable=True) def __str__(self): return f"Category(id={self.id}, title={self.title}, template={self.template})" diff --git a/blog/domain/category.py b/blog/domain/category.py index fd1d78a..6c145f7 100644 --- a/blog/domain/category.py +++ b/blog/domain/category.py @@ -2,8 +2,10 @@ from dataclasses import dataclass import typing +from typing import TYPE_CHECKING -from blog.post.models import Post +if TYPE_CHECKING: + from blog.post.models import Post @dataclass @@ -15,7 +17,7 @@ class Category: alias: str = "" template: str | None = None - posts: list["Post"] | None = None + posts: "list[Post] | None" = None @typing.override def __str__(self): diff --git a/blog/domain/post.py b/blog/domain/post.py index 591119a..b48624f 100644 --- a/blog/domain/post.py +++ b/blog/domain/post.py @@ -1,32 +1,33 @@ """Domain models for the Post entity.""" from dataclasses import dataclass -from typing import Optional, List import datetime +from typing import TYPE_CHECKING -from blog.category.models import Category -from blog.tags.models import Tag -from blog.user.models import User +if TYPE_CHECKING: + from blog.category.models import Category + from blog.tags.models import Tag + from blog.user.models import User @dataclass class Post: """Domain model for blog post.""" - id: Optional[int] = None + id: int | None = None pagetitle: str = "" alias: str = "" content: str = "" - createdon: Optional[datetime.datetime] = None - publishedon: Optional[datetime.datetime] = None - category_id: Optional[int] = None - user_id: Optional[int] = None + createdon: datetime.datetime | None = None + publishedon: datetime.datetime | None = None + category_id: int | None = None + user_id: int | None = None # These would typically be loaded separately in a real implementation # to avoid circular dependencies - user: Optional[User] = None - category: Optional[Category] = None - tags: Optional[List[Tag]] = None + user: "User | None" = None + category: "Category | None" = None + tags: "list[Tag] | None" = None def __post_init__(self): if self.createdon is None: diff --git a/blog/domain/tag.py b/blog/domain/tag.py index e9b48fa..98c753b 100644 --- a/blog/domain/tag.py +++ b/blog/domain/tag.py @@ -2,8 +2,10 @@ from dataclasses import dataclass import typing +from typing import TYPE_CHECKING -from blog.post.models import Post +if TYPE_CHECKING: + from blog.post.models import Post @dataclass @@ -14,7 +16,7 @@ class Tag: title: str = "" alias: str = "" - posts: list["Post"] | None = None + posts: "list[Post] | None" = None @typing.override def __str__(self): diff --git a/blog/domain/user.py b/blog/domain/user.py index 5524137..0d7aec3 100644 --- a/blog/domain/user.py +++ b/blog/domain/user.py @@ -3,8 +3,10 @@ import datetime import typing from dataclasses import dataclass +from typing import TYPE_CHECKING -from blog.post.models import Post +if TYPE_CHECKING: + from blog.post.models import Post @dataclass @@ -16,7 +18,7 @@ class User: password: str = "" authenticated: bool = False createdon: datetime.datetime | None = None - posts: list["Post"] | None = None + posts: "list[Post] | None" = None def __post_init__(self): if self.createdon is None: diff --git a/blog/post/models.py b/blog/post/models.py index f5dd3d0..1d8e5b5 100644 --- a/blog/post/models.py +++ b/blog/post/models.py @@ -1,7 +1,7 @@ # blog/posts/models.py import datetime -from typing import TYPE_CHECKING import typing +from typing import TYPE_CHECKING import markdown from sqlalchemy import DateTime, ForeignKey, Text @@ -32,13 +32,15 @@ class Post(db.Model): createdon: Mapped[datetime.datetime] = mapped_column( DateTime(timezone=True), server_default=func.now() ) - publishedon: Mapped[datetime.datetime] = mapped_column( + publishedon: Mapped[datetime.datetime | None] = mapped_column( DateTime(timezone=True), server_default=func.now(), nullable=True, ) - category_id: Mapped[int] = mapped_column(ForeignKey("categories.id"), nullable=True) - user_id: Mapped[int] = mapped_column(ForeignKey("users.id"), nullable=True) + category_id: Mapped[int | None] = mapped_column( + ForeignKey("categories.id"), nullable=True + ) + user_id: Mapped[int | None] = mapped_column(ForeignKey("users.id"), nullable=True) user: Mapped["User"] = relationship(back_populates="posts") category: Mapped["Category"] = relationship(back_populates="posts") tags: Mapped[list["Tag"]] = relationship( diff --git a/blog/repos/category.py b/blog/repos/category.py index 7fd8c3e..4f889c6 100644 --- a/blog/repos/category.py +++ b/blog/repos/category.py @@ -47,7 +47,9 @@ def create(self, category: Category) -> Category: category_orm = CategoryORM() category_orm.title = category.title category_orm.alias = category.alias - category_orm.template = category.template + # Handle the case where template might be None + if category.template is not None: + category_orm.template = category.template self.session.add(category_orm) self.session.flush() # Get the ID without committing category.id = category_orm.id @@ -62,7 +64,9 @@ def update(self, category: Category) -> Category: category_orm.title = category.title category_orm.alias = category.alias - category_orm.template = category.template + # Handle the case where template might be None + if category.template is not None: + category_orm.template = category.template self.session.flush() return category diff --git a/blog/repos/post.py b/blog/repos/post.py index c634ba8..344d693 100644 --- a/blog/repos/post.py +++ b/blog/repos/post.py @@ -1,7 +1,5 @@ """Repository for Post entities.""" -from typing import List, Optional - import sqlalchemy as sa from sqlalchemy.orm import Session @@ -13,10 +11,10 @@ class PostRepository: """Repository for Post entities.""" - def __init__(self, session: Optional[Session] = None): + def __init__(self, session: Session | None = None): self.session = session or db.session - def get_by_id(self, post_id: int) -> Optional[Post]: + def get_by_id(self, post_id: int) -> Post | None: """Get a post by its ID.""" stmt = sa.select(PostORM).where(PostORM.id == post_id) post_orm = self.session.scalar(stmt) @@ -24,7 +22,7 @@ def get_by_id(self, post_id: int) -> Optional[Post]: return self._to_domain_model(post_orm) return None - def get_by_alias(self, alias: str) -> Optional[Post]: + def get_by_alias(self, alias: str) -> Post | None: """Get a post by its alias.""" stmt = sa.select(PostORM).where(PostORM.alias == alias) post_orm = self.session.scalar(stmt) @@ -32,13 +30,13 @@ def get_by_alias(self, alias: str) -> Optional[Post]: return self._to_domain_model(post_orm) return None - def get_all(self) -> List[Post]: + def get_all(self) -> list[Post]: """Get all posts.""" stmt = sa.select(PostORM) posts_orm = self.session.scalars(stmt).all() return [self._to_domain_model(post_orm) for post_orm in posts_orm] - def get_published_posts(self) -> List[Post]: + def get_published_posts(self) -> list[Post]: """Get all published posts ordered by published date.""" stmt = ( sa.select(PostORM) @@ -51,7 +49,7 @@ def get_published_posts(self) -> List[Post]: posts_orm = self.session.scalars(stmt).all() return [self._to_domain_model(post_orm) for post_orm in posts_orm] - def get_page_posts(self, page_category_ids: List[int]) -> List[Post]: + def get_page_posts(self, page_category_ids: list[int]) -> list[Post]: """Get posts that are pages (in specific categories).""" stmt = sa.select(PostORM).where(PostORM.category_id.in_(page_category_ids)) posts_orm = self.session.scalars(stmt).all() @@ -59,15 +57,19 @@ def get_page_posts(self, page_category_ids: List[int]) -> List[Post]: def create(self, post: Post) -> Post: """Create a new post.""" - post_orm = PostORM( - pagetitle=post.pagetitle, - alias=post.alias, - content=post.content, - createdon=post.createdon, - publishedon=post.publishedon, - category_id=post.category_id, - user_id=post.user_id, - ) + post_orm = PostORM() + post_orm.pagetitle = post.pagetitle + post_orm.alias = post.alias + post_orm.content = post.content + # Handle datetime fields that might be None + if post.createdon is not None: + post_orm.createdon = post.createdon + if post.publishedon is not None: + post_orm.publishedon = post.publishedon + if post.category_id is not None: + post_orm.category_id = post.category_id + if post.user_id is not None: + post_orm.user_id = post.user_id self.session.add(post_orm) self.session.flush() # Get the ID without committing post.id = post_orm.id @@ -83,10 +85,15 @@ def update(self, post: Post) -> Post: post_orm.pagetitle = post.pagetitle post_orm.alias = post.alias post_orm.content = post.content - post_orm.createdon = post.createdon - post_orm.publishedon = post.publishedon - post_orm.category_id = post.category_id - post_orm.user_id = post.user_id + # Handle datetime fields that might be None + if post.createdon is not None: + post_orm.createdon = post.createdon + if post.publishedon is not None: + post_orm.publishedon = post.publishedon + if post.category_id is not None: + post_orm.category_id = post.category_id + if post.user_id is not None: + post_orm.user_id = post.user_id self.session.flush() return post diff --git a/blog/repos/tag.py b/blog/repos/tag.py index 6252c3f..622a316 100644 --- a/blog/repos/tag.py +++ b/blog/repos/tag.py @@ -1,7 +1,5 @@ """Repository for Tag entities.""" -from typing import List, Optional - import sqlalchemy as sa from sqlalchemy.orm import Session @@ -13,10 +11,10 @@ class TagRepository: """Repository for Tag entities.""" - def __init__(self, session: Optional[Session] = None): + def __init__(self, session: Session | None = None): self.session = session or db.session - def get_by_id(self, tag_id: int) -> Optional[Tag]: + def get_by_id(self, tag_id: int) -> Tag | None: """Get a tag by its ID.""" stmt = sa.select(TagORM).where(TagORM.id == tag_id) tag_orm = self.session.scalar(stmt) @@ -24,7 +22,7 @@ def get_by_id(self, tag_id: int) -> Optional[Tag]: return self._to_domain_model(tag_orm) return None - def get_by_alias(self, alias: str) -> Optional[Tag]: + def get_by_alias(self, alias: str) -> Tag | None: """Get a tag by its alias.""" stmt = sa.select(TagORM).where(TagORM.alias == alias) tag_orm = self.session.scalar(stmt) @@ -32,13 +30,13 @@ def get_by_alias(self, alias: str) -> Optional[Tag]: return self._to_domain_model(tag_orm) return None - def get_all(self) -> List[Tag]: + def get_all(self) -> list[Tag]: """Get all tags.""" stmt = sa.select(TagORM) tags_orm = self.session.scalars(stmt).all() return [self._to_domain_model(tag_orm) for tag_orm in tags_orm] - def get_tags_with_posts(self) -> List[Tag]: + def get_tags_with_posts(self) -> list[Tag]: """Get all tags with their posts.""" stmt = sa.select(TagORM).options(sa.orm.joinedload(TagORM.posts)) tags_orm = self.session.scalars(stmt).unique().all() @@ -46,7 +44,9 @@ def get_tags_with_posts(self) -> List[Tag]: def create(self, tag: Tag) -> Tag: """Create a new tag.""" - tag_orm = TagORM(title=tag.title, alias=tag.alias) + tag_orm = TagORM() + tag_orm.title = tag.title + tag_orm.alias = tag.alias self.session.add(tag_orm) self.session.flush() # Get the ID without committing tag.id = tag_orm.id diff --git a/blog/repos/user.py b/blog/repos/user.py index 94236b7..9c42044 100644 --- a/blog/repos/user.py +++ b/blog/repos/user.py @@ -1,7 +1,5 @@ """Repository for User entities.""" -from typing import List, Optional - import sqlalchemy as sa from sqlalchemy.orm import Session @@ -13,10 +11,10 @@ class UserRepository: """Repository for User entities.""" - def __init__(self, session: Optional[Session] = None): + def __init__(self, session: Session | None = None): self.session = session or db.session - def get_by_id(self, user_id: int) -> Optional[User]: + def get_by_id(self, user_id: int) -> User | None: """Get a user by its ID.""" stmt = sa.select(UserORM).where(UserORM.id == user_id) user_orm = self.session.scalar(stmt) @@ -24,7 +22,7 @@ def get_by_id(self, user_id: int) -> Optional[User]: return self._to_domain_model(user_orm) return None - def get_by_name(self, name: str) -> Optional[User]: + def get_by_name(self, name: str) -> User | None: """Get a user by their name.""" stmt = sa.select(UserORM).where(UserORM.name == name) user_orm = self.session.scalar(stmt) @@ -32,13 +30,13 @@ def get_by_name(self, name: str) -> Optional[User]: return self._to_domain_model(user_orm) return None - def get_all(self) -> List[User]: + def get_all(self) -> list[User]: """Get all users.""" stmt = sa.select(UserORM) users_orm = self.session.scalars(stmt).all() return [self._to_domain_model(user_orm) for user_orm in users_orm] - def get_users_with_posts(self) -> List[User]: + def get_users_with_posts(self) -> list[User]: """Get all users with their posts.""" stmt = sa.select(UserORM).options(sa.orm.joinedload(UserORM.posts)) users_orm = self.session.scalars(stmt).unique().all() @@ -46,12 +44,16 @@ def get_users_with_posts(self) -> List[User]: def create(self, user: User) -> User: """Create a new user.""" - user_orm = UserORM( - name=user.name, - password=user.password, - authenticated=user.authenticated, - createdon=user.createdon, + user_orm = UserORM() + user_orm.name = user.name + user_orm.password = user.password + # Handle the case where authenticated might be None + user_orm.authenticated = ( + user.authenticated if user.authenticated is not None else False ) + # Handle datetime field that might be None + if user.createdon is not None: + user_orm.createdon = user.createdon self.session.add(user_orm) self.session.flush() # Get the ID without committing user.id = user_orm.id @@ -66,8 +68,13 @@ def update(self, user: User) -> User: user_orm.name = user.name user_orm.password = user.password - user_orm.authenticated = user.authenticated - user_orm.createdon = user.createdon + # Handle the case where authenticated might be None + user_orm.authenticated = ( + user.authenticated if user.authenticated is not None else False + ) + # Handle datetime field that might be None + if user.createdon is not None: + user_orm.createdon = user.createdon self.session.flush() return user @@ -80,7 +87,7 @@ def delete(self, user_id: int) -> bool: return True return False - def authenticate(self, name: str, password: str) -> Optional[User]: + def authenticate(self, name: str, password: str) -> User | None: """Authenticate a user by name and password.""" stmt = sa.select(UserORM).where(UserORM.name == name) user_orm = self.session.scalar(stmt) @@ -94,6 +101,8 @@ def _to_domain_model(self, user_orm: UserORM) -> User: id=user_orm.id, name=user_orm.name, password=user_orm.password, - authenticated=user_orm.authenticated, + authenticated=user_orm.authenticated + if user_orm.authenticated is not None + else False, createdon=user_orm.createdon, ) diff --git a/blog/tags/models.py b/blog/tags/models.py index d2f69d1..fde0671 100644 --- a/blog/tags/models.py +++ b/blog/tags/models.py @@ -1,5 +1,5 @@ # blog/tags/models.py -from typing import TYPE_CHECKING, List +from typing import TYPE_CHECKING from sqlalchemy.orm import Mapped, mapped_column, relationship @@ -17,7 +17,7 @@ class Tag(db.Model): id: Mapped[int] = mapped_column(primary_key=True) title: Mapped[str] alias: Mapped[str] = mapped_column(unique=True) - posts: Mapped[List["Post"]] = relationship( + posts: Mapped[list["Post"]] = relationship( secondary=posts_tags, back_populates="tags" ) diff --git a/blog/user/models.py b/blog/user/models.py index 271e751..8ce0219 100644 --- a/blog/user/models.py +++ b/blog/user/models.py @@ -1,7 +1,7 @@ """SqlAlchemy models.""" import datetime -from typing import TYPE_CHECKING, List +from typing import TYPE_CHECKING from flask_login import UserMixin from sqlalchemy import DateTime @@ -27,11 +27,11 @@ class User(UserMixin, db.Model): id: Mapped[int] = mapped_column(primary_key=True) name: Mapped[str] = mapped_column(nullable=False) password: Mapped[str] - authenticated: Mapped[bool] = mapped_column(default=False, nullable=True) + authenticated: Mapped[bool | None] = mapped_column(default=False, nullable=True) createdon: Mapped[datetime.datetime] = mapped_column( DateTime(timezone=True), server_default=func.now() ) - posts: Mapped[List["Post"]] = relationship() + posts: Mapped[list["Post"]] = relationship() def is_authenticated(self): # pyright: ignore[ reportIncompatibleMethodOverride] return self.authenticated From 509bcf27bdf36aa5bce1b144bdaaab2545b0114b Mon Sep 17 00:00:00 2001 From: loki Date: Sat, 6 Sep 2025 02:09:20 +0300 Subject: [PATCH 03/34] re orm --- blog/category/models.py | 12 +++---- blog/infrastructure/database.py | 61 +++++++++++++++++++++++++++++++++ blog/post/models.py | 43 ++++++----------------- blog/tags/association.py | 2 ++ blog/tags/models.py | 14 +++----- blog/user/models.py | 16 +++------ 6 files changed, 89 insertions(+), 59 deletions(-) create mode 100644 blog/infrastructure/database.py diff --git a/blog/category/models.py b/blog/category/models.py index 7faf1f3..2789908 100644 --- a/blog/category/models.py +++ b/blog/category/models.py @@ -2,9 +2,10 @@ from typing import TYPE_CHECKING -from sqlalchemy.orm import Mapped, mapped_column, relationship +from sqlalchemy.orm import relationship from blog.extensions import db +from blog.infrastructure.database import get_categories_table if TYPE_CHECKING: from blog.post.models import Post @@ -13,12 +14,9 @@ class Category(db.Model): """orm model for blog post.""" - __tablename__ = "categories" - id: Mapped[int] = mapped_column(primary_key=True) - title: Mapped[str] = mapped_column(default="") - alias: Mapped[str] = mapped_column(unique=True) - posts: Mapped[list["Post"]] = relationship() - template: Mapped[str | None] = mapped_column(nullable=True) + __table__ = get_categories_table(db.metadata) + + posts = relationship("Post", back_populates="category") def __str__(self): return f"Category(id={self.id}, title={self.title}, template={self.template})" diff --git a/blog/infrastructure/database.py b/blog/infrastructure/database.py new file mode 100644 index 0000000..7335bc4 --- /dev/null +++ b/blog/infrastructure/database.py @@ -0,0 +1,61 @@ +"""SQLAlchemy Table Definitions (Infrastructure). + +This module contains the SQLAlchemy table definitions +following the UNION Architecture pattern where infrastructure +is separated from domain models. +""" + +from sqlalchemy import Table, Column, Integer, String, Text, DateTime, ForeignKey + +# Table definitions (Infrastructure layer) +def get_users_table(metadata): + return Table( + 'users', metadata, + Column('id', Integer, primary_key=True), + Column('name', String(50), nullable=False), + Column('password', String(255)), # Adjusted length for password hashes + Column('authenticated', Integer, default=0), # Using Integer for boolean + Column('createdon', DateTime(timezone=True)), + extend_existing=True + ) + +def get_posts_table(metadata): + return Table( + 'posts', metadata, + Column('id', Integer, primary_key=True), + Column('pagetitle', String(255), nullable=False), + Column('alias', String(255), nullable=False, unique=True), + Column('content', Text), + Column('createdon', DateTime(timezone=True)), + Column('publishedon', DateTime(timezone=True)), + Column('category_id', Integer, ForeignKey('categories.id'), nullable=True), + Column('user_id', Integer, ForeignKey('users.id'), nullable=True), + extend_existing=True + ) + +def get_categories_table(metadata): + return Table( + 'categories', metadata, + Column('id', Integer, primary_key=True), + Column('title', String(255)), + Column('alias', String(255), unique=True), + Column('template', String(255), nullable=True), + extend_existing=True + ) + +def get_tags_table(metadata): + return Table( + 'tags', metadata, + Column('id', Integer, primary_key=True), + Column('title', String(255)), + Column('alias', String(255), unique=True), + extend_existing=True + ) + +def get_posts_tags_table(metadata): + return Table( + 'posts_tags', metadata, + Column('post_id', Integer, ForeignKey('posts.id')), + Column('tag_id', Integer, ForeignKey('tags.id')), + extend_existing=True + ) \ No newline at end of file diff --git a/blog/post/models.py b/blog/post/models.py index 1d8e5b5..3f047fc 100644 --- a/blog/post/models.py +++ b/blog/post/models.py @@ -4,12 +4,11 @@ from typing import TYPE_CHECKING import markdown -from sqlalchemy import DateTime, ForeignKey, Text -from sqlalchemy.orm import Mapped, mapped_column, relationship +from sqlalchemy.orm import relationship from sqlalchemy.sql import func from blog.extensions import db -from blog.tags.association import posts_tags +from blog.infrastructure.database import get_posts_table, get_posts_tags_table if TYPE_CHECKING: from blog.category.models import Category @@ -23,29 +22,11 @@ class Post(db.Model): """orm model for blog post.""" - __tablename__ = "posts" # pyright: ignore[reportUnannotatedClassAttribute] - - id: Mapped[int] = mapped_column(primary_key=True) - pagetitle: Mapped[str] = mapped_column(nullable=False, unique=False) - alias: Mapped[str] = mapped_column(nullable=False, unique=True) - content: Mapped[str] = mapped_column(type_=Text) - createdon: Mapped[datetime.datetime] = mapped_column( - DateTime(timezone=True), server_default=func.now() - ) - publishedon: Mapped[datetime.datetime | None] = mapped_column( - DateTime(timezone=True), - server_default=func.now(), - nullable=True, - ) - category_id: Mapped[int | None] = mapped_column( - ForeignKey("categories.id"), nullable=True - ) - user_id: Mapped[int | None] = mapped_column(ForeignKey("users.id"), nullable=True) - user: Mapped["User"] = relationship(back_populates="posts") - category: Mapped["Category"] = relationship(back_populates="posts") - tags: Mapped[list["Tag"]] = relationship( - secondary=posts_tags, back_populates="posts" - ) + __table__ = get_posts_table(db.metadata) + + user = relationship("User", back_populates="posts") + category = relationship("Category", back_populates="posts") + tags = relationship("Tag", secondary=get_posts_tags_table(db.metadata), back_populates="posts") @property def markdown(self): @@ -61,12 +42,10 @@ class Icon(db.Model): __tablename__ = "icons" # pyright: ignore[reportUnannotatedClassAttribute] - id: Mapped[int] = mapped_column(primary_key=True) - title: Mapped[str] = mapped_column(nullable=False, unique=True) - - url: Mapped[str] = mapped_column(nullable=False, unique=True) - content: Mapped[str] = mapped_column(type_=Text) + id = db.Column(db.Integer, primary_key=True) + title = db.Column(db.String(255), nullable=False, unique=True) + url = db.Column(db.String(255), nullable=False, unique=True) + content = db.Column(db.Text) - @typing.override def __str__(self): return f"{self.id} {self.title}" diff --git a/blog/tags/association.py b/blog/tags/association.py index 33b3aac..f66001b 100644 --- a/blog/tags/association.py +++ b/blog/tags/association.py @@ -1,6 +1,8 @@ # blog/tags/association.py from sqlalchemy import Column, ForeignKey, Table +# This file is now deprecated as we're using the posts_tags_table from infrastructure.database +# Keeping it for backward compatibility, but it should be removed in future versions from blog.extensions import db posts_tags = Table( diff --git a/blog/tags/models.py b/blog/tags/models.py index fde0671..e138d7c 100644 --- a/blog/tags/models.py +++ b/blog/tags/models.py @@ -1,10 +1,10 @@ # blog/tags/models.py from typing import TYPE_CHECKING -from sqlalchemy.orm import Mapped, mapped_column, relationship +from sqlalchemy.orm import relationship from blog.extensions import db -from blog.tags.association import posts_tags +from blog.infrastructure.database import get_tags_table, get_posts_tags_table if TYPE_CHECKING: from blog.post.models import Post @@ -13,13 +13,9 @@ class Tag(db.Model): """orm model for blog post.""" - __tablename__ = "tags" - id: Mapped[int] = mapped_column(primary_key=True) - title: Mapped[str] - alias: Mapped[str] = mapped_column(unique=True) - posts: Mapped[list["Post"]] = relationship( - secondary=posts_tags, back_populates="tags" - ) + __table__ = get_tags_table(db.metadata) + + posts = relationship("Post", secondary=get_posts_tags_table(db.metadata), back_populates="tags") def __str__(self): return f"{self.title}" diff --git a/blog/user/models.py b/blog/user/models.py index 8ce0219..a3102e5 100644 --- a/blog/user/models.py +++ b/blog/user/models.py @@ -4,12 +4,12 @@ from typing import TYPE_CHECKING from flask_login import UserMixin -from sqlalchemy import DateTime -from sqlalchemy.orm import Mapped, mapped_column, relationship +from sqlalchemy.orm import relationship from sqlalchemy.sql import func from werkzeug.security import check_password_hash, generate_password_hash from blog.extensions import db, login_manager +from blog.infrastructure.database import get_users_table if TYPE_CHECKING: from blog.post.models import Post @@ -23,15 +23,9 @@ def load_user(id): class User(UserMixin, db.Model): """orm model for users.""" - __tablename__ = "users" - id: Mapped[int] = mapped_column(primary_key=True) - name: Mapped[str] = mapped_column(nullable=False) - password: Mapped[str] - authenticated: Mapped[bool | None] = mapped_column(default=False, nullable=True) - createdon: Mapped[datetime.datetime] = mapped_column( - DateTime(timezone=True), server_default=func.now() - ) - posts: Mapped[list["Post"]] = relationship() + __table__ = get_users_table(db.metadata) + + posts = relationship("Post", back_populates="user") def is_authenticated(self): # pyright: ignore[ reportIncompatibleMethodOverride] return self.authenticated From 37b3a2456bbd6c7e17d15245fa4880a99d8b4e4a Mon Sep 17 00:00:00 2001 From: loki Date: Sat, 6 Sep 2025 02:42:56 +0300 Subject: [PATCH 04/34] start integrate service --- blog/category/models.py | 9 ++-- blog/domain/post.py | 3 +- blog/infrastructure/database.py | 76 +++++++++++++++++++-------------- blog/post/models.py | 10 ++--- blog/post/views.py | 58 ++++++++++++++++--------- blog/services/post.py | 36 ++++++++++++++++ blog/tags/models.py | 8 ++-- blog/templates/posts.html | 2 +- blog/user/models.py | 32 +++++--------- blog/user/views.py | 9 +++- tests/test_posts.py | 2 + tests/test_tags.py | 28 ++++++++++-- 12 files changed, 177 insertions(+), 96 deletions(-) diff --git a/blog/category/models.py b/blog/category/models.py index 2789908..24dffb3 100644 --- a/blog/category/models.py +++ b/blog/category/models.py @@ -1,5 +1,4 @@ -"""SqlAlchemy models.""" - +# blog/category/models.py from typing import TYPE_CHECKING from sqlalchemy.orm import relationship @@ -8,15 +7,15 @@ from blog.infrastructure.database import get_categories_table if TYPE_CHECKING: - from blog.post.models import Post + pass class Category(db.Model): """orm model for blog post.""" __table__ = get_categories_table(db.metadata) - + posts = relationship("Post", back_populates="category") def __str__(self): - return f"Category(id={self.id}, title={self.title}, template={self.template})" + return f"{self.title}" diff --git a/blog/domain/post.py b/blog/domain/post.py index b48624f..87c778d 100644 --- a/blog/domain/post.py +++ b/blog/domain/post.py @@ -32,5 +32,4 @@ class Post: def __post_init__(self): if self.createdon is None: self.createdon = datetime.datetime.now(datetime.timezone.utc) - if self.publishedon is None: - self.publishedon = datetime.datetime.now(datetime.timezone.utc) + # Don't set default for publishedon - it should be None for unpublished posts diff --git a/blog/infrastructure/database.py b/blog/infrastructure/database.py index 7335bc4..567f75c 100644 --- a/blog/infrastructure/database.py +++ b/blog/infrastructure/database.py @@ -7,55 +7,65 @@ from sqlalchemy import Table, Column, Integer, String, Text, DateTime, ForeignKey + # Table definitions (Infrastructure layer) def get_users_table(metadata): return Table( - 'users', metadata, - Column('id', Integer, primary_key=True), - Column('name', String(50), nullable=False), - Column('password', String(255)), # Adjusted length for password hashes - Column('authenticated', Integer, default=0), # Using Integer for boolean - Column('createdon', DateTime(timezone=True)), - extend_existing=True + "users", + metadata, + Column("id", Integer, primary_key=True), + Column("name", String(50), nullable=False), + Column("password", String(255)), # Adjusted length for password hashes + Column("authenticated", Integer, default=0), # Using Integer for boolean + Column("createdon", DateTime(timezone=True)), + extend_existing=True, ) + def get_posts_table(metadata): return Table( - 'posts', metadata, - Column('id', Integer, primary_key=True), - Column('pagetitle', String(255), nullable=False), - Column('alias', String(255), nullable=False, unique=True), - Column('content', Text), - Column('createdon', DateTime(timezone=True)), - Column('publishedon', DateTime(timezone=True)), - Column('category_id', Integer, ForeignKey('categories.id'), nullable=True), - Column('user_id', Integer, ForeignKey('users.id'), nullable=True), - extend_existing=True + "posts", + metadata, + Column("id", Integer, primary_key=True), + Column("pagetitle", String(255), nullable=False), + Column("alias", String(255), nullable=False, unique=True), + Column("content", Text), + Column("createdon", DateTime(timezone=True)), + Column("publishedon", DateTime(timezone=True)), + Column("category_id", Integer, ForeignKey("categories.id"), nullable=True), + Column("user_id", Integer, ForeignKey("users.id"), nullable=True), + extend_existing=True, ) + def get_categories_table(metadata): return Table( - 'categories', metadata, - Column('id', Integer, primary_key=True), - Column('title', String(255)), - Column('alias', String(255), unique=True), - Column('template', String(255), nullable=True), - extend_existing=True + "categories", + metadata, + Column("id", Integer, primary_key=True), + Column("title", String(255)), + Column("alias", String(255), unique=True), + Column("template", String(255), nullable=True), + extend_existing=True, ) + def get_tags_table(metadata): return Table( - 'tags', metadata, - Column('id', Integer, primary_key=True), - Column('title', String(255)), - Column('alias', String(255), unique=True), - extend_existing=True + "tags", + metadata, + Column("id", Integer, primary_key=True), + Column("title", String(255)), + Column("alias", String(255), unique=True), + extend_existing=True, ) + def get_posts_tags_table(metadata): return Table( - 'posts_tags', metadata, - Column('post_id', Integer, ForeignKey('posts.id')), - Column('tag_id', Integer, ForeignKey('tags.id')), - extend_existing=True - ) \ No newline at end of file + "posts_tags", + metadata, + Column("post_id", Integer, ForeignKey("posts.id")), + Column("tag_id", Integer, ForeignKey("tags.id")), + extend_existing=True, + ) diff --git a/blog/post/models.py b/blog/post/models.py index 3f047fc..2fc1c7b 100644 --- a/blog/post/models.py +++ b/blog/post/models.py @@ -1,19 +1,15 @@ # blog/posts/models.py -import datetime import typing from typing import TYPE_CHECKING import markdown from sqlalchemy.orm import relationship -from sqlalchemy.sql import func from blog.extensions import db from blog.infrastructure.database import get_posts_table, get_posts_tags_table if TYPE_CHECKING: - from blog.category.models import Category - from blog.tags.models import Tag - from blog.user.models import User + pass MARKDOWN_EXTENSIONS = ["markdown.extensions.fenced_code"] @@ -26,7 +22,9 @@ class Post(db.Model): user = relationship("User", back_populates="posts") category = relationship("Category", back_populates="posts") - tags = relationship("Tag", secondary=get_posts_tags_table(db.metadata), back_populates="posts") + tags = relationship( + "Tag", secondary=get_posts_tags_table(db.metadata), back_populates="posts" + ) @property def markdown(self): diff --git a/blog/post/views.py b/blog/post/views.py index fdc51bc..b74b003 100644 --- a/blog/post/views.py +++ b/blog/post/views.py @@ -12,12 +12,12 @@ request, url_for, ) -from sqlalchemy import or_ from blog.extensions import flask_sitemap from blog import cache, db from blog.post.models import Post, Icon -from blog.category.models import Category +from blog.repos.post import PostRepository +from blog.services.post import PostService post = Blueprint("postb", __name__) @@ -37,19 +37,19 @@ def decorated_function(*args, **kwargs): return decorated_function +def get_post_service(): + """Create and return a PostService instance.""" + post_repository = PostRepository() + return PostService(post_repository) + + @post.route("/") @cache.cached(timeout=50) @pages_gen def index(**kwargs): - post_query = ( - sa.select(Post) - .where( - Post.publishedon.isnot(None), - Post.category_id.is_(None), - ) - .order_by(Post.publishedon.desc()) - ) - posts = db.session.scalars(post_query).all() + # Use service layer instead of direct database access + post_service = get_post_service() + posts = post_service.get_published_posts_orm() return render_template("posts.html", posts=posts, **kwargs) @@ -57,16 +57,34 @@ def index(**kwargs): @cache.cached(timeout=50) @pages_gen def view(alias=None, **kwargs): - page_categories = current_app.config["PAGE_CATEGORY"] # (1,3,) - post_query = sa.select(Post).where( - or_(Post.publishedon.isnot(None), Post.category_id.in_(page_categories)), - Post.alias == alias, - ) - post = db.first_or_404(post_query) + # Use service layer instead of direct database access + post_service = get_post_service() + post = post_service.get_post_by_alias_orm(alias) + if not post: + # Handle 404 case + from flask import abort + + abort(404) + + # For page categories, we need to check if it's a page or a regular post + page_categories = current_app.config["PAGE_CATEGORY"] + is_page = post.category_id is not None and post.category_id in page_categories + is_published = post.publishedon is not None + + if not (is_published or is_page): + from flask import abort + + abort(404) + + # Load category object if needed + page_category_obj = None + if post.category_id: + from blog.category.models import Category + + page_category_obj = db.session.scalars( + sa.select(Category).where(Category.id == post.category_id) + ).first() - page_category_obj = db.session.scalars( - sa.select(Category).where(Category.id == post.category_id) - ).first() if page_category_obj and page_category_obj.template: return render_template(page_category_obj.template, post=post, **kwargs) return render_template("post.html", post=post, **kwargs) diff --git a/blog/services/post.py b/blog/services/post.py index 479e54e..edcc9b7 100644 --- a/blog/services/post.py +++ b/blog/services/post.py @@ -3,6 +3,9 @@ from typing import List, Optional from blog.repos.post import PostRepository from blog.domain.post import Post +from blog.post.models import Post as PostORM +from blog.extensions import db +import sqlalchemy as sa class PostService: @@ -42,3 +45,36 @@ def update_post(self, post: Post) -> Post: def delete_post(self, post_id: int) -> bool: """Delete a post by its ID.""" return self.post_repository.delete(post_id) + + def get_published_posts_orm(self) -> List[PostORM]: + """Get all published posts as ORM models (for compatibility with views).""" + domain_posts = self.get_published_posts() + return [self._to_orm_model(post) for post in domain_posts] + + def get_post_by_alias_orm(self, alias: str) -> Optional[PostORM]: + """Get a post by its alias as ORM model (for compatibility with views).""" + domain_post = self.get_post_by_alias(alias) + if domain_post: + return self._to_orm_model(domain_post) + return None + + def _to_orm_model(self, post: Post) -> PostORM: + """Convert domain model to ORM model by loading from database.""" + if post.id: + # Load the full ORM model from database to get relationships + stmt = sa.select(PostORM).where(PostORM.id == post.id) + post_orm = db.session.scalar(stmt) + if post_orm: + return post_orm + + # If we can't load from database, create a new instance + post_orm = PostORM() + post_orm.id = post.id or 0 + post_orm.pagetitle = post.pagetitle + post_orm.alias = post.alias + post_orm.content = post.content + post_orm.createdon = post.createdon + post_orm.publishedon = post.publishedon + post_orm.category_id = post.category_id + post_orm.user_id = post.user_id + return post_orm diff --git a/blog/tags/models.py b/blog/tags/models.py index e138d7c..a8a9684 100644 --- a/blog/tags/models.py +++ b/blog/tags/models.py @@ -7,15 +7,17 @@ from blog.infrastructure.database import get_tags_table, get_posts_tags_table if TYPE_CHECKING: - from blog.post.models import Post + pass class Tag(db.Model): """orm model for blog post.""" __table__ = get_tags_table(db.metadata) - - posts = relationship("Post", secondary=get_posts_tags_table(db.metadata), back_populates="tags") + + posts = relationship( + "Post", secondary=get_posts_tags_table(db.metadata), back_populates="tags" + ) def __str__(self): return f"{self.title}" diff --git a/blog/templates/posts.html b/blog/templates/posts.html index 30c3d87..46e0c81 100644 --- a/blog/templates/posts.html +++ b/blog/templates/posts.html @@ -5,7 +5,7 @@ {% if tag %}

Посты c тэгом: {{tag.title}}

{% endif %} - {% for group in posts|groupby('publishedon.year')|sort(reverse=True) %} + {% for group in posts|selectattr('publishedon')|groupby('publishedon.year')|sort(reverse=True) %}

{{group.grouper}}

diff --git a/blog/user/models.py b/blog/user/models.py index a3102e5..0b197c7 100644 --- a/blog/user/models.py +++ b/blog/user/models.py @@ -1,43 +1,33 @@ """SqlAlchemy models.""" -import datetime from typing import TYPE_CHECKING from flask_login import UserMixin from sqlalchemy.orm import relationship -from sqlalchemy.sql import func from werkzeug.security import check_password_hash, generate_password_hash -from blog.extensions import db, login_manager +from blog.extensions import db from blog.infrastructure.database import get_users_table if TYPE_CHECKING: - from blog.post.models import Post - - -@login_manager.user_loader -def load_user(id): - return db.session.get(User, int(id)) + pass class User(UserMixin, db.Model): - """orm model for users.""" + """SqlAlchemy model for users.""" __table__ = get_users_table(db.metadata) - - posts = relationship("Post", back_populates="user") - def is_authenticated(self): # pyright: ignore[ reportIncompatibleMethodOverride] - return self.authenticated - - def get_id(self): - return str(self.id) + posts = relationship("Post", back_populates="user") - def set_password(self, password): + def set_password(self, password: str) -> None: + """Set password hash.""" self.password = generate_password_hash(password) - def check_password(self, password): - return check_password_hash(self.password, password) + def check_password(self, password: str) -> bool: + """Check password hash.""" + return check_password_hash(self.password or "", password) - def __str__(self): + def __str__(self) -> str: + """String representation.""" return f"{self.name}" diff --git a/blog/user/views.py b/blog/user/views.py index 98a7b10..5ea872f 100644 --- a/blog/user/views.py +++ b/blog/user/views.py @@ -3,13 +3,20 @@ from flask import Blueprint, flash, redirect, render_template, url_for from flask_login import current_user, login_user -from blog.extensions import db +from blog.extensions import db, login_manager from blog.user.forms import LoginForm from blog.user.models import User user_blueprint = Blueprint("userb", __name__) +@login_manager.user_loader +def load_user(user_id): + """Load user by ID for Flask-Login.""" + user_query = sa.select(User).where(User.id == int(user_id)) + return db.session.scalars(user_query).first() + + @user_blueprint.route("/login", methods=["GET", "POST"]) def login(): if current_user.is_authenticated: diff --git a/tests/test_posts.py b/tests/test_posts.py index ec916f7..f18a6f9 100644 --- a/tests/test_posts.py +++ b/tests/test_posts.py @@ -29,6 +29,8 @@ def post_helper(prefix="post", page=False): post.pagetitle = f"{prefix}_title" post.alias = f"{prefix}_alias" post.content = f"{prefix}_content" + # All posts should be published for tests + post.publishedon = db.func.now() if page: post.category_id = 1 return post diff --git a/tests/test_tags.py b/tests/test_tags.py index 8ad65c6..5e89a1d 100644 --- a/tests/test_tags.py +++ b/tests/test_tags.py @@ -25,13 +25,28 @@ def test_get_posts_by_tag(test_client): tag = Tag(title="test-tag", alias="test-tag") # type: ignore db.session.add(tag) - post1 = Post(pagetitle="Post 1", alias="post-1", content="Content 1") # type: ignore + post1 = Post( + pagetitle="Post 1", + alias="post-1", + content="Content 1", + publishedon=db.func.now(), + ) # type: ignore post1.tags.append(tag) - post2 = Post(pagetitle="Post 2", alias="post-2", content="Content 2") # type: ignore + post2 = Post( + pagetitle="Post 2", + alias="post-2", + content="Content 2", + publishedon=db.func.now(), + ) # type: ignore post2.tags.append(tag) - post3 = Post(pagetitle="Post 3", alias="post-3", content="Content 3") # type: ignore + post3 = Post( + pagetitle="Post 3", + alias="post-3", + content="Content 3", + publishedon=db.func.now(), + ) # type: ignore db.session.add(post1) db.session.add(post2) @@ -53,7 +68,12 @@ def test_post_have_tag(test_client): tag2 = Tag(title="test-tag2", alias="test-tag2") # type: ignore db.session.add(tag2) - post1 = Post(pagetitle="Post 1", alias="post-1", content="Content 1") # type: ignore + post1 = Post( + pagetitle="Post 1", + alias="post-1", + content="Content 1", + publishedon=db.func.now(), + ) # type: ignore post1.tags.append(tag1) db.session.add(post1) From 649cc5ab201e0e122c9aa8c551446d4eec8b50f6 Mon Sep 17 00:00:00 2001 From: loki Date: Sat, 6 Sep 2025 03:01:15 +0300 Subject: [PATCH 05/34] continue union layer --- blog/category/models.py | 2 +- blog/domain/icon.py | 16 +++++++ blog/post/views.py | 75 ++++++++++++++++-------------- blog/repos/icon.py | 81 ++++++++++++++++++++++++++++++++ blog/services/category.py | 85 ++++++++++++++++++++++++++++++++++ blog/services/factory.py | 46 +++++++++++++++++++ blog/services/icon.py | 79 +++++++++++++++++++++++++++++++ blog/services/post.py | 29 ++++++++++-- blog/services/tag.py | 89 +++++++++++++++++++++++++++++++++++ blog/services/user.py | 97 +++++++++++++++++++++++++++++++++++++++ blog/tags/models.py | 2 +- blog/tags/views.py | 17 +++++-- blog/user/views.py | 20 +++++--- 13 files changed, 587 insertions(+), 51 deletions(-) create mode 100644 blog/domain/icon.py create mode 100644 blog/repos/icon.py create mode 100644 blog/services/category.py create mode 100644 blog/services/factory.py create mode 100644 blog/services/icon.py create mode 100644 blog/services/tag.py create mode 100644 blog/services/user.py diff --git a/blog/category/models.py b/blog/category/models.py index 24dffb3..ffa231e 100644 --- a/blog/category/models.py +++ b/blog/category/models.py @@ -11,7 +11,7 @@ class Category(db.Model): - """orm model for blog post.""" + """orm model for blog category.""" __table__ = get_categories_table(db.metadata) diff --git a/blog/domain/icon.py b/blog/domain/icon.py new file mode 100644 index 0000000..7fc0a07 --- /dev/null +++ b/blog/domain/icon.py @@ -0,0 +1,16 @@ +"""Domain models for the Icon entity.""" + +from dataclasses import dataclass + + +@dataclass +class Icon: + """Domain model for blog icon.""" + + id: int | None = None + title: str = "" + url: str = "" + content: str | None = None + + def __str__(self): + return f"Icon(id={self.id}, title={self.title})" \ No newline at end of file diff --git a/blog/post/views.py b/blog/post/views.py index b74b003..23df2ab 100644 --- a/blog/post/views.py +++ b/blog/post/views.py @@ -17,7 +17,11 @@ from blog import cache, db from blog.post.models import Post, Icon from blog.repos.post import PostRepository +from blog.repos.category import CategoryRepository +from blog.repos.icon import IconRepository from blog.services.post import PostService +from blog.services.category import CategoryService +from blog.services.icon import IconService post = Blueprint("postb", __name__) @@ -25,30 +29,32 @@ def pages_gen(f): @wraps(f) def decorated_function(*args, **kwargs): + # Use service layer instead of direct database access + from blog.services.factory import ServiceFactory + page_category = current_app.config["PAGE_CATEGORY"] - pages_query = sa.select(Post).where(Post.category_id.in_(page_category)) - pages = db.session.scalars(pages_query).all() + + # Get posts using PostService + post_service = ServiceFactory.create_post_service() + pages = post_service.get_page_posts_orm(page_category) - icons_query = sa.select(Icon) - icons = db.session.scalars(icons_query).all() + # Get icons using IconService + icon_service = ServiceFactory.create_icon_service() + icons = icon_service.get_all_icons_orm() return f(pages=pages, icons=icons, *args, **kwargs) return decorated_function -def get_post_service(): - """Create and return a PostService instance.""" - post_repository = PostRepository() - return PostService(post_repository) - - @post.route("/") @cache.cached(timeout=50) @pages_gen def index(**kwargs): # Use service layer instead of direct database access - post_service = get_post_service() + from blog.services.factory import ServiceFactory + + post_service = ServiceFactory.create_post_service() posts = post_service.get_published_posts_orm() return render_template("posts.html", posts=posts, **kwargs) @@ -58,7 +64,9 @@ def index(**kwargs): @pages_gen def view(alias=None, **kwargs): # Use service layer instead of direct database access - post_service = get_post_service() + from blog.services.factory import ServiceFactory + + post_service = ServiceFactory.create_post_service() post = post_service.get_post_by_alias_orm(alias) if not post: # Handle 404 case @@ -76,14 +84,14 @@ def view(alias=None, **kwargs): abort(404) - # Load category object if needed + # Load category object if needed using service layer page_category_obj = None if post.category_id: from blog.category.models import Category - - page_category_obj = db.session.scalars( - sa.select(Category).where(Category.id == post.category_id) - ).first() + + # Use CategoryService instead of direct database access + category_service = ServiceFactory.create_category_service() + page_category_obj = category_service.get_category_by_id_orm(post.category_id) if page_category_obj and page_category_obj.template: return render_template(page_category_obj.template, post=post, **kwargs) @@ -92,21 +100,19 @@ def view(alias=None, **kwargs): @flask_sitemap.register_generator def site_map_gen(): + # Use service layer instead of direct database access + from blog.services.factory import ServiceFactory + page_category = current_app.config["PAGE_CATEGORY"] - pages_query = sa.select(Post).where(Post.category_id.in_(page_category)) - pages = db.session.scalars(pages_query).all() + + # Get pages using PostService + post_service = ServiceFactory.create_post_service() + pages = post_service.get_page_posts_orm(page_category) for page in pages: yield url_for("postb.view", alias=page.alias) - post_query = ( - sa.select(Post) - .where( - Post.publishedon.isnot(None), - Post.category_id.is_(None), - ) - .order_by(Post.publishedon.desc()) - ) - - posts = db.session.scalars(post_query).all() + + # Get posts using PostService + posts = post_service.get_published_posts_orm() for post in posts: yield url_for("postb.view", alias=post.alias) @@ -132,12 +138,13 @@ def robots(): @post.route("/rss.xml") @cache.cached(timeout=50) def rss(): + # Use service layer instead of direct database access + from blog.services.factory import ServiceFactory + + post_service = ServiceFactory.create_post_service() + list_posts = post_service.get_published_posts_orm() + date = datetime.datetime.now() - post_query = sa.select(Post).where( - Post.publishedon.isnot(None), - Post.category_id.is_(None), - ) - list_posts = db.session.scalars(post_query).all() rss_xml = render_template("rss.xml", posts=list_posts, date=date) response = make_response(rss_xml) response.headers["Content-Type"] = "application/rss+xml" diff --git a/blog/repos/icon.py b/blog/repos/icon.py new file mode 100644 index 0000000..54d5fc1 --- /dev/null +++ b/blog/repos/icon.py @@ -0,0 +1,81 @@ +"""Repository for Icon entities.""" + +import sqlalchemy as sa +from sqlalchemy.orm import Session + +from blog.extensions import db +from blog.post.models import Icon as IconORM +from blog.domain.icon import Icon + + +class IconRepository: + """Repository for Icon entities.""" + + def __init__(self, session: Session | None = None): + self.session = session or db.session + + def get_by_id(self, icon_id: int) -> Icon | None: + """Get an icon by its ID.""" + stmt = sa.select(IconORM).where(IconORM.id == icon_id) + icon_orm = self.session.scalar(stmt) + if icon_orm: + return self._to_domain_model(icon_orm) + return None + + def get_by_title(self, title: str) -> Icon | None: + """Get an icon by its title.""" + stmt = sa.select(IconORM).where(IconORM.title == title) + icon_orm = self.session.scalar(stmt) + if icon_orm: + return self._to_domain_model(icon_orm) + return None + + def get_all(self) -> list[Icon]: + """Get all icons.""" + stmt = sa.select(IconORM) + icons_orm = self.session.scalars(stmt).all() + return [self._to_domain_model(icon_orm) for icon_orm in icons_orm] + + def create(self, icon: Icon) -> Icon: + """Create a new icon.""" + icon_orm = IconORM() + icon_orm.title = icon.title + icon_orm.url = icon.url + if icon.content is not None: + icon_orm.content = icon.content + self.session.add(icon_orm) + self.session.flush() # Get the ID without committing + icon.id = icon_orm.id + return icon + + def update(self, icon: Icon) -> Icon: + """Update an existing icon.""" + stmt = sa.select(IconORM).where(IconORM.id == icon.id) + icon_orm = self.session.scalar(stmt) + if not icon_orm: + raise ValueError(f"Icon with id {icon.id} not found") + + icon_orm.title = icon.title + icon_orm.url = icon.url + if icon.content is not None: + icon_orm.content = icon.content + self.session.flush() + return icon + + def delete(self, icon_id: int) -> bool: + """Delete an icon by its ID.""" + stmt = sa.select(IconORM).where(IconORM.id == icon_id) + icon_orm = self.session.scalar(stmt) + if icon_orm: + self.session.delete(icon_orm) + return True + return False + + def _to_domain_model(self, icon_orm: IconORM) -> Icon: + """Convert ORM model to domain model.""" + return Icon( + id=icon_orm.id, + title=icon_orm.title, + url=icon_orm.url, + content=icon_orm.content, + ) \ No newline at end of file diff --git a/blog/services/category.py b/blog/services/category.py new file mode 100644 index 0000000..5369f0b --- /dev/null +++ b/blog/services/category.py @@ -0,0 +1,85 @@ +"""Service layer for Category entities.""" + +from typing import List, Optional +from blog.repos.category import CategoryRepository +from blog.domain.category import Category +from blog.category.models import Category as CategoryORM +from blog.extensions import db +import sqlalchemy as sa + + +class CategoryServiceError(Exception): + """Base exception for CategoryService errors.""" + pass + + +class CategoryService: + """Service layer for Category entities.""" + + def __init__(self, category_repository: CategoryRepository): + self.category_repository = category_repository + + def get_category_by_id(self, category_id: int) -> Optional[Category]: + """Get a category by its ID.""" + return self.category_repository.get_by_id(category_id) + + def get_category_by_alias(self, alias: str) -> Optional[Category]: + """Get a category by its alias.""" + return self.category_repository.get_by_alias(alias) + + def get_all_categories(self) -> List[Category]: + """Get all categories.""" + return self.category_repository.get_all() + + def get_categories_with_posts(self) -> List[Category]: + """Get all categories with their posts.""" + return self.category_repository.get_categories_with_posts() + + def create_category(self, category: Category) -> Category: + """Create a new category.""" + try: + return self.category_repository.create(category) + except Exception as e: + # Re-raise as a more specific exception for the service layer + raise CategoryServiceError(f"Failed to create category: {str(e)}") from e + + def update_category(self, category: Category) -> Category: + """Update an existing category.""" + try: + return self.category_repository.update(category) + except ValueError as e: + # Re-raise as a more specific exception for the service layer + raise CategoryServiceError(f"Failed to update category: {str(e)}") from e + + def delete_category(self, category_id: int) -> bool: + """Delete a category by its ID.""" + try: + return self.category_repository.delete(category_id) + except Exception as e: + # Log the error and return False to indicate failure + # In a real application, you might want to log this + return False + + def get_category_by_id_orm(self, category_id: int) -> Optional[CategoryORM]: + """Get a category by its ID as ORM model (for compatibility with views).""" + domain_category = self.get_category_by_id(category_id) + if domain_category: + return self._to_orm_model(domain_category) + return None + + def _to_orm_model(self, category: Category) -> CategoryORM: + """Convert domain model to ORM model by loading from database.""" + if category.id: + # Load the full ORM model from database to get relationships + stmt = sa.select(CategoryORM).where(CategoryORM.id == category.id) + category_orm = db.session.scalar(stmt) + if category_orm: + return category_orm + + # If we can't load from database, create a new instance + category_orm = CategoryORM() + category_orm.id = category.id or 0 + category_orm.title = category.title + category_orm.alias = category.alias + category_orm.template = category.template + return category_orm \ No newline at end of file diff --git a/blog/services/factory.py b/blog/services/factory.py new file mode 100644 index 0000000..e84dfa7 --- /dev/null +++ b/blog/services/factory.py @@ -0,0 +1,46 @@ +"""Service factory for creating service instances with proper dependency injection.""" + +from blog.repos.post import PostRepository +from blog.repos.category import CategoryRepository +from blog.repos.icon import IconRepository +from blog.repos.tag import TagRepository +from blog.repos.user import UserRepository +from blog.services.post import PostService +from blog.services.category import CategoryService +from blog.services.icon import IconService +from blog.services.tag import TagService +from blog.services.user import UserService + + +class ServiceFactory: + """Factory for creating service instances with proper dependency injection.""" + + @staticmethod + def create_post_service(): + """Create a PostService instance with its dependencies.""" + post_repository = PostRepository() + return PostService(post_repository) + + @staticmethod + def create_category_service(): + """Create a CategoryService instance with its dependencies.""" + category_repository = CategoryRepository() + return CategoryService(category_repository) + + @staticmethod + def create_icon_service(): + """Create an IconService instance with its dependencies.""" + icon_repository = IconRepository() + return IconService(icon_repository) + + @staticmethod + def create_tag_service(): + """Create a TagService instance with its dependencies.""" + tag_repository = TagRepository() + return TagService(tag_repository) + + @staticmethod + def create_user_service(): + """Create a UserService instance with its dependencies.""" + user_repository = UserRepository() + return UserService(user_repository) \ No newline at end of file diff --git a/blog/services/icon.py b/blog/services/icon.py new file mode 100644 index 0000000..4ec0669 --- /dev/null +++ b/blog/services/icon.py @@ -0,0 +1,79 @@ +"""Service layer for Icon entities.""" + +from typing import List, Optional +from blog.repos.icon import IconRepository +from blog.domain.icon import Icon +from blog.post.models import Icon as IconORM +from blog.extensions import db +import sqlalchemy as sa + + +class IconServiceError(Exception): + """Base exception for IconService errors.""" + pass + + +class IconService: + """Service layer for Icon entities.""" + + def __init__(self, icon_repository: IconRepository): + self.icon_repository = icon_repository + + def get_icon_by_id(self, icon_id: int) -> Optional[Icon]: + """Get an icon by its ID.""" + return self.icon_repository.get_by_id(icon_id) + + def get_icon_by_title(self, title: str) -> Optional[Icon]: + """Get an icon by its title.""" + return self.icon_repository.get_by_title(title) + + def get_all_icons(self) -> List[Icon]: + """Get all icons.""" + return self.icon_repository.get_all() + + def create_icon(self, icon: Icon) -> Icon: + """Create a new icon.""" + try: + return self.icon_repository.create(icon) + except Exception as e: + # Re-raise as a more specific exception for the service layer + raise IconServiceError(f"Failed to create icon: {str(e)}") from e + + def update_icon(self, icon: Icon) -> Icon: + """Update an existing icon.""" + try: + return self.icon_repository.update(icon) + except ValueError as e: + # Re-raise as a more specific exception for the service layer + raise IconServiceError(f"Failed to update icon: {str(e)}") from e + + def delete_icon(self, icon_id: int) -> bool: + """Delete an icon by its ID.""" + try: + return self.icon_repository.delete(icon_id) + except Exception as e: + # Log the error and return False to indicate failure + # In a real application, you might want to log this + return False + + def get_all_icons_orm(self) -> List[IconORM]: + """Get all icons as ORM models (for compatibility with views).""" + domain_icons = self.get_all_icons() + return [self._to_orm_model(icon) for icon in domain_icons] + + def _to_orm_model(self, icon: Icon) -> IconORM: + """Convert domain model to ORM model by loading from database.""" + if icon.id: + # Load the full ORM model from database + stmt = sa.select(IconORM).where(IconORM.id == icon.id) + icon_orm = db.session.scalar(stmt) + if icon_orm: + return icon_orm + + # If we can't load from database, create a new instance + icon_orm = IconORM() + icon_orm.id = icon.id or 0 + icon_orm.title = icon.title + icon_orm.url = icon.url + icon_orm.content = icon.content + return icon_orm \ No newline at end of file diff --git a/blog/services/post.py b/blog/services/post.py index edcc9b7..c044494 100644 --- a/blog/services/post.py +++ b/blog/services/post.py @@ -8,6 +8,11 @@ import sqlalchemy as sa +class PostServiceError(Exception): + """Base exception for PostService errors.""" + pass + + class PostService: """Service layer for Post entities.""" @@ -34,17 +39,35 @@ def get_page_posts(self, page_category_ids: List[int]) -> List[Post]: """Get posts that are pages (in specific categories).""" return self.post_repository.get_page_posts(page_category_ids) + def get_page_posts_orm(self, page_category_ids: List[int]) -> List[PostORM]: + """Get posts that are pages (in specific categories) as ORM models (for compatibility with views).""" + domain_posts = self.get_page_posts(page_category_ids) + return [self._to_orm_model(post) for post in domain_posts] + def create_post(self, post: Post) -> Post: """Create a new post.""" - return self.post_repository.create(post) + try: + return self.post_repository.create(post) + except Exception as e: + # Re-raise as a more specific exception for the service layer + raise PostServiceError(f"Failed to create post: {str(e)}") from e def update_post(self, post: Post) -> Post: """Update an existing post.""" - return self.post_repository.update(post) + try: + return self.post_repository.update(post) + except ValueError as e: + # Re-raise as a more specific exception for the service layer + raise PostServiceError(f"Failed to update post: {str(e)}") from e def delete_post(self, post_id: int) -> bool: """Delete a post by its ID.""" - return self.post_repository.delete(post_id) + try: + return self.post_repository.delete(post_id) + except Exception as e: + # Log the error and return False to indicate failure + # In a real application, you might want to log this + return False def get_published_posts_orm(self) -> List[PostORM]: """Get all published posts as ORM models (for compatibility with views).""" diff --git a/blog/services/tag.py b/blog/services/tag.py new file mode 100644 index 0000000..e8cd07d --- /dev/null +++ b/blog/services/tag.py @@ -0,0 +1,89 @@ +"""Service layer for Tag entities.""" + +from typing import List, Optional +from blog.repos.tag import TagRepository +from blog.domain.tag import Tag +from blog.tags.models import Tag as TagORM +from blog.extensions import db +import sqlalchemy as sa + + +class TagServiceError(Exception): + """Base exception for TagService errors.""" + pass + + +class TagService: + """Service layer for Tag entities.""" + + def __init__(self, tag_repository: TagRepository): + self.tag_repository = tag_repository + + def get_tag_by_id(self, tag_id: int) -> Optional[Tag]: + """Get a tag by its ID.""" + return self.tag_repository.get_by_id(tag_id) + + def get_tag_by_alias(self, alias: str) -> Optional[Tag]: + """Get a tag by its alias.""" + return self.tag_repository.get_by_alias(alias) + + def get_all_tags(self) -> List[Tag]: + """Get all tags.""" + return self.tag_repository.get_all() + + def get_tags_with_posts(self) -> List[Tag]: + """Get all tags with their posts.""" + return self.tag_repository.get_tags_with_posts() + + def create_tag(self, tag: Tag) -> Tag: + """Create a new tag.""" + try: + return self.tag_repository.create(tag) + except Exception as e: + # Re-raise as a more specific exception for the service layer + raise TagServiceError(f"Failed to create tag: {str(e)}") from e + + def update_tag(self, tag: Tag) -> Tag: + """Update an existing tag.""" + try: + return self.tag_repository.update(tag) + except ValueError as e: + # Re-raise as a more specific exception for the service layer + raise TagServiceError(f"Failed to update tag: {str(e)}") from e + + def delete_tag(self, tag_id: int) -> bool: + """Delete a tag by its ID.""" + try: + return self.tag_repository.delete(tag_id) + except Exception as e: + # Log the error and return False to indicate failure + # In a real application, you might want to log this + return False + + def get_tag_by_alias_orm(self, alias: str) -> Optional[TagORM]: + """Get a tag by its alias as ORM model (for compatibility with views).""" + domain_tag = self.get_tag_by_alias(alias) + if domain_tag: + return self._to_orm_model(domain_tag) + return None + + def get_all_tags_orm(self) -> List[TagORM]: + """Get all tags as ORM models (for compatibility with views).""" + domain_tags = self.get_all_tags() + return [self._to_orm_model(tag) for tag in domain_tags] + + def _to_orm_model(self, tag: Tag) -> TagORM: + """Convert domain model to ORM model by loading from database.""" + if tag.id: + # Load the full ORM model from database to get relationships + stmt = sa.select(TagORM).where(TagORM.id == tag.id) + tag_orm = db.session.scalar(stmt) + if tag_orm: + return tag_orm + + # If we can't load from database, create a new instance + tag_orm = TagORM() + tag_orm.id = tag.id or 0 + tag_orm.title = tag.title + tag_orm.alias = tag.alias + return tag_orm \ No newline at end of file diff --git a/blog/services/user.py b/blog/services/user.py new file mode 100644 index 0000000..7316f01 --- /dev/null +++ b/blog/services/user.py @@ -0,0 +1,97 @@ +"""Service layer for User entities.""" + +from typing import List, Optional +from blog.repos.user import UserRepository +from blog.domain.user import User +from blog.user.models import User as UserORM +from blog.extensions import db +import sqlalchemy as sa + + +class UserServiceError(Exception): + """Base exception for UserService errors.""" + pass + + +class UserService: + """Service layer for User entities.""" + + def __init__(self, user_repository: UserRepository): + self.user_repository = user_repository + + def get_user_by_id(self, user_id: int) -> Optional[User]: + """Get a user by its ID.""" + return self.user_repository.get_by_id(user_id) + + def get_user_by_name(self, name: str) -> Optional[User]: + """Get a user by their name.""" + return self.user_repository.get_by_name(name) + + def get_all_users(self) -> List[User]: + """Get all users.""" + return self.user_repository.get_all() + + def get_users_with_posts(self) -> List[User]: + """Get all users with their posts.""" + return self.user_repository.get_users_with_posts() + + def create_user(self, user: User) -> User: + """Create a new user.""" + try: + return self.user_repository.create(user) + except Exception as e: + # Re-raise as a more specific exception for the service layer + raise UserServiceError(f"Failed to create user: {str(e)}") from e + + def update_user(self, user: User) -> User: + """Update an existing user.""" + try: + return self.user_repository.update(user) + except ValueError as e: + # Re-raise as a more specific exception for the service layer + raise UserServiceError(f"Failed to update user: {str(e)}") from e + + def delete_user(self, user_id: int) -> bool: + """Delete a user by its ID.""" + try: + return self.user_repository.delete(user_id) + except Exception as e: + # Log the error and return False to indicate failure + # In a real application, you might want to log this + return False + + def authenticate_user(self, name: str, password: str) -> Optional[User]: + """Authenticate a user by name and password.""" + return self.user_repository.authenticate(name, password) + + def get_user_by_id_orm(self, user_id: int) -> Optional[UserORM]: + """Get a user by its ID as ORM model (for compatibility with views).""" + domain_user = self.get_user_by_id(user_id) + if domain_user: + return self._to_orm_model(domain_user) + return None + + def get_user_by_name_orm(self, name: str) -> Optional[UserORM]: + """Get a user by their name as ORM model (for compatibility with views).""" + domain_user = self.get_user_by_name(name) + if domain_user: + return self._to_orm_model(domain_user) + return None + + def _to_orm_model(self, user: User) -> UserORM: + """Convert domain model to ORM model by loading from database.""" + if user.id: + # Load the full ORM model from database to get relationships + stmt = sa.select(UserORM).where(UserORM.id == user.id) + user_orm = db.session.scalar(stmt) + if user_orm: + return user_orm + + # If we can't load from database, create a new instance + user_orm = UserORM() + user_orm.id = user.id or 0 + user_orm.name = user.name + user_orm.password = user.password + user_orm.authenticated = user.authenticated + user_orm.createdon = user.createdon + return user_orm \ No newline at end of file diff --git a/blog/tags/models.py b/blog/tags/models.py index a8a9684..e8f586c 100644 --- a/blog/tags/models.py +++ b/blog/tags/models.py @@ -11,7 +11,7 @@ class Tag(db.Model): - """orm model for blog post.""" + """orm model for blog tag.""" __table__ = get_tags_table(db.metadata) diff --git a/blog/tags/views.py b/blog/tags/views.py index 7c842bb..daa1cf3 100644 --- a/blog/tags/views.py +++ b/blog/tags/views.py @@ -1,9 +1,10 @@ import sqlalchemy as sa from flask import Blueprint, render_template -from blog import db from blog.post.views import pages_gen -from blog.tags.models import Tag +from blog.repos.tag import TagRepository +from blog.services.tag import TagService +from blog.services.factory import ServiceFactory tagsb = Blueprint("tagsb", __name__, url_prefix="/tags") @@ -11,13 +12,19 @@ @tagsb.route("/") @pages_gen def index(**kwargs): - tags = db.session.scalars(sa.select(Tag)).all() + # Use service layer instead of direct database access + tag_service = ServiceFactory.create_tag_service() + tags = tag_service.get_all_tags_orm() return render_template("tags.html", tags=tags, **kwargs) @tagsb.route("/") @pages_gen def view(alias=None, **kwargs): - tag_query = sa.select(Tag).where(Tag.alias == alias) - tag = db.first_or_404(tag_query) + # Use service layer instead of direct database access + tag_service = ServiceFactory.create_tag_service() + tag = tag_service.get_tag_by_alias_orm(alias) + if not tag: + from flask import abort + abort(404) return render_template("posts.html", posts=tag.posts, tag=tag, **kwargs) diff --git a/blog/user/views.py b/blog/user/views.py index 5ea872f..a984864 100644 --- a/blog/user/views.py +++ b/blog/user/views.py @@ -6,6 +6,8 @@ from blog.extensions import db, login_manager from blog.user.forms import LoginForm from blog.user.models import User +from blog.services.factory import ServiceFactory + user_blueprint = Blueprint("userb", __name__) @@ -13,8 +15,9 @@ @login_manager.user_loader def load_user(user_id): """Load user by ID for Flask-Login.""" - user_query = sa.select(User).where(User.id == int(user_id)) - return db.session.scalars(user_query).first() + # Use service layer instead of direct database access + user_service = ServiceFactory.create_user_service() + return user_service.get_user_by_id_orm(int(user_id)) @user_blueprint.route("/login", methods=["GET", "POST"]) @@ -23,11 +26,14 @@ def login(): return redirect("/") form = LoginForm() if form.validate_on_submit(): - user_query = sa.select(User).where(User.name == form.name.data) - user = db.session.scalars(user_query).first() - - if user and user.check_password(form.password.data): - login_user(user) + # Use service layer instead of direct database access + user_service = ServiceFactory.create_user_service() + user = user_service.authenticate_user(form.name.data, form.password.data) + + if user: + # Convert domain model to ORM model for Flask-Login + user_orm = user_service._to_orm_model(user) + login_user(user_orm) return redirect(url_for("admin.index")) flash("invalid user o password") return redirect(url_for("userb.login")) From eca012d4efe68cb6227eca74fb3ba2aa888afc3b Mon Sep 17 00:00:00 2001 From: loki Date: Sun, 7 Sep 2025 13:21:45 +0300 Subject: [PATCH 06/34] keep scrolling --- blog/category/models.py | 12 +- blog/domain/category.py | 10 +- blog/domain/icon.py | 2 +- blog/domain/post.py | 32 ++- blog/domain/tag.py | 8 +- blog/domain/user.py | 8 +- blog/post/models.py | 33 ++- blog/post/views.py | 71 ++--- blog/repos/category.py | 63 ++++- blog/repos/icon.py | 18 +- blog/repos/post.py | 101 +++++-- blog/repos/tag.py | 61 +++- blog/repos/user.py | 71 ++++- blog/services/category.py | 30 +- blog/services/factory.py | 13 +- blog/services/icon.py | 36 +-- blog/services/post.py | 44 +-- blog/services/tag.py | 34 +-- blog/services/user.py | 46 +--- blog/tags/models.py | 11 +- blog/tags/views.py | 17 +- blog/templates/post.html | 8 +- blog/user/models.py | 14 +- blog/user/views.py | 39 ++- requirements.txt | 5 - tests/test_repositories.py | 552 +++++++++++++++++++++++++++++++++++++ tests/test_services.py | 487 ++++++++++++++++++++++++++++++++ tests/test_tags.py | 92 ++++--- tests/test_views.py | 150 ++++++++++ 29 files changed, 1687 insertions(+), 381 deletions(-) delete mode 100644 requirements.txt create mode 100644 tests/test_repositories.py create mode 100644 tests/test_services.py create mode 100644 tests/test_views.py diff --git a/blog/category/models.py b/blog/category/models.py index ffa231e..8922cc0 100644 --- a/blog/category/models.py +++ b/blog/category/models.py @@ -1,13 +1,13 @@ # blog/category/models.py from typing import TYPE_CHECKING -from sqlalchemy.orm import relationship +from sqlalchemy.orm import Mapped, relationship from blog.extensions import db from blog.infrastructure.database import get_categories_table if TYPE_CHECKING: - pass + from blog.post.models import Post class Category(db.Model): @@ -15,7 +15,13 @@ class Category(db.Model): __table__ = get_categories_table(db.metadata) - posts = relationship("Post", back_populates="category") + # Type annotations for table columns + id: Mapped[int] + title: Mapped[str | None] + alias: Mapped[str | None] + template: Mapped[str | None] + + posts: Mapped[list["Post"]] = relationship("Post", back_populates="category") def __str__(self): return f"{self.title}" diff --git a/blog/domain/category.py b/blog/domain/category.py index 6c145f7..a05d0ae 100644 --- a/blog/domain/category.py +++ b/blog/domain/category.py @@ -2,22 +2,22 @@ from dataclasses import dataclass import typing -from typing import TYPE_CHECKING +from typing import TYPE_CHECKING, Optional, List if TYPE_CHECKING: - from blog.post.models import Post + from blog.domain.post import Post as PostDomain @dataclass class Category: """Domain model for blog category.""" - id: int | None = None + id: Optional[int] = None title: str = "" alias: str = "" - template: str | None = None + template: Optional[str] = None - posts: "list[Post] | None" = None + posts: "Optional[List[PostDomain]]" = None @typing.override def __str__(self): diff --git a/blog/domain/icon.py b/blog/domain/icon.py index 7fc0a07..12720bc 100644 --- a/blog/domain/icon.py +++ b/blog/domain/icon.py @@ -13,4 +13,4 @@ class Icon: content: str | None = None def __str__(self): - return f"Icon(id={self.id}, title={self.title})" \ No newline at end of file + return f"Icon(id={self.id}, title={self.title})" diff --git a/blog/domain/post.py b/blog/domain/post.py index 87c778d..666468d 100644 --- a/blog/domain/post.py +++ b/blog/domain/post.py @@ -2,34 +2,42 @@ from dataclasses import dataclass import datetime -from typing import TYPE_CHECKING +import markdown +from typing import TYPE_CHECKING, Optional, List if TYPE_CHECKING: - from blog.category.models import Category - from blog.tags.models import Tag - from blog.user.models import User + from blog.domain.category import Category as CategoryDomain + from blog.domain.tag import Tag as TagDomain + from blog.domain.user import User as UserDomain + + +MARKDOWN_EXTENSIONS = ["markdown.extensions.fenced_code"] @dataclass class Post: """Domain model for blog post.""" - id: int | None = None + id: Optional[int] = None pagetitle: str = "" alias: str = "" content: str = "" - createdon: datetime.datetime | None = None - publishedon: datetime.datetime | None = None - category_id: int | None = None - user_id: int | None = None + createdon: Optional[datetime.datetime] = None + publishedon: Optional[datetime.datetime] = None + category_id: Optional[int] = None + user_id: Optional[int] = None # These would typically be loaded separately in a real implementation # to avoid circular dependencies - user: "User | None" = None - category: "Category | None" = None - tags: "list[Tag] | None" = None + user: "Optional[UserDomain]" = None + category: "Optional[CategoryDomain]" = None + tags: "Optional[List[TagDomain]]" = None def __post_init__(self): if self.createdon is None: self.createdon = datetime.datetime.now(datetime.timezone.utc) # Don't set default for publishedon - it should be None for unpublished posts + + @property + def markdown(self): + return markdown.markdown(self.content or "", extensions=MARKDOWN_EXTENSIONS) diff --git a/blog/domain/tag.py b/blog/domain/tag.py index 98c753b..36c6806 100644 --- a/blog/domain/tag.py +++ b/blog/domain/tag.py @@ -2,21 +2,21 @@ from dataclasses import dataclass import typing -from typing import TYPE_CHECKING +from typing import TYPE_CHECKING, Optional, List if TYPE_CHECKING: - from blog.post.models import Post + from blog.domain.post import Post as PostDomain @dataclass class Tag: """Domain model for blog tag.""" - id: int | None = None + id: Optional[int] = None title: str = "" alias: str = "" - posts: "list[Post] | None" = None + posts: "Optional[List[PostDomain]]" = None @typing.override def __str__(self): diff --git a/blog/domain/user.py b/blog/domain/user.py index 0d7aec3..e4f5478 100644 --- a/blog/domain/user.py +++ b/blog/domain/user.py @@ -6,7 +6,11 @@ from typing import TYPE_CHECKING if TYPE_CHECKING: - from blog.post.models import Post + from blog.domain.post import Post as PostDomain + + Post = PostDomain +else: + Post = "Post" @dataclass @@ -18,7 +22,7 @@ class User: password: str = "" authenticated: bool = False createdon: datetime.datetime | None = None - posts: "list[Post] | None" = None + posts: list[Post] | None = None def __post_init__(self): if self.createdon is None: diff --git a/blog/post/models.py b/blog/post/models.py index 2fc1c7b..89c7bb4 100644 --- a/blog/post/models.py +++ b/blog/post/models.py @@ -1,15 +1,18 @@ # blog/posts/models.py import typing +from datetime import datetime from typing import TYPE_CHECKING import markdown -from sqlalchemy.orm import relationship +from sqlalchemy.orm import Mapped, relationship from blog.extensions import db from blog.infrastructure.database import get_posts_table, get_posts_tags_table if TYPE_CHECKING: - pass + from blog.category.models import Category + from blog.user.models import User + from blog.tags.models import Tag MARKDOWN_EXTENSIONS = ["markdown.extensions.fenced_code"] @@ -20,15 +23,25 @@ class Post(db.Model): __table__ = get_posts_table(db.metadata) - user = relationship("User", back_populates="posts") - category = relationship("Category", back_populates="posts") - tags = relationship( + # Type annotations for table columns + id: Mapped[int] + pagetitle: Mapped[str] + alias: Mapped[str] + content: Mapped[str | None] + createdon: Mapped[datetime | None] + publishedon: Mapped[datetime | None] + category_id: Mapped[int | None] + user_id: Mapped[int | None] + + user: Mapped["User"] = relationship("User", back_populates="posts") + category: Mapped["Category"] = relationship("Category", back_populates="posts") + tags: Mapped[list["Tag"]] = relationship( "Tag", secondary=get_posts_tags_table(db.metadata), back_populates="posts" ) @property def markdown(self): - return markdown.markdown(self.content, extensions=MARKDOWN_EXTENSIONS) + return markdown.markdown(self.content or "", extensions=MARKDOWN_EXTENSIONS) @typing.override def __str__(self): @@ -40,10 +53,10 @@ class Icon(db.Model): __tablename__ = "icons" # pyright: ignore[reportUnannotatedClassAttribute] - id = db.Column(db.Integer, primary_key=True) - title = db.Column(db.String(255), nullable=False, unique=True) - url = db.Column(db.String(255), nullable=False, unique=True) - content = db.Column(db.Text) + id: Mapped[int] = db.Column(db.Integer, primary_key=True) + title: Mapped[str] = db.Column(db.String(255), nullable=False, unique=True) + url: Mapped[str] = db.Column(db.String(255), nullable=False, unique=True) + content: Mapped[str | None] = db.Column(db.Text) def __str__(self): return f"{self.id} {self.title}" diff --git a/blog/post/views.py b/blog/post/views.py index 23df2ab..0c841b1 100644 --- a/blog/post/views.py +++ b/blog/post/views.py @@ -2,7 +2,6 @@ from functools import wraps import markdown -import sqlalchemy as sa from flask import ( Blueprint, current_app, @@ -14,14 +13,8 @@ ) from blog.extensions import flask_sitemap -from blog import cache, db -from blog.post.models import Post, Icon -from blog.repos.post import PostRepository -from blog.repos.category import CategoryRepository -from blog.repos.icon import IconRepository -from blog.services.post import PostService -from blog.services.category import CategoryService -from blog.services.icon import IconService +from blog import cache +from blog.services.factory import ServiceFactory post = Blueprint("postb", __name__) @@ -29,16 +22,15 @@ def pages_gen(f): @wraps(f) def decorated_function(*args, **kwargs): - # Use service layer instead of direct database access - from blog.services.factory import ServiceFactory - + # Use service layer for business logic and domain models + page_category = current_app.config["PAGE_CATEGORY"] - - # Get posts using PostService + + # Get posts using PostService for domain models post_service = ServiceFactory.create_post_service() - pages = post_service.get_page_posts_orm(page_category) + pages = post_service.get_page_posts(page_category) - # Get icons using IconService + # Get icons using IconService for ORM models (needed for specific use cases) icon_service = ServiceFactory.create_icon_service() icons = icon_service.get_all_icons_orm() @@ -51,11 +43,10 @@ def decorated_function(*args, **kwargs): @cache.cached(timeout=50) @pages_gen def index(**kwargs): - # Use service layer instead of direct database access - from blog.services.factory import ServiceFactory - + # Use service layer for domain models + post_service = ServiceFactory.create_post_service() - posts = post_service.get_published_posts_orm() + posts = post_service.get_published_posts() return render_template("posts.html", posts=posts, **kwargs) @@ -63,11 +54,14 @@ def index(**kwargs): @cache.cached(timeout=50) @pages_gen def view(alias=None, **kwargs): - # Use service layer instead of direct database access - from blog.services.factory import ServiceFactory - + # Use service layer for domain models + if alias is None: + from flask import abort + + abort(404) + post_service = ServiceFactory.create_post_service() - post = post_service.get_post_by_alias_orm(alias) + post = post_service.get_post_by_alias(alias) if not post: # Handle 404 case from flask import abort @@ -84,14 +78,11 @@ def view(alias=None, **kwargs): abort(404) - # Load category object if needed using service layer + # Load category object if needed using service page_category_obj = None if post.category_id: - from blog.category.models import Category - - # Use CategoryService instead of direct database access category_service = ServiceFactory.create_category_service() - page_category_obj = category_service.get_category_by_id_orm(post.category_id) + page_category_obj = category_service.get_category_by_id(post.category_id) if page_category_obj and page_category_obj.template: return render_template(page_category_obj.template, post=post, **kwargs) @@ -100,19 +91,18 @@ def view(alias=None, **kwargs): @flask_sitemap.register_generator def site_map_gen(): - # Use service layer instead of direct database access - from blog.services.factory import ServiceFactory - + # Use service layer for domain models + page_category = current_app.config["PAGE_CATEGORY"] - + # Get pages using PostService post_service = ServiceFactory.create_post_service() - pages = post_service.get_page_posts_orm(page_category) + pages = post_service.get_page_posts(page_category) for page in pages: yield url_for("postb.view", alias=page.alias) - + # Get posts using PostService - posts = post_service.get_published_posts_orm() + posts = post_service.get_published_posts() for post in posts: yield url_for("postb.view", alias=post.alias) @@ -138,12 +128,11 @@ def robots(): @post.route("/rss.xml") @cache.cached(timeout=50) def rss(): - # Use service layer instead of direct database access - from blog.services.factory import ServiceFactory - + # Use service layer for domain models + post_service = ServiceFactory.create_post_service() - list_posts = post_service.get_published_posts_orm() - + list_posts = post_service.get_published_posts() + date = datetime.datetime.now() rss_xml = render_template("rss.xml", posts=list_posts, date=date) response = make_response(rss_xml) diff --git a/blog/repos/category.py b/blog/repos/category.py index 4f889c6..190f8e0 100644 --- a/blog/repos/category.py +++ b/blog/repos/category.py @@ -1,20 +1,32 @@ """Repository for Category entities.""" import sqlalchemy as sa -from sqlalchemy.orm import Session +from typing import Any from blog.extensions import db from blog.category.models import Category as CategoryORM -from blog.domain.category import Category +from blog.domain.category import Category as CategoryDomain +from blog.domain.post import Post as PostDomain class CategoryRepository: """Repository for Category entities.""" - def __init__(self, session: Session | None = None): + def __init__(self, session: Any = None): self.session = session or db.session - def get_by_id(self, category_id: int) -> Category | None: + def get_category_orm_with_relationships( + self, category_id: int + ) -> CategoryORM | None: + """Get a category ORM model with all its relationships loaded.""" + stmt = ( + sa.select(CategoryORM) + .where(CategoryORM.id == category_id) + .options(sa.orm.joinedload(CategoryORM.posts)) + ) + return self.session.scalar(stmt) + + def get_by_id(self, category_id: int) -> CategoryDomain | None: """Get a category by its ID.""" stmt = sa.select(CategoryORM).where(CategoryORM.id == category_id) category_orm = self.session.scalar(stmt) @@ -22,7 +34,7 @@ def get_by_id(self, category_id: int) -> Category | None: return self._to_domain_model(category_orm) return None - def get_by_alias(self, alias: str) -> Category | None: + def get_by_alias(self, alias: str) -> CategoryDomain | None: """Get a category by its alias.""" stmt = sa.select(CategoryORM).where(CategoryORM.alias == alias) category_orm = self.session.scalar(stmt) @@ -30,19 +42,19 @@ def get_by_alias(self, alias: str) -> Category | None: return self._to_domain_model(category_orm) return None - def get_all(self) -> list[Category]: + def get_all(self) -> list[CategoryDomain]: """Get all categories.""" stmt = sa.select(CategoryORM) - categories_orm = self.session.scalars(stmt).all() + categories_orm = list(self.session.scalars(stmt).all()) return [self._to_domain_model(category_orm) for category_orm in categories_orm] - def get_categories_with_posts(self) -> list[Category]: + def get_categories_with_posts(self) -> list[CategoryDomain]: """Get all categories with their posts.""" stmt = sa.select(CategoryORM).options(sa.orm.joinedload(CategoryORM.posts)) - categories_orm = self.session.scalars(stmt).unique().all() + categories_orm = list(self.session.scalars(stmt).unique().all()) return [self._to_domain_model(category_orm) for category_orm in categories_orm] - def create(self, category: Category) -> Category: + def create(self, category: CategoryDomain) -> CategoryDomain: """Create a new category.""" category_orm = CategoryORM() category_orm.title = category.title @@ -55,7 +67,7 @@ def create(self, category: Category) -> Category: category.id = category_orm.id return category - def update(self, category: Category) -> Category: + def update(self, category: CategoryDomain) -> CategoryDomain: """Update an existing category.""" stmt = sa.select(CategoryORM).where(CategoryORM.id == category.id) category_orm = self.session.scalar(stmt) @@ -79,11 +91,32 @@ def delete(self, category_id: int) -> bool: return True return False - def _to_domain_model(self, category_orm: CategoryORM) -> Category: + def _to_domain_model(self, category_orm: CategoryORM) -> CategoryDomain: """Convert ORM model to domain model.""" - return Category( + # Convert related posts if they exist + posts = None + if category_orm.posts: + posts = [ + PostDomain( + id=post_orm.id, + pagetitle=post_orm.pagetitle or "", + alias=post_orm.alias or "", + content=post_orm.content or "", + createdon=post_orm.createdon, + publishedon=post_orm.publishedon, + category_id=post_orm.category_id, + user_id=post_orm.user_id, + user=None, # Avoid circular references + category=None, # Avoid circular references + tags=None, # Avoid circular references + ) + for post_orm in category_orm.posts + ] + + return CategoryDomain( id=category_orm.id, - title=category_orm.title, - alias=category_orm.alias, + title=category_orm.title or "", + alias=category_orm.alias or "", template=category_orm.template, + posts=posts, ) diff --git a/blog/repos/icon.py b/blog/repos/icon.py index 54d5fc1..509dba2 100644 --- a/blog/repos/icon.py +++ b/blog/repos/icon.py @@ -1,7 +1,7 @@ """Repository for Icon entities.""" import sqlalchemy as sa -from sqlalchemy.orm import Session +from typing import Any from blog.extensions import db from blog.post.models import Icon as IconORM @@ -11,9 +11,19 @@ class IconRepository: """Repository for Icon entities.""" - def __init__(self, session: Session | None = None): + def __init__(self, session: Any = None): self.session = session or db.session + def get_icon_orm_by_id(self, icon_id: int) -> IconORM | None: + """Get an icon ORM model by its ID. Used for specific use cases requiring ORM models.""" + stmt = sa.select(IconORM).where(IconORM.id == icon_id) + return self.session.scalar(stmt) + + def get_all_icons_orm(self) -> list[IconORM]: + """Get all icons as ORM models. Used for specific use cases requiring ORM models.""" + stmt = sa.select(IconORM) + return list(self.session.scalars(stmt).all()) + def get_by_id(self, icon_id: int) -> Icon | None: """Get an icon by its ID.""" stmt = sa.select(IconORM).where(IconORM.id == icon_id) @@ -33,7 +43,7 @@ def get_by_title(self, title: str) -> Icon | None: def get_all(self) -> list[Icon]: """Get all icons.""" stmt = sa.select(IconORM) - icons_orm = self.session.scalars(stmt).all() + icons_orm = list(self.session.scalars(stmt).all()) return [self._to_domain_model(icon_orm) for icon_orm in icons_orm] def create(self, icon: Icon) -> Icon: @@ -78,4 +88,4 @@ def _to_domain_model(self, icon_orm: IconORM) -> Icon: title=icon_orm.title, url=icon_orm.url, content=icon_orm.content, - ) \ No newline at end of file + ) diff --git a/blog/repos/post.py b/blog/repos/post.py index 344d693..7cbbbcc 100644 --- a/blog/repos/post.py +++ b/blog/repos/post.py @@ -1,20 +1,36 @@ """Repository for Post entities.""" import sqlalchemy as sa -from sqlalchemy.orm import Session +from typing import Any from blog.extensions import db from blog.post.models import Post as PostORM -from blog.domain.post import Post +from blog.domain.post import Post as PostDomain +from blog.domain.user import User as UserDomain +from blog.domain.category import Category as CategoryDomain +from blog.domain.tag import Tag as TagDomain class PostRepository: """Repository for Post entities.""" - def __init__(self, session: Session | None = None): + def __init__(self, session: Any = None): self.session = session or db.session - def get_by_id(self, post_id: int) -> Post | None: + def get_post_orm_with_relationships(self, post_id: int) -> PostORM | None: + """Get a post ORM model with all its relationships loaded.""" + stmt = ( + sa.select(PostORM) + .where(PostORM.id == post_id) + .options( + sa.orm.joinedload(PostORM.user), + sa.orm.joinedload(PostORM.category), + sa.orm.joinedload(PostORM.tags), + ) + ) + return self.session.scalar(stmt) + + def get_by_id(self, post_id: int) -> PostDomain | None: """Get a post by its ID.""" stmt = sa.select(PostORM).where(PostORM.id == post_id) post_orm = self.session.scalar(stmt) @@ -22,7 +38,7 @@ def get_by_id(self, post_id: int) -> Post | None: return self._to_domain_model(post_orm) return None - def get_by_alias(self, alias: str) -> Post | None: + def get_by_alias(self, alias: str) -> PostDomain | None: """Get a post by its alias.""" stmt = sa.select(PostORM).where(PostORM.alias == alias) post_orm = self.session.scalar(stmt) @@ -30,13 +46,13 @@ def get_by_alias(self, alias: str) -> Post | None: return self._to_domain_model(post_orm) return None - def get_all(self) -> list[Post]: + def get_all(self) -> list[PostDomain]: """Get all posts.""" stmt = sa.select(PostORM) - posts_orm = self.session.scalars(stmt).all() + posts_orm = list(self.session.scalars(stmt).all()) return [self._to_domain_model(post_orm) for post_orm in posts_orm] - def get_published_posts(self) -> list[Post]: + def get_published_posts(self) -> list[PostDomain]: """Get all published posts ordered by published date.""" stmt = ( sa.select(PostORM) @@ -46,16 +62,16 @@ def get_published_posts(self) -> list[Post]: ) .order_by(PostORM.publishedon.desc()) ) - posts_orm = self.session.scalars(stmt).all() + posts_orm = list(self.session.scalars(stmt).all()) return [self._to_domain_model(post_orm) for post_orm in posts_orm] - def get_page_posts(self, page_category_ids: list[int]) -> list[Post]: + def get_page_posts(self, page_category_ids: list[int]) -> list[PostDomain]: """Get posts that are pages (in specific categories).""" stmt = sa.select(PostORM).where(PostORM.category_id.in_(page_category_ids)) - posts_orm = self.session.scalars(stmt).all() + posts_orm = list(self.session.scalars(stmt).all()) return [self._to_domain_model(post_orm) for post_orm in posts_orm] - def create(self, post: Post) -> Post: + def create(self, post: PostDomain) -> PostDomain: """Create a new post.""" post_orm = PostORM() post_orm.pagetitle = post.pagetitle @@ -70,12 +86,20 @@ def create(self, post: Post) -> Post: post_orm.category_id = post.category_id if post.user_id is not None: post_orm.user_id = post.user_id + + # Handle tags relationship if provided + if post.tags: + # For now, we'll just set the tags field to an empty list + # In a real implementation, we would need to handle the many-to-many relationship + # This is a limitation of the current domain model design + pass + self.session.add(post_orm) self.session.flush() # Get the ID without committing post.id = post_orm.id return post - def update(self, post: Post) -> Post: + def update(self, post: PostDomain) -> PostDomain: """Update an existing post.""" stmt = sa.select(PostORM).where(PostORM.id == post.id) post_orm = self.session.scalar(stmt) @@ -106,15 +130,56 @@ def delete(self, post_id: int) -> bool: return True return False - def _to_domain_model(self, post_orm: PostORM) -> Post: + def _to_domain_model(self, post_orm: PostORM) -> PostDomain: """Convert ORM model to domain model.""" - return Post( + # Convert related user if it exists + user = None + if post_orm.user: + user = UserDomain( + id=post_orm.user.id, + name=post_orm.user.name or "", + password=post_orm.user.password or "", + authenticated=bool(post_orm.user.authenticated) + if post_orm.user.authenticated is not None + else False, + createdon=post_orm.user.createdon, + posts=None, # Avoid circular references + ) + + # Convert related category if it exists + category = None + if post_orm.category: + category = CategoryDomain( + id=post_orm.category.id, + title=post_orm.category.title or "", + alias=post_orm.category.alias or "", + template=post_orm.category.template, + posts=None, # Avoid circular references + ) + + # Convert related tags if they exist + tags = None + if post_orm.tags: + tags = [ + TagDomain( + id=tag_orm.id, + title=tag_orm.title or "", + alias=tag_orm.alias or "", + posts=None, # Avoid circular references + ) + for tag_orm in post_orm.tags + ] + + return PostDomain( id=post_orm.id, - pagetitle=post_orm.pagetitle, - alias=post_orm.alias, - content=post_orm.content, + pagetitle=post_orm.pagetitle or "", + alias=post_orm.alias or "", + content=post_orm.content or "", createdon=post_orm.createdon, publishedon=post_orm.publishedon, category_id=post_orm.category_id, user_id=post_orm.user_id, + user=user, + category=category, + tags=tags, ) diff --git a/blog/repos/tag.py b/blog/repos/tag.py index 622a316..a1e8047 100644 --- a/blog/repos/tag.py +++ b/blog/repos/tag.py @@ -1,20 +1,30 @@ """Repository for Tag entities.""" import sqlalchemy as sa -from sqlalchemy.orm import Session +from typing import Any from blog.extensions import db from blog.tags.models import Tag as TagORM -from blog.domain.tag import Tag +from blog.domain.tag import Tag as TagDomain +from blog.domain.post import Post as PostDomain class TagRepository: """Repository for Tag entities.""" - def __init__(self, session: Session | None = None): + def __init__(self, session: Any = None): self.session = session or db.session - def get_by_id(self, tag_id: int) -> Tag | None: + def get_tag_orm_with_relationships(self, tag_id: int) -> TagORM | None: + """Get a tag ORM model with all its relationships loaded.""" + stmt = ( + sa.select(TagORM) + .where(TagORM.id == tag_id) + .options(sa.orm.joinedload(TagORM.posts)) + ) + return self.session.scalar(stmt) + + def get_by_id(self, tag_id: int) -> TagDomain | None: """Get a tag by its ID.""" stmt = sa.select(TagORM).where(TagORM.id == tag_id) tag_orm = self.session.scalar(stmt) @@ -22,7 +32,7 @@ def get_by_id(self, tag_id: int) -> Tag | None: return self._to_domain_model(tag_orm) return None - def get_by_alias(self, alias: str) -> Tag | None: + def get_by_alias(self, alias: str) -> TagDomain | None: """Get a tag by its alias.""" stmt = sa.select(TagORM).where(TagORM.alias == alias) tag_orm = self.session.scalar(stmt) @@ -30,19 +40,19 @@ def get_by_alias(self, alias: str) -> Tag | None: return self._to_domain_model(tag_orm) return None - def get_all(self) -> list[Tag]: + def get_all(self) -> list[TagDomain]: """Get all tags.""" stmt = sa.select(TagORM) - tags_orm = self.session.scalars(stmt).all() + tags_orm = list(self.session.scalars(stmt).all()) return [self._to_domain_model(tag_orm) for tag_orm in tags_orm] - def get_tags_with_posts(self) -> list[Tag]: + def get_tags_with_posts(self) -> list[TagDomain]: """Get all tags with their posts.""" stmt = sa.select(TagORM).options(sa.orm.joinedload(TagORM.posts)) - tags_orm = self.session.scalars(stmt).unique().all() + tags_orm = list(self.session.scalars(stmt).unique().all()) return [self._to_domain_model(tag_orm) for tag_orm in tags_orm] - def create(self, tag: Tag) -> Tag: + def create(self, tag: TagDomain) -> TagDomain: """Create a new tag.""" tag_orm = TagORM() tag_orm.title = tag.title @@ -52,7 +62,7 @@ def create(self, tag: Tag) -> Tag: tag.id = tag_orm.id return tag - def update(self, tag: Tag) -> Tag: + def update(self, tag: TagDomain) -> TagDomain: """Update an existing tag.""" stmt = sa.select(TagORM).where(TagORM.id == tag.id) tag_orm = self.session.scalar(stmt) @@ -73,10 +83,31 @@ def delete(self, tag_id: int) -> bool: return True return False - def _to_domain_model(self, tag_orm: TagORM) -> Tag: + def _to_domain_model(self, tag_orm: TagORM) -> TagDomain: """Convert ORM model to domain model.""" - return Tag( + # Convert related posts if they exist + posts = None + if tag_orm.posts: + posts = [ + PostDomain( + id=post_orm.id, + pagetitle=post_orm.pagetitle or "", + alias=post_orm.alias or "", + content=post_orm.content or "", + createdon=post_orm.createdon, + publishedon=post_orm.publishedon, + category_id=post_orm.category_id, + user_id=post_orm.user_id, + user=None, # Avoid circular references + category=None, # Avoid circular references + tags=None, # Avoid circular references + ) + for post_orm in tag_orm.posts + ] + + return TagDomain( id=tag_orm.id, - title=tag_orm.title, - alias=tag_orm.alias, + title=tag_orm.title or "", + alias=tag_orm.alias or "", + posts=posts, ) diff --git a/blog/repos/user.py b/blog/repos/user.py index 9c42044..a9d5d8e 100644 --- a/blog/repos/user.py +++ b/blog/repos/user.py @@ -1,20 +1,40 @@ """Repository for User entities.""" import sqlalchemy as sa -from sqlalchemy.orm import Session +from typing import Any from blog.extensions import db from blog.user.models import User as UserORM -from blog.domain.user import User +from blog.domain.user import User as UserDomain +from blog.domain.post import Post as PostDomain class UserRepository: """Repository for User entities.""" - def __init__(self, session: Session | None = None): + def __init__(self, session: Any = None): self.session = session or db.session - def get_by_id(self, user_id: int) -> User | None: + def get_user_orm_with_relationships(self, user_id: int) -> UserORM | None: + """Get a user ORM model with all its relationships loaded.""" + stmt = ( + sa.select(UserORM) + .where(UserORM.id == user_id) + .options(sa.orm.joinedload(UserORM.posts)) + ) + return self.session.scalar(stmt) + + def get_user_orm_by_id(self, user_id: int) -> UserORM | None: + """Get a user ORM model by its ID. Used for Flask-Login compatibility.""" + stmt = sa.select(UserORM).where(UserORM.id == user_id) + return self.session.scalar(stmt) + + def get_user_orm_by_name(self, name: str) -> UserORM | None: + """Get a user ORM model by their name. Used for Flask-Login compatibility.""" + stmt = sa.select(UserORM).where(UserORM.name == name) + return self.session.scalar(stmt) + + def get_by_id(self, user_id: int) -> UserDomain | None: """Get a user by its ID.""" stmt = sa.select(UserORM).where(UserORM.id == user_id) user_orm = self.session.scalar(stmt) @@ -22,7 +42,7 @@ def get_by_id(self, user_id: int) -> User | None: return self._to_domain_model(user_orm) return None - def get_by_name(self, name: str) -> User | None: + def get_by_name(self, name: str) -> UserDomain | None: """Get a user by their name.""" stmt = sa.select(UserORM).where(UserORM.name == name) user_orm = self.session.scalar(stmt) @@ -30,19 +50,19 @@ def get_by_name(self, name: str) -> User | None: return self._to_domain_model(user_orm) return None - def get_all(self) -> list[User]: + def get_all(self) -> list[UserDomain]: """Get all users.""" stmt = sa.select(UserORM) users_orm = self.session.scalars(stmt).all() return [self._to_domain_model(user_orm) for user_orm in users_orm] - def get_users_with_posts(self) -> list[User]: + def get_users_with_posts(self) -> list[UserDomain]: """Get all users with their posts.""" stmt = sa.select(UserORM).options(sa.orm.joinedload(UserORM.posts)) users_orm = self.session.scalars(stmt).unique().all() return [self._to_domain_model(user_orm) for user_orm in users_orm] - def create(self, user: User) -> User: + def create(self, user: UserDomain) -> UserDomain: """Create a new user.""" user_orm = UserORM() user_orm.name = user.name @@ -59,7 +79,7 @@ def create(self, user: User) -> User: user.id = user_orm.id return user - def update(self, user: User) -> User: + def update(self, user: UserDomain) -> UserDomain: """Update an existing user.""" stmt = sa.select(UserORM).where(UserORM.id == user.id) user_orm = self.session.scalar(stmt) @@ -87,7 +107,7 @@ def delete(self, user_id: int) -> bool: return True return False - def authenticate(self, name: str, password: str) -> User | None: + def authenticate(self, name: str, password: str) -> UserDomain | None: """Authenticate a user by name and password.""" stmt = sa.select(UserORM).where(UserORM.name == name) user_orm = self.session.scalar(stmt) @@ -95,14 +115,35 @@ def authenticate(self, name: str, password: str) -> User | None: return self._to_domain_model(user_orm) return None - def _to_domain_model(self, user_orm: UserORM) -> User: + def _to_domain_model(self, user_orm: UserORM) -> UserDomain: """Convert ORM model to domain model.""" - return User( + # Convert related posts if they exist + posts = None + if user_orm.posts: + posts = [ + PostDomain( + id=post_orm.id, + pagetitle=post_orm.pagetitle or "", + alias=post_orm.alias or "", + content=post_orm.content or "", + createdon=post_orm.createdon, + publishedon=post_orm.publishedon, + category_id=post_orm.category_id, + user_id=post_orm.user_id, + user=None, # Avoid circular references + category=None, # Avoid circular references + tags=None, # Avoid circular references + ) + for post_orm in user_orm.posts + ] + + return UserDomain( id=user_orm.id, - name=user_orm.name, - password=user_orm.password, - authenticated=user_orm.authenticated + name=user_orm.name or "", + password=user_orm.password or "", + authenticated=bool(user_orm.authenticated) if user_orm.authenticated is not None else False, createdon=user_orm.createdon, + posts=posts, ) diff --git a/blog/services/category.py b/blog/services/category.py index 5369f0b..ead20c9 100644 --- a/blog/services/category.py +++ b/blog/services/category.py @@ -3,13 +3,11 @@ from typing import List, Optional from blog.repos.category import CategoryRepository from blog.domain.category import Category -from blog.category.models import Category as CategoryORM -from blog.extensions import db -import sqlalchemy as sa class CategoryServiceError(Exception): """Base exception for CategoryService errors.""" + pass @@ -55,31 +53,7 @@ def delete_category(self, category_id: int) -> bool: """Delete a category by its ID.""" try: return self.category_repository.delete(category_id) - except Exception as e: + except Exception: # Log the error and return False to indicate failure # In a real application, you might want to log this return False - - def get_category_by_id_orm(self, category_id: int) -> Optional[CategoryORM]: - """Get a category by its ID as ORM model (for compatibility with views).""" - domain_category = self.get_category_by_id(category_id) - if domain_category: - return self._to_orm_model(domain_category) - return None - - def _to_orm_model(self, category: Category) -> CategoryORM: - """Convert domain model to ORM model by loading from database.""" - if category.id: - # Load the full ORM model from database to get relationships - stmt = sa.select(CategoryORM).where(CategoryORM.id == category.id) - category_orm = db.session.scalar(stmt) - if category_orm: - return category_orm - - # If we can't load from database, create a new instance - category_orm = CategoryORM() - category_orm.id = category.id or 0 - category_orm.title = category.title - category_orm.alias = category.alias - category_orm.template = category.template - return category_orm \ No newline at end of file diff --git a/blog/services/factory.py b/blog/services/factory.py index e84dfa7..87f8d9c 100644 --- a/blog/services/factory.py +++ b/blog/services/factory.py @@ -1,5 +1,6 @@ """Service factory for creating service instances with proper dependency injection.""" +from blog.extensions import db from blog.repos.post import PostRepository from blog.repos.category import CategoryRepository from blog.repos.icon import IconRepository @@ -18,29 +19,29 @@ class ServiceFactory: @staticmethod def create_post_service(): """Create a PostService instance with its dependencies.""" - post_repository = PostRepository() + post_repository = PostRepository(db.session) return PostService(post_repository) @staticmethod def create_category_service(): """Create a CategoryService instance with its dependencies.""" - category_repository = CategoryRepository() + category_repository = CategoryRepository(db.session) return CategoryService(category_repository) @staticmethod def create_icon_service(): """Create an IconService instance with its dependencies.""" - icon_repository = IconRepository() + icon_repository = IconRepository(db.session) return IconService(icon_repository) @staticmethod def create_tag_service(): """Create a TagService instance with its dependencies.""" - tag_repository = TagRepository() + tag_repository = TagRepository(db.session) return TagService(tag_repository) @staticmethod def create_user_service(): """Create a UserService instance with its dependencies.""" - user_repository = UserRepository() - return UserService(user_repository) \ No newline at end of file + user_repository = UserRepository(db.session) + return UserService(user_repository) diff --git a/blog/services/icon.py b/blog/services/icon.py index 4ec0669..a4f0e87 100644 --- a/blog/services/icon.py +++ b/blog/services/icon.py @@ -3,13 +3,11 @@ from typing import List, Optional from blog.repos.icon import IconRepository from blog.domain.icon import Icon -from blog.post.models import Icon as IconORM -from blog.extensions import db -import sqlalchemy as sa class IconServiceError(Exception): """Base exception for IconService errors.""" + pass @@ -19,6 +17,14 @@ class IconService: def __init__(self, icon_repository: IconRepository): self.icon_repository = icon_repository + def get_icon_orm_by_id(self, icon_id: int): + """Get an icon ORM model by its ID. Used for specific use cases requiring ORM models.""" + return self.icon_repository.get_icon_orm_by_id(icon_id) + + def get_all_icons_orm(self) -> List: + """Get all icons as ORM models. Used for specific use cases requiring ORM models.""" + return self.icon_repository.get_all_icons_orm() + def get_icon_by_id(self, icon_id: int) -> Optional[Icon]: """Get an icon by its ID.""" return self.icon_repository.get_by_id(icon_id) @@ -51,29 +57,7 @@ def delete_icon(self, icon_id: int) -> bool: """Delete an icon by its ID.""" try: return self.icon_repository.delete(icon_id) - except Exception as e: + except Exception: # Log the error and return False to indicate failure # In a real application, you might want to log this return False - - def get_all_icons_orm(self) -> List[IconORM]: - """Get all icons as ORM models (for compatibility with views).""" - domain_icons = self.get_all_icons() - return [self._to_orm_model(icon) for icon in domain_icons] - - def _to_orm_model(self, icon: Icon) -> IconORM: - """Convert domain model to ORM model by loading from database.""" - if icon.id: - # Load the full ORM model from database - stmt = sa.select(IconORM).where(IconORM.id == icon.id) - icon_orm = db.session.scalar(stmt) - if icon_orm: - return icon_orm - - # If we can't load from database, create a new instance - icon_orm = IconORM() - icon_orm.id = icon.id or 0 - icon_orm.title = icon.title - icon_orm.url = icon.url - icon_orm.content = icon.content - return icon_orm \ No newline at end of file diff --git a/blog/services/post.py b/blog/services/post.py index c044494..dd9ebb1 100644 --- a/blog/services/post.py +++ b/blog/services/post.py @@ -3,13 +3,11 @@ from typing import List, Optional from blog.repos.post import PostRepository from blog.domain.post import Post -from blog.post.models import Post as PostORM -from blog.extensions import db -import sqlalchemy as sa class PostServiceError(Exception): """Base exception for PostService errors.""" + pass @@ -39,11 +37,6 @@ def get_page_posts(self, page_category_ids: List[int]) -> List[Post]: """Get posts that are pages (in specific categories).""" return self.post_repository.get_page_posts(page_category_ids) - def get_page_posts_orm(self, page_category_ids: List[int]) -> List[PostORM]: - """Get posts that are pages (in specific categories) as ORM models (for compatibility with views).""" - domain_posts = self.get_page_posts(page_category_ids) - return [self._to_orm_model(post) for post in domain_posts] - def create_post(self, post: Post) -> Post: """Create a new post.""" try: @@ -64,40 +57,7 @@ def delete_post(self, post_id: int) -> bool: """Delete a post by its ID.""" try: return self.post_repository.delete(post_id) - except Exception as e: + except Exception: # Log the error and return False to indicate failure # In a real application, you might want to log this return False - - def get_published_posts_orm(self) -> List[PostORM]: - """Get all published posts as ORM models (for compatibility with views).""" - domain_posts = self.get_published_posts() - return [self._to_orm_model(post) for post in domain_posts] - - def get_post_by_alias_orm(self, alias: str) -> Optional[PostORM]: - """Get a post by its alias as ORM model (for compatibility with views).""" - domain_post = self.get_post_by_alias(alias) - if domain_post: - return self._to_orm_model(domain_post) - return None - - def _to_orm_model(self, post: Post) -> PostORM: - """Convert domain model to ORM model by loading from database.""" - if post.id: - # Load the full ORM model from database to get relationships - stmt = sa.select(PostORM).where(PostORM.id == post.id) - post_orm = db.session.scalar(stmt) - if post_orm: - return post_orm - - # If we can't load from database, create a new instance - post_orm = PostORM() - post_orm.id = post.id or 0 - post_orm.pagetitle = post.pagetitle - post_orm.alias = post.alias - post_orm.content = post.content - post_orm.createdon = post.createdon - post_orm.publishedon = post.publishedon - post_orm.category_id = post.category_id - post_orm.user_id = post.user_id - return post_orm diff --git a/blog/services/tag.py b/blog/services/tag.py index e8cd07d..b361184 100644 --- a/blog/services/tag.py +++ b/blog/services/tag.py @@ -3,13 +3,11 @@ from typing import List, Optional from blog.repos.tag import TagRepository from blog.domain.tag import Tag -from blog.tags.models import Tag as TagORM -from blog.extensions import db -import sqlalchemy as sa class TagServiceError(Exception): """Base exception for TagService errors.""" + pass @@ -55,35 +53,7 @@ def delete_tag(self, tag_id: int) -> bool: """Delete a tag by its ID.""" try: return self.tag_repository.delete(tag_id) - except Exception as e: + except Exception: # Log the error and return False to indicate failure # In a real application, you might want to log this return False - - def get_tag_by_alias_orm(self, alias: str) -> Optional[TagORM]: - """Get a tag by its alias as ORM model (for compatibility with views).""" - domain_tag = self.get_tag_by_alias(alias) - if domain_tag: - return self._to_orm_model(domain_tag) - return None - - def get_all_tags_orm(self) -> List[TagORM]: - """Get all tags as ORM models (for compatibility with views).""" - domain_tags = self.get_all_tags() - return [self._to_orm_model(tag) for tag in domain_tags] - - def _to_orm_model(self, tag: Tag) -> TagORM: - """Convert domain model to ORM model by loading from database.""" - if tag.id: - # Load the full ORM model from database to get relationships - stmt = sa.select(TagORM).where(TagORM.id == tag.id) - tag_orm = db.session.scalar(stmt) - if tag_orm: - return tag_orm - - # If we can't load from database, create a new instance - tag_orm = TagORM() - tag_orm.id = tag.id or 0 - tag_orm.title = tag.title - tag_orm.alias = tag.alias - return tag_orm \ No newline at end of file diff --git a/blog/services/user.py b/blog/services/user.py index 7316f01..d69d6ee 100644 --- a/blog/services/user.py +++ b/blog/services/user.py @@ -3,13 +3,11 @@ from typing import List, Optional from blog.repos.user import UserRepository from blog.domain.user import User -from blog.user.models import User as UserORM -from blog.extensions import db -import sqlalchemy as sa class UserServiceError(Exception): """Base exception for UserService errors.""" + pass @@ -23,6 +21,14 @@ def get_user_by_id(self, user_id: int) -> Optional[User]: """Get a user by its ID.""" return self.user_repository.get_by_id(user_id) + def get_user_orm_by_id(self, user_id: int): + """Get a user ORM model by its ID. Used for Flask-Login compatibility.""" + return self.user_repository.get_user_orm_by_id(user_id) + + def get_user_orm_by_name(self, name: str): + """Get a user ORM model by their name. Used for Flask-Login compatibility.""" + return self.user_repository.get_user_orm_by_name(name) + def get_user_by_name(self, name: str) -> Optional[User]: """Get a user by their name.""" return self.user_repository.get_by_name(name) @@ -55,7 +61,7 @@ def delete_user(self, user_id: int) -> bool: """Delete a user by its ID.""" try: return self.user_repository.delete(user_id) - except Exception as e: + except Exception: # Log the error and return False to indicate failure # In a real application, you might want to log this return False @@ -63,35 +69,3 @@ def delete_user(self, user_id: int) -> bool: def authenticate_user(self, name: str, password: str) -> Optional[User]: """Authenticate a user by name and password.""" return self.user_repository.authenticate(name, password) - - def get_user_by_id_orm(self, user_id: int) -> Optional[UserORM]: - """Get a user by its ID as ORM model (for compatibility with views).""" - domain_user = self.get_user_by_id(user_id) - if domain_user: - return self._to_orm_model(domain_user) - return None - - def get_user_by_name_orm(self, name: str) -> Optional[UserORM]: - """Get a user by their name as ORM model (for compatibility with views).""" - domain_user = self.get_user_by_name(name) - if domain_user: - return self._to_orm_model(domain_user) - return None - - def _to_orm_model(self, user: User) -> UserORM: - """Convert domain model to ORM model by loading from database.""" - if user.id: - # Load the full ORM model from database to get relationships - stmt = sa.select(UserORM).where(UserORM.id == user.id) - user_orm = db.session.scalar(stmt) - if user_orm: - return user_orm - - # If we can't load from database, create a new instance - user_orm = UserORM() - user_orm.id = user.id or 0 - user_orm.name = user.name - user_orm.password = user.password - user_orm.authenticated = user.authenticated - user_orm.createdon = user.createdon - return user_orm \ No newline at end of file diff --git a/blog/tags/models.py b/blog/tags/models.py index e8f586c..93fef64 100644 --- a/blog/tags/models.py +++ b/blog/tags/models.py @@ -1,13 +1,13 @@ # blog/tags/models.py from typing import TYPE_CHECKING -from sqlalchemy.orm import relationship +from sqlalchemy.orm import Mapped, relationship from blog.extensions import db from blog.infrastructure.database import get_tags_table, get_posts_tags_table if TYPE_CHECKING: - pass + from blog.post.models import Post class Tag(db.Model): @@ -15,7 +15,12 @@ class Tag(db.Model): __table__ = get_tags_table(db.metadata) - posts = relationship( + # Type annotations for table columns + id: Mapped[int] + title: Mapped[str | None] + alias: Mapped[str | None] + + posts: Mapped[list["Post"]] = relationship( "Post", secondary=get_posts_tags_table(db.metadata), back_populates="tags" ) diff --git a/blog/tags/views.py b/blog/tags/views.py index daa1cf3..34cfe03 100644 --- a/blog/tags/views.py +++ b/blog/tags/views.py @@ -1,9 +1,6 @@ -import sqlalchemy as sa from flask import Blueprint, render_template from blog.post.views import pages_gen -from blog.repos.tag import TagRepository -from blog.services.tag import TagService from blog.services.factory import ServiceFactory tagsb = Blueprint("tagsb", __name__, url_prefix="/tags") @@ -12,19 +9,25 @@ @tagsb.route("/") @pages_gen def index(**kwargs): - # Use service layer instead of direct database access + # Use service layer for domain models tag_service = ServiceFactory.create_tag_service() - tags = tag_service.get_all_tags_orm() + tags = tag_service.get_all_tags() return render_template("tags.html", tags=tags, **kwargs) @tagsb.route("/") @pages_gen def view(alias=None, **kwargs): - # Use service layer instead of direct database access + # Use service layer for domain models + if alias is None: + from flask import abort + + abort(404) + tag_service = ServiceFactory.create_tag_service() - tag = tag_service.get_tag_by_alias_orm(alias) + tag = tag_service.get_tag_by_alias(alias) if not tag: from flask import abort + abort(404) return render_template("posts.html", posts=tag.posts, tag=tag, **kwargs) diff --git a/blog/templates/post.html b/blog/templates/post.html index 55591df..f0bc673 100644 --- a/blog/templates/post.html +++ b/blog/templates/post.html @@ -21,9 +21,11 @@

{{post.pagetitle}}

{% if post.category_id != config['PAGE_CATEGORY'] %}
- {% for tag in post.tags %} - {{tag}} - {% endfor %} + {% if post.tags %} + {% for tag in post.tags %} + {{tag}} + {% endfor %} + {% endif %}
{% endif %}
diff --git a/blog/user/models.py b/blog/user/models.py index 0b197c7..426d8b2 100644 --- a/blog/user/models.py +++ b/blog/user/models.py @@ -1,16 +1,17 @@ """SqlAlchemy models.""" +from datetime import datetime from typing import TYPE_CHECKING from flask_login import UserMixin -from sqlalchemy.orm import relationship +from sqlalchemy.orm import Mapped, relationship from werkzeug.security import check_password_hash, generate_password_hash from blog.extensions import db from blog.infrastructure.database import get_users_table if TYPE_CHECKING: - pass + from blog.post.models import Post class User(UserMixin, db.Model): @@ -18,7 +19,14 @@ class User(UserMixin, db.Model): __table__ = get_users_table(db.metadata) - posts = relationship("Post", back_populates="user") + # Type annotations for table columns + id: Mapped[int] + name: Mapped[str] + password: Mapped[str | None] + authenticated: Mapped[int | None] + createdon: Mapped[datetime | None] + + posts: Mapped[list["Post"]] = relationship("Post", back_populates="user") def set_password(self, password: str) -> None: """Set password hash.""" diff --git a/blog/user/views.py b/blog/user/views.py index a984864..3a77e6a 100644 --- a/blog/user/views.py +++ b/blog/user/views.py @@ -1,11 +1,9 @@ import flask_login -import sqlalchemy as sa from flask import Blueprint, flash, redirect, render_template, url_for from flask_login import current_user, login_user -from blog.extensions import db, login_manager +from blog.extensions import login_manager from blog.user.forms import LoginForm -from blog.user.models import User from blog.services.factory import ServiceFactory @@ -15,9 +13,15 @@ @login_manager.user_loader def load_user(user_id): """Load user by ID for Flask-Login.""" - # Use service layer instead of direct database access + # Use service layer to get user (but Flask-Login needs ORM model) user_service = ServiceFactory.create_user_service() - return user_service.get_user_by_id_orm(int(user_id)) + user = user_service.get_user_by_id(int(user_id)) + if user: + # For Flask-Login compatibility, we need to return an ORM model + # This is one of the few places where we directly access the service layer + # to get an ORM model because Flask-Login requires an ORM model + return user_service.get_user_orm_by_id(int(user_id)) + return None @user_blueprint.route("/login", methods=["GET", "POST"]) @@ -26,15 +30,22 @@ def login(): return redirect("/") form = LoginForm() if form.validate_on_submit(): - # Use service layer instead of direct database access - user_service = ServiceFactory.create_user_service() - user = user_service.authenticate_user(form.name.data, form.password.data) - - if user: - # Convert domain model to ORM model for Flask-Login - user_orm = user_service._to_orm_model(user) - login_user(user_orm) - return redirect(url_for("admin.index")) + # Check that form data is not None before using it + name = form.name.data + password = form.password.data + if name is not None and password is not None: + # Use service layer to authenticate user (returns domain model) + user_service = ServiceFactory.create_user_service() + user = user_service.authenticate_user(name, password) + + if user: + # Get the ORM model directly from service layer for Flask-Login + # This is one of the few places where we directly access the service layer + # to get an ORM model because Flask-Login requires an ORM model + user_orm = user_service.get_user_orm_by_name(name) + if user_orm: + login_user(user_orm) + return redirect(url_for("admin.index")) flash("invalid user o password") return redirect(url_for("userb.login")) return render_template("login.html", form=form) diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index cd7168e..0000000 --- a/requirements.txt +++ /dev/null @@ -1,5 +0,0 @@ -gunicorn -psycopg2-binary -gevent - -python-dotenv diff --git a/tests/test_repositories.py b/tests/test_repositories.py new file mode 100644 index 0000000..b29a427 --- /dev/null +++ b/tests/test_repositories.py @@ -0,0 +1,552 @@ +"""Unit tests for the repository layer.""" + +import pytest +import os +import datetime + +from blog import create_app +from blog.extensions import db +from blog.domain.post import Post as PostDomain +from blog.domain.category import Category as CategoryDomain +from blog.domain.tag import Tag as TagDomain +from blog.domain.user import User as UserDomain +from blog.domain.icon import Icon as IconDomain +from blog.repos.post import PostRepository +from blog.repos.category import CategoryRepository +from blog.repos.tag import TagRepository +from blog.repos.user import UserRepository +from blog.repos.icon import IconRepository +from blog.post.models import Post as PostORM +from blog.category.models import Category as CategoryORM +from blog.tags.models import Tag as TagORM +from blog.user.models import User as UserORM +from blog.post.models import Icon as IconORM + + +@pytest.fixture() +def app(): + os.environ["FLASK_ENV"] = "testing" + app = create_app() + with app.app_context(): + db.create_all() + yield app + db.session.remove() + db.drop_all() + + +@pytest.fixture() +def post_repository(app): + """Create a PostRepository instance for testing.""" + with app.app_context(): + return PostRepository(db.session) + + +@pytest.fixture() +def category_repository(app): + """Create a CategoryRepository instance for testing.""" + with app.app_context(): + return CategoryRepository(db.session) + + +@pytest.fixture() +def tag_repository(app): + """Create a TagRepository instance for testing.""" + with app.app_context(): + return TagRepository(db.session) + + +@pytest.fixture() +def user_repository(app): + """Create a UserRepository instance for testing.""" + with app.app_context(): + return UserRepository(db.session) + + +@pytest.fixture() +def icon_repository(app): + """Create an IconRepository instance for testing.""" + with app.app_context(): + return IconRepository(db.session) + + +class TestPostRepository: + """Test cases for PostRepository.""" + + def test_create_post(self, app, post_repository): + """Test creating a new post.""" + with app.app_context(): + # Create a post domain model + post_domain = PostDomain( + pagetitle="Test Post", + alias="test-post", + content="This is a test post", + createdon=datetime.datetime.now(datetime.timezone.utc), + publishedon=datetime.datetime.now(datetime.timezone.utc), + ) + + # Create the post using the repository + created_post = post_repository.create(post_domain) + + # Verify the post was created + assert created_post.id is not None + assert created_post.pagetitle == "Test Post" + assert created_post.alias == "test-post" + + # Verify the ORM model was created + stmt = db.select(PostORM).where(PostORM.id == created_post.id) + post_orm = db.session.scalar(stmt) + assert post_orm is not None + assert post_orm.pagetitle == "Test Post" + assert post_orm.alias == "test-post" + + def test_get_by_id(self, app, post_repository): + """Test getting a post by ID.""" + with app.app_context(): + # Create a post first + post_domain = PostDomain( + pagetitle="Test Post", + alias="test-post", + content="This is a test post", + createdon=datetime.datetime.now(datetime.timezone.utc), + publishedon=datetime.datetime.now(datetime.timezone.utc), + ) + created_post = post_repository.create(post_domain) + + # Get the post by ID + retrieved_post = post_repository.get_by_id(created_post.id) + + # Verify the post was retrieved + assert retrieved_post is not None + assert retrieved_post.id == created_post.id + assert retrieved_post.pagetitle == "Test Post" + + # Verify it's a domain model, not an ORM model + assert isinstance(retrieved_post, PostDomain) + assert not hasattr(retrieved_post, "_sa_instance_state") + + def test_to_domain_model_mapping(self, app, post_repository): + """Test that _to_domain_model correctly maps ORM to domain model.""" + with app.app_context(): + # Create an ORM model directly + post_orm = PostORM() + post_orm.pagetitle = "Test Post" + post_orm.alias = "test-post" + post_orm.content = "This is a test post" + post_orm.createdon = datetime.datetime.now(datetime.timezone.utc) + post_orm.publishedon = datetime.datetime.now(datetime.timezone.utc) + db.session.add(post_orm) + db.session.flush() + + # Convert to domain model + domain_model = post_repository._to_domain_model(post_orm) + + # Verify the mapping is correct + assert isinstance(domain_model, PostDomain) + assert domain_model.id == post_orm.id + assert domain_model.pagetitle == post_orm.pagetitle + assert domain_model.alias == post_orm.alias + assert domain_model.content == post_orm.content + assert domain_model.createdon == post_orm.createdon + assert domain_model.publishedon == post_orm.publishedon + assert domain_model.category_id == post_orm.category_id + assert domain_model.user_id == post_orm.user_id + + def test_domain_to_orm_mapping(self, app, post_repository): + """Test that domain model properties correctly map to ORM model.""" + with app.app_context(): + # Create a domain model + post_domain = PostDomain( + id=1, + pagetitle="Test Post", + alias="test-post", + content="This is a test post", + createdon=datetime.datetime.now(datetime.timezone.utc), + publishedon=datetime.datetime.now(datetime.timezone.utc), + category_id=1, + user_id=1, + ) + + # Create an ORM model and map properties + post_orm = PostORM() + post_orm.pagetitle = post_domain.pagetitle + post_orm.alias = post_domain.alias + post_orm.content = post_domain.content + post_orm.createdon = post_domain.createdon + post_orm.publishedon = post_domain.publishedon + post_orm.category_id = post_domain.category_id + post_orm.user_id = post_domain.user_id + + # Verify the mapping is correct + assert post_orm.pagetitle == post_domain.pagetitle + assert post_orm.alias == post_domain.alias + assert post_orm.content == post_domain.content + assert post_orm.createdon == post_domain.createdon + assert post_orm.publishedon == post_domain.publishedon + assert post_orm.category_id == post_domain.category_id + assert post_orm.user_id == post_domain.user_id + + +class TestCategoryRepository: + """Test cases for CategoryRepository.""" + + def test_create_category(self, app, category_repository): + """Test creating a new category.""" + with app.app_context(): + # Create a category domain model + category_domain = CategoryDomain( + title="Test Category", alias="test-category" + ) + + # Create the category using the repository + created_category = category_repository.create(category_domain) + + # Verify the category was created + assert created_category.id is not None + assert created_category.title == "Test Category" + assert created_category.alias == "test-category" + + # Verify the ORM model was created + stmt = db.select(CategoryORM).where(CategoryORM.id == created_category.id) + category_orm = db.session.scalar(stmt) + assert category_orm is not None + assert category_orm.title == "Test Category" + assert category_orm.alias == "test-category" + + def test_get_by_id(self, app, category_repository): + """Test getting a category by ID.""" + with app.app_context(): + # Create a category first + category_domain = CategoryDomain( + title="Test Category", alias="test-category" + ) + created_category = category_repository.create(category_domain) + + # Get the category by ID + retrieved_category = category_repository.get_by_id(created_category.id) + + # Verify the category was retrieved correctly + assert retrieved_category is not None + assert retrieved_category.id == created_category.id + assert retrieved_category.title == "Test Category" + + # Verify it's a domain model, not an ORM model + assert isinstance(retrieved_category, CategoryDomain) + assert not hasattr(retrieved_category, "_sa_instance_state") + + def test_to_domain_model_mapping(self, app, category_repository): + """Test that _to_domain_model correctly maps ORM to domain model.""" + with app.app_context(): + # Create an ORM model directly + category_orm = CategoryORM() + category_orm.title = "Test Category" + category_orm.alias = "test-category" + category_orm.template = "test-template" + db.session.add(category_orm) + db.session.flush() + + # Convert to domain model + domain_model = category_repository._to_domain_model(category_orm) + + # Verify the mapping is correct + assert isinstance(domain_model, CategoryDomain) + assert domain_model.id == category_orm.id + assert domain_model.title == category_orm.title + assert domain_model.alias == category_orm.alias + assert domain_model.template == category_orm.template + + def test_domain_to_orm_mapping(self, app, category_repository): + """Test that domain model properties correctly map to ORM model.""" + with app.app_context(): + # Create a domain model + category_domain = CategoryDomain( + id=1, + title="Test Category", + alias="test-category", + template="test-template", + ) + + # Create an ORM model and map properties + category_orm = CategoryORM() + category_orm.title = category_domain.title + category_orm.alias = category_domain.alias + category_orm.template = category_domain.template + + # Verify the mapping is correct + assert category_orm.title == category_domain.title + assert category_orm.alias == category_domain.alias + assert category_orm.template == category_domain.template + + +class TestTagRepository: + """Test cases for TagRepository.""" + + def test_create_tag(self, app, tag_repository): + """Test creating a new tag.""" + with app.app_context(): + # Create a tag domain model + tag_domain = TagDomain(title="Test Tag", alias="test-tag") + + # Create the tag using the repository + created_tag = tag_repository.create(tag_domain) + + # Verify the tag was created + assert created_tag.id is not None + assert created_tag.title == "Test Tag" + assert created_tag.alias == "test-tag" + + # Verify the ORM model was created + stmt = db.select(TagORM).where(TagORM.id == created_tag.id) + tag_orm = db.session.scalar(stmt) + assert tag_orm is not None + assert tag_orm.title == "Test Tag" + assert tag_orm.alias == "test-tag" + + def test_get_by_id(self, app, tag_repository): + """Test getting a tag by ID.""" + with app.app_context(): + # Create a tag first + tag_domain = TagDomain(title="Test Tag", alias="test-tag") + created_tag = tag_repository.create(tag_domain) + + # Get the tag by ID + retrieved_tag = tag_repository.get_by_id(created_tag.id) + + # Verify the tag was retrieved correctly + assert retrieved_tag is not None + assert retrieved_tag.id == created_tag.id + assert retrieved_tag.title == "Test Tag" + + # Verify it's a domain model, not an ORM model + assert isinstance(retrieved_tag, TagDomain) + assert not hasattr(retrieved_tag, "_sa_instance_state") + + def test_to_domain_model_mapping(self, app, tag_repository): + """Test that _to_domain_model correctly maps ORM to domain model.""" + with app.app_context(): + # Create an ORM model directly + tag_orm = TagORM() + tag_orm.title = "Test Tag" + tag_orm.alias = "test-tag" + db.session.add(tag_orm) + db.session.flush() + + # Convert to domain model + domain_model = tag_repository._to_domain_model(tag_orm) + + # Verify the mapping is correct + assert isinstance(domain_model, TagDomain) + assert domain_model.id == tag_orm.id + assert domain_model.title == tag_orm.title + assert domain_model.alias == tag_orm.alias + + def test_domain_to_orm_mapping(self, app, tag_repository): + """Test that domain model properties correctly map to ORM model.""" + with app.app_context(): + # Create a domain model + tag_domain = TagDomain( + id=1, + title="Test Tag", + alias="test-tag", + ) + + # Create an ORM model and map properties + tag_orm = TagORM() + tag_orm.title = tag_domain.title + tag_orm.alias = tag_domain.alias + + # Verify the mapping is correct + assert tag_orm.title == tag_domain.title + assert tag_orm.alias == tag_domain.alias + + +class TestUserRepository: + """Test cases for UserRepository.""" + + def test_create_user(self, app, user_repository): + """Test creating a new user.""" + with app.app_context(): + # Create a user domain model + user_domain = UserDomain(name="testuser", password="testpassword") + + # Create the user using the repository + created_user = user_repository.create(user_domain) + + # Verify the user was created + assert created_user.id is not None + assert created_user.name == "testuser" + + # Verify the ORM model was created + stmt = db.select(UserORM).where(UserORM.id == created_user.id) + user_orm = db.session.scalar(stmt) + assert user_orm is not None + assert user_orm.name == "testuser" + + def test_get_by_id(self, app, user_repository): + """Test getting a user by ID.""" + with app.app_context(): + # Create a user first + user_domain = UserDomain(name="testuser", password="testpassword") + created_user = user_repository.create(user_domain) + + # Get the user by ID + retrieved_user = user_repository.get_by_id(created_user.id) + + # Verify the user was retrieved correctly + assert retrieved_user is not None + assert retrieved_user.id == created_user.id + assert retrieved_user.name == "testuser" + + # Verify it's a domain model, not an ORM model + assert isinstance(retrieved_user, UserDomain) + assert not hasattr(retrieved_user, "_sa_instance_state") + + def test_to_domain_model_mapping(self, app, user_repository): + """Test that _to_domain_model correctly maps ORM to domain model.""" + with app.app_context(): + # Create an ORM model directly + user_orm = UserORM() + user_orm.name = "testuser" + user_orm.password = "testpassword" + user_orm.authenticated = 1 + user_orm.createdon = datetime.datetime.now(datetime.timezone.utc) + db.session.add(user_orm) + db.session.flush() + + # Convert to domain model + domain_model = user_repository._to_domain_model(user_orm) + + # Verify the mapping is correct + assert isinstance(domain_model, UserDomain) + assert domain_model.id == user_orm.id + assert domain_model.name == user_orm.name + assert domain_model.password == user_orm.password + assert domain_model.authenticated == bool(user_orm.authenticated) + assert domain_model.createdon == user_orm.createdon + + def test_domain_to_orm_mapping(self, app, user_repository): + """Test that domain model properties correctly map to ORM model.""" + with app.app_context(): + # Create a domain model + user_domain = UserDomain( + id=1, + name="testuser", + password="testpassword", + authenticated=True, + createdon=datetime.datetime.now(datetime.timezone.utc), + ) + + # Create an ORM model and map properties + user_orm = UserORM() + user_orm.name = user_domain.name + user_orm.password = user_domain.password + user_orm.authenticated = ( + int(user_domain.authenticated) + if user_domain.authenticated is not None + else 0 + ) + user_orm.createdon = user_domain.createdon + + # Verify the mapping is correct + assert user_orm.name == user_domain.name + assert user_orm.password == user_domain.password + assert ( + user_orm.authenticated == int(user_domain.authenticated) + if user_domain.authenticated is not None + else 0 + ) + assert user_orm.createdon == user_domain.createdon + + +class TestIconRepository: + """Test cases for IconRepository.""" + + def test_create_icon(self, app, icon_repository): + """Test creating a new icon.""" + with app.app_context(): + # Create an icon domain model + icon_domain = IconDomain( + title="Test Icon", + url="http://example.com/icon.png", + content="Icon content", + ) + + # Create the icon using the repository + created_icon = icon_repository.create(icon_domain) + + # Verify the icon was created + assert created_icon.id is not None + assert created_icon.title == "Test Icon" + assert created_icon.url == "http://example.com/icon.png" + + # Verify the ORM model was created + stmt = db.select(IconORM).where(IconORM.id == created_icon.id) + icon_orm = db.session.scalar(stmt) + assert icon_orm is not None + assert icon_orm.title == "Test Icon" + assert icon_orm.url == "http://example.com/icon.png" + + def test_get_by_id(self, app, icon_repository): + """Test getting an icon by ID.""" + with app.app_context(): + # Create an icon first + icon_domain = IconDomain( + title="Test Icon", + url="http://example.com/icon.png", + content="Icon content", + ) + created_icon = icon_repository.create(icon_domain) + + # Get the icon by ID + retrieved_icon = icon_repository.get_by_id(created_icon.id) + + # Verify the icon was retrieved correctly + assert retrieved_icon is not None + assert retrieved_icon.id == created_icon.id + assert retrieved_icon.title == "Test Icon" + + # Verify it's a domain model, not an ORM model + assert isinstance(retrieved_icon, IconDomain) + assert not hasattr(retrieved_icon, "_sa_instance_state") + + def test_to_domain_model_mapping(self, app, icon_repository): + """Test that _to_domain_model correctly maps ORM to domain model.""" + with app.app_context(): + # Create an ORM model directly + icon_orm = IconORM() + icon_orm.title = "Test Icon" + icon_orm.url = "http://example.com/icon.png" + icon_orm.content = "Icon content" + db.session.add(icon_orm) + db.session.flush() + + # Convert to domain model + domain_model = icon_repository._to_domain_model(icon_orm) + + # Verify the mapping is correct + assert isinstance(domain_model, IconDomain) + assert domain_model.id == icon_orm.id + assert domain_model.title == icon_orm.title + assert domain_model.url == icon_orm.url + assert domain_model.content == icon_orm.content + + def test_domain_to_orm_mapping(self, app, icon_repository): + """Test that domain model properties correctly map to ORM model.""" + with app.app_context(): + # Create a domain model + icon_domain = IconDomain( + id=1, + title="Test Icon", + url="http://example.com/icon.png", + content="Icon content", + ) + + # Create an ORM model and map properties + icon_orm = IconORM() + icon_orm.title = icon_domain.title + icon_orm.url = icon_domain.url + icon_orm.content = icon_domain.content + + # Verify the mapping is correct + assert icon_orm.title == icon_domain.title + assert icon_orm.url == icon_domain.url + assert icon_orm.content == icon_domain.content diff --git a/tests/test_services.py b/tests/test_services.py new file mode 100644 index 0000000..395e335 --- /dev/null +++ b/tests/test_services.py @@ -0,0 +1,487 @@ +"""Unit tests for the service layer.""" + +import pytest +import os +import datetime + +from blog import create_app +from blog.extensions import db +from blog.domain.post import Post as PostDomain +from blog.domain.category import Category as CategoryDomain +from blog.domain.tag import Tag as TagDomain +from blog.domain.user import User as UserDomain +from blog.domain.icon import Icon as IconDomain +from blog.services.post import PostService, PostServiceError +from blog.services.category import CategoryService +from blog.services.tag import TagService +from blog.services.user import UserService +from blog.services.icon import IconService +from blog.repos.post import PostRepository +from blog.repos.category import CategoryRepository +from blog.repos.tag import TagRepository +from blog.repos.user import UserRepository +from blog.repos.icon import IconRepository + + +@pytest.fixture() +def app(): + os.environ["FLASK_ENV"] = "testing" + app = create_app() + with app.app_context(): + db.create_all() + yield app + db.session.remove() + db.drop_all() + + +@pytest.fixture() +def post_service(app): + """Create a PostService instance for testing.""" + with app.app_context(): + repository = PostRepository(db.session) + return PostService(repository) + + +@pytest.fixture() +def category_service(app): + """Create a CategoryService instance for testing.""" + with app.app_context(): + repository = CategoryRepository(db.session) + return CategoryService(repository) + + +@pytest.fixture() +def tag_service(app): + """Create a TagService instance for testing.""" + with app.app_context(): + repository = TagRepository(db.session) + return TagService(repository) + + +@pytest.fixture() +def user_service(app): + """Create a UserService instance for testing.""" + with app.app_context(): + repository = UserRepository(db.session) + return UserService(repository) + + +@pytest.fixture() +def icon_service(app): + """Create an IconService instance for testing.""" + with app.app_context(): + repository = IconRepository(db.session) + return IconService(repository) + + +class TestPostService: + """Test cases for PostService.""" + + def test_create_post(self, app, post_service): + """Test creating a new post.""" + # Create a post domain model + post_domain = PostDomain( + pagetitle="Test Post", + alias="test-post", + content="This is a test post", + createdon=datetime.datetime.now(datetime.timezone.utc), + publishedon=datetime.datetime.now(datetime.timezone.utc), + ) + + # Create the post using the service + created_post = post_service.create_post(post_domain) + + # Verify the post was created + assert created_post.id is not None + assert created_post.pagetitle == "Test Post" + assert created_post.alias == "test-post" + + def test_service_returns_domain_models_not_orm_models(self, app, post_service): + """Test that service layer methods return domain models, not ORM models.""" + # Create a post first + post_domain = PostDomain( + pagetitle="Test Post", + alias="test-post", + content="This is a test post", + createdon=datetime.datetime.now(datetime.timezone.utc), + publishedon=datetime.datetime.now(datetime.timezone.utc), + ) + created_post = post_service.create_post(post_domain) + + # Verify all service methods return domain models + # 1. get_post_by_id should return a domain model + retrieved_post = post_service.get_post_by_id(created_post.id) + assert isinstance(retrieved_post, PostDomain) + assert not hasattr( + retrieved_post, "_sa_instance_state" + ) # ORM models have this attribute + + # 2. get_post_by_alias should return a domain model + retrieved_post = post_service.get_post_by_alias("test-post") + assert isinstance(retrieved_post, PostDomain) + assert not hasattr(retrieved_post, "_sa_instance_state") + + # 3. get_all_posts should return domain models + posts = post_service.get_all_posts() + assert all(isinstance(post, PostDomain) for post in posts) + assert all(not hasattr(post, "_sa_instance_state") for post in posts) + + # 4. get_published_posts should return domain models + published_posts = post_service.get_published_posts() + assert all(isinstance(post, PostDomain) for post in published_posts) + assert all(not hasattr(post, "_sa_instance_state") for post in published_posts) + + def test_get_post_by_id(self, app, post_service): + """Test getting a post by ID.""" + # Create a post first + post_domain = PostDomain( + pagetitle="Test Post", + alias="test-post", + content="This is a test post", + createdon=datetime.datetime.now(datetime.timezone.utc), + publishedon=datetime.datetime.now(datetime.timezone.utc), + ) + + created_post = post_service.create_post(post_domain) + + # Get the post by ID + retrieved_post = post_service.get_post_by_id(created_post.id) + + # Verify the post was retrieved + assert retrieved_post is not None + assert retrieved_post.id == created_post.id + assert retrieved_post.pagetitle == "Test Post" + + def test_update_post(self, app, post_service): + """Test updating a post.""" + # Create a post first + post_domain = PostDomain( + pagetitle="Test Post", + alias="test-post", + content="This is a test post", + createdon=datetime.datetime.now(datetime.timezone.utc), + publishedon=datetime.datetime.now(datetime.timezone.utc), + ) + created_post = post_service.create_post(post_domain) + + # Update the post + created_post.pagetitle = "Updated Post" + updated_post = post_service.update_post(created_post) + + # Verify the post was updated + assert updated_post.pagetitle == "Updated Post" + + def test_update_nonexistent_post_raises_error(self, app, post_service): + """Test that updating a nonexistent post raises an error.""" + # Try to update a post that doesn't exist + post_domain = PostDomain( + id=99999, # Nonexistent ID + pagetitle="Test Post", + alias="test-post", + content="This is a test post", + ) + + # Verify that updating a nonexistent post raises an error + with pytest.raises(PostServiceError): + post_service.update_post(post_domain) + + def test_delete_post(self, app, post_service): + """Test deleting a post.""" + # Create a post first + post_domain = PostDomain( + pagetitle="Test Post", + alias="test-post", + content="This is a test post", + createdon=datetime.datetime.now(datetime.timezone.utc), + publishedon=datetime.datetime.now(datetime.timezone.utc), + ) + created_post = post_service.create_post(post_domain) + + # Delete the post + result = post_service.delete_post(created_post.id) + + # Verify the post was deleted + assert result is True + + # Verify the post no longer exists + retrieved_post = post_service.get_post_by_id(created_post.id) + assert retrieved_post is None + + def test_delete_nonexistent_post(self, app, post_service): + """Test deleting a nonexistent post.""" + # Try to delete a post that doesn't exist + result = post_service.delete_post(99999) # Nonexistent ID + + # Verify the result is False + assert result is False + + def test_get_post_by_alias(self, app, post_service): + """Test getting a post by alias.""" + # Create a post first + post_domain = PostDomain( + pagetitle="Test Post", + alias="test-post", + content="This is a test post", + createdon=datetime.datetime.now(datetime.timezone.utc), + publishedon=datetime.datetime.now(datetime.timezone.utc), + ) + created_post = post_service.create_post(post_domain) + + # Get the post by alias + retrieved_post = post_service.get_post_by_alias("test-post") + + # Verify the post was retrieved + assert retrieved_post is not None + assert retrieved_post.id == created_post.id + assert retrieved_post.alias == "test-post" + + def test_get_all_posts(self, app, post_service): + """Test getting all posts.""" + # Create a few posts + post1_domain = PostDomain( + pagetitle="Test Post 1", + alias="test-post-1", + content="This is test post 1", + createdon=datetime.datetime.now(datetime.timezone.utc), + publishedon=datetime.datetime.now(datetime.timezone.utc), + ) + post_service.create_post(post1_domain) + + post2_domain = PostDomain( + pagetitle="Test Post 2", + alias="test-post-2", + content="This is test post 2", + createdon=datetime.datetime.now(datetime.timezone.utc), + publishedon=datetime.datetime.now(datetime.timezone.utc), + ) + post_service.create_post(post2_domain) + + # Get all posts + posts = post_service.get_all_posts() + + # Verify we got the posts + assert len(posts) >= 2 + aliases = [post.alias for post in posts] + assert "test-post-1" in aliases + assert "test-post-2" in aliases + + def test_get_published_posts(self, app, post_service): + """Test getting published posts.""" + # Create a published post + published_post_domain = PostDomain( + pagetitle="Published Post", + alias="published-post", + content="This is a published post", + createdon=datetime.datetime.now(datetime.timezone.utc), + publishedon=datetime.datetime.now(datetime.timezone.utc), + ) + post_service.create_post(published_post_domain) + + # Create an unpublished post + unpublished_post_domain = PostDomain( + pagetitle="Unpublished Post", + alias="unpublished-post", + content="This is an unpublished post", + createdon=datetime.datetime.now(datetime.timezone.utc), + # No publishedon field, so it's unpublished + ) + post_service.create_post(unpublished_post_domain) + + # Get published posts + published_posts = post_service.get_published_posts() + + # Verify we only got the published post + assert len(published_posts) >= 1 + aliases = [post.alias for post in published_posts] + assert "published-post" in aliases + assert "unpublished-post" not in aliases + + +class TestCategoryService: + """Test cases for CategoryService.""" + + def test_create_category(self, app, category_service): + """Test creating a new category.""" + with app.app_context(): + # Create a category domain model + category_domain = CategoryDomain( + title="Test Category", alias="test-category" + ) + + # Create the category using the service + created_category = category_service.create_category(category_domain) + + # Verify the category was created + assert created_category.id is not None + assert created_category.title == "Test Category" + assert created_category.alias == "test-category" + + def test_get_category_by_id(self, app, category_service): + """Test getting a category by ID.""" + with app.app_context(): + # Create a category first + category_domain = CategoryDomain( + title="Test Category", alias="test-category" + ) + created_category = category_service.create_category(category_domain) + + # Get the category by ID + retrieved_category = category_service.get_category_by_id( + created_category.id + ) + + # Verify the category was retrieved correctly + assert retrieved_category is not None + assert retrieved_category.id == created_category.id + assert retrieved_category.title == "Test Category" + + def test_service_returns_domain_models_not_orm_models(self, app, category_service): + """Test that service layer methods return domain models, not ORM models.""" + with app.app_context(): + # Create a category first + category_domain = CategoryDomain( + title="Test Category", alias="test-category" + ) + created_category = category_service.create_category(category_domain) + + # Verify all service methods return domain models + # get_category_by_id should return a domain model + retrieved_category = category_service.get_category_by_id( + created_category.id + ) + assert isinstance(retrieved_category, CategoryDomain) + assert not hasattr( + retrieved_category, "_sa_instance_state" + ) # ORM models have this attribute + + +class TestTagService: + """Test cases for TagService.""" + + def test_create_tag(self, app, tag_service): + """Test creating a new tag.""" + with app.app_context(): + # Create a tag domain model + tag_domain = TagDomain(title="Test Tag", alias="test-tag") + + # Create the tag using the service + created_tag = tag_service.create_tag(tag_domain) + + # Verify the tag was created + assert created_tag.id is not None + assert created_tag.title == "Test Tag" + assert created_tag.alias == "test-tag" + + def test_service_returns_domain_models_not_orm_models(self, app, tag_service): + """Test that service layer methods return domain models, not ORM models.""" + with app.app_context(): + # Create a tag first + tag_domain = TagDomain(title="Test Tag", alias="test-tag") + created_tag = tag_service.create_tag(tag_domain) + + # Verify all service methods return domain models + # get_tag_by_id should return a domain model + # Tags don't have a get_by_id method in the current implementation + # But we can verify that the created tag is a domain model + assert isinstance(created_tag, TagDomain) + assert not hasattr( + created_tag, "_sa_instance_state" + ) # ORM models have this attribute + + +class TestUserService: + """Test cases for UserService.""" + + def test_create_user(self, app, user_service): + """Test creating a new user.""" + with app.app_context(): + # Create a user domain model + user_domain = UserDomain(name="testuser", password="testpassword") + + # Create the user using the service + created_user = user_service.create_user(user_domain) + + # Verify the user was created + assert created_user.id is not None + assert created_user.name == "testuser" + + def test_authenticate_user(self, app, user_service): + """Test authenticating a user.""" + with app.app_context(): + # Create a user first + user_domain = UserDomain(name="testuser", password="testpassword") + created_user = user_service.create_user(user_domain) + # Set the password properly (this would normally be done in the repo) + from blog.user.models import User as UserORM + + user_orm = db.session.get(UserORM, created_user.id) + if user_orm: + user_orm.set_password("testpassword") + db.session.commit() + + # Authenticate the user + authenticated_user = user_service.authenticate_user( + "testuser", "testpassword" + ) + + # Verify the user was authenticated + assert authenticated_user is not None + assert authenticated_user.name == "testuser" + + def test_service_returns_domain_models_not_orm_models(self, app, user_service): + """Test that service layer methods return domain models, not ORM models.""" + with app.app_context(): + # Create a user first + user_domain = UserDomain(name="testuser", password="testpassword") + created_user = user_service.create_user(user_domain) + + # Verify all service methods return domain models + # get_user_by_id should return a domain model + # Users don't have a get_by_id method in the current implementation + # But we can verify that the created user is a domain model + assert isinstance(created_user, UserDomain) + assert not hasattr( + created_user, "_sa_instance_state" + ) # ORM models have this attribute + + +class TestIconService: + """Test cases for IconService.""" + + def test_create_icon(self, app, icon_service): + """Test creating a new icon.""" + with app.app_context(): + # Create an icon domain model + icon_domain = IconDomain( + title="Test Icon", + url="http://example.com/icon.png", + content="Icon content", + ) + + # Create the icon using the service + created_icon = icon_service.create_icon(icon_domain) + + # Verify the icon was created + assert created_icon.id is not None + assert created_icon.title == "Test Icon" + assert created_icon.url == "http://example.com/icon.png" + + def test_service_returns_domain_models_not_orm_models(self, app, icon_service): + """Test that service layer methods return domain models, not ORM models.""" + with app.app_context(): + # Create an icon first + icon_domain = IconDomain( + title="Test Icon", + url="http://example.com/icon.png", + content="Icon content", + ) + created_icon = icon_service.create_icon(icon_domain) + + # Verify all service methods return domain models + # get_icon_by_id should return a domain model + # Icons don't have a get_by_id method in the current implementation + # But we can verify that the created icon is a domain model + assert isinstance(created_icon, IconDomain) + assert not hasattr( + created_icon, "_sa_instance_state" + ) # ORM models have this attribute diff --git a/tests/test_tags.py b/tests/test_tags.py index 5e89a1d..736ff2d 100644 --- a/tests/test_tags.py +++ b/tests/test_tags.py @@ -1,10 +1,14 @@ import pytest import os +import datetime from blog import create_app -from blog import db -from blog.post.models import Post -from blog.tags.models import Tag +from blog.extensions import db +from blog.domain.post import Post as PostDomain +from blog.domain.tag import Tag as TagDomain +from blog.services.factory import ServiceFactory +from blog.post.models import Post as PostORM +from blog.tags.models import Tag as TagORM @pytest.fixture() @@ -22,36 +26,49 @@ def test_client(): def test_get_posts_by_tag(test_client): with test_client.application.app_context(): - tag = Tag(title="test-tag", alias="test-tag") # type: ignore - db.session.add(tag) + # Use service layer to create domain models + tag_service = ServiceFactory.create_tag_service() + post_service = ServiceFactory.create_post_service() - post1 = Post( + # Create a tag using domain model + tag_domain = TagDomain(title="test-tag", alias="test-tag") + tag = tag_service.create_tag(tag_domain) + + # Create posts using domain models + post1_domain = PostDomain( pagetitle="Post 1", alias="post-1", content="Content 1", - publishedon=db.func.now(), - ) # type: ignore - post1.tags.append(tag) + publishedon=datetime.datetime.now(datetime.timezone.utc), + ) + post1 = post_service.create_post(post1_domain) - post2 = Post( + post2_domain = PostDomain( pagetitle="Post 2", alias="post-2", content="Content 2", - publishedon=db.func.now(), - ) # type: ignore - post2.tags.append(tag) + publishedon=datetime.datetime.now(datetime.timezone.utc), + ) + post2 = post_service.create_post(post2_domain) - post3 = Post( + post3_domain = PostDomain( pagetitle="Post 3", alias="post-3", content="Content 3", - publishedon=db.func.now(), - ) # type: ignore + publishedon=datetime.datetime.now(datetime.timezone.utc), + ) + post_service.create_post(post3_domain) + + # Manually create the tag-post relationships at the ORM level + # This is a workaround for the current limitation in the domain model approach + tag_orm = db.session.get(TagORM, tag.id) + post1_orm = db.session.get(PostORM, post1.id) + post2_orm = db.session.get(PostORM, post2.id) - db.session.add(post1) - db.session.add(post2) - db.session.add(post3) - db.session.commit() + if tag_orm and post1_orm and post2_orm: + post1_orm.tags.append(tag_orm) + post2_orm.tags.append(tag_orm) + db.session.commit() response = test_client.get("/tags/test-tag") assert response.status_code == 200 @@ -63,21 +80,34 @@ def test_get_posts_by_tag(test_client): def test_post_have_tag(test_client): with test_client.application.app_context(): - tag1 = Tag(title="test-tag1", alias="test-tag1") # type: ignore - db.session.add(tag1) - tag2 = Tag(title="test-tag2", alias="test-tag2") # type: ignore - db.session.add(tag2) + # Use service layer to create domain models + tag_service = ServiceFactory.create_tag_service() + post_service = ServiceFactory.create_post_service() + + # Create tags using domain models + tag1_domain = TagDomain(title="test-tag1", alias="test-tag1") + tag1 = tag_service.create_tag(tag1_domain) - post1 = Post( + tag2_domain = TagDomain(title="test-tag2", alias="test-tag2") + tag_service.create_tag(tag2_domain) + + # Create a post + post1_domain = PostDomain( pagetitle="Post 1", alias="post-1", content="Content 1", - publishedon=db.func.now(), - ) # type: ignore - post1.tags.append(tag1) - - db.session.add(post1) - db.session.commit() + publishedon=datetime.datetime.now(datetime.timezone.utc), + ) + post1 = post_service.create_post(post1_domain) + + # Manually create the tag-post relationship at the ORM level + # This is a workaround for the current limitation in the domain model approach + tag1_orm = db.session.get(TagORM, tag1.id) + post1_orm = db.session.get(PostORM, post1.id) + + if tag1_orm and post1_orm: + post1_orm.tags.append(tag1_orm) + db.session.commit() response = test_client.get("/post-1") assert response.status_code == 200 diff --git a/tests/test_views.py b/tests/test_views.py new file mode 100644 index 0000000..6ee1e1d --- /dev/null +++ b/tests/test_views.py @@ -0,0 +1,150 @@ +"""Integration tests for view functions using domain models.""" + +import pytest +import os +import datetime + +from blog import create_app +from blog.extensions import db +from blog.domain.post import Post as PostDomain +from blog.domain.category import Category as CategoryDomain +from blog.domain.tag import Tag as TagDomain +from blog.services.factory import ServiceFactory + + +@pytest.fixture() +def test_client(): + """Create a test client for the Flask app.""" + os.environ["FLASK_ENV"] = "testing" + app = create_app() + with app.test_client() as client: + with app.app_context(): + db.create_all() + # Create a page category for testing + category_service = ServiceFactory.create_category_service() + page_category = CategoryDomain(id=1, title="page", alias="page") + category_service.create_category(page_category) + yield client + with app.app_context(): + db.session.remove() + db.drop_all() + + +def create_test_post( + title="Test Post", alias="test-post", content="Test content", page=False +): + """Helper function to create a test post.""" + post_service = ServiceFactory.create_post_service() + post = PostDomain( + pagetitle=title, + alias=alias, + content=content, + createdon=datetime.datetime.now(datetime.timezone.utc), + publishedon=datetime.datetime.now(datetime.timezone.utc) if not page else None, + category_id=1 if page else None, + ) + return post_service.create_post(post) + + +def create_test_tag(title="Test Tag", alias="test-tag"): + """Helper function to create a test tag.""" + tag_service = ServiceFactory.create_tag_service() + tag = TagDomain( + title=title, + alias=alias, + ) + return tag_service.create_tag(tag) + + +def test_post_view(test_client): + """Test that post view works with domain models.""" + # Create a test post + post = create_test_post() + + # Request the post page + response = test_client.get(f"/{post.alias}") + assert response.status_code == 200 + assert post.pagetitle.encode() in response.data + assert post.content.encode() in response.data + + +def test_page_view(test_client): + """Test that page view works with domain models.""" + # Create a test page + page = create_test_post( + title="Test Page", alias="test-page", content="Page content", page=True + ) + + # Request the page + response = test_client.get(f"/{page.alias}") + assert response.status_code == 200 + assert page.pagetitle.encode() in response.data + assert page.content.encode() in response.data + + +def test_index_view(test_client): + """Test that index view works with domain models.""" + # Create a test post + post = create_test_post() + + # Request the index page + response = test_client.get("/") + assert response.status_code == 200 + assert post.pagetitle.encode() in response.data + + +def test_tag_index_view(test_client): + """Test that tag index view works with domain models.""" + # Create a test tag + tag = create_test_tag() + + # Request the tags index page + response = test_client.get("/tags/") + assert response.status_code == 200 + assert tag.title.encode() in response.data + + +def test_tag_view(test_client): + """Test that tag view works with domain models.""" + # Create a test tag + tag = create_test_tag() + + # Request the tag page + response = test_client.get(f"/tags/{tag.alias}") + assert response.status_code == 200 + assert tag.title.encode() in response.data + + +def test_404_view(test_client): + """Test that 404 view works correctly.""" + # Request a non-existent page + response = test_client.get("/non-existent-page") + assert response.status_code == 404 + + +def test_rss_view(test_client): + """Test that RSS view works with domain models.""" + # Create a test post + post = create_test_post() + + # Request the RSS feed + response = test_client.get("/rss.xml") + assert response.status_code == 200 + assert response.content_type == "application/rss+xml" + assert post.pagetitle.encode() in response.data + + +def test_robots_view(test_client): + """Test that robots.txt view works.""" + # Request the robots.txt file + response = test_client.get("/robots.txt") + assert response.status_code == 200 + assert b"User-agent: *" in response.data + + +def test_markdown_view(test_client): + """Test that markdown conversion works.""" + # Post markdown data + response = test_client.post("/md/", data={"data": "# Test Header"}) + assert response.status_code == 200 + assert b"

Test Header

" in response.data From cda2ce7a62e17c31020da9a70f1daa4aceec96fd Mon Sep 17 00:00:00 2001 From: loki Date: Mon, 8 Sep 2025 13:35:24 +0300 Subject: [PATCH 07/34] clear --- Makefile | 6 ++---- dev.txt | 4 ---- 2 files changed, 2 insertions(+), 8 deletions(-) delete mode 100644 dev.txt diff --git a/Makefile b/Makefile index 7beecc4..8f31659 100644 --- a/Makefile +++ b/Makefile @@ -10,6 +10,7 @@ ruff-lint: uvx ruff check . ruff-lint-format-check: + uvx ruff format . uvx ruff format --check . lint-types: @@ -21,10 +22,7 @@ test: test-coverage: - ( \ - . venv/bin/activate;\ - FLASK_ENV=testing FLASK_APP=blog pytest --cov=blog --cov-report xml\ - ) + FLASK_ENV=testing FLASK_APP=blog uv run pytest --cov=blog --cov-report xml check: lint test diff --git a/dev.txt b/dev.txt deleted file mode 100644 index 3e63e2b..0000000 --- a/dev.txt +++ /dev/null @@ -1,4 +0,0 @@ -pytest -pytest-cov -flake8 -pre-commit From 85477ec69bf70549ae8de915dcd9fe13a49f95bf Mon Sep 17 00:00:00 2001 From: loki Date: Mon, 8 Sep 2025 13:35:44 +0300 Subject: [PATCH 08/34] remove commented --- Dockerfile | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1b24f38..dcde297 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.10-alpine AS test-image +FROM python:3.12-alpine AS test-image ENV PYTHONDONTWRITEBYTECODE=1 ENV PYTHONUNBUFFERED=1 @@ -7,12 +7,12 @@ ENV SQLALCHEMY_DATABASE_URI="sqlite:////app/tmp/dev.db" WORKDIR /app -RUN apk update && apk add --no-cache nodejs npm make uv +RUN apk update && apk add --no-cache make uv COPY . . RUN uv sync && make check && make test -FROM python:3.10-alpine +FROM python:3.12-alpine ENV PYTHONDONTWRITEBYTECODE=1 ENV PYTHONUNBUFFERED=1 @@ -31,9 +31,6 @@ RUN adduser \ --shell "/sbin/nologin" \ --uid "${UID}" \ appuser -# --no-create-home \ -# appuser - # Copy the source code into the container. COPY . . @@ -43,9 +40,6 @@ EXPOSE 5000 ENV PATH=/app/venv/bin:$PATH -#USER appuser - # Run the application. ENTRYPOINT [ "./entrypoint.sh" ] -#CMD [ "uv", "run gunicorn -c gunicorn.py "] From 0696d681e904be455aec39a0780ade5279beccba Mon Sep 17 00:00:00 2001 From: loki Date: Mon, 8 Sep 2025 13:36:41 +0300 Subject: [PATCH 09/34] continue refactorign --- blog/__init__.py | 10 +++++----- blog/domain/category.py | 8 ++++---- blog/domain/post.py | 18 +++++++++--------- blog/domain/tag.py | 6 +++--- blog/post/views.py | 10 +++++----- blog/repos/post.py | 20 +++++++++++++------- blog/services/category.py | 9 ++++----- blog/services/icon.py | 9 ++++----- blog/services/post.py | 31 +++++++++++++++++++------------ blog/services/tag.py | 9 ++++----- blog/services/user.py | 11 +++++------ blog/tags/views.py | 6 +++--- blog/templates/layout.html | 4 ++-- blog/templates/post.html | 2 +- blog/templates/posts.html | 2 +- blog/templates/tags.html | 2 +- blog/user/views.py | 10 +++++----- 17 files changed, 88 insertions(+), 79 deletions(-) diff --git a/blog/__init__.py b/blog/__init__.py index 1dbfacc..b85234d 100644 --- a/blog/__init__.py +++ b/blog/__init__.py @@ -10,8 +10,8 @@ from blog.config import config from blog.extensions import admin_ext, cache, db, login_manager, migrate, flask_sitemap from blog.post.views import post -from blog.tags.views import tagsb -from blog.user.views import user_blueprint +from blog.tags.views import tags +from blog.user.views import user load_dotenv() logger = logging.getLogger(__name__) @@ -24,7 +24,7 @@ def configure_extensions(app): cache.init_app(app) migrate.init_app(app=app, db=db) login_manager.init_app(app=app) - login_manager.login_view = "userb.index" # type: ignore + login_manager.login_view = "user.index" # type: ignore flask_sitemap.init_app(app) @@ -37,6 +37,6 @@ def create_app(): if not app.config["TESTING"]: create_admin(admin_ext) app.register_blueprint(post) - app.register_blueprint(tagsb) - app.register_blueprint(user_blueprint) + app.register_blueprint(tags) + app.register_blueprint(user) return app diff --git a/blog/domain/category.py b/blog/domain/category.py index a05d0ae..47797a2 100644 --- a/blog/domain/category.py +++ b/blog/domain/category.py @@ -2,7 +2,7 @@ from dataclasses import dataclass import typing -from typing import TYPE_CHECKING, Optional, List +from typing import TYPE_CHECKING if TYPE_CHECKING: from blog.domain.post import Post as PostDomain @@ -12,12 +12,12 @@ class Category: """Domain model for blog category.""" - id: Optional[int] = None + id: int | None = None title: str = "" alias: str = "" - template: Optional[str] = None + template: str | None = None - posts: "Optional[List[PostDomain]]" = None + posts: "list[PostDomain] | None" = None @typing.override def __str__(self): diff --git a/blog/domain/post.py b/blog/domain/post.py index 666468d..e285a90 100644 --- a/blog/domain/post.py +++ b/blog/domain/post.py @@ -3,7 +3,7 @@ from dataclasses import dataclass import datetime import markdown -from typing import TYPE_CHECKING, Optional, List +from typing import TYPE_CHECKING if TYPE_CHECKING: from blog.domain.category import Category as CategoryDomain @@ -18,20 +18,20 @@ class Post: """Domain model for blog post.""" - id: Optional[int] = None + id: int | None = None pagetitle: str = "" alias: str = "" content: str = "" - createdon: Optional[datetime.datetime] = None - publishedon: Optional[datetime.datetime] = None - category_id: Optional[int] = None - user_id: Optional[int] = None + createdon: datetime.datetime | None = None + publishedon: datetime.datetime | None = None + category_id: int | None = None + user_id: int | None = None # These would typically be loaded separately in a real implementation # to avoid circular dependencies - user: "Optional[UserDomain]" = None - category: "Optional[CategoryDomain]" = None - tags: "Optional[List[TagDomain]]" = None + user: "UserDomain | None" = None + category: "CategoryDomain | None" = None + tags: "list[TagDomain] | None" = None def __post_init__(self): if self.createdon is None: diff --git a/blog/domain/tag.py b/blog/domain/tag.py index 36c6806..f287f32 100644 --- a/blog/domain/tag.py +++ b/blog/domain/tag.py @@ -2,7 +2,7 @@ from dataclasses import dataclass import typing -from typing import TYPE_CHECKING, Optional, List +from typing import TYPE_CHECKING if TYPE_CHECKING: from blog.domain.post import Post as PostDomain @@ -12,11 +12,11 @@ class Tag: """Domain model for blog tag.""" - id: Optional[int] = None + id: int | None = None title: str = "" alias: str = "" - posts: "Optional[List[PostDomain]]" = None + posts: "list[PostDomain] | None" = None @typing.override def __str__(self): diff --git a/blog/post/views.py b/blog/post/views.py index 0c841b1..3944204 100644 --- a/blog/post/views.py +++ b/blog/post/views.py @@ -16,7 +16,7 @@ from blog import cache from blog.services.factory import ServiceFactory -post = Blueprint("postb", __name__) +post = Blueprint("post", __name__) def pages_gen(f): @@ -30,9 +30,9 @@ def decorated_function(*args, **kwargs): post_service = ServiceFactory.create_post_service() pages = post_service.get_page_posts(page_category) - # Get icons using IconService for ORM models (needed for specific use cases) + # Get icons using IconService for domain models icon_service = ServiceFactory.create_icon_service() - icons = icon_service.get_all_icons_orm() + icons = icon_service.get_all_icons() return f(pages=pages, icons=icons, *args, **kwargs) @@ -99,12 +99,12 @@ def site_map_gen(): post_service = ServiceFactory.create_post_service() pages = post_service.get_page_posts(page_category) for page in pages: - yield url_for("postb.view", alias=page.alias) + yield url_for("post.view", alias=page.alias) # Get posts using PostService posts = post_service.get_published_posts() for post in posts: - yield url_for("postb.view", alias=post.alias) + yield url_for("post.view", alias=post.alias) @post.route("/md/", methods=["POST", "GET"]) diff --git a/blog/repos/post.py b/blog/repos/post.py index 7cbbbcc..bd605bc 100644 --- a/blog/repos/post.py +++ b/blog/repos/post.py @@ -5,6 +5,7 @@ from blog.extensions import db from blog.post.models import Post as PostORM +from blog.tags.models import Tag as TagORM from blog.domain.post import Post as PostDomain from blog.domain.user import User as UserDomain from blog.domain.category import Category as CategoryDomain @@ -17,8 +18,8 @@ class PostRepository: def __init__(self, session: Any = None): self.session = session or db.session - def get_post_orm_with_relationships(self, post_id: int) -> PostORM | None: - """Get a post ORM model with all its relationships loaded.""" + def get_post_with_relationships(self, post_id: int) -> PostDomain | None: + """Get a post domain model with all its relationships loaded.""" stmt = ( sa.select(PostORM) .where(PostORM.id == post_id) @@ -28,7 +29,10 @@ def get_post_orm_with_relationships(self, post_id: int) -> PostORM | None: sa.orm.joinedload(PostORM.tags), ) ) - return self.session.scalar(stmt) + post_orm = self.session.scalar(stmt) + if post_orm: + return self._to_domain_model(post_orm) + return None def get_by_id(self, post_id: int) -> PostDomain | None: """Get a post by its ID.""" @@ -89,10 +93,12 @@ def create(self, post: PostDomain) -> PostDomain: # Handle tags relationship if provided if post.tags: - # For now, we'll just set the tags field to an empty list - # In a real implementation, we would need to handle the many-to-many relationship - # This is a limitation of the current domain model design - pass + # Find existing Tag ORM models based on the domain Tag models + tag_ids = [tag.id for tag in post.tags if tag.id is not None] + if tag_ids: + stmt = sa.select(TagORM).where(TagORM.id.in_(tag_ids)) + existing_tags = list(self.session.scalars(stmt).all()) + post_orm.tags = existing_tags self.session.add(post_orm) self.session.flush() # Get the ID without committing diff --git a/blog/services/category.py b/blog/services/category.py index ead20c9..1ed128e 100644 --- a/blog/services/category.py +++ b/blog/services/category.py @@ -1,6 +1,5 @@ """Service layer for Category entities.""" -from typing import List, Optional from blog.repos.category import CategoryRepository from blog.domain.category import Category @@ -17,19 +16,19 @@ class CategoryService: def __init__(self, category_repository: CategoryRepository): self.category_repository = category_repository - def get_category_by_id(self, category_id: int) -> Optional[Category]: + def get_category_by_id(self, category_id: int) -> Category | None: """Get a category by its ID.""" return self.category_repository.get_by_id(category_id) - def get_category_by_alias(self, alias: str) -> Optional[Category]: + def get_category_by_alias(self, alias: str) -> Category | None: """Get a category by its alias.""" return self.category_repository.get_by_alias(alias) - def get_all_categories(self) -> List[Category]: + def get_all_categories(self) -> list[Category]: """Get all categories.""" return self.category_repository.get_all() - def get_categories_with_posts(self) -> List[Category]: + def get_categories_with_posts(self) -> list[Category]: """Get all categories with their posts.""" return self.category_repository.get_categories_with_posts() diff --git a/blog/services/icon.py b/blog/services/icon.py index a4f0e87..7af6c50 100644 --- a/blog/services/icon.py +++ b/blog/services/icon.py @@ -1,6 +1,5 @@ """Service layer for Icon entities.""" -from typing import List, Optional from blog.repos.icon import IconRepository from blog.domain.icon import Icon @@ -21,19 +20,19 @@ def get_icon_orm_by_id(self, icon_id: int): """Get an icon ORM model by its ID. Used for specific use cases requiring ORM models.""" return self.icon_repository.get_icon_orm_by_id(icon_id) - def get_all_icons_orm(self) -> List: + def get_all_icons_orm(self) -> list: """Get all icons as ORM models. Used for specific use cases requiring ORM models.""" return self.icon_repository.get_all_icons_orm() - def get_icon_by_id(self, icon_id: int) -> Optional[Icon]: + def get_icon_by_id(self, icon_id: int) -> Icon | None: """Get an icon by its ID.""" return self.icon_repository.get_by_id(icon_id) - def get_icon_by_title(self, title: str) -> Optional[Icon]: + def get_icon_by_title(self, title: str) -> Icon | None: """Get an icon by its title.""" return self.icon_repository.get_by_title(title) - def get_all_icons(self) -> List[Icon]: + def get_all_icons(self) -> list[Icon]: """Get all icons.""" return self.icon_repository.get_all() diff --git a/blog/services/post.py b/blog/services/post.py index dd9ebb1..aee3001 100644 --- a/blog/services/post.py +++ b/blog/services/post.py @@ -1,10 +1,12 @@ -"""Service layer for Post entities.""" - -from typing import List, Optional +import logging from blog.repos.post import PostRepository from blog.domain.post import Post +# Set up logger +logger = logging.getLogger(__name__) + + class PostServiceError(Exception): """Base exception for PostService errors.""" @@ -17,23 +19,23 @@ class PostService: def __init__(self, post_repository: PostRepository): self.post_repository = post_repository - def get_post_by_id(self, post_id: int) -> Optional[Post]: + def get_post_by_id(self, post_id: int) -> Post | None: """Get a post by its ID.""" return self.post_repository.get_by_id(post_id) - def get_post_by_alias(self, alias: str) -> Optional[Post]: + def get_post_by_alias(self, alias: str) -> Post | None: """Get a post by its alias.""" return self.post_repository.get_by_alias(alias) - def get_all_posts(self) -> List[Post]: + def get_all_posts(self) -> list[Post]: """Get all posts.""" return self.post_repository.get_all() - def get_published_posts(self) -> List[Post]: + def get_published_posts(self) -> list[Post]: """Get all published posts.""" return self.post_repository.get_published_posts() - def get_page_posts(self, page_category_ids: List[int]) -> List[Post]: + def get_page_posts(self, page_category_ids: list[int]) -> list[Post]: """Get posts that are pages (in specific categories).""" return self.post_repository.get_page_posts(page_category_ids) @@ -57,7 +59,12 @@ def delete_post(self, post_id: int) -> bool: """Delete a post by its ID.""" try: return self.post_repository.delete(post_id) - except Exception: - # Log the error and return False to indicate failure - # In a real application, you might want to log this - return False + except Exception as e: + # Log the error with details + logger.error( + f"Failed to delete post with id {post_id}: {str(e)}", exc_info=True + ) + # Re-raise as a more specific exception for the service layer + raise PostServiceError( + f"Failed to delete post with id {post_id}: {str(e)}" + ) from e diff --git a/blog/services/tag.py b/blog/services/tag.py index b361184..7793199 100644 --- a/blog/services/tag.py +++ b/blog/services/tag.py @@ -1,6 +1,5 @@ """Service layer for Tag entities.""" -from typing import List, Optional from blog.repos.tag import TagRepository from blog.domain.tag import Tag @@ -17,19 +16,19 @@ class TagService: def __init__(self, tag_repository: TagRepository): self.tag_repository = tag_repository - def get_tag_by_id(self, tag_id: int) -> Optional[Tag]: + def get_tag_by_id(self, tag_id: int) -> Tag | None: """Get a tag by its ID.""" return self.tag_repository.get_by_id(tag_id) - def get_tag_by_alias(self, alias: str) -> Optional[Tag]: + def get_tag_by_alias(self, alias: str) -> Tag | None: """Get a tag by its alias.""" return self.tag_repository.get_by_alias(alias) - def get_all_tags(self) -> List[Tag]: + def get_all_tags(self) -> list[Tag]: """Get all tags.""" return self.tag_repository.get_all() - def get_tags_with_posts(self) -> List[Tag]: + def get_tags_with_posts(self) -> list[Tag]: """Get all tags with their posts.""" return self.tag_repository.get_tags_with_posts() diff --git a/blog/services/user.py b/blog/services/user.py index d69d6ee..a46ae48 100644 --- a/blog/services/user.py +++ b/blog/services/user.py @@ -1,6 +1,5 @@ """Service layer for User entities.""" -from typing import List, Optional from blog.repos.user import UserRepository from blog.domain.user import User @@ -17,7 +16,7 @@ class UserService: def __init__(self, user_repository: UserRepository): self.user_repository = user_repository - def get_user_by_id(self, user_id: int) -> Optional[User]: + def get_user_by_id(self, user_id: int) -> User | None: """Get a user by its ID.""" return self.user_repository.get_by_id(user_id) @@ -29,15 +28,15 @@ def get_user_orm_by_name(self, name: str): """Get a user ORM model by their name. Used for Flask-Login compatibility.""" return self.user_repository.get_user_orm_by_name(name) - def get_user_by_name(self, name: str) -> Optional[User]: + def get_user_by_name(self, name: str) -> User | None: """Get a user by their name.""" return self.user_repository.get_by_name(name) - def get_all_users(self) -> List[User]: + def get_all_users(self) -> list[User]: """Get all users.""" return self.user_repository.get_all() - def get_users_with_posts(self) -> List[User]: + def get_users_with_posts(self) -> list[User]: """Get all users with their posts.""" return self.user_repository.get_users_with_posts() @@ -66,6 +65,6 @@ def delete_user(self, user_id: int) -> bool: # In a real application, you might want to log this return False - def authenticate_user(self, name: str, password: str) -> Optional[User]: + def authenticate_user(self, name: str, password: str) -> User | None: """Authenticate a user by name and password.""" return self.user_repository.authenticate(name, password) diff --git a/blog/tags/views.py b/blog/tags/views.py index 34cfe03..272ea3a 100644 --- a/blog/tags/views.py +++ b/blog/tags/views.py @@ -3,10 +3,10 @@ from blog.post.views import pages_gen from blog.services.factory import ServiceFactory -tagsb = Blueprint("tagsb", __name__, url_prefix="/tags") +tags = Blueprint("tags", __name__, url_prefix="/tags") -@tagsb.route("/") +@tags.route("/") @pages_gen def index(**kwargs): # Use service layer for domain models @@ -15,7 +15,7 @@ def index(**kwargs): return render_template("tags.html", tags=tags, **kwargs) -@tagsb.route("/") +@tags.route("/") @pages_gen def view(alias=None, **kwargs): # Use service layer for domain models diff --git a/blog/templates/layout.html b/blog/templates/layout.html index e986033..9b606f6 100644 --- a/blog/templates/layout.html +++ b/blog/templates/layout.html @@ -33,9 +33,9 @@
diff --git a/blog/templates/post.html b/blog/templates/post.html index f0bc673..40374ee 100644 --- a/blog/templates/post.html +++ b/blog/templates/post.html @@ -23,7 +23,7 @@

{{post.pagetitle}}

{% if post.tags %} {% for tag in post.tags %} - {{tag}} + {{tag}} {% endfor %} {% endif %}
diff --git a/blog/templates/posts.html b/blog/templates/posts.html index 46e0c81..7d09f5a 100644 --- a/blog/templates/posts.html +++ b/blog/templates/posts.html @@ -11,7 +11,7 @@

{{group.grouper}}

{% for post in group.list %}
- + {{post.pagetitle}} diff --git a/blog/templates/tags.html b/blog/templates/tags.html index 58f0637..484af91 100644 --- a/blog/templates/tags.html +++ b/blog/templates/tags.html @@ -5,7 +5,7 @@

Tags

{% for tag in tags %}
- + {{tag.title}}
diff --git a/blog/user/views.py b/blog/user/views.py index 3a77e6a..2dd3acc 100644 --- a/blog/user/views.py +++ b/blog/user/views.py @@ -7,7 +7,7 @@ from blog.services.factory import ServiceFactory -user_blueprint = Blueprint("userb", __name__) +user = Blueprint("user", __name__) @login_manager.user_loader @@ -24,7 +24,7 @@ def load_user(user_id): return None -@user_blueprint.route("/login", methods=["GET", "POST"]) +@user.route("/login", methods=["GET", "POST"]) def login(): if current_user.is_authenticated: return redirect("/") @@ -47,11 +47,11 @@ def login(): login_user(user_orm) return redirect(url_for("admin.index")) flash("invalid user o password") - return redirect(url_for("userb.login")) + return redirect(url_for("user.login")) return render_template("login.html", form=form) -@user_blueprint.route("/logout") +@user.route("/logout") def logout(): flask_login.logout_user() - return redirect(url_for("postb.index")) + return redirect(url_for("post.index")) From 085be62145b5f48846f9dcdb928efbb866656a87 Mon Sep 17 00:00:00 2001 From: loki Date: Mon, 8 Sep 2025 14:09:30 +0300 Subject: [PATCH 10/34] remove comments --- blog/domain/post.py | 1 - blog/post/views.py | 15 --------------- blog/repos/category.py | 9 --------- blog/repos/icon.py | 7 ------- blog/repos/post.py | 10 ---------- blog/repos/tag.py | 9 --------- blog/repos/user.py | 10 ---------- blog/services/category.py | 7 ------- blog/services/icon.py | 6 ------ blog/services/post.py | 9 --------- blog/services/tag.py | 7 ------- blog/services/user.py | 8 -------- blog/tags/views.py | 2 -- blog/user/views.py | 4 +--- 14 files changed, 1 insertion(+), 103 deletions(-) diff --git a/blog/domain/post.py b/blog/domain/post.py index e285a90..158e4d0 100644 --- a/blog/domain/post.py +++ b/blog/domain/post.py @@ -36,7 +36,6 @@ class Post: def __post_init__(self): if self.createdon is None: self.createdon = datetime.datetime.now(datetime.timezone.utc) - # Don't set default for publishedon - it should be None for unpublished posts @property def markdown(self): diff --git a/blog/post/views.py b/blog/post/views.py index 3944204..ada3764 100644 --- a/blog/post/views.py +++ b/blog/post/views.py @@ -22,15 +22,11 @@ def pages_gen(f): @wraps(f) def decorated_function(*args, **kwargs): - # Use service layer for business logic and domain models - page_category = current_app.config["PAGE_CATEGORY"] - # Get posts using PostService for domain models post_service = ServiceFactory.create_post_service() pages = post_service.get_page_posts(page_category) - # Get icons using IconService for domain models icon_service = ServiceFactory.create_icon_service() icons = icon_service.get_all_icons() @@ -43,8 +39,6 @@ def decorated_function(*args, **kwargs): @cache.cached(timeout=50) @pages_gen def index(**kwargs): - # Use service layer for domain models - post_service = ServiceFactory.create_post_service() posts = post_service.get_published_posts() return render_template("posts.html", posts=posts, **kwargs) @@ -54,7 +48,6 @@ def index(**kwargs): @cache.cached(timeout=50) @pages_gen def view(alias=None, **kwargs): - # Use service layer for domain models if alias is None: from flask import abort @@ -63,7 +56,6 @@ def view(alias=None, **kwargs): post_service = ServiceFactory.create_post_service() post = post_service.get_post_by_alias(alias) if not post: - # Handle 404 case from flask import abort abort(404) @@ -78,7 +70,6 @@ def view(alias=None, **kwargs): abort(404) - # Load category object if needed using service page_category_obj = None if post.category_id: category_service = ServiceFactory.create_category_service() @@ -91,17 +82,13 @@ def view(alias=None, **kwargs): @flask_sitemap.register_generator def site_map_gen(): - # Use service layer for domain models - page_category = current_app.config["PAGE_CATEGORY"] - # Get pages using PostService post_service = ServiceFactory.create_post_service() pages = post_service.get_page_posts(page_category) for page in pages: yield url_for("post.view", alias=page.alias) - # Get posts using PostService posts = post_service.get_published_posts() for post in posts: yield url_for("post.view", alias=post.alias) @@ -128,8 +115,6 @@ def robots(): @post.route("/rss.xml") @cache.cached(timeout=50) def rss(): - # Use service layer for domain models - post_service = ServiceFactory.create_post_service() list_posts = post_service.get_published_posts() diff --git a/blog/repos/category.py b/blog/repos/category.py index 190f8e0..dbbbfbf 100644 --- a/blog/repos/category.py +++ b/blog/repos/category.py @@ -18,7 +18,6 @@ def __init__(self, session: Any = None): def get_category_orm_with_relationships( self, category_id: int ) -> CategoryORM | None: - """Get a category ORM model with all its relationships loaded.""" stmt = ( sa.select(CategoryORM) .where(CategoryORM.id == category_id) @@ -27,7 +26,6 @@ def get_category_orm_with_relationships( return self.session.scalar(stmt) def get_by_id(self, category_id: int) -> CategoryDomain | None: - """Get a category by its ID.""" stmt = sa.select(CategoryORM).where(CategoryORM.id == category_id) category_orm = self.session.scalar(stmt) if category_orm: @@ -35,7 +33,6 @@ def get_by_id(self, category_id: int) -> CategoryDomain | None: return None def get_by_alias(self, alias: str) -> CategoryDomain | None: - """Get a category by its alias.""" stmt = sa.select(CategoryORM).where(CategoryORM.alias == alias) category_orm = self.session.scalar(stmt) if category_orm: @@ -43,19 +40,16 @@ def get_by_alias(self, alias: str) -> CategoryDomain | None: return None def get_all(self) -> list[CategoryDomain]: - """Get all categories.""" stmt = sa.select(CategoryORM) categories_orm = list(self.session.scalars(stmt).all()) return [self._to_domain_model(category_orm) for category_orm in categories_orm] def get_categories_with_posts(self) -> list[CategoryDomain]: - """Get all categories with their posts.""" stmt = sa.select(CategoryORM).options(sa.orm.joinedload(CategoryORM.posts)) categories_orm = list(self.session.scalars(stmt).unique().all()) return [self._to_domain_model(category_orm) for category_orm in categories_orm] def create(self, category: CategoryDomain) -> CategoryDomain: - """Create a new category.""" category_orm = CategoryORM() category_orm.title = category.title category_orm.alias = category.alias @@ -68,7 +62,6 @@ def create(self, category: CategoryDomain) -> CategoryDomain: return category def update(self, category: CategoryDomain) -> CategoryDomain: - """Update an existing category.""" stmt = sa.select(CategoryORM).where(CategoryORM.id == category.id) category_orm = self.session.scalar(stmt) if not category_orm: @@ -83,7 +76,6 @@ def update(self, category: CategoryDomain) -> CategoryDomain: return category def delete(self, category_id: int) -> bool: - """Delete a category by its ID.""" stmt = sa.select(CategoryORM).where(CategoryORM.id == category_id) category_orm = self.session.scalar(stmt) if category_orm: @@ -92,7 +84,6 @@ def delete(self, category_id: int) -> bool: return False def _to_domain_model(self, category_orm: CategoryORM) -> CategoryDomain: - """Convert ORM model to domain model.""" # Convert related posts if they exist posts = None if category_orm.posts: diff --git a/blog/repos/icon.py b/blog/repos/icon.py index 509dba2..138eebc 100644 --- a/blog/repos/icon.py +++ b/blog/repos/icon.py @@ -25,7 +25,6 @@ def get_all_icons_orm(self) -> list[IconORM]: return list(self.session.scalars(stmt).all()) def get_by_id(self, icon_id: int) -> Icon | None: - """Get an icon by its ID.""" stmt = sa.select(IconORM).where(IconORM.id == icon_id) icon_orm = self.session.scalar(stmt) if icon_orm: @@ -33,7 +32,6 @@ def get_by_id(self, icon_id: int) -> Icon | None: return None def get_by_title(self, title: str) -> Icon | None: - """Get an icon by its title.""" stmt = sa.select(IconORM).where(IconORM.title == title) icon_orm = self.session.scalar(stmt) if icon_orm: @@ -41,13 +39,11 @@ def get_by_title(self, title: str) -> Icon | None: return None def get_all(self) -> list[Icon]: - """Get all icons.""" stmt = sa.select(IconORM) icons_orm = list(self.session.scalars(stmt).all()) return [self._to_domain_model(icon_orm) for icon_orm in icons_orm] def create(self, icon: Icon) -> Icon: - """Create a new icon.""" icon_orm = IconORM() icon_orm.title = icon.title icon_orm.url = icon.url @@ -59,7 +55,6 @@ def create(self, icon: Icon) -> Icon: return icon def update(self, icon: Icon) -> Icon: - """Update an existing icon.""" stmt = sa.select(IconORM).where(IconORM.id == icon.id) icon_orm = self.session.scalar(stmt) if not icon_orm: @@ -73,7 +68,6 @@ def update(self, icon: Icon) -> Icon: return icon def delete(self, icon_id: int) -> bool: - """Delete an icon by its ID.""" stmt = sa.select(IconORM).where(IconORM.id == icon_id) icon_orm = self.session.scalar(stmt) if icon_orm: @@ -82,7 +76,6 @@ def delete(self, icon_id: int) -> bool: return False def _to_domain_model(self, icon_orm: IconORM) -> Icon: - """Convert ORM model to domain model.""" return Icon( id=icon_orm.id, title=icon_orm.title, diff --git a/blog/repos/post.py b/blog/repos/post.py index bd605bc..384274a 100644 --- a/blog/repos/post.py +++ b/blog/repos/post.py @@ -19,7 +19,6 @@ def __init__(self, session: Any = None): self.session = session or db.session def get_post_with_relationships(self, post_id: int) -> PostDomain | None: - """Get a post domain model with all its relationships loaded.""" stmt = ( sa.select(PostORM) .where(PostORM.id == post_id) @@ -35,7 +34,6 @@ def get_post_with_relationships(self, post_id: int) -> PostDomain | None: return None def get_by_id(self, post_id: int) -> PostDomain | None: - """Get a post by its ID.""" stmt = sa.select(PostORM).where(PostORM.id == post_id) post_orm = self.session.scalar(stmt) if post_orm: @@ -43,7 +41,6 @@ def get_by_id(self, post_id: int) -> PostDomain | None: return None def get_by_alias(self, alias: str) -> PostDomain | None: - """Get a post by its alias.""" stmt = sa.select(PostORM).where(PostORM.alias == alias) post_orm = self.session.scalar(stmt) if post_orm: @@ -51,13 +48,11 @@ def get_by_alias(self, alias: str) -> PostDomain | None: return None def get_all(self) -> list[PostDomain]: - """Get all posts.""" stmt = sa.select(PostORM) posts_orm = list(self.session.scalars(stmt).all()) return [self._to_domain_model(post_orm) for post_orm in posts_orm] def get_published_posts(self) -> list[PostDomain]: - """Get all published posts ordered by published date.""" stmt = ( sa.select(PostORM) .where( @@ -70,13 +65,11 @@ def get_published_posts(self) -> list[PostDomain]: return [self._to_domain_model(post_orm) for post_orm in posts_orm] def get_page_posts(self, page_category_ids: list[int]) -> list[PostDomain]: - """Get posts that are pages (in specific categories).""" stmt = sa.select(PostORM).where(PostORM.category_id.in_(page_category_ids)) posts_orm = list(self.session.scalars(stmt).all()) return [self._to_domain_model(post_orm) for post_orm in posts_orm] def create(self, post: PostDomain) -> PostDomain: - """Create a new post.""" post_orm = PostORM() post_orm.pagetitle = post.pagetitle post_orm.alias = post.alias @@ -106,7 +99,6 @@ def create(self, post: PostDomain) -> PostDomain: return post def update(self, post: PostDomain) -> PostDomain: - """Update an existing post.""" stmt = sa.select(PostORM).where(PostORM.id == post.id) post_orm = self.session.scalar(stmt) if not post_orm: @@ -128,7 +120,6 @@ def update(self, post: PostDomain) -> PostDomain: return post def delete(self, post_id: int) -> bool: - """Delete a post by its ID.""" stmt = sa.select(PostORM).where(PostORM.id == post_id) post_orm = self.session.scalar(stmt) if post_orm: @@ -137,7 +128,6 @@ def delete(self, post_id: int) -> bool: return False def _to_domain_model(self, post_orm: PostORM) -> PostDomain: - """Convert ORM model to domain model.""" # Convert related user if it exists user = None if post_orm.user: diff --git a/blog/repos/tag.py b/blog/repos/tag.py index a1e8047..bf32272 100644 --- a/blog/repos/tag.py +++ b/blog/repos/tag.py @@ -16,7 +16,6 @@ def __init__(self, session: Any = None): self.session = session or db.session def get_tag_orm_with_relationships(self, tag_id: int) -> TagORM | None: - """Get a tag ORM model with all its relationships loaded.""" stmt = ( sa.select(TagORM) .where(TagORM.id == tag_id) @@ -25,7 +24,6 @@ def get_tag_orm_with_relationships(self, tag_id: int) -> TagORM | None: return self.session.scalar(stmt) def get_by_id(self, tag_id: int) -> TagDomain | None: - """Get a tag by its ID.""" stmt = sa.select(TagORM).where(TagORM.id == tag_id) tag_orm = self.session.scalar(stmt) if tag_orm: @@ -33,7 +31,6 @@ def get_by_id(self, tag_id: int) -> TagDomain | None: return None def get_by_alias(self, alias: str) -> TagDomain | None: - """Get a tag by its alias.""" stmt = sa.select(TagORM).where(TagORM.alias == alias) tag_orm = self.session.scalar(stmt) if tag_orm: @@ -41,19 +38,16 @@ def get_by_alias(self, alias: str) -> TagDomain | None: return None def get_all(self) -> list[TagDomain]: - """Get all tags.""" stmt = sa.select(TagORM) tags_orm = list(self.session.scalars(stmt).all()) return [self._to_domain_model(tag_orm) for tag_orm in tags_orm] def get_tags_with_posts(self) -> list[TagDomain]: - """Get all tags with their posts.""" stmt = sa.select(TagORM).options(sa.orm.joinedload(TagORM.posts)) tags_orm = list(self.session.scalars(stmt).unique().all()) return [self._to_domain_model(tag_orm) for tag_orm in tags_orm] def create(self, tag: TagDomain) -> TagDomain: - """Create a new tag.""" tag_orm = TagORM() tag_orm.title = tag.title tag_orm.alias = tag.alias @@ -63,7 +57,6 @@ def create(self, tag: TagDomain) -> TagDomain: return tag def update(self, tag: TagDomain) -> TagDomain: - """Update an existing tag.""" stmt = sa.select(TagORM).where(TagORM.id == tag.id) tag_orm = self.session.scalar(stmt) if not tag_orm: @@ -75,7 +68,6 @@ def update(self, tag: TagDomain) -> TagDomain: return tag def delete(self, tag_id: int) -> bool: - """Delete a tag by its ID.""" stmt = sa.select(TagORM).where(TagORM.id == tag_id) tag_orm = self.session.scalar(stmt) if tag_orm: @@ -84,7 +76,6 @@ def delete(self, tag_id: int) -> bool: return False def _to_domain_model(self, tag_orm: TagORM) -> TagDomain: - """Convert ORM model to domain model.""" # Convert related posts if they exist posts = None if tag_orm.posts: diff --git a/blog/repos/user.py b/blog/repos/user.py index a9d5d8e..c0b0947 100644 --- a/blog/repos/user.py +++ b/blog/repos/user.py @@ -16,7 +16,6 @@ def __init__(self, session: Any = None): self.session = session or db.session def get_user_orm_with_relationships(self, user_id: int) -> UserORM | None: - """Get a user ORM model with all its relationships loaded.""" stmt = ( sa.select(UserORM) .where(UserORM.id == user_id) @@ -35,7 +34,6 @@ def get_user_orm_by_name(self, name: str) -> UserORM | None: return self.session.scalar(stmt) def get_by_id(self, user_id: int) -> UserDomain | None: - """Get a user by its ID.""" stmt = sa.select(UserORM).where(UserORM.id == user_id) user_orm = self.session.scalar(stmt) if user_orm: @@ -43,7 +41,6 @@ def get_by_id(self, user_id: int) -> UserDomain | None: return None def get_by_name(self, name: str) -> UserDomain | None: - """Get a user by their name.""" stmt = sa.select(UserORM).where(UserORM.name == name) user_orm = self.session.scalar(stmt) if user_orm: @@ -51,19 +48,16 @@ def get_by_name(self, name: str) -> UserDomain | None: return None def get_all(self) -> list[UserDomain]: - """Get all users.""" stmt = sa.select(UserORM) users_orm = self.session.scalars(stmt).all() return [self._to_domain_model(user_orm) for user_orm in users_orm] def get_users_with_posts(self) -> list[UserDomain]: - """Get all users with their posts.""" stmt = sa.select(UserORM).options(sa.orm.joinedload(UserORM.posts)) users_orm = self.session.scalars(stmt).unique().all() return [self._to_domain_model(user_orm) for user_orm in users_orm] def create(self, user: UserDomain) -> UserDomain: - """Create a new user.""" user_orm = UserORM() user_orm.name = user.name user_orm.password = user.password @@ -80,7 +74,6 @@ def create(self, user: UserDomain) -> UserDomain: return user def update(self, user: UserDomain) -> UserDomain: - """Update an existing user.""" stmt = sa.select(UserORM).where(UserORM.id == user.id) user_orm = self.session.scalar(stmt) if not user_orm: @@ -99,7 +92,6 @@ def update(self, user: UserDomain) -> UserDomain: return user def delete(self, user_id: int) -> bool: - """Delete a user by its ID.""" stmt = sa.select(UserORM).where(UserORM.id == user_id) user_orm = self.session.scalar(stmt) if user_orm: @@ -108,7 +100,6 @@ def delete(self, user_id: int) -> bool: return False def authenticate(self, name: str, password: str) -> UserDomain | None: - """Authenticate a user by name and password.""" stmt = sa.select(UserORM).where(UserORM.name == name) user_orm = self.session.scalar(stmt) if user_orm and user_orm.check_password(password): @@ -116,7 +107,6 @@ def authenticate(self, name: str, password: str) -> UserDomain | None: return None def _to_domain_model(self, user_orm: UserORM) -> UserDomain: - """Convert ORM model to domain model.""" # Convert related posts if they exist posts = None if user_orm.posts: diff --git a/blog/services/category.py b/blog/services/category.py index 1ed128e..ab53596 100644 --- a/blog/services/category.py +++ b/blog/services/category.py @@ -17,23 +17,18 @@ def __init__(self, category_repository: CategoryRepository): self.category_repository = category_repository def get_category_by_id(self, category_id: int) -> Category | None: - """Get a category by its ID.""" return self.category_repository.get_by_id(category_id) def get_category_by_alias(self, alias: str) -> Category | None: - """Get a category by its alias.""" return self.category_repository.get_by_alias(alias) def get_all_categories(self) -> list[Category]: - """Get all categories.""" return self.category_repository.get_all() def get_categories_with_posts(self) -> list[Category]: - """Get all categories with their posts.""" return self.category_repository.get_categories_with_posts() def create_category(self, category: Category) -> Category: - """Create a new category.""" try: return self.category_repository.create(category) except Exception as e: @@ -41,7 +36,6 @@ def create_category(self, category: Category) -> Category: raise CategoryServiceError(f"Failed to create category: {str(e)}") from e def update_category(self, category: Category) -> Category: - """Update an existing category.""" try: return self.category_repository.update(category) except ValueError as e: @@ -49,7 +43,6 @@ def update_category(self, category: Category) -> Category: raise CategoryServiceError(f"Failed to update category: {str(e)}") from e def delete_category(self, category_id: int) -> bool: - """Delete a category by its ID.""" try: return self.category_repository.delete(category_id) except Exception: diff --git a/blog/services/icon.py b/blog/services/icon.py index 7af6c50..23fdc45 100644 --- a/blog/services/icon.py +++ b/blog/services/icon.py @@ -25,19 +25,15 @@ def get_all_icons_orm(self) -> list: return self.icon_repository.get_all_icons_orm() def get_icon_by_id(self, icon_id: int) -> Icon | None: - """Get an icon by its ID.""" return self.icon_repository.get_by_id(icon_id) def get_icon_by_title(self, title: str) -> Icon | None: - """Get an icon by its title.""" return self.icon_repository.get_by_title(title) def get_all_icons(self) -> list[Icon]: - """Get all icons.""" return self.icon_repository.get_all() def create_icon(self, icon: Icon) -> Icon: - """Create a new icon.""" try: return self.icon_repository.create(icon) except Exception as e: @@ -45,7 +41,6 @@ def create_icon(self, icon: Icon) -> Icon: raise IconServiceError(f"Failed to create icon: {str(e)}") from e def update_icon(self, icon: Icon) -> Icon: - """Update an existing icon.""" try: return self.icon_repository.update(icon) except ValueError as e: @@ -53,7 +48,6 @@ def update_icon(self, icon: Icon) -> Icon: raise IconServiceError(f"Failed to update icon: {str(e)}") from e def delete_icon(self, icon_id: int) -> bool: - """Delete an icon by its ID.""" try: return self.icon_repository.delete(icon_id) except Exception: diff --git a/blog/services/post.py b/blog/services/post.py index aee3001..1384e62 100644 --- a/blog/services/post.py +++ b/blog/services/post.py @@ -3,7 +3,6 @@ from blog.domain.post import Post -# Set up logger logger = logging.getLogger(__name__) @@ -20,27 +19,21 @@ def __init__(self, post_repository: PostRepository): self.post_repository = post_repository def get_post_by_id(self, post_id: int) -> Post | None: - """Get a post by its ID.""" return self.post_repository.get_by_id(post_id) def get_post_by_alias(self, alias: str) -> Post | None: - """Get a post by its alias.""" return self.post_repository.get_by_alias(alias) def get_all_posts(self) -> list[Post]: - """Get all posts.""" return self.post_repository.get_all() def get_published_posts(self) -> list[Post]: - """Get all published posts.""" return self.post_repository.get_published_posts() def get_page_posts(self, page_category_ids: list[int]) -> list[Post]: - """Get posts that are pages (in specific categories).""" return self.post_repository.get_page_posts(page_category_ids) def create_post(self, post: Post) -> Post: - """Create a new post.""" try: return self.post_repository.create(post) except Exception as e: @@ -48,7 +41,6 @@ def create_post(self, post: Post) -> Post: raise PostServiceError(f"Failed to create post: {str(e)}") from e def update_post(self, post: Post) -> Post: - """Update an existing post.""" try: return self.post_repository.update(post) except ValueError as e: @@ -56,7 +48,6 @@ def update_post(self, post: Post) -> Post: raise PostServiceError(f"Failed to update post: {str(e)}") from e def delete_post(self, post_id: int) -> bool: - """Delete a post by its ID.""" try: return self.post_repository.delete(post_id) except Exception as e: diff --git a/blog/services/tag.py b/blog/services/tag.py index 7793199..28dc6d6 100644 --- a/blog/services/tag.py +++ b/blog/services/tag.py @@ -17,23 +17,18 @@ def __init__(self, tag_repository: TagRepository): self.tag_repository = tag_repository def get_tag_by_id(self, tag_id: int) -> Tag | None: - """Get a tag by its ID.""" return self.tag_repository.get_by_id(tag_id) def get_tag_by_alias(self, alias: str) -> Tag | None: - """Get a tag by its alias.""" return self.tag_repository.get_by_alias(alias) def get_all_tags(self) -> list[Tag]: - """Get all tags.""" return self.tag_repository.get_all() def get_tags_with_posts(self) -> list[Tag]: - """Get all tags with their posts.""" return self.tag_repository.get_tags_with_posts() def create_tag(self, tag: Tag) -> Tag: - """Create a new tag.""" try: return self.tag_repository.create(tag) except Exception as e: @@ -41,7 +36,6 @@ def create_tag(self, tag: Tag) -> Tag: raise TagServiceError(f"Failed to create tag: {str(e)}") from e def update_tag(self, tag: Tag) -> Tag: - """Update an existing tag.""" try: return self.tag_repository.update(tag) except ValueError as e: @@ -49,7 +43,6 @@ def update_tag(self, tag: Tag) -> Tag: raise TagServiceError(f"Failed to update tag: {str(e)}") from e def delete_tag(self, tag_id: int) -> bool: - """Delete a tag by its ID.""" try: return self.tag_repository.delete(tag_id) except Exception: diff --git a/blog/services/user.py b/blog/services/user.py index a46ae48..0c127e6 100644 --- a/blog/services/user.py +++ b/blog/services/user.py @@ -17,7 +17,6 @@ def __init__(self, user_repository: UserRepository): self.user_repository = user_repository def get_user_by_id(self, user_id: int) -> User | None: - """Get a user by its ID.""" return self.user_repository.get_by_id(user_id) def get_user_orm_by_id(self, user_id: int): @@ -29,19 +28,15 @@ def get_user_orm_by_name(self, name: str): return self.user_repository.get_user_orm_by_name(name) def get_user_by_name(self, name: str) -> User | None: - """Get a user by their name.""" return self.user_repository.get_by_name(name) def get_all_users(self) -> list[User]: - """Get all users.""" return self.user_repository.get_all() def get_users_with_posts(self) -> list[User]: - """Get all users with their posts.""" return self.user_repository.get_users_with_posts() def create_user(self, user: User) -> User: - """Create a new user.""" try: return self.user_repository.create(user) except Exception as e: @@ -49,7 +44,6 @@ def create_user(self, user: User) -> User: raise UserServiceError(f"Failed to create user: {str(e)}") from e def update_user(self, user: User) -> User: - """Update an existing user.""" try: return self.user_repository.update(user) except ValueError as e: @@ -57,7 +51,6 @@ def update_user(self, user: User) -> User: raise UserServiceError(f"Failed to update user: {str(e)}") from e def delete_user(self, user_id: int) -> bool: - """Delete a user by its ID.""" try: return self.user_repository.delete(user_id) except Exception: @@ -66,5 +59,4 @@ def delete_user(self, user_id: int) -> bool: return False def authenticate_user(self, name: str, password: str) -> User | None: - """Authenticate a user by name and password.""" return self.user_repository.authenticate(name, password) diff --git a/blog/tags/views.py b/blog/tags/views.py index 272ea3a..d94e400 100644 --- a/blog/tags/views.py +++ b/blog/tags/views.py @@ -9,7 +9,6 @@ @tags.route("/") @pages_gen def index(**kwargs): - # Use service layer for domain models tag_service = ServiceFactory.create_tag_service() tags = tag_service.get_all_tags() return render_template("tags.html", tags=tags, **kwargs) @@ -18,7 +17,6 @@ def index(**kwargs): @tags.route("/") @pages_gen def view(alias=None, **kwargs): - # Use service layer for domain models if alias is None: from flask import abort diff --git a/blog/user/views.py b/blog/user/views.py index 2dd3acc..ed3044e 100644 --- a/blog/user/views.py +++ b/blog/user/views.py @@ -13,11 +13,10 @@ @login_manager.user_loader def load_user(user_id): """Load user by ID for Flask-Login.""" - # Use service layer to get user (but Flask-Login needs ORM model) + # For Flask-Login compatibility, we need to return an ORM model user_service = ServiceFactory.create_user_service() user = user_service.get_user_by_id(int(user_id)) if user: - # For Flask-Login compatibility, we need to return an ORM model # This is one of the few places where we directly access the service layer # to get an ORM model because Flask-Login requires an ORM model return user_service.get_user_orm_by_id(int(user_id)) @@ -34,7 +33,6 @@ def login(): name = form.name.data password = form.password.data if name is not None and password is not None: - # Use service layer to authenticate user (returns domain model) user_service = ServiceFactory.create_user_service() user = user_service.authenticate_user(name, password) From a6c36cb6403e688bcf27d8aaef956c5165002d1d Mon Sep 17 00:00:00 2001 From: loki Date: Mon, 8 Sep 2025 15:36:30 +0300 Subject: [PATCH 11/34] added user admin --- blog/__init__.py | 12 ++++++- blog/admin/__init__.py | 10 +++--- blog/cli.py | 39 +++++++++++++++++++++++ blog/commands.py | 38 ++++++++++++++++++++++ blog/user/models.py | 7 +++++ create_admin.py | 71 ++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 171 insertions(+), 6 deletions(-) create mode 100644 blog/cli.py create mode 100644 blog/commands.py create mode 100755 create_admin.py diff --git a/blog/__init__.py b/blog/__init__.py index b85234d..771c371 100644 --- a/blog/__init__.py +++ b/blog/__init__.py @@ -1,4 +1,4 @@ -"""[summary].""" +"""Blog application initialization.""" import logging import os @@ -28,6 +28,12 @@ def configure_extensions(app): flask_sitemap.init_app(app) +def register_commands(app): + """Register custom CLI commands.""" + from blog.commands import init_app + init_app(app) + + def create_app(): app = Flask(__name__) env = os.environ.get("FLASK_ENV", "development") @@ -39,4 +45,8 @@ def create_app(): app.register_blueprint(post) app.register_blueprint(tags) app.register_blueprint(user) + + # Register CLI commands + register_commands(app) + return app diff --git a/blog/admin/__init__.py b/blog/admin/__init__.py index cb6c034..f23a70f 100644 --- a/blog/admin/__init__.py +++ b/blog/admin/__init__.py @@ -36,10 +36,10 @@ def is_accessible(self): def create_admin(config_admin): - config_admin.add_view(PostView(Post, db.session, endpoint="")) - config_admin.add_view(UserView(Category, db.session, endpoint="")) - config_admin.add_view(UserView(Tag, db.session, endpoint="")) - config_admin.add_view(UserView(User, db.session, endpoint="")) - config_admin.add_view(UserView(Icon, db.session, endpoint="")) + config_admin.add_view(PostView(Post, db.session, endpoint="admin_post")) + config_admin.add_view(UserView(Category, db.session, endpoint="admin_category")) + config_admin.add_view(UserView(Tag, db.session, endpoint="admin_tag")) + config_admin.add_view(UserView(User, db.session, endpoint="admin_user")) + config_admin.add_view(UserView(Icon, db.session, endpoint="admin_icon")) path = os.path.join(os.path.dirname(__file__), "../static/upload") config_admin.add_view(MyFileAdmin(path, "/static/upload", name="files")) diff --git a/blog/cli.py b/blog/cli.py new file mode 100644 index 0000000..da6c685 --- /dev/null +++ b/blog/cli.py @@ -0,0 +1,39 @@ +"""CLI commands for the blog application.""" + +import click +from flask.cli import with_appcontext +from blog import create_app +from blog.extensions import db +from blog.user.models import User + + +@click.command() +@click.option('--name', prompt='Username', help='The username for the admin user') +@click.option('--password', prompt=True, hide_input=True, confirmation_prompt=True, + help='The password for the admin user') +@with_appcontext +def create_admin(name, password): + """Create an admin user with the given username and password.""" + # Check if user already exists + existing_user = db.session.execute( + db.select(User).where(User.name == name) + ).scalar_one_or_none() + + if existing_user: + click.echo(f"User '{name}' already exists.") + return + + # Create new user + user = User(name=name) + user.set_password(password) + + # Add to database + db.session.add(user) + db.session.commit() + + click.echo(f"Admin user '{name}' created successfully.") + + +def register_commands(app): + """Register CLI commands with the Flask app.""" + app.cli.add_command(create_admin) \ No newline at end of file diff --git a/blog/commands.py b/blog/commands.py new file mode 100644 index 0000000..fdeea8e --- /dev/null +++ b/blog/commands.py @@ -0,0 +1,38 @@ +"""Custom CLI commands for the blog application.""" + +import click +from flask.cli import with_appcontext +from blog.extensions import db +from blog.user.models import User + + +@click.command() +@click.option('--name', prompt='Username', help='The username for the admin user') +@click.option('--password', prompt=True, hide_input=True, confirmation_prompt=True, + help='The password for the admin user') +@with_appcontext +def create_admin(name, password): + """Create an admin user with the given username and password.""" + # Check if user already exists + existing_user = db.session.execute( + db.select(User).where(User.name == name) + ).scalar_one_or_none() + + if existing_user: + click.echo("User '{}' already exists.".format(name)) + return + + # Create new user + user = User(name=name) + user.set_password(password) + + # Add to database + db.session.add(user) + db.session.commit() + + click.echo("Admin user '{}' created successfully.".format(name)) + + +def init_app(app): + """Initialize the CLI commands with the Flask app.""" + app.cli.add_command(create_admin) \ No newline at end of file diff --git a/blog/user/models.py b/blog/user/models.py index 426d8b2..d3db2c7 100644 --- a/blog/user/models.py +++ b/blog/user/models.py @@ -28,6 +28,13 @@ class User(UserMixin, db.Model): posts: Mapped[list["Post"]] = relationship("Post", back_populates="user") + def __init__(self, **kwargs): + """Initialize a new User instance.""" + super().__init__(**kwargs) + # Set default createdon if not provided + if self.createdon is None: + self.createdon = datetime.now() + def set_password(self, password: str) -> None: """Set password hash.""" self.password = generate_password_hash(password) diff --git a/create_admin.py b/create_admin.py new file mode 100755 index 0000000..c4d6e51 --- /dev/null +++ b/create_admin.py @@ -0,0 +1,71 @@ +#!/usr/bin/env python3 +""" +CLI tool to create admin users for the blog application. +This version creates a minimal Flask app context to avoid blueprint conflicts. +""" + +import sys +import os +import getpass + +# Add the project root to the Python path +sys.path.insert(0, os.path.dirname(os.path.abspath(__file__))) + +def create_admin_user(name, password): + """Create an admin user with minimal app context.""" + # Import only what we need + from flask import Flask + from blog.config import config + from blog.extensions import db + from blog.user.models import User + + # Create a minimal app + app = Flask(__name__) + app.config.from_object(config.get('development')) + + # Initialize only the database + db.init_app(app) + + with app.app_context(): + # Check if user already exists + existing_user = db.session.execute( + db.select(User).where(User.name == name) + ).scalar_one_or_none() + + if existing_user: + print("User '{}' already exists.".format(name)) + return False + + # Create new user + user = User(name=name) + user.set_password(password) + + # Add to database + db.session.add(user) + db.session.commit() + + print("Admin user '{}' created successfully.".format(name)) + return True + + +if __name__ == "__main__": + import argparse + + parser = argparse.ArgumentParser(description="Create an admin user for the blog.") + parser.add_argument("name", help="Username for the admin user") + parser.add_argument("--password", help="Password for the admin user (will prompt if not provided)") + + args = parser.parse_args() + + # Get password from command line or prompt + if args.password: + password = args.password + else: + password = getpass.getpass("Password: ") + confirm_password = getpass.getpass("Confirm Password: ") + if password != confirm_password: + print("Passwords do not match.") + sys.exit(1) + + success = create_admin_user(args.name, password) + sys.exit(0 if success else 1) \ No newline at end of file From 2a4fc8ff5a3ab01000cebe92d1e9b7e55c16a88e Mon Sep 17 00:00:00 2001 From: loki Date: Mon, 8 Sep 2025 15:40:09 +0300 Subject: [PATCH 12/34] fix admin basic --- blog/__init__.py | 2 +- blog/templates/admin/index.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/blog/__init__.py b/blog/__init__.py index 771c371..4b4ae46 100644 --- a/blog/__init__.py +++ b/blog/__init__.py @@ -24,7 +24,7 @@ def configure_extensions(app): cache.init_app(app) migrate.init_app(app=app, db=db) login_manager.init_app(app=app) - login_manager.login_view = "user.index" # type: ignore + login_manager.login_view = "user.login" # type: ignore flask_sitemap.init_app(app) diff --git a/blog/templates/admin/index.html b/blog/templates/admin/index.html index c20e04c..4ce8bb9 100644 --- a/blog/templates/admin/index.html +++ b/blog/templates/admin/index.html @@ -14,9 +14,9 @@ {% endblock %} From 7037e76cd7b5485f9cb8147dbc306a5a8dbbbe7d Mon Sep 17 00:00:00 2001 From: loki Date: Mon, 8 Sep 2025 21:50:40 +0300 Subject: [PATCH 13/34] auth --- blog/__init__.py | 5 +- blog/auth/adapter.py | 108 +++++++++++++++++++++++++++++++ blog/cli.py | 22 ++++--- blog/commands.py | 21 +++--- blog/repos/user.py | 18 ------ blog/services/user.py | 8 --- blog/user/views.py | 28 +++----- create_admin.py | 31 +++++---- tests/test_auth.py | 144 ++++++++++++++++++++++++++++++++++++++++++ 9 files changed, 306 insertions(+), 79 deletions(-) create mode 100644 blog/auth/adapter.py create mode 100644 tests/test_auth.py diff --git a/blog/__init__.py b/blog/__init__.py index 4b4ae46..cc7d845 100644 --- a/blog/__init__.py +++ b/blog/__init__.py @@ -31,6 +31,7 @@ def configure_extensions(app): def register_commands(app): """Register custom CLI commands.""" from blog.commands import init_app + init_app(app) @@ -45,8 +46,8 @@ def create_app(): app.register_blueprint(post) app.register_blueprint(tags) app.register_blueprint(user) - + # Register CLI commands register_commands(app) - + return app diff --git a/blog/auth/adapter.py b/blog/auth/adapter.py new file mode 100644 index 0000000..f199fb6 --- /dev/null +++ b/blog/auth/adapter.py @@ -0,0 +1,108 @@ +"""Authentication adapter for Flask-Login integration.""" + +import sqlalchemy as sa +from flask_login import UserMixin + +from blog.domain.user import User as UserDomain +from blog.extensions import db, login_manager +from blog.services.factory import ServiceFactory +from blog.user.models import User as UserORM + + +class FlaskLoginUser(UserORM, UserMixin): + """Extended User ORM model that includes Flask-Login's UserMixin. + + This class is used specifically for Flask-Login compatibility. + It inherits from both the User ORM model and Flask-Login's UserMixin. + """ + pass + + +class AuthenticationAdapter: + """Adapter for handling authentication with Flask-Login. + + This adapter handles the conversion between domain models and ORM models + specifically for Flask-Login integration, keeping the service layer clean. + """ + + def __init__(self): + self.user_service = ServiceFactory.create_user_service() + + def load_user(self, user_id: int) -> FlaskLoginUser | None: + """Load user by ID for Flask-Login. + + Args: + user_id: The ID of the user to load + + Returns: + FlaskLoginUser instance if user exists, None otherwise + """ + # First check if user exists using the service layer (domain model) + user_domain = self.user_service.get_user_by_id(user_id) + if not user_domain: + return None + + # Get the ORM model for Flask-Login compatibility + stmt = sa.select(UserORM).where(UserORM.id == user_id) + user_orm = db.session.scalar(stmt) + if not user_orm: + return None + + # Return a FlaskLoginUser instance + return self._to_flask_login_user(user_orm) + + def authenticate_and_login(self, name: str, password: str) -> FlaskLoginUser | None: + """Authenticate user and return FlaskLoginUser instance for login. + + Args: + name: The username + password: The password + + Returns: + FlaskLoginUser instance if authentication successful, None otherwise + """ + # Authenticate using the service layer (domain model) + user_domain = self.user_service.authenticate_user(name, password) + if not user_domain: + return None + + # Get the ORM model for Flask-Login compatibility + stmt = sa.select(UserORM).where(UserORM.name == name) + user_orm = db.session.scalar(stmt) + if not user_orm: + return None + + # Return a FlaskLoginUser instance + return self._to_flask_login_user(user_orm) + + def _to_flask_login_user(self, user_orm: UserORM) -> FlaskLoginUser: + """Convert User ORM model to FlaskLoginUser. + + Args: + user_orm: The User ORM model + + Returns: + FlaskLoginUser instance + """ + # Create a FlaskLoginUser instance with the same attributes + flask_login_user = FlaskLoginUser() + flask_login_user.id = user_orm.id + flask_login_user.name = user_orm.name + flask_login_user.password = user_orm.password + flask_login_user.authenticated = user_orm.authenticated + flask_login_user.createdon = user_orm.createdon + return flask_login_user + + +# Initialize the authentication adapter +auth_adapter = AuthenticationAdapter() + + +@login_manager.user_loader +def load_user(user_id): + """Load user by ID for Flask-Login. + + This function uses the authentication adapter to handle the Flask-Login + integration while keeping the service layer clean. + """ + return auth_adapter.load_user(int(user_id)) \ No newline at end of file diff --git a/blog/cli.py b/blog/cli.py index da6c685..47415b4 100644 --- a/blog/cli.py +++ b/blog/cli.py @@ -2,15 +2,19 @@ import click from flask.cli import with_appcontext -from blog import create_app from blog.extensions import db from blog.user.models import User @click.command() -@click.option('--name', prompt='Username', help='The username for the admin user') -@click.option('--password', prompt=True, hide_input=True, confirmation_prompt=True, - help='The password for the admin user') +@click.option("--name", prompt="Username", help="The username for the admin user") +@click.option( + "--password", + prompt=True, + hide_input=True, + confirmation_prompt=True, + help="The password for the admin user", +) @with_appcontext def create_admin(name, password): """Create an admin user with the given username and password.""" @@ -18,22 +22,22 @@ def create_admin(name, password): existing_user = db.session.execute( db.select(User).where(User.name == name) ).scalar_one_or_none() - + if existing_user: click.echo(f"User '{name}' already exists.") return - + # Create new user user = User(name=name) user.set_password(password) - + # Add to database db.session.add(user) db.session.commit() - + click.echo(f"Admin user '{name}' created successfully.") def register_commands(app): """Register CLI commands with the Flask app.""" - app.cli.add_command(create_admin) \ No newline at end of file + app.cli.add_command(create_admin) diff --git a/blog/commands.py b/blog/commands.py index fdeea8e..9b55a5d 100644 --- a/blog/commands.py +++ b/blog/commands.py @@ -7,9 +7,14 @@ @click.command() -@click.option('--name', prompt='Username', help='The username for the admin user') -@click.option('--password', prompt=True, hide_input=True, confirmation_prompt=True, - help='The password for the admin user') +@click.option("--name", prompt="Username", help="The username for the admin user") +@click.option( + "--password", + prompt=True, + hide_input=True, + confirmation_prompt=True, + help="The password for the admin user", +) @with_appcontext def create_admin(name, password): """Create an admin user with the given username and password.""" @@ -17,22 +22,22 @@ def create_admin(name, password): existing_user = db.session.execute( db.select(User).where(User.name == name) ).scalar_one_or_none() - + if existing_user: click.echo("User '{}' already exists.".format(name)) return - + # Create new user user = User(name=name) user.set_password(password) - + # Add to database db.session.add(user) db.session.commit() - + click.echo("Admin user '{}' created successfully.".format(name)) def init_app(app): """Initialize the CLI commands with the Flask app.""" - app.cli.add_command(create_admin) \ No newline at end of file + app.cli.add_command(create_admin) diff --git a/blog/repos/user.py b/blog/repos/user.py index c0b0947..aa32307 100644 --- a/blog/repos/user.py +++ b/blog/repos/user.py @@ -15,24 +15,6 @@ class UserRepository: def __init__(self, session: Any = None): self.session = session or db.session - def get_user_orm_with_relationships(self, user_id: int) -> UserORM | None: - stmt = ( - sa.select(UserORM) - .where(UserORM.id == user_id) - .options(sa.orm.joinedload(UserORM.posts)) - ) - return self.session.scalar(stmt) - - def get_user_orm_by_id(self, user_id: int) -> UserORM | None: - """Get a user ORM model by its ID. Used for Flask-Login compatibility.""" - stmt = sa.select(UserORM).where(UserORM.id == user_id) - return self.session.scalar(stmt) - - def get_user_orm_by_name(self, name: str) -> UserORM | None: - """Get a user ORM model by their name. Used for Flask-Login compatibility.""" - stmt = sa.select(UserORM).where(UserORM.name == name) - return self.session.scalar(stmt) - def get_by_id(self, user_id: int) -> UserDomain | None: stmt = sa.select(UserORM).where(UserORM.id == user_id) user_orm = self.session.scalar(stmt) diff --git a/blog/services/user.py b/blog/services/user.py index 0c127e6..d0f55b7 100644 --- a/blog/services/user.py +++ b/blog/services/user.py @@ -19,14 +19,6 @@ def __init__(self, user_repository: UserRepository): def get_user_by_id(self, user_id: int) -> User | None: return self.user_repository.get_by_id(user_id) - def get_user_orm_by_id(self, user_id: int): - """Get a user ORM model by its ID. Used for Flask-Login compatibility.""" - return self.user_repository.get_user_orm_by_id(user_id) - - def get_user_orm_by_name(self, name: str): - """Get a user ORM model by their name. Used for Flask-Login compatibility.""" - return self.user_repository.get_user_orm_by_name(name) - def get_user_by_name(self, name: str) -> User | None: return self.user_repository.get_by_name(name) diff --git a/blog/user/views.py b/blog/user/views.py index ed3044e..8b05f1f 100644 --- a/blog/user/views.py +++ b/blog/user/views.py @@ -2,9 +2,9 @@ from flask import Blueprint, flash, redirect, render_template, url_for from flask_login import current_user, login_user +from blog.auth.adapter import auth_adapter from blog.extensions import login_manager from blog.user.forms import LoginForm -from blog.services.factory import ServiceFactory user = Blueprint("user", __name__) @@ -13,14 +13,8 @@ @login_manager.user_loader def load_user(user_id): """Load user by ID for Flask-Login.""" - # For Flask-Login compatibility, we need to return an ORM model - user_service = ServiceFactory.create_user_service() - user = user_service.get_user_by_id(int(user_id)) - if user: - # This is one of the few places where we directly access the service layer - # to get an ORM model because Flask-Login requires an ORM model - return user_service.get_user_orm_by_id(int(user_id)) - return None + # Use the authentication adapter for Flask-Login integration + return auth_adapter.load_user(int(user_id)) @user.route("/login", methods=["GET", "POST"]) @@ -33,17 +27,11 @@ def login(): name = form.name.data password = form.password.data if name is not None and password is not None: - user_service = ServiceFactory.create_user_service() - user = user_service.authenticate_user(name, password) - - if user: - # Get the ORM model directly from service layer for Flask-Login - # This is one of the few places where we directly access the service layer - # to get an ORM model because Flask-Login requires an ORM model - user_orm = user_service.get_user_orm_by_name(name) - if user_orm: - login_user(user_orm) - return redirect(url_for("admin.index")) + # Use the authentication adapter for Flask-Login integration + user_orm = auth_adapter.authenticate_and_login(name, password) + if user_orm: + login_user(user_orm) + return redirect(url_for("admin.index")) flash("invalid user o password") return redirect(url_for("user.login")) return render_template("login.html", form=form) diff --git a/create_admin.py b/create_admin.py index c4d6e51..f2d1d12 100755 --- a/create_admin.py +++ b/create_admin.py @@ -11,6 +11,7 @@ # Add the project root to the Python path sys.path.insert(0, os.path.dirname(os.path.abspath(__file__))) + def create_admin_user(name, password): """Create an admin user with minimal app context.""" # Import only what we need @@ -18,45 +19,47 @@ def create_admin_user(name, password): from blog.config import config from blog.extensions import db from blog.user.models import User - + # Create a minimal app app = Flask(__name__) - app.config.from_object(config.get('development')) - + app.config.from_object(config.get("development")) + # Initialize only the database db.init_app(app) - + with app.app_context(): # Check if user already exists existing_user = db.session.execute( db.select(User).where(User.name == name) ).scalar_one_or_none() - + if existing_user: print("User '{}' already exists.".format(name)) return False - + # Create new user user = User(name=name) user.set_password(password) - + # Add to database db.session.add(user) db.session.commit() - + print("Admin user '{}' created successfully.".format(name)) return True if __name__ == "__main__": import argparse - + parser = argparse.ArgumentParser(description="Create an admin user for the blog.") parser.add_argument("name", help="Username for the admin user") - parser.add_argument("--password", help="Password for the admin user (will prompt if not provided)") - + parser.add_argument( + "--password", help="Password for the admin user (will prompt if not provided)" + ) + args = parser.parse_args() - + # Get password from command line or prompt if args.password: password = args.password @@ -66,6 +69,6 @@ def create_admin_user(name, password): if password != confirm_password: print("Passwords do not match.") sys.exit(1) - + success = create_admin_user(args.name, password) - sys.exit(0 if success else 1) \ No newline at end of file + sys.exit(0 if success else 1) diff --git a/tests/test_auth.py b/tests/test_auth.py new file mode 100644 index 0000000..89c7f50 --- /dev/null +++ b/tests/test_auth.py @@ -0,0 +1,144 @@ +"""Unit tests for the authentication adapter.""" + +import pytest +import os +import datetime + +from blog import create_app +from blog.extensions import db +from blog.domain.user import User as UserDomain +from blog.auth.adapter import AuthenticationAdapter +from blog.user.models import User as UserORM +from blog.services.factory import ServiceFactory + + +@pytest.fixture() +def app(): + os.environ["FLASK_ENV"] = "testing" + app = create_app() + with app.app_context(): + db.create_all() + yield app + db.session.remove() + db.drop_all() + + +@pytest.fixture() +def auth_adapter(app): + """Create an AuthenticationAdapter instance for testing.""" + return AuthenticationAdapter() + + +@pytest.fixture() +def user_service(app): + """Create a UserService instance for testing.""" + return ServiceFactory.create_user_service() + + +class TestAuthenticationAdapter: + """Test cases for AuthenticationAdapter.""" + + def test_load_user_existing_user(self, app, auth_adapter, user_service): + """Test loading an existing user by ID.""" + with app.app_context(): + # Create a user first + user_domain = UserDomain(name="testuser", password="testpassword") + created_user = user_service.create_user(user_domain) + + # Set the password properly + user_orm = db.session.get(UserORM, created_user.id) + if user_orm: + user_orm.set_password("testpassword") + db.session.commit() + + # Load the user using the adapter + loaded_user = auth_adapter.load_user(created_user.id) + + # Verify the user was loaded correctly + assert loaded_user is not None + assert loaded_user.id == created_user.id + assert loaded_user.name == "testuser" + + def test_load_user_nonexistent_user(self, app, auth_adapter): + """Test loading a nonexistent user by ID.""" + with app.app_context(): + # Try to load a user that doesn't exist + loaded_user = auth_adapter.load_user(99999) + + # Verify None is returned + assert loaded_user is None + + def test_authenticate_and_login_valid_credentials(self, app, auth_adapter, user_service): + """Test authenticating with valid credentials.""" + with app.app_context(): + # Create a user first + user_domain = UserDomain(name="testuser", password="testpassword") + created_user = user_service.create_user(user_domain) + + # Set the password properly + user_orm = db.session.get(UserORM, created_user.id) + if user_orm: + user_orm.set_password("testpassword") + db.session.commit() + + # Authenticate the user using the adapter + authenticated_user = auth_adapter.authenticate_and_login("testuser", "testpassword") + + # Verify the user was authenticated correctly + assert authenticated_user is not None + assert authenticated_user.id == created_user.id + assert authenticated_user.name == "testuser" + + def test_authenticate_and_login_invalid_credentials(self, app, auth_adapter, user_service): + """Test authenticating with invalid credentials.""" + with app.app_context(): + # Create a user first + user_domain = UserDomain(name="testuser", password="testpassword") + created_user = user_service.create_user(user_domain) + + # Set the password properly + user_orm = db.session.get(UserORM, created_user.id) + if user_orm: + user_orm.set_password("testpassword") + db.session.commit() + + # Try to authenticate with wrong password + authenticated_user = auth_adapter.authenticate_and_login("testuser", "wrongpassword") + + # Verify None is returned + assert authenticated_user is None + + def test_authenticate_and_login_nonexistent_user(self, app, auth_adapter): + """Test authenticating a nonexistent user.""" + with app.app_context(): + # Try to authenticate a user that doesn't exist + authenticated_user = auth_adapter.authenticate_and_login("nonexistent", "password") + + # Verify None is returned + assert authenticated_user is None + + def test_to_flask_login_user_conversion(self, app, auth_adapter, user_service): + """Test converting User ORM model to FlaskLoginUser.""" + with app.app_context(): + # Create a user first + user_domain = UserDomain(name="testuser", password="testpassword") + created_user = user_service.create_user(user_domain) + + # Set the password properly + user_orm = db.session.get(UserORM, created_user.id) + if user_orm: + user_orm.set_password("testpassword") + db.session.commit() + + # Get the ORM model directly from the database + user_orm = db.session.get(UserORM, created_user.id) + assert user_orm is not None + + # Convert to FlaskLoginUser + flask_login_user = auth_adapter._to_flask_login_user(user_orm) + + # Verify the conversion was correct + assert flask_login_user.id == user_orm.id + assert flask_login_user.name == user_orm.name + assert flask_login_user.password == user_orm.password + assert flask_login_user.authenticated == user_orm.authenticated \ No newline at end of file From fb426bcdfe8f12139499a5791d3f07f2807f41ee Mon Sep 17 00:00:00 2001 From: loki Date: Mon, 8 Sep 2025 22:03:53 +0300 Subject: [PATCH 14/34] more abstract to gods of abstracts --- blog/auth/adapter.py | 30 ++++++++-------- blog/repos/base.py | 36 ++++++++++++++++++++ blog/repos/category.py | 45 ++++++++++++------------ blog/repos/icon.py | 45 ++++++++++++------------ blog/repos/post.py | 77 +++++++++++++++++++++--------------------- blog/repos/tag.py | 37 ++++++++++---------- blog/repos/user.py | 49 ++++++++++++++------------- 7 files changed, 180 insertions(+), 139 deletions(-) create mode 100644 blog/repos/base.py diff --git a/blog/auth/adapter.py b/blog/auth/adapter.py index f199fb6..27a2fef 100644 --- a/blog/auth/adapter.py +++ b/blog/auth/adapter.py @@ -3,7 +3,6 @@ import sqlalchemy as sa from flask_login import UserMixin -from blog.domain.user import User as UserDomain from blog.extensions import db, login_manager from blog.services.factory import ServiceFactory from blog.user.models import User as UserORM @@ -11,16 +10,17 @@ class FlaskLoginUser(UserORM, UserMixin): """Extended User ORM model that includes Flask-Login's UserMixin. - + This class is used specifically for Flask-Login compatibility. It inherits from both the User ORM model and Flask-Login's UserMixin. """ + pass class AuthenticationAdapter: """Adapter for handling authentication with Flask-Login. - + This adapter handles the conversion between domain models and ORM models specifically for Flask-Login integration, keeping the service layer clean. """ @@ -30,10 +30,10 @@ def __init__(self): def load_user(self, user_id: int) -> FlaskLoginUser | None: """Load user by ID for Flask-Login. - + Args: user_id: The ID of the user to load - + Returns: FlaskLoginUser instance if user exists, None otherwise """ @@ -41,23 +41,23 @@ def load_user(self, user_id: int) -> FlaskLoginUser | None: user_domain = self.user_service.get_user_by_id(user_id) if not user_domain: return None - + # Get the ORM model for Flask-Login compatibility stmt = sa.select(UserORM).where(UserORM.id == user_id) user_orm = db.session.scalar(stmt) if not user_orm: return None - + # Return a FlaskLoginUser instance return self._to_flask_login_user(user_orm) def authenticate_and_login(self, name: str, password: str) -> FlaskLoginUser | None: """Authenticate user and return FlaskLoginUser instance for login. - + Args: name: The username password: The password - + Returns: FlaskLoginUser instance if authentication successful, None otherwise """ @@ -65,22 +65,22 @@ def authenticate_and_login(self, name: str, password: str) -> FlaskLoginUser | N user_domain = self.user_service.authenticate_user(name, password) if not user_domain: return None - + # Get the ORM model for Flask-Login compatibility stmt = sa.select(UserORM).where(UserORM.name == name) user_orm = db.session.scalar(stmt) if not user_orm: return None - + # Return a FlaskLoginUser instance return self._to_flask_login_user(user_orm) def _to_flask_login_user(self, user_orm: UserORM) -> FlaskLoginUser: """Convert User ORM model to FlaskLoginUser. - + Args: user_orm: The User ORM model - + Returns: FlaskLoginUser instance """ @@ -101,8 +101,8 @@ def _to_flask_login_user(self, user_orm: UserORM) -> FlaskLoginUser: @login_manager.user_loader def load_user(user_id): """Load user by ID for Flask-Login. - + This function uses the authentication adapter to handle the Flask-Login integration while keeping the service layer clean. """ - return auth_adapter.load_user(int(user_id)) \ No newline at end of file + return auth_adapter.load_user(int(user_id)) diff --git a/blog/repos/base.py b/blog/repos/base.py new file mode 100644 index 0000000..f4b2461 --- /dev/null +++ b/blog/repos/base.py @@ -0,0 +1,36 @@ +"""Base repository interface for the application.""" + +from abc import ABC, abstractmethod +from typing import TypeVar, Generic, List, Optional + +T = TypeVar("T") # Domain model type +ID = TypeVar("ID") # ID type + + +class BaseRepository(ABC, Generic[T, ID]): + """Abstract base class for all repositories.""" + + @abstractmethod + def get_by_id(self, id: ID) -> Optional[T]: + """Get an entity by its ID.""" + pass + + @abstractmethod + def get_all(self) -> List[T]: + """Get all entities.""" + pass + + @abstractmethod + def create(self, entity: T) -> T: + """Create a new entity.""" + pass + + @abstractmethod + def update(self, entity: T) -> T: + """Update an existing entity.""" + pass + + @abstractmethod + def delete(self, id: ID) -> bool: + """Delete an entity by its ID.""" + pass diff --git a/blog/repos/category.py b/blog/repos/category.py index dbbbfbf..2ed62e6 100644 --- a/blog/repos/category.py +++ b/blog/repos/category.py @@ -1,15 +1,16 @@ """Repository for Category entities.""" import sqlalchemy as sa -from typing import Any +from typing import Any, List, Optional from blog.extensions import db from blog.category.models import Category as CategoryORM from blog.domain.category import Category as CategoryDomain from blog.domain.post import Post as PostDomain +from blog.repos.base import BaseRepository -class CategoryRepository: +class CategoryRepository(BaseRepository[CategoryDomain, int]): """Repository for Category entities.""" def __init__(self, session: Any = None): @@ -25,8 +26,8 @@ def get_category_orm_with_relationships( ) return self.session.scalar(stmt) - def get_by_id(self, category_id: int) -> CategoryDomain | None: - stmt = sa.select(CategoryORM).where(CategoryORM.id == category_id) + def get_by_id(self, id: int) -> Optional[CategoryDomain]: + stmt = sa.select(CategoryORM).where(CategoryORM.id == id) category_orm = self.session.scalar(stmt) if category_orm: return self._to_domain_model(category_orm) @@ -39,7 +40,7 @@ def get_by_alias(self, alias: str) -> CategoryDomain | None: return self._to_domain_model(category_orm) return None - def get_all(self) -> list[CategoryDomain]: + def get_all(self) -> List[CategoryDomain]: stmt = sa.select(CategoryORM) categories_orm = list(self.session.scalars(stmt).all()) return [self._to_domain_model(category_orm) for category_orm in categories_orm] @@ -49,34 +50,34 @@ def get_categories_with_posts(self) -> list[CategoryDomain]: categories_orm = list(self.session.scalars(stmt).unique().all()) return [self._to_domain_model(category_orm) for category_orm in categories_orm] - def create(self, category: CategoryDomain) -> CategoryDomain: + def create(self, entity: CategoryDomain) -> CategoryDomain: category_orm = CategoryORM() - category_orm.title = category.title - category_orm.alias = category.alias + category_orm.title = entity.title + category_orm.alias = entity.alias # Handle the case where template might be None - if category.template is not None: - category_orm.template = category.template + if entity.template is not None: + category_orm.template = entity.template self.session.add(category_orm) self.session.flush() # Get the ID without committing - category.id = category_orm.id - return category + entity.id = category_orm.id + return entity - def update(self, category: CategoryDomain) -> CategoryDomain: - stmt = sa.select(CategoryORM).where(CategoryORM.id == category.id) + def update(self, entity: CategoryDomain) -> CategoryDomain: + stmt = sa.select(CategoryORM).where(CategoryORM.id == entity.id) category_orm = self.session.scalar(stmt) if not category_orm: - raise ValueError(f"Category with id {category.id} not found") + raise ValueError(f"Category with id {entity.id} not found") - category_orm.title = category.title - category_orm.alias = category.alias + category_orm.title = entity.title + category_orm.alias = entity.alias # Handle the case where template might be None - if category.template is not None: - category_orm.template = category.template + if entity.template is not None: + category_orm.template = entity.template self.session.flush() - return category + return entity - def delete(self, category_id: int) -> bool: - stmt = sa.select(CategoryORM).where(CategoryORM.id == category_id) + def delete(self, id: int) -> bool: + stmt = sa.select(CategoryORM).where(CategoryORM.id == id) category_orm = self.session.scalar(stmt) if category_orm: self.session.delete(category_orm) diff --git a/blog/repos/icon.py b/blog/repos/icon.py index 138eebc..ebe85fa 100644 --- a/blog/repos/icon.py +++ b/blog/repos/icon.py @@ -1,14 +1,15 @@ """Repository for Icon entities.""" import sqlalchemy as sa -from typing import Any +from typing import Any, List, Optional from blog.extensions import db from blog.post.models import Icon as IconORM from blog.domain.icon import Icon +from blog.repos.base import BaseRepository -class IconRepository: +class IconRepository(BaseRepository[Icon, int]): """Repository for Icon entities.""" def __init__(self, session: Any = None): @@ -24,8 +25,8 @@ def get_all_icons_orm(self) -> list[IconORM]: stmt = sa.select(IconORM) return list(self.session.scalars(stmt).all()) - def get_by_id(self, icon_id: int) -> Icon | None: - stmt = sa.select(IconORM).where(IconORM.id == icon_id) + def get_by_id(self, id: int) -> Optional[Icon]: + stmt = sa.select(IconORM).where(IconORM.id == id) icon_orm = self.session.scalar(stmt) if icon_orm: return self._to_domain_model(icon_orm) @@ -38,37 +39,37 @@ def get_by_title(self, title: str) -> Icon | None: return self._to_domain_model(icon_orm) return None - def get_all(self) -> list[Icon]: + def get_all(self) -> List[Icon]: stmt = sa.select(IconORM) icons_orm = list(self.session.scalars(stmt).all()) return [self._to_domain_model(icon_orm) for icon_orm in icons_orm] - def create(self, icon: Icon) -> Icon: + def create(self, entity: Icon) -> Icon: icon_orm = IconORM() - icon_orm.title = icon.title - icon_orm.url = icon.url - if icon.content is not None: - icon_orm.content = icon.content + icon_orm.title = entity.title + icon_orm.url = entity.url + if entity.content is not None: + icon_orm.content = entity.content self.session.add(icon_orm) self.session.flush() # Get the ID without committing - icon.id = icon_orm.id - return icon + entity.id = icon_orm.id + return entity - def update(self, icon: Icon) -> Icon: - stmt = sa.select(IconORM).where(IconORM.id == icon.id) + def update(self, entity: Icon) -> Icon: + stmt = sa.select(IconORM).where(IconORM.id == entity.id) icon_orm = self.session.scalar(stmt) if not icon_orm: - raise ValueError(f"Icon with id {icon.id} not found") + raise ValueError(f"Icon with id {entity.id} not found") - icon_orm.title = icon.title - icon_orm.url = icon.url - if icon.content is not None: - icon_orm.content = icon.content + icon_orm.title = entity.title + icon_orm.url = entity.url + if entity.content is not None: + icon_orm.content = entity.content self.session.flush() - return icon + return entity - def delete(self, icon_id: int) -> bool: - stmt = sa.select(IconORM).where(IconORM.id == icon_id) + def delete(self, id: int) -> bool: + stmt = sa.select(IconORM).where(IconORM.id == id) icon_orm = self.session.scalar(stmt) if icon_orm: self.session.delete(icon_orm) diff --git a/blog/repos/post.py b/blog/repos/post.py index 384274a..9f86151 100644 --- a/blog/repos/post.py +++ b/blog/repos/post.py @@ -1,7 +1,7 @@ """Repository for Post entities.""" import sqlalchemy as sa -from typing import Any +from typing import Any, List, Optional from blog.extensions import db from blog.post.models import Post as PostORM @@ -10,9 +10,10 @@ from blog.domain.user import User as UserDomain from blog.domain.category import Category as CategoryDomain from blog.domain.tag import Tag as TagDomain +from blog.repos.base import BaseRepository -class PostRepository: +class PostRepository(BaseRepository[PostDomain, int]): """Repository for Post entities.""" def __init__(self, session: Any = None): @@ -33,8 +34,8 @@ def get_post_with_relationships(self, post_id: int) -> PostDomain | None: return self._to_domain_model(post_orm) return None - def get_by_id(self, post_id: int) -> PostDomain | None: - stmt = sa.select(PostORM).where(PostORM.id == post_id) + def get_by_id(self, id: int) -> Optional[PostDomain]: + stmt = sa.select(PostORM).where(PostORM.id == id) post_orm = self.session.scalar(stmt) if post_orm: return self._to_domain_model(post_orm) @@ -47,7 +48,7 @@ def get_by_alias(self, alias: str) -> PostDomain | None: return self._to_domain_model(post_orm) return None - def get_all(self) -> list[PostDomain]: + def get_all(self) -> List[PostDomain]: stmt = sa.select(PostORM) posts_orm = list(self.session.scalars(stmt).all()) return [self._to_domain_model(post_orm) for post_orm in posts_orm] @@ -69,25 +70,25 @@ def get_page_posts(self, page_category_ids: list[int]) -> list[PostDomain]: posts_orm = list(self.session.scalars(stmt).all()) return [self._to_domain_model(post_orm) for post_orm in posts_orm] - def create(self, post: PostDomain) -> PostDomain: + def create(self, entity: PostDomain) -> PostDomain: post_orm = PostORM() - post_orm.pagetitle = post.pagetitle - post_orm.alias = post.alias - post_orm.content = post.content + post_orm.pagetitle = entity.pagetitle + post_orm.alias = entity.alias + post_orm.content = entity.content # Handle datetime fields that might be None - if post.createdon is not None: - post_orm.createdon = post.createdon - if post.publishedon is not None: - post_orm.publishedon = post.publishedon - if post.category_id is not None: - post_orm.category_id = post.category_id - if post.user_id is not None: - post_orm.user_id = post.user_id + if entity.createdon is not None: + post_orm.createdon = entity.createdon + if entity.publishedon is not None: + post_orm.publishedon = entity.publishedon + if entity.category_id is not None: + post_orm.category_id = entity.category_id + if entity.user_id is not None: + post_orm.user_id = entity.user_id # Handle tags relationship if provided - if post.tags: + if entity.tags: # Find existing Tag ORM models based on the domain Tag models - tag_ids = [tag.id for tag in post.tags if tag.id is not None] + tag_ids = [tag.id for tag in entity.tags if tag.id is not None] if tag_ids: stmt = sa.select(TagORM).where(TagORM.id.in_(tag_ids)) existing_tags = list(self.session.scalars(stmt).all()) @@ -95,32 +96,32 @@ def create(self, post: PostDomain) -> PostDomain: self.session.add(post_orm) self.session.flush() # Get the ID without committing - post.id = post_orm.id - return post + entity.id = post_orm.id + return entity - def update(self, post: PostDomain) -> PostDomain: - stmt = sa.select(PostORM).where(PostORM.id == post.id) + def update(self, entity: PostDomain) -> PostDomain: + stmt = sa.select(PostORM).where(PostORM.id == entity.id) post_orm = self.session.scalar(stmt) if not post_orm: - raise ValueError(f"Post with id {post.id} not found") + raise ValueError(f"Post with id {entity.id} not found") - post_orm.pagetitle = post.pagetitle - post_orm.alias = post.alias - post_orm.content = post.content + post_orm.pagetitle = entity.pagetitle + post_orm.alias = entity.alias + post_orm.content = entity.content # Handle datetime fields that might be None - if post.createdon is not None: - post_orm.createdon = post.createdon - if post.publishedon is not None: - post_orm.publishedon = post.publishedon - if post.category_id is not None: - post_orm.category_id = post.category_id - if post.user_id is not None: - post_orm.user_id = post.user_id + if entity.createdon is not None: + post_orm.createdon = entity.createdon + if entity.publishedon is not None: + post_orm.publishedon = entity.publishedon + if entity.category_id is not None: + post_orm.category_id = entity.category_id + if entity.user_id is not None: + post_orm.user_id = entity.user_id self.session.flush() - return post + return entity - def delete(self, post_id: int) -> bool: - stmt = sa.select(PostORM).where(PostORM.id == post_id) + def delete(self, id: int) -> bool: + stmt = sa.select(PostORM).where(PostORM.id == id) post_orm = self.session.scalar(stmt) if post_orm: self.session.delete(post_orm) diff --git a/blog/repos/tag.py b/blog/repos/tag.py index bf32272..94bbc2d 100644 --- a/blog/repos/tag.py +++ b/blog/repos/tag.py @@ -1,15 +1,16 @@ """Repository for Tag entities.""" import sqlalchemy as sa -from typing import Any +from typing import Any, List, Optional from blog.extensions import db from blog.tags.models import Tag as TagORM from blog.domain.tag import Tag as TagDomain from blog.domain.post import Post as PostDomain +from blog.repos.base import BaseRepository -class TagRepository: +class TagRepository(BaseRepository[TagDomain, int]): """Repository for Tag entities.""" def __init__(self, session: Any = None): @@ -23,8 +24,8 @@ def get_tag_orm_with_relationships(self, tag_id: int) -> TagORM | None: ) return self.session.scalar(stmt) - def get_by_id(self, tag_id: int) -> TagDomain | None: - stmt = sa.select(TagORM).where(TagORM.id == tag_id) + def get_by_id(self, id: int) -> Optional[TagDomain]: + stmt = sa.select(TagORM).where(TagORM.id == id) tag_orm = self.session.scalar(stmt) if tag_orm: return self._to_domain_model(tag_orm) @@ -37,7 +38,7 @@ def get_by_alias(self, alias: str) -> TagDomain | None: return self._to_domain_model(tag_orm) return None - def get_all(self) -> list[TagDomain]: + def get_all(self) -> List[TagDomain]: stmt = sa.select(TagORM) tags_orm = list(self.session.scalars(stmt).all()) return [self._to_domain_model(tag_orm) for tag_orm in tags_orm] @@ -47,28 +48,28 @@ def get_tags_with_posts(self) -> list[TagDomain]: tags_orm = list(self.session.scalars(stmt).unique().all()) return [self._to_domain_model(tag_orm) for tag_orm in tags_orm] - def create(self, tag: TagDomain) -> TagDomain: + def create(self, entity: TagDomain) -> TagDomain: tag_orm = TagORM() - tag_orm.title = tag.title - tag_orm.alias = tag.alias + tag_orm.title = entity.title + tag_orm.alias = entity.alias self.session.add(tag_orm) self.session.flush() # Get the ID without committing - tag.id = tag_orm.id - return tag + entity.id = tag_orm.id + return entity - def update(self, tag: TagDomain) -> TagDomain: - stmt = sa.select(TagORM).where(TagORM.id == tag.id) + def update(self, entity: TagDomain) -> TagDomain: + stmt = sa.select(TagORM).where(TagORM.id == entity.id) tag_orm = self.session.scalar(stmt) if not tag_orm: - raise ValueError(f"Tag with id {tag.id} not found") + raise ValueError(f"Tag with id {entity.id} not found") - tag_orm.title = tag.title - tag_orm.alias = tag.alias + tag_orm.title = entity.title + tag_orm.alias = entity.alias self.session.flush() - return tag + return entity - def delete(self, tag_id: int) -> bool: - stmt = sa.select(TagORM).where(TagORM.id == tag_id) + def delete(self, id: int) -> bool: + stmt = sa.select(TagORM).where(TagORM.id == id) tag_orm = self.session.scalar(stmt) if tag_orm: self.session.delete(tag_orm) diff --git a/blog/repos/user.py b/blog/repos/user.py index aa32307..34290e0 100644 --- a/blog/repos/user.py +++ b/blog/repos/user.py @@ -1,22 +1,23 @@ """Repository for User entities.""" import sqlalchemy as sa -from typing import Any +from typing import Any, List, Optional from blog.extensions import db from blog.user.models import User as UserORM from blog.domain.user import User as UserDomain from blog.domain.post import Post as PostDomain +from blog.repos.base import BaseRepository -class UserRepository: +class UserRepository(BaseRepository[UserDomain, int]): """Repository for User entities.""" def __init__(self, session: Any = None): self.session = session or db.session - def get_by_id(self, user_id: int) -> UserDomain | None: - stmt = sa.select(UserORM).where(UserORM.id == user_id) + def get_by_id(self, id: int) -> Optional[UserDomain]: + stmt = sa.select(UserORM).where(UserORM.id == id) user_orm = self.session.scalar(stmt) if user_orm: return self._to_domain_model(user_orm) @@ -29,7 +30,7 @@ def get_by_name(self, name: str) -> UserDomain | None: return self._to_domain_model(user_orm) return None - def get_all(self) -> list[UserDomain]: + def get_all(self) -> List[UserDomain]: stmt = sa.select(UserORM) users_orm = self.session.scalars(stmt).all() return [self._to_domain_model(user_orm) for user_orm in users_orm] @@ -39,42 +40,42 @@ def get_users_with_posts(self) -> list[UserDomain]: users_orm = self.session.scalars(stmt).unique().all() return [self._to_domain_model(user_orm) for user_orm in users_orm] - def create(self, user: UserDomain) -> UserDomain: + def create(self, entity: UserDomain) -> UserDomain: user_orm = UserORM() - user_orm.name = user.name - user_orm.password = user.password + user_orm.name = entity.name + user_orm.password = entity.password # Handle the case where authenticated might be None user_orm.authenticated = ( - user.authenticated if user.authenticated is not None else False + entity.authenticated if entity.authenticated is not None else False ) # Handle datetime field that might be None - if user.createdon is not None: - user_orm.createdon = user.createdon + if entity.createdon is not None: + user_orm.createdon = entity.createdon self.session.add(user_orm) self.session.flush() # Get the ID without committing - user.id = user_orm.id - return user + entity.id = user_orm.id + return entity - def update(self, user: UserDomain) -> UserDomain: - stmt = sa.select(UserORM).where(UserORM.id == user.id) + def update(self, entity: UserDomain) -> UserDomain: + stmt = sa.select(UserORM).where(UserORM.id == entity.id) user_orm = self.session.scalar(stmt) if not user_orm: - raise ValueError(f"User with id {user.id} not found") + raise ValueError(f"User with id {entity.id} not found") - user_orm.name = user.name - user_orm.password = user.password + user_orm.name = entity.name + user_orm.password = entity.password # Handle the case where authenticated might be None user_orm.authenticated = ( - user.authenticated if user.authenticated is not None else False + entity.authenticated if entity.authenticated is not None else False ) # Handle datetime field that might be None - if user.createdon is not None: - user_orm.createdon = user.createdon + if entity.createdon is not None: + user_orm.createdon = entity.createdon self.session.flush() - return user + return entity - def delete(self, user_id: int) -> bool: - stmt = sa.select(UserORM).where(UserORM.id == user_id) + def delete(self, id: int) -> bool: + stmt = sa.select(UserORM).where(UserORM.id == id) user_orm = self.session.scalar(stmt) if user_orm: self.session.delete(user_orm) From 6d859e86de4f4c9fe55391c0f3de25f11a0497a8 Mon Sep 17 00:00:00 2001 From: loki Date: Mon, 8 Sep 2025 22:04:14 +0300 Subject: [PATCH 15/34] auth fix --- tests/test_auth.py | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/tests/test_auth.py b/tests/test_auth.py index 89c7f50..2171088 100644 --- a/tests/test_auth.py +++ b/tests/test_auth.py @@ -2,7 +2,6 @@ import pytest import os -import datetime from blog import create_app from blog.extensions import db @@ -44,7 +43,7 @@ def test_load_user_existing_user(self, app, auth_adapter, user_service): # Create a user first user_domain = UserDomain(name="testuser", password="testpassword") created_user = user_service.create_user(user_domain) - + # Set the password properly user_orm = db.session.get(UserORM, created_user.id) if user_orm: @@ -68,13 +67,15 @@ def test_load_user_nonexistent_user(self, app, auth_adapter): # Verify None is returned assert loaded_user is None - def test_authenticate_and_login_valid_credentials(self, app, auth_adapter, user_service): + def test_authenticate_and_login_valid_credentials( + self, app, auth_adapter, user_service + ): """Test authenticating with valid credentials.""" with app.app_context(): # Create a user first user_domain = UserDomain(name="testuser", password="testpassword") created_user = user_service.create_user(user_domain) - + # Set the password properly user_orm = db.session.get(UserORM, created_user.id) if user_orm: @@ -82,20 +83,24 @@ def test_authenticate_and_login_valid_credentials(self, app, auth_adapter, user_ db.session.commit() # Authenticate the user using the adapter - authenticated_user = auth_adapter.authenticate_and_login("testuser", "testpassword") + authenticated_user = auth_adapter.authenticate_and_login( + "testuser", "testpassword" + ) # Verify the user was authenticated correctly assert authenticated_user is not None assert authenticated_user.id == created_user.id assert authenticated_user.name == "testuser" - def test_authenticate_and_login_invalid_credentials(self, app, auth_adapter, user_service): + def test_authenticate_and_login_invalid_credentials( + self, app, auth_adapter, user_service + ): """Test authenticating with invalid credentials.""" with app.app_context(): # Create a user first user_domain = UserDomain(name="testuser", password="testpassword") created_user = user_service.create_user(user_domain) - + # Set the password properly user_orm = db.session.get(UserORM, created_user.id) if user_orm: @@ -103,7 +108,9 @@ def test_authenticate_and_login_invalid_credentials(self, app, auth_adapter, use db.session.commit() # Try to authenticate with wrong password - authenticated_user = auth_adapter.authenticate_and_login("testuser", "wrongpassword") + authenticated_user = auth_adapter.authenticate_and_login( + "testuser", "wrongpassword" + ) # Verify None is returned assert authenticated_user is None @@ -112,7 +119,9 @@ def test_authenticate_and_login_nonexistent_user(self, app, auth_adapter): """Test authenticating a nonexistent user.""" with app.app_context(): # Try to authenticate a user that doesn't exist - authenticated_user = auth_adapter.authenticate_and_login("nonexistent", "password") + authenticated_user = auth_adapter.authenticate_and_login( + "nonexistent", "password" + ) # Verify None is returned assert authenticated_user is None @@ -123,7 +132,7 @@ def test_to_flask_login_user_conversion(self, app, auth_adapter, user_service): # Create a user first user_domain = UserDomain(name="testuser", password="testpassword") created_user = user_service.create_user(user_domain) - + # Set the password properly user_orm = db.session.get(UserORM, created_user.id) if user_orm: @@ -141,4 +150,4 @@ def test_to_flask_login_user_conversion(self, app, auth_adapter, user_service): assert flask_login_user.id == user_orm.id assert flask_login_user.name == user_orm.name assert flask_login_user.password == user_orm.password - assert flask_login_user.authenticated == user_orm.authenticated \ No newline at end of file + assert flask_login_user.authenticated == user_orm.authenticated From 8749d6f2cd62cfa9a91c928b53f8313ef68169d1 Mon Sep 17 00:00:00 2001 From: loki Date: Mon, 8 Sep 2025 22:17:26 +0300 Subject: [PATCH 16/34] repo implementation --- blog/domain/category.py | 6 --- blog/domain/post.py | 12 ------ blog/domain/tag.py | 6 --- blog/domain/user.py | 9 ----- blog/post/views.py | 7 +++- blog/repos/category.py | 27 +++----------- blog/repos/post.py | 77 +++++++++++++-------------------------- blog/repos/tag.py | 35 +++++++----------- blog/repos/user.py | 27 +++----------- blog/services/post.py | 9 +++++ blog/tags/views.py | 6 ++- blog/templates/about.html | 8 ++-- blog/templates/post.html | 4 +- 13 files changed, 74 insertions(+), 159 deletions(-) diff --git a/blog/domain/category.py b/blog/domain/category.py index 47797a2..7212f79 100644 --- a/blog/domain/category.py +++ b/blog/domain/category.py @@ -2,10 +2,6 @@ from dataclasses import dataclass import typing -from typing import TYPE_CHECKING - -if TYPE_CHECKING: - from blog.domain.post import Post as PostDomain @dataclass @@ -17,8 +13,6 @@ class Category: alias: str = "" template: str | None = None - posts: "list[PostDomain] | None" = None - @typing.override def __str__(self): return f"Category(id={self.id}, title={self.title}, template={self.template})" diff --git a/blog/domain/post.py b/blog/domain/post.py index 158e4d0..e4b436b 100644 --- a/blog/domain/post.py +++ b/blog/domain/post.py @@ -3,12 +3,6 @@ from dataclasses import dataclass import datetime import markdown -from typing import TYPE_CHECKING - -if TYPE_CHECKING: - from blog.domain.category import Category as CategoryDomain - from blog.domain.tag import Tag as TagDomain - from blog.domain.user import User as UserDomain MARKDOWN_EXTENSIONS = ["markdown.extensions.fenced_code"] @@ -27,12 +21,6 @@ class Post: category_id: int | None = None user_id: int | None = None - # These would typically be loaded separately in a real implementation - # to avoid circular dependencies - user: "UserDomain | None" = None - category: "CategoryDomain | None" = None - tags: "list[TagDomain] | None" = None - def __post_init__(self): if self.createdon is None: self.createdon = datetime.datetime.now(datetime.timezone.utc) diff --git a/blog/domain/tag.py b/blog/domain/tag.py index f287f32..c517f7f 100644 --- a/blog/domain/tag.py +++ b/blog/domain/tag.py @@ -2,10 +2,6 @@ from dataclasses import dataclass import typing -from typing import TYPE_CHECKING - -if TYPE_CHECKING: - from blog.domain.post import Post as PostDomain @dataclass @@ -16,8 +12,6 @@ class Tag: title: str = "" alias: str = "" - posts: "list[PostDomain] | None" = None - @typing.override def __str__(self): return f"{self.title}" diff --git a/blog/domain/user.py b/blog/domain/user.py index e4f5478..6df223b 100644 --- a/blog/domain/user.py +++ b/blog/domain/user.py @@ -3,14 +3,6 @@ import datetime import typing from dataclasses import dataclass -from typing import TYPE_CHECKING - -if TYPE_CHECKING: - from blog.domain.post import Post as PostDomain - - Post = PostDomain -else: - Post = "Post" @dataclass @@ -22,7 +14,6 @@ class User: password: str = "" authenticated: bool = False createdon: datetime.datetime | None = None - posts: list[Post] | None = None def __post_init__(self): if self.createdon is None: diff --git a/blog/post/views.py b/blog/post/views.py index ada3764..77abfe2 100644 --- a/blog/post/views.py +++ b/blog/post/views.py @@ -70,14 +70,17 @@ def view(alias=None, **kwargs): abort(404) + # Get tags for the post + tags = post_service.get_tags_for_post(post.id) if post.id else [] + page_category_obj = None if post.category_id: category_service = ServiceFactory.create_category_service() page_category_obj = category_service.get_category_by_id(post.category_id) if page_category_obj and page_category_obj.template: - return render_template(page_category_obj.template, post=post, **kwargs) - return render_template("post.html", post=post, **kwargs) + return render_template("post.html", post=post, tags=tags, **kwargs) + return render_template("post.html", post=post, tags=tags, **kwargs) @flask_sitemap.register_generator diff --git a/blog/repos/category.py b/blog/repos/category.py index 2ed62e6..39ae093 100644 --- a/blog/repos/category.py +++ b/blog/repos/category.py @@ -6,7 +6,6 @@ from blog.extensions import db from blog.category.models import Category as CategoryORM from blog.domain.category import Category as CategoryDomain -from blog.domain.post import Post as PostDomain from blog.repos.base import BaseRepository @@ -46,6 +45,11 @@ def get_all(self) -> List[CategoryDomain]: return [self._to_domain_model(category_orm) for category_orm in categories_orm] def get_categories_with_posts(self) -> list[CategoryDomain]: + """Get all categories with their posts loaded. + + Note: This method loads relationships but doesn't include them in the domain model + since we've removed relationship fields to avoid circular dependencies. + """ stmt = sa.select(CategoryORM).options(sa.orm.joinedload(CategoryORM.posts)) categories_orm = list(self.session.scalars(stmt).unique().all()) return [self._to_domain_model(category_orm) for category_orm in categories_orm] @@ -85,30 +89,9 @@ def delete(self, id: int) -> bool: return False def _to_domain_model(self, category_orm: CategoryORM) -> CategoryDomain: - # Convert related posts if they exist - posts = None - if category_orm.posts: - posts = [ - PostDomain( - id=post_orm.id, - pagetitle=post_orm.pagetitle or "", - alias=post_orm.alias or "", - content=post_orm.content or "", - createdon=post_orm.createdon, - publishedon=post_orm.publishedon, - category_id=post_orm.category_id, - user_id=post_orm.user_id, - user=None, # Avoid circular references - category=None, # Avoid circular references - tags=None, # Avoid circular references - ) - for post_orm in category_orm.posts - ] - return CategoryDomain( id=category_orm.id, title=category_orm.title or "", alias=category_orm.alias or "", template=category_orm.template, - posts=posts, ) diff --git a/blog/repos/post.py b/blog/repos/post.py index 9f86151..f1e2949 100644 --- a/blog/repos/post.py +++ b/blog/repos/post.py @@ -7,8 +7,6 @@ from blog.post.models import Post as PostORM from blog.tags.models import Tag as TagORM from blog.domain.post import Post as PostDomain -from blog.domain.user import User as UserDomain -from blog.domain.category import Category as CategoryDomain from blog.domain.tag import Tag as TagDomain from blog.repos.base import BaseRepository @@ -20,6 +18,11 @@ def __init__(self, session: Any = None): self.session = session or db.session def get_post_with_relationships(self, post_id: int) -> PostDomain | None: + """Get a post by ID with its relationships loaded. + + Note: This method loads relationships but doesn't include them in the domain model + since we've removed relationship fields to avoid circular dependencies. + """ stmt = ( sa.select(PostORM) .where(PostORM.id == post_id) @@ -34,6 +37,26 @@ def get_post_with_relationships(self, post_id: int) -> PostDomain | None: return self._to_domain_model(post_orm) return None + def get_tags_for_post(self, post_id: int) -> List[TagDomain]: + """Get all tags associated with a specific post.""" + stmt = sa.select(TagORM).join(TagORM.posts).where(PostORM.id == post_id) + tags_orm = list(self.session.scalars(stmt).all()) + return [self._tag_to_domain_model(tag_orm) for tag_orm in tags_orm] + + def get_posts_by_tag(self, tag_id: int) -> List[PostDomain]: + """Get all posts associated with a specific tag.""" + stmt = sa.select(PostORM).join(PostORM.tags).where(TagORM.id == tag_id) + posts_orm = list(self.session.scalars(stmt).all()) + return [self._to_domain_model(post_orm) for post_orm in posts_orm] + + def _tag_to_domain_model(self, tag_orm: TagORM) -> TagDomain: + """Convert Tag ORM model to Tag domain model.""" + return TagDomain( + id=tag_orm.id, + title=tag_orm.title or "", + alias=tag_orm.alias or "", + ) + def get_by_id(self, id: int) -> Optional[PostDomain]: stmt = sa.select(PostORM).where(PostORM.id == id) post_orm = self.session.scalar(stmt) @@ -85,15 +108,6 @@ def create(self, entity: PostDomain) -> PostDomain: if entity.user_id is not None: post_orm.user_id = entity.user_id - # Handle tags relationship if provided - if entity.tags: - # Find existing Tag ORM models based on the domain Tag models - tag_ids = [tag.id for tag in entity.tags if tag.id is not None] - if tag_ids: - stmt = sa.select(TagORM).where(TagORM.id.in_(tag_ids)) - existing_tags = list(self.session.scalars(stmt).all()) - post_orm.tags = existing_tags - self.session.add(post_orm) self.session.flush() # Get the ID without committing entity.id = post_orm.id @@ -129,44 +143,6 @@ def delete(self, id: int) -> bool: return False def _to_domain_model(self, post_orm: PostORM) -> PostDomain: - # Convert related user if it exists - user = None - if post_orm.user: - user = UserDomain( - id=post_orm.user.id, - name=post_orm.user.name or "", - password=post_orm.user.password or "", - authenticated=bool(post_orm.user.authenticated) - if post_orm.user.authenticated is not None - else False, - createdon=post_orm.user.createdon, - posts=None, # Avoid circular references - ) - - # Convert related category if it exists - category = None - if post_orm.category: - category = CategoryDomain( - id=post_orm.category.id, - title=post_orm.category.title or "", - alias=post_orm.category.alias or "", - template=post_orm.category.template, - posts=None, # Avoid circular references - ) - - # Convert related tags if they exist - tags = None - if post_orm.tags: - tags = [ - TagDomain( - id=tag_orm.id, - title=tag_orm.title or "", - alias=tag_orm.alias or "", - posts=None, # Avoid circular references - ) - for tag_orm in post_orm.tags - ] - return PostDomain( id=post_orm.id, pagetitle=post_orm.pagetitle or "", @@ -176,7 +152,4 @@ def _to_domain_model(self, post_orm: PostORM) -> PostDomain: publishedon=post_orm.publishedon, category_id=post_orm.category_id, user_id=post_orm.user_id, - user=user, - category=category, - tags=tags, ) diff --git a/blog/repos/tag.py b/blog/repos/tag.py index 94bbc2d..75d3ed2 100644 --- a/blog/repos/tag.py +++ b/blog/repos/tag.py @@ -6,7 +6,6 @@ from blog.extensions import db from blog.tags.models import Tag as TagORM from blog.domain.tag import Tag as TagDomain -from blog.domain.post import Post as PostDomain from blog.repos.base import BaseRepository @@ -44,10 +43,23 @@ def get_all(self) -> List[TagDomain]: return [self._to_domain_model(tag_orm) for tag_orm in tags_orm] def get_tags_with_posts(self) -> list[TagDomain]: + """Get all tags with their posts loaded. + + Note: This method loads relationships but doesn't include them in the domain model + since we've removed relationship fields to avoid circular dependencies. + """ stmt = sa.select(TagORM).options(sa.orm.joinedload(TagORM.posts)) tags_orm = list(self.session.scalars(stmt).unique().all()) return [self._to_domain_model(tag_orm) for tag_orm in tags_orm] + def get_tags_for_post(self, post_id: int) -> List[TagDomain]: + """Get all tags associated with a specific post.""" + from blog.post.models import Post as PostORM + + stmt = sa.select(TagORM).join(TagORM.posts).where(PostORM.id == post_id) + tags_orm = list(self.session.scalars(stmt).all()) + return [self._to_domain_model(tag_orm) for tag_orm in tags_orm] + def create(self, entity: TagDomain) -> TagDomain: tag_orm = TagORM() tag_orm.title = entity.title @@ -77,29 +89,8 @@ def delete(self, id: int) -> bool: return False def _to_domain_model(self, tag_orm: TagORM) -> TagDomain: - # Convert related posts if they exist - posts = None - if tag_orm.posts: - posts = [ - PostDomain( - id=post_orm.id, - pagetitle=post_orm.pagetitle or "", - alias=post_orm.alias or "", - content=post_orm.content or "", - createdon=post_orm.createdon, - publishedon=post_orm.publishedon, - category_id=post_orm.category_id, - user_id=post_orm.user_id, - user=None, # Avoid circular references - category=None, # Avoid circular references - tags=None, # Avoid circular references - ) - for post_orm in tag_orm.posts - ] - return TagDomain( id=tag_orm.id, title=tag_orm.title or "", alias=tag_orm.alias or "", - posts=posts, ) diff --git a/blog/repos/user.py b/blog/repos/user.py index 34290e0..90701f3 100644 --- a/blog/repos/user.py +++ b/blog/repos/user.py @@ -6,7 +6,6 @@ from blog.extensions import db from blog.user.models import User as UserORM from blog.domain.user import User as UserDomain -from blog.domain.post import Post as PostDomain from blog.repos.base import BaseRepository @@ -36,6 +35,11 @@ def get_all(self) -> List[UserDomain]: return [self._to_domain_model(user_orm) for user_orm in users_orm] def get_users_with_posts(self) -> list[UserDomain]: + """Get all users with their posts loaded. + + Note: This method loads relationships but doesn't include them in the domain model + since we've removed relationship fields to avoid circular dependencies. + """ stmt = sa.select(UserORM).options(sa.orm.joinedload(UserORM.posts)) users_orm = self.session.scalars(stmt).unique().all() return [self._to_domain_model(user_orm) for user_orm in users_orm] @@ -90,26 +94,6 @@ def authenticate(self, name: str, password: str) -> UserDomain | None: return None def _to_domain_model(self, user_orm: UserORM) -> UserDomain: - # Convert related posts if they exist - posts = None - if user_orm.posts: - posts = [ - PostDomain( - id=post_orm.id, - pagetitle=post_orm.pagetitle or "", - alias=post_orm.alias or "", - content=post_orm.content or "", - createdon=post_orm.createdon, - publishedon=post_orm.publishedon, - category_id=post_orm.category_id, - user_id=post_orm.user_id, - user=None, # Avoid circular references - category=None, # Avoid circular references - tags=None, # Avoid circular references - ) - for post_orm in user_orm.posts - ] - return UserDomain( id=user_orm.id, name=user_orm.name or "", @@ -118,5 +102,4 @@ def _to_domain_model(self, user_orm: UserORM) -> UserDomain: if user_orm.authenticated is not None else False, createdon=user_orm.createdon, - posts=posts, ) diff --git a/blog/services/post.py b/blog/services/post.py index 1384e62..c5a03c8 100644 --- a/blog/services/post.py +++ b/blog/services/post.py @@ -1,6 +1,7 @@ import logging from blog.repos.post import PostRepository from blog.domain.post import Post +from blog.domain.tag import Tag logger = logging.getLogger(__name__) @@ -33,6 +34,14 @@ def get_published_posts(self) -> list[Post]: def get_page_posts(self, page_category_ids: list[int]) -> list[Post]: return self.post_repository.get_page_posts(page_category_ids) + def get_posts_by_tag(self, tag_id: int) -> list[Post]: + """Get all posts associated with a specific tag.""" + return self.post_repository.get_posts_by_tag(tag_id) + + def get_tags_for_post(self, post_id: int) -> list[Tag]: + """Get all tags associated with a specific post.""" + return self.post_repository.get_tags_for_post(post_id) + def create_post(self, post: Post) -> Post: try: return self.post_repository.create(post) diff --git a/blog/tags/views.py b/blog/tags/views.py index d94e400..f631080 100644 --- a/blog/tags/views.py +++ b/blog/tags/views.py @@ -28,4 +28,8 @@ def view(alias=None, **kwargs): from flask import abort abort(404) - return render_template("posts.html", posts=tag.posts, tag=tag, **kwargs) + + # Get posts for this tag through the post service + post_service = ServiceFactory.create_post_service() + posts = post_service.get_posts_by_tag(tag.id) if tag.id else [] + return render_template("posts.html", posts=posts, tag=tag, **kwargs) diff --git a/blog/templates/about.html b/blog/templates/about.html index df938cf..1d4a723 100644 --- a/blog/templates/about.html +++ b/blog/templates/about.html @@ -17,9 +17,11 @@

{{post.pagetitle}}

{% if post.category_id != config['PAGE_CATEGORY'] %}
- {% for tag in post.tags %} - {{tag}} - {% endfor %} + {% if tags %} + {% for tag in tags %} + {{tag}} + {% endfor %} + {% endif %}
{% endif %}
diff --git a/blog/templates/post.html b/blog/templates/post.html index 40374ee..d4473e0 100644 --- a/blog/templates/post.html +++ b/blog/templates/post.html @@ -21,8 +21,8 @@

{{post.pagetitle}}

{% if post.category_id != config['PAGE_CATEGORY'] %}
- {% if post.tags %} - {% for tag in post.tags %} + {% if tags %} + {% for tag in tags %} {{tag}} {% endfor %} {% endif %} From e59979b797d84c5e3605dcdef0e4f205d5ff1d02 Mon Sep 17 00:00:00 2001 From: loki Date: Mon, 8 Sep 2025 22:23:52 +0300 Subject: [PATCH 17/34] error handling --- blog/services/category.py | 25 +++++++++++++++++++++---- blog/services/icon.py | 25 +++++++++++++++++++++---- blog/services/post.py | 32 ++++++++++++++++++++++++++------ blog/services/tag.py | 25 +++++++++++++++++++++---- blog/services/user.py | 25 +++++++++++++++++++++---- 5 files changed, 110 insertions(+), 22 deletions(-) diff --git a/blog/services/category.py b/blog/services/category.py index ab53596..b25da49 100644 --- a/blog/services/category.py +++ b/blog/services/category.py @@ -10,6 +10,24 @@ class CategoryServiceError(Exception): pass +class CategoryNotFoundError(CategoryServiceError): + """Raised when a category is not found.""" + + pass + + +class CategoryCreationError(CategoryServiceError): + """Raised when a category cannot be created.""" + + pass + + +class CategoryUpdateError(CategoryServiceError): + """Raised when a category cannot be updated.""" + + pass + + class CategoryService: """Service layer for Category entities.""" @@ -33,19 +51,18 @@ def create_category(self, category: Category) -> Category: return self.category_repository.create(category) except Exception as e: # Re-raise as a more specific exception for the service layer - raise CategoryServiceError(f"Failed to create category: {str(e)}") from e + raise CategoryCreationError(f"Failed to create category: {str(e)}") from e def update_category(self, category: Category) -> Category: try: return self.category_repository.update(category) except ValueError as e: # Re-raise as a more specific exception for the service layer - raise CategoryServiceError(f"Failed to update category: {str(e)}") from e + raise CategoryUpdateError(f"Failed to update category: {str(e)}") from e def delete_category(self, category_id: int) -> bool: try: return self.category_repository.delete(category_id) except Exception: - # Log the error and return False to indicate failure - # In a real application, you might want to log this + # Return False to indicate failure return False diff --git a/blog/services/icon.py b/blog/services/icon.py index 23fdc45..09ac809 100644 --- a/blog/services/icon.py +++ b/blog/services/icon.py @@ -10,6 +10,24 @@ class IconServiceError(Exception): pass +class IconNotFoundError(IconServiceError): + """Raised when an icon is not found.""" + + pass + + +class IconCreationError(IconServiceError): + """Raised when an icon cannot be created.""" + + pass + + +class IconUpdateError(IconServiceError): + """Raised when an icon cannot be updated.""" + + pass + + class IconService: """Service layer for Icon entities.""" @@ -38,19 +56,18 @@ def create_icon(self, icon: Icon) -> Icon: return self.icon_repository.create(icon) except Exception as e: # Re-raise as a more specific exception for the service layer - raise IconServiceError(f"Failed to create icon: {str(e)}") from e + raise IconCreationError(f"Failed to create icon: {str(e)}") from e def update_icon(self, icon: Icon) -> Icon: try: return self.icon_repository.update(icon) except ValueError as e: # Re-raise as a more specific exception for the service layer - raise IconServiceError(f"Failed to update icon: {str(e)}") from e + raise IconUpdateError(f"Failed to update icon: {str(e)}") from e def delete_icon(self, icon_id: int) -> bool: try: return self.icon_repository.delete(icon_id) except Exception: - # Log the error and return False to indicate failure - # In a real application, you might want to log this + # Return False to indicate failure return False diff --git a/blog/services/post.py b/blog/services/post.py index c5a03c8..85ca6c7 100644 --- a/blog/services/post.py +++ b/blog/services/post.py @@ -13,6 +13,24 @@ class PostServiceError(Exception): pass +class PostNotFoundError(PostServiceError): + """Raised when a post is not found.""" + + pass + + +class PostCreationError(PostServiceError): + """Raised when a post cannot be created.""" + + pass + + +class PostUpdateError(PostServiceError): + """Raised when a post cannot be updated.""" + + pass + + class PostService: """Service layer for Post entities.""" @@ -46,15 +64,19 @@ def create_post(self, post: Post) -> Post: try: return self.post_repository.create(post) except Exception as e: + # Log the error with details + logger.error(f"Failed to create post: {str(e)}", exc_info=True) # Re-raise as a more specific exception for the service layer - raise PostServiceError(f"Failed to create post: {str(e)}") from e + raise PostCreationError(f"Failed to create post: {str(e)}") from e def update_post(self, post: Post) -> Post: try: return self.post_repository.update(post) except ValueError as e: + # Log the error with details + logger.error(f"Failed to update post: {str(e)}", exc_info=True) # Re-raise as a more specific exception for the service layer - raise PostServiceError(f"Failed to update post: {str(e)}") from e + raise PostUpdateError(f"Failed to update post: {str(e)}") from e def delete_post(self, post_id: int) -> bool: try: @@ -64,7 +86,5 @@ def delete_post(self, post_id: int) -> bool: logger.error( f"Failed to delete post with id {post_id}: {str(e)}", exc_info=True ) - # Re-raise as a more specific exception for the service layer - raise PostServiceError( - f"Failed to delete post with id {post_id}: {str(e)}" - ) from e + # Return False to indicate failure + return False diff --git a/blog/services/tag.py b/blog/services/tag.py index 28dc6d6..b4fcd46 100644 --- a/blog/services/tag.py +++ b/blog/services/tag.py @@ -10,6 +10,24 @@ class TagServiceError(Exception): pass +class TagNotFoundError(TagServiceError): + """Raised when a tag is not found.""" + + pass + + +class TagCreationError(TagServiceError): + """Raised when a tag cannot be created.""" + + pass + + +class TagUpdateError(TagServiceError): + """Raised when a tag cannot be updated.""" + + pass + + class TagService: """Service layer for Tag entities.""" @@ -33,19 +51,18 @@ def create_tag(self, tag: Tag) -> Tag: return self.tag_repository.create(tag) except Exception as e: # Re-raise as a more specific exception for the service layer - raise TagServiceError(f"Failed to create tag: {str(e)}") from e + raise TagCreationError(f"Failed to create tag: {str(e)}") from e def update_tag(self, tag: Tag) -> Tag: try: return self.tag_repository.update(tag) except ValueError as e: # Re-raise as a more specific exception for the service layer - raise TagServiceError(f"Failed to update tag: {str(e)}") from e + raise TagUpdateError(f"Failed to update tag: {str(e)}") from e def delete_tag(self, tag_id: int) -> bool: try: return self.tag_repository.delete(tag_id) except Exception: - # Log the error and return False to indicate failure - # In a real application, you might want to log this + # Return False to indicate failure return False diff --git a/blog/services/user.py b/blog/services/user.py index d0f55b7..05e7fe5 100644 --- a/blog/services/user.py +++ b/blog/services/user.py @@ -10,6 +10,24 @@ class UserServiceError(Exception): pass +class UserNotFoundError(UserServiceError): + """Raised when a user is not found.""" + + pass + + +class UserCreationError(UserServiceError): + """Raised when a user cannot be created.""" + + pass + + +class UserUpdateError(UserServiceError): + """Raised when a user cannot be updated.""" + + pass + + class UserService: """Service layer for User entities.""" @@ -33,21 +51,20 @@ def create_user(self, user: User) -> User: return self.user_repository.create(user) except Exception as e: # Re-raise as a more specific exception for the service layer - raise UserServiceError(f"Failed to create user: {str(e)}") from e + raise UserCreationError(f"Failed to create user: {str(e)}") from e def update_user(self, user: User) -> User: try: return self.user_repository.update(user) except ValueError as e: # Re-raise as a more specific exception for the service layer - raise UserServiceError(f"Failed to update user: {str(e)}") from e + raise UserUpdateError(f"Failed to update user: {str(e)}") from e def delete_user(self, user_id: int) -> bool: try: return self.user_repository.delete(user_id) except Exception: - # Log the error and return False to indicate failure - # In a real application, you might want to log this + # Return False to indicate failure return False def authenticate_user(self, name: str, password: str) -> User | None: From cf0209dbf07bede3df277ebf59948a45e6ad2dd7 Mon Sep 17 00:00:00 2001 From: loki Date: Mon, 8 Sep 2025 22:28:24 +0300 Subject: [PATCH 18/34] integration test --- tests/test_integration.py | 230 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 230 insertions(+) create mode 100644 tests/test_integration.py diff --git a/tests/test_integration.py b/tests/test_integration.py new file mode 100644 index 0000000..2ab698c --- /dev/null +++ b/tests/test_integration.py @@ -0,0 +1,230 @@ +"""Integration tests for the full request lifecycle.""" + +import pytest +import os +import datetime + +from blog import create_app +from blog.extensions import db +from blog.domain.post import Post as PostDomain +from blog.domain.category import Category as CategoryDomain +from blog.domain.tag import Tag as TagDomain +from blog.domain.user import User as UserDomain +from blog.services.factory import ServiceFactory + + +@pytest.fixture() +def integration_client(): + """Create a test client for the Flask app with full test data.""" + os.environ["FLASK_ENV"] = "testing" + app = create_app() + with app.test_client() as client: + with app.app_context(): + db.create_all() + + # Create test data using services (to ensure proper layer interaction) + category_service = ServiceFactory.create_category_service() + user_service = ServiceFactory.create_user_service() + post_service = ServiceFactory.create_post_service() + tag_service = ServiceFactory.create_tag_service() + + # Create a user + user = UserDomain(name="testuser", password="testpassword") + created_user = user_service.create_user(user) + + # Create categories + page_category = CategoryDomain(title="page", alias="page") + created_page_category = category_service.create_category(page_category) + + regular_category = CategoryDomain(title="tech", alias="tech") + created_regular_category = category_service.create_category( + regular_category + ) + + # Create tags + tag1 = TagDomain(title="python", alias="python") + created_tag1 = tag_service.create_tag(tag1) + + tag2 = TagDomain(title="flask", alias="flask") + created_tag2 = tag_service.create_tag(tag2) + + # Create posts + # Regular published post + post1 = PostDomain( + pagetitle="Test Post 1", + alias="test-post-1", + content="This is test post 1 content", + publishedon=datetime.datetime.now(datetime.timezone.utc), + user_id=created_user.id, + category_id=None, + ) + created_post1 = post_service.create_post(post1) + + # Page post + post2 = PostDomain( + pagetitle="Test Page", + alias="test-page", + content="This is a test page content", + publishedon=None, + user_id=created_user.id, + category_id=created_page_category.id, + ) + created_post2 = post_service.create_post(post2) + + # Post with tags (manually create the tag-post relationship at the ORM level) + # This is a workaround for the current limitation in the domain model approach + from blog.post.models import Post as PostORM + from blog.tags.models import Tag as TagORM + + post3_orm = db.session.get(PostORM, created_post1.id) + tag1_orm = db.session.get(TagORM, created_tag1.id) + tag2_orm = db.session.get(TagORM, created_tag2.id) + + if post3_orm and tag1_orm and tag2_orm: + post3_orm.tags.append(tag1_orm) + post3_orm.tags.append(tag2_orm) + db.session.commit() + + yield ( + client, + { + "user": created_user, + "page_category": created_page_category, + "regular_category": created_regular_category, + "tags": [created_tag1, created_tag2], + "posts": [created_post1, created_post2], + }, + ) + + with app.app_context(): + db.session.remove() + db.drop_all() + + +def test_full_post_lifecycle(integration_client): + """Test the full lifecycle of creating and viewing a post.""" + client, test_data = integration_client + + # Test that the post is accessible through the web interface + post = test_data["posts"][0] + response = client.get(f"/{post.alias}") + assert response.status_code == 200 + assert post.pagetitle.encode() in response.data + assert post.content.encode() in response.data + + +def test_full_page_lifecycle(integration_client): + """Test the full lifecycle of creating and viewing a page.""" + client, test_data = integration_client + + # Test that the page is accessible through the web interface + page = test_data["posts"][1] + response = client.get(f"/{page.alias}") + assert response.status_code == 200 + assert page.pagetitle.encode() in response.data + assert page.content.encode() in response.data + + +def test_post_with_tags(integration_client): + """Test that posts with tags are displayed correctly.""" + client, test_data = integration_client + + # Test that the post with tags is accessible + post = test_data["posts"][0] + response = client.get(f"/{post.alias}") + assert response.status_code == 200 + + # Check that tags are displayed + for tag in test_data["tags"]: + assert tag.title.encode() in response.data + + +def test_index_page_with_posts(integration_client): + """Test that the index page displays posts correctly.""" + client, test_data = integration_client + + # Test that the index page shows posts + response = client.get("/") + assert response.status_code == 200 + + # Check that posts are displayed + for post in test_data["posts"]: + assert post.pagetitle.encode() in response.data + + +def test_tags_page(integration_client): + """Test that the tags page displays tags correctly.""" + client, test_data = integration_client + + # Test that the tags index page shows tags + response = client.get("/tags/") + assert response.status_code == 200 + + # Check that tags are displayed + for tag in test_data["tags"]: + assert tag.title.encode() in response.data + + +def test_individual_tag_page(integration_client): + """Test that individual tag pages work correctly.""" + client, test_data = integration_client + + # Test that individual tag pages work + tag = test_data["tags"][0] + response = client.get(f"/tags/{tag.alias}") + assert response.status_code == 200 + assert tag.title.encode() in response.data + + +def test_rss_feed(integration_client): + """Test that the RSS feed works correctly.""" + client, test_data = integration_client + + # Test that the RSS feed works + response = client.get("/rss.xml") + assert response.status_code == 200 + assert response.content_type == "application/rss+xml" + + # Check that published posts are in the feed + # Only the first post is published (has publishedon set) + published_post = test_data["posts"][0] + assert published_post.pagetitle.encode() in response.data + + +def test_domain_model_consistency(integration_client): + """Test that domain models are properly passed between layers.""" + client, test_data = integration_client + + # Test that we can retrieve the same data through services + post_service = ServiceFactory.create_post_service() + category_service = ServiceFactory.create_category_service() + tag_service = ServiceFactory.create_tag_service() + user_service = ServiceFactory.create_user_service() + + # Check post data consistency + original_post = test_data["posts"][0] + retrieved_post = post_service.get_post_by_id(original_post.id) + assert retrieved_post is not None + assert retrieved_post.pagetitle == original_post.pagetitle + assert retrieved_post.alias == original_post.alias + assert retrieved_post.content == original_post.content + + # Check user data consistency + original_user = test_data["user"] + retrieved_user = user_service.get_user_by_id(original_user.id) + assert retrieved_user is not None + assert retrieved_user.name == original_user.name + + # Check category data consistency + original_category = test_data["page_category"] + retrieved_category = category_service.get_category_by_id(original_category.id) + assert retrieved_category is not None + assert retrieved_category.title == original_category.title + assert retrieved_category.alias == original_category.alias + + # Check tag data consistency + original_tag = test_data["tags"][0] + retrieved_tag = tag_service.get_tag_by_id(original_tag.id) + assert retrieved_tag is not None + assert retrieved_tag.title == original_tag.title + assert retrieved_tag.alias == original_tag.alias From 43a69bc0d52efc9e982ffdfa684861c8282f1b92 Mon Sep 17 00:00:00 2001 From: loki Date: Mon, 8 Sep 2025 22:41:21 +0300 Subject: [PATCH 19/34] services tests --- tests/test_services.py | 301 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 293 insertions(+), 8 deletions(-) diff --git a/tests/test_services.py b/tests/test_services.py index 395e335..1c75453 100644 --- a/tests/test_services.py +++ b/tests/test_services.py @@ -11,11 +11,11 @@ from blog.domain.tag import Tag as TagDomain from blog.domain.user import User as UserDomain from blog.domain.icon import Icon as IconDomain -from blog.services.post import PostService, PostServiceError -from blog.services.category import CategoryService -from blog.services.tag import TagService -from blog.services.user import UserService -from blog.services.icon import IconService +from blog.services.post import PostService, PostUpdateError +from blog.services.category import CategoryService, CategoryUpdateError +from blog.services.tag import TagService, TagUpdateError +from blog.services.user import UserService, UserUpdateError +from blog.services.icon import IconService, IconUpdateError from blog.repos.post import PostRepository from blog.repos.category import CategoryRepository from blog.repos.tag import TagRepository @@ -182,9 +182,70 @@ def test_update_nonexistent_post_raises_error(self, app, post_service): ) # Verify that updating a nonexistent post raises an error - with pytest.raises(PostServiceError): + with pytest.raises(PostUpdateError): post_service.update_post(post_domain) + def test_create_post_with_none_fields(self, app, post_service): + """Test creating a post with None fields.""" + # Create a post domain model with None fields + post_domain = PostDomain( + pagetitle="Test Post", + alias="test-post", + content="This is a test post", + createdon=None, # None datetime + publishedon=None, # None datetime + category_id=None, # None category + user_id=None, # None user + ) + + # Create the post using the service + created_post = post_service.create_post(post_domain) + + # Verify the post was created + assert created_post.id is not None + assert created_post.pagetitle == "Test Post" + assert created_post.alias == "test-post" + + def test_get_post_by_id_nonexistent(self, app, post_service): + """Test getting a nonexistent post by ID.""" + # Try to get a post that doesn't exist + retrieved_post = post_service.get_post_by_id(99999) # Nonexistent ID + + # Verify None is returned + assert retrieved_post is None + + def test_get_post_by_alias_nonexistent(self, app, post_service): + """Test getting a nonexistent post by alias.""" + # Try to get a post that doesn't exist + retrieved_post = post_service.get_post_by_alias("nonexistent-alias") + + # Verify None is returned + assert retrieved_post is None + + def test_get_posts_by_tag_nonexistent(self, app, post_service): + """Test getting posts by a nonexistent tag ID.""" + # Try to get posts for a tag that doesn't exist + posts = post_service.get_posts_by_tag(99999) # Nonexistent tag ID + + # Verify an empty list is returned + assert posts == [] + + def test_get_tags_for_post_nonexistent(self, app, post_service): + """Test getting tags for a nonexistent post ID.""" + # Try to get tags for a post that doesn't exist + tags = post_service.get_tags_for_post(99999) # Nonexistent post ID + + # Verify an empty list is returned + assert tags == [] + + def test_get_page_posts_empty_list(self, app, post_service): + """Test getting page posts with an empty category list.""" + # Try to get page posts with an empty category list + posts = post_service.get_page_posts([]) + + # Verify an empty list is returned + assert posts == [] + def test_delete_post(self, app, post_service): """Test deleting a post.""" # Create a post first @@ -316,6 +377,60 @@ def test_create_category(self, app, category_service): assert created_category.title == "Test Category" assert created_category.alias == "test-category" + def test_get_category_by_id_nonexistent(self, app, category_service): + """Test getting a nonexistent category by ID.""" + with app.app_context(): + # Try to get a category that doesn't exist + retrieved_category = category_service.get_category_by_id( + 99999 + ) # Nonexistent ID + + # Verify None is returned + assert retrieved_category is None + + def test_get_category_by_alias_nonexistent(self, app, category_service): + """Test getting a nonexistent category by alias.""" + with app.app_context(): + # Try to get a category that doesn't exist + retrieved_category = category_service.get_category_by_alias( + "nonexistent-alias" + ) + + # Verify None is returned + assert retrieved_category is None + + def test_update_nonexistent_category_raises_error(self, app, category_service): + """Test that updating a nonexistent category raises an error.""" + with app.app_context(): + # Try to update a category that doesn't exist + category_domain = CategoryDomain( + id=99999, # Nonexistent ID + title="Test Category", + alias="test-category", + ) + + # Verify that updating a nonexistent category raises an error + with pytest.raises(CategoryUpdateError): + category_service.update_category(category_domain) + + def test_create_category_with_none_template(self, app, category_service): + """Test creating a category with None template.""" + with app.app_context(): + # Create a category domain model with None template + category_domain = CategoryDomain( + title="Test Category", + alias="test-category", + template=None, # None template + ) + + # Create the category using the service + created_category = category_service.create_category(category_domain) + + # Verify the category was created + assert created_category.id is not None + assert created_category.title == "Test Category" + assert created_category.alias == "test-category" + def test_get_category_by_id(self, app, category_service): """Test getting a category by ID.""" with app.app_context(): @@ -372,6 +487,38 @@ def test_create_tag(self, app, tag_service): assert created_tag.title == "Test Tag" assert created_tag.alias == "test-tag" + def test_get_tag_by_id_nonexistent(self, app, tag_service): + """Test getting a nonexistent tag by ID.""" + with app.app_context(): + # Try to get a tag that doesn't exist + retrieved_tag = tag_service.get_tag_by_id(99999) # Nonexistent ID + + # Verify None is returned + assert retrieved_tag is None + + def test_get_tag_by_alias_nonexistent(self, app, tag_service): + """Test getting a nonexistent tag by alias.""" + with app.app_context(): + # Try to get a tag that doesn't exist + retrieved_tag = tag_service.get_tag_by_alias("nonexistent-alias") + + # Verify None is returned + assert retrieved_tag is None + + def test_update_nonexistent_tag_raises_error(self, app, tag_service): + """Test that updating a nonexistent tag raises an error.""" + with app.app_context(): + # Try to update a tag that doesn't exist + tag_domain = TagDomain( + id=99999, # Nonexistent ID + title="Test Tag", + alias="test-tag", + ) + + # Verify that updating a nonexistent tag raises an error + with pytest.raises(TagUpdateError): + tag_service.update_tag(tag_domain) + def test_service_returns_domain_models_not_orm_models(self, app, tag_service): """Test that service layer methods return domain models, not ORM models.""" with app.app_context(): @@ -411,10 +558,12 @@ def test_authenticate_user(self, app, user_service): # Create a user first user_domain = UserDomain(name="testuser", password="testpassword") created_user = user_service.create_user(user_domain) - # Set the password properly (this would normally be done in the repo) + + # Manually hash the password for the created user at the ORM level + # This is needed because the repository doesn't hash passwords from blog.user.models import User as UserORM - user_orm = db.session.get(UserORM, created_user.id) + user_orm = UserORM.query.get(created_user.id) if user_orm: user_orm.set_password("testpassword") db.session.commit() @@ -426,8 +575,94 @@ def test_authenticate_user(self, app, user_service): # Verify the user was authenticated assert authenticated_user is not None + assert authenticated_user.id == created_user.id assert authenticated_user.name == "testuser" + def test_authenticate_user_wrong_password(self, app, user_service): + """Test authenticating a user with wrong password.""" + with app.app_context(): + # Create a user first + user_domain = UserDomain(name="testuser", password="testpassword") + user_service.create_user(user_domain) + + # Manually hash the password for the created user at the ORM level + # This is needed because the repository doesn't hash passwords + from blog.user.models import User as UserORM + + user_orm = UserORM.query.first() + if user_orm: + user_orm.set_password("testpassword") + db.session.commit() + + # Try to authenticate with wrong password + authenticated_user = user_service.authenticate_user( + "testuser", "wrongpassword" + ) + + # Verify authentication failed + assert authenticated_user is None + + def test_authenticate_nonexistent_user(self, app, user_service): + """Test authenticating a nonexistent user.""" + with app.app_context(): + # Try to authenticate a user that doesn't exist + authenticated_user = user_service.authenticate_user( + "nonexistent", "password" + ) + + # Verify authentication failed + assert authenticated_user is None + + def test_get_user_by_id_nonexistent(self, app, user_service): + """Test getting a nonexistent user by ID.""" + with app.app_context(): + # Try to get a user that doesn't exist + retrieved_user = user_service.get_user_by_id(99999) # Nonexistent ID + + # Verify None is returned + assert retrieved_user is None + + def test_get_user_by_name_nonexistent(self, app, user_service): + """Test getting a nonexistent user by name.""" + with app.app_context(): + # Try to get a user that doesn't exist + retrieved_user = user_service.get_user_by_name("nonexistent") + + # Verify None is returned + assert retrieved_user is None + + def test_update_nonexistent_user_raises_error(self, app, user_service): + """Test that updating a nonexistent user raises an error.""" + with app.app_context(): + # Try to update a user that doesn't exist + user_domain = UserDomain( + id=99999, # Nonexistent ID + name="testuser", + password="testpassword", + ) + + # Verify that updating a nonexistent user raises an error + with pytest.raises(UserUpdateError): + user_service.update_user(user_domain) + + def test_create_user_with_none_fields(self, app, user_service): + """Test creating a user with None fields.""" + with app.app_context(): + # Create a user domain model with None fields + user_domain = UserDomain( + name="testuser", + password="testpassword", + authenticated=False, + createdon=None, # None datetime + ) + + # Create the user using the service + created_user = user_service.create_user(user_domain) + + # Verify the user was created + assert created_user.id is not None + assert created_user.name == "testuser" + def test_service_returns_domain_models_not_orm_models(self, app, user_service): """Test that service layer methods return domain models, not ORM models.""" with app.app_context(): @@ -466,6 +701,56 @@ def test_create_icon(self, app, icon_service): assert created_icon.title == "Test Icon" assert created_icon.url == "http://example.com/icon.png" + def test_get_icon_by_id_nonexistent(self, app, icon_service): + """Test getting a nonexistent icon by ID.""" + with app.app_context(): + # Try to get an icon that doesn't exist + retrieved_icon = icon_service.get_icon_by_id(99999) # Nonexistent ID + + # Verify None is returned + assert retrieved_icon is None + + def test_get_icon_by_title_nonexistent(self, app, icon_service): + """Test getting a nonexistent icon by title.""" + with app.app_context(): + # Try to get an icon that doesn't exist + retrieved_icon = icon_service.get_icon_by_title("nonexistent-title") + + # Verify None is returned + assert retrieved_icon is None + + def test_update_nonexistent_icon_raises_error(self, app, icon_service): + """Test that updating a nonexistent icon raises an error.""" + with app.app_context(): + # Try to update an icon that doesn't exist + icon_domain = IconDomain( + id=99999, # Nonexistent ID + title="Test Icon", + url="http://example.com/icon.png", + ) + + # Verify that updating a nonexistent icon raises an error + with pytest.raises(IconUpdateError): + icon_service.update_icon(icon_domain) + + def test_create_icon_with_none_content(self, app, icon_service): + """Test creating an icon with None content.""" + with app.app_context(): + # Create an icon domain model with None content + icon_domain = IconDomain( + title="Test Icon", + url="http://example.com/icon.png", + content=None, # None content + ) + + # Create the icon using the service + created_icon = icon_service.create_icon(icon_domain) + + # Verify the icon was created + assert created_icon.id is not None + assert created_icon.title == "Test Icon" + assert created_icon.url == "http://example.com/icon.png" + def test_service_returns_domain_models_not_orm_models(self, app, icon_service): """Test that service layer methods return domain models, not ORM models.""" with app.app_context(): From a04c059e61676283018650e498477845d806cc17 Mon Sep 17 00:00:00 2001 From: loki Date: Mon, 8 Sep 2025 22:51:26 +0300 Subject: [PATCH 20/34] keep testing --- tests/test_repositories.py | 1362 +++++++++++++++++++++++++++++++++++- 1 file changed, 1334 insertions(+), 28 deletions(-) diff --git a/tests/test_repositories.py b/tests/test_repositories.py index b29a427..2c95dc0 100644 --- a/tests/test_repositories.py +++ b/tests/test_repositories.py @@ -124,6 +124,439 @@ def test_get_by_id(self, app, post_repository): assert isinstance(retrieved_post, PostDomain) assert not hasattr(retrieved_post, "_sa_instance_state") + def test_get_by_id_nonexistent(self, app, post_repository): + """Test getting a nonexistent post by ID.""" + with app.app_context(): + # Try to get a post that doesn't exist + retrieved_post = post_repository.get_by_id(99999) # Nonexistent ID + + # Verify None is returned + assert retrieved_post is None + + def test_get_by_alias(self, app, post_repository): + """Test getting a post by alias.""" + with app.app_context(): + # Create a post first + post_domain = PostDomain( + pagetitle="Test Post", + alias="test-post", + content="This is a test post", + createdon=datetime.datetime.now(datetime.timezone.utc), + publishedon=datetime.datetime.now(datetime.timezone.utc), + ) + created_post = post_repository.create(post_domain) + + # Get the post by alias + retrieved_post = post_repository.get_by_alias("test-post") + + # Verify the post was retrieved + assert retrieved_post is not None + assert retrieved_post.id == created_post.id + assert retrieved_post.alias == "test-post" + + def test_get_by_alias_nonexistent(self, app, post_repository): + """Test getting a nonexistent post by alias.""" + with app.app_context(): + # Try to get a post that doesn't exist + retrieved_post = post_repository.get_by_alias("nonexistent-alias") + + # Verify None is returned + assert retrieved_post is None + + def test_get_all(self, app, post_repository): + """Test getting all posts.""" + with app.app_context(): + # Create a few posts + post1_domain = PostDomain( + pagetitle="Test Post 1", + alias="test-post-1", + content="This is test post 1", + createdon=datetime.datetime.now(datetime.timezone.utc), + publishedon=datetime.datetime.now(datetime.timezone.utc), + ) + post_repository.create(post1_domain) + + post2_domain = PostDomain( + pagetitle="Test Post 2", + alias="test-post-2", + content="This is test post 2", + createdon=datetime.datetime.now(datetime.timezone.utc), + publishedon=datetime.datetime.now(datetime.timezone.utc), + ) + post_repository.create(post2_domain) + + # Get all posts + posts = post_repository.get_all() + + # Verify we got the posts + assert len(posts) >= 2 + aliases = [post.alias for post in posts] + assert "test-post-1" in aliases + assert "test-post-2" in aliases + + # Verify they are domain models + assert all(isinstance(post, PostDomain) for post in posts) + assert all(not hasattr(post, "_sa_instance_state") for post in posts) + + def test_get_all_empty(self, app, post_repository): + """Test getting all posts when there are none.""" + with app.app_context(): + # Get all posts when there are none + posts = post_repository.get_all() + + # Verify an empty list is returned + assert posts == [] + + def test_get_published_posts(self, app, post_repository): + """Test getting published posts.""" + with app.app_context(): + # Create a published post + published_post_domain = PostDomain( + pagetitle="Published Post", + alias="published-post", + content="This is a published post", + createdon=datetime.datetime.now(datetime.timezone.utc), + publishedon=datetime.datetime.now(datetime.timezone.utc), + ) + post_repository.create(published_post_domain) + + # Create an unpublished post + unpublished_post_domain = PostDomain( + pagetitle="Unpublished Post", + alias="unpublished-post", + content="This is an unpublished post", + createdon=datetime.datetime.now(datetime.timezone.utc), + # No publishedon field, so it's unpublished + ) + post_repository.create(unpublished_post_domain) + + # Get published posts + published_posts = post_repository.get_published_posts() + + # Verify we only got the published post + assert len(published_posts) >= 1 + aliases = [post.alias for post in published_posts] + assert "published-post" in aliases + assert "unpublished-post" not in aliases + + # Verify they are domain models + assert all(isinstance(post, PostDomain) for post in published_posts) + assert all( + not hasattr(post, "_sa_instance_state") for post in published_posts + ) + + def test_get_published_posts_empty(self, app, post_repository): + """Test getting published posts when there are none.""" + with app.app_context(): + # Get published posts when there are none + published_posts = post_repository.get_published_posts() + + # Verify an empty list is returned + assert published_posts == [] + + def test_get_page_posts(self, app, post_repository): + """Test getting page posts.""" + with app.app_context(): + # Create a category first + from blog.repos.category import CategoryRepository + + category_repository = CategoryRepository(db.session) + category_domain = CategoryDomain( + title="Page Category", alias="page-category" + ) + created_category = category_repository.create(category_domain) + + # Create a page post + page_post_domain = PostDomain( + pagetitle="Page Post", + alias="page-post", + content="This is a page post", + createdon=datetime.datetime.now(datetime.timezone.utc), + publishedon=datetime.datetime.now(datetime.timezone.utc), + category_id=created_category.id, + ) + post_repository.create(page_post_domain) + + # Create a regular post + regular_post_domain = PostDomain( + pagetitle="Regular Post", + alias="regular-post", + content="This is a regular post", + createdon=datetime.datetime.now(datetime.timezone.utc), + publishedon=datetime.datetime.now(datetime.timezone.utc), + category_id=None, + ) + post_repository.create(regular_post_domain) + + # Get page posts + page_posts = post_repository.get_page_posts([created_category.id]) + + # Verify we only got the page post + assert len(page_posts) >= 1 + aliases = [post.alias for post in page_posts] + assert "page-post" in aliases + assert "regular-post" not in aliases + + # Verify they are domain models + assert all(isinstance(post, PostDomain) for post in page_posts) + assert all(not hasattr(post, "_sa_instance_state") for post in page_posts) + + def test_get_page_posts_empty_list(self, app, post_repository): + """Test getting page posts with an empty category list.""" + with app.app_context(): + # Get page posts with an empty category list + page_posts = post_repository.get_page_posts([]) + + # Verify an empty list is returned + assert page_posts == [] + + def test_update_post(self, app, post_repository): + """Test updating a post.""" + with app.app_context(): + # Create a post first + post_domain = PostDomain( + pagetitle="Test Post", + alias="test-post", + content="This is a test post", + createdon=datetime.datetime.now(datetime.timezone.utc), + publishedon=datetime.datetime.now(datetime.timezone.utc), + ) + created_post = post_repository.create(post_domain) + + # Update the post + created_post.pagetitle = "Updated Post" + updated_post = post_repository.update(created_post) + + # Verify the post was updated + assert updated_post.pagetitle == "Updated Post" + + # Verify the ORM model was updated + stmt = db.select(PostORM).where(PostORM.id == created_post.id) + post_orm = db.session.scalar(stmt) + assert post_orm is not None + assert post_orm.pagetitle == "Updated Post" + + def test_update_nonexistent_post(self, app, post_repository): + """Test updating a nonexistent post.""" + with app.app_context(): + # Try to update a post that doesn't exist + post_domain = PostDomain( + id=99999, # Nonexistent ID + pagetitle="Test Post", + alias="test-post", + content="This is a test post", + ) + + # Verify that updating a nonexistent post raises an error + with pytest.raises(ValueError): + post_repository.update(post_domain) + + def test_delete_post(self, app, post_repository): + """Test deleting a post.""" + with app.app_context(): + # Create a post first + post_domain = PostDomain( + pagetitle="Test Post", + alias="test-post", + content="This is a test post", + createdon=datetime.datetime.now(datetime.timezone.utc), + publishedon=datetime.datetime.now(datetime.timezone.utc), + ) + created_post = post_repository.create(post_domain) + + # Delete the post + result = post_repository.delete(created_post.id) + + # Verify the post was deleted + assert result is True + + # Verify the post no longer exists + retrieved_post = post_repository.get_by_id(created_post.id) + assert retrieved_post is None + + # Verify the ORM model was deleted + stmt = db.select(PostORM).where(PostORM.id == created_post.id) + post_orm = db.session.scalar(stmt) + assert post_orm is None + + def test_delete_nonexistent_post(self, app, post_repository): + """Test deleting a nonexistent post.""" + with app.app_context(): + # Try to delete a post that doesn't exist + result = post_repository.delete(99999) # Nonexistent ID + + # Verify the result is False + assert result is False + + def test_get_post_with_relationships(self, app, post_repository): + """Test getting a post with relationships loaded.""" + with app.app_context(): + # Create a user first + from blog.repos.user import UserRepository + + user_repository = UserRepository(db.session) + user_domain = UserDomain(name="testuser", password="testpassword") + created_user = user_repository.create(user_domain) + + # Create a category first + from blog.repos.category import CategoryRepository + + category_repository = CategoryRepository(db.session) + category_domain = CategoryDomain( + title="Test Category", alias="test-category" + ) + created_category = category_repository.create(category_domain) + + # Create a post + post_domain = PostDomain( + pagetitle="Test Post", + alias="test-post", + content="This is a test post", + createdon=datetime.datetime.now(datetime.timezone.utc), + publishedon=datetime.datetime.now(datetime.timezone.utc), + user_id=created_user.id, + category_id=created_category.id, + ) + created_post = post_repository.create(post_domain) + + # Get the post with relationships + retrieved_post = post_repository.get_post_with_relationships( + created_post.id + ) + + # Verify the post was retrieved + assert retrieved_post is not None + assert retrieved_post.id == created_post.id + assert retrieved_post.pagetitle == "Test Post" + + def test_get_post_with_relationships_nonexistent(self, app, post_repository): + """Test getting a nonexistent post with relationships loaded.""" + with app.app_context(): + # Try to get a post that doesn't exist + retrieved_post = post_repository.get_post_with_relationships( + 99999 + ) # Nonexistent ID + + # Verify None is returned + assert retrieved_post is None + + def test_get_tags_for_post(self, app, post_repository): + """Test getting tags for a post.""" + with app.app_context(): + # Create a post first + post_domain = PostDomain( + pagetitle="Test Post", + alias="test-post", + content="This is a test post", + createdon=datetime.datetime.now(datetime.timezone.utc), + publishedon=datetime.datetime.now(datetime.timezone.utc), + ) + created_post = post_repository.create(post_domain) + + # Create tags and associate them with the post + from blog.repos.tag import TagRepository + + tag_repository = TagRepository(db.session) + tag1_domain = TagDomain(title="Tag 1", alias="tag-1") + created_tag1 = tag_repository.create(tag1_domain) + tag2_domain = TagDomain(title="Tag 2", alias="tag-2") + created_tag2 = tag_repository.create(tag2_domain) + + # Manually create the tag-post relationship at the ORM level + # This is a workaround for the current limitation in the domain model approach + tag1_orm = db.session.get(TagORM, created_tag1.id) + tag2_orm = db.session.get(TagORM, created_tag2.id) + post_orm = db.session.get(PostORM, created_post.id) + + if tag1_orm and tag2_orm and post_orm: + post_orm.tags.append(tag1_orm) + post_orm.tags.append(tag2_orm) + db.session.commit() + + # Get tags for the post + tags = post_repository.get_tags_for_post(created_post.id) + + # Verify we got the tags + assert len(tags) >= 2 + titles = [tag.title for tag in tags] + assert "Tag 1" in titles + assert "Tag 2" in titles + + # Verify they are domain models + assert all(isinstance(tag, TagDomain) for tag in tags) + assert all(not hasattr(tag, "_sa_instance_state") for tag in tags) + + def test_get_tags_for_post_nonexistent(self, app, post_repository): + """Test getting tags for a nonexistent post.""" + with app.app_context(): + # Try to get tags for a post that doesn't exist + tags = post_repository.get_tags_for_post(99999) # Nonexistent ID + + # Verify an empty list is returned + assert tags == [] + + def test_get_posts_by_tag(self, app, post_repository): + """Test getting posts by tag.""" + with app.app_context(): + # Create tags first + from blog.repos.tag import TagRepository + + tag_repository = TagRepository(db.session) + tag_domain = TagDomain(title="Test Tag", alias="test-tag") + created_tag = tag_repository.create(tag_domain) + + # Create posts and associate them with the tag + post1_domain = PostDomain( + pagetitle="Post 1", + alias="post-1", + content="Content 1", + createdon=datetime.datetime.now(datetime.timezone.utc), + publishedon=datetime.datetime.now(datetime.timezone.utc), + ) + created_post1 = post_repository.create(post1_domain) + + post2_domain = PostDomain( + pagetitle="Post 2", + alias="post-2", + content="Content 2", + createdon=datetime.datetime.now(datetime.timezone.utc), + publishedon=datetime.datetime.now(datetime.timezone.utc), + ) + created_post2 = post_repository.create(post2_domain) + + # Manually create the tag-post relationship at the ORM level + # This is a workaround for the current limitation in the domain model approach + tag_orm = db.session.get(TagORM, created_tag.id) + post1_orm = db.session.get(PostORM, created_post1.id) + post2_orm = db.session.get(PostORM, created_post2.id) + + if tag_orm and post1_orm and post2_orm: + tag_orm.posts.append(post1_orm) + tag_orm.posts.append(post2_orm) + db.session.commit() + + # Get posts by tag + posts = post_repository.get_posts_by_tag(created_tag.id) + + # Verify we got the posts + assert len(posts) >= 2 + titles = [post.pagetitle for post in posts] + assert "Post 1" in titles + assert "Post 2" in titles + + # Verify they are domain models + assert all(isinstance(post, PostDomain) for post in posts) + assert all(not hasattr(post, "_sa_instance_state") for post in posts) + + def test_get_posts_by_tag_nonexistent(self, app, post_repository): + """Test getting posts by a nonexistent tag.""" + with app.app_context(): + # Try to get posts for a tag that doesn't exist + posts = post_repository.get_posts_by_tag(99999) # Nonexistent ID + + # Verify an empty list is returned + assert posts == [] + def test_to_domain_model_mapping(self, app, post_repository): """Test that _to_domain_model correctly maps ORM to domain model.""" with app.app_context(): @@ -233,6 +666,209 @@ def test_get_by_id(self, app, category_repository): assert isinstance(retrieved_category, CategoryDomain) assert not hasattr(retrieved_category, "_sa_instance_state") + def test_get_by_id_nonexistent(self, app, category_repository): + """Test getting a nonexistent category by ID.""" + with app.app_context(): + # Try to get a category that doesn't exist + retrieved_category = category_repository.get_by_id(99999) # Nonexistent ID + + # Verify None is returned + assert retrieved_category is None + + def test_get_by_alias(self, app, category_repository): + """Test getting a category by alias.""" + with app.app_context(): + # Create a category first + category_domain = CategoryDomain( + title="Test Category", alias="test-category" + ) + created_category = category_repository.create(category_domain) + + # Get the category by alias + retrieved_category = category_repository.get_by_alias("test-category") + + # Verify the category was retrieved correctly + assert retrieved_category is not None + assert retrieved_category.id == created_category.id + assert retrieved_category.alias == "test-category" + + def test_get_by_alias_nonexistent(self, app, category_repository): + """Test getting a nonexistent category by alias.""" + with app.app_context(): + # Try to get a category that doesn't exist + retrieved_category = category_repository.get_by_alias("nonexistent-alias") + + # Verify None is returned + assert retrieved_category is None + + def test_get_all(self, app, category_repository): + """Test getting all categories.""" + with app.app_context(): + # Create a few categories + category1_domain = CategoryDomain( + title="Test Category 1", alias="test-category-1" + ) + category_repository.create(category1_domain) + + category2_domain = CategoryDomain( + title="Test Category 2", alias="test-category-2" + ) + category_repository.create(category2_domain) + + # Get all categories + categories = category_repository.get_all() + + # Verify we got the categories + assert len(categories) >= 2 + aliases = [category.alias for category in categories] + assert "test-category-1" in aliases + assert "test-category-2" in aliases + + # Verify they are domain models + assert all(isinstance(category, CategoryDomain) for category in categories) + assert all( + not hasattr(category, "_sa_instance_state") for category in categories + ) + + def test_get_all_empty(self, app, category_repository): + """Test getting all categories when there are none.""" + with app.app_context(): + # Get all categories when there are none + categories = category_repository.get_all() + + # Verify an empty list is returned + assert categories == [] + + def test_get_categories_with_posts(self, app, category_repository): + """Test getting categories with posts loaded.""" + with app.app_context(): + # Create a category + category_domain = CategoryDomain( + title="Test Category", alias="test-category" + ) + category_repository.create(category_domain) + + # Get categories with posts + categories = category_repository.get_categories_with_posts() + + # Verify we got the category + assert len(categories) >= 1 + aliases = [category.alias for category in categories] + assert "test-category" in aliases + + # Verify they are domain models + assert all(isinstance(category, CategoryDomain) for category in categories) + assert all( + not hasattr(category, "_sa_instance_state") for category in categories + ) + + def test_get_categories_with_posts_empty(self, app, category_repository): + """Test getting categories with posts when there are none.""" + with app.app_context(): + # Get categories with posts when there are none + categories = category_repository.get_categories_with_posts() + + # Verify an empty list is returned + assert categories == [] + + def test_update_category(self, app, category_repository): + """Test updating a category.""" + with app.app_context(): + # Create a category first + category_domain = CategoryDomain( + title="Test Category", alias="test-category" + ) + created_category = category_repository.create(category_domain) + + # Update the category + created_category.title = "Updated Category" + updated_category = category_repository.update(created_category) + + # Verify the category was updated + assert updated_category.title == "Updated Category" + + # Verify the ORM model was updated + stmt = db.select(CategoryORM).where(CategoryORM.id == created_category.id) + category_orm = db.session.scalar(stmt) + assert category_orm is not None + assert category_orm.title == "Updated Category" + + def test_update_nonexistent_category(self, app, category_repository): + """Test updating a nonexistent category.""" + with app.app_context(): + # Try to update a category that doesn't exist + category_domain = CategoryDomain( + id=99999, # Nonexistent ID + title="Test Category", + alias="test-category", + ) + + # Verify that updating a nonexistent category raises an error + with pytest.raises(ValueError): + category_repository.update(category_domain) + + def test_delete_category(self, app, category_repository): + """Test deleting a category.""" + with app.app_context(): + # Create a category first + category_domain = CategoryDomain( + title="Test Category", alias="test-category" + ) + created_category = category_repository.create(category_domain) + + # Delete the category + result = category_repository.delete(created_category.id) + + # Verify the category was deleted + assert result is True + + # Verify the category no longer exists + retrieved_category = category_repository.get_by_id(created_category.id) + assert retrieved_category is None + + # Verify the ORM model was deleted + stmt = db.select(CategoryORM).where(CategoryORM.id == created_category.id) + category_orm = db.session.scalar(stmt) + assert category_orm is None + + def test_delete_nonexistent_category(self, app, category_repository): + """Test deleting a nonexistent category.""" + with app.app_context(): + # Try to delete a category that doesn't exist + result = category_repository.delete(99999) # Nonexistent ID + + # Verify the result is False + assert result is False + + def test_get_category_orm_with_relationships(self, app, category_repository): + """Test getting a category ORM model with relationships loaded.""" + with app.app_context(): + # Create a category + category_domain = CategoryDomain( + title="Test Category", alias="test-category" + ) + category_repository.create(category_domain) + + # Get the category ORM model with relationships + category_orm = category_repository.get_category_orm_with_relationships(1) + + # Verify the category ORM model was retrieved + assert category_orm is not None + assert category_orm.title == "Test Category" + + def test_get_category_orm_with_relationships_nonexistent( + self, app, category_repository + ): + """Test getting a nonexistent category ORM model with relationships loaded.""" + with app.app_context(): + # Try to get a category that doesn't exist + category_orm = category_repository.get_category_orm_with_relationships( + 99999 + ) # Nonexistent ID + + # Verify None is returned + assert category_orm is None + def test_to_domain_model_mapping(self, app, category_repository): """Test that _to_domain_model correctly maps ORM to domain model.""" with app.app_context(): @@ -271,54 +907,293 @@ def test_domain_to_orm_mapping(self, app, category_repository): category_orm.alias = category_domain.alias category_orm.template = category_domain.template - # Verify the mapping is correct - assert category_orm.title == category_domain.title - assert category_orm.alias == category_domain.alias - assert category_orm.template == category_domain.template + # Verify the mapping is correct + assert category_orm.title == category_domain.title + assert category_orm.alias == category_domain.alias + assert category_orm.template == category_domain.template + + +class TestTagRepository: + """Test cases for TagRepository.""" + + def test_create_tag(self, app, tag_repository): + """Test creating a new tag.""" + with app.app_context(): + # Create a tag domain model + tag_domain = TagDomain(title="Test Tag", alias="test-tag") + + # Create the tag using the repository + created_tag = tag_repository.create(tag_domain) + + # Verify the tag was created + assert created_tag.id is not None + assert created_tag.title == "Test Tag" + assert created_tag.alias == "test-tag" + + # Verify the ORM model was created + stmt = db.select(TagORM).where(TagORM.id == created_tag.id) + tag_orm = db.session.scalar(stmt) + assert tag_orm is not None + assert tag_orm.title == "Test Tag" + assert tag_orm.alias == "test-tag" + + def test_get_by_id(self, app, tag_repository): + """Test getting a tag by ID.""" + with app.app_context(): + # Create a tag first + tag_domain = TagDomain(title="Test Tag", alias="test-tag") + created_tag = tag_repository.create(tag_domain) + + # Get the tag by ID + retrieved_tag = tag_repository.get_by_id(created_tag.id) + + # Verify the tag was retrieved correctly + assert retrieved_tag is not None + assert retrieved_tag.id == created_tag.id + assert retrieved_tag.title == "Test Tag" + + # Verify it's a domain model, not an ORM model + assert isinstance(retrieved_tag, TagDomain) + assert not hasattr(retrieved_tag, "_sa_instance_state") + + def test_get_by_id_nonexistent(self, app, tag_repository): + """Test getting a nonexistent tag by ID.""" + with app.app_context(): + # Try to get a tag that doesn't exist + retrieved_tag = tag_repository.get_by_id(99999) # Nonexistent ID + + # Verify None is returned + assert retrieved_tag is None + + def test_get_by_alias(self, app, tag_repository): + """Test getting a tag by alias.""" + with app.app_context(): + # Create a tag first + tag_domain = TagDomain(title="Test Tag", alias="test-tag") + created_tag = tag_repository.create(tag_domain) + + # Get the tag by alias + retrieved_tag = tag_repository.get_by_alias("test-tag") + + # Verify the tag was retrieved correctly + assert retrieved_tag is not None + assert retrieved_tag.id == created_tag.id + assert retrieved_tag.alias == "test-tag" + + def test_get_by_alias_nonexistent(self, app, tag_repository): + """Test getting a nonexistent tag by alias.""" + with app.app_context(): + # Try to get a tag that doesn't exist + retrieved_tag = tag_repository.get_by_alias("nonexistent-alias") + + # Verify None is returned + assert retrieved_tag is None + + def test_get_all(self, app, tag_repository): + """Test getting all tags.""" + with app.app_context(): + # Create a few tags + tag1_domain = TagDomain(title="Test Tag 1", alias="test-tag-1") + tag_repository.create(tag1_domain) + + tag2_domain = TagDomain(title="Test Tag 2", alias="test-tag-2") + tag_repository.create(tag2_domain) + + # Get all tags + tags = tag_repository.get_all() + + # Verify we got the tags + assert len(tags) >= 2 + aliases = [tag.alias for tag in tags] + assert "test-tag-1" in aliases + assert "test-tag-2" in aliases + + # Verify they are domain models + assert all(isinstance(tag, TagDomain) for tag in tags) + assert all(not hasattr(tag, "_sa_instance_state") for tag in tags) + + def test_get_all_empty(self, app, tag_repository): + """Test getting all tags when there are none.""" + with app.app_context(): + # Get all tags when there are none + tags = tag_repository.get_all() + + # Verify an empty list is returned + assert tags == [] + + def test_get_tags_with_posts(self, app, tag_repository): + """Test getting tags with posts loaded.""" + with app.app_context(): + # Create a tag + tag_domain = TagDomain(title="Test Tag", alias="test-tag") + tag_repository.create(tag_domain) + + # Get tags with posts + tags = tag_repository.get_tags_with_posts() + + # Verify we got the tag + assert len(tags) >= 1 + aliases = [tag.alias for tag in tags] + assert "test-tag" in aliases + + # Verify they are domain models + assert all(isinstance(tag, TagDomain) for tag in tags) + assert all(not hasattr(tag, "_sa_instance_state") for tag in tags) + + def test_get_tags_with_posts_empty(self, app, tag_repository): + """Test getting tags with posts when there are none.""" + with app.app_context(): + # Get tags with posts when there are none + tags = tag_repository.get_tags_with_posts() + # Verify an empty list is returned + assert tags == [] -class TestTagRepository: - """Test cases for TagRepository.""" + def test_get_tags_for_post(self, app, tag_repository): + """Test getting tags for a post.""" + with app.app_context(): + # Create a post first + from blog.repos.post import PostRepository - def test_create_tag(self, app, tag_repository): - """Test creating a new tag.""" + post_repository = PostRepository(db.session) + post_domain = PostDomain( + pagetitle="Test Post", + alias="test-post", + content="This is a test post", + createdon=datetime.datetime.now(datetime.timezone.utc), + publishedon=datetime.datetime.now(datetime.timezone.utc), + ) + created_post = post_repository.create(post_domain) + + # Create tags and associate them with the post + tag1_domain = TagDomain(title="Tag 1", alias="tag-1") + created_tag1 = tag_repository.create(tag1_domain) + tag2_domain = TagDomain(title="Tag 2", alias="tag-2") + created_tag2 = tag_repository.create(tag2_domain) + + # Manually create the tag-post relationship at the ORM level + # This is a workaround for the current limitation in the domain model approach + tag1_orm = db.session.get(TagORM, created_tag1.id) + tag2_orm = db.session.get(TagORM, created_tag2.id) + post_orm = db.session.get(PostORM, created_post.id) + + if tag1_orm and tag2_orm and post_orm: + post_orm.tags.append(tag1_orm) + post_orm.tags.append(tag2_orm) + db.session.commit() + + # Get tags for the post + tags = tag_repository.get_tags_for_post(created_post.id) + + # Verify we got the tags + assert len(tags) >= 2 + titles = [tag.title for tag in tags] + assert "Tag 1" in titles + assert "Tag 2" in titles + + # Verify they are domain models + assert all(isinstance(tag, TagDomain) for tag in tags) + assert all(not hasattr(tag, "_sa_instance_state") for tag in tags) + + def test_get_tags_for_post_nonexistent(self, app, tag_repository): + """Test getting tags for a nonexistent post.""" with app.app_context(): - # Create a tag domain model - tag_domain = TagDomain(title="Test Tag", alias="test-tag") + # Try to get tags for a post that doesn't exist + tags = tag_repository.get_tags_for_post(99999) # Nonexistent ID - # Create the tag using the repository + # Verify an empty list is returned + assert tags == [] + + def test_update_tag(self, app, tag_repository): + """Test updating a tag.""" + with app.app_context(): + # Create a tag first + tag_domain = TagDomain(title="Test Tag", alias="test-tag") created_tag = tag_repository.create(tag_domain) - # Verify the tag was created - assert created_tag.id is not None - assert created_tag.title == "Test Tag" - assert created_tag.alias == "test-tag" + # Update the tag + created_tag.title = "Updated Tag" + updated_tag = tag_repository.update(created_tag) - # Verify the ORM model was created + # Verify the tag was updated + assert updated_tag.title == "Updated Tag" + + # Verify the ORM model was updated stmt = db.select(TagORM).where(TagORM.id == created_tag.id) tag_orm = db.session.scalar(stmt) assert tag_orm is not None - assert tag_orm.title == "Test Tag" - assert tag_orm.alias == "test-tag" + assert tag_orm.title == "Updated Tag" - def test_get_by_id(self, app, tag_repository): - """Test getting a tag by ID.""" + def test_update_nonexistent_tag(self, app, tag_repository): + """Test updating a nonexistent tag.""" + with app.app_context(): + # Try to update a tag that doesn't exist + tag_domain = TagDomain( + id=99999, # Nonexistent ID + title="Test Tag", + alias="test-tag", + ) + + # Verify that updating a nonexistent tag raises an error + with pytest.raises(ValueError): + tag_repository.update(tag_domain) + + def test_delete_tag(self, app, tag_repository): + """Test deleting a tag.""" with app.app_context(): # Create a tag first tag_domain = TagDomain(title="Test Tag", alias="test-tag") created_tag = tag_repository.create(tag_domain) - # Get the tag by ID + # Delete the tag + result = tag_repository.delete(created_tag.id) + + # Verify the tag was deleted + assert result is True + + # Verify the tag no longer exists retrieved_tag = tag_repository.get_by_id(created_tag.id) + assert retrieved_tag is None - # Verify the tag was retrieved correctly - assert retrieved_tag is not None - assert retrieved_tag.id == created_tag.id - assert retrieved_tag.title == "Test Tag" + # Verify the ORM model was deleted + stmt = db.select(TagORM).where(TagORM.id == created_tag.id) + tag_orm = db.session.scalar(stmt) + assert tag_orm is None - # Verify it's a domain model, not an ORM model - assert isinstance(retrieved_tag, TagDomain) - assert not hasattr(retrieved_tag, "_sa_instance_state") + def test_delete_nonexistent_tag(self, app, tag_repository): + """Test deleting a nonexistent tag.""" + with app.app_context(): + # Try to delete a tag that doesn't exist + result = tag_repository.delete(99999) # Nonexistent ID + + # Verify the result is False + assert result is False + + def test_get_tag_orm_with_relationships(self, app, tag_repository): + """Test getting a tag ORM model with relationships loaded.""" + with app.app_context(): + # Create a tag + tag_domain = TagDomain(title="Test Tag", alias="test-tag") + created_tag = tag_repository.create(tag_domain) + + # Get the tag ORM model with relationships + tag_orm = tag_repository.get_tag_orm_with_relationships(created_tag.id) + + # Verify the tag ORM model was retrieved + assert tag_orm is not None + assert tag_orm.id == created_tag.id + assert tag_orm.title == "Test Tag" + + def test_get_tag_orm_with_relationships_nonexistent(self, app, tag_repository): + """Test getting a nonexistent tag ORM model with relationships loaded.""" + with app.app_context(): + # Try to get a tag that doesn't exist + tag_orm = tag_repository.get_tag_orm_with_relationships( + 99999 + ) # Nonexistent ID + + # Verify None is returned + assert tag_orm is None def test_to_domain_model_mapping(self, app, tag_repository): """Test that _to_domain_model correctly maps ORM to domain model.""" @@ -400,6 +1275,219 @@ def test_get_by_id(self, app, user_repository): assert isinstance(retrieved_user, UserDomain) assert not hasattr(retrieved_user, "_sa_instance_state") + def test_get_by_id_nonexistent(self, app, user_repository): + """Test getting a nonexistent user by ID.""" + with app.app_context(): + # Try to get a user that doesn't exist + retrieved_user = user_repository.get_by_id(99999) # Nonexistent ID + + # Verify None is returned + assert retrieved_user is None + + def test_get_by_name(self, app, user_repository): + """Test getting a user by name.""" + with app.app_context(): + # Create a user first + user_domain = UserDomain(name="testuser", password="testpassword") + created_user = user_repository.create(user_domain) + + # Get the user by name + retrieved_user = user_repository.get_by_name("testuser") + + # Verify the user was retrieved correctly + assert retrieved_user is not None + assert retrieved_user.id == created_user.id + assert retrieved_user.name == "testuser" + + def test_get_by_name_nonexistent(self, app, user_repository): + """Test getting a nonexistent user by name.""" + with app.app_context(): + # Try to get a user that doesn't exist + retrieved_user = user_repository.get_by_name("nonexistent") + + # Verify None is returned + assert retrieved_user is None + + def test_get_all(self, app, user_repository): + """Test getting all users.""" + with app.app_context(): + # Create a few users + user1_domain = UserDomain(name="testuser1", password="testpassword1") + user_repository.create(user1_domain) + + user2_domain = UserDomain(name="testuser2", password="testpassword2") + user_repository.create(user2_domain) + + # Get all users + users = user_repository.get_all() + + # Verify we got the users + assert len(users) >= 2 + names = [user.name for user in users] + assert "testuser1" in names + assert "testuser2" in names + + # Verify they are domain models + assert all(isinstance(user, UserDomain) for user in users) + assert all(not hasattr(user, "_sa_instance_state") for user in users) + + def test_get_all_empty(self, app, user_repository): + """Test getting all users when there are none.""" + with app.app_context(): + # Get all users when there are none + users = user_repository.get_all() + + # Verify an empty list is returned + assert users == [] + + def test_get_users_with_posts(self, app, user_repository): + """Test getting users with posts loaded.""" + with app.app_context(): + # Create a user + user_domain = UserDomain(name="testuser", password="testpassword") + user_repository.create(user_domain) + + # Get users with posts + users = user_repository.get_users_with_posts() + + # Verify we got the user + assert len(users) >= 1 + names = [user.name for user in users] + assert "testuser" in names + + # Verify they are domain models + assert all(isinstance(user, UserDomain) for user in users) + assert all(not hasattr(user, "_sa_instance_state") for user in users) + + def test_get_users_with_posts_empty(self, app, user_repository): + """Test getting users with posts when there are none.""" + with app.app_context(): + # Get users with posts when there are none + users = user_repository.get_users_with_posts() + + # Verify an empty list is returned + assert users == [] + + def test_update_user(self, app, user_repository): + """Test updating a user.""" + with app.app_context(): + # Create a user first + user_domain = UserDomain(name="testuser", password="testpassword") + created_user = user_repository.create(user_domain) + + # Update the user + created_user.name = "updateduser" + updated_user = user_repository.update(created_user) + + # Verify the user was updated + assert updated_user.name == "updateduser" + + # Verify the ORM model was updated + stmt = db.select(UserORM).where(UserORM.id == created_user.id) + user_orm = db.session.scalar(stmt) + assert user_orm is not None + assert user_orm.name == "updateduser" + + def test_update_nonexistent_user(self, app, user_repository): + """Test updating a nonexistent user.""" + with app.app_context(): + # Try to update a user that doesn't exist + user_domain = UserDomain( + id=99999, # Nonexistent ID + name="testuser", + password="testpassword", + ) + + # Verify that updating a nonexistent user raises an error + with pytest.raises(ValueError): + user_repository.update(user_domain) + + def test_delete_user(self, app, user_repository): + """Test deleting a user.""" + with app.app_context(): + # Create a user first + user_domain = UserDomain(name="testuser", password="testpassword") + created_user = user_repository.create(user_domain) + + # Delete the user + result = user_repository.delete(created_user.id) + + # Verify the user was deleted + assert result is True + + # Verify the user no longer exists + retrieved_user = user_repository.get_by_id(created_user.id) + assert retrieved_user is None + + # Verify the ORM model was deleted + stmt = db.select(UserORM).where(UserORM.id == created_user.id) + user_orm = db.session.scalar(stmt) + assert user_orm is None + + def test_delete_nonexistent_user(self, app, user_repository): + """Test deleting a nonexistent user.""" + with app.app_context(): + # Try to delete a user that doesn't exist + result = user_repository.delete(99999) # Nonexistent ID + + # Verify the result is False + assert result is False + + def test_authenticate(self, app, user_repository): + """Test authenticating a user.""" + with app.app_context(): + # Create a user first + user_domain = UserDomain(name="testuser", password="testpassword") + created_user = user_repository.create(user_domain) + + # Manually hash the password for the created user at the ORM level + # This is needed because the repository doesn't hash passwords + user_orm = UserORM.query.get(created_user.id) + if user_orm: + user_orm.set_password("testpassword") + db.session.commit() + + # Authenticate the user + authenticated_user = user_repository.authenticate( + "testuser", "testpassword" + ) + + # Verify the user was authenticated + assert authenticated_user is not None + assert authenticated_user.id == created_user.id + assert authenticated_user.name == "testuser" + + def test_authenticate_wrong_password(self, app, user_repository): + """Test authenticating a user with wrong password.""" + with app.app_context(): + # Create a user first + user_domain = UserDomain(name="testuser", password="testpassword") + user_repository.create(user_domain) + + # Manually hash the password for the created user at the ORM level + # This is needed because the repository doesn't hash passwords + user_orm = UserORM.query.first() + if user_orm: + user_orm.set_password("testpassword") + db.session.commit() + + # Try to authenticate with wrong password + authenticated_user = user_repository.authenticate( + "testuser", "wrongpassword" + ) + + # Verify authentication failed + assert authenticated_user is None + + def test_authenticate_nonexistent_user(self, app, user_repository): + """Test authenticating a nonexistent user.""" + with app.app_context(): + # Try to authenticate a user that doesn't exist + authenticated_user = user_repository.authenticate("nonexistent", "password") + + # Verify authentication failed + assert authenticated_user is None + def test_to_domain_model_mapping(self, app, user_repository): """Test that _to_domain_model correctly maps ORM to domain model.""" with app.app_context(): @@ -508,6 +1596,224 @@ def test_get_by_id(self, app, icon_repository): assert isinstance(retrieved_icon, IconDomain) assert not hasattr(retrieved_icon, "_sa_instance_state") + def test_get_by_id_nonexistent(self, app, icon_repository): + """Test getting a nonexistent icon by ID.""" + with app.app_context(): + # Try to get an icon that doesn't exist + retrieved_icon = icon_repository.get_by_id(99999) # Nonexistent ID + + # Verify None is returned + assert retrieved_icon is None + + def test_get_by_title(self, app, icon_repository): + """Test getting an icon by title.""" + with app.app_context(): + # Create an icon first + icon_domain = IconDomain( + title="Test Icon", + url="http://example.com/icon.png", + content="Icon content", + ) + created_icon = icon_repository.create(icon_domain) + + # Get the icon by title + retrieved_icon = icon_repository.get_by_title("Test Icon") + + # Verify the icon was retrieved correctly + assert retrieved_icon is not None + assert retrieved_icon.id == created_icon.id + assert retrieved_icon.title == "Test Icon" + + def test_get_by_title_nonexistent(self, app, icon_repository): + """Test getting a nonexistent icon by title.""" + with app.app_context(): + # Try to get an icon that doesn't exist + retrieved_icon = icon_repository.get_by_title("nonexistent-title") + + # Verify None is returned + assert retrieved_icon is None + + def test_get_all(self, app, icon_repository): + """Test getting all icons.""" + with app.app_context(): + # Create a few icons + icon1_domain = IconDomain( + title="Test Icon 1", + url="http://example.com/icon1.png", + content="Icon content 1", + ) + icon_repository.create(icon1_domain) + + icon2_domain = IconDomain( + title="Test Icon 2", + url="http://example.com/icon2.png", + content="Icon content 2", + ) + icon_repository.create(icon2_domain) + + # Get all icons + icons = icon_repository.get_all() + + # Verify we got the icons + assert len(icons) >= 2 + titles = [icon.title for icon in icons] + assert "Test Icon 1" in titles + assert "Test Icon 2" in titles + + # Verify they are domain models + assert all(isinstance(icon, IconDomain) for icon in icons) + assert all(not hasattr(icon, "_sa_instance_state") for icon in icons) + + def test_get_all_empty(self, app, icon_repository): + """Test getting all icons when there are none.""" + with app.app_context(): + # Get all icons when there are none + icons = icon_repository.get_all() + + # Verify an empty list is returned + assert icons == [] + + def test_update_icon(self, app, icon_repository): + """Test updating an icon.""" + with app.app_context(): + # Create an icon first + icon_domain = IconDomain( + title="Test Icon", + url="http://example.com/icon.png", + content="Icon content", + ) + created_icon = icon_repository.create(icon_domain) + + # Update the icon + created_icon.title = "Updated Icon" + updated_icon = icon_repository.update(created_icon) + + # Verify the icon was updated + assert updated_icon.title == "Updated Icon" + + # Verify the ORM model was updated + stmt = db.select(IconORM).where(IconORM.id == created_icon.id) + icon_orm = db.session.scalar(stmt) + assert icon_orm is not None + assert icon_orm.title == "Updated Icon" + + def test_update_nonexistent_icon(self, app, icon_repository): + """Test updating a nonexistent icon.""" + with app.app_context(): + # Try to update an icon that doesn't exist + icon_domain = IconDomain( + id=99999, # Nonexistent ID + title="Test Icon", + url="http://example.com/icon.png", + content="Icon content", + ) + + # Verify that updating a nonexistent icon raises an error + with pytest.raises(ValueError): + icon_repository.update(icon_domain) + + def test_delete_icon(self, app, icon_repository): + """Test deleting an icon.""" + with app.app_context(): + # Create an icon first + icon_domain = IconDomain( + title="Test Icon", + url="http://example.com/icon.png", + content="Icon content", + ) + created_icon = icon_repository.create(icon_domain) + + # Delete the icon + result = icon_repository.delete(created_icon.id) + + # Verify the icon was deleted + assert result is True + + # Verify the icon no longer exists + retrieved_icon = icon_repository.get_by_id(created_icon.id) + assert retrieved_icon is None + + # Verify the ORM model was deleted + stmt = db.select(IconORM).where(IconORM.id == created_icon.id) + icon_orm = db.session.scalar(stmt) + assert icon_orm is None + + def test_delete_nonexistent_icon(self, app, icon_repository): + """Test deleting a nonexistent icon.""" + with app.app_context(): + # Try to delete an icon that doesn't exist + result = icon_repository.delete(99999) # Nonexistent ID + + # Verify the result is False + assert result is False + + def test_get_icon_orm_by_id(self, app, icon_repository): + """Test getting an icon ORM model by ID.""" + with app.app_context(): + # Create an icon first + icon_domain = IconDomain( + title="Test Icon", + url="http://example.com/icon.png", + content="Icon content", + ) + created_icon = icon_repository.create(icon_domain) + + # Get the icon ORM model by ID + icon_orm = icon_repository.get_icon_orm_by_id(created_icon.id) + + # Verify the icon ORM model was retrieved + assert icon_orm is not None + assert icon_orm.id == created_icon.id + assert icon_orm.title == "Test Icon" + + def test_get_icon_orm_by_id_nonexistent(self, app, icon_repository): + """Test getting a nonexistent icon ORM model by ID.""" + with app.app_context(): + # Try to get an icon that doesn't exist + icon_orm = icon_repository.get_icon_orm_by_id(99999) # Nonexistent ID + + # Verify None is returned + assert icon_orm is None + + def test_get_all_icons_orm(self, app, icon_repository): + """Test getting all icons as ORM models.""" + with app.app_context(): + # Create a few icons + icon1_domain = IconDomain( + title="Test Icon 1", + url="http://example.com/icon1.png", + content="Icon content 1", + ) + icon_repository.create(icon1_domain) + + icon2_domain = IconDomain( + title="Test Icon 2", + url="http://example.com/icon2.png", + content="Icon content 2", + ) + icon_repository.create(icon2_domain) + + # Get all icons as ORM models + icons_orm = icon_repository.get_all_icons_orm() + + # Verify we got the icons + assert len(icons_orm) >= 2 + titles = [icon.title for icon in icons_orm] + assert "Test Icon 1" in titles + assert "Test Icon 2" in titles + + # Verify they are ORM models + assert all(isinstance(icon, IconORM) for icon in icons_orm) + + def test_get_all_icons_orm_empty(self, app, icon_repository): + """Test getting all icons as ORM models when there are none.""" + with app.app_context(): + # Get all icons as ORM models when there are none + icons_orm = icon_repository.get_all_icons_orm() + + # Verify an empty list is returned + assert icons_orm == [] + def test_to_domain_model_mapping(self, app, icon_repository): """Test that _to_domain_model correctly maps ORM to domain model.""" with app.app_context(): From d9d144bf449bdb2121ce19a34cf558afb57041b5 Mon Sep 17 00:00:00 2001 From: loki Date: Mon, 8 Sep 2025 23:04:19 +0300 Subject: [PATCH 21/34] config validator --- blog/config_validator.py | 154 ++++++++++++++++++++++ config.example.sh | 37 ++++++ gunicorn.example.conf | 37 ++++++ tests/test_config_validator.py | 232 +++++++++++++++++++++++++++++++++ 4 files changed, 460 insertions(+) create mode 100644 blog/config_validator.py create mode 100644 config.example.sh create mode 100644 gunicorn.example.conf create mode 100644 tests/test_config_validator.py diff --git a/blog/config_validator.py b/blog/config_validator.py new file mode 100644 index 0000000..1610e3a --- /dev/null +++ b/blog/config_validator.py @@ -0,0 +1,154 @@ +"""Configuration validation module.""" + +import logging +import os +from typing import Dict, Any, List + +logger = logging.getLogger(__name__) + + +class ConfigValidationError(Exception): + """Raised when configuration validation fails.""" + + pass + + +def validate_config(config: Dict[str, Any]) -> List[str]: + """Validate the application configuration. + + Args: + config: The configuration dictionary to validate + + Returns: + List of validation warnings (non-fatal issues) + + Raises: + ConfigValidationError: If critical configuration is missing or invalid + """ + warnings = [] + + # Validate SECRET_KEY + secret_key = config.get("SECRET_KEY") + if not secret_key: + raise ConfigValidationError( + "SECRET_KEY is required but not set. " + "Set the SECRET_KEY environment variable." + ) + elif secret_key == "hard to guess string": + warnings.append( + "Using default SECRET_KEY. " + "For production, set a strong SECRET_KEY environment variable." + ) + + # Validate SQLALCHEMY_DATABASE_URI + db_uri = config.get("SQLALCHEMY_DATABASE_URI") + if not db_uri: + warnings.append( + "SQLALCHEMY_DATABASE_URI is not set. " + "Using default database URI which may not be suitable for production." + ) + else: + # Basic validation of database URI + if not isinstance(db_uri, str): + raise ConfigValidationError("SQLALCHEMY_DATABASE_URI must be a string") + + # Check for common database URI prefixes + valid_schemes = ("sqlite://", "postgresql://", "mysql://", "oracle://") + if not any(db_uri.startswith(scheme) for scheme in valid_schemes): + warnings.append( + f"SQLALCHEMY_DATABASE_URI '{db_uri}' uses an uncommon scheme. " + "Supported schemes: sqlite://, postgresql://, mysql://, oracle://" + ) + + # Validate PAGE_CATEGORY + page_category = config.get("PAGE_CATEGORY") + if page_category is not None: + if not isinstance(page_category, list): + raise ConfigValidationError("PAGE_CATEGORY must be a list of integers") + for item in page_category: + if not isinstance(item, int): + raise ConfigValidationError("PAGE_CATEGORY must contain only integers") + + # Validate PORT + port = config.get("PORT") + if port: + try: + port_int = int(port) + if port_int <= 0 or port_int > 65535: + raise ConfigValidationError( + f"PORT must be between 1 and 65535, got {port_int}" + ) + except ValueError: + raise ConfigValidationError(f"PORT must be a valid integer, got '{port}'") + + # Validate CACHE settings for production + env = os.environ.get("FLASK_ENV", "development") + if env == "production": + cache_type = config.get("CACHE_TYPE", "NullCache") + if cache_type == "NullCache": + warnings.append( + "Using NullCache in production. " + "Consider using a proper cache implementation for better performance." + ) + + logger.info("Configuration validation completed with %d warnings", len(warnings)) + return warnings + + +def validate_required_configs(config: Dict[str, Any], required_keys: List[str]) -> None: + """Validate that all required configuration keys are present. + + Args: + config: The configuration dictionary to validate + required_keys: List of required configuration keys + + Raises: + ConfigValidationError: If any required configuration is missing + """ + missing_keys = [] + for key in required_keys: + if key not in config or config[key] is None: + missing_keys.append(key) + + if missing_keys: + raise ConfigValidationError( + f"Missing required configuration keys: {', '.join(missing_keys)}. " + "Set these environment variables or check your configuration." + ) + + +def validate_environment_specific_configs(config: Dict[str, Any]) -> List[str]: + """Validate environment-specific configurations. + + Args: + config: The configuration dictionary to validate + + Returns: + List of validation warnings + """ + warnings = [] + env = os.environ.get("FLASK_ENV", "development") + + if env == "production": + # Additional validations for production environment + if config.get("DEBUG", False): + warnings.append( + "DEBUG mode is enabled in production. " + "Disable DEBUG mode for security reasons." + ) + + if config.get("TESTING", False): + warnings.append( + "TESTING mode is enabled in production. " + "Disable TESTING mode for security reasons." + ) + + elif env == "testing": + # Validations for testing environment + pass + + elif env == "development": + # Validations for development environment + pass + + return warnings diff --git a/config.example.sh b/config.example.sh new file mode 100644 index 0000000..6a5b772 --- /dev/null +++ b/config.example.sh @@ -0,0 +1,37 @@ +#!/bin/bash +# Example configuration script for the gunlinux.ru blog application +# Copy this file to config.sh and modify as needed + +# Secret key for Flask sessions and CSRF protection +# Generate a strong random key for production +export SECRET_KEY="change-this-to-a-strong-random-string-in-production" + +# Database configuration +# SQLite (development) +export SQLALCHEMY_DATABASE_URI="sqlite:///tmp/dev.db" + +# For PostgreSQL: +# export SQLALCHEMY_DATABASE_URI="postgresql://username:password@localhost/database_name" + +# For MySQL: +# export SQLALCHEMY_DATABASE_URI="mysql://username:password@localhost/database_name" + +# Application environment +# Options: development, testing, production +export FLASK_ENV="development" + +# Web server port +export PORT="5555" + +# Yandex verification code (optional) +# export YANDEX_VERIFICATION="your-yandex-verification-code" + +# Yandex Metrika ID (optional) +# export YANDEX_METRIKA="your-yandex-metrika-id" + +# Page categories (comma-separated list of integers) +export PAGE_CATEGORY="0" + +# Cache configuration (optional) +# export CACHE_TYPE="SimpleCache" +# export CACHE_DEFAULT_TIMEOUT="300" \ No newline at end of file diff --git a/gunicorn.example.conf b/gunicorn.example.conf new file mode 100644 index 0000000..cc68d5d --- /dev/null +++ b/gunicorn.example.conf @@ -0,0 +1,37 @@ +# Example Gunicorn configuration file for the gunlinux.ru blog application +# Copy this file to gunicorn.conf and modify as needed + +# Server socket +bind = "0.0.0.0:5555" + +# Worker processes +workers = 2 +worker_class = "gevent" +worker_connections = 1000 +timeout = 30 +keepalive = 2 + +# Restart workers after this many requests, to help prevent memory leaks +max_requests = 1000 +max_requests_jitter = 100 + +# Logging +accesslog = "-" +errorlog = "-" +loglevel = "info" + +# Process naming +proc_name = "gunlinux.ru" + +# Server mechanics +preload_app = True +daemon = False +pidfile = "/tmp/gunlinux.ru.pid" +user = "www-data" +group = "www-data" + +# Security +# Limit the allowed HTTP methods +# limit_request_line = 4094 +# limit_request_fields = 100 +# limit_request_field_size = 8190 \ No newline at end of file diff --git a/tests/test_config_validator.py b/tests/test_config_validator.py new file mode 100644 index 0000000..b892c49 --- /dev/null +++ b/tests/test_config_validator.py @@ -0,0 +1,232 @@ +"""Unit tests for the configuration validator.""" + +import pytest +import os + +from blog.config_validator import ( + validate_config, + validate_required_configs, + validate_environment_specific_configs, + ConfigValidationError +) + + +def test_validate_config_valid_secret_key(): + """Test that validate_config accepts a valid SECRET_KEY.""" + config = { + 'SECRET_KEY': 'a-valid-secret-key', + 'SQLALCHEMY_DATABASE_URI': 'sqlite:///:memory:', + } + + # Should not raise an exception + warnings = validate_config(config) + assert isinstance(warnings, list) + + +def test_validate_config_default_secret_key_warning(): + """Test that validate_config warns about default SECRET_KEY.""" + config = { + 'SECRET_KEY': 'hard to guess string', # Default value + 'SQLALCHEMY_DATABASE_URI': 'sqlite:///:memory:', + } + + warnings = validate_config(config) + assert len(warnings) >= 1 + assert any('SECRET_KEY' in warning for warning in warnings) + + +def test_validate_config_missing_secret_key(): + """Test that validate_config raises an error for missing SECRET_KEY.""" + config = { + 'SQLALCHEMY_DATABASE_URI': 'sqlite:///:memory:', + } + + with pytest.raises(ConfigValidationError, match="SECRET_KEY is required"): + validate_config(config) + + +def test_validate_config_invalid_database_uri(): + """Test that validate_config handles invalid database URIs.""" + config = { + 'SECRET_KEY': 'a-valid-secret-key', + 'SQLALCHEMY_DATABASE_URI': 123, # Invalid type + } + + with pytest.raises(ConfigValidationError, match="must be a string"): + validate_config(config) + + +def test_validate_config_uncommon_database_uri(): + """Test that validate_config warns about uncommon database URIs.""" + config = { + 'SECRET_KEY': 'a-valid-secret-key', + 'SQLALCHEMY_DATABASE_URI': 'mongodb://localhost/mydb', # Uncommon scheme + } + + warnings = validate_config(config) + assert any('uncommon scheme' in warning for warning in warnings) + + +def test_validate_config_missing_database_uri(): + """Test that validate_config warns about missing database URI.""" + config = { + 'SECRET_KEY': 'a-valid-secret-key', + } + + warnings = validate_config(config) + assert any('SQLALCHEMY_DATABASE_URI' in warning for warning in warnings) + + +def test_validate_config_invalid_port(): + """Test that validate_config handles invalid ports.""" + config = { + 'SECRET_KEY': 'a-valid-secret-key', + 'PORT': 'invalid-port', + } + + with pytest.raises(ConfigValidationError, match="PORT must be a valid integer"): + validate_config(config) + + +def test_validate_config_port_out_of_range(): + """Test that validate_config handles ports out of range.""" + config = { + 'SECRET_KEY': 'a-valid-secret-key', + 'PORT': '99999', # Too high + } + + with pytest.raises(ConfigValidationError, match="PORT must be between 1 and 65535"): + validate_config(config) + + +def test_validate_config_valid_port(): + """Test that validate_config accepts valid ports.""" + config = { + 'SECRET_KEY': 'a-valid-secret-key', + 'PORT': '8080', + } + + # Should not raise an exception + warnings = validate_config(config) + assert isinstance(warnings, list) + + +def test_validate_config_invalid_page_category(): + """Test that validate_config handles invalid PAGE_CATEGORY.""" + config = { + 'SECRET_KEY': 'a-valid-secret-key', + 'PAGE_CATEGORY': 'not-a-list', # Invalid type + } + + with pytest.raises(ConfigValidationError, match="PAGE_CATEGORY must be a list"): + validate_config(config) + + +def test_validate_config_invalid_page_category_items(): + """Test that validate_config handles invalid PAGE_CATEGORY items.""" + config = { + 'SECRET_KEY': 'a-valid-secret-key', + 'PAGE_CATEGORY': ['not-an-int'], # Invalid items + } + + with pytest.raises(ConfigValidationError, match="PAGE_CATEGORY must contain only integers"): + validate_config(config) + + +def test_validate_config_valid_page_category(): + """Test that validate_config accepts valid PAGE_CATEGORY.""" + config = { + 'SECRET_KEY': 'a-valid-secret-key', + 'PAGE_CATEGORY': [1, 2, 3], + } + + # Should not raise an exception + warnings = validate_config(config) + assert isinstance(warnings, list) + + +def test_validate_config_nullcache_in_production(): + """Test that validate_config warns about NullCache in production.""" + # Temporarily set environment + old_env = os.environ.get("FLASK_ENV") + os.environ["FLASK_ENV"] = "production" + + try: + config = { + 'SECRET_KEY': 'a-valid-secret-key', + 'CACHE_TYPE': 'NullCache', # Should warn in production + } + + warnings = validate_config(config) + assert any('NullCache' in warning for warning in warnings) + finally: + # Restore environment + if old_env is not None: + os.environ["FLASK_ENV"] = old_env + elif "FLASK_ENV" in os.environ: + del os.environ["FLASK_ENV"] + + +def test_validate_required_configs_all_present(): + """Test that validate_required_configs passes when all required configs are present.""" + config = { + 'SECRET_KEY': 'a-valid-secret-key', + 'SQLALCHEMY_DATABASE_URI': 'sqlite:///:memory:', + 'REQUIRED_CONFIG': 'value', + } + + # Should not raise an exception + validate_required_configs(config, ['SECRET_KEY', 'SQLALCHEMY_DATABASE_URI', 'REQUIRED_CONFIG']) + + +def test_validate_required_configs_missing(): + """Test that validate_required_configs raises an error when configs are missing.""" + config = { + 'SECRET_KEY': 'a-valid-secret-key', + } + + with pytest.raises(ConfigValidationError, match="Missing required configuration keys"): + validate_required_configs(config, ['SECRET_KEY', 'SQLALCHEMY_DATABASE_URI', 'REQUIRED_CONFIG']) + + +def test_validate_environment_specific_configs_development_debug(): + """Test that validate_environment_specific_configs handles development environment.""" + # Temporarily set environment + old_env = os.environ.get("FLASK_ENV") + os.environ["FLASK_ENV"] = "development" + + try: + config = { + 'DEBUG': True, + } + + warnings = validate_environment_specific_configs(config) + # No warnings expected for development environment with debug + assert isinstance(warnings, list) + finally: + # Restore environment + if old_env is not None: + os.environ["FLASK_ENV"] = old_env + elif "FLASK_ENV" in os.environ: + del os.environ["FLASK_ENV"] + + +def test_validate_environment_specific_configs_production_debug(): + """Test that validate_environment_specific_configs warns about debug in production.""" + # Temporarily set environment + old_env = os.environ.get("FLASK_ENV") + os.environ["FLASK_ENV"] = "production" + + try: + config = { + 'DEBUG': True, + } + + warnings = validate_environment_specific_configs(config) + assert any('DEBUG mode is enabled' in warning for warning in warnings) + finally: + # Restore environment + if old_env is not None: + os.environ["FLASK_ENV"] = old_env + elif "FLASK_ENV" in os.environ: + del os.environ["FLASK_ENV"] \ No newline at end of file From 9119ca21c816484f486e8df197e83b8227d7b506 Mon Sep 17 00:00:00 2001 From: loki Date: Mon, 8 Sep 2025 23:26:45 +0300 Subject: [PATCH 22/34] postgresql__ --- blog/__init__.py | 32 +++++ blog/config.py | 6 +- migrations/README.md | 54 +++++++ .../f00000000001_fix_schema_consistency.py | 120 ++++++++++++++++ .../f00000000002_fix_postgres_types.py | 27 ++++ tests/test_config_validator.py | 134 ++++++++++-------- 6 files changed, 309 insertions(+), 64 deletions(-) create mode 100644 migrations/README.md create mode 100644 migrations/versions/f00000000001_fix_schema_consistency.py create mode 100644 migrations/versions/f00000000002_fix_postgres_types.py diff --git a/blog/__init__.py b/blog/__init__.py index cc7d845..e4300ce 100644 --- a/blog/__init__.py +++ b/blog/__init__.py @@ -8,6 +8,7 @@ from blog.admin import create_admin from blog.config import config +from blog.config_validator import validate_config, ConfigValidationError from blog.extensions import admin_ext, cache, db, login_manager, migrate, flask_sitemap from blog.post.views import post from blog.tags.views import tags @@ -35,11 +36,42 @@ def register_commands(app): init_app(app) +def validate_application_config(app): + """Validate the application configuration at startup. + + Args: + app: The Flask application instance + + Raises: + ConfigValidationError: If configuration validation fails + """ + try: + # Validate the configuration + warnings = validate_config(app.config) + + # Log any warnings + for warning in warnings: + logger.warning("Configuration warning: %s", warning) + + logger.info("Application configuration validated successfully") + + except ConfigValidationError as e: + logger.error("Configuration validation failed: %s", str(e)) + raise + except Exception as e: + logger.error("Unexpected error during configuration validation: %s", str(e)) + raise ConfigValidationError(f"Configuration validation failed: {str(e)}") from e + + def create_app(): app = Flask(__name__) env = os.environ.get("FLASK_ENV", "development") logger.debug("current FLASK_ENV %s", env) app.config.from_object(config.get(env)) + + # Validate configuration at startup + validate_application_config(app) + configure_extensions(app) if not app.config["TESTING"]: create_admin(admin_ext) diff --git a/blog/config.py b/blog/config.py index 655a8bc..6207d74 100644 --- a/blog/config.py +++ b/blog/config.py @@ -36,7 +36,11 @@ class TestingConfig(Config): class ProductionConfig(Config): - SQLALCHEMY_DATABASE_URI: str | None = environ.get("SQLALCHEMY_DATABASE_URI", None) + DEBUG: bool = False + default_db_uri: str = f"sqlite:///{path.join(basedir, '../tmp/prod.db')}" + SQLALCHEMY_DATABASE_URI: str = environ.get( + "SQLALCHEMY_DATABASE_URI", default_db_uri + ) CACHE_TYPE: str = "SimpleCache" CACHE_DEFAULT_TIMEOUT: int = 300 diff --git a/migrations/README.md b/migrations/README.md new file mode 100644 index 0000000..842dd73 --- /dev/null +++ b/migrations/README.md @@ -0,0 +1,54 @@ +# Database Migrations + +This directory contains the Alembic migration scripts for the gunlinux.ru blog application. + +## Overview + +Database migrations allow us to evolve the database schema over time while maintaining data integrity and providing rollback capabilities. + +## Directory Structure + +- `versions/` - Migration scripts (timestamped) +- `alembic.ini` - Alembic configuration +- `env.py` - Migration environment configuration +- `script.py.mako` - Template for new migration scripts + +## Working with Migrations + +### Apply Pending Migrations + +```bash +flask db upgrade +``` + +### Create a New Migration + +After modifying SQLAlchemy models: + +```bash +flask db migrate -m "Description of changes" +``` + +### Check Current Revision + +```bash +flask db current +``` + +### View Migration History + +```bash +flask db history +``` + +## Best Practices + +1. **Review Generated Migrations**: Always review auto-generated migration scripts before committing +2. **Test Migrations**: Test both upgrade and downgrade functions before deploying to production +3. **Version Control**: Commit migration scripts immediately after creation +4. **Descriptive Names**: Give migration scripts descriptive names that explain the changes +5. **Backup Before Production**: Always backup the database before applying migrations in production + +## Documentation + +For detailed information about migrations, see [docs/migrations.md](../docs/migrations.md). \ No newline at end of file diff --git a/migrations/versions/f00000000001_fix_schema_consistency.py b/migrations/versions/f00000000001_fix_schema_consistency.py new file mode 100644 index 0000000..62099b0 --- /dev/null +++ b/migrations/versions/f00000000001_fix_schema_consistency.py @@ -0,0 +1,120 @@ +"""Fix PostgreSQL-specific migration for cross-database compatibility + +Revision ID: f00000000001 +Revises: b0e3595603e9 +Create Date: 2025-09-08 23:30:00.000000 + +""" + +from alembic import op +import sqlalchemy as sa + +# revision identifiers, used by Alembic. +revision = "f00000000001" +down_revision = "b0e3595603e9" +branch_labels = None +depends_on = None + + +def upgrade(): + """Upgrade the database schema to fix issues and improve consistency.""" + # Fix issues with nullable columns that should not be nullable + with op.batch_alter_table("categories", schema=None) as batch_op: + batch_op.alter_column( + "title", existing_type=sa.VARCHAR(length=255), nullable=False + ) + batch_op.alter_column( + "alias", existing_type=sa.VARCHAR(length=255), nullable=False + ) + + with op.batch_alter_table("icons", schema=None) as batch_op: + batch_op.alter_column( + "title", existing_type=sa.VARCHAR(length=255), nullable=False + ) + batch_op.alter_column( + "url", existing_type=sa.VARCHAR(length=255), nullable=False + ) + # Allow content to be nullable for icons + batch_op.alter_column("content", existing_type=sa.TEXT(), nullable=True) + + with op.batch_alter_table("posts", schema=None) as batch_op: + batch_op.alter_column( + "pagetitle", existing_type=sa.VARCHAR(length=255), nullable=False + ) + batch_op.alter_column( + "alias", existing_type=sa.VARCHAR(length=255), nullable=False + ) + # Allow content to be nullable for drafts + batch_op.alter_column("content", existing_type=sa.TEXT(), nullable=True) + batch_op.alter_column("createdon", existing_type=sa.DATETIME(), nullable=False) + + with op.batch_alter_table("tags", schema=None) as batch_op: + batch_op.alter_column( + "title", existing_type=sa.VARCHAR(length=255), nullable=False + ) + batch_op.alter_column( + "alias", existing_type=sa.VARCHAR(length=255), nullable=False + ) + + with op.batch_alter_table("users", schema=None) as batch_op: + batch_op.alter_column( + "name", existing_type=sa.VARCHAR(length=50), nullable=False + ) + # Password should be nullable to allow for external auth + batch_op.alter_column( + "password", existing_type=sa.VARCHAR(length=255), nullable=True + ) + # Fix authenticated column type + batch_op.alter_column( + "authenticated", existing_type=sa.Integer(), nullable=True + ) + + +def downgrade(): + """Downgrade the database schema to the previous state.""" + # Revert changes to nullable columns + with op.batch_alter_table("users", schema=None) as batch_op: + batch_op.alter_column( + "authenticated", existing_type=sa.Integer(), nullable=True + ) + batch_op.alter_column( + "password", existing_type=sa.VARCHAR(length=255), nullable=True + ) + batch_op.alter_column( + "name", existing_type=sa.VARCHAR(length=50), nullable=True + ) + + with op.batch_alter_table("tags", schema=None) as batch_op: + batch_op.alter_column( + "alias", existing_type=sa.VARCHAR(length=255), nullable=True + ) + batch_op.alter_column( + "title", existing_type=sa.VARCHAR(length=255), nullable=True + ) + + with op.batch_alter_table("posts", schema=None) as batch_op: + batch_op.alter_column("createdon", existing_type=sa.DATETIME(), nullable=True) + batch_op.alter_column("content", existing_type=sa.TEXT(), nullable=True) + batch_op.alter_column( + "alias", existing_type=sa.VARCHAR(length=255), nullable=True + ) + batch_op.alter_column( + "pagetitle", existing_type=sa.VARCHAR(length=255), nullable=True + ) + + with op.batch_alter_table("icons", schema=None) as batch_op: + batch_op.alter_column("content", existing_type=sa.TEXT(), nullable=True) + batch_op.alter_column( + "url", existing_type=sa.VARCHAR(length=255), nullable=True + ) + batch_op.alter_column( + "title", existing_type=sa.VARCHAR(length=255), nullable=True + ) + + with op.batch_alter_table("categories", schema=None) as batch_op: + batch_op.alter_column( + "alias", existing_type=sa.VARCHAR(length=255), nullable=True + ) + batch_op.alter_column( + "title", existing_type=sa.VARCHAR(length=255), nullable=True + ) diff --git a/migrations/versions/f00000000002_fix_postgres_types.py b/migrations/versions/f00000000002_fix_postgres_types.py new file mode 100644 index 0000000..55c49e4 --- /dev/null +++ b/migrations/versions/f00000000002_fix_postgres_types.py @@ -0,0 +1,27 @@ +"""Replace PostgreSQL-specific types with generic SQLAlchemy types + +Revision ID: f00000000002 +Revises: f00000000001 +Create Date: 2025-09-08 23:35:00.000000 + +""" + +# revision identifiers, used by Alembic. +revision = "f00000000002" +down_revision = "f00000000001" +branch_labels = None +depends_on = None + + +def upgrade(): + """Upgrade the database schema to use generic types instead of PostgreSQL-specific types.""" + # This migration fixes PostgreSQL-specific type references + # Since we're using generic SQLAlchemy types, no changes are needed + # This is a placeholder to ensure migration chain integrity + pass + + +def downgrade(): + """Downgrade the database schema.""" + # No changes needed for downgrade + pass diff --git a/tests/test_config_validator.py b/tests/test_config_validator.py index b892c49..804dbaa 100644 --- a/tests/test_config_validator.py +++ b/tests/test_config_validator.py @@ -4,20 +4,20 @@ import os from blog.config_validator import ( - validate_config, - validate_required_configs, + validate_config, + validate_required_configs, validate_environment_specific_configs, - ConfigValidationError + ConfigValidationError, ) def test_validate_config_valid_secret_key(): """Test that validate_config accepts a valid SECRET_KEY.""" config = { - 'SECRET_KEY': 'a-valid-secret-key', - 'SQLALCHEMY_DATABASE_URI': 'sqlite:///:memory:', + "SECRET_KEY": "a-valid-secret-key", + "SQLALCHEMY_DATABASE_URI": "sqlite:///:memory:", } - + # Should not raise an exception warnings = validate_config(config) assert isinstance(warnings, list) @@ -26,21 +26,21 @@ def test_validate_config_valid_secret_key(): def test_validate_config_default_secret_key_warning(): """Test that validate_config warns about default SECRET_KEY.""" config = { - 'SECRET_KEY': 'hard to guess string', # Default value - 'SQLALCHEMY_DATABASE_URI': 'sqlite:///:memory:', + "SECRET_KEY": "hard to guess string", # Default value + "SQLALCHEMY_DATABASE_URI": "sqlite:///:memory:", } - + warnings = validate_config(config) assert len(warnings) >= 1 - assert any('SECRET_KEY' in warning for warning in warnings) + assert any("SECRET_KEY" in warning for warning in warnings) def test_validate_config_missing_secret_key(): """Test that validate_config raises an error for missing SECRET_KEY.""" config = { - 'SQLALCHEMY_DATABASE_URI': 'sqlite:///:memory:', + "SQLALCHEMY_DATABASE_URI": "sqlite:///:memory:", } - + with pytest.raises(ConfigValidationError, match="SECRET_KEY is required"): validate_config(config) @@ -48,10 +48,10 @@ def test_validate_config_missing_secret_key(): def test_validate_config_invalid_database_uri(): """Test that validate_config handles invalid database URIs.""" config = { - 'SECRET_KEY': 'a-valid-secret-key', - 'SQLALCHEMY_DATABASE_URI': 123, # Invalid type + "SECRET_KEY": "a-valid-secret-key", + "SQLALCHEMY_DATABASE_URI": 123, # Invalid type } - + with pytest.raises(ConfigValidationError, match="must be a string"): validate_config(config) @@ -59,31 +59,31 @@ def test_validate_config_invalid_database_uri(): def test_validate_config_uncommon_database_uri(): """Test that validate_config warns about uncommon database URIs.""" config = { - 'SECRET_KEY': 'a-valid-secret-key', - 'SQLALCHEMY_DATABASE_URI': 'mongodb://localhost/mydb', # Uncommon scheme + "SECRET_KEY": "a-valid-secret-key", + "SQLALCHEMY_DATABASE_URI": "mongodb://localhost/mydb", # Uncommon scheme } - + warnings = validate_config(config) - assert any('uncommon scheme' in warning for warning in warnings) + assert any("uncommon scheme" in warning for warning in warnings) def test_validate_config_missing_database_uri(): """Test that validate_config warns about missing database URI.""" config = { - 'SECRET_KEY': 'a-valid-secret-key', + "SECRET_KEY": "a-valid-secret-key", } - + warnings = validate_config(config) - assert any('SQLALCHEMY_DATABASE_URI' in warning for warning in warnings) + assert any("SQLALCHEMY_DATABASE_URI" in warning for warning in warnings) def test_validate_config_invalid_port(): """Test that validate_config handles invalid ports.""" config = { - 'SECRET_KEY': 'a-valid-secret-key', - 'PORT': 'invalid-port', + "SECRET_KEY": "a-valid-secret-key", + "PORT": "invalid-port", } - + with pytest.raises(ConfigValidationError, match="PORT must be a valid integer"): validate_config(config) @@ -91,10 +91,10 @@ def test_validate_config_invalid_port(): def test_validate_config_port_out_of_range(): """Test that validate_config handles ports out of range.""" config = { - 'SECRET_KEY': 'a-valid-secret-key', - 'PORT': '99999', # Too high + "SECRET_KEY": "a-valid-secret-key", + "PORT": "99999", # Too high } - + with pytest.raises(ConfigValidationError, match="PORT must be between 1 and 65535"): validate_config(config) @@ -102,10 +102,10 @@ def test_validate_config_port_out_of_range(): def test_validate_config_valid_port(): """Test that validate_config accepts valid ports.""" config = { - 'SECRET_KEY': 'a-valid-secret-key', - 'PORT': '8080', + "SECRET_KEY": "a-valid-secret-key", + "PORT": "8080", } - + # Should not raise an exception warnings = validate_config(config) assert isinstance(warnings, list) @@ -114,10 +114,10 @@ def test_validate_config_valid_port(): def test_validate_config_invalid_page_category(): """Test that validate_config handles invalid PAGE_CATEGORY.""" config = { - 'SECRET_KEY': 'a-valid-secret-key', - 'PAGE_CATEGORY': 'not-a-list', # Invalid type + "SECRET_KEY": "a-valid-secret-key", + "PAGE_CATEGORY": "not-a-list", # Invalid type } - + with pytest.raises(ConfigValidationError, match="PAGE_CATEGORY must be a list"): validate_config(config) @@ -125,21 +125,23 @@ def test_validate_config_invalid_page_category(): def test_validate_config_invalid_page_category_items(): """Test that validate_config handles invalid PAGE_CATEGORY items.""" config = { - 'SECRET_KEY': 'a-valid-secret-key', - 'PAGE_CATEGORY': ['not-an-int'], # Invalid items + "SECRET_KEY": "a-valid-secret-key", + "PAGE_CATEGORY": ["not-an-int"], # Invalid items } - - with pytest.raises(ConfigValidationError, match="PAGE_CATEGORY must contain only integers"): + + with pytest.raises( + ConfigValidationError, match="PAGE_CATEGORY must contain only integers" + ): validate_config(config) def test_validate_config_valid_page_category(): """Test that validate_config accepts valid PAGE_CATEGORY.""" config = { - 'SECRET_KEY': 'a-valid-secret-key', - 'PAGE_CATEGORY': [1, 2, 3], + "SECRET_KEY": "a-valid-secret-key", + "PAGE_CATEGORY": [1, 2, 3], } - + # Should not raise an exception warnings = validate_config(config) assert isinstance(warnings, list) @@ -150,15 +152,15 @@ def test_validate_config_nullcache_in_production(): # Temporarily set environment old_env = os.environ.get("FLASK_ENV") os.environ["FLASK_ENV"] = "production" - + try: config = { - 'SECRET_KEY': 'a-valid-secret-key', - 'CACHE_TYPE': 'NullCache', # Should warn in production + "SECRET_KEY": "a-valid-secret-key", + "CACHE_TYPE": "NullCache", # Should warn in production } - + warnings = validate_config(config) - assert any('NullCache' in warning for warning in warnings) + assert any("NullCache" in warning for warning in warnings) finally: # Restore environment if old_env is not None: @@ -170,23 +172,29 @@ def test_validate_config_nullcache_in_production(): def test_validate_required_configs_all_present(): """Test that validate_required_configs passes when all required configs are present.""" config = { - 'SECRET_KEY': 'a-valid-secret-key', - 'SQLALCHEMY_DATABASE_URI': 'sqlite:///:memory:', - 'REQUIRED_CONFIG': 'value', + "SECRET_KEY": "a-valid-secret-key", + "SQLALCHEMY_DATABASE_URI": "sqlite:///:memory:", + "REQUIRED_CONFIG": "value", } - + # Should not raise an exception - validate_required_configs(config, ['SECRET_KEY', 'SQLALCHEMY_DATABASE_URI', 'REQUIRED_CONFIG']) + validate_required_configs( + config, ["SECRET_KEY", "SQLALCHEMY_DATABASE_URI", "REQUIRED_CONFIG"] + ) def test_validate_required_configs_missing(): """Test that validate_required_configs raises an error when configs are missing.""" config = { - 'SECRET_KEY': 'a-valid-secret-key', + "SECRET_KEY": "a-valid-secret-key", } - - with pytest.raises(ConfigValidationError, match="Missing required configuration keys"): - validate_required_configs(config, ['SECRET_KEY', 'SQLALCHEMY_DATABASE_URI', 'REQUIRED_CONFIG']) + + with pytest.raises( + ConfigValidationError, match="Missing required configuration keys" + ): + validate_required_configs( + config, ["SECRET_KEY", "SQLALCHEMY_DATABASE_URI", "REQUIRED_CONFIG"] + ) def test_validate_environment_specific_configs_development_debug(): @@ -194,12 +202,12 @@ def test_validate_environment_specific_configs_development_debug(): # Temporarily set environment old_env = os.environ.get("FLASK_ENV") os.environ["FLASK_ENV"] = "development" - + try: config = { - 'DEBUG': True, + "DEBUG": True, } - + warnings = validate_environment_specific_configs(config) # No warnings expected for development environment with debug assert isinstance(warnings, list) @@ -216,17 +224,17 @@ def test_validate_environment_specific_configs_production_debug(): # Temporarily set environment old_env = os.environ.get("FLASK_ENV") os.environ["FLASK_ENV"] = "production" - + try: config = { - 'DEBUG': True, + "DEBUG": True, } - + warnings = validate_environment_specific_configs(config) - assert any('DEBUG mode is enabled' in warning for warning in warnings) + assert any("DEBUG mode is enabled" in warning for warning in warnings) finally: # Restore environment if old_env is not None: os.environ["FLASK_ENV"] = old_env elif "FLASK_ENV" in os.environ: - del os.environ["FLASK_ENV"] \ No newline at end of file + del os.environ["FLASK_ENV"] From 0a637f37054da9db63ddb17ff6506db90f149e5f Mon Sep 17 00:00:00 2001 From: loki Date: Tue, 9 Sep 2025 01:59:22 +0300 Subject: [PATCH 23/34] explode --- blog/adapters/factory.py | 12 ++++ blog/adapters/orm_adapter.py | 102 ++++++++++++++++++++++++++++++ blog/auth/adapter.py | 15 +++-- blog/repos/category.py | 10 --- blog/repos/icon.py | 10 --- blog/repos/tag.py | 8 --- blog/services/category.py | 12 +++- blog/services/icon.py | 20 +++--- blog/services/tag.py | 12 +++- blog/services/user.py | 12 +++- tests/test_repositories.py | 119 ----------------------------------- 11 files changed, 165 insertions(+), 167 deletions(-) create mode 100644 blog/adapters/factory.py create mode 100644 blog/adapters/orm_adapter.py diff --git a/blog/adapters/factory.py b/blog/adapters/factory.py new file mode 100644 index 0000000..bf414e4 --- /dev/null +++ b/blog/adapters/factory.py @@ -0,0 +1,12 @@ +"""Factory for creating ORM adapters.""" + +from blog.adapters.orm_adapter import ORMAdapter + + +class ORMAdapterFactory: + """Factory for creating ORM adapters.""" + + @staticmethod + def create_orm_adapter(): + """Create an ORM adapter instance.""" + return ORMAdapter() \ No newline at end of file diff --git a/blog/adapters/orm_adapter.py b/blog/adapters/orm_adapter.py new file mode 100644 index 0000000..7ea2fa3 --- /dev/null +++ b/blog/adapters/orm_adapter.py @@ -0,0 +1,102 @@ +"""Adapters for handling ORM model exposure in special cases. + +This module provides adapters that handle the conversion between domain models and ORM models +for special cases where ORM models need to be exposed directly, keeping the service layer clean. +""" + +import sqlalchemy as sa +from typing import List, Optional + +from blog.extensions import db +from blog.post.models import Post as PostORM, Icon as IconORM +from blog.category.models import Category as CategoryORM +from blog.tags.models import Tag as TagORM +from blog.user.models import User as UserORM + + +class ORMAdapter: + """Adapter for handling ORM model exposure in special cases.""" + + def __init__(self): + self.session = db.session + + # Icon ORM adapters + def get_icon_orm_by_id(self, icon_id: int) -> Optional[IconORM]: + """Get an icon ORM model by its ID. + + Args: + icon_id: The ID of the icon to retrieve + + Returns: + IconORM instance if found, None otherwise + """ + stmt = sa.select(IconORM).where(IconORM.id == icon_id) + return self.session.scalar(stmt) + + def get_all_icons_orm(self) -> List[IconORM]: + """Get all icons as ORM models. + + Returns: + List of IconORM instances + """ + stmt = sa.select(IconORM) + return list(self.session.scalars(stmt).all()) + + # Category ORM adapters + def get_category_orm_with_relationships(self, category_id: int) -> Optional[CategoryORM]: + """Get a category ORM model with its relationships loaded. + + Args: + category_id: The ID of the category to retrieve + + Returns: + CategoryORM instance with relationships loaded if found, None otherwise + """ + stmt = ( + sa.select(CategoryORM) + .where(CategoryORM.id == category_id) + .options(sa.orm.joinedload(CategoryORM.posts)) + ) + return self.session.scalar(stmt) + + # Tag ORM adapters + def get_tag_orm_with_relationships(self, tag_id: int) -> Optional[TagORM]: + """Get a tag ORM model with its relationships loaded. + + Args: + tag_id: The ID of the tag to retrieve + + Returns: + TagORM instance with relationships loaded if found, None otherwise + """ + stmt = ( + sa.select(TagORM) + .where(TagORM.id == tag_id) + .options(sa.orm.joinedload(TagORM.posts)) + ) + return self.session.scalar(stmt) + + # User ORM adapters (for Flask-Login) + def get_user_orm_by_id(self, user_id: int) -> Optional[UserORM]: + """Get a user ORM model by its ID. + + Args: + user_id: The ID of the user to retrieve + + Returns: + UserORM instance if found, None otherwise + """ + stmt = sa.select(UserORM).where(UserORM.id == user_id) + return self.session.scalar(stmt) + + def get_user_orm_by_name(self, name: str) -> Optional[UserORM]: + """Get a user ORM model by its name. + + Args: + name: The name of the user to retrieve + + Returns: + UserORM instance if found, None otherwise + """ + stmt = sa.select(UserORM).where(UserORM.name == name) + return self.session.scalar(stmt) \ No newline at end of file diff --git a/blog/auth/adapter.py b/blog/auth/adapter.py index 27a2fef..5b70a51 100644 --- a/blog/auth/adapter.py +++ b/blog/auth/adapter.py @@ -1,9 +1,9 @@ """Authentication adapter for Flask-Login integration.""" -import sqlalchemy as sa from flask_login import UserMixin -from blog.extensions import db, login_manager +from blog.adapters.factory import ORMAdapterFactory +from blog.extensions import login_manager from blog.services.factory import ServiceFactory from blog.user.models import User as UserORM @@ -27,6 +27,7 @@ class AuthenticationAdapter: def __init__(self): self.user_service = ServiceFactory.create_user_service() + self.orm_adapter = ORMAdapterFactory.create_orm_adapter() def load_user(self, user_id: int) -> FlaskLoginUser | None: """Load user by ID for Flask-Login. @@ -42,9 +43,8 @@ def load_user(self, user_id: int) -> FlaskLoginUser | None: if not user_domain: return None - # Get the ORM model for Flask-Login compatibility - stmt = sa.select(UserORM).where(UserORM.id == user_id) - user_orm = db.session.scalar(stmt) + # Get the ORM model for Flask-Login compatibility using the ORM adapter + user_orm = self.orm_adapter.get_user_orm_by_id(user_id) if not user_orm: return None @@ -66,9 +66,8 @@ def authenticate_and_login(self, name: str, password: str) -> FlaskLoginUser | N if not user_domain: return None - # Get the ORM model for Flask-Login compatibility - stmt = sa.select(UserORM).where(UserORM.name == name) - user_orm = db.session.scalar(stmt) + # Get the ORM model for Flask-Login compatibility using the ORM adapter + user_orm = self.orm_adapter.get_user_orm_by_name(name) if not user_orm: return None diff --git a/blog/repos/category.py b/blog/repos/category.py index 39ae093..4b3c9bd 100644 --- a/blog/repos/category.py +++ b/blog/repos/category.py @@ -15,16 +15,6 @@ class CategoryRepository(BaseRepository[CategoryDomain, int]): def __init__(self, session: Any = None): self.session = session or db.session - def get_category_orm_with_relationships( - self, category_id: int - ) -> CategoryORM | None: - stmt = ( - sa.select(CategoryORM) - .where(CategoryORM.id == category_id) - .options(sa.orm.joinedload(CategoryORM.posts)) - ) - return self.session.scalar(stmt) - def get_by_id(self, id: int) -> Optional[CategoryDomain]: stmt = sa.select(CategoryORM).where(CategoryORM.id == id) category_orm = self.session.scalar(stmt) diff --git a/blog/repos/icon.py b/blog/repos/icon.py index ebe85fa..b2c6a93 100644 --- a/blog/repos/icon.py +++ b/blog/repos/icon.py @@ -15,16 +15,6 @@ class IconRepository(BaseRepository[Icon, int]): def __init__(self, session: Any = None): self.session = session or db.session - def get_icon_orm_by_id(self, icon_id: int) -> IconORM | None: - """Get an icon ORM model by its ID. Used for specific use cases requiring ORM models.""" - stmt = sa.select(IconORM).where(IconORM.id == icon_id) - return self.session.scalar(stmt) - - def get_all_icons_orm(self) -> list[IconORM]: - """Get all icons as ORM models. Used for specific use cases requiring ORM models.""" - stmt = sa.select(IconORM) - return list(self.session.scalars(stmt).all()) - def get_by_id(self, id: int) -> Optional[Icon]: stmt = sa.select(IconORM).where(IconORM.id == id) icon_orm = self.session.scalar(stmt) diff --git a/blog/repos/tag.py b/blog/repos/tag.py index 75d3ed2..12a29f6 100644 --- a/blog/repos/tag.py +++ b/blog/repos/tag.py @@ -15,14 +15,6 @@ class TagRepository(BaseRepository[TagDomain, int]): def __init__(self, session: Any = None): self.session = session or db.session - def get_tag_orm_with_relationships(self, tag_id: int) -> TagORM | None: - stmt = ( - sa.select(TagORM) - .where(TagORM.id == tag_id) - .options(sa.orm.joinedload(TagORM.posts)) - ) - return self.session.scalar(stmt) - def get_by_id(self, id: int) -> Optional[TagDomain]: stmt = sa.select(TagORM).where(TagORM.id == id) tag_orm = self.session.scalar(stmt) diff --git a/blog/services/category.py b/blog/services/category.py index b25da49..3c04a64 100644 --- a/blog/services/category.py +++ b/blog/services/category.py @@ -1,9 +1,13 @@ """Service layer for Category entities.""" +import logging from blog.repos.category import CategoryRepository from blog.domain.category import Category +logger = logging.getLogger(__name__) + + class CategoryServiceError(Exception): """Base exception for CategoryService errors.""" @@ -50,6 +54,8 @@ def create_category(self, category: Category) -> Category: try: return self.category_repository.create(category) except Exception as e: + # Log the error with details + logger.error(f"Failed to create category: {str(e)}", exc_info=True) # Re-raise as a more specific exception for the service layer raise CategoryCreationError(f"Failed to create category: {str(e)}") from e @@ -57,12 +63,16 @@ def update_category(self, category: Category) -> Category: try: return self.category_repository.update(category) except ValueError as e: + # Log the error with details + logger.error(f"Failed to update category: {str(e)}", exc_info=True) # Re-raise as a more specific exception for the service layer raise CategoryUpdateError(f"Failed to update category: {str(e)}") from e def delete_category(self, category_id: int) -> bool: try: return self.category_repository.delete(category_id) - except Exception: + except Exception as e: + # Log the error with details + logger.error(f"Failed to delete category with id {category_id}: {str(e)}", exc_info=True) # Return False to indicate failure return False diff --git a/blog/services/icon.py b/blog/services/icon.py index 09ac809..c9a3977 100644 --- a/blog/services/icon.py +++ b/blog/services/icon.py @@ -1,9 +1,13 @@ """Service layer for Icon entities.""" +import logging from blog.repos.icon import IconRepository from blog.domain.icon import Icon +logger = logging.getLogger(__name__) + + class IconServiceError(Exception): """Base exception for IconService errors.""" @@ -34,14 +38,6 @@ class IconService: def __init__(self, icon_repository: IconRepository): self.icon_repository = icon_repository - def get_icon_orm_by_id(self, icon_id: int): - """Get an icon ORM model by its ID. Used for specific use cases requiring ORM models.""" - return self.icon_repository.get_icon_orm_by_id(icon_id) - - def get_all_icons_orm(self) -> list: - """Get all icons as ORM models. Used for specific use cases requiring ORM models.""" - return self.icon_repository.get_all_icons_orm() - def get_icon_by_id(self, icon_id: int) -> Icon | None: return self.icon_repository.get_by_id(icon_id) @@ -55,6 +51,8 @@ def create_icon(self, icon: Icon) -> Icon: try: return self.icon_repository.create(icon) except Exception as e: + # Log the error with details + logger.error(f"Failed to create icon: {str(e)}", exc_info=True) # Re-raise as a more specific exception for the service layer raise IconCreationError(f"Failed to create icon: {str(e)}") from e @@ -62,12 +60,16 @@ def update_icon(self, icon: Icon) -> Icon: try: return self.icon_repository.update(icon) except ValueError as e: + # Log the error with details + logger.error(f"Failed to update icon: {str(e)}", exc_info=True) # Re-raise as a more specific exception for the service layer raise IconUpdateError(f"Failed to update icon: {str(e)}") from e def delete_icon(self, icon_id: int) -> bool: try: return self.icon_repository.delete(icon_id) - except Exception: + except Exception as e: + # Log the error with details + logger.error(f"Failed to delete icon with id {icon_id}: {str(e)}", exc_info=True) # Return False to indicate failure return False diff --git a/blog/services/tag.py b/blog/services/tag.py index b4fcd46..014c82a 100644 --- a/blog/services/tag.py +++ b/blog/services/tag.py @@ -1,9 +1,13 @@ """Service layer for Tag entities.""" +import logging from blog.repos.tag import TagRepository from blog.domain.tag import Tag +logger = logging.getLogger(__name__) + + class TagServiceError(Exception): """Base exception for TagService errors.""" @@ -50,6 +54,8 @@ def create_tag(self, tag: Tag) -> Tag: try: return self.tag_repository.create(tag) except Exception as e: + # Log the error with details + logger.error(f"Failed to create tag: {str(e)}", exc_info=True) # Re-raise as a more specific exception for the service layer raise TagCreationError(f"Failed to create tag: {str(e)}") from e @@ -57,12 +63,16 @@ def update_tag(self, tag: Tag) -> Tag: try: return self.tag_repository.update(tag) except ValueError as e: + # Log the error with details + logger.error(f"Failed to update tag: {str(e)}", exc_info=True) # Re-raise as a more specific exception for the service layer raise TagUpdateError(f"Failed to update tag: {str(e)}") from e def delete_tag(self, tag_id: int) -> bool: try: return self.tag_repository.delete(tag_id) - except Exception: + except Exception as e: + # Log the error with details + logger.error(f"Failed to delete tag with id {tag_id}: {str(e)}", exc_info=True) # Return False to indicate failure return False diff --git a/blog/services/user.py b/blog/services/user.py index 05e7fe5..00382a0 100644 --- a/blog/services/user.py +++ b/blog/services/user.py @@ -1,9 +1,13 @@ """Service layer for User entities.""" +import logging from blog.repos.user import UserRepository from blog.domain.user import User +logger = logging.getLogger(__name__) + + class UserServiceError(Exception): """Base exception for UserService errors.""" @@ -50,6 +54,8 @@ def create_user(self, user: User) -> User: try: return self.user_repository.create(user) except Exception as e: + # Log the error with details + logger.error(f"Failed to create user: {str(e)}", exc_info=True) # Re-raise as a more specific exception for the service layer raise UserCreationError(f"Failed to create user: {str(e)}") from e @@ -57,13 +63,17 @@ def update_user(self, user: User) -> User: try: return self.user_repository.update(user) except ValueError as e: + # Log the error with details + logger.error(f"Failed to update user: {str(e)}", exc_info=True) # Re-raise as a more specific exception for the service layer raise UserUpdateError(f"Failed to update user: {str(e)}") from e def delete_user(self, user_id: int) -> bool: try: return self.user_repository.delete(user_id) - except Exception: + except Exception as e: + # Log the error with details + logger.error(f"Failed to delete user with id {user_id}: {str(e)}", exc_info=True) # Return False to indicate failure return False diff --git a/tests/test_repositories.py b/tests/test_repositories.py index 2c95dc0..18878f1 100644 --- a/tests/test_repositories.py +++ b/tests/test_repositories.py @@ -829,7 +829,6 @@ def test_delete_category(self, app, category_repository): # Verify the ORM model was deleted stmt = db.select(CategoryORM).where(CategoryORM.id == created_category.id) category_orm = db.session.scalar(stmt) - assert category_orm is None def test_delete_nonexistent_category(self, app, category_repository): """Test deleting a nonexistent category.""" @@ -840,34 +839,7 @@ def test_delete_nonexistent_category(self, app, category_repository): # Verify the result is False assert result is False - def test_get_category_orm_with_relationships(self, app, category_repository): - """Test getting a category ORM model with relationships loaded.""" - with app.app_context(): - # Create a category - category_domain = CategoryDomain( - title="Test Category", alias="test-category" - ) - category_repository.create(category_domain) - - # Get the category ORM model with relationships - category_orm = category_repository.get_category_orm_with_relationships(1) - - # Verify the category ORM model was retrieved - assert category_orm is not None - assert category_orm.title == "Test Category" - - def test_get_category_orm_with_relationships_nonexistent( - self, app, category_repository - ): - """Test getting a nonexistent category ORM model with relationships loaded.""" - with app.app_context(): - # Try to get a category that doesn't exist - category_orm = category_repository.get_category_orm_with_relationships( - 99999 - ) # Nonexistent ID - # Verify None is returned - assert category_orm is None def test_to_domain_model_mapping(self, app, category_repository): """Test that _to_domain_model correctly maps ORM to domain model.""" @@ -1158,7 +1130,6 @@ def test_delete_tag(self, app, tag_repository): # Verify the ORM model was deleted stmt = db.select(TagORM).where(TagORM.id == created_tag.id) tag_orm = db.session.scalar(stmt) - assert tag_orm is None def test_delete_nonexistent_tag(self, app, tag_repository): """Test deleting a nonexistent tag.""" @@ -1167,33 +1138,8 @@ def test_delete_nonexistent_tag(self, app, tag_repository): result = tag_repository.delete(99999) # Nonexistent ID # Verify the result is False - assert result is False - - def test_get_tag_orm_with_relationships(self, app, tag_repository): - """Test getting a tag ORM model with relationships loaded.""" - with app.app_context(): - # Create a tag - tag_domain = TagDomain(title="Test Tag", alias="test-tag") - created_tag = tag_repository.create(tag_domain) - - # Get the tag ORM model with relationships - tag_orm = tag_repository.get_tag_orm_with_relationships(created_tag.id) - - # Verify the tag ORM model was retrieved - assert tag_orm is not None - assert tag_orm.id == created_tag.id - assert tag_orm.title == "Test Tag" - - def test_get_tag_orm_with_relationships_nonexistent(self, app, tag_repository): - """Test getting a nonexistent tag ORM model with relationships loaded.""" - with app.app_context(): - # Try to get a tag that doesn't exist - tag_orm = tag_repository.get_tag_orm_with_relationships( - 99999 - ) # Nonexistent ID # Verify None is returned - assert tag_orm is None def test_to_domain_model_mapping(self, app, tag_repository): """Test that _to_domain_model correctly maps ORM to domain model.""" @@ -1736,7 +1682,6 @@ def test_delete_icon(self, app, icon_repository): # Verify the ORM model was deleted stmt = db.select(IconORM).where(IconORM.id == created_icon.id) icon_orm = db.session.scalar(stmt) - assert icon_orm is None def test_delete_nonexistent_icon(self, app, icon_repository): """Test deleting a nonexistent icon.""" @@ -1747,72 +1692,8 @@ def test_delete_nonexistent_icon(self, app, icon_repository): # Verify the result is False assert result is False - def test_get_icon_orm_by_id(self, app, icon_repository): - """Test getting an icon ORM model by ID.""" - with app.app_context(): - # Create an icon first - icon_domain = IconDomain( - title="Test Icon", - url="http://example.com/icon.png", - content="Icon content", - ) - created_icon = icon_repository.create(icon_domain) - - # Get the icon ORM model by ID - icon_orm = icon_repository.get_icon_orm_by_id(created_icon.id) - - # Verify the icon ORM model was retrieved - assert icon_orm is not None - assert icon_orm.id == created_icon.id - assert icon_orm.title == "Test Icon" - - def test_get_icon_orm_by_id_nonexistent(self, app, icon_repository): - """Test getting a nonexistent icon ORM model by ID.""" - with app.app_context(): - # Try to get an icon that doesn't exist - icon_orm = icon_repository.get_icon_orm_by_id(99999) # Nonexistent ID - - # Verify None is returned - assert icon_orm is None - - def test_get_all_icons_orm(self, app, icon_repository): - """Test getting all icons as ORM models.""" - with app.app_context(): - # Create a few icons - icon1_domain = IconDomain( - title="Test Icon 1", - url="http://example.com/icon1.png", - content="Icon content 1", - ) - icon_repository.create(icon1_domain) - - icon2_domain = IconDomain( - title="Test Icon 2", - url="http://example.com/icon2.png", - content="Icon content 2", - ) - icon_repository.create(icon2_domain) - - # Get all icons as ORM models - icons_orm = icon_repository.get_all_icons_orm() - - # Verify we got the icons - assert len(icons_orm) >= 2 - titles = [icon.title for icon in icons_orm] - assert "Test Icon 1" in titles - assert "Test Icon 2" in titles - - # Verify they are ORM models - assert all(isinstance(icon, IconORM) for icon in icons_orm) - - def test_get_all_icons_orm_empty(self, app, icon_repository): - """Test getting all icons as ORM models when there are none.""" - with app.app_context(): - # Get all icons as ORM models when there are none - icons_orm = icon_repository.get_all_icons_orm() # Verify an empty list is returned - assert icons_orm == [] def test_to_domain_model_mapping(self, app, icon_repository): """Test that _to_domain_model correctly maps ORM to domain model.""" From 26407824e89c58ddd4bf097093fb6b3865e90ec1 Mon Sep 17 00:00:00 2001 From: loki Date: Sat, 27 Sep 2025 04:16:26 +1000 Subject: [PATCH 24/34] pyright chapter one pyright chapter 2 pyright chapter 3 pyright chapter 4 move setup.cfg -> pyproject.toml remove unused pyright final --- Makefile | 4 +- blog/__init__.py | 10 ++--- blog/adapters/factory.py | 2 +- blog/adapters/orm_adapter.py | 43 +++++++++---------- blog/admin/__init__.py | 9 +++- blog/auth/adapter.py | 2 +- blog/category/models.py | 3 +- blog/cli.py | 9 +++- blog/commands.py | 11 +++-- blog/config_validator.py | 40 +++++++++--------- blog/domain/icon.py | 2 + blog/infrastructure/database.py | 11 ++--- blog/post/models.py | 6 +-- blog/post/views.py | 60 ++++++++++++++++---------- blog/repos/base.py | 6 +-- blog/repos/category.py | 13 ++++-- blog/repos/icon.py | 13 ++++-- blog/repos/post.py | 17 +++++--- blog/repos/tag.py | 15 ++++--- blog/repos/user.py | 23 +++++----- blog/services/category.py | 5 ++- blog/services/icon.py | 4 +- blog/services/tag.py | 4 +- blog/services/user.py | 4 +- blog/tags/models.py | 3 +- blog/tags/views.py | 11 +++-- blog/user/models.py | 5 ++- blog/user/views.py | 24 +++++++---- create_admin.py | 74 --------------------------------- migrations/env.py | 12 +++++- pyproject.toml | 23 +++++++++- setup.cfg | 29 ------------- tests/test_repositories.py | 9 ++-- uv.lock | 46 +++++++++++--------- 34 files changed, 283 insertions(+), 269 deletions(-) delete mode 100755 create_admin.py delete mode 100644 setup.cfg diff --git a/Makefile b/Makefile index 8f31659..898014b 100644 --- a/Makefile +++ b/Makefile @@ -14,12 +14,14 @@ ruff-lint-format-check: uvx ruff format --check . lint-types: - uv run pyright . + uv run basedpyright . test: FLASK_ENV=testing FLASK_APP=blog uv run pytest +test-dev: + FLASK_ENV=testing FLASK_APP=blog uv run pytest -vv -s test-coverage: FLASK_ENV=testing FLASK_APP=blog uv run pytest --cov=blog --cov-report xml diff --git a/blog/__init__.py b/blog/__init__.py index e4300ce..e1d5942 100644 --- a/blog/__init__.py +++ b/blog/__init__.py @@ -18,25 +18,25 @@ logger = logging.getLogger(__name__) -def configure_extensions(app): +def configure_extensions(app: Flask) -> None: """Configures the extensions.""" db.init_app(app) admin_ext.init_app(app) cache.init_app(app) migrate.init_app(app=app, db=db) login_manager.init_app(app=app) - login_manager.login_view = "user.login" # type: ignore + login_manager.login_view = "user.login" # pyright: ignore[reportAttributeAccessIssue] flask_sitemap.init_app(app) -def register_commands(app): +def register_commands(app: Flask) -> None: """Register custom CLI commands.""" from blog.commands import init_app init_app(app) -def validate_application_config(app): +def validate_application_config(app: Flask) -> None: """Validate the application configuration at startup. Args: @@ -63,7 +63,7 @@ def validate_application_config(app): raise ConfigValidationError(f"Configuration validation failed: {str(e)}") from e -def create_app(): +def create_app() -> Flask: app = Flask(__name__) env = os.environ.get("FLASK_ENV", "development") logger.debug("current FLASK_ENV %s", env) diff --git a/blog/adapters/factory.py b/blog/adapters/factory.py index bf414e4..c3e3994 100644 --- a/blog/adapters/factory.py +++ b/blog/adapters/factory.py @@ -9,4 +9,4 @@ class ORMAdapterFactory: @staticmethod def create_orm_adapter(): """Create an ORM adapter instance.""" - return ORMAdapter() \ No newline at end of file + return ORMAdapter() diff --git a/blog/adapters/orm_adapter.py b/blog/adapters/orm_adapter.py index 7ea2fa3..abaa6d2 100644 --- a/blog/adapters/orm_adapter.py +++ b/blog/adapters/orm_adapter.py @@ -5,10 +5,9 @@ """ import sqlalchemy as sa -from typing import List, Optional from blog.extensions import db -from blog.post.models import Post as PostORM, Icon as IconORM +from blog.post.models import Icon as IconORM from blog.category.models import Category as CategoryORM from blog.tags.models import Tag as TagORM from blog.user.models import User as UserORM @@ -21,34 +20,36 @@ def __init__(self): self.session = db.session # Icon ORM adapters - def get_icon_orm_by_id(self, icon_id: int) -> Optional[IconORM]: + def get_icon_orm_by_id(self, icon_id: int) -> IconORM | None: """Get an icon ORM model by its ID. - + Args: icon_id: The ID of the icon to retrieve - + Returns: IconORM instance if found, None otherwise """ stmt = sa.select(IconORM).where(IconORM.id == icon_id) return self.session.scalar(stmt) - def get_all_icons_orm(self) -> List[IconORM]: + def get_all_icons_orm(self) -> list[IconORM]: """Get all icons as ORM models. - + Returns: - List of IconORM instances + list of IconORM instances """ stmt = sa.select(IconORM) return list(self.session.scalars(stmt).all()) # Category ORM adapters - def get_category_orm_with_relationships(self, category_id: int) -> Optional[CategoryORM]: + def get_category_orm_with_relationships( + self, category_id: int + ) -> CategoryORM | None: """Get a category ORM model with its relationships loaded. - + Args: category_id: The ID of the category to retrieve - + Returns: CategoryORM instance with relationships loaded if found, None otherwise """ @@ -60,12 +61,12 @@ def get_category_orm_with_relationships(self, category_id: int) -> Optional[Cate return self.session.scalar(stmt) # Tag ORM adapters - def get_tag_orm_with_relationships(self, tag_id: int) -> Optional[TagORM]: + def get_tag_orm_with_relationships(self, tag_id: int) -> TagORM | None: """Get a tag ORM model with its relationships loaded. - + Args: tag_id: The ID of the tag to retrieve - + Returns: TagORM instance with relationships loaded if found, None otherwise """ @@ -77,26 +78,26 @@ def get_tag_orm_with_relationships(self, tag_id: int) -> Optional[TagORM]: return self.session.scalar(stmt) # User ORM adapters (for Flask-Login) - def get_user_orm_by_id(self, user_id: int) -> Optional[UserORM]: + def get_user_orm_by_id(self, user_id: int) -> UserORM | None: """Get a user ORM model by its ID. - + Args: user_id: The ID of the user to retrieve - + Returns: UserORM instance if found, None otherwise """ stmt = sa.select(UserORM).where(UserORM.id == user_id) return self.session.scalar(stmt) - def get_user_orm_by_name(self, name: str) -> Optional[UserORM]: + def get_user_orm_by_name(self, name: str) -> UserORM | None: """Get a user ORM model by its name. - + Args: name: The name of the user to retrieve - + Returns: UserORM instance if found, None otherwise """ stmt = sa.select(UserORM).where(UserORM.name == name) - return self.session.scalar(stmt) \ No newline at end of file + return self.session.scalar(stmt) diff --git a/blog/admin/__init__.py b/blog/admin/__init__.py index f23a70f..15b8c10 100644 --- a/blog/admin/__init__.py +++ b/blog/admin/__init__.py @@ -1,5 +1,7 @@ import os +from typing import TYPE_CHECKING, override + from flask_admin.contrib import fileadmin, sqla from flask_login import current_user @@ -9,6 +11,9 @@ from blog.tags.models import Tag from blog.user.models import User +if TYPE_CHECKING: + from flask_admin import Admin + class UserView(sqla.ModelView): column_exclude_list = ["content", "alias"] @@ -17,6 +22,7 @@ class UserView(sqla.ModelView): column_default_sort = ("id", True) + @override def is_accessible(self): return current_user.is_authenticated @@ -31,11 +37,12 @@ class PostView(UserView): class MyFileAdmin(fileadmin.FileAdmin): + @override def is_accessible(self): return current_user.is_authenticated -def create_admin(config_admin): +def create_admin(config_admin: "Admin") -> None: config_admin.add_view(PostView(Post, db.session, endpoint="admin_post")) config_admin.add_view(UserView(Category, db.session, endpoint="admin_category")) config_admin.add_view(UserView(Tag, db.session, endpoint="admin_tag")) diff --git a/blog/auth/adapter.py b/blog/auth/adapter.py index 5b70a51..dd12a88 100644 --- a/blog/auth/adapter.py +++ b/blog/auth/adapter.py @@ -98,7 +98,7 @@ def _to_flask_login_user(self, user_orm: UserORM) -> FlaskLoginUser: @login_manager.user_loader -def load_user(user_id): +def load_user(user_id: str) -> FlaskLoginUser | None: """Load user by ID for Flask-Login. This function uses the authentication adapter to handle the Flask-Login diff --git a/blog/category/models.py b/blog/category/models.py index 8922cc0..29d4649 100644 --- a/blog/category/models.py +++ b/blog/category/models.py @@ -1,5 +1,5 @@ # blog/category/models.py -from typing import TYPE_CHECKING +from typing import TYPE_CHECKING, override from sqlalchemy.orm import Mapped, relationship @@ -23,5 +23,6 @@ class Category(db.Model): posts: Mapped[list["Post"]] = relationship("Post", back_populates="category") + @override def __str__(self): return f"{self.title}" diff --git a/blog/cli.py b/blog/cli.py index 47415b4..09490bd 100644 --- a/blog/cli.py +++ b/blog/cli.py @@ -1,10 +1,15 @@ """CLI commands for the blog application.""" +from typing import TYPE_CHECKING + import click from flask.cli import with_appcontext from blog.extensions import db from blog.user.models import User +if TYPE_CHECKING: + from flask import Flask + @click.command() @click.option("--name", prompt="Username", help="The username for the admin user") @@ -16,7 +21,7 @@ help="The password for the admin user", ) @with_appcontext -def create_admin(name, password): +def create_admin(name: str, password: str) -> None: """Create an admin user with the given username and password.""" # Check if user already exists existing_user = db.session.execute( @@ -38,6 +43,6 @@ def create_admin(name, password): click.echo(f"Admin user '{name}' created successfully.") -def register_commands(app): +def register_commands(app: "Flask") -> None: """Register CLI commands with the Flask app.""" app.cli.add_command(create_admin) diff --git a/blog/commands.py b/blog/commands.py index 9b55a5d..7faea5e 100644 --- a/blog/commands.py +++ b/blog/commands.py @@ -1,12 +1,17 @@ """Custom CLI commands for the blog application.""" +from typing import TYPE_CHECKING + import click from flask.cli import with_appcontext from blog.extensions import db from blog.user.models import User +if TYPE_CHECKING: + from flask import Flask + -@click.command() +@click.command("create-admin") # Add this decorator to make it a Click command @click.option("--name", prompt="Username", help="The username for the admin user") @click.option( "--password", @@ -16,7 +21,7 @@ help="The password for the admin user", ) @with_appcontext -def create_admin(name, password): +def create_admin(name: str, password: str) -> None: """Create an admin user with the given username and password.""" # Check if user already exists existing_user = db.session.execute( @@ -38,6 +43,6 @@ def create_admin(name, password): click.echo("Admin user '{}' created successfully.".format(name)) -def init_app(app): +def init_app(app: "Flask") -> None: """Initialize the CLI commands with the Flask app.""" app.cli.add_command(create_admin) diff --git a/blog/config_validator.py b/blog/config_validator.py index 1610e3a..3b7180f 100644 --- a/blog/config_validator.py +++ b/blog/config_validator.py @@ -2,7 +2,8 @@ import logging import os -from typing import Dict, Any, List +from typing import Any +import typing logger = logging.getLogger(__name__) @@ -13,31 +14,31 @@ class ConfigValidationError(Exception): pass -def validate_config(config: Dict[str, Any]) -> List[str]: +def validate_config(config: dict[str, Any]) -> list[str]: # pyright: ignore[reportExplicitAny] """Validate the application configuration. Args: config: The configuration dictionary to validate Returns: - List of validation warnings (non-fatal issues) + list of validation warnings (non-fatal issues) Raises: ConfigValidationError: If critical configuration is missing or invalid """ - warnings = [] + warnings: list[str] = [] # Validate SECRET_KEY secret_key = config.get("SECRET_KEY") if not secret_key: raise ConfigValidationError( "SECRET_KEY is required but not set. " - "Set the SECRET_KEY environment variable." + + "Set the SECRET_KEY environment variable." ) elif secret_key == "hard to guess string": warnings.append( "Using default SECRET_KEY. " - "For production, set a strong SECRET_KEY environment variable." + + "For production, set a strong SECRET_KEY environment variable." ) # Validate SQLALCHEMY_DATABASE_URI @@ -45,7 +46,7 @@ def validate_config(config: Dict[str, Any]) -> List[str]: if not db_uri: warnings.append( "SQLALCHEMY_DATABASE_URI is not set. " - "Using default database URI which may not be suitable for production." + + "Using default database URI which may not be suitable for production." ) else: # Basic validation of database URI @@ -57,15 +58,16 @@ def validate_config(config: Dict[str, Any]) -> List[str]: if not any(db_uri.startswith(scheme) for scheme in valid_schemes): warnings.append( f"SQLALCHEMY_DATABASE_URI '{db_uri}' uses an uncommon scheme. " - "Supported schemes: sqlite://, postgresql://, mysql://, oracle://" + + "Supported schemes: sqlite://, postgresql://, mysql://, oracle://" ) # Validate PAGE_CATEGORY page_category = config.get("PAGE_CATEGORY") + print(page_category, type(page_category)) if page_category is not None: if not isinstance(page_category, list): raise ConfigValidationError("PAGE_CATEGORY must be a list of integers") - for item in page_category: + for item in typing.cast("list[Any]", page_category): # pyright: ignore[reportExplicitAny] if not isinstance(item, int): raise ConfigValidationError("PAGE_CATEGORY must contain only integers") @@ -88,24 +90,24 @@ def validate_config(config: Dict[str, Any]) -> List[str]: if cache_type == "NullCache": warnings.append( "Using NullCache in production. " - "Consider using a proper cache implementation for better performance." + + "Consider using a proper cache implementation for better performance." ) logger.info("Configuration validation completed with %d warnings", len(warnings)) return warnings -def validate_required_configs(config: Dict[str, Any], required_keys: List[str]) -> None: +def validate_required_configs(config: dict[str, Any], required_keys: list[str]) -> None: # pyright: ignore[reportExplicitAny] """Validate that all required configuration keys are present. Args: config: The configuration dictionary to validate - required_keys: List of required configuration keys + required_keys: list of required configuration keys Raises: ConfigValidationError: If any required configuration is missing """ - missing_keys = [] + missing_keys: list[str] = [] for key in required_keys: if key not in config or config[key] is None: missing_keys.append(key) @@ -113,20 +115,20 @@ def validate_required_configs(config: Dict[str, Any], required_keys: List[str]) if missing_keys: raise ConfigValidationError( f"Missing required configuration keys: {', '.join(missing_keys)}. " - "Set these environment variables or check your configuration." + + "Set these environment variables or check your configuration." ) -def validate_environment_specific_configs(config: Dict[str, Any]) -> List[str]: +def validate_environment_specific_configs(config: dict[str, Any]) -> list[str]: # pyright: ignore[reportExplicitAny] """Validate environment-specific configurations. Args: config: The configuration dictionary to validate Returns: - List of validation warnings + list of validation warnings """ - warnings = [] + warnings: list[str] = [] env = os.environ.get("FLASK_ENV", "development") if env == "production": @@ -134,13 +136,13 @@ def validate_environment_specific_configs(config: Dict[str, Any]) -> List[str]: if config.get("DEBUG", False): warnings.append( "DEBUG mode is enabled in production. " - "Disable DEBUG mode for security reasons." + + "Disable DEBUG mode for security reasons." ) if config.get("TESTING", False): warnings.append( "TESTING mode is enabled in production. " - "Disable TESTING mode for security reasons." + + "Disable TESTING mode for security reasons." ) elif env == "testing": diff --git a/blog/domain/icon.py b/blog/domain/icon.py index 12720bc..3e501b5 100644 --- a/blog/domain/icon.py +++ b/blog/domain/icon.py @@ -1,5 +1,6 @@ """Domain models for the Icon entity.""" +from typing import override from dataclasses import dataclass @@ -12,5 +13,6 @@ class Icon: url: str = "" content: str | None = None + @override def __str__(self): return f"Icon(id={self.id}, title={self.title})" diff --git a/blog/infrastructure/database.py b/blog/infrastructure/database.py index 567f75c..5449b37 100644 --- a/blog/infrastructure/database.py +++ b/blog/infrastructure/database.py @@ -6,10 +6,11 @@ """ from sqlalchemy import Table, Column, Integer, String, Text, DateTime, ForeignKey +from sqlalchemy.sql.schema import MetaData # Table definitions (Infrastructure layer) -def get_users_table(metadata): +def get_users_table(metadata: "MetaData") -> Table: return Table( "users", metadata, @@ -22,7 +23,7 @@ def get_users_table(metadata): ) -def get_posts_table(metadata): +def get_posts_table(metadata: MetaData) -> Table: return Table( "posts", metadata, @@ -38,7 +39,7 @@ def get_posts_table(metadata): ) -def get_categories_table(metadata): +def get_categories_table(metadata: MetaData) -> Table: return Table( "categories", metadata, @@ -50,7 +51,7 @@ def get_categories_table(metadata): ) -def get_tags_table(metadata): +def get_tags_table(metadata: MetaData) -> Table: return Table( "tags", metadata, @@ -61,7 +62,7 @@ def get_tags_table(metadata): ) -def get_posts_tags_table(metadata): +def get_posts_tags_table(metadata: MetaData) -> Table: return Table( "posts_tags", metadata, diff --git a/blog/post/models.py b/blog/post/models.py index 89c7bb4..780af77 100644 --- a/blog/post/models.py +++ b/blog/post/models.py @@ -1,7 +1,6 @@ -# blog/posts/models.py import typing from datetime import datetime -from typing import TYPE_CHECKING +from typing import TYPE_CHECKING, override import markdown from sqlalchemy.orm import Mapped, relationship @@ -51,12 +50,13 @@ def __str__(self): class Icon(db.Model): """orm model for icons.""" - __tablename__ = "icons" # pyright: ignore[reportUnannotatedClassAttribute] + __tablename__ = "icons" id: Mapped[int] = db.Column(db.Integer, primary_key=True) title: Mapped[str] = db.Column(db.String(255), nullable=False, unique=True) url: Mapped[str] = db.Column(db.String(255), nullable=False, unique=True) content: Mapped[str | None] = db.Column(db.Text) + @override def __str__(self): return f"{self.id} {self.title}" diff --git a/blog/post/views.py b/blog/post/views.py index 77abfe2..419b33d 100644 --- a/blog/post/views.py +++ b/blog/post/views.py @@ -1,9 +1,12 @@ import datetime +import typing from functools import wraps +from collections.abc import Callable import markdown from flask import ( Blueprint, + Response, current_app, jsonify, make_response, @@ -11,43 +14,57 @@ request, url_for, ) -from blog.extensions import flask_sitemap -from blog import cache + +if typing.TYPE_CHECKING: + from flask import Response +from blog.extensions import flask_sitemap, cache from blog.services.factory import ServiceFactory post = Blueprint("post", __name__) -def pages_gen(f): +P = typing.ParamSpec("P") +R = typing.TypeVar("R") + +""" +def with_lock(f: Callable[Concatenate[Lock, P], R]) -> Callable[P, R]: + def inner(*args: P.args, **kwargs: P.kwargs) -> R: +""" + + +def pages_gen( + f: Callable[P, R], +) -> Callable[P, R]: @wraps(f) - def decorated_function(*args, **kwargs): - page_category = current_app.config["PAGE_CATEGORY"] + def decorated_function(*args: P.args, **kwargs: P.kwargs) -> R: + page_category = typing.cast("list[int]", current_app.config["PAGE_CATEGORY"]) post_service = ServiceFactory.create_post_service() pages = post_service.get_page_posts(page_category) icon_service = ServiceFactory.create_icon_service() icons = icon_service.get_all_icons() - - return f(pages=pages, icons=icons, *args, **kwargs) + kwargs["icons"] = icons + kwargs["pages"] = pages + return f(*args, **kwargs) return decorated_function @post.route("/") -@cache.cached(timeout=50) +@cache.cached(timeout=50) # pyright: ignore[reportUntypedFunctionDecorator] @pages_gen -def index(**kwargs): +def index(**kwargs: typing.Any) -> Response | str: post_service = ServiceFactory.create_post_service() posts = post_service.get_published_posts() return render_template("posts.html", posts=posts, **kwargs) @post.route("/") -@cache.cached(timeout=50) +@cache.cached(timeout=50) # pyright: ignore[reportUntypedFunctionDecorator] @pages_gen -def view(alias=None, **kwargs): +def view(alias: str | None = None, **kwargs: typing.Any) -> Response | str: if alias is None: from flask import abort @@ -61,7 +78,7 @@ def view(alias=None, **kwargs): abort(404) # For page categories, we need to check if it's a page or a regular post - page_categories = current_app.config["PAGE_CATEGORY"] + page_categories = typing.cast("list[int]", current_app.config["PAGE_CATEGORY"]) is_page = post.category_id is not None and post.category_id in page_categories is_published = post.publishedon is not None @@ -85,7 +102,7 @@ def view(alias=None, **kwargs): @flask_sitemap.register_generator def site_map_gen(): - page_category = current_app.config["PAGE_CATEGORY"] + page_category = typing.cast("list[int]", current_app.config["PAGE_CATEGORY"]) post_service = ServiceFactory.create_post_service() pages = post_service.get_page_posts(page_category) @@ -105,18 +122,17 @@ def getmd(): @post.route("/robots.txt") -@cache.cached(timeout=50) -def robots(): - return """ -User-agent: * -Crawl-delay: 2 -Disallow: /tag/* -Host: gunlinux.ru -""" +@cache.cached(timeout=50) # pyright: ignore[reportUntypedFunctionDecorator] +def robots() -> Response | str: + response = make_response( + """\nUser-agent: *\nCrawl-delay: 2\nDisallow: /tag/*\nHost: gunlinux.ru\n""" + ) + response.headers["Content-Type"] = "text/plain" + return response @post.route("/rss.xml") -@cache.cached(timeout=50) +@cache.cached(timeout=50) # pyright: ignore[reportUntypedFunctionDecorator] def rss(): post_service = ServiceFactory.create_post_service() list_posts = post_service.get_published_posts() diff --git a/blog/repos/base.py b/blog/repos/base.py index f4b2461..f14a6ef 100644 --- a/blog/repos/base.py +++ b/blog/repos/base.py @@ -1,7 +1,7 @@ """Base repository interface for the application.""" from abc import ABC, abstractmethod -from typing import TypeVar, Generic, List, Optional +from typing import TypeVar, Generic T = TypeVar("T") # Domain model type ID = TypeVar("ID") # ID type @@ -11,12 +11,12 @@ class BaseRepository(ABC, Generic[T, ID]): """Abstract base class for all repositories.""" @abstractmethod - def get_by_id(self, id: ID) -> Optional[T]: + def get_by_id(self, id: ID) -> T | None: """Get an entity by its ID.""" pass @abstractmethod - def get_all(self) -> List[T]: + def get_all(self) -> list[T]: """Get all entities.""" pass diff --git a/blog/repos/category.py b/blog/repos/category.py index 4b3c9bd..f18dd60 100644 --- a/blog/repos/category.py +++ b/blog/repos/category.py @@ -1,7 +1,7 @@ """Repository for Category entities.""" import sqlalchemy as sa -from typing import Any, List, Optional +from typing import Any, override from blog.extensions import db from blog.category.models import Category as CategoryORM @@ -12,10 +12,11 @@ class CategoryRepository(BaseRepository[CategoryDomain, int]): """Repository for Category entities.""" - def __init__(self, session: Any = None): + def __init__(self, session: Any = None): # pyright: ignore[reportExplicitAny] self.session = session or db.session - def get_by_id(self, id: int) -> Optional[CategoryDomain]: + @override + def get_by_id(self, id: int) -> CategoryDomain | None: stmt = sa.select(CategoryORM).where(CategoryORM.id == id) category_orm = self.session.scalar(stmt) if category_orm: @@ -29,7 +30,8 @@ def get_by_alias(self, alias: str) -> CategoryDomain | None: return self._to_domain_model(category_orm) return None - def get_all(self) -> List[CategoryDomain]: + @override + def get_all(self) -> list[CategoryDomain]: stmt = sa.select(CategoryORM) categories_orm = list(self.session.scalars(stmt).all()) return [self._to_domain_model(category_orm) for category_orm in categories_orm] @@ -44,6 +46,7 @@ def get_categories_with_posts(self) -> list[CategoryDomain]: categories_orm = list(self.session.scalars(stmt).unique().all()) return [self._to_domain_model(category_orm) for category_orm in categories_orm] + @override def create(self, entity: CategoryDomain) -> CategoryDomain: category_orm = CategoryORM() category_orm.title = entity.title @@ -56,6 +59,7 @@ def create(self, entity: CategoryDomain) -> CategoryDomain: entity.id = category_orm.id return entity + @override def update(self, entity: CategoryDomain) -> CategoryDomain: stmt = sa.select(CategoryORM).where(CategoryORM.id == entity.id) category_orm = self.session.scalar(stmt) @@ -70,6 +74,7 @@ def update(self, entity: CategoryDomain) -> CategoryDomain: self.session.flush() return entity + @override def delete(self, id: int) -> bool: stmt = sa.select(CategoryORM).where(CategoryORM.id == id) category_orm = self.session.scalar(stmt) diff --git a/blog/repos/icon.py b/blog/repos/icon.py index b2c6a93..bacd537 100644 --- a/blog/repos/icon.py +++ b/blog/repos/icon.py @@ -1,7 +1,7 @@ """Repository for Icon entities.""" import sqlalchemy as sa -from typing import Any, List, Optional +from typing import Any, override from blog.extensions import db from blog.post.models import Icon as IconORM @@ -12,10 +12,11 @@ class IconRepository(BaseRepository[Icon, int]): """Repository for Icon entities.""" - def __init__(self, session: Any = None): + def __init__(self, session: Any = None): # pyright: ignore[reportExplicitAny] self.session = session or db.session - def get_by_id(self, id: int) -> Optional[Icon]: + @override + def get_by_id(self, id: int) -> Icon | None: stmt = sa.select(IconORM).where(IconORM.id == id) icon_orm = self.session.scalar(stmt) if icon_orm: @@ -29,11 +30,13 @@ def get_by_title(self, title: str) -> Icon | None: return self._to_domain_model(icon_orm) return None - def get_all(self) -> List[Icon]: + @override + def get_all(self) -> list[Icon]: stmt = sa.select(IconORM) icons_orm = list(self.session.scalars(stmt).all()) return [self._to_domain_model(icon_orm) for icon_orm in icons_orm] + @override def create(self, entity: Icon) -> Icon: icon_orm = IconORM() icon_orm.title = entity.title @@ -45,6 +48,7 @@ def create(self, entity: Icon) -> Icon: entity.id = icon_orm.id return entity + @override def update(self, entity: Icon) -> Icon: stmt = sa.select(IconORM).where(IconORM.id == entity.id) icon_orm = self.session.scalar(stmt) @@ -58,6 +62,7 @@ def update(self, entity: Icon) -> Icon: self.session.flush() return entity + @override def delete(self, id: int) -> bool: stmt = sa.select(IconORM).where(IconORM.id == id) icon_orm = self.session.scalar(stmt) diff --git a/blog/repos/post.py b/blog/repos/post.py index f1e2949..94c2460 100644 --- a/blog/repos/post.py +++ b/blog/repos/post.py @@ -1,7 +1,7 @@ """Repository for Post entities.""" import sqlalchemy as sa -from typing import Any, List, Optional +from typing import Any, override from blog.extensions import db from blog.post.models import Post as PostORM @@ -14,7 +14,7 @@ class PostRepository(BaseRepository[PostDomain, int]): """Repository for Post entities.""" - def __init__(self, session: Any = None): + def __init__(self, session: Any = None): # pyright: ignore[reportExplicitAny] self.session = session or db.session def get_post_with_relationships(self, post_id: int) -> PostDomain | None: @@ -37,13 +37,13 @@ def get_post_with_relationships(self, post_id: int) -> PostDomain | None: return self._to_domain_model(post_orm) return None - def get_tags_for_post(self, post_id: int) -> List[TagDomain]: + def get_tags_for_post(self, post_id: int) -> list[TagDomain]: """Get all tags associated with a specific post.""" stmt = sa.select(TagORM).join(TagORM.posts).where(PostORM.id == post_id) tags_orm = list(self.session.scalars(stmt).all()) return [self._tag_to_domain_model(tag_orm) for tag_orm in tags_orm] - def get_posts_by_tag(self, tag_id: int) -> List[PostDomain]: + def get_posts_by_tag(self, tag_id: int) -> list[PostDomain]: """Get all posts associated with a specific tag.""" stmt = sa.select(PostORM).join(PostORM.tags).where(TagORM.id == tag_id) posts_orm = list(self.session.scalars(stmt).all()) @@ -57,7 +57,8 @@ def _tag_to_domain_model(self, tag_orm: TagORM) -> TagDomain: alias=tag_orm.alias or "", ) - def get_by_id(self, id: int) -> Optional[PostDomain]: + @override + def get_by_id(self, id: int) -> PostDomain | None: stmt = sa.select(PostORM).where(PostORM.id == id) post_orm = self.session.scalar(stmt) if post_orm: @@ -71,7 +72,8 @@ def get_by_alias(self, alias: str) -> PostDomain | None: return self._to_domain_model(post_orm) return None - def get_all(self) -> List[PostDomain]: + @override + def get_all(self) -> list[PostDomain]: stmt = sa.select(PostORM) posts_orm = list(self.session.scalars(stmt).all()) return [self._to_domain_model(post_orm) for post_orm in posts_orm] @@ -93,6 +95,7 @@ def get_page_posts(self, page_category_ids: list[int]) -> list[PostDomain]: posts_orm = list(self.session.scalars(stmt).all()) return [self._to_domain_model(post_orm) for post_orm in posts_orm] + @override def create(self, entity: PostDomain) -> PostDomain: post_orm = PostORM() post_orm.pagetitle = entity.pagetitle @@ -113,6 +116,7 @@ def create(self, entity: PostDomain) -> PostDomain: entity.id = post_orm.id return entity + @override def update(self, entity: PostDomain) -> PostDomain: stmt = sa.select(PostORM).where(PostORM.id == entity.id) post_orm = self.session.scalar(stmt) @@ -134,6 +138,7 @@ def update(self, entity: PostDomain) -> PostDomain: self.session.flush() return entity + @override def delete(self, id: int) -> bool: stmt = sa.select(PostORM).where(PostORM.id == id) post_orm = self.session.scalar(stmt) diff --git a/blog/repos/tag.py b/blog/repos/tag.py index 12a29f6..98969d2 100644 --- a/blog/repos/tag.py +++ b/blog/repos/tag.py @@ -1,7 +1,7 @@ """Repository for Tag entities.""" import sqlalchemy as sa -from typing import Any, List, Optional +from typing import Any, override from blog.extensions import db from blog.tags.models import Tag as TagORM @@ -12,10 +12,11 @@ class TagRepository(BaseRepository[TagDomain, int]): """Repository for Tag entities.""" - def __init__(self, session: Any = None): + def __init__(self, session: Any = None): # pyright: ignore[reportExplicitAny] self.session = session or db.session - def get_by_id(self, id: int) -> Optional[TagDomain]: + @override + def get_by_id(self, id: int) -> TagDomain | None: stmt = sa.select(TagORM).where(TagORM.id == id) tag_orm = self.session.scalar(stmt) if tag_orm: @@ -29,7 +30,8 @@ def get_by_alias(self, alias: str) -> TagDomain | None: return self._to_domain_model(tag_orm) return None - def get_all(self) -> List[TagDomain]: + @override + def get_all(self) -> list[TagDomain]: stmt = sa.select(TagORM) tags_orm = list(self.session.scalars(stmt).all()) return [self._to_domain_model(tag_orm) for tag_orm in tags_orm] @@ -44,7 +46,7 @@ def get_tags_with_posts(self) -> list[TagDomain]: tags_orm = list(self.session.scalars(stmt).unique().all()) return [self._to_domain_model(tag_orm) for tag_orm in tags_orm] - def get_tags_for_post(self, post_id: int) -> List[TagDomain]: + def get_tags_for_post(self, post_id: int) -> list[TagDomain]: """Get all tags associated with a specific post.""" from blog.post.models import Post as PostORM @@ -52,6 +54,7 @@ def get_tags_for_post(self, post_id: int) -> List[TagDomain]: tags_orm = list(self.session.scalars(stmt).all()) return [self._to_domain_model(tag_orm) for tag_orm in tags_orm] + @override def create(self, entity: TagDomain) -> TagDomain: tag_orm = TagORM() tag_orm.title = entity.title @@ -61,6 +64,7 @@ def create(self, entity: TagDomain) -> TagDomain: entity.id = tag_orm.id return entity + @override def update(self, entity: TagDomain) -> TagDomain: stmt = sa.select(TagORM).where(TagORM.id == entity.id) tag_orm = self.session.scalar(stmt) @@ -72,6 +76,7 @@ def update(self, entity: TagDomain) -> TagDomain: self.session.flush() return entity + @override def delete(self, id: int) -> bool: stmt = sa.select(TagORM).where(TagORM.id == id) tag_orm = self.session.scalar(stmt) diff --git a/blog/repos/user.py b/blog/repos/user.py index 90701f3..ee7a53e 100644 --- a/blog/repos/user.py +++ b/blog/repos/user.py @@ -1,7 +1,7 @@ """Repository for User entities.""" import sqlalchemy as sa -from typing import Any, List, Optional +from typing import Any, override from blog.extensions import db from blog.user.models import User as UserORM @@ -12,10 +12,11 @@ class UserRepository(BaseRepository[UserDomain, int]): """Repository for User entities.""" - def __init__(self, session: Any = None): + def __init__(self, session: Any = None): # pyright: ignore[reportExplicitAny] self.session = session or db.session - def get_by_id(self, id: int) -> Optional[UserDomain]: + @override + def get_by_id(self, id: int) -> UserDomain | None: stmt = sa.select(UserORM).where(UserORM.id == id) user_orm = self.session.scalar(stmt) if user_orm: @@ -29,7 +30,8 @@ def get_by_name(self, name: str) -> UserDomain | None: return self._to_domain_model(user_orm) return None - def get_all(self) -> List[UserDomain]: + @override + def get_all(self) -> list[UserDomain]: stmt = sa.select(UserORM) users_orm = self.session.scalars(stmt).all() return [self._to_domain_model(user_orm) for user_orm in users_orm] @@ -44,14 +46,12 @@ def get_users_with_posts(self) -> list[UserDomain]: users_orm = self.session.scalars(stmt).unique().all() return [self._to_domain_model(user_orm) for user_orm in users_orm] + @override def create(self, entity: UserDomain) -> UserDomain: user_orm = UserORM() user_orm.name = entity.name user_orm.password = entity.password - # Handle the case where authenticated might be None - user_orm.authenticated = ( - entity.authenticated if entity.authenticated is not None else False - ) + user_orm.authenticated = entity.authenticated # Handle datetime field that might be None if entity.createdon is not None: user_orm.createdon = entity.createdon @@ -60,6 +60,7 @@ def create(self, entity: UserDomain) -> UserDomain: entity.id = user_orm.id return entity + @override def update(self, entity: UserDomain) -> UserDomain: stmt = sa.select(UserORM).where(UserORM.id == entity.id) user_orm = self.session.scalar(stmt) @@ -68,16 +69,14 @@ def update(self, entity: UserDomain) -> UserDomain: user_orm.name = entity.name user_orm.password = entity.password - # Handle the case where authenticated might be None - user_orm.authenticated = ( - entity.authenticated if entity.authenticated is not None else False - ) + user_orm.authenticated = entity.authenticated # Handle datetime field that might be None if entity.createdon is not None: user_orm.createdon = entity.createdon self.session.flush() return entity + @override def delete(self, id: int) -> bool: stmt = sa.select(UserORM).where(UserORM.id == id) user_orm = self.session.scalar(stmt) diff --git a/blog/services/category.py b/blog/services/category.py index 3c04a64..79bce5e 100644 --- a/blog/services/category.py +++ b/blog/services/category.py @@ -73,6 +73,9 @@ def delete_category(self, category_id: int) -> bool: return self.category_repository.delete(category_id) except Exception as e: # Log the error with details - logger.error(f"Failed to delete category with id {category_id}: {str(e)}", exc_info=True) + logger.error( + f"Failed to delete category with id {category_id}: {str(e)}", + exc_info=True, + ) # Return False to indicate failure return False diff --git a/blog/services/icon.py b/blog/services/icon.py index c9a3977..27be187 100644 --- a/blog/services/icon.py +++ b/blog/services/icon.py @@ -70,6 +70,8 @@ def delete_icon(self, icon_id: int) -> bool: return self.icon_repository.delete(icon_id) except Exception as e: # Log the error with details - logger.error(f"Failed to delete icon with id {icon_id}: {str(e)}", exc_info=True) + logger.error( + f"Failed to delete icon with id {icon_id}: {str(e)}", exc_info=True + ) # Return False to indicate failure return False diff --git a/blog/services/tag.py b/blog/services/tag.py index 014c82a..53e7007 100644 --- a/blog/services/tag.py +++ b/blog/services/tag.py @@ -73,6 +73,8 @@ def delete_tag(self, tag_id: int) -> bool: return self.tag_repository.delete(tag_id) except Exception as e: # Log the error with details - logger.error(f"Failed to delete tag with id {tag_id}: {str(e)}", exc_info=True) + logger.error( + f"Failed to delete tag with id {tag_id}: {str(e)}", exc_info=True + ) # Return False to indicate failure return False diff --git a/blog/services/user.py b/blog/services/user.py index 00382a0..95cf80b 100644 --- a/blog/services/user.py +++ b/blog/services/user.py @@ -73,7 +73,9 @@ def delete_user(self, user_id: int) -> bool: return self.user_repository.delete(user_id) except Exception as e: # Log the error with details - logger.error(f"Failed to delete user with id {user_id}: {str(e)}", exc_info=True) + logger.error( + f"Failed to delete user with id {user_id}: {str(e)}", exc_info=True + ) # Return False to indicate failure return False diff --git a/blog/tags/models.py b/blog/tags/models.py index 93fef64..0a5e310 100644 --- a/blog/tags/models.py +++ b/blog/tags/models.py @@ -1,5 +1,5 @@ # blog/tags/models.py -from typing import TYPE_CHECKING +from typing import TYPE_CHECKING, override from sqlalchemy.orm import Mapped, relationship @@ -24,5 +24,6 @@ class Tag(db.Model): "Post", secondary=get_posts_tags_table(db.metadata), back_populates="tags" ) + @override def __str__(self): return f"{self.title}" diff --git a/blog/tags/views.py b/blog/tags/views.py index f631080..05e37ab 100644 --- a/blog/tags/views.py +++ b/blog/tags/views.py @@ -1,14 +1,19 @@ -from flask import Blueprint, render_template +from typing import TYPE_CHECKING, ParamSpecKwargs + +from flask import Blueprint, render_template, Response from blog.post.views import pages_gen from blog.services.factory import ServiceFactory +if TYPE_CHECKING: + from flask import Response + tags = Blueprint("tags", __name__, url_prefix="/tags") @tags.route("/") @pages_gen -def index(**kwargs): +def index(**kwargs: ParamSpecKwargs) -> Response | str: tag_service = ServiceFactory.create_tag_service() tags = tag_service.get_all_tags() return render_template("tags.html", tags=tags, **kwargs) @@ -16,7 +21,7 @@ def index(**kwargs): @tags.route("/") @pages_gen -def view(alias=None, **kwargs): +def view(alias: str | None = None, **kwargs: ParamSpecKwargs) -> Response | str: if alias is None: from flask import abort diff --git a/blog/user/models.py b/blog/user/models.py index d3db2c7..6681809 100644 --- a/blog/user/models.py +++ b/blog/user/models.py @@ -1,7 +1,7 @@ """SqlAlchemy models.""" from datetime import datetime -from typing import TYPE_CHECKING +from typing import TYPE_CHECKING, override from flask_login import UserMixin from sqlalchemy.orm import Mapped, relationship @@ -28,7 +28,7 @@ class User(UserMixin, db.Model): posts: Mapped[list["Post"]] = relationship("Post", back_populates="user") - def __init__(self, **kwargs): + def __init__(self, **kwargs: str) -> None: """Initialize a new User instance.""" super().__init__(**kwargs) # Set default createdon if not provided @@ -43,6 +43,7 @@ def check_password(self, password: str) -> bool: """Check password hash.""" return check_password_hash(self.password or "", password) + @override def __str__(self) -> str: """String representation.""" return f"{self.name}" diff --git a/blog/user/views.py b/blog/user/views.py index 8b05f1f..56b5e20 100644 --- a/blog/user/views.py +++ b/blog/user/views.py @@ -1,26 +1,32 @@ +import typing import flask_login -from flask import Blueprint, flash, redirect, render_template, url_for -from flask_login import current_user, login_user +from typing import TYPE_CHECKING + +from flask import Blueprint, flash, redirect, render_template, url_for, Response +from flask_login import current_user, login_user # pyright: ignore[reportUnknownVariableType] from blog.auth.adapter import auth_adapter from blog.extensions import login_manager from blog.user.forms import LoginForm +if TYPE_CHECKING: + from flask import Response + user = Blueprint("user", __name__) @login_manager.user_loader -def load_user(user_id): +def load_user(user_id: str): """Load user by ID for Flask-Login.""" # Use the authentication adapter for Flask-Login integration return auth_adapter.load_user(int(user_id)) @user.route("/login", methods=["GET", "POST"]) -def login(): +def login() -> Response | str: if current_user.is_authenticated: - return redirect("/") + return typing.cast("Response", redirect("/")) form = LoginForm() if form.validate_on_submit(): # Check that form data is not None before using it @@ -31,13 +37,13 @@ def login(): user_orm = auth_adapter.authenticate_and_login(name, password) if user_orm: login_user(user_orm) - return redirect(url_for("admin.index")) + return typing.cast("Response", redirect(url_for("admin.index"))) flash("invalid user o password") - return redirect(url_for("user.login")) + return typing.cast("Response", redirect(url_for("user.login"))) return render_template("login.html", form=form) @user.route("/logout") -def logout(): +def logout() -> Response: flask_login.logout_user() - return redirect(url_for("post.index")) + return typing.cast("Response", redirect(url_for("post.index"))) diff --git a/create_admin.py b/create_admin.py deleted file mode 100755 index f2d1d12..0000000 --- a/create_admin.py +++ /dev/null @@ -1,74 +0,0 @@ -#!/usr/bin/env python3 -""" -CLI tool to create admin users for the blog application. -This version creates a minimal Flask app context to avoid blueprint conflicts. -""" - -import sys -import os -import getpass - -# Add the project root to the Python path -sys.path.insert(0, os.path.dirname(os.path.abspath(__file__))) - - -def create_admin_user(name, password): - """Create an admin user with minimal app context.""" - # Import only what we need - from flask import Flask - from blog.config import config - from blog.extensions import db - from blog.user.models import User - - # Create a minimal app - app = Flask(__name__) - app.config.from_object(config.get("development")) - - # Initialize only the database - db.init_app(app) - - with app.app_context(): - # Check if user already exists - existing_user = db.session.execute( - db.select(User).where(User.name == name) - ).scalar_one_or_none() - - if existing_user: - print("User '{}' already exists.".format(name)) - return False - - # Create new user - user = User(name=name) - user.set_password(password) - - # Add to database - db.session.add(user) - db.session.commit() - - print("Admin user '{}' created successfully.".format(name)) - return True - - -if __name__ == "__main__": - import argparse - - parser = argparse.ArgumentParser(description="Create an admin user for the blog.") - parser.add_argument("name", help="Username for the admin user") - parser.add_argument( - "--password", help="Password for the admin user (will prompt if not provided)" - ) - - args = parser.parse_args() - - # Get password from command line or prompt - if args.password: - password = args.password - else: - password = getpass.getpass("Password: ") - confirm_password = getpass.getpass("Confirm Password: ") - if password != confirm_password: - print("Passwords do not match.") - sys.exit(1) - - success = create_admin_user(args.name, password) - sys.exit(0 if success else 1) diff --git a/migrations/env.py b/migrations/env.py index d92c0d2..49ad3fe 100644 --- a/migrations/env.py +++ b/migrations/env.py @@ -1,10 +1,16 @@ import logging from logging.config import fileConfig +from typing import TYPE_CHECKING from flask import current_app from alembic import context +if TYPE_CHECKING: + from alembic.runtime.environment import EnvironmentContext + from alembic.script.revision import Revision + from alembic.autogenerate.api import AutogenContext + # this is the Alembic Config object, which provides # access to the values within the .ini file in use. config = context.config @@ -80,9 +86,11 @@ def run_migrations_online(): # this callback is used to prevent an auto-migration from being generated # when there are no changes to the schema # reference: http://alembic.zzzcomputing.com/en/latest/cookbook.html - def process_revision_directives(context, revision, directives): + def process_revision_directives( + context: "EnvironmentContext", revision: "Revision", directives: list + ): if getattr(config.cmd_opts, "autogenerate", False): - script = directives[0] + script: "AutogenContext" = directives[0] if script.upgrade_ops.is_empty(): directives[:] = [] logger.info("No changes in schema detected.") diff --git a/pyproject.toml b/pyproject.toml index 555dd4e..9d5e05e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -33,10 +33,31 @@ build-backend = "hatchling.build" [tool.hatch.build.targets.wheel] packages = ["gunlinuxblog"] +[tool.pyright] +ignore = ["tests", "migrations"] +reportOptionalCall = false +reportUnusedCallResult = false +# enable? +reportUnannotatedClassAttribute = false +reportAny = false +reportMissingTypeStubs = false +reportUninitializedInstanceVariable = false +reportImportCycles = false +reportUnknownArgumentType = false +reportUnknownMemberType = false +reportUnknownParameterType = false + +[tool.coverage.run] +branch = true + +[tool.pytest.ini_options] +norecursedirs = "__pycache__" +addopts = "--strict-markers --cov=blog --cov-report xml" + [dependency-groups] dev = [ + "basedpyright>=1.31.5", "mypy>=1.15.0", - "pyright>=1.1.396", "pytest>=8.3.5", "pytest-cov>=6.0.0", ] diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index f4df407..0000000 --- a/setup.cfg +++ /dev/null @@ -1,29 +0,0 @@ -[coverage:run] -branch = True - -[flake8] -accept-encodings = utf-8 -max-complexity = 6 -statistics = False -max-line-length = 90 -doctests = True -enable-extensions = G -isort-show-traceback = True - -# clean default ignore list -ignore = W503 -exclude = - # Git certainly doesn't need to be checked. - .git, - # Bytecode directories to skiping. - __pycache__, - # Eggs from installation, they can not escape! - *.egg-info - migrations - venv - - -[tool:pytest] -norecursedirs = __pycache__ -addopts = --strict-markers --cov=blog --cov-report xml - diff --git a/tests/test_repositories.py b/tests/test_repositories.py index 18878f1..58a0e4d 100644 --- a/tests/test_repositories.py +++ b/tests/test_repositories.py @@ -829,6 +829,7 @@ def test_delete_category(self, app, category_repository): # Verify the ORM model was deleted stmt = db.select(CategoryORM).where(CategoryORM.id == created_category.id) category_orm = db.session.scalar(stmt) + assert category_orm is None def test_delete_nonexistent_category(self, app, category_repository): """Test deleting a nonexistent category.""" @@ -1130,16 +1131,14 @@ def test_delete_tag(self, app, tag_repository): # Verify the ORM model was deleted stmt = db.select(TagORM).where(TagORM.id == created_tag.id) tag_orm = db.session.scalar(stmt) + assert tag_orm is None def test_delete_nonexistent_tag(self, app, tag_repository): """Test deleting a nonexistent tag.""" with app.app_context(): # Try to delete a tag that doesn't exist result = tag_repository.delete(99999) # Nonexistent ID - - # Verify the result is False - - # Verify None is returned + assert not result def test_to_domain_model_mapping(self, app, tag_repository): """Test that _to_domain_model correctly maps ORM to domain model.""" @@ -1682,6 +1681,7 @@ def test_delete_icon(self, app, icon_repository): # Verify the ORM model was deleted stmt = db.select(IconORM).where(IconORM.id == created_icon.id) icon_orm = db.session.scalar(stmt) + assert icon_orm is None def test_delete_nonexistent_icon(self, app, icon_repository): """Test deleting a nonexistent icon.""" @@ -1692,7 +1692,6 @@ def test_delete_nonexistent_icon(self, app, icon_repository): # Verify the result is False assert result is False - # Verify an empty list is returned def test_to_domain_model_mapping(self, app, icon_repository): diff --git a/uv.lock b/uv.lock index f1f62a7..dd37068 100644 --- a/uv.lock +++ b/uv.lock @@ -1,5 +1,5 @@ version = 1 -revision = 2 +revision = 3 requires-python = ">=3.10" [[package]] @@ -16,6 +16,18 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/99/f7/d398fae160568472ddce0b3fde9c4581afc593019a6adc91006a66406991/alembic-1.15.1-py3-none-any.whl", hash = "sha256:197de710da4b3e91cf66a826a5b31b5d59a127ab41bd0fc42863e2902ce2bbbe", size = 231753, upload-time = "2025-03-04T22:02:41.673Z" }, ] +[[package]] +name = "basedpyright" +version = "1.31.5" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "nodejs-wheel-binaries" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/23/c1/f50d6dfc35f87c75b109b414d48cdc55097b21d2f4b5fb7f74702ef0d26c/basedpyright-1.31.5.tar.gz", hash = "sha256:11bbc4af6107de1b1aa1eb76647f0c194095251dfff3c5f7aaf50376690142f5", size = 22511888, upload-time = "2025-09-24T12:53:13.202Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/71/b3/42b736baf91f5289f8907937575a1ea1a91484a8bf0985d03ed4251c5e4f/basedpyright-1.31.5-py3-none-any.whl", hash = "sha256:a345aae09fa6c12694f401514baf87fdb66ddade36a45bf978f1920a40b08df6", size = 11738983, upload-time = "2025-09-24T12:53:09.624Z" }, +] + [[package]] name = "blinker" version = "1.9.0" @@ -390,8 +402,8 @@ dependencies = [ [package.dev-dependencies] dev = [ + { name = "basedpyright" }, { name = "mypy" }, - { name = "pyright" }, { name = "pytest" }, { name = "pytest-cov" }, ] @@ -415,8 +427,8 @@ requires-dist = [ [package.metadata.requires-dev] dev = [ + { name = "basedpyright", specifier = ">=1.31.5" }, { name = "mypy", specifier = ">=1.15.0" }, - { name = "pyright", specifier = ">=1.1.396" }, { name = "pytest", specifier = ">=8.3.5" }, { name = "pytest-cov", specifier = ">=6.0.0" }, ] @@ -578,12 +590,19 @@ wheels = [ ] [[package]] -name = "nodeenv" -version = "1.9.1" +name = "nodejs-wheel-binaries" +version = "22.20.0" source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/43/16/fc88b08840de0e0a72a2f9d8c6bae36be573e475a6326ae854bcc549fc45/nodeenv-1.9.1.tar.gz", hash = "sha256:6ec12890a2dab7946721edbfbcd91f3319c6ccc9aec47be7c7e6b7011ee6645f", size = 47437, upload-time = "2024-06-04T18:44:11.171Z" } +sdist = { url = "https://files.pythonhosted.org/packages/0f/54/02f58c8119e2f1984e2572cc77a7b469dbaf4f8d171ad376e305749ef48e/nodejs_wheel_binaries-22.20.0.tar.gz", hash = "sha256:a62d47c9fd9c32191dff65bbe60261504f26992a0a19fe8b4d523256a84bd351", size = 8058, upload-time = "2025-09-26T09:48:00.906Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/d2/1d/1b658dbd2b9fa9c4c9f32accbfc0205d532c8c6194dc0f2a4c0428e7128a/nodeenv-1.9.1-py2.py3-none-any.whl", hash = "sha256:ba11c9782d29c27c70ffbdda2d7415098754709be8a7056d79a737cd901155c9", size = 22314, upload-time = "2024-06-04T18:44:08.352Z" }, + { url = "https://files.pythonhosted.org/packages/24/6d/333e5458422f12318e3c3e6e7f194353aa68b0d633217c7e89833427ca01/nodejs_wheel_binaries-22.20.0-py2.py3-none-macosx_11_0_arm64.whl", hash = "sha256:455add5ac4f01c9c830ab6771dbfad0fdf373f9b040d3aabe8cca9b6c56654fb", size = 53246314, upload-time = "2025-09-26T09:47:32.536Z" }, + { url = "https://files.pythonhosted.org/packages/56/30/dcd6879d286a35b3c4c8f9e5e0e1bcf4f9e25fe35310fc77ecf97f915a23/nodejs_wheel_binaries-22.20.0-py2.py3-none-macosx_11_0_x86_64.whl", hash = "sha256:5d8c12f97eea7028b34a84446eb5ca81829d0c428dfb4e647e09ac617f4e21fa", size = 53644391, upload-time = "2025-09-26T09:47:36.093Z" }, + { url = "https://files.pythonhosted.org/packages/58/be/c7b2e7aa3bb281d380a1c531f84d0ccfe225832dfc3bed1ca171753b9630/nodejs_wheel_binaries-22.20.0-py2.py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7a2b0989194148f66e9295d8f11bc463bde02cbe276517f4d20a310fb84780ae", size = 60282516, upload-time = "2025-09-26T09:47:39.88Z" }, + { url = "https://files.pythonhosted.org/packages/3e/c5/8befacf4190e03babbae54cb0809fb1a76e1600ec3967ab8ee9f8fc85b65/nodejs_wheel_binaries-22.20.0-py2.py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b5c500aa4dc046333ecb0a80f183e069e5c30ce637f1c1a37166b2c0b642dc21", size = 60347290, upload-time = "2025-09-26T09:47:43.712Z" }, + { url = "https://files.pythonhosted.org/packages/c0/bd/cfffd1e334277afa0714962c6ec432b5fe339340a6bca2e5fa8e678e7590/nodejs_wheel_binaries-22.20.0-py2.py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:3279eb1b99521f0d20a850bbfc0159a658e0e85b843b3cf31b090d7da9f10dfc", size = 62178798, upload-time = "2025-09-26T09:47:47.752Z" }, + { url = "https://files.pythonhosted.org/packages/08/14/10b83a9c02faac985b3e9f5e65d63a34fc0f46b48d8a2c3e4caa3e1e7318/nodejs_wheel_binaries-22.20.0-py2.py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:d29705797b33bade62d79d8f106c2453c8a26442a9b2a5576610c0f7e7c351ed", size = 62772957, upload-time = "2025-09-26T09:47:51.266Z" }, + { url = "https://files.pythonhosted.org/packages/b4/a9/c6a480259aa0d6b270aac2c6ba73a97444b9267adde983a5b7e34f17e45a/nodejs_wheel_binaries-22.20.0-py2.py3-none-win_amd64.whl", hash = "sha256:4bd658962f24958503541963e5a6f2cc512a8cb301e48a69dc03c879f40a28ae", size = 40120431, upload-time = "2025-09-26T09:47:54.363Z" }, + { url = "https://files.pythonhosted.org/packages/42/b1/6a4eb2c6e9efa028074b0001b61008c9d202b6b46caee9e5d1b18c088216/nodejs_wheel_binaries-22.20.0-py2.py3-none-win_arm64.whl", hash = "sha256:1fccac931faa210d22b6962bcdbc99269d16221d831b9a118bbb80fe434a60b8", size = 38844133, upload-time = "2025-09-26T09:47:57.357Z" }, ] [[package]] @@ -668,19 +687,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/13/a3/a812df4e2dd5696d1f351d58b8fe16a405b234ad2886a0dab9183fb78109/pycparser-2.22-py3-none-any.whl", hash = "sha256:c3702b6d3dd8c7abc1afa565d7e63d53a1d0bd86cdc24edd75470f4de499cfcc", size = 117552, upload-time = "2024-03-30T13:22:20.476Z" }, ] -[[package]] -name = "pyright" -version = "1.1.396" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "nodeenv" }, - { name = "typing-extensions" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/bd/73/f20cb1dea1bdc1774e7f860fb69dc0718c7d8dea854a345faec845eb086a/pyright-1.1.396.tar.gz", hash = "sha256:142901f5908f5a0895be3d3befcc18bedcdb8cc1798deecaec86ef7233a29b03", size = 3814400, upload-time = "2025-03-02T02:12:16.732Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/80/be/ecb7cfb42d242b7ee764b52e6ff4782beeec00e3b943a3ec832b281f9da6/pyright-1.1.396-py3-none-any.whl", hash = "sha256:c635e473095b9138c471abccca22b9fedbe63858e0b40d4fc4b67da041891844", size = 5689355, upload-time = "2025-03-02T02:12:14.044Z" }, -] - [[package]] name = "pytest" version = "8.3.5" From 6f1c6f6cb8757efb23b2d8a4f4ceef973ed676ab Mon Sep 17 00:00:00 2001 From: loki Date: Tue, 30 Sep 2025 02:18:21 +1000 Subject: [PATCH 25/34] typing stability --- blog/config_validator.py | 5 ++--- blog/domain/category.py | 4 ++-- blog/domain/tag.py | 4 ++-- blog/domain/user.py | 4 ++-- blog/post/models.py | 3 +-- blog/post/views.py | 23 +++++++++-------------- blog/user/views.py | 11 +++++------ 7 files changed, 23 insertions(+), 31 deletions(-) diff --git a/blog/config_validator.py b/blog/config_validator.py index 3b7180f..0b461db 100644 --- a/blog/config_validator.py +++ b/blog/config_validator.py @@ -2,8 +2,7 @@ import logging import os -from typing import Any -import typing +from typing import Any, cast logger = logging.getLogger(__name__) @@ -67,7 +66,7 @@ def validate_config(config: dict[str, Any]) -> list[str]: # pyright: ignore[rep if page_category is not None: if not isinstance(page_category, list): raise ConfigValidationError("PAGE_CATEGORY must be a list of integers") - for item in typing.cast("list[Any]", page_category): # pyright: ignore[reportExplicitAny] + for item in cast("list[Any]", page_category): # pyright: ignore[reportExplicitAny] if not isinstance(item, int): raise ConfigValidationError("PAGE_CATEGORY must contain only integers") diff --git a/blog/domain/category.py b/blog/domain/category.py index 7212f79..5665aa2 100644 --- a/blog/domain/category.py +++ b/blog/domain/category.py @@ -1,7 +1,7 @@ """Domain models for the Category entity.""" from dataclasses import dataclass -import typing +from typing import override @dataclass @@ -13,6 +13,6 @@ class Category: alias: str = "" template: str | None = None - @typing.override + @override def __str__(self): return f"Category(id={self.id}, title={self.title}, template={self.template})" diff --git a/blog/domain/tag.py b/blog/domain/tag.py index c517f7f..76cb7cf 100644 --- a/blog/domain/tag.py +++ b/blog/domain/tag.py @@ -1,7 +1,7 @@ """Domain models for the Tag entity.""" from dataclasses import dataclass -import typing +from typing import override @dataclass @@ -12,6 +12,6 @@ class Tag: title: str = "" alias: str = "" - @typing.override + @override def __str__(self): return f"{self.title}" diff --git a/blog/domain/user.py b/blog/domain/user.py index 6df223b..8d93b62 100644 --- a/blog/domain/user.py +++ b/blog/domain/user.py @@ -1,7 +1,7 @@ """Domain models for the User entity.""" +from typing import override import datetime -import typing from dataclasses import dataclass @@ -19,6 +19,6 @@ def __post_init__(self): if self.createdon is None: self.createdon = datetime.datetime.now(datetime.timezone.utc) - @typing.override + @override def __str__(self): return f"{self.name}" diff --git a/blog/post/models.py b/blog/post/models.py index 780af77..4cc7bb8 100644 --- a/blog/post/models.py +++ b/blog/post/models.py @@ -1,4 +1,3 @@ -import typing from datetime import datetime from typing import TYPE_CHECKING, override @@ -42,7 +41,7 @@ class Post(db.Model): def markdown(self): return markdown.markdown(self.content or "", extensions=MARKDOWN_EXTENSIONS) - @typing.override + @override def __str__(self): return f"{self.pagetitle}" diff --git a/blog/post/views.py b/blog/post/views.py index 419b33d..e1e4c60 100644 --- a/blog/post/views.py +++ b/blog/post/views.py @@ -1,5 +1,5 @@ import datetime -import typing +from typing import cast, TYPE_CHECKING, ParamSpec, TypeVar from functools import wraps from collections.abc import Callable @@ -16,7 +16,7 @@ ) -if typing.TYPE_CHECKING: +if TYPE_CHECKING: from flask import Response from blog.extensions import flask_sitemap, cache from blog.services.factory import ServiceFactory @@ -24,13 +24,8 @@ post = Blueprint("post", __name__) -P = typing.ParamSpec("P") -R = typing.TypeVar("R") - -""" -def with_lock(f: Callable[Concatenate[Lock, P], R]) -> Callable[P, R]: - def inner(*args: P.args, **kwargs: P.kwargs) -> R: -""" +P = ParamSpec("P") +R = TypeVar("R") def pages_gen( @@ -38,7 +33,7 @@ def pages_gen( ) -> Callable[P, R]: @wraps(f) def decorated_function(*args: P.args, **kwargs: P.kwargs) -> R: - page_category = typing.cast("list[int]", current_app.config["PAGE_CATEGORY"]) + page_category = cast("list[int]", current_app.config["PAGE_CATEGORY"]) post_service = ServiceFactory.create_post_service() pages = post_service.get_page_posts(page_category) @@ -55,7 +50,7 @@ def decorated_function(*args: P.args, **kwargs: P.kwargs) -> R: @post.route("/") @cache.cached(timeout=50) # pyright: ignore[reportUntypedFunctionDecorator] @pages_gen -def index(**kwargs: typing.Any) -> Response | str: +def index(**kwargs: str) -> Response | str: post_service = ServiceFactory.create_post_service() posts = post_service.get_published_posts() return render_template("posts.html", posts=posts, **kwargs) @@ -64,7 +59,7 @@ def index(**kwargs: typing.Any) -> Response | str: @post.route("/") @cache.cached(timeout=50) # pyright: ignore[reportUntypedFunctionDecorator] @pages_gen -def view(alias: str | None = None, **kwargs: typing.Any) -> Response | str: +def view(alias: str | None = None, **kwargs: str) -> Response | str: if alias is None: from flask import abort @@ -78,7 +73,7 @@ def view(alias: str | None = None, **kwargs: typing.Any) -> Response | str: abort(404) # For page categories, we need to check if it's a page or a regular post - page_categories = typing.cast("list[int]", current_app.config["PAGE_CATEGORY"]) + page_categories = cast("list[int]", current_app.config["PAGE_CATEGORY"]) is_page = post.category_id is not None and post.category_id in page_categories is_published = post.publishedon is not None @@ -102,7 +97,7 @@ def view(alias: str | None = None, **kwargs: typing.Any) -> Response | str: @flask_sitemap.register_generator def site_map_gen(): - page_category = typing.cast("list[int]", current_app.config["PAGE_CATEGORY"]) + page_category = cast("list[int]", current_app.config["PAGE_CATEGORY"]) post_service = ServiceFactory.create_post_service() pages = post_service.get_page_posts(page_category) diff --git a/blog/user/views.py b/blog/user/views.py index 56b5e20..2b32f82 100644 --- a/blog/user/views.py +++ b/blog/user/views.py @@ -1,6 +1,5 @@ -import typing import flask_login -from typing import TYPE_CHECKING +from typing import TYPE_CHECKING, cast from flask import Blueprint, flash, redirect, render_template, url_for, Response from flask_login import current_user, login_user # pyright: ignore[reportUnknownVariableType] @@ -26,7 +25,7 @@ def load_user(user_id: str): @user.route("/login", methods=["GET", "POST"]) def login() -> Response | str: if current_user.is_authenticated: - return typing.cast("Response", redirect("/")) + return cast("Response", redirect("/")) form = LoginForm() if form.validate_on_submit(): # Check that form data is not None before using it @@ -37,13 +36,13 @@ def login() -> Response | str: user_orm = auth_adapter.authenticate_and_login(name, password) if user_orm: login_user(user_orm) - return typing.cast("Response", redirect(url_for("admin.index"))) + return cast("Response", redirect(url_for("admin.index"))) flash("invalid user o password") - return typing.cast("Response", redirect(url_for("user.login"))) + return cast("Response", redirect(url_for("user.login"))) return render_template("login.html", form=form) @user.route("/logout") def logout() -> Response: flask_login.logout_user() - return typing.cast("Response", redirect(url_for("post.index"))) + return cast("Response", redirect(url_for("post.index"))) From 700c3e7092f19e87dbab55b73fd5e89386d96061 Mon Sep 17 00:00:00 2001 From: loki Date: Tue, 30 Sep 2025 02:19:59 +1000 Subject: [PATCH 26/34] remove unused import --- blog/post/views.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/blog/post/views.py b/blog/post/views.py index e1e4c60..a0603a2 100644 --- a/blog/post/views.py +++ b/blog/post/views.py @@ -1,5 +1,5 @@ import datetime -from typing import cast, TYPE_CHECKING, ParamSpec, TypeVar +from typing import cast, ParamSpec, TypeVar from functools import wraps from collections.abc import Callable @@ -16,8 +16,6 @@ ) -if TYPE_CHECKING: - from flask import Response from blog.extensions import flask_sitemap, cache from blog.services.factory import ServiceFactory From 2114aeaa7e3bd3b95478a82f3a1ac7320a3075e8 Mon Sep 17 00:00:00 2001 From: loki Date: Tue, 30 Sep 2025 03:19:13 +1000 Subject: [PATCH 27/34] error handling --- blog/repos/post.py | 2 +- blog/services/post.py | 3 +-- tests/test_repositories.py | 6 ++---- tests/test_services.py | 11 ++++++----- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/blog/repos/post.py b/blog/repos/post.py index 94c2460..4f860f2 100644 --- a/blog/repos/post.py +++ b/blog/repos/post.py @@ -145,7 +145,7 @@ def delete(self, id: int) -> bool: if post_orm: self.session.delete(post_orm) return True - return False + raise ValueError(f"Post not found {id}") def _to_domain_model(self, post_orm: PostORM) -> PostDomain: return PostDomain( diff --git a/blog/services/post.py b/blog/services/post.py index 85ca6c7..6e84ca7 100644 --- a/blog/services/post.py +++ b/blog/services/post.py @@ -86,5 +86,4 @@ def delete_post(self, post_id: int) -> bool: logger.error( f"Failed to delete post with id {post_id}: {str(e)}", exc_info=True ) - # Return False to indicate failure - return False + raise PostNotFoundError(f"Failed to delete post with id: {str(e)}") from e diff --git a/tests/test_repositories.py b/tests/test_repositories.py index 58a0e4d..4f8a8e9 100644 --- a/tests/test_repositories.py +++ b/tests/test_repositories.py @@ -383,10 +383,8 @@ def test_delete_nonexistent_post(self, app, post_repository): """Test deleting a nonexistent post.""" with app.app_context(): # Try to delete a post that doesn't exist - result = post_repository.delete(99999) # Nonexistent ID - - # Verify the result is False - assert result is False + with pytest.raises(ValueError): + post_repository.delete(99999) # Nonexistent ID def test_get_post_with_relationships(self, app, post_repository): """Test getting a post with relationships loaded.""" diff --git a/tests/test_services.py b/tests/test_services.py index 1c75453..0ad9f1d 100644 --- a/tests/test_services.py +++ b/tests/test_services.py @@ -11,7 +11,7 @@ from blog.domain.tag import Tag as TagDomain from blog.domain.user import User as UserDomain from blog.domain.icon import Icon as IconDomain -from blog.services.post import PostService, PostUpdateError +from blog.services.post import PostService, PostUpdateError, PostNotFoundError from blog.services.category import CategoryService, CategoryUpdateError from blog.services.tag import TagService, TagUpdateError from blog.services.user import UserService, UserUpdateError @@ -268,13 +268,14 @@ def test_delete_post(self, app, post_service): retrieved_post = post_service.get_post_by_id(created_post.id) assert retrieved_post is None + with pytest.raises(PostNotFoundError): + post_service.delete_post(created_post.id) + def test_delete_nonexistent_post(self, app, post_service): """Test deleting a nonexistent post.""" # Try to delete a post that doesn't exist - result = post_service.delete_post(99999) # Nonexistent ID - - # Verify the result is False - assert result is False + with pytest.raises(PostNotFoundError): + post_service.delete_post(99999) # Nonexistent ID def test_get_post_by_alias(self, app, post_service): """Test getting a post by alias.""" From a0afb1dd27be5836974e4d4554356d4dda859d1d Mon Sep 17 00:00:00 2001 From: loki Date: Tue, 30 Sep 2025 03:58:39 +1000 Subject: [PATCH 28/34] bump wtf --- pyproject.toml | 2 +- uv.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 9d5e05e..0ccee16 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -20,7 +20,7 @@ dependencies = [ "markdown>=3.7", "psycopg2-binary>=2.9.10", "python-dotenv>=1.0.1", - "wtforms==2.3.3", + "wtforms>=3.2.1", ] [project.scripts] diff --git a/uv.lock b/uv.lock index dd37068..371625f 100644 --- a/uv.lock +++ b/uv.lock @@ -422,7 +422,7 @@ requires-dist = [ { name = "markdown", specifier = ">=3.7" }, { name = "psycopg2-binary", specifier = ">=2.9.10" }, { name = "python-dotenv", specifier = ">=1.0.1" }, - { name = "wtforms", specifier = "==2.3.3" }, + { name = "wtforms", specifier = ">=3.2.1" }, ] [package.metadata.requires-dev] @@ -842,14 +842,14 @@ wheels = [ [[package]] name = "wtforms" -version = "2.3.3" +version = "3.2.1" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "markupsafe" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/dd/3f/f25d26b1c66896e2876124a12cd8be8f606abf4e1890a20f3ca04e4a1555/WTForms-2.3.3.tar.gz", hash = "sha256:81195de0ac94fbc8368abbaf9197b88c4f3ffd6c2719b5bf5fc9da744f3d829c", size = 162945, upload-time = "2020-07-30T17:08:26.883Z" } +sdist = { url = "https://files.pythonhosted.org/packages/01/e4/633d080897e769ed5712dcfad626e55dbd6cf45db0ff4d9884315c6a82da/wtforms-3.2.1.tar.gz", hash = "sha256:df3e6b70f3192e92623128123ec8dca3067df9cfadd43d59681e210cfb8d4682", size = 137801, upload-time = "2024-10-21T11:34:00.108Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/e0/31/614fc7dc7d76005b0acb8c0c8920d962b83d7422b4ba912886dfb63f86ff/WTForms-2.3.3-py2.py3-none-any.whl", hash = "sha256:7b504fc724d0d1d4d5d5c114e778ec88c37ea53144683e084215eed5155ada4c", size = 169106, upload-time = "2020-07-30T17:08:25.026Z" }, + { url = "https://files.pythonhosted.org/packages/08/c9/2088fb5645cd289c99ebe0d4cdcc723922a1d8e1beaefb0f6f76dff9b21c/wtforms-3.2.1-py3-none-any.whl", hash = "sha256:583bad77ba1dd7286463f21e11aa3043ca4869d03575921d1a1698d0715e0fd4", size = 152454, upload-time = "2024-10-21T11:33:58.44Z" }, ] [[package]] From acc6899a5ad23d809fc29c9ac65b4bb4788cf27a Mon Sep 17 00:00:00 2001 From: loki Date: Tue, 30 Sep 2025 04:26:10 +1000 Subject: [PATCH 29/34] bump version --- pyproject.toml | 4 +- uv.lock | 816 ++++++++++++++++++++++++++++--------------------- 2 files changed, 464 insertions(+), 356 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 0ccee16..fc78297 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,7 +8,7 @@ authors = [ ] requires-python = ">=3.10" dependencies = [ - "flask-admin>=1.6.1", + "Flask-Admin>=1.6.1", "flask-caching>=2.3.1", "flask-login>=0.6.3", "flask-migrate>=4.1.0", @@ -20,7 +20,7 @@ dependencies = [ "markdown>=3.7", "psycopg2-binary>=2.9.10", "python-dotenv>=1.0.1", - "wtforms>=3.2.1", + "wtforms<3.0", ] [project.scripts] diff --git a/uv.lock b/uv.lock index 371625f..40b21b3 100644 --- a/uv.lock +++ b/uv.lock @@ -4,16 +4,17 @@ requires-python = ">=3.10" [[package]] name = "alembic" -version = "1.15.1" +version = "1.16.5" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "mako" }, { name = "sqlalchemy" }, + { name = "tomli", marker = "python_full_version < '3.11'" }, { name = "typing-extensions" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/4a/ed/901044acb892caa5604bf818d2da9ab0df94ef606c6059fdf367894ebf60/alembic-1.15.1.tar.gz", hash = "sha256:e1a1c738577bca1f27e68728c910cd389b9a92152ff91d902da649c192e30c49", size = 1924789, upload-time = "2025-03-04T22:02:38.583Z" } +sdist = { url = "https://files.pythonhosted.org/packages/9a/ca/4dc52902cf3491892d464f5265a81e9dff094692c8a049a3ed6a05fe7ee8/alembic-1.16.5.tar.gz", hash = "sha256:a88bb7f6e513bd4301ecf4c7f2206fe93f9913f9b48dac3b78babde2d6fe765e", size = 1969868, upload-time = "2025-08-27T18:02:05.668Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/99/f7/d398fae160568472ddce0b3fde9c4581afc593019a6adc91006a66406991/alembic-1.15.1-py3-none-any.whl", hash = "sha256:197de710da4b3e91cf66a826a5b31b5d59a127ab41bd0fc42863e2902ce2bbbe", size = 231753, upload-time = "2025-03-04T22:02:41.673Z" }, + { url = "https://files.pythonhosted.org/packages/39/4a/4c61d4c84cfd9befb6fa08a702535b27b21fff08c946bc2f6139decbf7f7/alembic-1.16.5-py3-none-any.whl", hash = "sha256:e845dfe090c5ffa7b92593ae6687c5cb1a101e91fa53868497dbd79847f9dbe3", size = 247355, upload-time = "2025-08-27T18:02:07.37Z" }, ] [[package]] @@ -48,33 +49,42 @@ wheels = [ [[package]] name = "cffi" -version = "1.17.1" +version = "2.0.0" source = { registry = "https://pypi.org/simple" } dependencies = [ - { name = "pycparser" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/fc/97/c783634659c2920c3fc70419e3af40972dbaf758daa229a7d6ea6135c90d/cffi-1.17.1.tar.gz", hash = "sha256:1c39c6016c32bc48dd54561950ebd6836e1670f2ae46128f67cf49e789c52824", size = 516621, upload-time = "2024-09-04T20:45:21.852Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/f8/fe/4d41c2f200c4a457933dbd98d3cf4e911870877bd94d9656cc0fcb390681/cffi-1.17.1-cp310-cp310-win32.whl", hash = "sha256:c9c3d058ebabb74db66e431095118094d06abf53284d9c81f27300d0e0d8bc7c", size = 171804, upload-time = "2024-09-04T20:43:48.186Z" }, - { url = "https://files.pythonhosted.org/packages/d1/b6/0b0f5ab93b0df4acc49cae758c81fe4e5ef26c3ae2e10cc69249dfd8b3ab/cffi-1.17.1-cp310-cp310-win_amd64.whl", hash = "sha256:0f048dcf80db46f0098ccac01132761580d28e28bc0f78ae0d58048063317e15", size = 181299, upload-time = "2024-09-04T20:43:49.812Z" }, - { url = "https://files.pythonhosted.org/packages/34/33/e1b8a1ba29025adbdcda5fb3a36f94c03d771c1b7b12f726ff7fef2ebe36/cffi-1.17.1-cp311-cp311-win32.whl", hash = "sha256:85a950a4ac9c359340d5963966e3e0a94a676bd6245a4b55bc43949eee26a655", size = 171727, upload-time = "2024-09-04T20:44:09.481Z" }, - { url = "https://files.pythonhosted.org/packages/3d/97/50228be003bb2802627d28ec0627837ac0bf35c90cf769812056f235b2d1/cffi-1.17.1-cp311-cp311-win_amd64.whl", hash = "sha256:caaf0640ef5f5517f49bc275eca1406b0ffa6aa184892812030f04c2abf589a0", size = 181400, upload-time = "2024-09-04T20:44:10.873Z" }, - { url = "https://files.pythonhosted.org/packages/86/c5/28b2d6f799ec0bdecf44dced2ec5ed43e0eb63097b0f58c293583b406582/cffi-1.17.1-cp312-cp312-win32.whl", hash = "sha256:a08d7e755f8ed21095a310a693525137cfe756ce62d066e53f502a83dc550f65", size = 172448, upload-time = "2024-09-04T20:44:26.208Z" }, - { url = "https://files.pythonhosted.org/packages/50/b9/db34c4755a7bd1cb2d1603ac3863f22bcecbd1ba29e5ee841a4bc510b294/cffi-1.17.1-cp312-cp312-win_amd64.whl", hash = "sha256:51392eae71afec0d0c8fb1a53b204dbb3bcabcb3c9b807eedf3e1e6ccf2de903", size = 181976, upload-time = "2024-09-04T20:44:27.578Z" }, - { url = "https://files.pythonhosted.org/packages/bf/ee/f94057fa6426481d663b88637a9a10e859e492c73d0384514a17d78ee205/cffi-1.17.1-cp313-cp313-win32.whl", hash = "sha256:e03eab0a8677fa80d646b5ddece1cbeaf556c313dcfac435ba11f107ba117b5d", size = 172475, upload-time = "2024-09-04T20:44:43.733Z" }, - { url = "https://files.pythonhosted.org/packages/7c/fc/6a8cb64e5f0324877d503c854da15d76c1e50eb722e320b15345c4d0c6de/cffi-1.17.1-cp313-cp313-win_amd64.whl", hash = "sha256:f6a16c31041f09ead72d69f583767292f750d24913dadacf5756b966aacb3f1a", size = 182009, upload-time = "2024-09-04T20:44:45.309Z" }, + { name = "pycparser", marker = "implementation_name != 'PyPy'" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/eb/56/b1ba7935a17738ae8453301356628e8147c79dbb825bcbc73dc7401f9846/cffi-2.0.0.tar.gz", hash = "sha256:44d1b5909021139fe36001ae048dbdde8214afa20200eda0f64c068cac5d5529", size = 523588, upload-time = "2025-09-08T23:24:04.541Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/e2/cc/027d7fb82e58c48ea717149b03bcadcbdc293553edb283af792bd4bcbb3f/cffi-2.0.0-cp310-cp310-win32.whl", hash = "sha256:1f72fb8906754ac8a2cc3f9f5aaa298070652a0ffae577e0ea9bd480dc3c931a", size = 172184, upload-time = "2025-09-08T23:22:23.328Z" }, + { url = "https://files.pythonhosted.org/packages/33/fa/072dd15ae27fbb4e06b437eb6e944e75b068deb09e2a2826039e49ee2045/cffi-2.0.0-cp310-cp310-win_amd64.whl", hash = "sha256:b18a3ed7d5b3bd8d9ef7a8cb226502c6bf8308df1525e1cc676c3680e7176739", size = 182790, upload-time = "2025-09-08T23:22:24.752Z" }, + { url = "https://files.pythonhosted.org/packages/2b/c0/015b25184413d7ab0a410775fdb4a50fca20f5589b5dab1dbbfa3baad8ce/cffi-2.0.0-cp311-cp311-win32.whl", hash = "sha256:c649e3a33450ec82378822b3dad03cc228b8f5963c0c12fc3b1e0ab940f768a5", size = 172076, upload-time = "2025-09-08T23:22:40.95Z" }, + { url = "https://files.pythonhosted.org/packages/ae/8f/dc5531155e7070361eb1b7e4c1a9d896d0cb21c49f807a6c03fd63fc877e/cffi-2.0.0-cp311-cp311-win_amd64.whl", hash = "sha256:66f011380d0e49ed280c789fbd08ff0d40968ee7b665575489afa95c98196ab5", size = 182820, upload-time = "2025-09-08T23:22:42.463Z" }, + { url = "https://files.pythonhosted.org/packages/95/5c/1b493356429f9aecfd56bc171285a4c4ac8697f76e9bbbbb105e537853a1/cffi-2.0.0-cp311-cp311-win_arm64.whl", hash = "sha256:c6638687455baf640e37344fe26d37c404db8b80d037c3d29f58fe8d1c3b194d", size = 177635, upload-time = "2025-09-08T23:22:43.623Z" }, + { url = "https://files.pythonhosted.org/packages/7b/2b/2b6435f76bfeb6bbf055596976da087377ede68df465419d192acf00c437/cffi-2.0.0-cp312-cp312-win32.whl", hash = "sha256:da902562c3e9c550df360bfa53c035b2f241fed6d9aef119048073680ace4a18", size = 172932, upload-time = "2025-09-08T23:22:57.188Z" }, + { url = "https://files.pythonhosted.org/packages/f8/ed/13bd4418627013bec4ed6e54283b1959cf6db888048c7cf4b4c3b5b36002/cffi-2.0.0-cp312-cp312-win_amd64.whl", hash = "sha256:da68248800ad6320861f129cd9c1bf96ca849a2771a59e0344e88681905916f5", size = 183557, upload-time = "2025-09-08T23:22:58.351Z" }, + { url = "https://files.pythonhosted.org/packages/95/31/9f7f93ad2f8eff1dbc1c3656d7ca5bfd8fb52c9d786b4dcf19b2d02217fa/cffi-2.0.0-cp312-cp312-win_arm64.whl", hash = "sha256:4671d9dd5ec934cb9a73e7ee9676f9362aba54f7f34910956b84d727b0d73fb6", size = 177762, upload-time = "2025-09-08T23:22:59.668Z" }, + { url = "https://files.pythonhosted.org/packages/eb/6d/bf9bda840d5f1dfdbf0feca87fbdb64a918a69bca42cfa0ba7b137c48cb8/cffi-2.0.0-cp313-cp313-win32.whl", hash = "sha256:74a03b9698e198d47562765773b4a8309919089150a0bb17d829ad7b44b60d27", size = 172909, upload-time = "2025-09-08T23:23:14.32Z" }, + { url = "https://files.pythonhosted.org/packages/37/18/6519e1ee6f5a1e579e04b9ddb6f1676c17368a7aba48299c3759bbc3c8b3/cffi-2.0.0-cp313-cp313-win_amd64.whl", hash = "sha256:19f705ada2530c1167abacb171925dd886168931e0a7b78f5bffcae5c6b5be75", size = 183402, upload-time = "2025-09-08T23:23:15.535Z" }, + { url = "https://files.pythonhosted.org/packages/cb/0e/02ceeec9a7d6ee63bb596121c2c8e9b3a9e150936f4fbef6ca1943e6137c/cffi-2.0.0-cp313-cp313-win_arm64.whl", hash = "sha256:256f80b80ca3853f90c21b23ee78cd008713787b1b1e93eae9f3d6a7134abd91", size = 177780, upload-time = "2025-09-08T23:23:16.761Z" }, + { url = "https://files.pythonhosted.org/packages/3e/aa/df335faa45b395396fcbc03de2dfcab242cd61a9900e914fe682a59170b1/cffi-2.0.0-cp314-cp314-win32.whl", hash = "sha256:087067fa8953339c723661eda6b54bc98c5625757ea62e95eb4898ad5e776e9f", size = 175328, upload-time = "2025-09-08T23:23:44.61Z" }, + { url = "https://files.pythonhosted.org/packages/bb/92/882c2d30831744296ce713f0feb4c1cd30f346ef747b530b5318715cc367/cffi-2.0.0-cp314-cp314-win_amd64.whl", hash = "sha256:203a48d1fb583fc7d78a4c6655692963b860a417c0528492a6bc21f1aaefab25", size = 185650, upload-time = "2025-09-08T23:23:45.848Z" }, + { url = "https://files.pythonhosted.org/packages/9f/2c/98ece204b9d35a7366b5b2c6539c350313ca13932143e79dc133ba757104/cffi-2.0.0-cp314-cp314-win_arm64.whl", hash = "sha256:dbd5c7a25a7cb98f5ca55d258b103a2054f859a46ae11aaf23134f9cc0d356ad", size = 180687, upload-time = "2025-09-08T23:23:47.105Z" }, + { url = "https://files.pythonhosted.org/packages/a0/1d/ec1a60bd1a10daa292d3cd6bb0b359a81607154fb8165f3ec95fe003b85c/cffi-2.0.0-cp314-cp314t-win32.whl", hash = "sha256:1fc9ea04857caf665289b7a75923f2c6ed559b8298a1b8c49e59f7dd95c8481e", size = 180487, upload-time = "2025-09-08T23:23:40.423Z" }, + { url = "https://files.pythonhosted.org/packages/bf/41/4c1168c74fac325c0c8156f04b6749c8b6a8f405bbf91413ba088359f60d/cffi-2.0.0-cp314-cp314t-win_amd64.whl", hash = "sha256:d68b6cef7827e8641e8ef16f4494edda8b36104d79773a334beaa1e3521430f6", size = 191726, upload-time = "2025-09-08T23:23:41.742Z" }, + { url = "https://files.pythonhosted.org/packages/ae/3a/dbeec9d1ee0844c679f6bb5d6ad4e9f198b1224f4e7a32825f47f6192b0c/cffi-2.0.0-cp314-cp314t-win_arm64.whl", hash = "sha256:0a1527a803f0a659de1af2e1fd700213caba79377e27e4693648c2923da066f9", size = 184195, upload-time = "2025-09-08T23:23:43.004Z" }, ] [[package]] name = "click" -version = "8.1.8" +version = "8.3.0" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "colorama", marker = "sys_platform == 'win32'" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/b9/2e/0090cbf739cee7d23781ad4b89a9894a41538e4fcf4c31dcdd705b78eb8b/click-8.1.8.tar.gz", hash = "sha256:ed53c9d8990d83c2a27deae68e4ee337473f6330c040a31d4225c9574d16096a", size = 226593, upload-time = "2024-12-21T18:38:44.339Z" } +sdist = { url = "https://files.pythonhosted.org/packages/46/61/de6cd827efad202d7057d93e0fed9294b96952e188f7384832791c7b2254/click-8.3.0.tar.gz", hash = "sha256:e7b8232224eba16f4ebe410c25ced9f7875cb5f3263ffc93cc3e8da705e229c4", size = 276943, upload-time = "2025-09-18T17:32:23.696Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/7e/d4/7ebdbd03970677812aac39c869717059dbb71a4cfc033ca6e5221787892c/click-8.1.8-py3-none-any.whl", hash = "sha256:63c132bbbed01578a06712a2d1f497bb62d9c1c0d329b7903a866228027263b2", size = 98188, upload-time = "2024-12-21T18:38:41.666Z" }, + { url = "https://files.pythonhosted.org/packages/db/d3/9dcc0f5797f070ec8edf30fbadfb200e71d9db6b84d211e3b2085a7589a0/click-8.3.0-py3-none-any.whl", hash = "sha256:9b9f285302c6e3064f4330c05f05b81945b2a39544279343e6e7c5f27a9baddc", size = 107295, upload-time = "2025-09-18T17:32:22.42Z" }, ] [[package]] @@ -88,62 +98,101 @@ wheels = [ [[package]] name = "coverage" -version = "7.6.12" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/0c/d6/2b53ab3ee99f2262e6f0b8369a43f6d66658eab45510331c0b3d5c8c4272/coverage-7.6.12.tar.gz", hash = "sha256:48cfc4641d95d34766ad41d9573cc0f22a48aa88d22657a1fe01dca0dbae4de2", size = 805941, upload-time = "2025-02-11T14:47:03.797Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/ba/67/81dc41ec8f548c365d04a29f1afd492d3176b372c33e47fa2a45a01dc13a/coverage-7.6.12-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:704c8c8c6ce6569286ae9622e534b4f5b9759b6f2cd643f1c1a61f666d534fe8", size = 208345, upload-time = "2025-02-11T14:44:51.83Z" }, - { url = "https://files.pythonhosted.org/packages/33/43/17f71676016c8829bde69e24c852fef6bd9ed39f774a245d9ec98f689fa0/coverage-7.6.12-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:ad7525bf0241e5502168ae9c643a2f6c219fa0a283001cee4cf23a9b7da75879", size = 208775, upload-time = "2025-02-11T14:44:54.852Z" }, - { url = "https://files.pythonhosted.org/packages/86/25/c6ff0775f8960e8c0840845b723eed978d22a3cd9babd2b996e4a7c502c6/coverage-7.6.12-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:06097c7abfa611c91edb9e6920264e5be1d6ceb374efb4986f38b09eed4cb2fe", size = 237925, upload-time = "2025-02-11T14:44:56.675Z" }, - { url = "https://files.pythonhosted.org/packages/b0/3d/5f5bd37046243cb9d15fff2c69e498c2f4fe4f9b42a96018d4579ed3506f/coverage-7.6.12-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:220fa6c0ad7d9caef57f2c8771918324563ef0d8272c94974717c3909664e674", size = 235835, upload-time = "2025-02-11T14:44:59.007Z" }, - { url = "https://files.pythonhosted.org/packages/b5/f1/9e6b75531fe33490b910d251b0bf709142e73a40e4e38a3899e6986fe088/coverage-7.6.12-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3688b99604a24492bcfe1c106278c45586eb819bf66a654d8a9a1433022fb2eb", size = 236966, upload-time = "2025-02-11T14:45:02.744Z" }, - { url = "https://files.pythonhosted.org/packages/4f/bc/aef5a98f9133851bd1aacf130e754063719345d2fb776a117d5a8d516971/coverage-7.6.12-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:d1a987778b9c71da2fc8948e6f2656da6ef68f59298b7e9786849634c35d2c3c", size = 236080, upload-time = "2025-02-11T14:45:05.416Z" }, - { url = "https://files.pythonhosted.org/packages/eb/d0/56b4ab77f9b12aea4d4c11dc11cdcaa7c29130b837eb610639cf3400c9c3/coverage-7.6.12-cp310-cp310-musllinux_1_2_i686.whl", hash = "sha256:cec6b9ce3bd2b7853d4a4563801292bfee40b030c05a3d29555fd2a8ee9bd68c", size = 234393, upload-time = "2025-02-11T14:45:08.627Z" }, - { url = "https://files.pythonhosted.org/packages/0d/77/28ef95c5d23fe3dd191a0b7d89c82fea2c2d904aef9315daf7c890e96557/coverage-7.6.12-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:ace9048de91293e467b44bce0f0381345078389814ff6e18dbac8fdbf896360e", size = 235536, upload-time = "2025-02-11T14:45:10.313Z" }, - { url = "https://files.pythonhosted.org/packages/29/62/18791d3632ee3ff3f95bc8599115707d05229c72db9539f208bb878a3d88/coverage-7.6.12-cp310-cp310-win32.whl", hash = "sha256:ea31689f05043d520113e0552f039603c4dd71fa4c287b64cb3606140c66f425", size = 211063, upload-time = "2025-02-11T14:45:12.278Z" }, - { url = "https://files.pythonhosted.org/packages/fc/57/b3878006cedfd573c963e5c751b8587154eb10a61cc0f47a84f85c88a355/coverage-7.6.12-cp310-cp310-win_amd64.whl", hash = "sha256:676f92141e3c5492d2a1596d52287d0d963df21bf5e55c8b03075a60e1ddf8aa", size = 211955, upload-time = "2025-02-11T14:45:14.579Z" }, - { url = "https://files.pythonhosted.org/packages/64/2d/da78abbfff98468c91fd63a73cccdfa0e99051676ded8dd36123e3a2d4d5/coverage-7.6.12-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:e18aafdfb3e9ec0d261c942d35bd7c28d031c5855dadb491d2723ba54f4c3015", size = 208464, upload-time = "2025-02-11T14:45:18.314Z" }, - { url = "https://files.pythonhosted.org/packages/31/f2/c269f46c470bdabe83a69e860c80a82e5e76840e9f4bbd7f38f8cebbee2f/coverage-7.6.12-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:66fe626fd7aa5982cdebad23e49e78ef7dbb3e3c2a5960a2b53632f1f703ea45", size = 208893, upload-time = "2025-02-11T14:45:19.881Z" }, - { url = "https://files.pythonhosted.org/packages/47/63/5682bf14d2ce20819998a49c0deadb81e608a59eed64d6bc2191bc8046b9/coverage-7.6.12-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0ef01d70198431719af0b1f5dcbefc557d44a190e749004042927b2a3fed0702", size = 241545, upload-time = "2025-02-11T14:45:22.215Z" }, - { url = "https://files.pythonhosted.org/packages/6a/b6/6b6631f1172d437e11067e1c2edfdb7238b65dff965a12bce3b6d1bf2be2/coverage-7.6.12-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:07e92ae5a289a4bc4c0aae710c0948d3c7892e20fd3588224ebe242039573bf0", size = 239230, upload-time = "2025-02-11T14:45:24.864Z" }, - { url = "https://files.pythonhosted.org/packages/c7/01/9cd06cbb1be53e837e16f1b4309f6357e2dfcbdab0dd7cd3b1a50589e4e1/coverage-7.6.12-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e695df2c58ce526eeab11a2e915448d3eb76f75dffe338ea613c1201b33bab2f", size = 241013, upload-time = "2025-02-11T14:45:27.203Z" }, - { url = "https://files.pythonhosted.org/packages/4b/26/56afefc03c30871326e3d99709a70d327ac1f33da383cba108c79bd71563/coverage-7.6.12-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:d74c08e9aaef995f8c4ef6d202dbd219c318450fe2a76da624f2ebb9c8ec5d9f", size = 239750, upload-time = "2025-02-11T14:45:29.577Z" }, - { url = "https://files.pythonhosted.org/packages/dd/ea/88a1ff951ed288f56aa561558ebe380107cf9132facd0b50bced63ba7238/coverage-7.6.12-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:e995b3b76ccedc27fe4f477b349b7d64597e53a43fc2961db9d3fbace085d69d", size = 238462, upload-time = "2025-02-11T14:45:31.096Z" }, - { url = "https://files.pythonhosted.org/packages/6e/d4/1d9404566f553728889409eff82151d515fbb46dc92cbd13b5337fa0de8c/coverage-7.6.12-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:b1f097878d74fe51e1ddd1be62d8e3682748875b461232cf4b52ddc6e6db0bba", size = 239307, upload-time = "2025-02-11T14:45:32.713Z" }, - { url = "https://files.pythonhosted.org/packages/12/c1/e453d3b794cde1e232ee8ac1d194fde8e2ba329c18bbf1b93f6f5eef606b/coverage-7.6.12-cp311-cp311-win32.whl", hash = "sha256:1f7ffa05da41754e20512202c866d0ebfc440bba3b0ed15133070e20bf5aeb5f", size = 211117, upload-time = "2025-02-11T14:45:34.228Z" }, - { url = "https://files.pythonhosted.org/packages/d5/db/829185120c1686fa297294f8fcd23e0422f71070bf85ef1cc1a72ecb2930/coverage-7.6.12-cp311-cp311-win_amd64.whl", hash = "sha256:e216c5c45f89ef8971373fd1c5d8d1164b81f7f5f06bbf23c37e7908d19e8558", size = 212019, upload-time = "2025-02-11T14:45:35.724Z" }, - { url = "https://files.pythonhosted.org/packages/e2/7f/4af2ed1d06ce6bee7eafc03b2ef748b14132b0bdae04388e451e4b2c529b/coverage-7.6.12-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:b172f8e030e8ef247b3104902cc671e20df80163b60a203653150d2fc204d1ad", size = 208645, upload-time = "2025-02-11T14:45:37.95Z" }, - { url = "https://files.pythonhosted.org/packages/dc/60/d19df912989117caa95123524d26fc973f56dc14aecdec5ccd7d0084e131/coverage-7.6.12-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:641dfe0ab73deb7069fb972d4d9725bf11c239c309ce694dd50b1473c0f641c3", size = 208898, upload-time = "2025-02-11T14:45:40.27Z" }, - { url = "https://files.pythonhosted.org/packages/bd/10/fecabcf438ba676f706bf90186ccf6ff9f6158cc494286965c76e58742fa/coverage-7.6.12-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0e549f54ac5f301e8e04c569dfdb907f7be71b06b88b5063ce9d6953d2d58574", size = 242987, upload-time = "2025-02-11T14:45:43.982Z" }, - { url = "https://files.pythonhosted.org/packages/4c/53/4e208440389e8ea936f5f2b0762dcd4cb03281a7722def8e2bf9dc9c3d68/coverage-7.6.12-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:959244a17184515f8c52dcb65fb662808767c0bd233c1d8a166e7cf74c9ea985", size = 239881, upload-time = "2025-02-11T14:45:45.537Z" }, - { url = "https://files.pythonhosted.org/packages/c4/47/2ba744af8d2f0caa1f17e7746147e34dfc5f811fb65fc153153722d58835/coverage-7.6.12-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bda1c5f347550c359f841d6614fb8ca42ae5cb0b74d39f8a1e204815ebe25750", size = 242142, upload-time = "2025-02-11T14:45:47.069Z" }, - { url = "https://files.pythonhosted.org/packages/e9/90/df726af8ee74d92ee7e3bf113bf101ea4315d71508952bd21abc3fae471e/coverage-7.6.12-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:1ceeb90c3eda1f2d8c4c578c14167dbd8c674ecd7d38e45647543f19839dd6ea", size = 241437, upload-time = "2025-02-11T14:45:48.602Z" }, - { url = "https://files.pythonhosted.org/packages/f6/af/995263fd04ae5f9cf12521150295bf03b6ba940d0aea97953bb4a6db3e2b/coverage-7.6.12-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:0f16f44025c06792e0fb09571ae454bcc7a3ec75eeb3c36b025eccf501b1a4c3", size = 239724, upload-time = "2025-02-11T14:45:51.333Z" }, - { url = "https://files.pythonhosted.org/packages/1c/8e/5bb04f0318805e190984c6ce106b4c3968a9562a400180e549855d8211bd/coverage-7.6.12-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:b076e625396e787448d27a411aefff867db2bffac8ed04e8f7056b07024eed5a", size = 241329, upload-time = "2025-02-11T14:45:53.19Z" }, - { url = "https://files.pythonhosted.org/packages/9e/9d/fa04d9e6c3f6459f4e0b231925277cfc33d72dfab7fa19c312c03e59da99/coverage-7.6.12-cp312-cp312-win32.whl", hash = "sha256:00b2086892cf06c7c2d74983c9595dc511acca00665480b3ddff749ec4fb2a95", size = 211289, upload-time = "2025-02-11T14:45:54.74Z" }, - { url = "https://files.pythonhosted.org/packages/53/40/53c7ffe3c0c3fff4d708bc99e65f3d78c129110d6629736faf2dbd60ad57/coverage-7.6.12-cp312-cp312-win_amd64.whl", hash = "sha256:7ae6eabf519bc7871ce117fb18bf14e0e343eeb96c377667e3e5dd12095e0288", size = 212079, upload-time = "2025-02-11T14:45:57.22Z" }, - { url = "https://files.pythonhosted.org/packages/76/89/1adf3e634753c0de3dad2f02aac1e73dba58bc5a3a914ac94a25b2ef418f/coverage-7.6.12-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:488c27b3db0ebee97a830e6b5a3ea930c4a6e2c07f27a5e67e1b3532e76b9ef1", size = 208673, upload-time = "2025-02-11T14:45:59.618Z" }, - { url = "https://files.pythonhosted.org/packages/ce/64/92a4e239d64d798535c5b45baac6b891c205a8a2e7c9cc8590ad386693dc/coverage-7.6.12-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:5d1095bbee1851269f79fd8e0c9b5544e4c00c0c24965e66d8cba2eb5bb535fd", size = 208945, upload-time = "2025-02-11T14:46:01.869Z" }, - { url = "https://files.pythonhosted.org/packages/b4/d0/4596a3ef3bca20a94539c9b1e10fd250225d1dec57ea78b0867a1cf9742e/coverage-7.6.12-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0533adc29adf6a69c1baa88c3d7dbcaadcffa21afbed3ca7a225a440e4744bf9", size = 242484, upload-time = "2025-02-11T14:46:03.527Z" }, - { url = "https://files.pythonhosted.org/packages/1c/ef/6fd0d344695af6718a38d0861408af48a709327335486a7ad7e85936dc6e/coverage-7.6.12-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:53c56358d470fa507a2b6e67a68fd002364d23c83741dbc4c2e0680d80ca227e", size = 239525, upload-time = "2025-02-11T14:46:05.973Z" }, - { url = "https://files.pythonhosted.org/packages/0c/4b/373be2be7dd42f2bcd6964059fd8fa307d265a29d2b9bcf1d044bcc156ed/coverage-7.6.12-cp313-cp313-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:64cbb1a3027c79ca6310bf101014614f6e6e18c226474606cf725238cf5bc2d4", size = 241545, upload-time = "2025-02-11T14:46:07.79Z" }, - { url = "https://files.pythonhosted.org/packages/a6/7d/0e83cc2673a7790650851ee92f72a343827ecaaea07960587c8f442b5cd3/coverage-7.6.12-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:79cac3390bfa9836bb795be377395f28410811c9066bc4eefd8015258a7578c6", size = 241179, upload-time = "2025-02-11T14:46:11.853Z" }, - { url = "https://files.pythonhosted.org/packages/ff/8c/566ea92ce2bb7627b0900124e24a99f9244b6c8c92d09ff9f7633eb7c3c8/coverage-7.6.12-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:9b148068e881faa26d878ff63e79650e208e95cf1c22bd3f77c3ca7b1d9821a3", size = 239288, upload-time = "2025-02-11T14:46:13.411Z" }, - { url = "https://files.pythonhosted.org/packages/7d/e4/869a138e50b622f796782d642c15fb5f25a5870c6d0059a663667a201638/coverage-7.6.12-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:8bec2ac5da793c2685ce5319ca9bcf4eee683b8a1679051f8e6ec04c4f2fd7dc", size = 241032, upload-time = "2025-02-11T14:46:15.005Z" }, - { url = "https://files.pythonhosted.org/packages/ae/28/a52ff5d62a9f9e9fe9c4f17759b98632edd3a3489fce70154c7d66054dd3/coverage-7.6.12-cp313-cp313-win32.whl", hash = "sha256:200e10beb6ddd7c3ded322a4186313d5ca9e63e33d8fab4faa67ef46d3460af3", size = 211315, upload-time = "2025-02-11T14:46:16.638Z" }, - { url = "https://files.pythonhosted.org/packages/bc/17/ab849b7429a639f9722fa5628364c28d675c7ff37ebc3268fe9840dda13c/coverage-7.6.12-cp313-cp313-win_amd64.whl", hash = "sha256:2b996819ced9f7dbb812c701485d58f261bef08f9b85304d41219b1496b591ef", size = 212099, upload-time = "2025-02-11T14:46:18.268Z" }, - { url = "https://files.pythonhosted.org/packages/d2/1c/b9965bf23e171d98505eb5eb4fb4d05c44efd256f2e0f19ad1ba8c3f54b0/coverage-7.6.12-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:299cf973a7abff87a30609879c10df0b3bfc33d021e1adabc29138a48888841e", size = 209511, upload-time = "2025-02-11T14:46:20.768Z" }, - { url = "https://files.pythonhosted.org/packages/57/b3/119c201d3b692d5e17784fee876a9a78e1b3051327de2709392962877ca8/coverage-7.6.12-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:4b467a8c56974bf06e543e69ad803c6865249d7a5ccf6980457ed2bc50312703", size = 209729, upload-time = "2025-02-11T14:46:22.258Z" }, - { url = "https://files.pythonhosted.org/packages/52/4e/a7feb5a56b266304bc59f872ea07b728e14d5a64f1ad3a2cc01a3259c965/coverage-7.6.12-cp313-cp313t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2458f275944db8129f95d91aee32c828a408481ecde3b30af31d552c2ce284a0", size = 253988, upload-time = "2025-02-11T14:46:23.999Z" }, - { url = "https://files.pythonhosted.org/packages/65/19/069fec4d6908d0dae98126aa7ad08ce5130a6decc8509da7740d36e8e8d2/coverage-7.6.12-cp313-cp313t-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0a9d8be07fb0832636a0f72b80d2a652fe665e80e720301fb22b191c3434d924", size = 249697, upload-time = "2025-02-11T14:46:25.617Z" }, - { url = "https://files.pythonhosted.org/packages/1c/da/5b19f09ba39df7c55f77820736bf17bbe2416bbf5216a3100ac019e15839/coverage-7.6.12-cp313-cp313t-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:14d47376a4f445e9743f6c83291e60adb1b127607a3618e3185bbc8091f0467b", size = 252033, upload-time = "2025-02-11T14:46:28.069Z" }, - { url = "https://files.pythonhosted.org/packages/1e/89/4c2750df7f80a7872267f7c5fe497c69d45f688f7b3afe1297e52e33f791/coverage-7.6.12-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:b95574d06aa9d2bd6e5cc35a5bbe35696342c96760b69dc4287dbd5abd4ad51d", size = 251535, upload-time = "2025-02-11T14:46:29.818Z" }, - { url = "https://files.pythonhosted.org/packages/78/3b/6d3ae3c1cc05f1b0460c51e6f6dcf567598cbd7c6121e5ad06643974703c/coverage-7.6.12-cp313-cp313t-musllinux_1_2_i686.whl", hash = "sha256:ecea0c38c9079570163d663c0433a9af4094a60aafdca491c6a3d248c7432827", size = 249192, upload-time = "2025-02-11T14:46:31.563Z" }, - { url = "https://files.pythonhosted.org/packages/6e/8e/c14a79f535ce41af7d436bbad0d3d90c43d9e38ec409b4770c894031422e/coverage-7.6.12-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:2251fabcfee0a55a8578a9d29cecfee5f2de02f11530e7d5c5a05859aa85aee9", size = 250627, upload-time = "2025-02-11T14:46:33.145Z" }, - { url = "https://files.pythonhosted.org/packages/cb/79/b7cee656cfb17a7f2c1b9c3cee03dd5d8000ca299ad4038ba64b61a9b044/coverage-7.6.12-cp313-cp313t-win32.whl", hash = "sha256:eb5507795caabd9b2ae3f1adc95f67b1104971c22c624bb354232d65c4fc90b3", size = 212033, upload-time = "2025-02-11T14:46:35.79Z" }, - { url = "https://files.pythonhosted.org/packages/b6/c3/f7aaa3813f1fa9a4228175a7bd368199659d392897e184435a3b66408dd3/coverage-7.6.12-cp313-cp313t-win_amd64.whl", hash = "sha256:f60a297c3987c6c02ffb29effc70eadcbb412fe76947d394a1091a3615948e2f", size = 213240, upload-time = "2025-02-11T14:46:38.119Z" }, - { url = "https://files.pythonhosted.org/packages/7a/7f/05818c62c7afe75df11e0233bd670948d68b36cdbf2a339a095bc02624a8/coverage-7.6.12-pp39.pp310-none-any.whl", hash = "sha256:7e39e845c4d764208e7b8f6a21c541ade741e2c41afabdfa1caa28687a3c98cf", size = 200558, upload-time = "2025-02-11T14:47:00.292Z" }, - { url = "https://files.pythonhosted.org/packages/fb/b2/f655700e1024dec98b10ebaafd0cedbc25e40e4abe62a3c8e2ceef4f8f0a/coverage-7.6.12-py3-none-any.whl", hash = "sha256:eb8668cfbc279a536c633137deeb9435d2962caec279c3f8cf8b91fff6ff8953", size = 200552, upload-time = "2025-02-11T14:47:01.999Z" }, +version = "7.10.7" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/51/26/d22c300112504f5f9a9fd2297ce33c35f3d353e4aeb987c8419453b2a7c2/coverage-7.10.7.tar.gz", hash = "sha256:f4ab143ab113be368a3e9b795f9cd7906c5ef407d6173fe9675a902e1fffc239", size = 827704, upload-time = "2025-09-21T20:03:56.815Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/e5/6c/3a3f7a46888e69d18abe3ccc6fe4cb16cccb1e6a2f99698931dafca489e6/coverage-7.10.7-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:fc04cc7a3db33664e0c2d10eb8990ff6b3536f6842c9590ae8da4c614b9ed05a", size = 217987, upload-time = "2025-09-21T20:00:57.218Z" }, + { url = "https://files.pythonhosted.org/packages/03/94/952d30f180b1a916c11a56f5c22d3535e943aa22430e9e3322447e520e1c/coverage-7.10.7-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:e201e015644e207139f7e2351980feb7040e6f4b2c2978892f3e3789d1c125e5", size = 218388, upload-time = "2025-09-21T20:01:00.081Z" }, + { url = "https://files.pythonhosted.org/packages/50/2b/9e0cf8ded1e114bcd8b2fd42792b57f1c4e9e4ea1824cde2af93a67305be/coverage-7.10.7-cp310-cp310-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:240af60539987ced2c399809bd34f7c78e8abe0736af91c3d7d0e795df633d17", size = 245148, upload-time = "2025-09-21T20:01:01.768Z" }, + { url = "https://files.pythonhosted.org/packages/19/20/d0384ac06a6f908783d9b6aa6135e41b093971499ec488e47279f5b846e6/coverage-7.10.7-cp310-cp310-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:8421e088bc051361b01c4b3a50fd39a4b9133079a2229978d9d30511fd05231b", size = 246958, upload-time = "2025-09-21T20:01:03.355Z" }, + { url = "https://files.pythonhosted.org/packages/60/83/5c283cff3d41285f8eab897651585db908a909c572bdc014bcfaf8a8b6ae/coverage-7.10.7-cp310-cp310-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6be8ed3039ae7f7ac5ce058c308484787c86e8437e72b30bf5e88b8ea10f3c87", size = 248819, upload-time = "2025-09-21T20:01:04.968Z" }, + { url = "https://files.pythonhosted.org/packages/60/22/02eb98fdc5ff79f423e990d877693e5310ae1eab6cb20ae0b0b9ac45b23b/coverage-7.10.7-cp310-cp310-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:e28299d9f2e889e6d51b1f043f58d5f997c373cc12e6403b90df95b8b047c13e", size = 245754, upload-time = "2025-09-21T20:01:06.321Z" }, + { url = "https://files.pythonhosted.org/packages/b4/bc/25c83bcf3ad141b32cd7dc45485ef3c01a776ca3aa8ef0a93e77e8b5bc43/coverage-7.10.7-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:c4e16bd7761c5e454f4efd36f345286d6f7c5fa111623c355691e2755cae3b9e", size = 246860, upload-time = "2025-09-21T20:01:07.605Z" }, + { url = "https://files.pythonhosted.org/packages/3c/b7/95574702888b58c0928a6e982038c596f9c34d52c5e5107f1eef729399b5/coverage-7.10.7-cp310-cp310-musllinux_1_2_i686.whl", hash = "sha256:b1c81d0e5e160651879755c9c675b974276f135558cf4ba79fee7b8413a515df", size = 244877, upload-time = "2025-09-21T20:01:08.829Z" }, + { url = "https://files.pythonhosted.org/packages/47/b6/40095c185f235e085df0e0b158f6bd68cc6e1d80ba6c7721dc81d97ec318/coverage-7.10.7-cp310-cp310-musllinux_1_2_riscv64.whl", hash = "sha256:606cc265adc9aaedcc84f1f064f0e8736bc45814f15a357e30fca7ecc01504e0", size = 245108, upload-time = "2025-09-21T20:01:10.527Z" }, + { url = "https://files.pythonhosted.org/packages/c8/50/4aea0556da7a4b93ec9168420d170b55e2eb50ae21b25062513d020c6861/coverage-7.10.7-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:10b24412692df990dbc34f8fb1b6b13d236ace9dfdd68df5b28c2e39cafbba13", size = 245752, upload-time = "2025-09-21T20:01:11.857Z" }, + { url = "https://files.pythonhosted.org/packages/6a/28/ea1a84a60828177ae3b100cb6723838523369a44ec5742313ed7db3da160/coverage-7.10.7-cp310-cp310-win32.whl", hash = "sha256:b51dcd060f18c19290d9b8a9dd1e0181538df2ce0717f562fff6cf74d9fc0b5b", size = 220497, upload-time = "2025-09-21T20:01:13.459Z" }, + { url = "https://files.pythonhosted.org/packages/fc/1a/a81d46bbeb3c3fd97b9602ebaa411e076219a150489bcc2c025f151bd52d/coverage-7.10.7-cp310-cp310-win_amd64.whl", hash = "sha256:3a622ac801b17198020f09af3eaf45666b344a0d69fc2a6ffe2ea83aeef1d807", size = 221392, upload-time = "2025-09-21T20:01:14.722Z" }, + { url = "https://files.pythonhosted.org/packages/d2/5d/c1a17867b0456f2e9ce2d8d4708a4c3a089947d0bec9c66cdf60c9e7739f/coverage-7.10.7-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:a609f9c93113be646f44c2a0256d6ea375ad047005d7f57a5c15f614dc1b2f59", size = 218102, upload-time = "2025-09-21T20:01:16.089Z" }, + { url = "https://files.pythonhosted.org/packages/54/f0/514dcf4b4e3698b9a9077f084429681bf3aad2b4a72578f89d7f643eb506/coverage-7.10.7-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:65646bb0359386e07639c367a22cf9b5bf6304e8630b565d0626e2bdf329227a", size = 218505, upload-time = "2025-09-21T20:01:17.788Z" }, + { url = "https://files.pythonhosted.org/packages/20/f6/9626b81d17e2a4b25c63ac1b425ff307ecdeef03d67c9a147673ae40dc36/coverage-7.10.7-cp311-cp311-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:5f33166f0dfcce728191f520bd2692914ec70fac2713f6bf3ce59c3deacb4699", size = 248898, upload-time = "2025-09-21T20:01:19.488Z" }, + { url = "https://files.pythonhosted.org/packages/b0/ef/bd8e719c2f7417ba03239052e099b76ea1130ac0cbb183ee1fcaa58aaff3/coverage-7.10.7-cp311-cp311-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:35f5e3f9e455bb17831876048355dca0f758b6df22f49258cb5a91da23ef437d", size = 250831, upload-time = "2025-09-21T20:01:20.817Z" }, + { url = "https://files.pythonhosted.org/packages/a5/b6/bf054de41ec948b151ae2b79a55c107f5760979538f5fb80c195f2517718/coverage-7.10.7-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:4da86b6d62a496e908ac2898243920c7992499c1712ff7c2b6d837cc69d9467e", size = 252937, upload-time = "2025-09-21T20:01:22.171Z" }, + { url = "https://files.pythonhosted.org/packages/0f/e5/3860756aa6f9318227443c6ce4ed7bf9e70bb7f1447a0353f45ac5c7974b/coverage-7.10.7-cp311-cp311-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:6b8b09c1fad947c84bbbc95eca841350fad9cbfa5a2d7ca88ac9f8d836c92e23", size = 249021, upload-time = "2025-09-21T20:01:23.907Z" }, + { url = "https://files.pythonhosted.org/packages/26/0f/bd08bd042854f7fd07b45808927ebcce99a7ed0f2f412d11629883517ac2/coverage-7.10.7-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:4376538f36b533b46f8971d3a3e63464f2c7905c9800db97361c43a2b14792ab", size = 250626, upload-time = "2025-09-21T20:01:25.721Z" }, + { url = "https://files.pythonhosted.org/packages/8e/a7/4777b14de4abcc2e80c6b1d430f5d51eb18ed1d75fca56cbce5f2db9b36e/coverage-7.10.7-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:121da30abb574f6ce6ae09840dae322bef734480ceafe410117627aa54f76d82", size = 248682, upload-time = "2025-09-21T20:01:27.105Z" }, + { url = "https://files.pythonhosted.org/packages/34/72/17d082b00b53cd45679bad682fac058b87f011fd8b9fe31d77f5f8d3a4e4/coverage-7.10.7-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:88127d40df529336a9836870436fc2751c339fbaed3a836d42c93f3e4bd1d0a2", size = 248402, upload-time = "2025-09-21T20:01:28.629Z" }, + { url = "https://files.pythonhosted.org/packages/81/7a/92367572eb5bdd6a84bfa278cc7e97db192f9f45b28c94a9ca1a921c3577/coverage-7.10.7-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:ba58bbcd1b72f136080c0bccc2400d66cc6115f3f906c499013d065ac33a4b61", size = 249320, upload-time = "2025-09-21T20:01:30.004Z" }, + { url = "https://files.pythonhosted.org/packages/2f/88/a23cc185f6a805dfc4fdf14a94016835eeb85e22ac3a0e66d5e89acd6462/coverage-7.10.7-cp311-cp311-win32.whl", hash = "sha256:972b9e3a4094b053a4e46832b4bc829fc8a8d347160eb39d03f1690316a99c14", size = 220536, upload-time = "2025-09-21T20:01:32.184Z" }, + { url = "https://files.pythonhosted.org/packages/fe/ef/0b510a399dfca17cec7bc2f05ad8bd78cf55f15c8bc9a73ab20c5c913c2e/coverage-7.10.7-cp311-cp311-win_amd64.whl", hash = "sha256:a7b55a944a7f43892e28ad4bc0561dfd5f0d73e605d1aa5c3c976b52aea121d2", size = 221425, upload-time = "2025-09-21T20:01:33.557Z" }, + { url = "https://files.pythonhosted.org/packages/51/7f/023657f301a276e4ba1850f82749bc136f5a7e8768060c2e5d9744a22951/coverage-7.10.7-cp311-cp311-win_arm64.whl", hash = "sha256:736f227fb490f03c6488f9b6d45855f8e0fd749c007f9303ad30efab0e73c05a", size = 220103, upload-time = "2025-09-21T20:01:34.929Z" }, + { url = "https://files.pythonhosted.org/packages/13/e4/eb12450f71b542a53972d19117ea5a5cea1cab3ac9e31b0b5d498df1bd5a/coverage-7.10.7-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:7bb3b9ddb87ef7725056572368040c32775036472d5a033679d1fa6c8dc08417", size = 218290, upload-time = "2025-09-21T20:01:36.455Z" }, + { url = "https://files.pythonhosted.org/packages/37/66/593f9be12fc19fb36711f19a5371af79a718537204d16ea1d36f16bd78d2/coverage-7.10.7-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:18afb24843cbc175687225cab1138c95d262337f5473512010e46831aa0c2973", size = 218515, upload-time = "2025-09-21T20:01:37.982Z" }, + { url = "https://files.pythonhosted.org/packages/66/80/4c49f7ae09cafdacc73fbc30949ffe77359635c168f4e9ff33c9ebb07838/coverage-7.10.7-cp312-cp312-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:399a0b6347bcd3822be369392932884b8216d0944049ae22925631a9b3d4ba4c", size = 250020, upload-time = "2025-09-21T20:01:39.617Z" }, + { url = "https://files.pythonhosted.org/packages/a6/90/a64aaacab3b37a17aaedd83e8000142561a29eb262cede42d94a67f7556b/coverage-7.10.7-cp312-cp312-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:314f2c326ded3f4b09be11bc282eb2fc861184bc95748ae67b360ac962770be7", size = 252769, upload-time = "2025-09-21T20:01:41.341Z" }, + { url = "https://files.pythonhosted.org/packages/98/2e/2dda59afd6103b342e096f246ebc5f87a3363b5412609946c120f4e7750d/coverage-7.10.7-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:c41e71c9cfb854789dee6fc51e46743a6d138b1803fab6cb860af43265b42ea6", size = 253901, upload-time = "2025-09-21T20:01:43.042Z" }, + { url = "https://files.pythonhosted.org/packages/53/dc/8d8119c9051d50f3119bb4a75f29f1e4a6ab9415cd1fa8bf22fcc3fb3b5f/coverage-7.10.7-cp312-cp312-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:bc01f57ca26269c2c706e838f6422e2a8788e41b3e3c65e2f41148212e57cd59", size = 250413, upload-time = "2025-09-21T20:01:44.469Z" }, + { url = "https://files.pythonhosted.org/packages/98/b3/edaff9c5d79ee4d4b6d3fe046f2b1d799850425695b789d491a64225d493/coverage-7.10.7-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:a6442c59a8ac8b85812ce33bc4d05bde3fb22321fa8294e2a5b487c3505f611b", size = 251820, upload-time = "2025-09-21T20:01:45.915Z" }, + { url = "https://files.pythonhosted.org/packages/11/25/9a0728564bb05863f7e513e5a594fe5ffef091b325437f5430e8cfb0d530/coverage-7.10.7-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:78a384e49f46b80fb4c901d52d92abe098e78768ed829c673fbb53c498bef73a", size = 249941, upload-time = "2025-09-21T20:01:47.296Z" }, + { url = "https://files.pythonhosted.org/packages/e0/fd/ca2650443bfbef5b0e74373aac4df67b08180d2f184b482c41499668e258/coverage-7.10.7-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:5e1e9802121405ede4b0133aa4340ad8186a1d2526de5b7c3eca519db7bb89fb", size = 249519, upload-time = "2025-09-21T20:01:48.73Z" }, + { url = "https://files.pythonhosted.org/packages/24/79/f692f125fb4299b6f963b0745124998ebb8e73ecdfce4ceceb06a8c6bec5/coverage-7.10.7-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:d41213ea25a86f69efd1575073d34ea11aabe075604ddf3d148ecfec9e1e96a1", size = 251375, upload-time = "2025-09-21T20:01:50.529Z" }, + { url = "https://files.pythonhosted.org/packages/5e/75/61b9bbd6c7d24d896bfeec57acba78e0f8deac68e6baf2d4804f7aae1f88/coverage-7.10.7-cp312-cp312-win32.whl", hash = "sha256:77eb4c747061a6af8d0f7bdb31f1e108d172762ef579166ec84542f711d90256", size = 220699, upload-time = "2025-09-21T20:01:51.941Z" }, + { url = "https://files.pythonhosted.org/packages/ca/f3/3bf7905288b45b075918d372498f1cf845b5b579b723c8fd17168018d5f5/coverage-7.10.7-cp312-cp312-win_amd64.whl", hash = "sha256:f51328ffe987aecf6d09f3cd9d979face89a617eacdaea43e7b3080777f647ba", size = 221512, upload-time = "2025-09-21T20:01:53.481Z" }, + { url = "https://files.pythonhosted.org/packages/5c/44/3e32dbe933979d05cf2dac5e697c8599cfe038aaf51223ab901e208d5a62/coverage-7.10.7-cp312-cp312-win_arm64.whl", hash = "sha256:bda5e34f8a75721c96085903c6f2197dc398c20ffd98df33f866a9c8fd95f4bf", size = 220147, upload-time = "2025-09-21T20:01:55.2Z" }, + { url = "https://files.pythonhosted.org/packages/9a/94/b765c1abcb613d103b64fcf10395f54d69b0ef8be6a0dd9c524384892cc7/coverage-7.10.7-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:981a651f543f2854abd3b5fcb3263aac581b18209be49863ba575de6edf4c14d", size = 218320, upload-time = "2025-09-21T20:01:56.629Z" }, + { url = "https://files.pythonhosted.org/packages/72/4f/732fff31c119bb73b35236dd333030f32c4bfe909f445b423e6c7594f9a2/coverage-7.10.7-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:73ab1601f84dc804f7812dc297e93cd99381162da39c47040a827d4e8dafe63b", size = 218575, upload-time = "2025-09-21T20:01:58.203Z" }, + { url = "https://files.pythonhosted.org/packages/87/02/ae7e0af4b674be47566707777db1aa375474f02a1d64b9323e5813a6cdd5/coverage-7.10.7-cp313-cp313-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:a8b6f03672aa6734e700bbcd65ff050fd19cddfec4b031cc8cf1c6967de5a68e", size = 249568, upload-time = "2025-09-21T20:01:59.748Z" }, + { url = "https://files.pythonhosted.org/packages/a2/77/8c6d22bf61921a59bce5471c2f1f7ac30cd4ac50aadde72b8c48d5727902/coverage-7.10.7-cp313-cp313-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:10b6ba00ab1132a0ce4428ff68cf50a25efd6840a42cdf4239c9b99aad83be8b", size = 252174, upload-time = "2025-09-21T20:02:01.192Z" }, + { url = "https://files.pythonhosted.org/packages/b1/20/b6ea4f69bbb52dac0aebd62157ba6a9dddbfe664f5af8122dac296c3ee15/coverage-7.10.7-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:c79124f70465a150e89340de5963f936ee97097d2ef76c869708c4248c63ca49", size = 253447, upload-time = "2025-09-21T20:02:02.701Z" }, + { url = "https://files.pythonhosted.org/packages/f9/28/4831523ba483a7f90f7b259d2018fef02cb4d5b90bc7c1505d6e5a84883c/coverage-7.10.7-cp313-cp313-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:69212fbccdbd5b0e39eac4067e20a4a5256609e209547d86f740d68ad4f04911", size = 249779, upload-time = "2025-09-21T20:02:04.185Z" }, + { url = "https://files.pythonhosted.org/packages/a7/9f/4331142bc98c10ca6436d2d620c3e165f31e6c58d43479985afce6f3191c/coverage-7.10.7-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:7ea7c6c9d0d286d04ed3541747e6597cbe4971f22648b68248f7ddcd329207f0", size = 251604, upload-time = "2025-09-21T20:02:06.034Z" }, + { url = "https://files.pythonhosted.org/packages/ce/60/bda83b96602036b77ecf34e6393a3836365481b69f7ed7079ab85048202b/coverage-7.10.7-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:b9be91986841a75042b3e3243d0b3cb0b2434252b977baaf0cd56e960fe1e46f", size = 249497, upload-time = "2025-09-21T20:02:07.619Z" }, + { url = "https://files.pythonhosted.org/packages/5f/af/152633ff35b2af63977edd835d8e6430f0caef27d171edf2fc76c270ef31/coverage-7.10.7-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:b281d5eca50189325cfe1f365fafade89b14b4a78d9b40b05ddd1fc7d2a10a9c", size = 249350, upload-time = "2025-09-21T20:02:10.34Z" }, + { url = "https://files.pythonhosted.org/packages/9d/71/d92105d122bd21cebba877228990e1646d862e34a98bb3374d3fece5a794/coverage-7.10.7-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:99e4aa63097ab1118e75a848a28e40d68b08a5e19ce587891ab7fd04475e780f", size = 251111, upload-time = "2025-09-21T20:02:12.122Z" }, + { url = "https://files.pythonhosted.org/packages/a2/9e/9fdb08f4bf476c912f0c3ca292e019aab6712c93c9344a1653986c3fd305/coverage-7.10.7-cp313-cp313-win32.whl", hash = "sha256:dc7c389dce432500273eaf48f410b37886be9208b2dd5710aaf7c57fd442c698", size = 220746, upload-time = "2025-09-21T20:02:13.919Z" }, + { url = "https://files.pythonhosted.org/packages/b1/b1/a75fd25df44eab52d1931e89980d1ada46824c7a3210be0d3c88a44aaa99/coverage-7.10.7-cp313-cp313-win_amd64.whl", hash = "sha256:cac0fdca17b036af3881a9d2729a850b76553f3f716ccb0360ad4dbc06b3b843", size = 221541, upload-time = "2025-09-21T20:02:15.57Z" }, + { url = "https://files.pythonhosted.org/packages/14/3a/d720d7c989562a6e9a14b2c9f5f2876bdb38e9367126d118495b89c99c37/coverage-7.10.7-cp313-cp313-win_arm64.whl", hash = "sha256:4b6f236edf6e2f9ae8fcd1332da4e791c1b6ba0dc16a2dc94590ceccb482e546", size = 220170, upload-time = "2025-09-21T20:02:17.395Z" }, + { url = "https://files.pythonhosted.org/packages/bb/22/e04514bf2a735d8b0add31d2b4ab636fc02370730787c576bb995390d2d5/coverage-7.10.7-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:a0ec07fd264d0745ee396b666d47cef20875f4ff2375d7c4f58235886cc1ef0c", size = 219029, upload-time = "2025-09-21T20:02:18.936Z" }, + { url = "https://files.pythonhosted.org/packages/11/0b/91128e099035ece15da3445d9015e4b4153a6059403452d324cbb0a575fa/coverage-7.10.7-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:dd5e856ebb7bfb7672b0086846db5afb4567a7b9714b8a0ebafd211ec7ce6a15", size = 219259, upload-time = "2025-09-21T20:02:20.44Z" }, + { url = "https://files.pythonhosted.org/packages/8b/51/66420081e72801536a091a0c8f8c1f88a5c4bf7b9b1bdc6222c7afe6dc9b/coverage-7.10.7-cp313-cp313t-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:f57b2a3c8353d3e04acf75b3fed57ba41f5c0646bbf1d10c7c282291c97936b4", size = 260592, upload-time = "2025-09-21T20:02:22.313Z" }, + { url = "https://files.pythonhosted.org/packages/5d/22/9b8d458c2881b22df3db5bb3e7369e63d527d986decb6c11a591ba2364f7/coverage-7.10.7-cp313-cp313t-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:1ef2319dd15a0b009667301a3f84452a4dc6fddfd06b0c5c53ea472d3989fbf0", size = 262768, upload-time = "2025-09-21T20:02:24.287Z" }, + { url = "https://files.pythonhosted.org/packages/f7/08/16bee2c433e60913c610ea200b276e8eeef084b0d200bdcff69920bd5828/coverage-7.10.7-cp313-cp313t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:83082a57783239717ceb0ad584de3c69cf581b2a95ed6bf81ea66034f00401c0", size = 264995, upload-time = "2025-09-21T20:02:26.133Z" }, + { url = "https://files.pythonhosted.org/packages/20/9d/e53eb9771d154859b084b90201e5221bca7674ba449a17c101a5031d4054/coverage-7.10.7-cp313-cp313t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:50aa94fb1fb9a397eaa19c0d5ec15a5edd03a47bf1a3a6111a16b36e190cff65", size = 259546, upload-time = "2025-09-21T20:02:27.716Z" }, + { url = "https://files.pythonhosted.org/packages/ad/b0/69bc7050f8d4e56a89fb550a1577d5d0d1db2278106f6f626464067b3817/coverage-7.10.7-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:2120043f147bebb41c85b97ac45dd173595ff14f2a584f2963891cbcc3091541", size = 262544, upload-time = "2025-09-21T20:02:29.216Z" }, + { url = "https://files.pythonhosted.org/packages/ef/4b/2514b060dbd1bc0aaf23b852c14bb5818f244c664cb16517feff6bb3a5ab/coverage-7.10.7-cp313-cp313t-musllinux_1_2_i686.whl", hash = "sha256:2fafd773231dd0378fdba66d339f84904a8e57a262f583530f4f156ab83863e6", size = 260308, upload-time = "2025-09-21T20:02:31.226Z" }, + { url = "https://files.pythonhosted.org/packages/54/78/7ba2175007c246d75e496f64c06e94122bdb914790a1285d627a918bd271/coverage-7.10.7-cp313-cp313t-musllinux_1_2_riscv64.whl", hash = "sha256:0b944ee8459f515f28b851728ad224fa2d068f1513ef6b7ff1efafeb2185f999", size = 258920, upload-time = "2025-09-21T20:02:32.823Z" }, + { url = "https://files.pythonhosted.org/packages/c0/b3/fac9f7abbc841409b9a410309d73bfa6cfb2e51c3fada738cb607ce174f8/coverage-7.10.7-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:4b583b97ab2e3efe1b3e75248a9b333bd3f8b0b1b8e5b45578e05e5850dfb2c2", size = 261434, upload-time = "2025-09-21T20:02:34.86Z" }, + { url = "https://files.pythonhosted.org/packages/ee/51/a03bec00d37faaa891b3ff7387192cef20f01604e5283a5fabc95346befa/coverage-7.10.7-cp313-cp313t-win32.whl", hash = "sha256:2a78cd46550081a7909b3329e2266204d584866e8d97b898cd7fb5ac8d888b1a", size = 221403, upload-time = "2025-09-21T20:02:37.034Z" }, + { url = "https://files.pythonhosted.org/packages/53/22/3cf25d614e64bf6d8e59c7c669b20d6d940bb337bdee5900b9ca41c820bb/coverage-7.10.7-cp313-cp313t-win_amd64.whl", hash = "sha256:33a5e6396ab684cb43dc7befa386258acb2d7fae7f67330ebb85ba4ea27938eb", size = 222469, upload-time = "2025-09-21T20:02:39.011Z" }, + { url = "https://files.pythonhosted.org/packages/49/a1/00164f6d30d8a01c3c9c48418a7a5be394de5349b421b9ee019f380df2a0/coverage-7.10.7-cp313-cp313t-win_arm64.whl", hash = "sha256:86b0e7308289ddde73d863b7683f596d8d21c7d8664ce1dee061d0bcf3fbb4bb", size = 220731, upload-time = "2025-09-21T20:02:40.939Z" }, + { url = "https://files.pythonhosted.org/packages/23/9c/5844ab4ca6a4dd97a1850e030a15ec7d292b5c5cb93082979225126e35dd/coverage-7.10.7-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:b06f260b16ead11643a5a9f955bd4b5fd76c1a4c6796aeade8520095b75de520", size = 218302, upload-time = "2025-09-21T20:02:42.527Z" }, + { url = "https://files.pythonhosted.org/packages/f0/89/673f6514b0961d1f0e20ddc242e9342f6da21eaba3489901b565c0689f34/coverage-7.10.7-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:212f8f2e0612778f09c55dd4872cb1f64a1f2b074393d139278ce902064d5b32", size = 218578, upload-time = "2025-09-21T20:02:44.468Z" }, + { url = "https://files.pythonhosted.org/packages/05/e8/261cae479e85232828fb17ad536765c88dd818c8470aca690b0ac6feeaa3/coverage-7.10.7-cp314-cp314-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:3445258bcded7d4aa630ab8296dea4d3f15a255588dd535f980c193ab6b95f3f", size = 249629, upload-time = "2025-09-21T20:02:46.503Z" }, + { url = "https://files.pythonhosted.org/packages/82/62/14ed6546d0207e6eda876434e3e8475a3e9adbe32110ce896c9e0c06bb9a/coverage-7.10.7-cp314-cp314-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:bb45474711ba385c46a0bfe696c695a929ae69ac636cda8f532be9e8c93d720a", size = 252162, upload-time = "2025-09-21T20:02:48.689Z" }, + { url = "https://files.pythonhosted.org/packages/ff/49/07f00db9ac6478e4358165a08fb41b469a1b053212e8a00cb02f0d27a05f/coverage-7.10.7-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:813922f35bd800dca9994c5971883cbc0d291128a5de6b167c7aa697fcf59360", size = 253517, upload-time = "2025-09-21T20:02:50.31Z" }, + { url = "https://files.pythonhosted.org/packages/a2/59/c5201c62dbf165dfbc91460f6dbbaa85a8b82cfa6131ac45d6c1bfb52deb/coverage-7.10.7-cp314-cp314-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:93c1b03552081b2a4423091d6fb3787265b8f86af404cff98d1b5342713bdd69", size = 249632, upload-time = "2025-09-21T20:02:51.971Z" }, + { url = "https://files.pythonhosted.org/packages/07/ae/5920097195291a51fb00b3a70b9bbd2edbfe3c84876a1762bd1ef1565ebc/coverage-7.10.7-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:cc87dd1b6eaf0b848eebb1c86469b9f72a1891cb42ac7adcfbce75eadb13dd14", size = 251520, upload-time = "2025-09-21T20:02:53.858Z" }, + { url = "https://files.pythonhosted.org/packages/b9/3c/a815dde77a2981f5743a60b63df31cb322c944843e57dbd579326625a413/coverage-7.10.7-cp314-cp314-musllinux_1_2_i686.whl", hash = "sha256:39508ffda4f343c35f3236fe8d1a6634a51f4581226a1262769d7f970e73bffe", size = 249455, upload-time = "2025-09-21T20:02:55.807Z" }, + { url = "https://files.pythonhosted.org/packages/aa/99/f5cdd8421ea656abefb6c0ce92556709db2265c41e8f9fc6c8ae0f7824c9/coverage-7.10.7-cp314-cp314-musllinux_1_2_riscv64.whl", hash = "sha256:925a1edf3d810537c5a3abe78ec5530160c5f9a26b1f4270b40e62cc79304a1e", size = 249287, upload-time = "2025-09-21T20:02:57.784Z" }, + { url = "https://files.pythonhosted.org/packages/c3/7a/e9a2da6a1fc5d007dd51fca083a663ab930a8c4d149c087732a5dbaa0029/coverage-7.10.7-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:2c8b9a0636f94c43cd3576811e05b89aa9bc2d0a85137affc544ae5cb0e4bfbd", size = 250946, upload-time = "2025-09-21T20:02:59.431Z" }, + { url = "https://files.pythonhosted.org/packages/ef/5b/0b5799aa30380a949005a353715095d6d1da81927d6dbed5def2200a4e25/coverage-7.10.7-cp314-cp314-win32.whl", hash = "sha256:b7b8288eb7cdd268b0304632da8cb0bb93fadcfec2fe5712f7b9cc8f4d487be2", size = 221009, upload-time = "2025-09-21T20:03:01.324Z" }, + { url = "https://files.pythonhosted.org/packages/da/b0/e802fbb6eb746de006490abc9bb554b708918b6774b722bb3a0e6aa1b7de/coverage-7.10.7-cp314-cp314-win_amd64.whl", hash = "sha256:1ca6db7c8807fb9e755d0379ccc39017ce0a84dcd26d14b5a03b78563776f681", size = 221804, upload-time = "2025-09-21T20:03:03.4Z" }, + { url = "https://files.pythonhosted.org/packages/9e/e8/71d0c8e374e31f39e3389bb0bd19e527d46f00ea8571ec7ec8fd261d8b44/coverage-7.10.7-cp314-cp314-win_arm64.whl", hash = "sha256:097c1591f5af4496226d5783d036bf6fd6cd0cbc132e071b33861de756efb880", size = 220384, upload-time = "2025-09-21T20:03:05.111Z" }, + { url = "https://files.pythonhosted.org/packages/62/09/9a5608d319fa3eba7a2019addeacb8c746fb50872b57a724c9f79f146969/coverage-7.10.7-cp314-cp314t-macosx_10_13_x86_64.whl", hash = "sha256:a62c6ef0d50e6de320c270ff91d9dd0a05e7250cac2a800b7784bae474506e63", size = 219047, upload-time = "2025-09-21T20:03:06.795Z" }, + { url = "https://files.pythonhosted.org/packages/f5/6f/f58d46f33db9f2e3647b2d0764704548c184e6f5e014bef528b7f979ef84/coverage-7.10.7-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:9fa6e4dd51fe15d8738708a973470f67a855ca50002294852e9571cdbd9433f2", size = 219266, upload-time = "2025-09-21T20:03:08.495Z" }, + { url = "https://files.pythonhosted.org/packages/74/5c/183ffc817ba68e0b443b8c934c8795553eb0c14573813415bd59941ee165/coverage-7.10.7-cp314-cp314t-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:8fb190658865565c549b6b4706856d6a7b09302c797eb2cf8e7fe9dabb043f0d", size = 260767, upload-time = "2025-09-21T20:03:10.172Z" }, + { url = "https://files.pythonhosted.org/packages/0f/48/71a8abe9c1ad7e97548835e3cc1adbf361e743e9d60310c5f75c9e7bf847/coverage-7.10.7-cp314-cp314t-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:affef7c76a9ef259187ef31599a9260330e0335a3011732c4b9effa01e1cd6e0", size = 262931, upload-time = "2025-09-21T20:03:11.861Z" }, + { url = "https://files.pythonhosted.org/packages/84/fd/193a8fb132acfc0a901f72020e54be5e48021e1575bb327d8ee1097a28fd/coverage-7.10.7-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6e16e07d85ca0cf8bafe5f5d23a0b850064e8e945d5677492b06bbe6f09cc699", size = 265186, upload-time = "2025-09-21T20:03:13.539Z" }, + { url = "https://files.pythonhosted.org/packages/b1/8f/74ecc30607dd95ad50e3034221113ccb1c6d4e8085cc761134782995daae/coverage-7.10.7-cp314-cp314t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:03ffc58aacdf65d2a82bbeb1ffe4d01ead4017a21bfd0454983b88ca73af94b9", size = 259470, upload-time = "2025-09-21T20:03:15.584Z" }, + { url = "https://files.pythonhosted.org/packages/0f/55/79ff53a769f20d71b07023ea115c9167c0bb56f281320520cf64c5298a96/coverage-7.10.7-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:1b4fd784344d4e52647fd7857b2af5b3fbe6c239b0b5fa63e94eb67320770e0f", size = 262626, upload-time = "2025-09-21T20:03:17.673Z" }, + { url = "https://files.pythonhosted.org/packages/88/e2/dac66c140009b61ac3fc13af673a574b00c16efdf04f9b5c740703e953c0/coverage-7.10.7-cp314-cp314t-musllinux_1_2_i686.whl", hash = "sha256:0ebbaddb2c19b71912c6f2518e791aa8b9f054985a0769bdb3a53ebbc765c6a1", size = 260386, upload-time = "2025-09-21T20:03:19.36Z" }, + { url = "https://files.pythonhosted.org/packages/a2/f1/f48f645e3f33bb9ca8a496bc4a9671b52f2f353146233ebd7c1df6160440/coverage-7.10.7-cp314-cp314t-musllinux_1_2_riscv64.whl", hash = "sha256:a2d9a3b260cc1d1dbdb1c582e63ddcf5363426a1a68faa0f5da28d8ee3c722a0", size = 258852, upload-time = "2025-09-21T20:03:21.007Z" }, + { url = "https://files.pythonhosted.org/packages/bb/3b/8442618972c51a7affeead957995cfa8323c0c9bcf8fa5a027421f720ff4/coverage-7.10.7-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:a3cc8638b2480865eaa3926d192e64ce6c51e3d29c849e09d5b4ad95efae5399", size = 261534, upload-time = "2025-09-21T20:03:23.12Z" }, + { url = "https://files.pythonhosted.org/packages/b2/dc/101f3fa3a45146db0cb03f5b4376e24c0aac818309da23e2de0c75295a91/coverage-7.10.7-cp314-cp314t-win32.whl", hash = "sha256:67f8c5cbcd3deb7a60b3345dffc89a961a484ed0af1f6f73de91705cc6e31235", size = 221784, upload-time = "2025-09-21T20:03:24.769Z" }, + { url = "https://files.pythonhosted.org/packages/4c/a1/74c51803fc70a8a40d7346660379e144be772bab4ac7bb6e6b905152345c/coverage-7.10.7-cp314-cp314t-win_amd64.whl", hash = "sha256:e1ed71194ef6dea7ed2d5cb5f7243d4bcd334bfb63e59878519be558078f848d", size = 222905, upload-time = "2025-09-21T20:03:26.93Z" }, + { url = "https://files.pythonhosted.org/packages/12/65/f116a6d2127df30bcafbceef0302d8a64ba87488bf6f73a6d8eebf060873/coverage-7.10.7-cp314-cp314t-win_arm64.whl", hash = "sha256:7fe650342addd8524ca63d77b2362b02345e5f1a093266787d210c70a50b471a", size = 220922, upload-time = "2025-09-21T20:03:28.672Z" }, + { url = "https://files.pythonhosted.org/packages/ec/16/114df1c291c22cac3b0c127a73e0af5c12ed7bbb6558d310429a0ae24023/coverage-7.10.7-py3-none-any.whl", hash = "sha256:f7941f6f2fe6dd6807a1208737b8a0cbcf1cc6d7b07d24998ad2d63590868260", size = 209952, upload-time = "2025-09-21T20:03:53.918Z" }, ] [package.optional-dependencies] @@ -153,27 +202,31 @@ toml = [ [[package]] name = "exceptiongroup" -version = "1.2.2" +version = "1.3.0" source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/09/35/2495c4ac46b980e4ca1f6ad6db102322ef3ad2410b79fdde159a4b0f3b92/exceptiongroup-1.2.2.tar.gz", hash = "sha256:47c2edf7c6738fafb49fd34290706d1a1a2f4d1c6df275526b62cbb4aa5393cc", size = 28883, upload-time = "2024-07-12T22:26:00.161Z" } +dependencies = [ + { name = "typing-extensions", marker = "python_full_version < '3.13'" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/0b/9f/a65090624ecf468cdca03533906e7c69ed7588582240cfe7cc9e770b50eb/exceptiongroup-1.3.0.tar.gz", hash = "sha256:b241f5885f560bc56a59ee63ca4c6a8bfa46ae4ad651af316d4e81817bb9fd88", size = 29749, upload-time = "2025-05-10T17:42:51.123Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/02/cc/b7e31358aac6ed1ef2bb790a9746ac2c69bcb3c8588b41616914eb106eaf/exceptiongroup-1.2.2-py3-none-any.whl", hash = "sha256:3111b9d131c238bec2f8f516e123e14ba243563fb135d3fe885990585aa7795b", size = 16453, upload-time = "2024-07-12T22:25:58.476Z" }, + { url = "https://files.pythonhosted.org/packages/36/f4/c6e662dade71f56cd2f3735141b265c3c79293c109549c1e6933b0651ffc/exceptiongroup-1.3.0-py3-none-any.whl", hash = "sha256:4d111e6e0c13d0644cad6ddaa7ed0261a0b36971f6d23e7ec9b4b9097da78a10", size = 16674, upload-time = "2025-05-10T17:42:49.33Z" }, ] [[package]] name = "flask" -version = "3.1.0" +version = "3.1.2" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "blinker" }, { name = "click" }, { name = "itsdangerous" }, { name = "jinja2" }, + { name = "markupsafe" }, { name = "werkzeug" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/89/50/dff6380f1c7f84135484e176e0cac8690af72fa90e932ad2a0a60e28c69b/flask-3.1.0.tar.gz", hash = "sha256:5f873c5184c897c8d9d1b05df1e3d01b14910ce69607a117bd3277098a5836ac", size = 680824, upload-time = "2024-11-13T18:24:38.127Z" } +sdist = { url = "https://files.pythonhosted.org/packages/dc/6d/cfe3c0fcc5e477df242b98bfe186a4c34357b4847e87ecaef04507332dab/flask-3.1.2.tar.gz", hash = "sha256:bf656c15c80190ed628ad08cdfd3aaa35beb087855e2f494910aa3774cc4fd87", size = 720160, upload-time = "2025-08-19T21:03:21.205Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/af/47/93213ee66ef8fae3b93b3e29206f6b251e65c97bd91d8e1c5596ef15af0a/flask-3.1.0-py3-none-any.whl", hash = "sha256:d667207822eb83f1c4b50949b1623c8fc8d51f2341d65f72e1a1815397551136", size = 102979, upload-time = "2024-11-13T18:24:36.135Z" }, + { url = "https://files.pythonhosted.org/packages/ec/f9/7f9263c5695f4bd0023734af91bedb2ff8209e8de6ead162f35d8dc762fd/flask-3.1.2-py3-none-any.whl", hash = "sha256:ca1d8112ec8a6158cc29ea4858963350011b5c846a414cdb7a954aa9e967d03c", size = 103308, upload-time = "2025-08-19T21:03:19.499Z" }, ] [[package]] @@ -271,7 +324,7 @@ wheels = [ [[package]] name = "gevent" -version = "25.5.1" +version = "25.9.1" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "cffi", marker = "platform_python_implementation == 'CPython' and sys_platform == 'win32'" }, @@ -279,93 +332,97 @@ dependencies = [ { name = "zope-event" }, { name = "zope-interface" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/f1/58/267e8160aea00ab00acd2de97197eecfe307064a376fb5c892870a8a6159/gevent-25.5.1.tar.gz", hash = "sha256:582c948fa9a23188b890d0bc130734a506d039a2e5ad87dae276a456cc683e61", size = 6388207, upload-time = "2025-05-12T12:57:59.833Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/44/a7/438568c37fb255f80e710318bfcad04731b92ce764bc16adee278fdc6b4d/gevent-25.5.1-cp310-cp310-macosx_11_0_universal2.whl", hash = "sha256:8e5a0fab5e245b15ec1005b3666b0a2e867c26f411c8fe66ae1afe07174a30e9", size = 2922800, upload-time = "2025-05-12T11:11:46.728Z" }, - { url = "https://files.pythonhosted.org/packages/5d/b3/b44d8b1c4a4d01097a7f82ffbc582d054007365c27b28867f0b2d4241d73/gevent-25.5.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c7b80a37f2fb45ee4a8f7e64b77dd8a842d364384046e394227b974a4e9c9a52", size = 1812954, upload-time = "2025-05-12T11:52:27.059Z" }, - { url = "https://files.pythonhosted.org/packages/1e/c6/935b4c973ad827c9ec49c354d68d047da1d23e3018bda63d3723cce43178/gevent-25.5.1-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:29ab729d50ae85077a68e0385f129f5b01052d01a0ae6d7fdc1824f5337905e4", size = 1900169, upload-time = "2025-05-12T11:54:17.797Z" }, - { url = "https://files.pythonhosted.org/packages/38/8a/b745bddfec35fb723cafb036f191e5e0a0013f1698bf0ba4fa2cb8e01879/gevent-25.5.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:80d20592aeabcc4e294fd441fd43d45cb537437fd642c374ea9d964622fad229", size = 1849786, upload-time = "2025-05-12T12:00:01.962Z" }, - { url = "https://files.pythonhosted.org/packages/7c/b3/7aa7b09d91207bebe7608699558bbadd34f63e32904351867c29f8be25de/gevent-25.5.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a8ba0257542ccbb72a8229dc34d00844ccdfba110417e4b7b34599548d0e20e9", size = 2139021, upload-time = "2025-05-12T11:32:58.961Z" }, - { url = "https://files.pythonhosted.org/packages/74/da/cf52ae0c84361f4164a04f3338508b1234331ce79719db103e50dbc5598c/gevent-25.5.1-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:cad0821dff998c7c60dd238f92cd61380342c47fb9e92e1a8705d9b5ac7c16e8", size = 1830758, upload-time = "2025-05-12T11:59:55.666Z" }, - { url = "https://files.pythonhosted.org/packages/93/93/73a49b896d78eec27f0895ce3008f9825db748a5aacbca47404d1014da4b/gevent-25.5.1-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:017a7384c0cd1a5907751c991535a0699596e89725468a7fc39228312e10efa1", size = 2199993, upload-time = "2025-05-12T11:40:50.845Z" }, - { url = "https://files.pythonhosted.org/packages/df/c7/34680b7d2a75492fa032fa8ecaacc03c1940767a35125f6740954a0132a3/gevent-25.5.1-cp310-cp310-win_amd64.whl", hash = "sha256:469c86d02fccad7e2a3d82fe22237e47ecb376fbf4710bc18747b49c50716817", size = 1652665, upload-time = "2025-05-12T12:35:58.105Z" }, - { url = "https://files.pythonhosted.org/packages/c6/eb/015e93f16a718e2f836ecebecae9bcd7b4d2a5695d1c8bd5bba2d5d91548/gevent-25.5.1-cp311-cp311-macosx_11_0_universal2.whl", hash = "sha256:12380aba5c316e9ff53cc21d8ab80f4a91c0df3ada58f65d4f5eb2cf693db00e", size = 2877441, upload-time = "2025-05-12T11:14:57.735Z" }, - { url = "https://files.pythonhosted.org/packages/7b/86/42d191a6f6672ca59d6d79b4cd9b89d4a15f59c843fbbad42f2b749f8ea9/gevent-25.5.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7f0694daab1a041b69a53f53c2141c12994892b2503870515cabe6a5dbd2a928", size = 1774873, upload-time = "2025-05-12T11:52:29.015Z" }, - { url = "https://files.pythonhosted.org/packages/f5/9f/42dd255849c9ca2e814f5cbe180980594007ba19044a132cf674069e38bf/gevent-25.5.1-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:2797885e9aeffdc98e1846723e5aa212e7ce53007dbef40d6fd2add264235c41", size = 1857911, upload-time = "2025-05-12T11:54:19.523Z" }, - { url = "https://files.pythonhosted.org/packages/3e/fc/8e799a733be48f6114bfc531b94e28812741664d8af89872dd90e117f8a4/gevent-25.5.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:cde6aaac36b54332e10ea2a5bc0de6a8aba6c205c92603fe4396e3777c88e05d", size = 1812751, upload-time = "2025-05-12T12:00:03.719Z" }, - { url = "https://files.pythonhosted.org/packages/52/4f/a3f3acd961887da10cb0b49c3d915201973d59ce6bf49e2922eaf2058d5f/gevent-25.5.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:24484f80f14befb8822bf29554cfb3a26a26cb69cd1e5a8be9e23b4bd7a96e25", size = 2087115, upload-time = "2025-05-12T11:33:01.128Z" }, - { url = "https://files.pythonhosted.org/packages/b6/27/bb38e005106a53787c13ad1f9f73ed990e403e462108acae6320ab11d442/gevent-25.5.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:8fdc7446895fa184890d8ca5ea61e502691114f9db55c9b76adc33f3086c4368", size = 1793549, upload-time = "2025-05-12T11:59:57.854Z" }, - { url = "https://files.pythonhosted.org/packages/ee/56/da817bc69e1f0ae8438f12f2cd150656b09a8c3576c6d12f992dc9ca64ef/gevent-25.5.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:5b6106e2414b1797133786258fa1962a5e836480e4d5e861577f9fc63b673a5a", size = 2145899, upload-time = "2025-05-12T11:40:53.275Z" }, - { url = "https://files.pythonhosted.org/packages/b8/42/989403abbdbb1346a1507083c02018bee3fedaef3f9648940c767d8c0958/gevent-25.5.1-cp311-cp311-win_amd64.whl", hash = "sha256:bc899212d90f311784c58938a9c09c59802fb6dc287a35fabdc36d180f57f575", size = 1635771, upload-time = "2025-05-12T12:26:47.644Z" }, - { url = "https://files.pythonhosted.org/packages/58/c5/cf71423666a0b83db3d7e3f85788bc47d573fca5fe62b798fe2c4273de7c/gevent-25.5.1-cp312-cp312-macosx_11_0_universal2.whl", hash = "sha256:d87c0a1bd809d8f70f96b9b229779ec6647339830b8888a192beed33ac8d129f", size = 2909333, upload-time = "2025-05-12T11:11:34.883Z" }, - { url = "https://files.pythonhosted.org/packages/26/7e/d2f174ee8bec6eb85d961ca203bc599d059c857b8412e367b8fa206603a5/gevent-25.5.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b87a4b66edb3808d4d07bbdb0deed5a710cf3d3c531e082759afd283758bb649", size = 1788420, upload-time = "2025-05-12T11:52:30.306Z" }, - { url = "https://files.pythonhosted.org/packages/fe/f3/3aba8c147b9108e62ba348c726fe38ae69735a233db425565227336e8ce6/gevent-25.5.1-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:f076779050029a82feb0cb1462021d3404d22f80fa76a181b1a7889cd4d6b519", size = 1868854, upload-time = "2025-05-12T11:54:21.564Z" }, - { url = "https://files.pythonhosted.org/packages/c6/b1/11a5453f8fcebe90a456471fad48bd154c6a62fcb96e3475a5e408d05fc8/gevent-25.5.1-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:bb673eb291c19370f69295f7a881a536451408481e2e3deec3f41dedb7c281ec", size = 1833946, upload-time = "2025-05-12T12:00:05.514Z" }, - { url = "https://files.pythonhosted.org/packages/70/1c/37d4a62303f86e6af67660a8df38c1171b7290df61b358e618c6fea79567/gevent-25.5.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c1325ed44225c8309c0dd188bdbbbee79e1df8c11ceccac226b861c7d52e4837", size = 2070583, upload-time = "2025-05-12T11:33:02.803Z" }, - { url = "https://files.pythonhosted.org/packages/4b/8f/3b14929ff28263aba1d268ea97bcf104be1a86ba6f6bb4633838e7a1905e/gevent-25.5.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:fcd5bcad3102bde686d0adcc341fade6245186050ce14386d547ccab4bd54310", size = 1808341, upload-time = "2025-05-12T11:59:59.154Z" }, - { url = "https://files.pythonhosted.org/packages/2f/fc/674ec819fb8a96e482e4d21f8baa43d34602dba09dfce7bbdc8700899d1b/gevent-25.5.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:1a93062609e8fa67ec97cd5fb9206886774b2a09b24887f40148c9c37e6fb71c", size = 2137974, upload-time = "2025-05-12T11:40:54.78Z" }, - { url = "https://files.pythonhosted.org/packages/05/9a/048b7f5e28c54e4595ad4a8ad3c338fa89560e558db2bbe8273f44f030de/gevent-25.5.1-cp312-cp312-win_amd64.whl", hash = "sha256:2534c23dc32bed62b659ed4fd9e198906179e68b26c9276a897e04163bdde806", size = 1638344, upload-time = "2025-05-12T12:08:31.776Z" }, - { url = "https://files.pythonhosted.org/packages/10/25/2162b38d7b48e08865db6772d632bd1648136ce2bb50e340565e45607cad/gevent-25.5.1-cp313-cp313-macosx_11_0_universal2.whl", hash = "sha256:a022a9de9275ce0b390b7315595454258c525dc8287a03f1a6cacc5878ab7cbc", size = 2928044, upload-time = "2025-05-12T11:11:36.33Z" }, - { url = "https://files.pythonhosted.org/packages/1b/e0/dbd597a964ed00176da122ea759bf2a6c1504f1e9f08e185379f92dc355f/gevent-25.5.1-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3fae8533f9d0ef3348a1f503edcfb531ef7a0236b57da1e24339aceb0ce52922", size = 1788751, upload-time = "2025-05-12T11:52:32.643Z" }, - { url = "https://files.pythonhosted.org/packages/f1/74/960cc4cf4c9c90eafbe0efc238cdf588862e8e278d0b8c0d15a0da4ed480/gevent-25.5.1-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:c7b32d9c3b5294b39ea9060e20c582e49e1ec81edbfeae6cf05f8ad0829cb13d", size = 1869766, upload-time = "2025-05-12T11:54:23.903Z" }, - { url = "https://files.pythonhosted.org/packages/56/78/fa84b1c7db79b156929685db09a7c18c3127361dca18a09e998e98118506/gevent-25.5.1-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:7b95815fe44f318ebbfd733b6428b4cb18cc5e68f1c40e8501dd69cc1f42a83d", size = 1835358, upload-time = "2025-05-12T12:00:06.794Z" }, - { url = "https://files.pythonhosted.org/packages/00/5c/bfefe3822bbca5b83bfad256c82251b3f5be13d52d14e17a786847b9b625/gevent-25.5.1-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2d316529b70d325b183b2f3f5cde958911ff7be12eb2b532b5c301f915dbbf1e", size = 2073071, upload-time = "2025-05-12T11:33:04.2Z" }, - { url = "https://files.pythonhosted.org/packages/20/e4/08a77a3839a37db96393dea952e992d5846a881b887986dde62ead6b48a1/gevent-25.5.1-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:f6ba33c13db91ffdbb489a4f3d177a261ea1843923e1d68a5636c53fe98fa5ce", size = 1809805, upload-time = "2025-05-12T12:00:00.537Z" }, - { url = "https://files.pythonhosted.org/packages/2b/ac/28848348f790c1283df74b0fc0a554271d0606676470f848eccf84eae42a/gevent-25.5.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:37ee34b77c7553777c0b8379915f75934c3f9c8cd32f7cd098ea43c9323c2276", size = 2138305, upload-time = "2025-05-12T11:40:56.566Z" }, - { url = "https://files.pythonhosted.org/packages/52/9e/0e9e40facd2d714bfb00f71fc6dacaacc82c24c1c2e097bf6461e00dec9f/gevent-25.5.1-cp313-cp313-win_amd64.whl", hash = "sha256:9fa6aa0da224ed807d3b76cdb4ee8b54d4d4d5e018aed2478098e685baae7896", size = 1637444, upload-time = "2025-05-12T12:17:45.995Z" }, - { url = "https://files.pythonhosted.org/packages/60/16/b71171e97ec7b4ded8669542f4369d88d5a289e2704efbbde51e858e062a/gevent-25.5.1-cp314-cp314-macosx_11_0_universal2.whl", hash = "sha256:0bacf89a65489d26c7087669af89938d5bfd9f7afb12a07b57855b9fad6ccbd0", size = 2937113, upload-time = "2025-05-12T11:12:03.191Z" }, - { url = "https://files.pythonhosted.org/packages/11/81/834da3c1ea5e71e4dc1a78a034a15f2813d9760d135464aae5d1f058a8c6/gevent-25.5.1-pp310-pypy310_pp73-macosx_11_0_universal2.whl", hash = "sha256:60ad4ca9ca2c4cc8201b607c229cd17af749831e371d006d8a91303bb5568eb1", size = 1291540, upload-time = "2025-05-12T11:11:55.456Z" }, +sdist = { url = "https://files.pythonhosted.org/packages/9e/48/b3ef2673ffb940f980966694e40d6d32560f3ffa284ecaeb5ea3a90a6d3f/gevent-25.9.1.tar.gz", hash = "sha256:adf9cd552de44a4e6754c51ff2e78d9193b7fa6eab123db9578a210e657235dd", size = 5059025, upload-time = "2025-09-17T16:15:34.528Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/ae/c7/2c60fc4e5c9144f2b91e23af8d87c626870ad3183cfd09d2b3ba6d699178/gevent-25.9.1-cp310-cp310-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:856b990be5590e44c3a3dc6c8d48a40eaccbb42e99d2b791d11d1e7711a4297e", size = 1831980, upload-time = "2025-09-17T15:41:22.597Z" }, + { url = "https://files.pythonhosted.org/packages/2e/ae/49bf0a01f95a1c92c001d7b3f482a2301626b8a0617f448c4cd14ca9b5d4/gevent-25.9.1-cp310-cp310-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:fe1599d0b30e6093eb3213551751b24feeb43db79f07e89d98dd2f3330c9063e", size = 1918777, upload-time = "2025-09-17T15:48:57.223Z" }, + { url = "https://files.pythonhosted.org/packages/88/3f/266d2eb9f5d75c184a55a39e886b53a4ea7f42ff31f195220a363f0e3f9e/gevent-25.9.1-cp310-cp310-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:f0d8b64057b4bf1529b9ef9bd2259495747fba93d1f836c77bfeaacfec373fd0", size = 1869235, upload-time = "2025-09-17T15:49:18.255Z" }, + { url = "https://files.pythonhosted.org/packages/76/24/c0c7c7db70ca74c7b1918388ebda7c8c2a3c3bff0bbfbaa9280ed04b3340/gevent-25.9.1-cp310-cp310-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:b56cbc820e3136ba52cd690bdf77e47a4c239964d5f80dc657c1068e0fe9521c", size = 2177334, upload-time = "2025-09-17T15:15:10.073Z" }, + { url = "https://files.pythonhosted.org/packages/4c/1e/de96bd033c03955f54c455b51a5127b1d540afcfc97838d1801fafce6d2e/gevent-25.9.1-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:c5fa9ce5122c085983e33e0dc058f81f5264cebe746de5c401654ab96dddfca8", size = 1847708, upload-time = "2025-09-17T15:52:38.475Z" }, + { url = "https://files.pythonhosted.org/packages/26/8b/6851e9cd3e4f322fa15c1d196cbf1a8a123da69788b078227dd13dd4208f/gevent-25.9.1-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:03c74fec58eda4b4edc043311fca8ba4f8744ad1632eb0a41d5ec25413581975", size = 2234274, upload-time = "2025-09-17T15:24:07.797Z" }, + { url = "https://files.pythonhosted.org/packages/0f/d8/b1178b70538c91493bec283018b47c16eab4bac9ddf5a3d4b7dd905dab60/gevent-25.9.1-cp310-cp310-win_amd64.whl", hash = "sha256:a8ae9f895e8651d10b0a8328a61c9c53da11ea51b666388aa99b0ce90f9fdc27", size = 1695326, upload-time = "2025-09-17T20:10:25.455Z" }, + { url = "https://files.pythonhosted.org/packages/81/86/03f8db0704fed41b0fa830425845f1eb4e20c92efa3f18751ee17809e9c6/gevent-25.9.1-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:18e5aff9e8342dc954adb9c9c524db56c2f3557999463445ba3d9cbe3dada7b7", size = 1792418, upload-time = "2025-09-17T15:41:24.384Z" }, + { url = "https://files.pythonhosted.org/packages/5f/35/f6b3a31f0849a62cfa2c64574bcc68a781d5499c3195e296e892a121a3cf/gevent-25.9.1-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:1cdf6db28f050ee103441caa8b0448ace545364f775059d5e2de089da975c457", size = 1875700, upload-time = "2025-09-17T15:48:59.652Z" }, + { url = "https://files.pythonhosted.org/packages/66/1e/75055950aa9b48f553e061afa9e3728061b5ccecca358cef19166e4ab74a/gevent-25.9.1-cp311-cp311-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:812debe235a8295be3b2a63b136c2474241fa5c58af55e6a0f8cfc29d4936235", size = 1831365, upload-time = "2025-09-17T15:49:19.426Z" }, + { url = "https://files.pythonhosted.org/packages/31/e8/5c1f6968e5547e501cfa03dcb0239dff55e44c3660a37ec534e32a0c008f/gevent-25.9.1-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:b28b61ff9216a3d73fe8f35669eefcafa957f143ac534faf77e8a19eb9e6883a", size = 2122087, upload-time = "2025-09-17T15:15:12.329Z" }, + { url = "https://files.pythonhosted.org/packages/c0/2c/ebc5d38a7542af9fb7657bfe10932a558bb98c8a94e4748e827d3823fced/gevent-25.9.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:5e4b6278b37373306fc6b1e5f0f1cf56339a1377f67c35972775143d8d7776ff", size = 1808776, upload-time = "2025-09-17T15:52:40.16Z" }, + { url = "https://files.pythonhosted.org/packages/e6/26/e1d7d6c8ffbf76fe1fbb4e77bdb7f47d419206adc391ec40a8ace6ebbbf0/gevent-25.9.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:d99f0cb2ce43c2e8305bf75bee61a8bde06619d21b9d0316ea190fc7a0620a56", size = 2179141, upload-time = "2025-09-17T15:24:09.895Z" }, + { url = "https://files.pythonhosted.org/packages/1d/6c/bb21fd9c095506aeeaa616579a356aa50935165cc0f1e250e1e0575620a7/gevent-25.9.1-cp311-cp311-win_amd64.whl", hash = "sha256:72152517ecf548e2f838c61b4be76637d99279dbaa7e01b3924df040aa996586", size = 1677941, upload-time = "2025-09-17T19:59:50.185Z" }, + { url = "https://files.pythonhosted.org/packages/f7/49/e55930ba5259629eb28ac7ee1abbca971996a9165f902f0249b561602f24/gevent-25.9.1-cp312-cp312-macosx_11_0_universal2.whl", hash = "sha256:46b188248c84ffdec18a686fcac5dbb32365d76912e14fda350db5dc0bfd4f86", size = 2955991, upload-time = "2025-09-17T14:52:30.568Z" }, + { url = "https://files.pythonhosted.org/packages/aa/88/63dc9e903980e1da1e16541ec5c70f2b224ec0a8e34088cb42794f1c7f52/gevent-25.9.1-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:f2b54ea3ca6f0c763281cd3f96010ac7e98c2e267feb1221b5a26e2ca0b9a692", size = 1808503, upload-time = "2025-09-17T15:41:25.59Z" }, + { url = "https://files.pythonhosted.org/packages/7a/8d/7236c3a8f6ef7e94c22e658397009596fa90f24c7d19da11ad7ab3a9248e/gevent-25.9.1-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:7a834804ac00ed8a92a69d3826342c677be651b1c3cd66cc35df8bc711057aa2", size = 1890001, upload-time = "2025-09-17T15:49:01.227Z" }, + { url = "https://files.pythonhosted.org/packages/4f/63/0d7f38c4a2085ecce26b50492fc6161aa67250d381e26d6a7322c309b00f/gevent-25.9.1-cp312-cp312-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:323a27192ec4da6b22a9e51c3d9d896ff20bc53fdc9e45e56eaab76d1c39dd74", size = 1855335, upload-time = "2025-09-17T15:49:20.582Z" }, + { url = "https://files.pythonhosted.org/packages/95/18/da5211dfc54c7a57e7432fd9a6ffeae1ce36fe5a313fa782b1c96529ea3d/gevent-25.9.1-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:6ea78b39a2c51d47ff0f130f4c755a9a4bbb2dd9721149420ad4712743911a51", size = 2109046, upload-time = "2025-09-17T15:15:13.817Z" }, + { url = "https://files.pythonhosted.org/packages/a6/5a/7bb5ec8e43a2c6444853c4a9f955f3e72f479d7c24ea86c95fb264a2de65/gevent-25.9.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:dc45cd3e1cc07514a419960af932a62eb8515552ed004e56755e4bf20bad30c5", size = 1827099, upload-time = "2025-09-17T15:52:41.384Z" }, + { url = "https://files.pythonhosted.org/packages/ca/d4/b63a0a60635470d7d986ef19897e893c15326dd69e8fb342c76a4f07fe9e/gevent-25.9.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:34e01e50c71eaf67e92c186ee0196a039d6e4f4b35670396baed4a2d8f1b347f", size = 2172623, upload-time = "2025-09-17T15:24:12.03Z" }, + { url = "https://files.pythonhosted.org/packages/d5/98/caf06d5d22a7c129c1fb2fc1477306902a2c8ddfd399cd26bbbd4caf2141/gevent-25.9.1-cp312-cp312-win_amd64.whl", hash = "sha256:4acd6bcd5feabf22c7c5174bd3b9535ee9f088d2bbce789f740ad8d6554b18f3", size = 1682837, upload-time = "2025-09-17T19:48:47.318Z" }, + { url = "https://files.pythonhosted.org/packages/5a/77/b97f086388f87f8ad3e01364f845004aef0123d4430241c7c9b1f9bde742/gevent-25.9.1-cp313-cp313-macosx_11_0_universal2.whl", hash = "sha256:4f84591d13845ee31c13f44bdf6bd6c3dbf385b5af98b2f25ec328213775f2ed", size = 2973739, upload-time = "2025-09-17T14:53:30.279Z" }, + { url = "https://files.pythonhosted.org/packages/3c/2e/9d5f204ead343e5b27bbb2fedaec7cd0009d50696b2266f590ae845d0331/gevent-25.9.1-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:9cdbb24c276a2d0110ad5c978e49daf620b153719ac8a548ce1250a7eb1b9245", size = 1809165, upload-time = "2025-09-17T15:41:27.193Z" }, + { url = "https://files.pythonhosted.org/packages/10/3e/791d1bf1eb47748606d5f2c2aa66571f474d63e0176228b1f1fd7b77ab37/gevent-25.9.1-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:88b6c07169468af631dcf0fdd3658f9246d6822cc51461d43f7c44f28b0abb82", size = 1890638, upload-time = "2025-09-17T15:49:02.45Z" }, + { url = "https://files.pythonhosted.org/packages/f2/5c/9ad0229b2b4d81249ca41e4f91dd8057deaa0da6d4fbe40bf13cdc5f7a47/gevent-25.9.1-cp313-cp313-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:b7bb0e29a7b3e6ca9bed2394aa820244069982c36dc30b70eb1004dd67851a48", size = 1857118, upload-time = "2025-09-17T15:49:22.125Z" }, + { url = "https://files.pythonhosted.org/packages/49/2a/3010ed6c44179a3a5c5c152e6de43a30ff8bc2c8de3115ad8733533a018f/gevent-25.9.1-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:2951bb070c0ee37b632ac9134e4fdaad70d2e660c931bb792983a0837fe5b7d7", size = 2111598, upload-time = "2025-09-17T15:15:15.226Z" }, + { url = "https://files.pythonhosted.org/packages/08/75/6bbe57c19a7aa4527cc0f9afcdf5a5f2aed2603b08aadbccb5bf7f607ff4/gevent-25.9.1-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:e4e17c2d57e9a42e25f2a73d297b22b60b2470a74be5a515b36c984e1a246d47", size = 1829059, upload-time = "2025-09-17T15:52:42.596Z" }, + { url = "https://files.pythonhosted.org/packages/06/6e/19a9bee9092be45679cb69e4dd2e0bf5f897b7140b4b39c57cc123d24829/gevent-25.9.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:8d94936f8f8b23d9de2251798fcb603b84f083fdf0d7f427183c1828fb64f117", size = 2173529, upload-time = "2025-09-17T15:24:13.897Z" }, + { url = "https://files.pythonhosted.org/packages/ca/4f/50de9afd879440e25737e63f5ba6ee764b75a3abe17376496ab57f432546/gevent-25.9.1-cp313-cp313-win_amd64.whl", hash = "sha256:eb51c5f9537b07da673258b4832f6635014fee31690c3f0944d34741b69f92fa", size = 1681518, upload-time = "2025-09-17T19:39:47.488Z" }, + { url = "https://files.pythonhosted.org/packages/15/1a/948f8167b2cdce573cf01cec07afc64d0456dc134b07900b26ac7018b37e/gevent-25.9.1-cp314-cp314-macosx_11_0_universal2.whl", hash = "sha256:1a3fe4ea1c312dbf6b375b416925036fe79a40054e6bf6248ee46526ea628be1", size = 2982934, upload-time = "2025-09-17T14:54:11.302Z" }, + { url = "https://files.pythonhosted.org/packages/9b/ec/726b146d1d3aad82e03d2e1e1507048ab6072f906e83f97f40667866e582/gevent-25.9.1-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:0adb937f13e5fb90cca2edf66d8d7e99d62a299687400ce2edee3f3504009356", size = 1813982, upload-time = "2025-09-17T15:41:28.506Z" }, + { url = "https://files.pythonhosted.org/packages/35/5d/5f83f17162301662bd1ce702f8a736a8a8cac7b7a35e1d8b9866938d1f9d/gevent-25.9.1-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:427f869a2050a4202d93cf7fd6ab5cffb06d3e9113c10c967b6e2a0d45237cb8", size = 1894902, upload-time = "2025-09-17T15:49:03.702Z" }, + { url = "https://files.pythonhosted.org/packages/83/cd/cf5e74e353f60dab357829069ffc300a7bb414c761f52cf8c0c6e9728b8d/gevent-25.9.1-cp314-cp314-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:c049880175e8c93124188f9d926af0a62826a3b81aa6d3074928345f8238279e", size = 1861792, upload-time = "2025-09-17T15:49:23.279Z" }, + { url = "https://files.pythonhosted.org/packages/dd/65/b9a4526d4a4edce26fe4b3b993914ec9dc64baabad625a3101e51adb17f3/gevent-25.9.1-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:b5a67a0974ad9f24721034d1e008856111e0535f1541499f72a733a73d658d1c", size = 2113215, upload-time = "2025-09-17T15:15:16.34Z" }, + { url = "https://files.pythonhosted.org/packages/e5/be/7d35731dfaf8370795b606e515d964a0967e129db76ea7873f552045dd39/gevent-25.9.1-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:1d0f5d8d73f97e24ea8d24d8be0f51e0cf7c54b8021c1fddb580bf239474690f", size = 1833449, upload-time = "2025-09-17T15:52:43.75Z" }, + { url = "https://files.pythonhosted.org/packages/65/58/7bc52544ea5e63af88c4a26c90776feb42551b7555a1c89c20069c168a3f/gevent-25.9.1-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:ddd3ff26e5c4240d3fbf5516c2d9d5f2a998ef87cfb73e1429cfaeaaec860fa6", size = 2176034, upload-time = "2025-09-17T15:24:15.676Z" }, + { url = "https://files.pythonhosted.org/packages/c2/69/a7c4ba2ffbc7c7dbf6d8b4f5d0f0a421f7815d229f4909854266c445a3d4/gevent-25.9.1-cp314-cp314-win_amd64.whl", hash = "sha256:bb63c0d6cb9950cc94036a4995b9cc4667b8915366613449236970f4394f94d7", size = 1703019, upload-time = "2025-09-17T19:30:55.272Z" }, ] [[package]] name = "greenlet" -version = "3.2.3" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/c9/92/bb85bd6e80148a4d2e0c59f7c0c2891029f8fd510183afc7d8d2feeed9b6/greenlet-3.2.3.tar.gz", hash = "sha256:8b0dd8ae4c0d6f5e54ee55ba935eeb3d735a9b58a8a1e5b5cbab64e01a39f365", size = 185752, upload-time = "2025-06-05T16:16:09.955Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/92/db/b4c12cff13ebac2786f4f217f06588bccd8b53d260453404ef22b121fc3a/greenlet-3.2.3-cp310-cp310-macosx_11_0_universal2.whl", hash = "sha256:1afd685acd5597349ee6d7a88a8bec83ce13c106ac78c196ee9dde7c04fe87be", size = 268977, upload-time = "2025-06-05T16:10:24.001Z" }, - { url = "https://files.pythonhosted.org/packages/52/61/75b4abd8147f13f70986df2801bf93735c1bd87ea780d70e3b3ecda8c165/greenlet-3.2.3-cp310-cp310-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:761917cac215c61e9dc7324b2606107b3b292a8349bdebb31503ab4de3f559ac", size = 627351, upload-time = "2025-06-05T16:38:50.685Z" }, - { url = "https://files.pythonhosted.org/packages/35/aa/6894ae299d059d26254779a5088632874b80ee8cf89a88bca00b0709d22f/greenlet-3.2.3-cp310-cp310-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:a433dbc54e4a37e4fff90ef34f25a8c00aed99b06856f0119dcf09fbafa16392", size = 638599, upload-time = "2025-06-05T16:41:34.057Z" }, - { url = "https://files.pythonhosted.org/packages/30/64/e01a8261d13c47f3c082519a5e9dbf9e143cc0498ed20c911d04e54d526c/greenlet-3.2.3-cp310-cp310-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:72e77ed69312bab0434d7292316d5afd6896192ac4327d44f3d613ecb85b037c", size = 634482, upload-time = "2025-06-05T16:48:16.26Z" }, - { url = "https://files.pythonhosted.org/packages/47/48/ff9ca8ba9772d083a4f5221f7b4f0ebe8978131a9ae0909cf202f94cd879/greenlet-3.2.3-cp310-cp310-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:68671180e3849b963649254a882cd544a3c75bfcd2c527346ad8bb53494444db", size = 633284, upload-time = "2025-06-05T16:13:01.599Z" }, - { url = "https://files.pythonhosted.org/packages/e9/45/626e974948713bc15775b696adb3eb0bd708bec267d6d2d5c47bb47a6119/greenlet-3.2.3-cp310-cp310-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:49c8cfb18fb419b3d08e011228ef8a25882397f3a859b9fe1436946140b6756b", size = 582206, upload-time = "2025-06-05T16:12:48.51Z" }, - { url = "https://files.pythonhosted.org/packages/b1/8e/8b6f42c67d5df7db35b8c55c9a850ea045219741bb14416255616808c690/greenlet-3.2.3-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:efc6dc8a792243c31f2f5674b670b3a95d46fa1c6a912b8e310d6f542e7b0712", size = 1111412, upload-time = "2025-06-05T16:36:45.479Z" }, - { url = "https://files.pythonhosted.org/packages/05/46/ab58828217349500a7ebb81159d52ca357da747ff1797c29c6023d79d798/greenlet-3.2.3-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:731e154aba8e757aedd0781d4b240f1225b075b4409f1bb83b05ff410582cf00", size = 1135054, upload-time = "2025-06-05T16:12:36.478Z" }, - { url = "https://files.pythonhosted.org/packages/68/7f/d1b537be5080721c0f0089a8447d4ef72839039cdb743bdd8ffd23046e9a/greenlet-3.2.3-cp310-cp310-win_amd64.whl", hash = "sha256:96c20252c2f792defe9a115d3287e14811036d51e78b3aaddbee23b69b216302", size = 296573, upload-time = "2025-06-05T16:34:26.521Z" }, - { url = "https://files.pythonhosted.org/packages/fc/2e/d4fcb2978f826358b673f779f78fa8a32ee37df11920dc2bb5589cbeecef/greenlet-3.2.3-cp311-cp311-macosx_11_0_universal2.whl", hash = "sha256:784ae58bba89fa1fa5733d170d42486580cab9decda3484779f4759345b29822", size = 270219, upload-time = "2025-06-05T16:10:10.414Z" }, - { url = "https://files.pythonhosted.org/packages/16/24/929f853e0202130e4fe163bc1d05a671ce8dcd604f790e14896adac43a52/greenlet-3.2.3-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:0921ac4ea42a5315d3446120ad48f90c3a6b9bb93dd9b3cf4e4d84a66e42de83", size = 630383, upload-time = "2025-06-05T16:38:51.785Z" }, - { url = "https://files.pythonhosted.org/packages/d1/b2/0320715eb61ae70c25ceca2f1d5ae620477d246692d9cc284c13242ec31c/greenlet-3.2.3-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:d2971d93bb99e05f8c2c0c2f4aa9484a18d98c4c3bd3c62b65b7e6ae33dfcfaf", size = 642422, upload-time = "2025-06-05T16:41:35.259Z" }, - { url = "https://files.pythonhosted.org/packages/bd/49/445fd1a210f4747fedf77615d941444349c6a3a4a1135bba9701337cd966/greenlet-3.2.3-cp311-cp311-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:c667c0bf9d406b77a15c924ef3285e1e05250948001220368e039b6aa5b5034b", size = 638375, upload-time = "2025-06-05T16:48:18.235Z" }, - { url = "https://files.pythonhosted.org/packages/7e/c8/ca19760cf6eae75fa8dc32b487e963d863b3ee04a7637da77b616703bc37/greenlet-3.2.3-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:592c12fb1165be74592f5de0d70f82bc5ba552ac44800d632214b76089945147", size = 637627, upload-time = "2025-06-05T16:13:02.858Z" }, - { url = "https://files.pythonhosted.org/packages/65/89/77acf9e3da38e9bcfca881e43b02ed467c1dedc387021fc4d9bd9928afb8/greenlet-3.2.3-cp311-cp311-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:29e184536ba333003540790ba29829ac14bb645514fbd7e32af331e8202a62a5", size = 585502, upload-time = "2025-06-05T16:12:49.642Z" }, - { url = "https://files.pythonhosted.org/packages/97/c6/ae244d7c95b23b7130136e07a9cc5aadd60d59b5951180dc7dc7e8edaba7/greenlet-3.2.3-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:93c0bb79844a367782ec4f429d07589417052e621aa39a5ac1fb99c5aa308edc", size = 1114498, upload-time = "2025-06-05T16:36:46.598Z" }, - { url = "https://files.pythonhosted.org/packages/89/5f/b16dec0cbfd3070658e0d744487919740c6d45eb90946f6787689a7efbce/greenlet-3.2.3-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:751261fc5ad7b6705f5f76726567375bb2104a059454e0226e1eef6c756748ba", size = 1139977, upload-time = "2025-06-05T16:12:38.262Z" }, - { url = "https://files.pythonhosted.org/packages/66/77/d48fb441b5a71125bcac042fc5b1494c806ccb9a1432ecaa421e72157f77/greenlet-3.2.3-cp311-cp311-win_amd64.whl", hash = "sha256:83a8761c75312361aa2b5b903b79da97f13f556164a7dd2d5448655425bd4c34", size = 297017, upload-time = "2025-06-05T16:25:05.225Z" }, - { url = "https://files.pythonhosted.org/packages/f3/94/ad0d435f7c48debe960c53b8f60fb41c2026b1d0fa4a99a1cb17c3461e09/greenlet-3.2.3-cp312-cp312-macosx_11_0_universal2.whl", hash = "sha256:25ad29caed5783d4bd7a85c9251c651696164622494c00802a139c00d639242d", size = 271992, upload-time = "2025-06-05T16:11:23.467Z" }, - { url = "https://files.pythonhosted.org/packages/93/5d/7c27cf4d003d6e77749d299c7c8f5fd50b4f251647b5c2e97e1f20da0ab5/greenlet-3.2.3-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:88cd97bf37fe24a6710ec6a3a7799f3f81d9cd33317dcf565ff9950c83f55e0b", size = 638820, upload-time = "2025-06-05T16:38:52.882Z" }, - { url = "https://files.pythonhosted.org/packages/c6/7e/807e1e9be07a125bb4c169144937910bf59b9d2f6d931578e57f0bce0ae2/greenlet-3.2.3-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:baeedccca94880d2f5666b4fa16fc20ef50ba1ee353ee2d7092b383a243b0b0d", size = 653046, upload-time = "2025-06-05T16:41:36.343Z" }, - { url = "https://files.pythonhosted.org/packages/9d/ab/158c1a4ea1068bdbc78dba5a3de57e4c7aeb4e7fa034320ea94c688bfb61/greenlet-3.2.3-cp312-cp312-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:be52af4b6292baecfa0f397f3edb3c6092ce071b499dd6fe292c9ac9f2c8f264", size = 647701, upload-time = "2025-06-05T16:48:19.604Z" }, - { url = "https://files.pythonhosted.org/packages/cc/0d/93729068259b550d6a0288da4ff72b86ed05626eaf1eb7c0d3466a2571de/greenlet-3.2.3-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:0cc73378150b8b78b0c9fe2ce56e166695e67478550769536a6742dca3651688", size = 649747, upload-time = "2025-06-05T16:13:04.628Z" }, - { url = "https://files.pythonhosted.org/packages/f6/f6/c82ac1851c60851302d8581680573245c8fc300253fc1ff741ae74a6c24d/greenlet-3.2.3-cp312-cp312-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:706d016a03e78df129f68c4c9b4c4f963f7d73534e48a24f5f5a7101ed13dbbb", size = 605461, upload-time = "2025-06-05T16:12:50.792Z" }, - { url = "https://files.pythonhosted.org/packages/98/82/d022cf25ca39cf1200650fc58c52af32c90f80479c25d1cbf57980ec3065/greenlet-3.2.3-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:419e60f80709510c343c57b4bb5a339d8767bf9aef9b8ce43f4f143240f88b7c", size = 1121190, upload-time = "2025-06-05T16:36:48.59Z" }, - { url = "https://files.pythonhosted.org/packages/f5/e1/25297f70717abe8104c20ecf7af0a5b82d2f5a980eb1ac79f65654799f9f/greenlet-3.2.3-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:93d48533fade144203816783373f27a97e4193177ebaaf0fc396db19e5d61163", size = 1149055, upload-time = "2025-06-05T16:12:40.457Z" }, - { url = "https://files.pythonhosted.org/packages/1f/8f/8f9e56c5e82eb2c26e8cde787962e66494312dc8cb261c460e1f3a9c88bc/greenlet-3.2.3-cp312-cp312-win_amd64.whl", hash = "sha256:7454d37c740bb27bdeddfc3f358f26956a07d5220818ceb467a483197d84f849", size = 297817, upload-time = "2025-06-05T16:29:49.244Z" }, - { url = "https://files.pythonhosted.org/packages/b1/cf/f5c0b23309070ae93de75c90d29300751a5aacefc0a3ed1b1d8edb28f08b/greenlet-3.2.3-cp313-cp313-macosx_11_0_universal2.whl", hash = "sha256:500b8689aa9dd1ab26872a34084503aeddefcb438e2e7317b89b11eaea1901ad", size = 270732, upload-time = "2025-06-05T16:10:08.26Z" }, - { url = "https://files.pythonhosted.org/packages/48/ae/91a957ba60482d3fecf9be49bc3948f341d706b52ddb9d83a70d42abd498/greenlet-3.2.3-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:a07d3472c2a93117af3b0136f246b2833fdc0b542d4a9799ae5f41c28323faef", size = 639033, upload-time = "2025-06-05T16:38:53.983Z" }, - { url = "https://files.pythonhosted.org/packages/6f/df/20ffa66dd5a7a7beffa6451bdb7400d66251374ab40b99981478c69a67a8/greenlet-3.2.3-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:8704b3768d2f51150626962f4b9a9e4a17d2e37c8a8d9867bbd9fa4eb938d3b3", size = 652999, upload-time = "2025-06-05T16:41:37.89Z" }, - { url = "https://files.pythonhosted.org/packages/51/b4/ebb2c8cb41e521f1d72bf0465f2f9a2fd803f674a88db228887e6847077e/greenlet-3.2.3-cp313-cp313-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:5035d77a27b7c62db6cf41cf786cfe2242644a7a337a0e155c80960598baab95", size = 647368, upload-time = "2025-06-05T16:48:21.467Z" }, - { url = "https://files.pythonhosted.org/packages/8e/6a/1e1b5aa10dced4ae876a322155705257748108b7fd2e4fae3f2a091fe81a/greenlet-3.2.3-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:2d8aa5423cd4a396792f6d4580f88bdc6efcb9205891c9d40d20f6e670992efb", size = 650037, upload-time = "2025-06-05T16:13:06.402Z" }, - { url = "https://files.pythonhosted.org/packages/26/f2/ad51331a157c7015c675702e2d5230c243695c788f8f75feba1af32b3617/greenlet-3.2.3-cp313-cp313-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:2c724620a101f8170065d7dded3f962a2aea7a7dae133a009cada42847e04a7b", size = 608402, upload-time = "2025-06-05T16:12:51.91Z" }, - { url = "https://files.pythonhosted.org/packages/26/bc/862bd2083e6b3aff23300900a956f4ea9a4059de337f5c8734346b9b34fc/greenlet-3.2.3-cp313-cp313-musllinux_1_1_aarch64.whl", hash = "sha256:873abe55f134c48e1f2a6f53f7d1419192a3d1a4e873bace00499a4e45ea6af0", size = 1119577, upload-time = "2025-06-05T16:36:49.787Z" }, - { url = "https://files.pythonhosted.org/packages/86/94/1fc0cc068cfde885170e01de40a619b00eaa8f2916bf3541744730ffb4c3/greenlet-3.2.3-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:024571bbce5f2c1cfff08bf3fbaa43bbc7444f580ae13b0099e95d0e6e67ed36", size = 1147121, upload-time = "2025-06-05T16:12:42.527Z" }, - { url = "https://files.pythonhosted.org/packages/27/1a/199f9587e8cb08a0658f9c30f3799244307614148ffe8b1e3aa22f324dea/greenlet-3.2.3-cp313-cp313-win_amd64.whl", hash = "sha256:5195fb1e75e592dd04ce79881c8a22becdfa3e6f500e7feb059b1e6fdd54d3e3", size = 297603, upload-time = "2025-06-05T16:20:12.651Z" }, - { url = "https://files.pythonhosted.org/packages/d8/ca/accd7aa5280eb92b70ed9e8f7fd79dc50a2c21d8c73b9a0856f5b564e222/greenlet-3.2.3-cp314-cp314-macosx_11_0_universal2.whl", hash = "sha256:3d04332dddb10b4a211b68111dabaee2e1a073663d117dc10247b5b1642bac86", size = 271479, upload-time = "2025-06-05T16:10:47.525Z" }, - { url = "https://files.pythonhosted.org/packages/55/71/01ed9895d9eb49223280ecc98a557585edfa56b3d0e965b9fa9f7f06b6d9/greenlet-3.2.3-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:8186162dffde068a465deab08fc72c767196895c39db26ab1c17c0b77a6d8b97", size = 683952, upload-time = "2025-06-05T16:38:55.125Z" }, - { url = "https://files.pythonhosted.org/packages/ea/61/638c4bdf460c3c678a0a1ef4c200f347dff80719597e53b5edb2fb27ab54/greenlet-3.2.3-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:f4bfbaa6096b1b7a200024784217defedf46a07c2eee1a498e94a1b5f8ec5728", size = 696917, upload-time = "2025-06-05T16:41:38.959Z" }, - { url = "https://files.pythonhosted.org/packages/22/cc/0bd1a7eb759d1f3e3cc2d1bc0f0b487ad3cc9f34d74da4b80f226fde4ec3/greenlet-3.2.3-cp314-cp314-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:ed6cfa9200484d234d8394c70f5492f144b20d4533f69262d530a1a082f6ee9a", size = 692443, upload-time = "2025-06-05T16:48:23.113Z" }, - { url = "https://files.pythonhosted.org/packages/67/10/b2a4b63d3f08362662e89c103f7fe28894a51ae0bc890fabf37d1d780e52/greenlet-3.2.3-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:02b0df6f63cd15012bed5401b47829cfd2e97052dc89da3cfaf2c779124eb892", size = 692995, upload-time = "2025-06-05T16:13:07.972Z" }, - { url = "https://files.pythonhosted.org/packages/5a/c6/ad82f148a4e3ce9564056453a71529732baf5448ad53fc323e37efe34f66/greenlet-3.2.3-cp314-cp314-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:86c2d68e87107c1792e2e8d5399acec2487a4e993ab76c792408e59394d52141", size = 655320, upload-time = "2025-06-05T16:12:53.453Z" }, - { url = "https://files.pythonhosted.org/packages/5c/4f/aab73ecaa6b3086a4c89863d94cf26fa84cbff63f52ce9bc4342b3087a06/greenlet-3.2.3-cp314-cp314-win_amd64.whl", hash = "sha256:8c47aae8fbbfcf82cc13327ae802ba13c9c36753b67e760023fd116bc124a62a", size = 301236, upload-time = "2025-06-05T16:15:20.111Z" }, +version = "3.2.4" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/03/b8/704d753a5a45507a7aab61f18db9509302ed3d0a27ac7e0359ec2905b1a6/greenlet-3.2.4.tar.gz", hash = "sha256:0dca0d95ff849f9a364385f36ab49f50065d76964944638be9691e1832e9f86d", size = 188260, upload-time = "2025-08-07T13:24:33.51Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/7d/ed/6bfa4109fcb23a58819600392564fea69cdc6551ffd5e69ccf1d52a40cbc/greenlet-3.2.4-cp310-cp310-macosx_11_0_universal2.whl", hash = "sha256:8c68325b0d0acf8d91dde4e6f930967dd52a5302cd4062932a6b2e7c2969f47c", size = 271061, upload-time = "2025-08-07T13:17:15.373Z" }, + { url = "https://files.pythonhosted.org/packages/2a/fc/102ec1a2fc015b3a7652abab7acf3541d58c04d3d17a8d3d6a44adae1eb1/greenlet-3.2.4-cp310-cp310-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:94385f101946790ae13da500603491f04a76b6e4c059dab271b3ce2e283b2590", size = 629475, upload-time = "2025-08-07T13:42:54.009Z" }, + { url = "https://files.pythonhosted.org/packages/c5/26/80383131d55a4ac0fb08d71660fd77e7660b9db6bdb4e8884f46d9f2cc04/greenlet-3.2.4-cp310-cp310-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:f10fd42b5ee276335863712fa3da6608e93f70629c631bf77145021600abc23c", size = 640802, upload-time = "2025-08-07T13:45:25.52Z" }, + { url = "https://files.pythonhosted.org/packages/9f/7c/e7833dbcd8f376f3326bd728c845d31dcde4c84268d3921afcae77d90d08/greenlet-3.2.4-cp310-cp310-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:c8c9e331e58180d0d83c5b7999255721b725913ff6bc6cf39fa2a45841a4fd4b", size = 636703, upload-time = "2025-08-07T13:53:12.622Z" }, + { url = "https://files.pythonhosted.org/packages/e9/49/547b93b7c0428ede7b3f309bc965986874759f7d89e4e04aeddbc9699acb/greenlet-3.2.4-cp310-cp310-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:58b97143c9cc7b86fc458f215bd0932f1757ce649e05b640fea2e79b54cedb31", size = 635417, upload-time = "2025-08-07T13:18:25.189Z" }, + { url = "https://files.pythonhosted.org/packages/7f/91/ae2eb6b7979e2f9b035a9f612cf70f1bf54aad4e1d125129bef1eae96f19/greenlet-3.2.4-cp310-cp310-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:c2ca18a03a8cfb5b25bc1cbe20f3d9a4c80d8c3b13ba3df49ac3961af0b1018d", size = 584358, upload-time = "2025-08-07T13:18:23.708Z" }, + { url = "https://files.pythonhosted.org/packages/f7/85/433de0c9c0252b22b16d413c9407e6cb3b41df7389afc366ca204dbc1393/greenlet-3.2.4-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:9fe0a28a7b952a21e2c062cd5756d34354117796c6d9215a87f55e38d15402c5", size = 1113550, upload-time = "2025-08-07T13:42:37.467Z" }, + { url = "https://files.pythonhosted.org/packages/a1/8d/88f3ebd2bc96bf7747093696f4335a0a8a4c5acfcf1b757717c0d2474ba3/greenlet-3.2.4-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:8854167e06950ca75b898b104b63cc646573aa5fef1353d4508ecdd1ee76254f", size = 1137126, upload-time = "2025-08-07T13:18:20.239Z" }, + { url = "https://files.pythonhosted.org/packages/d6/6f/b60b0291d9623c496638c582297ead61f43c4b72eef5e9c926ef4565ec13/greenlet-3.2.4-cp310-cp310-win_amd64.whl", hash = "sha256:73f49b5368b5359d04e18d15828eecc1806033db5233397748f4ca813ff1056c", size = 298654, upload-time = "2025-08-07T13:50:00.469Z" }, + { url = "https://files.pythonhosted.org/packages/a4/de/f28ced0a67749cac23fecb02b694f6473f47686dff6afaa211d186e2ef9c/greenlet-3.2.4-cp311-cp311-macosx_11_0_universal2.whl", hash = "sha256:96378df1de302bc38e99c3a9aa311967b7dc80ced1dcc6f171e99842987882a2", size = 272305, upload-time = "2025-08-07T13:15:41.288Z" }, + { url = "https://files.pythonhosted.org/packages/09/16/2c3792cba130000bf2a31c5272999113f4764fd9d874fb257ff588ac779a/greenlet-3.2.4-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:1ee8fae0519a337f2329cb78bd7a8e128ec0f881073d43f023c7b8d4831d5246", size = 632472, upload-time = "2025-08-07T13:42:55.044Z" }, + { url = "https://files.pythonhosted.org/packages/ae/8f/95d48d7e3d433e6dae5b1682e4292242a53f22df82e6d3dda81b1701a960/greenlet-3.2.4-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:94abf90142c2a18151632371140b3dba4dee031633fe614cb592dbb6c9e17bc3", size = 644646, upload-time = "2025-08-07T13:45:26.523Z" }, + { url = "https://files.pythonhosted.org/packages/d5/5e/405965351aef8c76b8ef7ad370e5da58d57ef6068df197548b015464001a/greenlet-3.2.4-cp311-cp311-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:4d1378601b85e2e5171b99be8d2dc85f594c79967599328f95c1dc1a40f1c633", size = 640519, upload-time = "2025-08-07T13:53:13.928Z" }, + { url = "https://files.pythonhosted.org/packages/25/5d/382753b52006ce0218297ec1b628e048c4e64b155379331f25a7316eb749/greenlet-3.2.4-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:0db5594dce18db94f7d1650d7489909b57afde4c580806b8d9203b6e79cdc079", size = 639707, upload-time = "2025-08-07T13:18:27.146Z" }, + { url = "https://files.pythonhosted.org/packages/1f/8e/abdd3f14d735b2929290a018ecf133c901be4874b858dd1c604b9319f064/greenlet-3.2.4-cp311-cp311-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:2523e5246274f54fdadbce8494458a2ebdcdbc7b802318466ac5606d3cded1f8", size = 587684, upload-time = "2025-08-07T13:18:25.164Z" }, + { url = "https://files.pythonhosted.org/packages/5d/65/deb2a69c3e5996439b0176f6651e0052542bb6c8f8ec2e3fba97c9768805/greenlet-3.2.4-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:1987de92fec508535687fb807a5cea1560f6196285a4cde35c100b8cd632cc52", size = 1116647, upload-time = "2025-08-07T13:42:38.655Z" }, + { url = "https://files.pythonhosted.org/packages/3f/cc/b07000438a29ac5cfb2194bfc128151d52f333cee74dd7dfe3fb733fc16c/greenlet-3.2.4-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:55e9c5affaa6775e2c6b67659f3a71684de4c549b3dd9afca3bc773533d284fa", size = 1142073, upload-time = "2025-08-07T13:18:21.737Z" }, + { url = "https://files.pythonhosted.org/packages/d8/0f/30aef242fcab550b0b3520b8e3561156857c94288f0332a79928c31a52cf/greenlet-3.2.4-cp311-cp311-win_amd64.whl", hash = "sha256:9c40adce87eaa9ddb593ccb0fa6a07caf34015a29bf8d344811665b573138db9", size = 299100, upload-time = "2025-08-07T13:44:12.287Z" }, + { url = "https://files.pythonhosted.org/packages/44/69/9b804adb5fd0671f367781560eb5eb586c4d495277c93bde4307b9e28068/greenlet-3.2.4-cp312-cp312-macosx_11_0_universal2.whl", hash = "sha256:3b67ca49f54cede0186854a008109d6ee71f66bd57bb36abd6d0a0267b540cdd", size = 274079, upload-time = "2025-08-07T13:15:45.033Z" }, + { url = "https://files.pythonhosted.org/packages/46/e9/d2a80c99f19a153eff70bc451ab78615583b8dac0754cfb942223d2c1a0d/greenlet-3.2.4-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:ddf9164e7a5b08e9d22511526865780a576f19ddd00d62f8a665949327fde8bb", size = 640997, upload-time = "2025-08-07T13:42:56.234Z" }, + { url = "https://files.pythonhosted.org/packages/3b/16/035dcfcc48715ccd345f3a93183267167cdd162ad123cd93067d86f27ce4/greenlet-3.2.4-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:f28588772bb5fb869a8eb331374ec06f24a83a9c25bfa1f38b6993afe9c1e968", size = 655185, upload-time = "2025-08-07T13:45:27.624Z" }, + { url = "https://files.pythonhosted.org/packages/31/da/0386695eef69ffae1ad726881571dfe28b41970173947e7c558d9998de0f/greenlet-3.2.4-cp312-cp312-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:5c9320971821a7cb77cfab8d956fa8e39cd07ca44b6070db358ceb7f8797c8c9", size = 649926, upload-time = "2025-08-07T13:53:15.251Z" }, + { url = "https://files.pythonhosted.org/packages/68/88/69bf19fd4dc19981928ceacbc5fd4bb6bc2215d53199e367832e98d1d8fe/greenlet-3.2.4-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:c60a6d84229b271d44b70fb6e5fa23781abb5d742af7b808ae3f6efd7c9c60f6", size = 651839, upload-time = "2025-08-07T13:18:30.281Z" }, + { url = "https://files.pythonhosted.org/packages/19/0d/6660d55f7373b2ff8152401a83e02084956da23ae58cddbfb0b330978fe9/greenlet-3.2.4-cp312-cp312-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:3b3812d8d0c9579967815af437d96623f45c0f2ae5f04e366de62a12d83a8fb0", size = 607586, upload-time = "2025-08-07T13:18:28.544Z" }, + { url = "https://files.pythonhosted.org/packages/8e/1a/c953fdedd22d81ee4629afbb38d2f9d71e37d23caace44775a3a969147d4/greenlet-3.2.4-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:abbf57b5a870d30c4675928c37278493044d7c14378350b3aa5d484fa65575f0", size = 1123281, upload-time = "2025-08-07T13:42:39.858Z" }, + { url = "https://files.pythonhosted.org/packages/3f/c7/12381b18e21aef2c6bd3a636da1088b888b97b7a0362fac2e4de92405f97/greenlet-3.2.4-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:20fb936b4652b6e307b8f347665e2c615540d4b42b3b4c8a321d8286da7e520f", size = 1151142, upload-time = "2025-08-07T13:18:22.981Z" }, + { url = "https://files.pythonhosted.org/packages/e9/08/b0814846b79399e585f974bbeebf5580fbe59e258ea7be64d9dfb253c84f/greenlet-3.2.4-cp312-cp312-win_amd64.whl", hash = "sha256:a7d4e128405eea3814a12cc2605e0e6aedb4035bf32697f72deca74de4105e02", size = 299899, upload-time = "2025-08-07T13:38:53.448Z" }, + { url = "https://files.pythonhosted.org/packages/49/e8/58c7f85958bda41dafea50497cbd59738c5c43dbbea5ee83d651234398f4/greenlet-3.2.4-cp313-cp313-macosx_11_0_universal2.whl", hash = "sha256:1a921e542453fe531144e91e1feedf12e07351b1cf6c9e8a3325ea600a715a31", size = 272814, upload-time = "2025-08-07T13:15:50.011Z" }, + { url = "https://files.pythonhosted.org/packages/62/dd/b9f59862e9e257a16e4e610480cfffd29e3fae018a68c2332090b53aac3d/greenlet-3.2.4-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:cd3c8e693bff0fff6ba55f140bf390fa92c994083f838fece0f63be121334945", size = 641073, upload-time = "2025-08-07T13:42:57.23Z" }, + { url = "https://files.pythonhosted.org/packages/f7/0b/bc13f787394920b23073ca3b6c4a7a21396301ed75a655bcb47196b50e6e/greenlet-3.2.4-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:710638eb93b1fa52823aa91bf75326f9ecdfd5e0466f00789246a5280f4ba0fc", size = 655191, upload-time = "2025-08-07T13:45:29.752Z" }, + { url = "https://files.pythonhosted.org/packages/f2/d6/6adde57d1345a8d0f14d31e4ab9c23cfe8e2cd39c3baf7674b4b0338d266/greenlet-3.2.4-cp313-cp313-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:c5111ccdc9c88f423426df3fd1811bfc40ed66264d35aa373420a34377efc98a", size = 649516, upload-time = "2025-08-07T13:53:16.314Z" }, + { url = "https://files.pythonhosted.org/packages/7f/3b/3a3328a788d4a473889a2d403199932be55b1b0060f4ddd96ee7cdfcad10/greenlet-3.2.4-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:d76383238584e9711e20ebe14db6c88ddcedc1829a9ad31a584389463b5aa504", size = 652169, upload-time = "2025-08-07T13:18:32.861Z" }, + { url = "https://files.pythonhosted.org/packages/ee/43/3cecdc0349359e1a527cbf2e3e28e5f8f06d3343aaf82ca13437a9aa290f/greenlet-3.2.4-cp313-cp313-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:23768528f2911bcd7e475210822ffb5254ed10d71f4028387e5a99b4c6699671", size = 610497, upload-time = "2025-08-07T13:18:31.636Z" }, + { url = "https://files.pythonhosted.org/packages/b8/19/06b6cf5d604e2c382a6f31cafafd6f33d5dea706f4db7bdab184bad2b21d/greenlet-3.2.4-cp313-cp313-musllinux_1_1_aarch64.whl", hash = "sha256:00fadb3fedccc447f517ee0d3fd8fe49eae949e1cd0f6a611818f4f6fb7dc83b", size = 1121662, upload-time = "2025-08-07T13:42:41.117Z" }, + { url = "https://files.pythonhosted.org/packages/a2/15/0d5e4e1a66fab130d98168fe984c509249c833c1a3c16806b90f253ce7b9/greenlet-3.2.4-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:d25c5091190f2dc0eaa3f950252122edbbadbb682aa7b1ef2f8af0f8c0afefae", size = 1149210, upload-time = "2025-08-07T13:18:24.072Z" }, + { url = "https://files.pythonhosted.org/packages/0b/55/2321e43595e6801e105fcfdee02b34c0f996eb71e6ddffca6b10b7e1d771/greenlet-3.2.4-cp313-cp313-win_amd64.whl", hash = "sha256:554b03b6e73aaabec3745364d6239e9e012d64c68ccd0b8430c64ccc14939a8b", size = 299685, upload-time = "2025-08-07T13:24:38.824Z" }, + { url = "https://files.pythonhosted.org/packages/22/5c/85273fd7cc388285632b0498dbbab97596e04b154933dfe0f3e68156c68c/greenlet-3.2.4-cp314-cp314-macosx_11_0_universal2.whl", hash = "sha256:49a30d5fda2507ae77be16479bdb62a660fa51b1eb4928b524975b3bde77b3c0", size = 273586, upload-time = "2025-08-07T13:16:08.004Z" }, + { url = "https://files.pythonhosted.org/packages/d1/75/10aeeaa3da9332c2e761e4c50d4c3556c21113ee3f0afa2cf5769946f7a3/greenlet-3.2.4-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:299fd615cd8fc86267b47597123e3f43ad79c9d8a22bebdce535e53550763e2f", size = 686346, upload-time = "2025-08-07T13:42:59.944Z" }, + { url = "https://files.pythonhosted.org/packages/c0/aa/687d6b12ffb505a4447567d1f3abea23bd20e73a5bed63871178e0831b7a/greenlet-3.2.4-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:c17b6b34111ea72fc5a4e4beec9711d2226285f0386ea83477cbb97c30a3f3a5", size = 699218, upload-time = "2025-08-07T13:45:30.969Z" }, + { url = "https://files.pythonhosted.org/packages/dc/8b/29aae55436521f1d6f8ff4e12fb676f3400de7fcf27fccd1d4d17fd8fecd/greenlet-3.2.4-cp314-cp314-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:b4a1870c51720687af7fa3e7cda6d08d801dae660f75a76f3845b642b4da6ee1", size = 694659, upload-time = "2025-08-07T13:53:17.759Z" }, + { url = "https://files.pythonhosted.org/packages/92/2e/ea25914b1ebfde93b6fc4ff46d6864564fba59024e928bdc7de475affc25/greenlet-3.2.4-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:061dc4cf2c34852b052a8620d40f36324554bc192be474b9e9770e8c042fd735", size = 695355, upload-time = "2025-08-07T13:18:34.517Z" }, + { url = "https://files.pythonhosted.org/packages/72/60/fc56c62046ec17f6b0d3060564562c64c862948c9d4bc8aa807cf5bd74f4/greenlet-3.2.4-cp314-cp314-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:44358b9bf66c8576a9f57a590d5f5d6e72fa4228b763d0e43fee6d3b06d3a337", size = 657512, upload-time = "2025-08-07T13:18:33.969Z" }, + { url = "https://files.pythonhosted.org/packages/e3/a5/6ddab2b4c112be95601c13428db1d8b6608a8b6039816f2ba09c346c08fc/greenlet-3.2.4-cp314-cp314-win_amd64.whl", hash = "sha256:e37ab26028f12dbb0ff65f29a8d3d44a765c61e729647bf2ddfbbed621726f01", size = 303425, upload-time = "2025-08-07T13:32:27.59Z" }, ] [[package]] @@ -422,7 +479,7 @@ requires-dist = [ { name = "markdown", specifier = ">=3.7" }, { name = "psycopg2-binary", specifier = ">=2.9.10" }, { name = "python-dotenv", specifier = ">=1.0.1" }, - { name = "wtforms", specifier = ">=3.2.1" }, + { name = "wtforms", specifier = "<3.0" }, ] [package.metadata.requires-dev] @@ -435,11 +492,11 @@ dev = [ [[package]] name = "iniconfig" -version = "2.0.0" +version = "2.1.0" source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/d7/4b/cbd8e699e64a6f16ca3a8220661b5f83792b3017d0f79807cb8708d33913/iniconfig-2.0.0.tar.gz", hash = "sha256:2d91e135bf72d31a410b17c16da610a82cb55f6b0477d1a902134b24a455b8b3", size = 4646, upload-time = "2023-01-07T11:08:11.254Z" } +sdist = { url = "https://files.pythonhosted.org/packages/f2/97/ebf4da567aa6827c909642694d71c9fcf53e5b504f2d96afea02718862f3/iniconfig-2.1.0.tar.gz", hash = "sha256:3abbd2e30b36733fee78f9c7f7308f2d0050e88f0087fd25c2645f63c773e1c7", size = 4793, upload-time = "2025-03-19T20:09:59.721Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/ef/a6/62565a6e1cf69e10f5727360368e451d4b7f58beeac6173dc9db836a5b46/iniconfig-2.0.0-py3-none-any.whl", hash = "sha256:b6a85871a79d2e3b22d2d1b94ac2824226a63c6b741c88f7ae975f18b6778374", size = 5892, upload-time = "2023-01-07T11:08:09.864Z" }, + { url = "https://files.pythonhosted.org/packages/2c/e1/e6716421ea10d38022b952c159d5161ca1193197fb744506875fbb87ea7b/iniconfig-2.1.0-py3-none-any.whl", hash = "sha256:9deba5723312380e77435581c6bf4935c94cbfab9b1ed33ef8d238ea168eb760", size = 6050, upload-time = "2025-03-19T20:10:01.071Z" }, ] [[package]] @@ -465,128 +522,162 @@ wheels = [ [[package]] name = "mako" -version = "1.3.9" +version = "1.3.10" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "markupsafe" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/62/4f/ddb1965901bc388958db9f0c991255b2c469349a741ae8c9cd8a562d70a6/mako-1.3.9.tar.gz", hash = "sha256:b5d65ff3462870feec922dbccf38f6efb44e5714d7b593a656be86663d8600ac", size = 392195, upload-time = "2025-02-04T15:05:49.37Z" } +sdist = { url = "https://files.pythonhosted.org/packages/9e/38/bd5b78a920a64d708fe6bc8e0a2c075e1389d53bef8413725c63ba041535/mako-1.3.10.tar.gz", hash = "sha256:99579a6f39583fa7e5630a28c3c1f440e4e97a414b80372649c0ce338da2ea28", size = 392474, upload-time = "2025-04-10T12:44:31.16Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/cd/83/de0a49e7de540513f53ab5d2e105321dedeb08a8f5850f0208decf4390ec/Mako-1.3.9-py3-none-any.whl", hash = "sha256:95920acccb578427a9aa38e37a186b1e43156c87260d7ba18ca63aa4c7cbd3a1", size = 78456, upload-time = "2025-02-04T15:05:51.115Z" }, + { url = "https://files.pythonhosted.org/packages/87/fb/99f81ac72ae23375f22b7afdb7642aba97c00a713c217124420147681a2f/mako-1.3.10-py3-none-any.whl", hash = "sha256:baef24a52fc4fc514a0887ac600f9f1cff3d82c61d4d700a1fa84d597b88db59", size = 78509, upload-time = "2025-04-10T12:50:53.297Z" }, ] [[package]] name = "markdown" -version = "3.7" +version = "3.9" source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/54/28/3af612670f82f4c056911fbbbb42760255801b3068c48de792d354ff4472/markdown-3.7.tar.gz", hash = "sha256:2ae2471477cfd02dbbf038d5d9bc226d40def84b4fe2986e49b59b6b472bbed2", size = 357086, upload-time = "2024-08-16T15:55:17.812Z" } +sdist = { url = "https://files.pythonhosted.org/packages/8d/37/02347f6d6d8279247a5837082ebc26fc0d5aaeaf75aa013fcbb433c777ab/markdown-3.9.tar.gz", hash = "sha256:d2900fe1782bd33bdbbd56859defef70c2e78fc46668f8eb9df3128138f2cb6a", size = 364585, upload-time = "2025-09-04T20:25:22.885Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/3f/08/83871f3c50fc983b88547c196d11cf8c3340e37c32d2e9d6152abe2c61f7/Markdown-3.7-py3-none-any.whl", hash = "sha256:7eb6df5690b81a1d7942992c97fad2938e956e79df20cbc6186e9c3a77b1c803", size = 106349, upload-time = "2024-08-16T15:55:16.176Z" }, + { url = "https://files.pythonhosted.org/packages/70/ae/44c4a6a4cbb496d93c6257954260fe3a6e91b7bed2240e5dad2a717f5111/markdown-3.9-py3-none-any.whl", hash = "sha256:9f4d91ed810864ea88a6f32c07ba8bee1346c0cc1f6b1f9f6c822f2a9667d280", size = 107441, upload-time = "2025-09-04T20:25:21.784Z" }, ] [[package]] name = "markupsafe" -version = "3.0.2" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/b2/97/5d42485e71dfc078108a86d6de8fa46db44a1a9295e89c5d6d4a06e23a62/markupsafe-3.0.2.tar.gz", hash = "sha256:ee55d3edf80167e48ea11a923c7386f4669df67d7994554387f84e7d8b0a2bf0", size = 20537, upload-time = "2024-10-18T15:21:54.129Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/04/90/d08277ce111dd22f77149fd1a5d4653eeb3b3eaacbdfcbae5afb2600eebd/MarkupSafe-3.0.2-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:7e94c425039cde14257288fd61dcfb01963e658efbc0ff54f5306b06054700f8", size = 14357, upload-time = "2024-10-18T15:20:51.44Z" }, - { url = "https://files.pythonhosted.org/packages/04/e1/6e2194baeae0bca1fae6629dc0cbbb968d4d941469cbab11a3872edff374/MarkupSafe-3.0.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:9e2d922824181480953426608b81967de705c3cef4d1af983af849d7bd619158", size = 12393, upload-time = "2024-10-18T15:20:52.426Z" }, - { url = "https://files.pythonhosted.org/packages/1d/69/35fa85a8ece0a437493dc61ce0bb6d459dcba482c34197e3efc829aa357f/MarkupSafe-3.0.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:38a9ef736c01fccdd6600705b09dc574584b89bea478200c5fbf112a6b0d5579", size = 21732, upload-time = "2024-10-18T15:20:53.578Z" }, - { url = "https://files.pythonhosted.org/packages/22/35/137da042dfb4720b638d2937c38a9c2df83fe32d20e8c8f3185dbfef05f7/MarkupSafe-3.0.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bbcb445fa71794da8f178f0f6d66789a28d7319071af7a496d4d507ed566270d", size = 20866, upload-time = "2024-10-18T15:20:55.06Z" }, - { url = "https://files.pythonhosted.org/packages/29/28/6d029a903727a1b62edb51863232152fd335d602def598dade38996887f0/MarkupSafe-3.0.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:57cb5a3cf367aeb1d316576250f65edec5bb3be939e9247ae594b4bcbc317dfb", size = 20964, upload-time = "2024-10-18T15:20:55.906Z" }, - { url = "https://files.pythonhosted.org/packages/cc/cd/07438f95f83e8bc028279909d9c9bd39e24149b0d60053a97b2bc4f8aa51/MarkupSafe-3.0.2-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:3809ede931876f5b2ec92eef964286840ed3540dadf803dd570c3b7e13141a3b", size = 21977, upload-time = "2024-10-18T15:20:57.189Z" }, - { url = "https://files.pythonhosted.org/packages/29/01/84b57395b4cc062f9c4c55ce0df7d3108ca32397299d9df00fedd9117d3d/MarkupSafe-3.0.2-cp310-cp310-musllinux_1_2_i686.whl", hash = "sha256:e07c3764494e3776c602c1e78e298937c3315ccc9043ead7e685b7f2b8d47b3c", size = 21366, upload-time = "2024-10-18T15:20:58.235Z" }, - { url = "https://files.pythonhosted.org/packages/bd/6e/61ebf08d8940553afff20d1fb1ba7294b6f8d279df9fd0c0db911b4bbcfd/MarkupSafe-3.0.2-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:b424c77b206d63d500bcb69fa55ed8d0e6a3774056bdc4839fc9298a7edca171", size = 21091, upload-time = "2024-10-18T15:20:59.235Z" }, - { url = "https://files.pythonhosted.org/packages/11/23/ffbf53694e8c94ebd1e7e491de185124277964344733c45481f32ede2499/MarkupSafe-3.0.2-cp310-cp310-win32.whl", hash = "sha256:fcabf5ff6eea076f859677f5f0b6b5c1a51e70a376b0579e0eadef8db48c6b50", size = 15065, upload-time = "2024-10-18T15:21:00.307Z" }, - { url = "https://files.pythonhosted.org/packages/44/06/e7175d06dd6e9172d4a69a72592cb3f7a996a9c396eee29082826449bbc3/MarkupSafe-3.0.2-cp310-cp310-win_amd64.whl", hash = "sha256:6af100e168aa82a50e186c82875a5893c5597a0c1ccdb0d8b40240b1f28b969a", size = 15514, upload-time = "2024-10-18T15:21:01.122Z" }, - { url = "https://files.pythonhosted.org/packages/6b/28/bbf83e3f76936960b850435576dd5e67034e200469571be53f69174a2dfd/MarkupSafe-3.0.2-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:9025b4018f3a1314059769c7bf15441064b2207cb3f065e6ea1e7359cb46db9d", size = 14353, upload-time = "2024-10-18T15:21:02.187Z" }, - { url = "https://files.pythonhosted.org/packages/6c/30/316d194b093cde57d448a4c3209f22e3046c5bb2fb0820b118292b334be7/MarkupSafe-3.0.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:93335ca3812df2f366e80509ae119189886b0f3c2b81325d39efdb84a1e2ae93", size = 12392, upload-time = "2024-10-18T15:21:02.941Z" }, - { url = "https://files.pythonhosted.org/packages/f2/96/9cdafba8445d3a53cae530aaf83c38ec64c4d5427d975c974084af5bc5d2/MarkupSafe-3.0.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2cb8438c3cbb25e220c2ab33bb226559e7afb3baec11c4f218ffa7308603c832", size = 23984, upload-time = "2024-10-18T15:21:03.953Z" }, - { url = "https://files.pythonhosted.org/packages/f1/a4/aefb044a2cd8d7334c8a47d3fb2c9f328ac48cb349468cc31c20b539305f/MarkupSafe-3.0.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a123e330ef0853c6e822384873bef7507557d8e4a082961e1defa947aa59ba84", size = 23120, upload-time = "2024-10-18T15:21:06.495Z" }, - { url = "https://files.pythonhosted.org/packages/8d/21/5e4851379f88f3fad1de30361db501300d4f07bcad047d3cb0449fc51f8c/MarkupSafe-3.0.2-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1e084f686b92e5b83186b07e8a17fc09e38fff551f3602b249881fec658d3eca", size = 23032, upload-time = "2024-10-18T15:21:07.295Z" }, - { url = "https://files.pythonhosted.org/packages/00/7b/e92c64e079b2d0d7ddf69899c98842f3f9a60a1ae72657c89ce2655c999d/MarkupSafe-3.0.2-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:d8213e09c917a951de9d09ecee036d5c7d36cb6cb7dbaece4c71a60d79fb9798", size = 24057, upload-time = "2024-10-18T15:21:08.073Z" }, - { url = "https://files.pythonhosted.org/packages/f9/ac/46f960ca323037caa0a10662ef97d0a4728e890334fc156b9f9e52bcc4ca/MarkupSafe-3.0.2-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:5b02fb34468b6aaa40dfc198d813a641e3a63b98c2b05a16b9f80b7ec314185e", size = 23359, upload-time = "2024-10-18T15:21:09.318Z" }, - { url = "https://files.pythonhosted.org/packages/69/84/83439e16197337b8b14b6a5b9c2105fff81d42c2a7c5b58ac7b62ee2c3b1/MarkupSafe-3.0.2-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:0bff5e0ae4ef2e1ae4fdf2dfd5b76c75e5c2fa4132d05fc1b0dabcd20c7e28c4", size = 23306, upload-time = "2024-10-18T15:21:10.185Z" }, - { url = "https://files.pythonhosted.org/packages/9a/34/a15aa69f01e2181ed8d2b685c0d2f6655d5cca2c4db0ddea775e631918cd/MarkupSafe-3.0.2-cp311-cp311-win32.whl", hash = "sha256:6c89876f41da747c8d3677a2b540fb32ef5715f97b66eeb0c6b66f5e3ef6f59d", size = 15094, upload-time = "2024-10-18T15:21:11.005Z" }, - { url = "https://files.pythonhosted.org/packages/da/b8/3a3bd761922d416f3dc5d00bfbed11f66b1ab89a0c2b6e887240a30b0f6b/MarkupSafe-3.0.2-cp311-cp311-win_amd64.whl", hash = "sha256:70a87b411535ccad5ef2f1df5136506a10775d267e197e4cf531ced10537bd6b", size = 15521, upload-time = "2024-10-18T15:21:12.911Z" }, - { url = "https://files.pythonhosted.org/packages/22/09/d1f21434c97fc42f09d290cbb6350d44eb12f09cc62c9476effdb33a18aa/MarkupSafe-3.0.2-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:9778bd8ab0a994ebf6f84c2b949e65736d5575320a17ae8984a77fab08db94cf", size = 14274, upload-time = "2024-10-18T15:21:13.777Z" }, - { url = "https://files.pythonhosted.org/packages/6b/b0/18f76bba336fa5aecf79d45dcd6c806c280ec44538b3c13671d49099fdd0/MarkupSafe-3.0.2-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:846ade7b71e3536c4e56b386c2a47adf5741d2d8b94ec9dc3e92e5e1ee1e2225", size = 12348, upload-time = "2024-10-18T15:21:14.822Z" }, - { url = "https://files.pythonhosted.org/packages/e0/25/dd5c0f6ac1311e9b40f4af06c78efde0f3b5cbf02502f8ef9501294c425b/MarkupSafe-3.0.2-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1c99d261bd2d5f6b59325c92c73df481e05e57f19837bdca8413b9eac4bd8028", size = 24149, upload-time = "2024-10-18T15:21:15.642Z" }, - { url = "https://files.pythonhosted.org/packages/f3/f0/89e7aadfb3749d0f52234a0c8c7867877876e0a20b60e2188e9850794c17/MarkupSafe-3.0.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e17c96c14e19278594aa4841ec148115f9c7615a47382ecb6b82bd8fea3ab0c8", size = 23118, upload-time = "2024-10-18T15:21:17.133Z" }, - { url = "https://files.pythonhosted.org/packages/d5/da/f2eeb64c723f5e3777bc081da884b414671982008c47dcc1873d81f625b6/MarkupSafe-3.0.2-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:88416bd1e65dcea10bc7569faacb2c20ce071dd1f87539ca2ab364bf6231393c", size = 22993, upload-time = "2024-10-18T15:21:18.064Z" }, - { url = "https://files.pythonhosted.org/packages/da/0e/1f32af846df486dce7c227fe0f2398dc7e2e51d4a370508281f3c1c5cddc/MarkupSafe-3.0.2-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:2181e67807fc2fa785d0592dc2d6206c019b9502410671cc905d132a92866557", size = 24178, upload-time = "2024-10-18T15:21:18.859Z" }, - { url = "https://files.pythonhosted.org/packages/c4/f6/bb3ca0532de8086cbff5f06d137064c8410d10779c4c127e0e47d17c0b71/MarkupSafe-3.0.2-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:52305740fe773d09cffb16f8ed0427942901f00adedac82ec8b67752f58a1b22", size = 23319, upload-time = "2024-10-18T15:21:19.671Z" }, - { url = "https://files.pythonhosted.org/packages/a2/82/8be4c96ffee03c5b4a034e60a31294daf481e12c7c43ab8e34a1453ee48b/MarkupSafe-3.0.2-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:ad10d3ded218f1039f11a75f8091880239651b52e9bb592ca27de44eed242a48", size = 23352, upload-time = "2024-10-18T15:21:20.971Z" }, - { url = "https://files.pythonhosted.org/packages/51/ae/97827349d3fcffee7e184bdf7f41cd6b88d9919c80f0263ba7acd1bbcb18/MarkupSafe-3.0.2-cp312-cp312-win32.whl", hash = "sha256:0f4ca02bea9a23221c0182836703cbf8930c5e9454bacce27e767509fa286a30", size = 15097, upload-time = "2024-10-18T15:21:22.646Z" }, - { url = "https://files.pythonhosted.org/packages/c1/80/a61f99dc3a936413c3ee4e1eecac96c0da5ed07ad56fd975f1a9da5bc630/MarkupSafe-3.0.2-cp312-cp312-win_amd64.whl", hash = "sha256:8e06879fc22a25ca47312fbe7c8264eb0b662f6db27cb2d3bbbc74b1df4b9b87", size = 15601, upload-time = "2024-10-18T15:21:23.499Z" }, - { url = "https://files.pythonhosted.org/packages/83/0e/67eb10a7ecc77a0c2bbe2b0235765b98d164d81600746914bebada795e97/MarkupSafe-3.0.2-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:ba9527cdd4c926ed0760bc301f6728ef34d841f405abf9d4f959c478421e4efd", size = 14274, upload-time = "2024-10-18T15:21:24.577Z" }, - { url = "https://files.pythonhosted.org/packages/2b/6d/9409f3684d3335375d04e5f05744dfe7e9f120062c9857df4ab490a1031a/MarkupSafe-3.0.2-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:f8b3d067f2e40fe93e1ccdd6b2e1d16c43140e76f02fb1319a05cf2b79d99430", size = 12352, upload-time = "2024-10-18T15:21:25.382Z" }, - { url = "https://files.pythonhosted.org/packages/d2/f5/6eadfcd3885ea85fe2a7c128315cc1bb7241e1987443d78c8fe712d03091/MarkupSafe-3.0.2-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:569511d3b58c8791ab4c2e1285575265991e6d8f8700c7be0e88f86cb0672094", size = 24122, upload-time = "2024-10-18T15:21:26.199Z" }, - { url = "https://files.pythonhosted.org/packages/0c/91/96cf928db8236f1bfab6ce15ad070dfdd02ed88261c2afafd4b43575e9e9/MarkupSafe-3.0.2-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:15ab75ef81add55874e7ab7055e9c397312385bd9ced94920f2802310c930396", size = 23085, upload-time = "2024-10-18T15:21:27.029Z" }, - { url = "https://files.pythonhosted.org/packages/c2/cf/c9d56af24d56ea04daae7ac0940232d31d5a8354f2b457c6d856b2057d69/MarkupSafe-3.0.2-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f3818cb119498c0678015754eba762e0d61e5b52d34c8b13d770f0719f7b1d79", size = 22978, upload-time = "2024-10-18T15:21:27.846Z" }, - { url = "https://files.pythonhosted.org/packages/2a/9f/8619835cd6a711d6272d62abb78c033bda638fdc54c4e7f4272cf1c0962b/MarkupSafe-3.0.2-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:cdb82a876c47801bb54a690c5ae105a46b392ac6099881cdfb9f6e95e4014c6a", size = 24208, upload-time = "2024-10-18T15:21:28.744Z" }, - { url = "https://files.pythonhosted.org/packages/f9/bf/176950a1792b2cd2102b8ffeb5133e1ed984547b75db47c25a67d3359f77/MarkupSafe-3.0.2-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:cabc348d87e913db6ab4aa100f01b08f481097838bdddf7c7a84b7575b7309ca", size = 23357, upload-time = "2024-10-18T15:21:29.545Z" }, - { url = "https://files.pythonhosted.org/packages/ce/4f/9a02c1d335caabe5c4efb90e1b6e8ee944aa245c1aaaab8e8a618987d816/MarkupSafe-3.0.2-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:444dcda765c8a838eaae23112db52f1efaf750daddb2d9ca300bcae1039adc5c", size = 23344, upload-time = "2024-10-18T15:21:30.366Z" }, - { url = "https://files.pythonhosted.org/packages/ee/55/c271b57db36f748f0e04a759ace9f8f759ccf22b4960c270c78a394f58be/MarkupSafe-3.0.2-cp313-cp313-win32.whl", hash = "sha256:bcf3e58998965654fdaff38e58584d8937aa3096ab5354d493c77d1fdd66d7a1", size = 15101, upload-time = "2024-10-18T15:21:31.207Z" }, - { url = "https://files.pythonhosted.org/packages/29/88/07df22d2dd4df40aba9f3e402e6dc1b8ee86297dddbad4872bd5e7b0094f/MarkupSafe-3.0.2-cp313-cp313-win_amd64.whl", hash = "sha256:e6a2a455bd412959b57a172ce6328d2dd1f01cb2135efda2e4576e8a23fa3b0f", size = 15603, upload-time = "2024-10-18T15:21:32.032Z" }, - { url = "https://files.pythonhosted.org/packages/62/6a/8b89d24db2d32d433dffcd6a8779159da109842434f1dd2f6e71f32f738c/MarkupSafe-3.0.2-cp313-cp313t-macosx_10_13_universal2.whl", hash = "sha256:b5a6b3ada725cea8a5e634536b1b01c30bcdcd7f9c6fff4151548d5bf6b3a36c", size = 14510, upload-time = "2024-10-18T15:21:33.625Z" }, - { url = "https://files.pythonhosted.org/packages/7a/06/a10f955f70a2e5a9bf78d11a161029d278eeacbd35ef806c3fd17b13060d/MarkupSafe-3.0.2-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:a904af0a6162c73e3edcb969eeeb53a63ceeb5d8cf642fade7d39e7963a22ddb", size = 12486, upload-time = "2024-10-18T15:21:34.611Z" }, - { url = "https://files.pythonhosted.org/packages/34/cf/65d4a571869a1a9078198ca28f39fba5fbb910f952f9dbc5220afff9f5e6/MarkupSafe-3.0.2-cp313-cp313t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4aa4e5faecf353ed117801a068ebab7b7e09ffb6e1d5e412dc852e0da018126c", size = 25480, upload-time = "2024-10-18T15:21:35.398Z" }, - { url = "https://files.pythonhosted.org/packages/0c/e3/90e9651924c430b885468b56b3d597cabf6d72be4b24a0acd1fa0e12af67/MarkupSafe-3.0.2-cp313-cp313t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c0ef13eaeee5b615fb07c9a7dadb38eac06a0608b41570d8ade51c56539e509d", size = 23914, upload-time = "2024-10-18T15:21:36.231Z" }, - { url = "https://files.pythonhosted.org/packages/66/8c/6c7cf61f95d63bb866db39085150df1f2a5bd3335298f14a66b48e92659c/MarkupSafe-3.0.2-cp313-cp313t-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d16a81a06776313e817c951135cf7340a3e91e8c1ff2fac444cfd75fffa04afe", size = 23796, upload-time = "2024-10-18T15:21:37.073Z" }, - { url = "https://files.pythonhosted.org/packages/bb/35/cbe9238ec3f47ac9a7c8b3df7a808e7cb50fe149dc7039f5f454b3fba218/MarkupSafe-3.0.2-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:6381026f158fdb7c72a168278597a5e3a5222e83ea18f543112b2662a9b699c5", size = 25473, upload-time = "2024-10-18T15:21:37.932Z" }, - { url = "https://files.pythonhosted.org/packages/e6/32/7621a4382488aa283cc05e8984a9c219abad3bca087be9ec77e89939ded9/MarkupSafe-3.0.2-cp313-cp313t-musllinux_1_2_i686.whl", hash = "sha256:3d79d162e7be8f996986c064d1c7c817f6df3a77fe3d6859f6f9e7be4b8c213a", size = 24114, upload-time = "2024-10-18T15:21:39.799Z" }, - { url = "https://files.pythonhosted.org/packages/0d/80/0985960e4b89922cb5a0bac0ed39c5b96cbc1a536a99f30e8c220a996ed9/MarkupSafe-3.0.2-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:131a3c7689c85f5ad20f9f6fb1b866f402c445b220c19fe4308c0b147ccd2ad9", size = 24098, upload-time = "2024-10-18T15:21:40.813Z" }, - { url = "https://files.pythonhosted.org/packages/82/78/fedb03c7d5380df2427038ec8d973587e90561b2d90cd472ce9254cf348b/MarkupSafe-3.0.2-cp313-cp313t-win32.whl", hash = "sha256:ba8062ed2cf21c07a9e295d5b8a2a5ce678b913b45fdf68c32d95d6c1291e0b6", size = 15208, upload-time = "2024-10-18T15:21:41.814Z" }, - { url = "https://files.pythonhosted.org/packages/4f/65/6079a46068dfceaeabb5dcad6d674f5f5c61a6fa5673746f42a9f4c233b3/MarkupSafe-3.0.2-cp313-cp313t-win_amd64.whl", hash = "sha256:e444a31f8db13eb18ada366ab3cf45fd4b31e4db1236a4448f68778c1d1a5a2f", size = 15739, upload-time = "2024-10-18T15:21:42.784Z" }, +version = "3.0.3" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/7e/99/7690b6d4034fffd95959cbe0c02de8deb3098cc577c67bb6a24fe5d7caa7/markupsafe-3.0.3.tar.gz", hash = "sha256:722695808f4b6457b320fdc131280796bdceb04ab50fe1795cd540799ebe1698", size = 80313, upload-time = "2025-09-27T18:37:40.426Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/e8/4b/3541d44f3937ba468b75da9eebcae497dcf67adb65caa16760b0a6807ebb/markupsafe-3.0.3-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:2f981d352f04553a7171b8e44369f2af4055f888dfb147d55e42d29e29e74559", size = 11631, upload-time = "2025-09-27T18:36:05.558Z" }, + { url = "https://files.pythonhosted.org/packages/98/1b/fbd8eed11021cabd9226c37342fa6ca4e8a98d8188a8d9b66740494960e4/markupsafe-3.0.3-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:e1c1493fb6e50ab01d20a22826e57520f1284df32f2d8601fdd90b6304601419", size = 12057, upload-time = "2025-09-27T18:36:07.165Z" }, + { url = "https://files.pythonhosted.org/packages/40/01/e560d658dc0bb8ab762670ece35281dec7b6c1b33f5fbc09ebb57a185519/markupsafe-3.0.3-cp310-cp310-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:1ba88449deb3de88bd40044603fafffb7bc2b055d626a330323a9ed736661695", size = 22050, upload-time = "2025-09-27T18:36:08.005Z" }, + { url = "https://files.pythonhosted.org/packages/af/cd/ce6e848bbf2c32314c9b237839119c5a564a59725b53157c856e90937b7a/markupsafe-3.0.3-cp310-cp310-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:f42d0984e947b8adf7dd6dde396e720934d12c506ce84eea8476409563607591", size = 20681, upload-time = "2025-09-27T18:36:08.881Z" }, + { url = "https://files.pythonhosted.org/packages/c9/2a/b5c12c809f1c3045c4d580b035a743d12fcde53cf685dbc44660826308da/markupsafe-3.0.3-cp310-cp310-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:c0c0b3ade1c0b13b936d7970b1d37a57acde9199dc2aecc4c336773e1d86049c", size = 20705, upload-time = "2025-09-27T18:36:10.131Z" }, + { url = "https://files.pythonhosted.org/packages/cf/e3/9427a68c82728d0a88c50f890d0fc072a1484de2f3ac1ad0bfc1a7214fd5/markupsafe-3.0.3-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:0303439a41979d9e74d18ff5e2dd8c43ed6c6001fd40e5bf2e43f7bd9bbc523f", size = 21524, upload-time = "2025-09-27T18:36:11.324Z" }, + { url = "https://files.pythonhosted.org/packages/bc/36/23578f29e9e582a4d0278e009b38081dbe363c5e7165113fad546918a232/markupsafe-3.0.3-cp310-cp310-musllinux_1_2_riscv64.whl", hash = "sha256:d2ee202e79d8ed691ceebae8e0486bd9a2cd4794cec4824e1c99b6f5009502f6", size = 20282, upload-time = "2025-09-27T18:36:12.573Z" }, + { url = "https://files.pythonhosted.org/packages/56/21/dca11354e756ebd03e036bd8ad58d6d7168c80ce1fe5e75218e4945cbab7/markupsafe-3.0.3-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:177b5253b2834fe3678cb4a5f0059808258584c559193998be2601324fdeafb1", size = 20745, upload-time = "2025-09-27T18:36:13.504Z" }, + { url = "https://files.pythonhosted.org/packages/87/99/faba9369a7ad6e4d10b6a5fbf71fa2a188fe4a593b15f0963b73859a1bbd/markupsafe-3.0.3-cp310-cp310-win32.whl", hash = "sha256:2a15a08b17dd94c53a1da0438822d70ebcd13f8c3a95abe3a9ef9f11a94830aa", size = 14571, upload-time = "2025-09-27T18:36:14.779Z" }, + { url = "https://files.pythonhosted.org/packages/d6/25/55dc3ab959917602c96985cb1253efaa4ff42f71194bddeb61eb7278b8be/markupsafe-3.0.3-cp310-cp310-win_amd64.whl", hash = "sha256:c4ffb7ebf07cfe8931028e3e4c85f0357459a3f9f9490886198848f4fa002ec8", size = 15056, upload-time = "2025-09-27T18:36:16.125Z" }, + { url = "https://files.pythonhosted.org/packages/d0/9e/0a02226640c255d1da0b8d12e24ac2aa6734da68bff14c05dd53b94a0fc3/markupsafe-3.0.3-cp310-cp310-win_arm64.whl", hash = "sha256:e2103a929dfa2fcaf9bb4e7c091983a49c9ac3b19c9061b6d5427dd7d14d81a1", size = 13932, upload-time = "2025-09-27T18:36:17.311Z" }, + { url = "https://files.pythonhosted.org/packages/08/db/fefacb2136439fc8dd20e797950e749aa1f4997ed584c62cfb8ef7c2be0e/markupsafe-3.0.3-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:1cc7ea17a6824959616c525620e387f6dd30fec8cb44f649e31712db02123dad", size = 11631, upload-time = "2025-09-27T18:36:18.185Z" }, + { url = "https://files.pythonhosted.org/packages/e1/2e/5898933336b61975ce9dc04decbc0a7f2fee78c30353c5efba7f2d6ff27a/markupsafe-3.0.3-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:4bd4cd07944443f5a265608cc6aab442e4f74dff8088b0dfc8238647b8f6ae9a", size = 12058, upload-time = "2025-09-27T18:36:19.444Z" }, + { url = "https://files.pythonhosted.org/packages/1d/09/adf2df3699d87d1d8184038df46a9c80d78c0148492323f4693df54e17bb/markupsafe-3.0.3-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6b5420a1d9450023228968e7e6a9ce57f65d148ab56d2313fcd589eee96a7a50", size = 24287, upload-time = "2025-09-27T18:36:20.768Z" }, + { url = "https://files.pythonhosted.org/packages/30/ac/0273f6fcb5f42e314c6d8cd99effae6a5354604d461b8d392b5ec9530a54/markupsafe-3.0.3-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:0bf2a864d67e76e5c9a34dc26ec616a66b9888e25e7b9460e1c76d3293bd9dbf", size = 22940, upload-time = "2025-09-27T18:36:22.249Z" }, + { url = "https://files.pythonhosted.org/packages/19/ae/31c1be199ef767124c042c6c3e904da327a2f7f0cd63a0337e1eca2967a8/markupsafe-3.0.3-cp311-cp311-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:bc51efed119bc9cfdf792cdeaa4d67e8f6fcccab66ed4bfdd6bde3e59bfcbb2f", size = 21887, upload-time = "2025-09-27T18:36:23.535Z" }, + { url = "https://files.pythonhosted.org/packages/b2/76/7edcab99d5349a4532a459e1fe64f0b0467a3365056ae550d3bcf3f79e1e/markupsafe-3.0.3-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:068f375c472b3e7acbe2d5318dea141359e6900156b5b2ba06a30b169086b91a", size = 23692, upload-time = "2025-09-27T18:36:24.823Z" }, + { url = "https://files.pythonhosted.org/packages/a4/28/6e74cdd26d7514849143d69f0bf2399f929c37dc2b31e6829fd2045b2765/markupsafe-3.0.3-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:7be7b61bb172e1ed687f1754f8e7484f1c8019780f6f6b0786e76bb01c2ae115", size = 21471, upload-time = "2025-09-27T18:36:25.95Z" }, + { url = "https://files.pythonhosted.org/packages/62/7e/a145f36a5c2945673e590850a6f8014318d5577ed7e5920a4b3448e0865d/markupsafe-3.0.3-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:f9e130248f4462aaa8e2552d547f36ddadbeaa573879158d721bbd33dfe4743a", size = 22923, upload-time = "2025-09-27T18:36:27.109Z" }, + { url = "https://files.pythonhosted.org/packages/0f/62/d9c46a7f5c9adbeeeda52f5b8d802e1094e9717705a645efc71b0913a0a8/markupsafe-3.0.3-cp311-cp311-win32.whl", hash = "sha256:0db14f5dafddbb6d9208827849fad01f1a2609380add406671a26386cdf15a19", size = 14572, upload-time = "2025-09-27T18:36:28.045Z" }, + { url = "https://files.pythonhosted.org/packages/83/8a/4414c03d3f891739326e1783338e48fb49781cc915b2e0ee052aa490d586/markupsafe-3.0.3-cp311-cp311-win_amd64.whl", hash = "sha256:de8a88e63464af587c950061a5e6a67d3632e36df62b986892331d4620a35c01", size = 15077, upload-time = "2025-09-27T18:36:29.025Z" }, + { url = "https://files.pythonhosted.org/packages/35/73/893072b42e6862f319b5207adc9ae06070f095b358655f077f69a35601f0/markupsafe-3.0.3-cp311-cp311-win_arm64.whl", hash = "sha256:3b562dd9e9ea93f13d53989d23a7e775fdfd1066c33494ff43f5418bc8c58a5c", size = 13876, upload-time = "2025-09-27T18:36:29.954Z" }, + { url = "https://files.pythonhosted.org/packages/5a/72/147da192e38635ada20e0a2e1a51cf8823d2119ce8883f7053879c2199b5/markupsafe-3.0.3-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:d53197da72cc091b024dd97249dfc7794d6a56530370992a5e1a08983ad9230e", size = 11615, upload-time = "2025-09-27T18:36:30.854Z" }, + { url = "https://files.pythonhosted.org/packages/9a/81/7e4e08678a1f98521201c3079f77db69fb552acd56067661f8c2f534a718/markupsafe-3.0.3-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:1872df69a4de6aead3491198eaf13810b565bdbeec3ae2dc8780f14458ec73ce", size = 12020, upload-time = "2025-09-27T18:36:31.971Z" }, + { url = "https://files.pythonhosted.org/packages/1e/2c/799f4742efc39633a1b54a92eec4082e4f815314869865d876824c257c1e/markupsafe-3.0.3-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:3a7e8ae81ae39e62a41ec302f972ba6ae23a5c5396c8e60113e9066ef893da0d", size = 24332, upload-time = "2025-09-27T18:36:32.813Z" }, + { url = "https://files.pythonhosted.org/packages/3c/2e/8d0c2ab90a8c1d9a24f0399058ab8519a3279d1bd4289511d74e909f060e/markupsafe-3.0.3-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:d6dd0be5b5b189d31db7cda48b91d7e0a9795f31430b7f271219ab30f1d3ac9d", size = 22947, upload-time = "2025-09-27T18:36:33.86Z" }, + { url = "https://files.pythonhosted.org/packages/2c/54/887f3092a85238093a0b2154bd629c89444f395618842e8b0c41783898ea/markupsafe-3.0.3-cp312-cp312-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:94c6f0bb423f739146aec64595853541634bde58b2135f27f61c1ffd1cd4d16a", size = 21962, upload-time = "2025-09-27T18:36:35.099Z" }, + { url = "https://files.pythonhosted.org/packages/c9/2f/336b8c7b6f4a4d95e91119dc8521402461b74a485558d8f238a68312f11c/markupsafe-3.0.3-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:be8813b57049a7dc738189df53d69395eba14fb99345e0a5994914a3864c8a4b", size = 23760, upload-time = "2025-09-27T18:36:36.001Z" }, + { url = "https://files.pythonhosted.org/packages/32/43/67935f2b7e4982ffb50a4d169b724d74b62a3964bc1a9a527f5ac4f1ee2b/markupsafe-3.0.3-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:83891d0e9fb81a825d9a6d61e3f07550ca70a076484292a70fde82c4b807286f", size = 21529, upload-time = "2025-09-27T18:36:36.906Z" }, + { url = "https://files.pythonhosted.org/packages/89/e0/4486f11e51bbba8b0c041098859e869e304d1c261e59244baa3d295d47b7/markupsafe-3.0.3-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:77f0643abe7495da77fb436f50f8dab76dbc6e5fd25d39589a0f1fe6548bfa2b", size = 23015, upload-time = "2025-09-27T18:36:37.868Z" }, + { url = "https://files.pythonhosted.org/packages/2f/e1/78ee7a023dac597a5825441ebd17170785a9dab23de95d2c7508ade94e0e/markupsafe-3.0.3-cp312-cp312-win32.whl", hash = "sha256:d88b440e37a16e651bda4c7c2b930eb586fd15ca7406cb39e211fcff3bf3017d", size = 14540, upload-time = "2025-09-27T18:36:38.761Z" }, + { url = "https://files.pythonhosted.org/packages/aa/5b/bec5aa9bbbb2c946ca2733ef9c4ca91c91b6a24580193e891b5f7dbe8e1e/markupsafe-3.0.3-cp312-cp312-win_amd64.whl", hash = "sha256:26a5784ded40c9e318cfc2bdb30fe164bdb8665ded9cd64d500a34fb42067b1c", size = 15105, upload-time = "2025-09-27T18:36:39.701Z" }, + { url = "https://files.pythonhosted.org/packages/e5/f1/216fc1bbfd74011693a4fd837e7026152e89c4bcf3e77b6692fba9923123/markupsafe-3.0.3-cp312-cp312-win_arm64.whl", hash = "sha256:35add3b638a5d900e807944a078b51922212fb3dedb01633a8defc4b01a3c85f", size = 13906, upload-time = "2025-09-27T18:36:40.689Z" }, + { url = "https://files.pythonhosted.org/packages/38/2f/907b9c7bbba283e68f20259574b13d005c121a0fa4c175f9bed27c4597ff/markupsafe-3.0.3-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:e1cf1972137e83c5d4c136c43ced9ac51d0e124706ee1c8aa8532c1287fa8795", size = 11622, upload-time = "2025-09-27T18:36:41.777Z" }, + { url = "https://files.pythonhosted.org/packages/9c/d9/5f7756922cdd676869eca1c4e3c0cd0df60ed30199ffd775e319089cb3ed/markupsafe-3.0.3-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:116bb52f642a37c115f517494ea5feb03889e04df47eeff5b130b1808ce7c219", size = 12029, upload-time = "2025-09-27T18:36:43.257Z" }, + { url = "https://files.pythonhosted.org/packages/00/07/575a68c754943058c78f30db02ee03a64b3c638586fba6a6dd56830b30a3/markupsafe-3.0.3-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:133a43e73a802c5562be9bbcd03d090aa5a1fe899db609c29e8c8d815c5f6de6", size = 24374, upload-time = "2025-09-27T18:36:44.508Z" }, + { url = "https://files.pythonhosted.org/packages/a9/21/9b05698b46f218fc0e118e1f8168395c65c8a2c750ae2bab54fc4bd4e0e8/markupsafe-3.0.3-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:ccfcd093f13f0f0b7fdd0f198b90053bf7b2f02a3927a30e63f3ccc9df56b676", size = 22980, upload-time = "2025-09-27T18:36:45.385Z" }, + { url = "https://files.pythonhosted.org/packages/7f/71/544260864f893f18b6827315b988c146b559391e6e7e8f7252839b1b846a/markupsafe-3.0.3-cp313-cp313-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:509fa21c6deb7a7a273d629cf5ec029bc209d1a51178615ddf718f5918992ab9", size = 21990, upload-time = "2025-09-27T18:36:46.916Z" }, + { url = "https://files.pythonhosted.org/packages/c2/28/b50fc2f74d1ad761af2f5dcce7492648b983d00a65b8c0e0cb457c82ebbe/markupsafe-3.0.3-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:a4afe79fb3de0b7097d81da19090f4df4f8d3a2b3adaa8764138aac2e44f3af1", size = 23784, upload-time = "2025-09-27T18:36:47.884Z" }, + { url = "https://files.pythonhosted.org/packages/ed/76/104b2aa106a208da8b17a2fb72e033a5a9d7073c68f7e508b94916ed47a9/markupsafe-3.0.3-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:795e7751525cae078558e679d646ae45574b47ed6e7771863fcc079a6171a0fc", size = 21588, upload-time = "2025-09-27T18:36:48.82Z" }, + { url = "https://files.pythonhosted.org/packages/b5/99/16a5eb2d140087ebd97180d95249b00a03aa87e29cc224056274f2e45fd6/markupsafe-3.0.3-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:8485f406a96febb5140bfeca44a73e3ce5116b2501ac54fe953e488fb1d03b12", size = 23041, upload-time = "2025-09-27T18:36:49.797Z" }, + { url = "https://files.pythonhosted.org/packages/19/bc/e7140ed90c5d61d77cea142eed9f9c303f4c4806f60a1044c13e3f1471d0/markupsafe-3.0.3-cp313-cp313-win32.whl", hash = "sha256:bdd37121970bfd8be76c5fb069c7751683bdf373db1ed6c010162b2a130248ed", size = 14543, upload-time = "2025-09-27T18:36:51.584Z" }, + { url = "https://files.pythonhosted.org/packages/05/73/c4abe620b841b6b791f2edc248f556900667a5a1cf023a6646967ae98335/markupsafe-3.0.3-cp313-cp313-win_amd64.whl", hash = "sha256:9a1abfdc021a164803f4d485104931fb8f8c1efd55bc6b748d2f5774e78b62c5", size = 15113, upload-time = "2025-09-27T18:36:52.537Z" }, + { url = "https://files.pythonhosted.org/packages/f0/3a/fa34a0f7cfef23cf9500d68cb7c32dd64ffd58a12b09225fb03dd37d5b80/markupsafe-3.0.3-cp313-cp313-win_arm64.whl", hash = "sha256:7e68f88e5b8799aa49c85cd116c932a1ac15caaa3f5db09087854d218359e485", size = 13911, upload-time = "2025-09-27T18:36:53.513Z" }, + { url = "https://files.pythonhosted.org/packages/e4/d7/e05cd7efe43a88a17a37b3ae96e79a19e846f3f456fe79c57ca61356ef01/markupsafe-3.0.3-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:218551f6df4868a8d527e3062d0fb968682fe92054e89978594c28e642c43a73", size = 11658, upload-time = "2025-09-27T18:36:54.819Z" }, + { url = "https://files.pythonhosted.org/packages/99/9e/e412117548182ce2148bdeacdda3bb494260c0b0184360fe0d56389b523b/markupsafe-3.0.3-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:3524b778fe5cfb3452a09d31e7b5adefeea8c5be1d43c4f810ba09f2ceb29d37", size = 12066, upload-time = "2025-09-27T18:36:55.714Z" }, + { url = "https://files.pythonhosted.org/packages/bc/e6/fa0ffcda717ef64a5108eaa7b4f5ed28d56122c9a6d70ab8b72f9f715c80/markupsafe-3.0.3-cp313-cp313t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:4e885a3d1efa2eadc93c894a21770e4bc67899e3543680313b09f139e149ab19", size = 25639, upload-time = "2025-09-27T18:36:56.908Z" }, + { url = "https://files.pythonhosted.org/packages/96/ec/2102e881fe9d25fc16cb4b25d5f5cde50970967ffa5dddafdb771237062d/markupsafe-3.0.3-cp313-cp313t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:8709b08f4a89aa7586de0aadc8da56180242ee0ada3999749b183aa23df95025", size = 23569, upload-time = "2025-09-27T18:36:57.913Z" }, + { url = "https://files.pythonhosted.org/packages/4b/30/6f2fce1f1f205fc9323255b216ca8a235b15860c34b6798f810f05828e32/markupsafe-3.0.3-cp313-cp313t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:b8512a91625c9b3da6f127803b166b629725e68af71f8184ae7e7d54686a56d6", size = 23284, upload-time = "2025-09-27T18:36:58.833Z" }, + { url = "https://files.pythonhosted.org/packages/58/47/4a0ccea4ab9f5dcb6f79c0236d954acb382202721e704223a8aafa38b5c8/markupsafe-3.0.3-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:9b79b7a16f7fedff2495d684f2b59b0457c3b493778c9eed31111be64d58279f", size = 24801, upload-time = "2025-09-27T18:36:59.739Z" }, + { url = "https://files.pythonhosted.org/packages/6a/70/3780e9b72180b6fecb83a4814d84c3bf4b4ae4bf0b19c27196104149734c/markupsafe-3.0.3-cp313-cp313t-musllinux_1_2_riscv64.whl", hash = "sha256:12c63dfb4a98206f045aa9563db46507995f7ef6d83b2f68eda65c307c6829eb", size = 22769, upload-time = "2025-09-27T18:37:00.719Z" }, + { url = "https://files.pythonhosted.org/packages/98/c5/c03c7f4125180fc215220c035beac6b9cb684bc7a067c84fc69414d315f5/markupsafe-3.0.3-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:8f71bc33915be5186016f675cd83a1e08523649b0e33efdb898db577ef5bb009", size = 23642, upload-time = "2025-09-27T18:37:01.673Z" }, + { url = "https://files.pythonhosted.org/packages/80/d6/2d1b89f6ca4bff1036499b1e29a1d02d282259f3681540e16563f27ebc23/markupsafe-3.0.3-cp313-cp313t-win32.whl", hash = "sha256:69c0b73548bc525c8cb9a251cddf1931d1db4d2258e9599c28c07ef3580ef354", size = 14612, upload-time = "2025-09-27T18:37:02.639Z" }, + { url = "https://files.pythonhosted.org/packages/2b/98/e48a4bfba0a0ffcf9925fe2d69240bfaa19c6f7507b8cd09c70684a53c1e/markupsafe-3.0.3-cp313-cp313t-win_amd64.whl", hash = "sha256:1b4b79e8ebf6b55351f0d91fe80f893b4743f104bff22e90697db1590e47a218", size = 15200, upload-time = "2025-09-27T18:37:03.582Z" }, + { url = "https://files.pythonhosted.org/packages/0e/72/e3cc540f351f316e9ed0f092757459afbc595824ca724cbc5a5d4263713f/markupsafe-3.0.3-cp313-cp313t-win_arm64.whl", hash = "sha256:ad2cf8aa28b8c020ab2fc8287b0f823d0a7d8630784c31e9ee5edea20f406287", size = 13973, upload-time = "2025-09-27T18:37:04.929Z" }, + { url = "https://files.pythonhosted.org/packages/33/8a/8e42d4838cd89b7dde187011e97fe6c3af66d8c044997d2183fbd6d31352/markupsafe-3.0.3-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:eaa9599de571d72e2daf60164784109f19978b327a3910d3e9de8c97b5b70cfe", size = 11619, upload-time = "2025-09-27T18:37:06.342Z" }, + { url = "https://files.pythonhosted.org/packages/b5/64/7660f8a4a8e53c924d0fa05dc3a55c9cee10bbd82b11c5afb27d44b096ce/markupsafe-3.0.3-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:c47a551199eb8eb2121d4f0f15ae0f923d31350ab9280078d1e5f12b249e0026", size = 12029, upload-time = "2025-09-27T18:37:07.213Z" }, + { url = "https://files.pythonhosted.org/packages/da/ef/e648bfd021127bef5fa12e1720ffed0c6cbb8310c8d9bea7266337ff06de/markupsafe-3.0.3-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:f34c41761022dd093b4b6896d4810782ffbabe30f2d443ff5f083e0cbbb8c737", size = 24408, upload-time = "2025-09-27T18:37:09.572Z" }, + { url = "https://files.pythonhosted.org/packages/41/3c/a36c2450754618e62008bf7435ccb0f88053e07592e6028a34776213d877/markupsafe-3.0.3-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:457a69a9577064c05a97c41f4e65148652db078a3a509039e64d3467b9e7ef97", size = 23005, upload-time = "2025-09-27T18:37:10.58Z" }, + { url = "https://files.pythonhosted.org/packages/bc/20/b7fdf89a8456b099837cd1dc21974632a02a999ec9bf7ca3e490aacd98e7/markupsafe-3.0.3-cp314-cp314-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:e8afc3f2ccfa24215f8cb28dcf43f0113ac3c37c2f0f0806d8c70e4228c5cf4d", size = 22048, upload-time = "2025-09-27T18:37:11.547Z" }, + { url = "https://files.pythonhosted.org/packages/9a/a7/591f592afdc734f47db08a75793a55d7fbcc6902a723ae4cfbab61010cc5/markupsafe-3.0.3-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:ec15a59cf5af7be74194f7ab02d0f59a62bdcf1a537677ce67a2537c9b87fcda", size = 23821, upload-time = "2025-09-27T18:37:12.48Z" }, + { url = "https://files.pythonhosted.org/packages/7d/33/45b24e4f44195b26521bc6f1a82197118f74df348556594bd2262bda1038/markupsafe-3.0.3-cp314-cp314-musllinux_1_2_riscv64.whl", hash = "sha256:0eb9ff8191e8498cca014656ae6b8d61f39da5f95b488805da4bb029cccbfbaf", size = 21606, upload-time = "2025-09-27T18:37:13.485Z" }, + { url = "https://files.pythonhosted.org/packages/ff/0e/53dfaca23a69fbfbbf17a4b64072090e70717344c52eaaaa9c5ddff1e5f0/markupsafe-3.0.3-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:2713baf880df847f2bece4230d4d094280f4e67b1e813eec43b4c0e144a34ffe", size = 23043, upload-time = "2025-09-27T18:37:14.408Z" }, + { url = "https://files.pythonhosted.org/packages/46/11/f333a06fc16236d5238bfe74daccbca41459dcd8d1fa952e8fbd5dccfb70/markupsafe-3.0.3-cp314-cp314-win32.whl", hash = "sha256:729586769a26dbceff69f7a7dbbf59ab6572b99d94576a5592625d5b411576b9", size = 14747, upload-time = "2025-09-27T18:37:15.36Z" }, + { url = "https://files.pythonhosted.org/packages/28/52/182836104b33b444e400b14f797212f720cbc9ed6ba34c800639d154e821/markupsafe-3.0.3-cp314-cp314-win_amd64.whl", hash = "sha256:bdc919ead48f234740ad807933cdf545180bfbe9342c2bb451556db2ed958581", size = 15341, upload-time = "2025-09-27T18:37:16.496Z" }, + { url = "https://files.pythonhosted.org/packages/6f/18/acf23e91bd94fd7b3031558b1f013adfa21a8e407a3fdb32745538730382/markupsafe-3.0.3-cp314-cp314-win_arm64.whl", hash = "sha256:5a7d5dc5140555cf21a6fefbdbf8723f06fcd2f63ef108f2854de715e4422cb4", size = 14073, upload-time = "2025-09-27T18:37:17.476Z" }, + { url = "https://files.pythonhosted.org/packages/3c/f0/57689aa4076e1b43b15fdfa646b04653969d50cf30c32a102762be2485da/markupsafe-3.0.3-cp314-cp314t-macosx_10_13_x86_64.whl", hash = "sha256:1353ef0c1b138e1907ae78e2f6c63ff67501122006b0f9abad68fda5f4ffc6ab", size = 11661, upload-time = "2025-09-27T18:37:18.453Z" }, + { url = "https://files.pythonhosted.org/packages/89/c3/2e67a7ca217c6912985ec766c6393b636fb0c2344443ff9d91404dc4c79f/markupsafe-3.0.3-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:1085e7fbddd3be5f89cc898938f42c0b3c711fdcb37d75221de2666af647c175", size = 12069, upload-time = "2025-09-27T18:37:19.332Z" }, + { url = "https://files.pythonhosted.org/packages/f0/00/be561dce4e6ca66b15276e184ce4b8aec61fe83662cce2f7d72bd3249d28/markupsafe-3.0.3-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:1b52b4fb9df4eb9ae465f8d0c228a00624de2334f216f178a995ccdcf82c4634", size = 25670, upload-time = "2025-09-27T18:37:20.245Z" }, + { url = "https://files.pythonhosted.org/packages/50/09/c419f6f5a92e5fadde27efd190eca90f05e1261b10dbd8cbcb39cd8ea1dc/markupsafe-3.0.3-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:fed51ac40f757d41b7c48425901843666a6677e3e8eb0abcff09e4ba6e664f50", size = 23598, upload-time = "2025-09-27T18:37:21.177Z" }, + { url = "https://files.pythonhosted.org/packages/22/44/a0681611106e0b2921b3033fc19bc53323e0b50bc70cffdd19f7d679bb66/markupsafe-3.0.3-cp314-cp314t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:f190daf01f13c72eac4efd5c430a8de82489d9cff23c364c3ea822545032993e", size = 23261, upload-time = "2025-09-27T18:37:22.167Z" }, + { url = "https://files.pythonhosted.org/packages/5f/57/1b0b3f100259dc9fffe780cfb60d4be71375510e435efec3d116b6436d43/markupsafe-3.0.3-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:e56b7d45a839a697b5eb268c82a71bd8c7f6c94d6fd50c3d577fa39a9f1409f5", size = 24835, upload-time = "2025-09-27T18:37:23.296Z" }, + { url = "https://files.pythonhosted.org/packages/26/6a/4bf6d0c97c4920f1597cc14dd720705eca0bf7c787aebc6bb4d1bead5388/markupsafe-3.0.3-cp314-cp314t-musllinux_1_2_riscv64.whl", hash = "sha256:f3e98bb3798ead92273dc0e5fd0f31ade220f59a266ffd8a4f6065e0a3ce0523", size = 22733, upload-time = "2025-09-27T18:37:24.237Z" }, + { url = "https://files.pythonhosted.org/packages/14/c7/ca723101509b518797fedc2fdf79ba57f886b4aca8a7d31857ba3ee8281f/markupsafe-3.0.3-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:5678211cb9333a6468fb8d8be0305520aa073f50d17f089b5b4b477ea6e67fdc", size = 23672, upload-time = "2025-09-27T18:37:25.271Z" }, + { url = "https://files.pythonhosted.org/packages/fb/df/5bd7a48c256faecd1d36edc13133e51397e41b73bb77e1a69deab746ebac/markupsafe-3.0.3-cp314-cp314t-win32.whl", hash = "sha256:915c04ba3851909ce68ccc2b8e2cd691618c4dc4c4232fb7982bca3f41fd8c3d", size = 14819, upload-time = "2025-09-27T18:37:26.285Z" }, + { url = "https://files.pythonhosted.org/packages/1a/8a/0402ba61a2f16038b48b39bccca271134be00c5c9f0f623208399333c448/markupsafe-3.0.3-cp314-cp314t-win_amd64.whl", hash = "sha256:4faffd047e07c38848ce017e8725090413cd80cbc23d86e55c587bf979e579c9", size = 15426, upload-time = "2025-09-27T18:37:27.316Z" }, + { url = "https://files.pythonhosted.org/packages/70/bc/6f1c2f612465f5fa89b95bead1f44dcb607670fd42891d8fdcd5d039f4f4/markupsafe-3.0.3-cp314-cp314t-win_arm64.whl", hash = "sha256:32001d6a8fc98c8cb5c947787c5d08b0a50663d139f1305bac5885d98d9b40fa", size = 14146, upload-time = "2025-09-27T18:37:28.327Z" }, ] [[package]] name = "mypy" -version = "1.15.0" +version = "1.18.2" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "mypy-extensions" }, + { name = "pathspec" }, { name = "tomli", marker = "python_full_version < '3.11'" }, { name = "typing-extensions" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/ce/43/d5e49a86afa64bd3839ea0d5b9c7103487007d728e1293f52525d6d5486a/mypy-1.15.0.tar.gz", hash = "sha256:404534629d51d3efea5c800ee7c42b72a6554d6c400e6a79eafe15d11341fd43", size = 3239717, upload-time = "2025-02-05T03:50:34.655Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/68/f8/65a7ce8d0e09b6329ad0c8d40330d100ea343bd4dd04c4f8ae26462d0a17/mypy-1.15.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:979e4e1a006511dacf628e36fadfecbcc0160a8af6ca7dad2f5025529e082c13", size = 10738433, upload-time = "2025-02-05T03:49:29.145Z" }, - { url = "https://files.pythonhosted.org/packages/b4/95/9c0ecb8eacfe048583706249439ff52105b3f552ea9c4024166c03224270/mypy-1.15.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:c4bb0e1bd29f7d34efcccd71cf733580191e9a264a2202b0239da95984c5b559", size = 9861472, upload-time = "2025-02-05T03:49:16.986Z" }, - { url = "https://files.pythonhosted.org/packages/84/09/9ec95e982e282e20c0d5407bc65031dfd0f0f8ecc66b69538296e06fcbee/mypy-1.15.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:be68172e9fd9ad8fb876c6389f16d1c1b5f100ffa779f77b1fb2176fcc9ab95b", size = 11611424, upload-time = "2025-02-05T03:49:46.908Z" }, - { url = "https://files.pythonhosted.org/packages/78/13/f7d14e55865036a1e6a0a69580c240f43bc1f37407fe9235c0d4ef25ffb0/mypy-1.15.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:c7be1e46525adfa0d97681432ee9fcd61a3964c2446795714699a998d193f1a3", size = 12365450, upload-time = "2025-02-05T03:50:05.89Z" }, - { url = "https://files.pythonhosted.org/packages/48/e1/301a73852d40c241e915ac6d7bcd7fedd47d519246db2d7b86b9d7e7a0cb/mypy-1.15.0-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:2e2c2e6d3593f6451b18588848e66260ff62ccca522dd231cd4dd59b0160668b", size = 12551765, upload-time = "2025-02-05T03:49:33.56Z" }, - { url = "https://files.pythonhosted.org/packages/77/ba/c37bc323ae5fe7f3f15a28e06ab012cd0b7552886118943e90b15af31195/mypy-1.15.0-cp310-cp310-win_amd64.whl", hash = "sha256:6983aae8b2f653e098edb77f893f7b6aca69f6cffb19b2cc7443f23cce5f4828", size = 9274701, upload-time = "2025-02-05T03:49:38.981Z" }, - { url = "https://files.pythonhosted.org/packages/03/bc/f6339726c627bd7ca1ce0fa56c9ae2d0144604a319e0e339bdadafbbb599/mypy-1.15.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:2922d42e16d6de288022e5ca321cd0618b238cfc5570e0263e5ba0a77dbef56f", size = 10662338, upload-time = "2025-02-05T03:50:17.287Z" }, - { url = "https://files.pythonhosted.org/packages/e2/90/8dcf506ca1a09b0d17555cc00cd69aee402c203911410136cd716559efe7/mypy-1.15.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:2ee2d57e01a7c35de00f4634ba1bbf015185b219e4dc5909e281016df43f5ee5", size = 9787540, upload-time = "2025-02-05T03:49:51.21Z" }, - { url = "https://files.pythonhosted.org/packages/05/05/a10f9479681e5da09ef2f9426f650d7b550d4bafbef683b69aad1ba87457/mypy-1.15.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:973500e0774b85d9689715feeffcc980193086551110fd678ebe1f4342fb7c5e", size = 11538051, upload-time = "2025-02-05T03:50:20.885Z" }, - { url = "https://files.pythonhosted.org/packages/e9/9a/1f7d18b30edd57441a6411fcbc0c6869448d1a4bacbaee60656ac0fc29c8/mypy-1.15.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:5a95fb17c13e29d2d5195869262f8125dfdb5c134dc8d9a9d0aecf7525b10c2c", size = 12286751, upload-time = "2025-02-05T03:49:42.408Z" }, - { url = "https://files.pythonhosted.org/packages/72/af/19ff499b6f1dafcaf56f9881f7a965ac2f474f69f6f618b5175b044299f5/mypy-1.15.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:1905f494bfd7d85a23a88c5d97840888a7bd516545fc5aaedff0267e0bb54e2f", size = 12421783, upload-time = "2025-02-05T03:49:07.707Z" }, - { url = "https://files.pythonhosted.org/packages/96/39/11b57431a1f686c1aed54bf794870efe0f6aeca11aca281a0bd87a5ad42c/mypy-1.15.0-cp311-cp311-win_amd64.whl", hash = "sha256:c9817fa23833ff189db061e6d2eff49b2f3b6ed9856b4a0a73046e41932d744f", size = 9265618, upload-time = "2025-02-05T03:49:54.581Z" }, - { url = "https://files.pythonhosted.org/packages/98/3a/03c74331c5eb8bd025734e04c9840532226775c47a2c39b56a0c8d4f128d/mypy-1.15.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:aea39e0583d05124836ea645f412e88a5c7d0fd77a6d694b60d9b6b2d9f184fd", size = 10793981, upload-time = "2025-02-05T03:50:28.25Z" }, - { url = "https://files.pythonhosted.org/packages/f0/1a/41759b18f2cfd568848a37c89030aeb03534411eef981df621d8fad08a1d/mypy-1.15.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:2f2147ab812b75e5b5499b01ade1f4a81489a147c01585cda36019102538615f", size = 9749175, upload-time = "2025-02-05T03:50:13.411Z" }, - { url = "https://files.pythonhosted.org/packages/12/7e/873481abf1ef112c582db832740f4c11b2bfa510e829d6da29b0ab8c3f9c/mypy-1.15.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:ce436f4c6d218a070048ed6a44c0bbb10cd2cc5e272b29e7845f6a2f57ee4464", size = 11455675, upload-time = "2025-02-05T03:50:31.421Z" }, - { url = "https://files.pythonhosted.org/packages/b3/d0/92ae4cde706923a2d3f2d6c39629134063ff64b9dedca9c1388363da072d/mypy-1.15.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:8023ff13985661b50a5928fc7a5ca15f3d1affb41e5f0a9952cb68ef090b31ee", size = 12410020, upload-time = "2025-02-05T03:48:48.705Z" }, - { url = "https://files.pythonhosted.org/packages/46/8b/df49974b337cce35f828ba6fda228152d6db45fed4c86ba56ffe442434fd/mypy-1.15.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:1124a18bc11a6a62887e3e137f37f53fbae476dc36c185d549d4f837a2a6a14e", size = 12498582, upload-time = "2025-02-05T03:49:03.628Z" }, - { url = "https://files.pythonhosted.org/packages/13/50/da5203fcf6c53044a0b699939f31075c45ae8a4cadf538a9069b165c1050/mypy-1.15.0-cp312-cp312-win_amd64.whl", hash = "sha256:171a9ca9a40cd1843abeca0e405bc1940cd9b305eaeea2dda769ba096932bb22", size = 9366614, upload-time = "2025-02-05T03:50:00.313Z" }, - { url = "https://files.pythonhosted.org/packages/6a/9b/fd2e05d6ffff24d912f150b87db9e364fa8282045c875654ce7e32fffa66/mypy-1.15.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:93faf3fdb04768d44bf28693293f3904bbb555d076b781ad2530214ee53e3445", size = 10788592, upload-time = "2025-02-05T03:48:55.789Z" }, - { url = "https://files.pythonhosted.org/packages/74/37/b246d711c28a03ead1fd906bbc7106659aed7c089d55fe40dd58db812628/mypy-1.15.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:811aeccadfb730024c5d3e326b2fbe9249bb7413553f15499a4050f7c30e801d", size = 9753611, upload-time = "2025-02-05T03:48:44.581Z" }, - { url = "https://files.pythonhosted.org/packages/a6/ac/395808a92e10cfdac8003c3de9a2ab6dc7cde6c0d2a4df3df1b815ffd067/mypy-1.15.0-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:98b7b9b9aedb65fe628c62a6dc57f6d5088ef2dfca37903a7d9ee374d03acca5", size = 11438443, upload-time = "2025-02-05T03:49:25.514Z" }, - { url = "https://files.pythonhosted.org/packages/d2/8b/801aa06445d2de3895f59e476f38f3f8d610ef5d6908245f07d002676cbf/mypy-1.15.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:c43a7682e24b4f576d93072216bf56eeff70d9140241f9edec0c104d0c515036", size = 12402541, upload-time = "2025-02-05T03:49:57.623Z" }, - { url = "https://files.pythonhosted.org/packages/c7/67/5a4268782eb77344cc613a4cf23540928e41f018a9a1ec4c6882baf20ab8/mypy-1.15.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:baefc32840a9f00babd83251560e0ae1573e2f9d1b067719479bfb0e987c6357", size = 12494348, upload-time = "2025-02-05T03:48:52.361Z" }, - { url = "https://files.pythonhosted.org/packages/83/3e/57bb447f7bbbfaabf1712d96f9df142624a386d98fb026a761532526057e/mypy-1.15.0-cp313-cp313-win_amd64.whl", hash = "sha256:b9378e2c00146c44793c98b8d5a61039a048e31f429fb0eb546d93f4b000bedf", size = 9373648, upload-time = "2025-02-05T03:49:11.395Z" }, - { url = "https://files.pythonhosted.org/packages/09/4e/a7d65c7322c510de2c409ff3828b03354a7c43f5a8ed458a7a131b41c7b9/mypy-1.15.0-py3-none-any.whl", hash = "sha256:5469affef548bd1895d86d3bf10ce2b44e33d86923c29e4d675b3e323437ea3e", size = 2221777, upload-time = "2025-02-05T03:50:08.348Z" }, +sdist = { url = "https://files.pythonhosted.org/packages/c0/77/8f0d0001ffad290cef2f7f216f96c814866248a0b92a722365ed54648e7e/mypy-1.18.2.tar.gz", hash = "sha256:06a398102a5f203d7477b2923dda3634c36727fa5c237d8f859ef90c42a9924b", size = 3448846, upload-time = "2025-09-19T00:11:10.519Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/03/6f/657961a0743cff32e6c0611b63ff1c1970a0b482ace35b069203bf705187/mypy-1.18.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:c1eab0cf6294dafe397c261a75f96dc2c31bffe3b944faa24db5def4e2b0f77c", size = 12807973, upload-time = "2025-09-19T00:10:35.282Z" }, + { url = "https://files.pythonhosted.org/packages/10/e9/420822d4f661f13ca8900f5fa239b40ee3be8b62b32f3357df9a3045a08b/mypy-1.18.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:7a780ca61fc239e4865968ebc5240bb3bf610ef59ac398de9a7421b54e4a207e", size = 11896527, upload-time = "2025-09-19T00:10:55.791Z" }, + { url = "https://files.pythonhosted.org/packages/aa/73/a05b2bbaa7005f4642fcfe40fb73f2b4fb6bb44229bd585b5878e9a87ef8/mypy-1.18.2-cp310-cp310-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:448acd386266989ef11662ce3c8011fd2a7b632e0ec7d61a98edd8e27472225b", size = 12507004, upload-time = "2025-09-19T00:11:05.411Z" }, + { url = "https://files.pythonhosted.org/packages/4f/01/f6e4b9f0d031c11ccbd6f17da26564f3a0f3c4155af344006434b0a05a9d/mypy-1.18.2-cp310-cp310-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:f9e171c465ad3901dc652643ee4bffa8e9fef4d7d0eece23b428908c77a76a66", size = 13245947, upload-time = "2025-09-19T00:10:46.923Z" }, + { url = "https://files.pythonhosted.org/packages/d7/97/19727e7499bfa1ae0773d06afd30ac66a58ed7437d940c70548634b24185/mypy-1.18.2-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:592ec214750bc00741af1f80cbf96b5013d81486b7bb24cb052382c19e40b428", size = 13499217, upload-time = "2025-09-19T00:09:39.472Z" }, + { url = "https://files.pythonhosted.org/packages/9f/4f/90dc8c15c1441bf31cf0f9918bb077e452618708199e530f4cbd5cede6ff/mypy-1.18.2-cp310-cp310-win_amd64.whl", hash = "sha256:7fb95f97199ea11769ebe3638c29b550b5221e997c63b14ef93d2e971606ebed", size = 9766753, upload-time = "2025-09-19T00:10:49.161Z" }, + { url = "https://files.pythonhosted.org/packages/88/87/cafd3ae563f88f94eec33f35ff722d043e09832ea8530ef149ec1efbaf08/mypy-1.18.2-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:807d9315ab9d464125aa9fcf6d84fde6e1dc67da0b6f80e7405506b8ac72bc7f", size = 12731198, upload-time = "2025-09-19T00:09:44.857Z" }, + { url = "https://files.pythonhosted.org/packages/0f/e0/1e96c3d4266a06d4b0197ace5356d67d937d8358e2ee3ffac71faa843724/mypy-1.18.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:776bb00de1778caf4db739c6e83919c1d85a448f71979b6a0edd774ea8399341", size = 11817879, upload-time = "2025-09-19T00:09:47.131Z" }, + { url = "https://files.pythonhosted.org/packages/72/ef/0c9ba89eb03453e76bdac5a78b08260a848c7bfc5d6603634774d9cd9525/mypy-1.18.2-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:1379451880512ffce14505493bd9fe469e0697543717298242574882cf8cdb8d", size = 12427292, upload-time = "2025-09-19T00:10:22.472Z" }, + { url = "https://files.pythonhosted.org/packages/1a/52/ec4a061dd599eb8179d5411d99775bec2a20542505988f40fc2fee781068/mypy-1.18.2-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:1331eb7fd110d60c24999893320967594ff84c38ac6d19e0a76c5fd809a84c86", size = 13163750, upload-time = "2025-09-19T00:09:51.472Z" }, + { url = "https://files.pythonhosted.org/packages/c4/5f/2cf2ceb3b36372d51568f2208c021870fe7834cf3186b653ac6446511839/mypy-1.18.2-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:3ca30b50a51e7ba93b00422e486cbb124f1c56a535e20eff7b2d6ab72b3b2e37", size = 13351827, upload-time = "2025-09-19T00:09:58.311Z" }, + { url = "https://files.pythonhosted.org/packages/c8/7d/2697b930179e7277529eaaec1513f8de622818696857f689e4a5432e5e27/mypy-1.18.2-cp311-cp311-win_amd64.whl", hash = "sha256:664dc726e67fa54e14536f6e1224bcfce1d9e5ac02426d2326e2bb4e081d1ce8", size = 9757983, upload-time = "2025-09-19T00:10:09.071Z" }, + { url = "https://files.pythonhosted.org/packages/07/06/dfdd2bc60c66611dd8335f463818514733bc763e4760dee289dcc33df709/mypy-1.18.2-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:33eca32dd124b29400c31d7cf784e795b050ace0e1f91b8dc035672725617e34", size = 12908273, upload-time = "2025-09-19T00:10:58.321Z" }, + { url = "https://files.pythonhosted.org/packages/81/14/6a9de6d13a122d5608e1a04130724caf9170333ac5a924e10f670687d3eb/mypy-1.18.2-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:a3c47adf30d65e89b2dcd2fa32f3aeb5e94ca970d2c15fcb25e297871c8e4764", size = 11920910, upload-time = "2025-09-19T00:10:20.043Z" }, + { url = "https://files.pythonhosted.org/packages/5f/a9/b29de53e42f18e8cc547e38daa9dfa132ffdc64f7250e353f5c8cdd44bee/mypy-1.18.2-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:5d6c838e831a062f5f29d11c9057c6009f60cb294fea33a98422688181fe2893", size = 12465585, upload-time = "2025-09-19T00:10:33.005Z" }, + { url = "https://files.pythonhosted.org/packages/77/ae/6c3d2c7c61ff21f2bee938c917616c92ebf852f015fb55917fd6e2811db2/mypy-1.18.2-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:01199871b6110a2ce984bde85acd481232d17413868c9807e95c1b0739a58914", size = 13348562, upload-time = "2025-09-19T00:10:11.51Z" }, + { url = "https://files.pythonhosted.org/packages/4d/31/aec68ab3b4aebdf8f36d191b0685d99faa899ab990753ca0fee60fb99511/mypy-1.18.2-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:a2afc0fa0b0e91b4599ddfe0f91e2c26c2b5a5ab263737e998d6817874c5f7c8", size = 13533296, upload-time = "2025-09-19T00:10:06.568Z" }, + { url = "https://files.pythonhosted.org/packages/9f/83/abcb3ad9478fca3ebeb6a5358bb0b22c95ea42b43b7789c7fb1297ca44f4/mypy-1.18.2-cp312-cp312-win_amd64.whl", hash = "sha256:d8068d0afe682c7c4897c0f7ce84ea77f6de953262b12d07038f4d296d547074", size = 9828828, upload-time = "2025-09-19T00:10:28.203Z" }, + { url = "https://files.pythonhosted.org/packages/5f/04/7f462e6fbba87a72bc8097b93f6842499c428a6ff0c81dd46948d175afe8/mypy-1.18.2-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:07b8b0f580ca6d289e69209ec9d3911b4a26e5abfde32228a288eb79df129fcc", size = 12898728, upload-time = "2025-09-19T00:10:01.33Z" }, + { url = "https://files.pythonhosted.org/packages/99/5b/61ed4efb64f1871b41fd0b82d29a64640f3516078f6c7905b68ab1ad8b13/mypy-1.18.2-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:ed4482847168439651d3feee5833ccedbf6657e964572706a2adb1f7fa4dfe2e", size = 11910758, upload-time = "2025-09-19T00:10:42.607Z" }, + { url = "https://files.pythonhosted.org/packages/3c/46/d297d4b683cc89a6e4108c4250a6a6b717f5fa96e1a30a7944a6da44da35/mypy-1.18.2-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:c3ad2afadd1e9fea5cf99a45a822346971ede8685cc581ed9cd4d42eaf940986", size = 12475342, upload-time = "2025-09-19T00:11:00.371Z" }, + { url = "https://files.pythonhosted.org/packages/83/45/4798f4d00df13eae3bfdf726c9244bcb495ab5bd588c0eed93a2f2dd67f3/mypy-1.18.2-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:a431a6f1ef14cf8c144c6b14793a23ec4eae3db28277c358136e79d7d062f62d", size = 13338709, upload-time = "2025-09-19T00:11:03.358Z" }, + { url = "https://files.pythonhosted.org/packages/d7/09/479f7358d9625172521a87a9271ddd2441e1dab16a09708f056e97007207/mypy-1.18.2-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:7ab28cc197f1dd77a67e1c6f35cd1f8e8b73ed2217e4fc005f9e6a504e46e7ba", size = 13529806, upload-time = "2025-09-19T00:10:26.073Z" }, + { url = "https://files.pythonhosted.org/packages/71/cf/ac0f2c7e9d0ea3c75cd99dff7aec1c9df4a1376537cb90e4c882267ee7e9/mypy-1.18.2-cp313-cp313-win_amd64.whl", hash = "sha256:0e2785a84b34a72ba55fb5daf079a1003a34c05b22238da94fcae2bbe46f3544", size = 9833262, upload-time = "2025-09-19T00:10:40.035Z" }, + { url = "https://files.pythonhosted.org/packages/5a/0c/7d5300883da16f0063ae53996358758b2a2df2a09c72a5061fa79a1f5006/mypy-1.18.2-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:62f0e1e988ad41c2a110edde6c398383a889d95b36b3e60bcf155f5164c4fdce", size = 12893775, upload-time = "2025-09-19T00:10:03.814Z" }, + { url = "https://files.pythonhosted.org/packages/50/df/2cffbf25737bdb236f60c973edf62e3e7b4ee1c25b6878629e88e2cde967/mypy-1.18.2-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:8795a039bab805ff0c1dfdb8cd3344642c2b99b8e439d057aba30850b8d3423d", size = 11936852, upload-time = "2025-09-19T00:10:51.631Z" }, + { url = "https://files.pythonhosted.org/packages/be/50/34059de13dd269227fb4a03be1faee6e2a4b04a2051c82ac0a0b5a773c9a/mypy-1.18.2-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6ca1e64b24a700ab5ce10133f7ccd956a04715463d30498e64ea8715236f9c9c", size = 12480242, upload-time = "2025-09-19T00:11:07.955Z" }, + { url = "https://files.pythonhosted.org/packages/5b/11/040983fad5132d85914c874a2836252bbc57832065548885b5bb5b0d4359/mypy-1.18.2-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:d924eef3795cc89fecf6bedc6ed32b33ac13e8321344f6ddbf8ee89f706c05cb", size = 13326683, upload-time = "2025-09-19T00:09:55.572Z" }, + { url = "https://files.pythonhosted.org/packages/e9/ba/89b2901dd77414dd7a8c8729985832a5735053be15b744c18e4586e506ef/mypy-1.18.2-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:20c02215a080e3a2be3aa50506c67242df1c151eaba0dcbc1e4e557922a26075", size = 13514749, upload-time = "2025-09-19T00:10:44.827Z" }, + { url = "https://files.pythonhosted.org/packages/25/bc/cc98767cffd6b2928ba680f3e5bc969c4152bf7c2d83f92f5a504b92b0eb/mypy-1.18.2-cp314-cp314-win_amd64.whl", hash = "sha256:749b5f83198f1ca64345603118a6f01a4e99ad4bf9d103ddc5a3200cc4614adf", size = 9982959, upload-time = "2025-09-19T00:10:37.344Z" }, + { url = "https://files.pythonhosted.org/packages/87/e3/be76d87158ebafa0309946c4a73831974d4d6ab4f4ef40c3b53a385a66fd/mypy-1.18.2-py3-none-any.whl", hash = "sha256:22a1748707dd62b58d2ae53562ffc4d7f8bcc727e8ac7cbc69c053ddc874d47e", size = 2352367, upload-time = "2025-09-19T00:10:15.489Z" }, ] [[package]] name = "mypy-extensions" -version = "1.0.0" +version = "1.1.0" source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/98/a4/1ab47638b92648243faf97a5aeb6ea83059cc3624972ab6b8d2316078d3f/mypy_extensions-1.0.0.tar.gz", hash = "sha256:75dbf8955dc00442a438fc4d0666508a9a97b6bd41aa2f0ffe9d2f2725af0782", size = 4433, upload-time = "2023-02-04T12:11:27.157Z" } +sdist = { url = "https://files.pythonhosted.org/packages/a2/6e/371856a3fb9d31ca8dac321cda606860fa4548858c0cc45d9d1d4ca2628b/mypy_extensions-1.1.0.tar.gz", hash = "sha256:52e68efc3284861e772bbcd66823fde5ae21fd2fdb51c62a211403730b916558", size = 6343, upload-time = "2025-04-22T14:54:24.164Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/2a/e2/5d3f6ada4297caebe1a2add3b126fe800c96f56dbe5d1988a2cbe0b267aa/mypy_extensions-1.0.0-py3-none-any.whl", hash = "sha256:4392f6c0eb8a5668a69e23d168ffa70f0be9ccfd32b5cc2d26a34ae5b844552d", size = 4695, upload-time = "2023-02-04T12:11:25.002Z" }, + { url = "https://files.pythonhosted.org/packages/79/7b/2c79738432f5c924bef5071f933bcc9efd0473bac3b4aa584a6f7c1c8df8/mypy_extensions-1.1.0-py3-none-any.whl", hash = "sha256:1be4cccdb0f2482337c4743e60421de3a356cd97508abadd57d47403e94f5505", size = 4963, upload-time = "2025-04-22T14:54:22.983Z" }, ] [[package]] @@ -607,20 +698,29 @@ wheels = [ [[package]] name = "packaging" -version = "24.2" +version = "25.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/a1/d4/1fc4078c65507b51b96ca8f8c3ba19e6a61c8253c72794544580a7b6c24d/packaging-25.0.tar.gz", hash = "sha256:d443872c98d677bf60f6a1f2f8c1cb748e8fe762d2bf9d3148b5599295b0fc4f", size = 165727, upload-time = "2025-04-19T11:48:59.673Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/20/12/38679034af332785aac8774540895e234f4d07f7545804097de4b666afd8/packaging-25.0-py3-none-any.whl", hash = "sha256:29572ef2b1f17581046b3a2227d5c611fb25ec70ca1ba8554b24b0e69331a484", size = 66469, upload-time = "2025-04-19T11:48:57.875Z" }, +] + +[[package]] +name = "pathspec" +version = "0.12.1" source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/d0/63/68dbb6eb2de9cb10ee4c9c14a0148804425e13c4fb20d61cce69f53106da/packaging-24.2.tar.gz", hash = "sha256:c228a6dc5e932d346bc5739379109d49e8853dd8223571c7c5b55260edc0b97f", size = 163950, upload-time = "2024-11-08T09:47:47.202Z" } +sdist = { url = "https://files.pythonhosted.org/packages/ca/bc/f35b8446f4531a7cb215605d100cd88b7ac6f44ab3fc94870c120ab3adbf/pathspec-0.12.1.tar.gz", hash = "sha256:a482d51503a1ab33b1c67a6c3813a26953dbdc71c31dacaef9a838c4e29f5712", size = 51043, upload-time = "2023-12-10T22:30:45Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/88/ef/eb23f262cca3c0c4eb7ab1933c3b1f03d021f2c48f54763065b6f0e321be/packaging-24.2-py3-none-any.whl", hash = "sha256:09abb1bccd265c01f4a3aa3f7a7db064b36514d2cba19a2f694fe6150451a759", size = 65451, upload-time = "2024-11-08T09:47:44.722Z" }, + { url = "https://files.pythonhosted.org/packages/cc/20/ff623b09d963f88bfde16306a54e12ee5ea43e9b597108672ff3a408aad6/pathspec-0.12.1-py3-none-any.whl", hash = "sha256:a0d503e138a4c123b27490a4f7beda6a01c6f288df0e4a8b79c7eb0dc7b4cc08", size = 31191, upload-time = "2023-12-10T22:30:43.14Z" }, ] [[package]] name = "pluggy" -version = "1.5.0" +version = "1.6.0" source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/96/2d/02d4312c973c6050a18b314a5ad0b3210edb65a906f868e31c111dede4a6/pluggy-1.5.0.tar.gz", hash = "sha256:2cffa88e94fdc978c4c574f15f9e59b7f4201d439195c3715ca9e2486f1d0cf1", size = 67955, upload-time = "2024-04-20T21:34:42.531Z" } +sdist = { url = "https://files.pythonhosted.org/packages/f9/e2/3e91f31a7d2b083fe6ef3fa267035b518369d9511ffab804f839851d2779/pluggy-1.6.0.tar.gz", hash = "sha256:7dcc130b76258d33b90f61b658791dede3486c3e6bfb003ee5c9bfb396dd22f3", size = 69412, upload-time = "2025-05-15T12:30:07.975Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/88/5f/e351af9a41f866ac3f1fac4ca0613908d9a41741cfcf2228f4ad853b697d/pluggy-1.5.0-py3-none-any.whl", hash = "sha256:44e1ad92c8ca002de6377e165f3e0f1be63266ab4d554740532335b9d75ea669", size = 20556, upload-time = "2024-04-20T21:34:40.434Z" }, + { url = "https://files.pythonhosted.org/packages/54/20/4d324d65cc6d9205fabedc306948156824eb9f0ee1633355a8f7ec5c66bf/pluggy-1.6.0-py3-none-any.whl", hash = "sha256:e920276dd6813095e9377c0bc5566d94c932c33b27a3e3945d8389c374dd4746", size = 20538, upload-time = "2025-05-15T12:30:06.134Z" }, ] [[package]] @@ -680,16 +780,25 @@ wheels = [ [[package]] name = "pycparser" -version = "2.22" +version = "2.23" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/fe/cf/d2d3b9f5699fb1e4615c8e32ff220203e43b248e1dfcc6736ad9057731ca/pycparser-2.23.tar.gz", hash = "sha256:78816d4f24add8f10a06d6f05b4d424ad9e96cfebf68a4ddc99c65c0720d00c2", size = 173734, upload-time = "2025-09-09T13:23:47.91Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/a0/e3/59cd50310fc9b59512193629e1984c1f95e5c8ae6e5d8c69532ccc65a7fe/pycparser-2.23-py3-none-any.whl", hash = "sha256:e5c6e8d3fbad53479cab09ac03729e0a9faf2bee3db8208a550daf5af81a5934", size = 118140, upload-time = "2025-09-09T13:23:46.651Z" }, +] + +[[package]] +name = "pygments" +version = "2.19.2" source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/1d/b2/31537cf4b1ca988837256c910a668b553fceb8f069bedc4b1c826024b52c/pycparser-2.22.tar.gz", hash = "sha256:491c8be9c040f5390f5bf44a5b07752bd07f56edf992381b05c701439eec10f6", size = 172736, upload-time = "2024-03-30T13:22:22.564Z" } +sdist = { url = "https://files.pythonhosted.org/packages/b0/77/a5b8c569bf593b0140bde72ea885a803b82086995367bf2037de0159d924/pygments-2.19.2.tar.gz", hash = "sha256:636cb2477cec7f8952536970bc533bc43743542f70392ae026374600add5b887", size = 4968631, upload-time = "2025-06-21T13:39:12.283Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/13/a3/a812df4e2dd5696d1f351d58b8fe16a405b234ad2886a0dab9183fb78109/pycparser-2.22-py3-none-any.whl", hash = "sha256:c3702b6d3dd8c7abc1afa565d7e63d53a1d0bd86cdc24edd75470f4de499cfcc", size = 117552, upload-time = "2024-03-30T13:22:20.476Z" }, + { url = "https://files.pythonhosted.org/packages/c7/21/705964c7812476f378728bdf590ca4b771ec72385c533964653c68e86bdc/pygments-2.19.2-py3-none-any.whl", hash = "sha256:86540386c03d588bb81d44bc3928634ff26449851e99741617ecb9037ee5ec0b", size = 1225217, upload-time = "2025-06-21T13:39:07.939Z" }, ] [[package]] name = "pytest" -version = "8.3.5" +version = "8.4.2" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "colorama", marker = "sys_platform == 'win32'" }, @@ -697,33 +806,35 @@ dependencies = [ { name = "iniconfig" }, { name = "packaging" }, { name = "pluggy" }, + { name = "pygments" }, { name = "tomli", marker = "python_full_version < '3.11'" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/ae/3c/c9d525a414d506893f0cd8a8d0de7706446213181570cdbd766691164e40/pytest-8.3.5.tar.gz", hash = "sha256:f4efe70cc14e511565ac476b57c279e12a855b11f48f212af1080ef2263d3845", size = 1450891, upload-time = "2025-03-02T12:54:54.503Z" } +sdist = { url = "https://files.pythonhosted.org/packages/a3/5c/00a0e072241553e1a7496d638deababa67c5058571567b92a7eaa258397c/pytest-8.4.2.tar.gz", hash = "sha256:86c0d0b93306b961d58d62a4db4879f27fe25513d4b969df351abdddb3c30e01", size = 1519618, upload-time = "2025-09-04T14:34:22.711Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/30/3d/64ad57c803f1fa1e963a7946b6e0fea4a70df53c1a7fed304586539c2bac/pytest-8.3.5-py3-none-any.whl", hash = "sha256:c69214aa47deac29fad6c2a4f590b9c4a9fdb16a403176fe154b79c0b4d4d820", size = 343634, upload-time = "2025-03-02T12:54:52.069Z" }, + { url = "https://files.pythonhosted.org/packages/a8/a4/20da314d277121d6534b3a980b29035dcd51e6744bd79075a6ce8fa4eb8d/pytest-8.4.2-py3-none-any.whl", hash = "sha256:872f880de3fc3a5bdc88a11b39c9710c3497a547cfa9320bc3c5e62fbf272e79", size = 365750, upload-time = "2025-09-04T14:34:20.226Z" }, ] [[package]] name = "pytest-cov" -version = "6.0.0" +version = "7.0.0" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "coverage", extra = ["toml"] }, + { name = "pluggy" }, { name = "pytest" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/be/45/9b538de8cef30e17c7b45ef42f538a94889ed6a16f2387a6c89e73220651/pytest-cov-6.0.0.tar.gz", hash = "sha256:fde0b595ca248bb8e2d76f020b465f3b107c9632e6a1d1705f17834c89dcadc0", size = 66945, upload-time = "2024-10-29T20:13:35.363Z" } +sdist = { url = "https://files.pythonhosted.org/packages/5e/f7/c933acc76f5208b3b00089573cf6a2bc26dc80a8aece8f52bb7d6b1855ca/pytest_cov-7.0.0.tar.gz", hash = "sha256:33c97eda2e049a0c5298e91f519302a1334c26ac65c1a483d6206fd458361af1", size = 54328, upload-time = "2025-09-09T10:57:02.113Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/36/3b/48e79f2cd6a61dbbd4807b4ed46cb564b4fd50a76166b1c4ea5c1d9e2371/pytest_cov-6.0.0-py3-none-any.whl", hash = "sha256:eee6f1b9e61008bd34975a4d5bab25801eb31898b032dd55addc93e96fcaaa35", size = 22949, upload-time = "2024-10-29T20:13:33.215Z" }, + { url = "https://files.pythonhosted.org/packages/ee/49/1377b49de7d0c1ce41292161ea0f721913fa8722c19fb9c1e3aa0367eecb/pytest_cov-7.0.0-py3-none-any.whl", hash = "sha256:3b8e9558b16cc1479da72058bdecf8073661c7f57f7d3c5f22a1c23507f2d861", size = 22424, upload-time = "2025-09-09T10:57:00.695Z" }, ] [[package]] name = "python-dotenv" -version = "1.0.1" +version = "1.1.1" source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/bc/57/e84d88dfe0aec03b7a2d4327012c1627ab5f03652216c63d49846d7a6c58/python-dotenv-1.0.1.tar.gz", hash = "sha256:e324ee90a023d808f1959c46bcbc04446a10ced277783dc6ee09987c37ec10ca", size = 39115, upload-time = "2024-01-23T06:33:00.505Z" } +sdist = { url = "https://files.pythonhosted.org/packages/f6/b0/4bc07ccd3572a2f9df7e6782f52b0c6c90dcbb803ac4a167702d7d0dfe1e/python_dotenv-1.1.1.tar.gz", hash = "sha256:a8a6399716257f45be6a007360200409fce5cda2661e3dec71d23dc15f6189ab", size = 41978, upload-time = "2025-06-24T04:21:07.341Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/6a/3e/b68c118422ec867fa7ab88444e1274aa40681c606d59ac27de5a5588f082/python_dotenv-1.0.1-py3-none-any.whl", hash = "sha256:f7b63ef50f1b690dddf550d03497b66d609393b40b564ed0d674909a68ebf16a", size = 19863, upload-time = "2024-01-23T06:32:58.246Z" }, + { url = "https://files.pythonhosted.org/packages/5f/ed/539768cf28c661b5b068d66d96a2f155c4971a5d55684a514c1a0e0dec2f/python_dotenv-1.1.1-py3-none-any.whl", hash = "sha256:31f23644fe2602f88ff55e1f5c79ba497e01224ee7737937930c448e4d0e24dc", size = 20556, upload-time = "2025-06-24T04:21:06.073Z" }, ] [[package]] @@ -737,47 +848,47 @@ wheels = [ [[package]] name = "sqlalchemy" -version = "2.0.38" +version = "2.0.43" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "greenlet", marker = "(python_full_version < '3.14' and platform_machine == 'AMD64') or (python_full_version < '3.14' and platform_machine == 'WIN32') or (python_full_version < '3.14' and platform_machine == 'aarch64') or (python_full_version < '3.14' and platform_machine == 'amd64') or (python_full_version < '3.14' and platform_machine == 'ppc64le') or (python_full_version < '3.14' and platform_machine == 'win32') or (python_full_version < '3.14' and platform_machine == 'x86_64')" }, { name = "typing-extensions" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/e4/08/9a90962ea72acd532bda71249a626344d855c4032603924b1b547694b837/sqlalchemy-2.0.38.tar.gz", hash = "sha256:e5a4d82bdb4bf1ac1285a68eab02d253ab73355d9f0fe725a97e1e0fa689decb", size = 9634782, upload-time = "2025-02-06T20:10:06.676Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/78/10/16ed1503e18c0ec4e17a1819ff44604368607eed3db1e1d89d33269fe5b9/SQLAlchemy-2.0.38-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:5e1d9e429028ce04f187a9f522818386c8b076723cdbe9345708384f49ebcec6", size = 2105151, upload-time = "2025-02-06T22:10:59.068Z" }, - { url = "https://files.pythonhosted.org/packages/79/e5/2e9a0807cba2e625204d04bc39a18a47478e4bacae353ae8a7f2e784c341/SQLAlchemy-2.0.38-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:b87a90f14c68c925817423b0424381f0e16d80fc9a1a1046ef202ab25b19a444", size = 2096335, upload-time = "2025-02-06T22:11:02.765Z" }, - { url = "https://files.pythonhosted.org/packages/c1/97/8fa5cc6ed994eab611dcf0bc431161308f297c6f896f02a3ebb8d8aa06ea/SQLAlchemy-2.0.38-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:402c2316d95ed90d3d3c25ad0390afa52f4d2c56b348f212aa9c8d072a40eee5", size = 3078705, upload-time = "2025-02-06T21:07:05.559Z" }, - { url = "https://files.pythonhosted.org/packages/a9/99/505feb8a9bc7027addaa2b312b8b306319cacbbd8a5231c4123ca1fa082a/SQLAlchemy-2.0.38-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6493bc0eacdbb2c0f0d260d8988e943fee06089cd239bd7f3d0c45d1657a70e2", size = 3086958, upload-time = "2025-02-06T22:20:09.999Z" }, - { url = "https://files.pythonhosted.org/packages/39/26/fb7cef8198bb2627ac527b2cf6c576588db09856d634d4f1017280f8ab64/SQLAlchemy-2.0.38-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:0561832b04c6071bac3aad45b0d3bb6d2c4f46a8409f0a7a9c9fa6673b41bc03", size = 3042798, upload-time = "2025-02-06T21:07:10.355Z" }, - { url = "https://files.pythonhosted.org/packages/cc/7c/b6f9e0ee4e8e993fdce42477f9290b2b8373e672fb1dc0272179f0aeafb4/SQLAlchemy-2.0.38-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:49aa2cdd1e88adb1617c672a09bf4ebf2f05c9448c6dbeba096a3aeeb9d4d443", size = 3068318, upload-time = "2025-02-06T22:20:12.987Z" }, - { url = "https://files.pythonhosted.org/packages/e6/22/903497e8202960c4249ffc340ec8de63f7fbdd4856bdfe854f617e124e90/SQLAlchemy-2.0.38-cp310-cp310-win32.whl", hash = "sha256:64aa8934200e222f72fcfd82ee71c0130a9c07d5725af6fe6e919017d095b297", size = 2077434, upload-time = "2025-02-06T20:26:52.492Z" }, - { url = "https://files.pythonhosted.org/packages/20/a8/08f6ceccff5e0abb4a22e2e91c44b0e39911fda06b5d0c905dfc642de57a/SQLAlchemy-2.0.38-cp310-cp310-win_amd64.whl", hash = "sha256:c57b8e0841f3fce7b703530ed70c7c36269c6d180ea2e02e36b34cb7288c50c7", size = 2101608, upload-time = "2025-02-06T20:26:54.261Z" }, - { url = "https://files.pythonhosted.org/packages/00/6c/9d3a638f297fce288ba12a4e5dbd08ef1841d119abee9300c100eba00217/SQLAlchemy-2.0.38-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:bf89e0e4a30714b357f5d46b6f20e0099d38b30d45fa68ea48589faf5f12f62d", size = 2106330, upload-time = "2025-02-06T22:11:05.22Z" }, - { url = "https://files.pythonhosted.org/packages/0e/57/d5fdee56f418491267701965795805662b1744de40915d4764451390536d/SQLAlchemy-2.0.38-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:8455aa60da49cb112df62b4721bd8ad3654a3a02b9452c783e651637a1f21fa2", size = 2096730, upload-time = "2025-02-06T22:11:07.515Z" }, - { url = "https://files.pythonhosted.org/packages/42/84/205f423f8b28329c47237b7e130a7f93c234a49fab20b4534bd1ff26a06a/SQLAlchemy-2.0.38-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f53c0d6a859b2db58332e0e6a921582a02c1677cc93d4cbb36fdf49709b327b2", size = 3215023, upload-time = "2025-02-06T21:07:11.976Z" }, - { url = "https://files.pythonhosted.org/packages/77/41/94a558d47bffae5a361b0cfb3721324ea4154829dd5432f80bd4cfeecbc9/SQLAlchemy-2.0.38-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b3c4817dff8cef5697f5afe5fec6bc1783994d55a68391be24cb7d80d2dbc3a6", size = 3214991, upload-time = "2025-02-06T22:20:14.923Z" }, - { url = "https://files.pythonhosted.org/packages/74/a0/cc3c030e7440bd17ce67c1875f50edb41d0ef17b9c76fbc290ef27bbe37f/SQLAlchemy-2.0.38-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:c9cea5b756173bb86e2235f2f871b406a9b9d722417ae31e5391ccaef5348f2c", size = 3151854, upload-time = "2025-02-06T21:07:13.669Z" }, - { url = "https://files.pythonhosted.org/packages/24/ab/8ba2588c2eb1d092944551354d775ef4fc0250badede324d786a4395d10e/SQLAlchemy-2.0.38-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:40e9cdbd18c1f84631312b64993f7d755d85a3930252f6276a77432a2b25a2f3", size = 3172158, upload-time = "2025-02-06T22:20:16.889Z" }, - { url = "https://files.pythonhosted.org/packages/e0/73/2a3d6217e8e6abb553ed410ce5adc0bdec7effd684716f0fbaee5831d677/SQLAlchemy-2.0.38-cp311-cp311-win32.whl", hash = "sha256:cb39ed598aaf102251483f3e4675c5dd6b289c8142210ef76ba24aae0a8f8aba", size = 2076965, upload-time = "2025-02-06T20:26:56.673Z" }, - { url = "https://files.pythonhosted.org/packages/a4/17/364a99c8c5698492c7fa40fc463bf388f05b0b03b74028828b71a79dc89d/SQLAlchemy-2.0.38-cp311-cp311-win_amd64.whl", hash = "sha256:f9d57f1b3061b3e21476b0ad5f0397b112b94ace21d1f439f2db472e568178ae", size = 2102169, upload-time = "2025-02-06T20:26:59.431Z" }, - { url = "https://files.pythonhosted.org/packages/5a/f8/6d0424af1442c989b655a7b5f608bc2ae5e4f94cdf6df9f6054f629dc587/SQLAlchemy-2.0.38-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:12d5b06a1f3aeccf295a5843c86835033797fea292c60e72b07bcb5d820e6dd3", size = 2104927, upload-time = "2025-02-06T22:17:56.183Z" }, - { url = "https://files.pythonhosted.org/packages/25/80/fc06e65fca0a19533e2bfab633a5633ed8b6ee0b9c8d580acf84609ce4da/SQLAlchemy-2.0.38-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:e036549ad14f2b414c725349cce0772ea34a7ab008e9cd67f9084e4f371d1f32", size = 2095317, upload-time = "2025-02-06T22:17:58.415Z" }, - { url = "https://files.pythonhosted.org/packages/98/2d/5d66605f76b8e344813237dc160a01f03b987201e974b46056a7fb94a874/SQLAlchemy-2.0.38-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ee3bee874cb1fadee2ff2b79fc9fc808aa638670f28b2145074538d4a6a5028e", size = 3244735, upload-time = "2025-02-06T21:07:23.301Z" }, - { url = "https://files.pythonhosted.org/packages/73/8d/b0539e8dce90861efc38fea3eefb15a5d0cfeacf818614762e77a9f192f9/SQLAlchemy-2.0.38-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e185ea07a99ce8b8edfc788c586c538c4b1351007e614ceb708fd01b095ef33e", size = 3255581, upload-time = "2025-02-06T22:19:24.166Z" }, - { url = "https://files.pythonhosted.org/packages/ac/a5/94e1e44bf5bdffd1782807fcc072542b110b950f0be53f49e68b5f5eca1b/SQLAlchemy-2.0.38-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:b79ee64d01d05a5476d5cceb3c27b5535e6bb84ee0f872ba60d9a8cd4d0e6579", size = 3190877, upload-time = "2025-02-06T21:07:27.462Z" }, - { url = "https://files.pythonhosted.org/packages/91/13/f08b09996dce945aec029c64f61c13b4788541ac588d9288e31e0d3d8850/SQLAlchemy-2.0.38-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:afd776cf1ebfc7f9aa42a09cf19feadb40a26366802d86c1fba080d8e5e74bdd", size = 3217485, upload-time = "2025-02-06T22:19:26.521Z" }, - { url = "https://files.pythonhosted.org/packages/13/8f/8cfe2ba5ba6d8090f4de0e658330c53be6b7bf430a8df1b141c2b180dcdf/SQLAlchemy-2.0.38-cp312-cp312-win32.whl", hash = "sha256:a5645cd45f56895cfe3ca3459aed9ff2d3f9aaa29ff7edf557fa7a23515a3725", size = 2075254, upload-time = "2025-02-06T20:25:21.863Z" }, - { url = "https://files.pythonhosted.org/packages/c2/5c/e3c77fae41862be1da966ca98eec7fbc07cdd0b00f8b3e1ef2a13eaa6cca/SQLAlchemy-2.0.38-cp312-cp312-win_amd64.whl", hash = "sha256:1052723e6cd95312f6a6eff9a279fd41bbae67633415373fdac3c430eca3425d", size = 2100865, upload-time = "2025-02-06T20:25:27.686Z" }, - { url = "https://files.pythonhosted.org/packages/21/77/caa875a1f5a8a8980b564cc0e6fee1bc992d62d29101252561d0a5e9719c/SQLAlchemy-2.0.38-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:ecef029b69843b82048c5b347d8e6049356aa24ed644006c9a9d7098c3bd3bfd", size = 2100201, upload-time = "2025-02-06T22:18:00.802Z" }, - { url = "https://files.pythonhosted.org/packages/f4/ec/94bb036ec78bf9a20f8010c807105da9152dd84f72e8c51681ad2f30b3fd/SQLAlchemy-2.0.38-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:9c8bcad7fc12f0cc5896d8e10fdf703c45bd487294a986903fe032c72201596b", size = 2090678, upload-time = "2025-02-06T22:18:02.923Z" }, - { url = "https://files.pythonhosted.org/packages/7b/61/63ff1893f146e34d3934c0860209fdd3925c25ee064330e6c2152bacc335/SQLAlchemy-2.0.38-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2a0ef3f98175d77180ffdc623d38e9f1736e8d86b6ba70bff182a7e68bed7727", size = 3177107, upload-time = "2025-02-06T21:07:31.027Z" }, - { url = "https://files.pythonhosted.org/packages/a9/4f/b933bea41a602b5f274065cc824fae25780ed38664d735575192490a021b/SQLAlchemy-2.0.38-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8b0ac78898c50e2574e9f938d2e5caa8fe187d7a5b69b65faa1ea4648925b096", size = 3190435, upload-time = "2025-02-06T22:19:29.458Z" }, - { url = "https://files.pythonhosted.org/packages/f5/23/9e654b4059e385988de08c5d3b38a369ea042f4c4d7c8902376fd737096a/SQLAlchemy-2.0.38-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:9eb4fa13c8c7a2404b6a8e3772c17a55b1ba18bc711e25e4d6c0c9f5f541b02a", size = 3123648, upload-time = "2025-02-06T21:07:32.591Z" }, - { url = "https://files.pythonhosted.org/packages/83/59/94c6d804e76ebc6412a08d2b086a8cb3e5a056cd61508e18ddaf3ec70100/SQLAlchemy-2.0.38-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:5dba1cdb8f319084f5b00d41207b2079822aa8d6a4667c0f369fce85e34b0c86", size = 3151789, upload-time = "2025-02-06T22:19:32.523Z" }, - { url = "https://files.pythonhosted.org/packages/b2/27/17f143013aabbe1256dce19061eafdce0b0142465ce32168cdb9a18c04b1/SQLAlchemy-2.0.38-cp313-cp313-win32.whl", hash = "sha256:eae27ad7580529a427cfdd52c87abb2dfb15ce2b7a3e0fc29fbb63e2ed6f8120", size = 2073023, upload-time = "2025-02-06T20:25:32.861Z" }, - { url = "https://files.pythonhosted.org/packages/e2/3e/259404b03c3ed2e7eee4c179e001a07d9b61070334be91124cf4ad32eec7/SQLAlchemy-2.0.38-cp313-cp313-win_amd64.whl", hash = "sha256:b335a7c958bc945e10c522c069cd6e5804f4ff20f9a744dd38e748eb602cbbda", size = 2096908, upload-time = "2025-02-06T20:25:35.053Z" }, - { url = "https://files.pythonhosted.org/packages/aa/e4/592120713a314621c692211eba034d09becaf6bc8848fabc1dc2a54d8c16/SQLAlchemy-2.0.38-py3-none-any.whl", hash = "sha256:63178c675d4c80def39f1febd625a6333f44c0ba269edd8a468b156394b27753", size = 1896347, upload-time = "2025-02-06T22:08:29.784Z" }, +sdist = { url = "https://files.pythonhosted.org/packages/d7/bc/d59b5d97d27229b0e009bd9098cd81af71c2fa5549c580a0a67b9bed0496/sqlalchemy-2.0.43.tar.gz", hash = "sha256:788bfcef6787a7764169cfe9859fe425bf44559619e1d9f56f5bddf2ebf6f417", size = 9762949, upload-time = "2025-08-11T14:24:58.438Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/8f/4e/985f7da36f09592c5ade99321c72c15101d23c0bb7eecfd1daaca5714422/sqlalchemy-2.0.43-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:70322986c0c699dca241418fcf18e637a4369e0ec50540a2b907b184c8bca069", size = 2133162, upload-time = "2025-08-11T15:52:17.854Z" }, + { url = "https://files.pythonhosted.org/packages/37/34/798af8db3cae069461e3bc0898a1610dc469386a97048471d364dc8aae1c/sqlalchemy-2.0.43-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:87accdbba88f33efa7b592dc2e8b2a9c2cdbca73db2f9d5c510790428c09c154", size = 2123082, upload-time = "2025-08-11T15:52:19.181Z" }, + { url = "https://files.pythonhosted.org/packages/fb/0f/79cf4d9dad42f61ec5af1e022c92f66c2d110b93bb1dc9b033892971abfa/sqlalchemy-2.0.43-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c00e7845d2f692ebfc7d5e4ec1a3fd87698e4337d09e58d6749a16aedfdf8612", size = 3208871, upload-time = "2025-08-11T15:50:30.656Z" }, + { url = "https://files.pythonhosted.org/packages/56/b3/59befa58fb0e1a9802c87df02344548e6d007e77e87e6084e2131c29e033/sqlalchemy-2.0.43-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:022e436a1cb39b13756cf93b48ecce7aa95382b9cfacceb80a7d263129dfd019", size = 3209583, upload-time = "2025-08-11T15:57:47.697Z" }, + { url = "https://files.pythonhosted.org/packages/29/d2/124b50c0eb8146e8f0fe16d01026c1a073844f0b454436d8544fe9b33bd7/sqlalchemy-2.0.43-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:c5e73ba0d76eefc82ec0219d2301cb33bfe5205ed7a2602523111e2e56ccbd20", size = 3148177, upload-time = "2025-08-11T15:50:32.078Z" }, + { url = "https://files.pythonhosted.org/packages/83/f5/e369cd46aa84278107624617034a5825fedfc5c958b2836310ced4d2eadf/sqlalchemy-2.0.43-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:9c2e02f06c68092b875d5cbe4824238ab93a7fa35d9c38052c033f7ca45daa18", size = 3172276, upload-time = "2025-08-11T15:57:49.477Z" }, + { url = "https://files.pythonhosted.org/packages/de/2b/4602bf4c3477fa4c837c9774e6dd22e0389fc52310c4c4dfb7e7ba05e90d/sqlalchemy-2.0.43-cp310-cp310-win32.whl", hash = "sha256:e7a903b5b45b0d9fa03ac6a331e1c1d6b7e0ab41c63b6217b3d10357b83c8b00", size = 2101491, upload-time = "2025-08-11T15:54:59.191Z" }, + { url = "https://files.pythonhosted.org/packages/38/2d/bfc6b6143adef553a08295490ddc52607ee435b9c751c714620c1b3dd44d/sqlalchemy-2.0.43-cp310-cp310-win_amd64.whl", hash = "sha256:4bf0edb24c128b7be0c61cd17eef432e4bef507013292415f3fb7023f02b7d4b", size = 2125148, upload-time = "2025-08-11T15:55:00.593Z" }, + { url = "https://files.pythonhosted.org/packages/9d/77/fa7189fe44114658002566c6fe443d3ed0ec1fa782feb72af6ef7fbe98e7/sqlalchemy-2.0.43-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:52d9b73b8fb3e9da34c2b31e6d99d60f5f99fd8c1225c9dad24aeb74a91e1d29", size = 2136472, upload-time = "2025-08-11T15:52:21.789Z" }, + { url = "https://files.pythonhosted.org/packages/99/ea/92ac27f2fbc2e6c1766bb807084ca455265707e041ba027c09c17d697867/sqlalchemy-2.0.43-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:f42f23e152e4545157fa367b2435a1ace7571cab016ca26038867eb7df2c3631", size = 2126535, upload-time = "2025-08-11T15:52:23.109Z" }, + { url = "https://files.pythonhosted.org/packages/94/12/536ede80163e295dc57fff69724caf68f91bb40578b6ac6583a293534849/sqlalchemy-2.0.43-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4fb1a8c5438e0c5ea51afe9c6564f951525795cf432bed0c028c1cb081276685", size = 3297521, upload-time = "2025-08-11T15:50:33.536Z" }, + { url = "https://files.pythonhosted.org/packages/03/b5/cacf432e6f1fc9d156eca0560ac61d4355d2181e751ba8c0cd9cb232c8c1/sqlalchemy-2.0.43-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:db691fa174e8f7036afefe3061bc40ac2b770718be2862bfb03aabae09051aca", size = 3297343, upload-time = "2025-08-11T15:57:51.186Z" }, + { url = "https://files.pythonhosted.org/packages/ca/ba/d4c9b526f18457667de4c024ffbc3a0920c34237b9e9dd298e44c7c00ee5/sqlalchemy-2.0.43-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:fe2b3b4927d0bc03d02ad883f402d5de201dbc8894ac87d2e981e7d87430e60d", size = 3232113, upload-time = "2025-08-11T15:50:34.949Z" }, + { url = "https://files.pythonhosted.org/packages/aa/79/c0121b12b1b114e2c8a10ea297a8a6d5367bc59081b2be896815154b1163/sqlalchemy-2.0.43-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:4d3d9b904ad4a6b175a2de0738248822f5ac410f52c2fd389ada0b5262d6a1e3", size = 3258240, upload-time = "2025-08-11T15:57:52.983Z" }, + { url = "https://files.pythonhosted.org/packages/79/99/a2f9be96fb382f3ba027ad42f00dbe30fdb6ba28cda5f11412eee346bec5/sqlalchemy-2.0.43-cp311-cp311-win32.whl", hash = "sha256:5cda6b51faff2639296e276591808c1726c4a77929cfaa0f514f30a5f6156921", size = 2101248, upload-time = "2025-08-11T15:55:01.855Z" }, + { url = "https://files.pythonhosted.org/packages/ee/13/744a32ebe3b4a7a9c7ea4e57babae7aa22070d47acf330d8e5a1359607f1/sqlalchemy-2.0.43-cp311-cp311-win_amd64.whl", hash = "sha256:c5d1730b25d9a07727d20ad74bc1039bbbb0a6ca24e6769861c1aa5bf2c4c4a8", size = 2126109, upload-time = "2025-08-11T15:55:04.092Z" }, + { url = "https://files.pythonhosted.org/packages/61/db/20c78f1081446095450bdc6ee6cc10045fce67a8e003a5876b6eaafc5cc4/sqlalchemy-2.0.43-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:20d81fc2736509d7a2bd33292e489b056cbae543661bb7de7ce9f1c0cd6e7f24", size = 2134891, upload-time = "2025-08-11T15:51:13.019Z" }, + { url = "https://files.pythonhosted.org/packages/45/0a/3d89034ae62b200b4396f0f95319f7d86e9945ee64d2343dcad857150fa2/sqlalchemy-2.0.43-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:25b9fc27650ff5a2c9d490c13c14906b918b0de1f8fcbb4c992712d8caf40e83", size = 2123061, upload-time = "2025-08-11T15:51:14.319Z" }, + { url = "https://files.pythonhosted.org/packages/cb/10/2711f7ff1805919221ad5bee205971254845c069ee2e7036847103ca1e4c/sqlalchemy-2.0.43-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6772e3ca8a43a65a37c88e2f3e2adfd511b0b1da37ef11ed78dea16aeae85bd9", size = 3320384, upload-time = "2025-08-11T15:52:35.088Z" }, + { url = "https://files.pythonhosted.org/packages/6e/0e/3d155e264d2ed2778484006ef04647bc63f55b3e2d12e6a4f787747b5900/sqlalchemy-2.0.43-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1a113da919c25f7f641ffbd07fbc9077abd4b3b75097c888ab818f962707eb48", size = 3329648, upload-time = "2025-08-11T15:56:34.153Z" }, + { url = "https://files.pythonhosted.org/packages/5b/81/635100fb19725c931622c673900da5efb1595c96ff5b441e07e3dd61f2be/sqlalchemy-2.0.43-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:4286a1139f14b7d70141c67a8ae1582fc2b69105f1b09d9573494eb4bb4b2687", size = 3258030, upload-time = "2025-08-11T15:52:36.933Z" }, + { url = "https://files.pythonhosted.org/packages/0c/ed/a99302716d62b4965fded12520c1cbb189f99b17a6d8cf77611d21442e47/sqlalchemy-2.0.43-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:529064085be2f4d8a6e5fab12d36ad44f1909a18848fcfbdb59cc6d4bbe48efe", size = 3294469, upload-time = "2025-08-11T15:56:35.553Z" }, + { url = "https://files.pythonhosted.org/packages/5d/a2/3a11b06715149bf3310b55a98b5c1e84a42cfb949a7b800bc75cb4e33abc/sqlalchemy-2.0.43-cp312-cp312-win32.whl", hash = "sha256:b535d35dea8bbb8195e7e2b40059e2253acb2b7579b73c1b432a35363694641d", size = 2098906, upload-time = "2025-08-11T15:55:00.645Z" }, + { url = "https://files.pythonhosted.org/packages/bc/09/405c915a974814b90aa591280623adc6ad6b322f61fd5cff80aeaef216c9/sqlalchemy-2.0.43-cp312-cp312-win_amd64.whl", hash = "sha256:1c6d85327ca688dbae7e2b06d7d84cfe4f3fffa5b5f9e21bb6ce9d0e1a0e0e0a", size = 2126260, upload-time = "2025-08-11T15:55:02.965Z" }, + { url = "https://files.pythonhosted.org/packages/41/1c/a7260bd47a6fae7e03768bf66451437b36451143f36b285522b865987ced/sqlalchemy-2.0.43-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:e7c08f57f75a2bb62d7ee80a89686a5e5669f199235c6d1dac75cd59374091c3", size = 2130598, upload-time = "2025-08-11T15:51:15.903Z" }, + { url = "https://files.pythonhosted.org/packages/8e/84/8a337454e82388283830b3586ad7847aa9c76fdd4f1df09cdd1f94591873/sqlalchemy-2.0.43-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:14111d22c29efad445cd5021a70a8b42f7d9152d8ba7f73304c4d82460946aaa", size = 2118415, upload-time = "2025-08-11T15:51:17.256Z" }, + { url = "https://files.pythonhosted.org/packages/cf/ff/22ab2328148492c4d71899d62a0e65370ea66c877aea017a244a35733685/sqlalchemy-2.0.43-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:21b27b56eb2f82653168cefe6cb8e970cdaf4f3a6cb2c5e3c3c1cf3158968ff9", size = 3248707, upload-time = "2025-08-11T15:52:38.444Z" }, + { url = "https://files.pythonhosted.org/packages/dc/29/11ae2c2b981de60187f7cbc84277d9d21f101093d1b2e945c63774477aba/sqlalchemy-2.0.43-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9c5a9da957c56e43d72126a3f5845603da00e0293720b03bde0aacffcf2dc04f", size = 3253602, upload-time = "2025-08-11T15:56:37.348Z" }, + { url = "https://files.pythonhosted.org/packages/b8/61/987b6c23b12c56d2be451bc70900f67dd7d989d52b1ee64f239cf19aec69/sqlalchemy-2.0.43-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:5d79f9fdc9584ec83d1b3c75e9f4595c49017f5594fee1a2217117647225d738", size = 3183248, upload-time = "2025-08-11T15:52:39.865Z" }, + { url = "https://files.pythonhosted.org/packages/86/85/29d216002d4593c2ce1c0ec2cec46dda77bfbcd221e24caa6e85eff53d89/sqlalchemy-2.0.43-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:9df7126fd9db49e3a5a3999442cc67e9ee8971f3cb9644250107d7296cb2a164", size = 3219363, upload-time = "2025-08-11T15:56:39.11Z" }, + { url = "https://files.pythonhosted.org/packages/b6/e4/bd78b01919c524f190b4905d47e7630bf4130b9f48fd971ae1c6225b6f6a/sqlalchemy-2.0.43-cp313-cp313-win32.whl", hash = "sha256:7f1ac7828857fcedb0361b48b9ac4821469f7694089d15550bbcf9ab22564a1d", size = 2096718, upload-time = "2025-08-11T15:55:05.349Z" }, + { url = "https://files.pythonhosted.org/packages/ac/a5/ca2f07a2a201f9497de1928f787926613db6307992fe5cda97624eb07c2f/sqlalchemy-2.0.43-cp313-cp313-win_amd64.whl", hash = "sha256:971ba928fcde01869361f504fcff3b7143b47d30de188b11c6357c0505824197", size = 2123200, upload-time = "2025-08-11T15:55:07.932Z" }, + { url = "https://files.pythonhosted.org/packages/b8/d9/13bdde6521f322861fab67473cec4b1cc8999f3871953531cf61945fad92/sqlalchemy-2.0.43-py3-none-any.whl", hash = "sha256:1681c21dd2ccee222c2fe0bef671d1aef7c504087c9c4e800371cfcc8ac966fc", size = 1924759, upload-time = "2025-08-11T15:39:53.024Z" }, ] [[package]] @@ -821,11 +932,11 @@ wheels = [ [[package]] name = "typing-extensions" -version = "4.12.2" +version = "4.15.0" source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/df/db/f35a00659bc03fec321ba8bce9420de607a1d37f8342eee1863174c69557/typing_extensions-4.12.2.tar.gz", hash = "sha256:1a7ead55c7e559dd4dee8856e3a88b41225abfe1ce8df57b7c13915fe121ffb8", size = 85321, upload-time = "2024-06-07T18:52:15.995Z" } +sdist = { url = "https://files.pythonhosted.org/packages/72/94/1a15dd82efb362ac84269196e94cf00f187f7ed21c242792a923cdb1c61f/typing_extensions-4.15.0.tar.gz", hash = "sha256:0cea48d173cc12fa28ecabc3b837ea3cf6f38c6d1136f85cbaaf598984861466", size = 109391, upload-time = "2025-08-25T13:49:26.313Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/26/9f/ad63fc0248c5379346306f8668cda6e2e2e9c95e01216d2b8ffd9ff037d0/typing_extensions-4.12.2-py3-none-any.whl", hash = "sha256:04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d", size = 37438, upload-time = "2024-06-07T18:52:13.582Z" }, + { url = "https://files.pythonhosted.org/packages/18/67/36e9267722cc04a6b9f15c7f3441c2363321a3ea07da7ae0c0707beb2a9c/typing_extensions-4.15.0-py3-none-any.whl", hash = "sha256:f0fa19c6845758ab08074a0cfa8b7aecb71c999ca73d62883bc25cc018c4e548", size = 44614, upload-time = "2025-08-25T13:49:24.86Z" }, ] [[package]] @@ -842,59 +953,56 @@ wheels = [ [[package]] name = "wtforms" -version = "3.2.1" +version = "2.3.3" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "markupsafe" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/01/e4/633d080897e769ed5712dcfad626e55dbd6cf45db0ff4d9884315c6a82da/wtforms-3.2.1.tar.gz", hash = "sha256:df3e6b70f3192e92623128123ec8dca3067df9cfadd43d59681e210cfb8d4682", size = 137801, upload-time = "2024-10-21T11:34:00.108Z" } +sdist = { url = "https://files.pythonhosted.org/packages/dd/3f/f25d26b1c66896e2876124a12cd8be8f606abf4e1890a20f3ca04e4a1555/WTForms-2.3.3.tar.gz", hash = "sha256:81195de0ac94fbc8368abbaf9197b88c4f3ffd6c2719b5bf5fc9da744f3d829c", size = 162945, upload-time = "2020-07-30T17:08:26.883Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/08/c9/2088fb5645cd289c99ebe0d4cdcc723922a1d8e1beaefb0f6f76dff9b21c/wtforms-3.2.1-py3-none-any.whl", hash = "sha256:583bad77ba1dd7286463f21e11aa3043ca4869d03575921d1a1698d0715e0fd4", size = 152454, upload-time = "2024-10-21T11:33:58.44Z" }, + { url = "https://files.pythonhosted.org/packages/e0/31/614fc7dc7d76005b0acb8c0c8920d962b83d7422b4ba912886dfb63f86ff/WTForms-2.3.3-py2.py3-none-any.whl", hash = "sha256:7b504fc724d0d1d4d5d5c114e778ec88c37ea53144683e084215eed5155ada4c", size = 169106, upload-time = "2020-07-30T17:08:25.026Z" }, ] [[package]] name = "zope-event" -version = "5.0" +version = "6.0" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "setuptools" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/46/c2/427f1867bb96555d1d34342f1dd97f8c420966ab564d58d18469a1db8736/zope.event-5.0.tar.gz", hash = "sha256:bac440d8d9891b4068e2b5a2c5e2c9765a9df762944bda6955f96bb9b91e67cd", size = 17350, upload-time = "2023-06-23T06:28:35.709Z" } +sdist = { url = "https://files.pythonhosted.org/packages/c2/d8/9c8b0c6bb1db09725395618f68d3b8a08089fca0aed28437500caaf713ee/zope_event-6.0.tar.gz", hash = "sha256:0ebac894fa7c5f8b7a89141c272133d8c1de6ddc75ea4b1f327f00d1f890df92", size = 18731, upload-time = "2025-09-12T07:10:13.551Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/fe/42/f8dbc2b9ad59e927940325a22d6d3931d630c3644dae7e2369ef5d9ba230/zope.event-5.0-py3-none-any.whl", hash = "sha256:2832e95014f4db26c47a13fdaef84cef2f4df37e66b59d8f1f4a8f319a632c26", size = 6824, upload-time = "2023-06-23T06:28:32.652Z" }, + { url = "https://files.pythonhosted.org/packages/d1/b5/1abb5a8b443314c978617bf46d5d9ad648bdf21058074e817d7efbb257db/zope_event-6.0-py3-none-any.whl", hash = "sha256:6f0922593407cc673e7d8766b492c519f91bdc99f3080fe43dcec0a800d682a3", size = 6409, upload-time = "2025-09-12T07:10:12.316Z" }, ] [[package]] name = "zope-interface" -version = "7.2" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "setuptools" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/30/93/9210e7606be57a2dfc6277ac97dcc864fd8d39f142ca194fdc186d596fda/zope.interface-7.2.tar.gz", hash = "sha256:8b49f1a3d1ee4cdaf5b32d2e738362c7f5e40ac8b46dd7d1a65e82a4872728fe", size = 252960, upload-time = "2024-11-28T08:45:39.224Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/76/71/e6177f390e8daa7e75378505c5ab974e0bf59c1d3b19155638c7afbf4b2d/zope.interface-7.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:ce290e62229964715f1011c3dbeab7a4a1e4971fd6f31324c4519464473ef9f2", size = 208243, upload-time = "2024-11-28T08:47:29.781Z" }, - { url = "https://files.pythonhosted.org/packages/52/db/7e5f4226bef540f6d55acfd95cd105782bc6ee044d9b5587ce2c95558a5e/zope.interface-7.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:05b910a5afe03256b58ab2ba6288960a2892dfeef01336dc4be6f1b9ed02ab0a", size = 208759, upload-time = "2024-11-28T08:47:31.908Z" }, - { url = "https://files.pythonhosted.org/packages/28/ea/fdd9813c1eafd333ad92464d57a4e3a82b37ae57c19497bcffa42df673e4/zope.interface-7.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:550f1c6588ecc368c9ce13c44a49b8d6b6f3ca7588873c679bd8fd88a1b557b6", size = 254922, upload-time = "2024-11-28T09:18:11.795Z" }, - { url = "https://files.pythonhosted.org/packages/3b/d3/0000a4d497ef9fbf4f66bb6828b8d0a235e690d57c333be877bec763722f/zope.interface-7.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0ef9e2f865721553c6f22a9ff97da0f0216c074bd02b25cf0d3af60ea4d6931d", size = 249367, upload-time = "2024-11-28T08:48:24.238Z" }, - { url = "https://files.pythonhosted.org/packages/3e/e5/0b359e99084f033d413419eff23ee9c2bd33bca2ca9f4e83d11856f22d10/zope.interface-7.2-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:27f926f0dcb058211a3bb3e0e501c69759613b17a553788b2caeb991bed3b61d", size = 254488, upload-time = "2024-11-28T08:48:28.816Z" }, - { url = "https://files.pythonhosted.org/packages/7b/90/12d50b95f40e3b2fc0ba7f7782104093b9fd62806b13b98ef4e580f2ca61/zope.interface-7.2-cp310-cp310-win_amd64.whl", hash = "sha256:144964649eba4c5e4410bb0ee290d338e78f179cdbfd15813de1a664e7649b3b", size = 211947, upload-time = "2024-11-28T08:48:18.831Z" }, - { url = "https://files.pythonhosted.org/packages/98/7d/2e8daf0abea7798d16a58f2f3a2bf7588872eee54ac119f99393fdd47b65/zope.interface-7.2-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:1909f52a00c8c3dcab6c4fad5d13de2285a4b3c7be063b239b8dc15ddfb73bd2", size = 208776, upload-time = "2024-11-28T08:47:53.009Z" }, - { url = "https://files.pythonhosted.org/packages/a0/2a/0c03c7170fe61d0d371e4c7ea5b62b8cb79b095b3d630ca16719bf8b7b18/zope.interface-7.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:80ecf2451596f19fd607bb09953f426588fc1e79e93f5968ecf3367550396b22", size = 209296, upload-time = "2024-11-28T08:47:57.993Z" }, - { url = "https://files.pythonhosted.org/packages/49/b4/451f19448772b4a1159519033a5f72672221e623b0a1bd2b896b653943d8/zope.interface-7.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:033b3923b63474800b04cba480b70f6e6243a62208071fc148354f3f89cc01b7", size = 260997, upload-time = "2024-11-28T09:18:13.935Z" }, - { url = "https://files.pythonhosted.org/packages/65/94/5aa4461c10718062c8f8711161faf3249d6d3679c24a0b81dd6fc8ba1dd3/zope.interface-7.2-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a102424e28c6b47c67923a1f337ede4a4c2bba3965b01cf707978a801fc7442c", size = 255038, upload-time = "2024-11-28T08:48:26.381Z" }, - { url = "https://files.pythonhosted.org/packages/9f/aa/1a28c02815fe1ca282b54f6705b9ddba20328fabdc37b8cf73fc06b172f0/zope.interface-7.2-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:25e6a61dcb184453bb00eafa733169ab6d903e46f5c2ace4ad275386f9ab327a", size = 259806, upload-time = "2024-11-28T08:48:30.78Z" }, - { url = "https://files.pythonhosted.org/packages/a7/2c/82028f121d27c7e68632347fe04f4a6e0466e77bb36e104c8b074f3d7d7b/zope.interface-7.2-cp311-cp311-win_amd64.whl", hash = "sha256:3f6771d1647b1fc543d37640b45c06b34832a943c80d1db214a37c31161a93f1", size = 212305, upload-time = "2024-11-28T08:49:14.525Z" }, - { url = "https://files.pythonhosted.org/packages/68/0b/c7516bc3bad144c2496f355e35bd699443b82e9437aa02d9867653203b4a/zope.interface-7.2-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:086ee2f51eaef1e4a52bd7d3111a0404081dadae87f84c0ad4ce2649d4f708b7", size = 208959, upload-time = "2024-11-28T08:47:47.788Z" }, - { url = "https://files.pythonhosted.org/packages/a2/e9/1463036df1f78ff8c45a02642a7bf6931ae4a38a4acd6a8e07c128e387a7/zope.interface-7.2-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:21328fcc9d5b80768bf051faa35ab98fb979080c18e6f84ab3f27ce703bce465", size = 209357, upload-time = "2024-11-28T08:47:50.897Z" }, - { url = "https://files.pythonhosted.org/packages/07/a8/106ca4c2add440728e382f1b16c7d886563602487bdd90004788d45eb310/zope.interface-7.2-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f6dd02ec01f4468da0f234da9d9c8545c5412fef80bc590cc51d8dd084138a89", size = 264235, upload-time = "2024-11-28T09:18:15.56Z" }, - { url = "https://files.pythonhosted.org/packages/fc/ca/57286866285f4b8a4634c12ca1957c24bdac06eae28fd4a3a578e30cf906/zope.interface-7.2-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8e7da17f53e25d1a3bde5da4601e026adc9e8071f9f6f936d0fe3fe84ace6d54", size = 259253, upload-time = "2024-11-28T08:48:29.025Z" }, - { url = "https://files.pythonhosted.org/packages/96/08/2103587ebc989b455cf05e858e7fbdfeedfc3373358320e9c513428290b1/zope.interface-7.2-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cab15ff4832580aa440dc9790b8a6128abd0b88b7ee4dd56abacbc52f212209d", size = 264702, upload-time = "2024-11-28T08:48:37.363Z" }, - { url = "https://files.pythonhosted.org/packages/5f/c7/3c67562e03b3752ba4ab6b23355f15a58ac2d023a6ef763caaca430f91f2/zope.interface-7.2-cp312-cp312-win_amd64.whl", hash = "sha256:29caad142a2355ce7cfea48725aa8bcf0067e2b5cc63fcf5cd9f97ad12d6afb5", size = 212466, upload-time = "2024-11-28T08:49:14.397Z" }, - { url = "https://files.pythonhosted.org/packages/c6/3b/e309d731712c1a1866d61b5356a069dd44e5b01e394b6cb49848fa2efbff/zope.interface-7.2-cp313-cp313-macosx_10_9_x86_64.whl", hash = "sha256:3e0350b51e88658d5ad126c6a57502b19d5f559f6cb0a628e3dc90442b53dd98", size = 208961, upload-time = "2024-11-28T08:48:29.865Z" }, - { url = "https://files.pythonhosted.org/packages/49/65/78e7cebca6be07c8fc4032bfbb123e500d60efdf7b86727bb8a071992108/zope.interface-7.2-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:15398c000c094b8855d7d74f4fdc9e73aa02d4d0d5c775acdef98cdb1119768d", size = 209356, upload-time = "2024-11-28T08:48:33.297Z" }, - { url = "https://files.pythonhosted.org/packages/11/b1/627384b745310d082d29e3695db5f5a9188186676912c14b61a78bbc6afe/zope.interface-7.2-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:802176a9f99bd8cc276dcd3b8512808716492f6f557c11196d42e26c01a69a4c", size = 264196, upload-time = "2024-11-28T09:18:17.584Z" }, - { url = "https://files.pythonhosted.org/packages/b8/f6/54548df6dc73e30ac6c8a7ff1da73ac9007ba38f866397091d5a82237bd3/zope.interface-7.2-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:eb23f58a446a7f09db85eda09521a498e109f137b85fb278edb2e34841055398", size = 259237, upload-time = "2024-11-28T08:48:31.71Z" }, - { url = "https://files.pythonhosted.org/packages/b6/66/ac05b741c2129fdf668b85631d2268421c5cd1a9ff99be1674371139d665/zope.interface-7.2-cp313-cp313-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a71a5b541078d0ebe373a81a3b7e71432c61d12e660f1d67896ca62d9628045b", size = 264696, upload-time = "2024-11-28T08:48:41.161Z" }, - { url = "https://files.pythonhosted.org/packages/0a/2f/1bccc6f4cc882662162a1158cda1a7f616add2ffe322b28c99cb031b4ffc/zope.interface-7.2-cp313-cp313-win_amd64.whl", hash = "sha256:4893395d5dd2ba655c38ceb13014fd65667740f09fa5bb01caa1e6284e48c0cd", size = 212472, upload-time = "2024-11-28T08:49:56.587Z" }, +version = "8.0.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/88/3a/7fcf02178b8fad0a51e67e32765cd039ae505d054d744d76b8c2bbcba5ba/zope_interface-8.0.1.tar.gz", hash = "sha256:eba5610d042c3704a48222f7f7c6ab5b243ed26f917e2bc69379456b115e02d1", size = 253746, upload-time = "2025-09-25T05:55:51.285Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/75/e5/ffef169d17b92c6236b3b18b890c0ce73502f3cbd5b6532ff20d412d94a3/zope_interface-8.0.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:fd7195081b8637eeed8d73e4d183b07199a1dc738fb28b3de6666b1b55662570", size = 207364, upload-time = "2025-09-25T05:58:50.262Z" }, + { url = "https://files.pythonhosted.org/packages/35/b6/87aca626c09af829d3a32011599d6e18864bc8daa0ad3a7e258f3d7f8bcf/zope_interface-8.0.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:f7c4bc4021108847bce763673ce70d0716b08dfc2ba9889e7bad46ac2b3bb924", size = 207901, upload-time = "2025-09-25T05:58:51.74Z" }, + { url = "https://files.pythonhosted.org/packages/d8/c1/eec33cc9f847ebeb0bc6234d7d45fe3fc0a6fe8fc5b5e6be0442bd2c684d/zope_interface-8.0.1-cp310-cp310-manylinux1_i686.manylinux2014_i686.manylinux_2_17_i686.manylinux_2_5_i686.whl", hash = "sha256:758803806b962f32c87b31bb18c298b022965ba34fe532163831cc39118c24ab", size = 249358, upload-time = "2025-09-25T05:58:16.979Z" }, + { url = "https://files.pythonhosted.org/packages/58/7d/1e3476a1ef0175559bd8492dc7bb921ad0df5b73861d764b1f824ad5484a/zope_interface-8.0.1-cp310-cp310-manylinux1_x86_64.manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:f8e88f35f86bbe8243cad4b2972deef0fdfca0a0723455abbebdc83bbab96b69", size = 254475, upload-time = "2025-09-25T05:58:10.032Z" }, + { url = "https://files.pythonhosted.org/packages/bc/67/ba5ea98ff23f723c5cbe7db7409f2e43c9fe2df1ced67881443c01e64478/zope_interface-8.0.1-cp310-cp310-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:7844765695937d9b0d83211220b72e2cf6ac81a08608ad2b58f2c094af498d83", size = 254913, upload-time = "2025-09-25T06:26:22.263Z" }, + { url = "https://files.pythonhosted.org/packages/2b/a7/b1b8b6c13fba955c043cdee409953ee85f652b106493e2e931a84f95c1aa/zope_interface-8.0.1-cp310-cp310-win_amd64.whl", hash = "sha256:64fa7b206dd9669f29d5c1241a768bebe8ab1e8a4b63ee16491f041e058c09d0", size = 211753, upload-time = "2025-09-25T05:59:00.561Z" }, + { url = "https://files.pythonhosted.org/packages/f2/2f/c10c739bcb9b072090c97c2e08533777497190daa19d190d72b4cce9c7cb/zope_interface-8.0.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:4bd01022d2e1bce4a4a4ed9549edb25393c92e607d7daa6deff843f1f68b479d", size = 207903, upload-time = "2025-09-25T05:58:21.671Z" }, + { url = "https://files.pythonhosted.org/packages/b5/e1/9845ac3697f108d9a1af6912170c59a23732090bbfb35955fe77e5544955/zope_interface-8.0.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:29be8db8b712d94f1c05e24ea230a879271d787205ba1c9a6100d1d81f06c69a", size = 208345, upload-time = "2025-09-25T05:58:24.217Z" }, + { url = "https://files.pythonhosted.org/packages/f2/49/6573bc8b841cfab18e80c8e8259f1abdbbf716140011370de30231be79ad/zope_interface-8.0.1-cp311-cp311-manylinux1_i686.manylinux2014_i686.manylinux_2_17_i686.manylinux_2_5_i686.whl", hash = "sha256:51ae1b856565b30455b7879fdf0a56a88763b401d3f814fa9f9542d7410dbd7e", size = 255027, upload-time = "2025-09-25T05:58:19.975Z" }, + { url = "https://files.pythonhosted.org/packages/e2/fd/908b0fd4b1ab6e412dfac9bd2b606f2893ef9ba3dd36d643f5e5b94c57b3/zope_interface-8.0.1-cp311-cp311-manylinux1_x86_64.manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:d2e7596149cb1acd1d4d41b9f8fe2ffc0e9e29e2e91d026311814181d0d9efaf", size = 259800, upload-time = "2025-09-25T05:58:11.487Z" }, + { url = "https://files.pythonhosted.org/packages/dc/78/8419a2b4e88410520ed4b7f93bbd25a6d4ae66c4e2b131320f2b90f43077/zope_interface-8.0.1-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:b2737c11c34fb9128816759864752d007ec4f987b571c934c30723ed881a7a4f", size = 260978, upload-time = "2025-09-25T06:26:24.483Z" }, + { url = "https://files.pythonhosted.org/packages/e5/90/caf68152c292f1810e2bd3acd2177badf08a740aa8a348714617d6c9ad0b/zope_interface-8.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:cf66e4bf731aa7e0ced855bb3670e8cda772f6515a475c6a107bad5cb6604103", size = 212155, upload-time = "2025-09-25T05:59:40.318Z" }, + { url = "https://files.pythonhosted.org/packages/dc/a6/0f08713ddda834c428ebf97b2a7fd8dea50c0100065a8955924dbd94dae8/zope_interface-8.0.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:115f27c1cc95ce7a517d960ef381beedb0a7ce9489645e80b9ab3cbf8a78799c", size = 208609, upload-time = "2025-09-25T05:58:53.698Z" }, + { url = "https://files.pythonhosted.org/packages/e9/5e/d423045f54dc81e0991ec655041e7a0eccf6b2642535839dd364b35f4d7f/zope_interface-8.0.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:af655c573b84e3cb6a4f6fd3fbe04e4dc91c63c6b6f99019b3713ef964e589bc", size = 208797, upload-time = "2025-09-25T05:58:56.258Z" }, + { url = "https://files.pythonhosted.org/packages/c6/43/39d4bb3f7a80ebd261446792493cfa4e198badd47107224f5b6fe1997ad9/zope_interface-8.0.1-cp312-cp312-manylinux1_i686.manylinux2014_i686.manylinux_2_17_i686.manylinux_2_5_i686.whl", hash = "sha256:23f82ef9b2d5370750cc1bf883c3b94c33d098ce08557922a3fbc7ff3b63dfe1", size = 259242, upload-time = "2025-09-25T05:58:21.602Z" }, + { url = "https://files.pythonhosted.org/packages/da/29/49effcff64ef30731e35520a152a9dfcafec86cf114b4c2aff942e8264ba/zope_interface-8.0.1-cp312-cp312-manylinux1_x86_64.manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:35a1565d5244997f2e629c5c68715b3d9d9036e8df23c4068b08d9316dcb2822", size = 264696, upload-time = "2025-09-25T05:58:13.351Z" }, + { url = "https://files.pythonhosted.org/packages/c7/39/b947673ec9a258eeaa20208dd2f6127d9fbb3e5071272a674ebe02063a78/zope_interface-8.0.1-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:029ea1db7e855a475bf88d9910baab4e94d007a054810e9007ac037a91c67c6f", size = 264229, upload-time = "2025-09-25T06:26:26.226Z" }, + { url = "https://files.pythonhosted.org/packages/8f/ee/eed6efd1fc3788d1bef7a814e0592d8173b7fe601c699b935009df035fc2/zope_interface-8.0.1-cp312-cp312-win_amd64.whl", hash = "sha256:0beb3e7f7dc153944076fcaf717a935f68d39efa9fce96ec97bafcc0c2ea6cab", size = 212270, upload-time = "2025-09-25T05:58:53.584Z" }, + { url = "https://files.pythonhosted.org/packages/5f/dc/3c12fca01c910c793d636ffe9c0984e0646abaf804e44552070228ed0ede/zope_interface-8.0.1-cp313-cp313-macosx_10_9_x86_64.whl", hash = "sha256:c7cc027fc5c61c5d69e5080c30b66382f454f43dc379c463a38e78a9c6bab71a", size = 208992, upload-time = "2025-09-25T05:58:40.712Z" }, + { url = "https://files.pythonhosted.org/packages/46/71/6127b7282a3e380ca927ab2b40778a9c97935a4a57a2656dadc312db5f30/zope_interface-8.0.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:fcf9097ff3003b7662299f1c25145e15260ec2a27f9a9e69461a585d79ca8552", size = 209051, upload-time = "2025-09-25T05:58:42.182Z" }, + { url = "https://files.pythonhosted.org/packages/56/86/4387a9f951ee18b0e41fda77da77d59c33e59f04660578e2bad688703e64/zope_interface-8.0.1-cp313-cp313-manylinux1_i686.manylinux2014_i686.manylinux_2_17_i686.manylinux_2_5_i686.whl", hash = "sha256:6d965347dd1fb9e9a53aa852d4ded46b41ca670d517fd54e733a6b6a4d0561c2", size = 259223, upload-time = "2025-09-25T05:58:23.191Z" }, + { url = "https://files.pythonhosted.org/packages/61/08/ce60a114466abc067c68ed41e2550c655f551468ae17b4b17ea360090146/zope_interface-8.0.1-cp313-cp313-manylinux1_x86_64.manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:9a3b8bb77a4b89427a87d1e9eb969ab05e38e6b4a338a9de10f6df23c33ec3c2", size = 264690, upload-time = "2025-09-25T05:58:15.052Z" }, + { url = "https://files.pythonhosted.org/packages/36/9a/62a9ba3a919594605a07c34eee3068659bbd648e2fa0c4a86d876810b674/zope_interface-8.0.1-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:87e6b089002c43231fb9afec89268391bcc7a3b66e76e269ffde19a8112fb8d5", size = 264201, upload-time = "2025-09-25T06:26:27.797Z" }, + { url = "https://files.pythonhosted.org/packages/da/06/8fe88bd7edef60566d21ef5caca1034e10f6b87441ea85de4bbf9ea74768/zope_interface-8.0.1-cp313-cp313-win_amd64.whl", hash = "sha256:64a43f5280aa770cbafd0307cb3d1ff430e2a1001774e8ceb40787abe4bb6658", size = 212273, upload-time = "2025-09-25T06:00:25.398Z" }, ] From 4031546d0a96fdd61fa178f2f5e24980381d5f5e Mon Sep 17 00:00:00 2001 From: loki Date: Thu, 2 Oct 2025 02:27:47 +1000 Subject: [PATCH 30/34] passing pyright --- blog/__init__.py | 2 +- pyproject.toml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/blog/__init__.py b/blog/__init__.py index e1d5942..2029bd3 100644 --- a/blog/__init__.py +++ b/blog/__init__.py @@ -25,7 +25,7 @@ def configure_extensions(app: Flask) -> None: cache.init_app(app) migrate.init_app(app=app, db=db) login_manager.init_app(app=app) - login_manager.login_view = "user.login" # pyright: ignore[reportAttributeAccessIssue] + login_manager.login_view = "user.login" flask_sitemap.init_app(app) diff --git a/pyproject.toml b/pyproject.toml index fc78297..5bd7485 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -46,6 +46,7 @@ reportImportCycles = false reportUnknownArgumentType = false reportUnknownMemberType = false reportUnknownParameterType = false +reportAttributeAccessIssue = false [tool.coverage.run] branch = true From c086663e830ebc2d75ced183a8bacdeebe47f544 Mon Sep 17 00:00:00 2001 From: loki Date: Thu, 2 Oct 2025 02:33:39 +1000 Subject: [PATCH 31/34] suppress not mine pytest warnings --- pyproject.toml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index 5bd7485..45ae704 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -54,6 +54,12 @@ branch = true [tool.pytest.ini_options] norecursedirs = "__pycache__" addopts = "--strict-markers --cov=blog --cov-report xml" +filterwarnings = [ + "ignore::UserWarning:.*pkg_resources.*", + "ignore::DeprecationWarning:.*pkg_resources.*", + "ignore::UserWarning:.*flask_admin.*", + "ignore::DeprecationWarning:.*flask_admin.*", +] [dependency-groups] dev = [ From f68f708e585330a10bd0150456b250ea6ac30d3a Mon Sep 17 00:00:00 2001 From: loki Date: Thu, 2 Oct 2025 02:38:04 +1000 Subject: [PATCH 32/34] fix depredication style in tests --- tests/test_repositories.py | 2 +- tests/test_services.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_repositories.py b/tests/test_repositories.py index 4f8a8e9..b7e1da5 100644 --- a/tests/test_repositories.py +++ b/tests/test_repositories.py @@ -1385,7 +1385,7 @@ def test_authenticate(self, app, user_repository): # Manually hash the password for the created user at the ORM level # This is needed because the repository doesn't hash passwords - user_orm = UserORM.query.get(created_user.id) + user_orm = db.session.get(UserORM, created_user.id) if user_orm: user_orm.set_password("testpassword") db.session.commit() diff --git a/tests/test_services.py b/tests/test_services.py index 0ad9f1d..701ef3a 100644 --- a/tests/test_services.py +++ b/tests/test_services.py @@ -564,7 +564,7 @@ def test_authenticate_user(self, app, user_service): # This is needed because the repository doesn't hash passwords from blog.user.models import User as UserORM - user_orm = UserORM.query.get(created_user.id) + user_orm = db.session.get(UserORM, created_user.id) if user_orm: user_orm.set_password("testpassword") db.session.commit() From 108765534abc05de42bd119adc809054dea1e68e Mon Sep 17 00:00:00 2001 From: loki Date: Thu, 2 Oct 2025 02:46:10 +1000 Subject: [PATCH 33/34] fix config validator and env --- blog/config_validator.py | 4 ++-- tests/test_config_validator.py | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/blog/config_validator.py b/blog/config_validator.py index 0b461db..2f58a9f 100644 --- a/blog/config_validator.py +++ b/blog/config_validator.py @@ -26,10 +26,11 @@ def validate_config(config: dict[str, Any]) -> list[str]: # pyright: ignore[rep ConfigValidationError: If critical configuration is missing or invalid """ warnings: list[str] = [] + env = os.environ.get("FLASK_ENV", "development") # Validate SECRET_KEY secret_key = config.get("SECRET_KEY") - if not secret_key: + if not secret_key and env not in ("development", "testing"): raise ConfigValidationError( "SECRET_KEY is required but not set. " + "Set the SECRET_KEY environment variable." @@ -83,7 +84,6 @@ def validate_config(config: dict[str, Any]) -> list[str]: # pyright: ignore[rep raise ConfigValidationError(f"PORT must be a valid integer, got '{port}'") # Validate CACHE settings for production - env = os.environ.get("FLASK_ENV", "development") if env == "production": cache_type = config.get("CACHE_TYPE", "NullCache") if cache_type == "NullCache": diff --git a/tests/test_config_validator.py b/tests/test_config_validator.py index 804dbaa..e2bcfbf 100644 --- a/tests/test_config_validator.py +++ b/tests/test_config_validator.py @@ -37,6 +37,8 @@ def test_validate_config_default_secret_key_warning(): def test_validate_config_missing_secret_key(): """Test that validate_config raises an error for missing SECRET_KEY.""" + + os.environ["FLASK_ENV"] = "production" config = { "SQLALCHEMY_DATABASE_URI": "sqlite:///:memory:", } From ff2755278e717f10da9d49e1955e39b702a77e28 Mon Sep 17 00:00:00 2001 From: loki Date: Sun, 5 Oct 2025 03:17:43 +1000 Subject: [PATCH 34/34] fix tests admin --- .github/workflows/code-quality.yaml | 2 +- blog/__init__.py | 5 +- tests/conftest.py | 32 ++++++++ tests/test_admin.py | 110 ++++++++++++++++++++++++++++ tests/test_admin_no_user.py | 30 ++++++++ 5 files changed, 176 insertions(+), 3 deletions(-) create mode 100644 tests/conftest.py create mode 100644 tests/test_admin.py create mode 100644 tests/test_admin_no_user.py diff --git a/.github/workflows/code-quality.yaml b/.github/workflows/code-quality.yaml index 00ad5fe..d0339e2 100644 --- a/.github/workflows/code-quality.yaml +++ b/.github/workflows/code-quality.yaml @@ -31,7 +31,7 @@ jobs: steps: - uses: actions/checkout@v4 - uses: ./.github/actions/setup - - run: uv run pyright . + - run: uv run basedpyright . diff --git a/blog/__init__.py b/blog/__init__.py index 2029bd3..0f540ca 100644 --- a/blog/__init__.py +++ b/blog/__init__.py @@ -63,7 +63,7 @@ def validate_application_config(app: Flask) -> None: raise ConfigValidationError(f"Configuration validation failed: {str(e)}") from e -def create_app() -> Flask: +def create_app(init_admin: bool = False) -> Flask: app = Flask(__name__) env = os.environ.get("FLASK_ENV", "development") logger.debug("current FLASK_ENV %s", env) @@ -73,7 +73,8 @@ def create_app() -> Flask: validate_application_config(app) configure_extensions(app) - if not app.config["TESTING"]: + if init_admin or env != "testing": + print("init admin") create_admin(admin_ext) app.register_blueprint(post) app.register_blueprint(tags) diff --git a/tests/conftest.py b/tests/conftest.py new file mode 100644 index 0000000..a6ecf85 --- /dev/null +++ b/tests/conftest.py @@ -0,0 +1,32 @@ +import pytest +import os +from blog import create_app +from blog.extensions import db, admin_ext + +os.environ["FLASK_ENV"] = "testing" + + +@pytest.fixture() +def admin_app(): + os.environ["FLASK_ENV"] = "testing" + test_app = create_app(init_admin=True) + test_app.config.update( + { + "TESTING": True, + "SQLALCHEMY_DATABASE_URI": "sqlite:///:memory:", + "WTF_CSRF_ENABLED": False, + } + ) + with test_app.app_context(): + db.create_all() + yield test_app + with test_app.app_context(): + db.session.remove() + db.drop_all() + admin_ext._views = [] + admin_ext._menu = [] + + +@pytest.fixture() +def client_admin(admin_app): + return admin_app.test_client() diff --git a/tests/test_admin.py b/tests/test_admin.py new file mode 100644 index 0000000..99f56e6 --- /dev/null +++ b/tests/test_admin.py @@ -0,0 +1,110 @@ +"""Unit tests for the authentication adapter.""" + +import pytest + +from blog.extensions import db +from blog.domain.user import User as UserDomain +from blog.auth.adapter import AuthenticationAdapter +from blog.repos.user import UserRepository +from blog.user.models import User as UserORM +from blog.services.factory import ServiceFactory + + +@pytest.fixture() +def auth_adapter(admin_app): + """Create an AuthenticationAdapter instance for testing.""" + return AuthenticationAdapter() + + +@pytest.fixture() +def user_service(admin_app): + """Create a UserService instance for testing.""" + return ServiceFactory.create_user_service() + + +@pytest.fixture() +def temp_user(admin_app, auth_adapter, user_service): + """Create a UserService instance for testing.""" + # Create a user first + user_domain = UserDomain(name="testuser", password="testpassword") + + with admin_app.app_context(): + created_user = user_service.create_user(user_domain) + user_service.authenticate_user("testuser", "testpassword") + + # Set the password properly + user_orm = db.session.get(UserORM, created_user.id) + if user_orm: + user_orm.set_password("testpassword") + db.session.commit() + + # Load the user using the adapter + loaded_user = auth_adapter.load_user(created_user.id) + print(loaded_user, type(loaded_user)) + assert loaded_user is not None + + return user_orm + + +@pytest.fixture() +def user_repository(client_admin): + """Create an IconRepository instance for testing.""" + return UserRepository(db.session) + + +"""Test cases for AuthenticationAdapter.""" + + +@pytest.fixture() +def authenticated_client(client_admin, temp_user): + """Create a client that is logged in as the test user.""" + # First, get the login page to extract CSRF token + login_page_response = client_admin.get("/login") + content = login_page_response.get_data(as_text=True) + + # Extract the CSRF token using regex + import re + + csrf_match = re.search(r'name="csrf_token"[^>]*value="([^"]*)"', content) + csrf_token = csrf_match.group(1) if csrf_match else "" + + # Log in the user using the proper login endpoint with CSRF token + login_response = client_admin.post( + "/login", + data={"name": "testuser", "password": "testpassword", "csrf_token": csrf_token}, + follow_redirects=True, + ) + + # Verify that login was successful + assert login_response.status_code == 200 + + yield client_admin + + +def test_admin_view(authenticated_client, user_repository): + """Test that admin views are accessible to authenticated users.""" + # Access the admin page - it should be accessible to authenticated users + rv = authenticated_client.get("/admin/") + assert rv.status_code == 200 + + links = ( + "admin_user", + "admin_post", + "admin_category", + "admin_tag", + "admin_icon", + ) + # check is user auth + # juser = user_repository.get_by_id(1) + # assert user is not None + + for link in links: + url = f"/admin/{link}/" + rv = authenticated_client.get(url) + assert rv.status_code == 200 + + url = f"/admin/{link}/new/" + rv = authenticated_client.get(url) + assert rv.status_code == 200 + rv = authenticated_client.get("/admin/myfileadmin/") + assert rv.status_code == 200 diff --git a/tests/test_admin_no_user.py b/tests/test_admin_no_user.py new file mode 100644 index 0000000..3dd32d0 --- /dev/null +++ b/tests/test_admin_no_user.py @@ -0,0 +1,30 @@ +"""Unit tests for the authentication adapter.""" + + +def test_non_user(admin_app, client_admin): + """Test that admin views are accessible to authenticated users.""" + # Access the admin page - it should be accessible to authenticated users + rv = client_admin.get("/admin/") + assert rv.status_code == 404 + + rv = client_admin.get("/login") + assert rv.status_code == 200 + + links = ( + "admin_user", + "admin_post", + "admin_category", + "admin_tag", + "admin_icon", + ) + + for link in links: + url = f"/admin/{link}/" + rv = client_admin.get(url) + assert rv.status_code == 403 + + url = f"/admin/{link}/new/" + rv = client_admin.get(url) + assert rv.status_code == 403 + rv = client_admin.get("/admin/myfileadmin/") + assert rv.status_code == 403