From 46e7d863f25a0dc1719528940603fff52aef07b5 Mon Sep 17 00:00:00 2001 From: Idris Abdurrahman Date: Thu, 20 Mar 2025 14:01:03 +0100 Subject: [PATCH] Update generated backend for blog_app --- app/api/core/dependencies/dependencies.py | 8 ++++++ app/api/core/middleware/activity_tracker.py | 16 ++++++++++++ app/api/db/database.py | 11 ++++++++ app/api/v1/models/and.py | 13 +++++++++ app/api/v1/models/comments.py | 14 ++++++++++ app/api/v1/models/posts.py | 13 +++++++++ app/api/v1/models/user.py | 13 +++++++++ app/api/v1/routes/__init__.py | 13 +++++++++ app/api/v1/routes/and.py | 29 +++++++++++++++++++++ app/api/v1/routes/comments.py | 29 +++++++++++++++++++++ app/api/v1/routes/posts.py | 29 +++++++++++++++++++++ app/api/v1/routes/user.py | 29 +++++++++++++++++++++ app/api/v1/schemas/and.py | 13 +++++++++ app/api/v1/schemas/comments.py | 17 ++++++++++++ app/api/v1/schemas/posts.py | 17 ++++++++++++ app/api/v1/schemas/user.py | 21 +++++++++++++++ main.py | 12 ++++++--- requirements.txt | 5 +--- 18 files changed, 294 insertions(+), 8 deletions(-) create mode 100644 app/api/core/dependencies/dependencies.py create mode 100644 app/api/core/middleware/activity_tracker.py create mode 100644 app/api/db/database.py create mode 100644 app/api/v1/models/and.py create mode 100644 app/api/v1/models/comments.py create mode 100644 app/api/v1/models/posts.py create mode 100644 app/api/v1/models/user.py create mode 100644 app/api/v1/routes/and.py create mode 100644 app/api/v1/routes/comments.py create mode 100644 app/api/v1/routes/posts.py create mode 100644 app/api/v1/routes/user.py create mode 100644 app/api/v1/schemas/and.py create mode 100644 app/api/v1/schemas/comments.py create mode 100644 app/api/v1/schemas/posts.py create mode 100644 app/api/v1/schemas/user.py diff --git a/app/api/core/dependencies/dependencies.py b/app/api/core/dependencies/dependencies.py new file mode 100644 index 0000000..1ba6818 --- /dev/null +++ b/app/api/core/dependencies/dependencies.py @@ -0,0 +1,8 @@ +from app.api.db.database import SessionLocal + +def get_db(): + db = SessionLocal() + try: + yield db + finally: + db.close() \ No newline at end of file diff --git a/app/api/core/middleware/activity_tracker.py b/app/api/core/middleware/activity_tracker.py new file mode 100644 index 0000000..51dbecc --- /dev/null +++ b/app/api/core/middleware/activity_tracker.py @@ -0,0 +1,16 @@ +from typing import Callable, Awaitable +from loguru import logger +from time import time + +class ActivityTrackerMiddleware: + async def __call__(self, request: Request, call_next: Callable[[Request], Awaitable[Response]]) -> Response: + start_time = time() + request_method = request.method + request_url = str(request.url) + + response = await call_next(request) + + process_time = time() - start_time + logger.info(f"{request_method} {request_url} - {process_time:.6f} seconds") + + return response \ No newline at end of file diff --git a/app/api/db/database.py b/app/api/db/database.py new file mode 100644 index 0000000..c6d7a01 --- /dev/null +++ b/app/api/db/database.py @@ -0,0 +1,11 @@ +from sqlalchemy import create_engine +from sqlalchemy.ext.declarative import declarative_base +from sqlalchemy.orm import sessionmaker + +SQLALCHEMY_DATABASE_URL = "sqlite:///./blog_app.db" + +engine = create_engine( + SQLALCHEMY_DATABASE_URL, connect_args={"check_same_thread": False} +SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine) + +Base = declarative_base() \ No newline at end of file diff --git a/app/api/v1/models/and.py b/app/api/v1/models/and.py new file mode 100644 index 0000000..2f7499c --- /dev/null +++ b/app/api/v1/models/and.py @@ -0,0 +1,13 @@ +from sqlalchemy import Column, Integer, String, ForeignKey +from sqlalchemy.orm import relationship +from app.api.db.database import Base + +class And(Base): + __tablename__ = "ands" + + id = Column(Integer, primary_key=True, index=True) + title = Column(String) + content = Column(String) + blog_id = Column(Integer, ForeignKey("blogs.id")) + + blog = relationship("Blog", back_populates="ands") \ No newline at end of file diff --git a/app/api/v1/models/comments.py b/app/api/v1/models/comments.py new file mode 100644 index 0000000..6481014 --- /dev/null +++ b/app/api/v1/models/comments.py @@ -0,0 +1,14 @@ +from sqlalchemy import Column, Integer, String, ForeignKey +from sqlalchemy.orm import relationship +from app.api.db.database import Base + +class Comments(Base): + __tablename__ = "comments" + + id = Column(Integer, primary_key=True, index=True) + content = Column(String) + post_id = Column(Integer, ForeignKey("posts.id")) + author_id = Column(Integer, ForeignKey("users.id")) + + post = relationship("Posts", back_populates="comments") + author = relationship("Users", back_populates="comments") \ No newline at end of file diff --git a/app/api/v1/models/posts.py b/app/api/v1/models/posts.py new file mode 100644 index 0000000..d6e2eaf --- /dev/null +++ b/app/api/v1/models/posts.py @@ -0,0 +1,13 @@ +from sqlalchemy import Column, Integer, String, Text, ForeignKey +from sqlalchemy.orm import relationship +from app.api.db.database import Base + +class Posts(Base): + __tablename__ = "posts" + + id = Column(Integer, primary_key=True, index=True) + title = Column(String) + content = Column(Text) + user_id = Column(Integer, ForeignKey("users.id")) + + user = relationship("Users", back_populates="posts") \ No newline at end of file diff --git a/app/api/v1/models/user.py b/app/api/v1/models/user.py new file mode 100644 index 0000000..5db6ec6 --- /dev/null +++ b/app/api/v1/models/user.py @@ -0,0 +1,13 @@ +from sqlalchemy import Column, Integer, String +from app.api.db.database import Base + +class User(Base): + __tablename__ = "users" + + id = Column(Integer, primary_key=True, index=True) + username = Column(String, unique=True, index=True) + email = Column(String, unique=True, index=True) + password = Column(String) + full_name = Column(String) + bio = Column(String) + profile_picture = Column(String) \ No newline at end of file diff --git a/app/api/v1/routes/__init__.py b/app/api/v1/routes/__init__.py index e69de29..b09c2b9 100644 --- a/app/api/v1/routes/__init__.py +++ b/app/api/v1/routes/__init__.py @@ -0,0 +1,13 @@ +from fastapi import APIRouter + +from .users import router as users_router +from .auths import router as auths_router +from .comments import router as comments_router +from .posts import router as posts_router + +router = APIRouter() + +router.include_router(users_router, prefix="/users", tags=["users"]) +router.include_router(auths_router, prefix="/auths", tags=["auths"]) +router.include_router(comments_router, prefix="/comments", tags=["comments"]) +router.include_router(posts_router, prefix="/posts", tags=["posts"]) \ No newline at end of file diff --git a/app/api/v1/routes/and.py b/app/api/v1/routes/and.py new file mode 100644 index 0000000..47e8917 --- /dev/null +++ b/app/api/v1/routes/and.py @@ -0,0 +1,29 @@ +from typing import List +from fastapi import APIRouter, Depends, HTTPException +from sqlalchemy.orm import Session + +from app.api.v1.models.and import And +from app.api.v1.schemas.and import AndCreate, AndResponse +from app.api.core.dependencies.dependencies import get_db + +router = APIRouter() + +@router.get("/ands", response_model=List[AndResponse]) +def read_ands(db: Session = Depends(get_db)): + ands = db.query(And).all() + return ands + +@router.post("/ands", response_model=AndResponse) +def create_and(and_create: AndCreate, db: Session = Depends(get_db)): + and_db = And(**and_create.dict()) + db.add(and_db) + db.commit() + db.refresh(and_db) + return and_db + +@router.get("/ands/{id}", response_model=AndResponse) +def read_and(id: int, db: Session = Depends(get_db)): + and_db = db.query(And).filter(And.id == id).first() + if not and_db: + raise HTTPException(status_code=404, detail="And not found") + return and_db \ No newline at end of file diff --git a/app/api/v1/routes/comments.py b/app/api/v1/routes/comments.py new file mode 100644 index 0000000..8da3c83 --- /dev/null +++ b/app/api/v1/routes/comments.py @@ -0,0 +1,29 @@ +from typing import List +from fastapi import APIRouter, Depends, HTTPException +from sqlalchemy.orm import Session + +from app.api.v1.models.comments import Comment +from app.api.v1.schemas.comments import CommentCreate, CommentResponse +from app.api.core.dependencies.dependencies import get_db + +router = APIRouter() + +@router.get("/commentss", response_model=List[CommentResponse]) +def read_commentss(db: Session = Depends(get_db)): + commentss = db.query(Comment).all() + return commentss + +@router.post("/commentss", response_model=CommentResponse) +def create_comments(comments: CommentCreate, db: Session = Depends(get_db)): + db_comments = Comment(**comments.dict()) + db.add(db_comments) + db.commit() + db.refresh(db_comments) + return db_comments + +@router.get("/commentss/{id}", response_model=CommentResponse) +def read_comments(id: int, db: Session = Depends(get_db)): + db_comments = db.query(Comment).get(id) + if not db_comments: + raise HTTPException(status_code=404, detail="Comments not found") + return db_comments \ No newline at end of file diff --git a/app/api/v1/routes/posts.py b/app/api/v1/routes/posts.py new file mode 100644 index 0000000..dad0642 --- /dev/null +++ b/app/api/v1/routes/posts.py @@ -0,0 +1,29 @@ +from typing import List +from fastapi import APIRouter, Depends, HTTPException +from sqlalchemy.orm import Session + +from app.api.v1.models.posts import Posts +from app.api.v1.schemas.posts import PostsCreate, PostsOut +from app.api.core.dependencies.dependencies import get_db + +router = APIRouter() + +@router.get("/postss", response_model=List[PostsOut]) +def read_postss(db: Session = Depends(get_db)): + postss = db.query(Posts).all() + return postss + +@router.post("/postss", response_model=PostsOut) +def create_posts(posts: PostsCreate, db: Session = Depends(get_db)): + db_posts = Posts(**posts.dict()) + db.add(db_posts) + db.commit() + db.refresh(db_posts) + return db_posts + +@router.get("/postss/{id}", response_model=PostsOut) +def read_posts(id: int, db: Session = Depends(get_db)): + db_posts = db.query(Posts).get(id) + if not db_posts: + raise HTTPException(status_code=404, detail="Posts not found") + return db_posts \ No newline at end of file diff --git a/app/api/v1/routes/user.py b/app/api/v1/routes/user.py new file mode 100644 index 0000000..a062cad --- /dev/null +++ b/app/api/v1/routes/user.py @@ -0,0 +1,29 @@ +from typing import List +from fastapi import APIRouter, Depends, HTTPException +from sqlalchemy.orm import Session + +from app.api.core.dependencies import get_db +from app.api.v1.models.user import User +from app.api.v1.schemas.user import UserCreate, UserResponse + +router = APIRouter() + +@router.get("/users", response_model=List[UserResponse]) +def read_users(db: Session = Depends(get_db)): + users = db.query(User).all() + return users + +@router.post("/users", response_model=UserResponse) +def create_user(user: UserCreate, db: Session = Depends(get_db)): + db_user = User(**user.dict()) + db.add(db_user) + db.commit() + db.refresh(db_user) + return db_user + +@router.get("/users/{user_id}", response_model=UserResponse) +def read_user(user_id: int, db: Session = Depends(get_db)): + db_user = db.query(User).filter(User.id == user_id).first() + if not db_user: + raise HTTPException(status_code=404, detail="User not found") + return db_user \ No newline at end of file diff --git a/app/api/v1/schemas/and.py b/app/api/v1/schemas/and.py new file mode 100644 index 0000000..7ed1361 --- /dev/null +++ b/app/api/v1/schemas/and.py @@ -0,0 +1,13 @@ +from pydantic import BaseModel + +class AndBase(BaseModel): + pass + +class AndCreate(AndBase): + pass + +class And(AndBase): + id: int + + class Config: + orm_mode = True \ No newline at end of file diff --git a/app/api/v1/schemas/comments.py b/app/api/v1/schemas/comments.py new file mode 100644 index 0000000..cbb07f5 --- /dev/null +++ b/app/api/v1/schemas/comments.py @@ -0,0 +1,17 @@ +from typing import Optional +from pydantic import BaseModel + +class CommentsBase(BaseModel): + comment_text: str + post_id: int + +class CommentsCreate(CommentsBase): + pass + +class Comments(CommentsBase): + id: int + created_at: Optional[str] = None + updated_at: Optional[str] = None + + class Config: + orm_mode = True \ No newline at end of file diff --git a/app/api/v1/schemas/posts.py b/app/api/v1/schemas/posts.py new file mode 100644 index 0000000..b5200f0 --- /dev/null +++ b/app/api/v1/schemas/posts.py @@ -0,0 +1,17 @@ +from typing import Optional +from pydantic import BaseModel + +class PostsBase(BaseModel): + title: str + content: str + +class PostsCreate(PostsBase): + pass + +class Posts(PostsBase): + id: int + is_published: bool + rating: Optional[int] = None + + class Config: + orm_mode = True \ No newline at end of file diff --git a/app/api/v1/schemas/user.py b/app/api/v1/schemas/user.py new file mode 100644 index 0000000..d640816 --- /dev/null +++ b/app/api/v1/schemas/user.py @@ -0,0 +1,21 @@ +from typing import Optional +from pydantic import BaseModel, EmailStr + +class UserBase(BaseModel): + email: Optional[EmailStr] = None + is_active: Optional[bool] = True + is_superuser: bool = False + full_name: Optional[str] = None + +class UserCreate(UserBase): + email: EmailStr + password: str + +class User(UserBase): + id: int + is_active: bool + is_superuser: bool + full_name: str + + class Config: + orm_mode = True \ No newline at end of file diff --git a/main.py b/main.py index dca5c44..dc4441c 100644 --- a/main.py +++ b/main.py @@ -1,7 +1,11 @@ from fastapi import FastAPI +from app.api.db.database import Base, engine +from app.api.v1.routes import router as v1_router +from app.api.core.middleware.activity_tracker import ActivityTrackerMiddleware -app = FastAPI(title="Generated Backend") +app = FastAPI() -@app.get("/") -def read_root(): - return {"message": "Welcome to the generated backend"} \ No newline at end of file +Base.metadata.create_all(bind=engine) + +app.include_router(v1_router, prefix="/v1") +app.add_middleware(ActivityTrackerMiddleware) \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index a70e8ac..5dcc60d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1 @@ -fastapi -uvicorn -sqlalchemy -pydantic \ No newline at end of file +# No valid code generated