mirror of
https://github.com/creyD/creyPY.git
synced 2026-04-13 03:40:31 +02:00
Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 3f0379290d | |||
|
|
fa7a1c8a61 | ||
| 5a7e1776db | |||
| 4c25d91e18 | |||
| f24db62781 | |||
| 4d997a375e |
12
CHANGELOG.md
12
CHANGELOG.md
@@ -2,6 +2,18 @@
|
|||||||
|
|
||||||
All notable changes to this project will be documented in this file.
|
All notable changes to this project will be documented in this file.
|
||||||
|
|
||||||
|
## 1.2.4
|
||||||
|
|
||||||
|
- Enabled newer versions for all dependencies
|
||||||
|
|
||||||
|
## 1.2.3
|
||||||
|
|
||||||
|
- Added option to specify lookup_column for get_object_or_404
|
||||||
|
|
||||||
|
## 1.2.2
|
||||||
|
|
||||||
|
- Added order_by method
|
||||||
|
|
||||||
## 1.1.0
|
## 1.1.0
|
||||||
|
|
||||||
- Added headers to testing
|
- Added headers to testing
|
||||||
|
|||||||
@@ -10,8 +10,10 @@ from .models.base import Base
|
|||||||
T = TypeVar("T", bound=Base)
|
T = TypeVar("T", bound=Base)
|
||||||
|
|
||||||
|
|
||||||
def get_object_or_404(db_class: Type[T], id: UUID | str, db: Session, expunge: bool = False) -> T:
|
def get_object_or_404(
|
||||||
obj = db.query(db_class).filter(db_class.id == id).one_or_none()
|
db_class: Type[T], id: UUID | str, db: Session, expunge: bool = False, lookup_column: str = "id"
|
||||||
|
) -> T:
|
||||||
|
obj = db.query(db_class).filter(getattr(db_class, lookup_column) == id).one_or_none()
|
||||||
if obj is None:
|
if obj is None:
|
||||||
raise HTTPException(status_code=404, detail="The object does not exist.")
|
raise HTTPException(status_code=404, detail="The object does not exist.")
|
||||||
if expunge:
|
if expunge:
|
||||||
@@ -36,7 +38,7 @@ def update_obj_from_data(
|
|||||||
model: Type[T],
|
model: Type[T],
|
||||||
id: UUID | str,
|
id: UUID | str,
|
||||||
db: Session,
|
db: Session,
|
||||||
partial: bool = False,
|
partial: bool = False, # TODO: inverse, because it is currently the wrong way around
|
||||||
ignore_fields=[],
|
ignore_fields=[],
|
||||||
additional_data={},
|
additional_data={},
|
||||||
exclude={},
|
exclude={},
|
||||||
|
|||||||
25
creyPY/fastapi/order_by.py
Normal file
25
creyPY/fastapi/order_by.py
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
from typing import Callable
|
||||||
|
|
||||||
|
from pydantic.json_schema import SkipJsonSchema
|
||||||
|
from sqlalchemy import String, asc, cast, desc
|
||||||
|
from sqlalchemy.dialects.postgresql import UUID
|
||||||
|
from sqlalchemy.sql.selectable import Select
|
||||||
|
|
||||||
|
|
||||||
|
def order_by(order_by: str | SkipJsonSchema[None] = None) -> Callable[[Select], Select]:
|
||||||
|
def _order_by(query: Select) -> Select:
|
||||||
|
if order_by:
|
||||||
|
direction = desc if order_by.startswith("-") else asc
|
||||||
|
column_name = order_by.lstrip("-")
|
||||||
|
|
||||||
|
# Get the column from the query
|
||||||
|
for column in query.inner_columns:
|
||||||
|
if column.key == column_name:
|
||||||
|
# If the column is a UUID, cast it to a string
|
||||||
|
if isinstance(column.type, UUID):
|
||||||
|
column = cast(column, String)
|
||||||
|
query = query.order_by(direction(column))
|
||||||
|
break
|
||||||
|
return query
|
||||||
|
|
||||||
|
return _order_by
|
||||||
@@ -1,23 +1,23 @@
|
|||||||
annotated-types==0.6.0 # Pydantic
|
annotated-types>=0.6.0 # Pydantic
|
||||||
pydantic==2.6.4 # Pydantic
|
pydantic>=2.6.4 # Pydantic
|
||||||
pydantic-core==2.16.3 # Pydantic
|
pydantic-core>=2.16.3 # Pydantic
|
||||||
typing-extensions==4.10.0 # Pydantic
|
typing-extensions>=4.10.0 # Pydantic
|
||||||
|
|
||||||
anyio==4.3.0 # FastAPI
|
anyio>=4.3.0 # FastAPI
|
||||||
fastapi==0.110.1 # FastAPI
|
fastapi>=0.110.1 # FastAPI
|
||||||
idna==3.6 # FastAPI
|
idna>=3.6 # FastAPI
|
||||||
sniffio==1.3.1 # FastAPI
|
sniffio>=1.3.1 # FastAPI
|
||||||
starlette==0.37.2 # FastAPI
|
starlette>=0.37.2 # FastAPI
|
||||||
|
|
||||||
fastapi-pagination==0.12.21 # Pagination
|
fastapi-pagination>=0.12.21 # Pagination
|
||||||
sqlalchemy==2.0.29 # SQLAlchemy
|
sqlalchemy>=2.0.29 # SQLAlchemy
|
||||||
|
|
||||||
python-dotenv==1.0.1 # Environment variables
|
python-dotenv>=1.0.1 # Environment variables
|
||||||
|
|
||||||
psycopg==3.1.18 # PostgreSQL
|
psycopg>=3.1.18 # PostgreSQL
|
||||||
psycopg-binary==3.1.18 # PostgreSQL
|
psycopg-binary>=3.1.18 # PostgreSQL
|
||||||
psycopg-pool==3.2.1 # PostgreSQL
|
psycopg-pool>=3.2.1 # PostgreSQL
|
||||||
|
|
||||||
h11==0.14.0 # Testing
|
h11>=0.14.0 # Testing
|
||||||
httpcore==1.0.5 # Testing
|
httpcore>=1.0.5 # Testing
|
||||||
httpx==0.27.0 # Testing
|
httpx>=0.27.0 # Testing
|
||||||
|
|||||||
Reference in New Issue
Block a user