mirror of
https://github.com/creyD/creyPY.git
synced 2026-04-13 11:50:31 +02:00
Compare commits
22 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d471b86a25 | ||
|
|
aa99fc6226 | ||
|
|
30a5e417eb | ||
|
|
1f5ba9210f | ||
|
|
f805b3f508 | ||
|
|
8a882cdaae | ||
|
|
40176aa3e9 | ||
|
|
be66bbebbf | ||
|
|
79dde8008a | ||
|
|
adb017d6ce | ||
|
|
e160cc5fea | ||
|
|
7afb8e2fd8 | ||
|
|
badf2b157f | ||
|
|
c903266ec4 | ||
|
|
910638e3a6 | ||
|
|
83dca59817 | ||
|
|
b80d26586d | ||
|
|
c2e2469027 | ||
|
|
8363055984 | ||
|
|
f586ce5c03 | ||
|
|
0af8f05edf | ||
|
|
b73c524e8d |
4
.github/workflows/ci.yml
vendored
4
.github/workflows/ci.yml
vendored
@@ -38,7 +38,7 @@ jobs:
|
|||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- uses: actions/setup-python@v5
|
- uses: actions/setup-python@v5
|
||||||
with:
|
with:
|
||||||
python-version: '3.12'
|
python-version: '3.13'
|
||||||
- run: python -m pip install --upgrade pip
|
- run: python -m pip install --upgrade pip
|
||||||
- run: |
|
- run: |
|
||||||
python -m pip install -r requirements.txt
|
python -m pip install -r requirements.txt
|
||||||
@@ -93,7 +93,7 @@ jobs:
|
|||||||
- name: Set up Python
|
- name: Set up Python
|
||||||
uses: actions/setup-python@v5
|
uses: actions/setup-python@v5
|
||||||
with:
|
with:
|
||||||
python-version: '3.12'
|
python-version: '3.13'
|
||||||
|
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: |
|
run: |
|
||||||
|
|||||||
2
.gitignore
vendored
2
.gitignore
vendored
@@ -158,3 +158,5 @@ cython_debug/
|
|||||||
# and can be added to the global gitignore or merged into this file. For a more nuclear
|
# and can be added to the global gitignore or merged into this file. For a more nuclear
|
||||||
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
|
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
|
||||||
#.idea/
|
#.idea/
|
||||||
|
|
||||||
|
.DS_*
|
||||||
|
|||||||
@@ -1,12 +1,13 @@
|
|||||||
from typing import Type, TypeVar, overload
|
import asyncio
|
||||||
|
from typing import List, Type, TypeVar, overload
|
||||||
from uuid import UUID
|
from uuid import UUID
|
||||||
|
|
||||||
from fastapi import HTTPException
|
from fastapi import HTTPException
|
||||||
from pydantic import BaseModel
|
from pydantic import BaseModel
|
||||||
from sqlalchemy.orm import Session
|
|
||||||
from sqlalchemy.ext.asyncio import AsyncSession
|
from sqlalchemy.ext.asyncio import AsyncSession
|
||||||
from sqlalchemy.future import select
|
from sqlalchemy.future import select
|
||||||
import asyncio
|
from sqlalchemy.orm import Session
|
||||||
|
|
||||||
from .models.base import Base
|
from .models.base import Base
|
||||||
|
|
||||||
T = TypeVar("T", bound=Base)
|
T = TypeVar("T", bound=Base)
|
||||||
@@ -19,13 +20,19 @@ async def get_object_or_404(
|
|||||||
db: AsyncSession,
|
db: AsyncSession,
|
||||||
expunge: bool = False,
|
expunge: bool = False,
|
||||||
lookup_column: str = "id",
|
lookup_column: str = "id",
|
||||||
|
response_fields: List[str] = [],
|
||||||
) -> T:
|
) -> T:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
@overload
|
@overload
|
||||||
def get_object_or_404(
|
def get_object_or_404(
|
||||||
db_class: Type[T], id: UUID | str, db: Session, expunge: bool = False, lookup_column: str = "id"
|
db_class: Type[T],
|
||||||
|
id: UUID | str,
|
||||||
|
db: Session,
|
||||||
|
expunge: bool = False,
|
||||||
|
lookup_column: str = "id",
|
||||||
|
response_fields: List[str] = [],
|
||||||
) -> T:
|
) -> T:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
@@ -36,20 +43,44 @@ def get_object_or_404(
|
|||||||
db: Session | AsyncSession,
|
db: Session | AsyncSession,
|
||||||
expunge: bool = False,
|
expunge: bool = False,
|
||||||
lookup_column: str = "id",
|
lookup_column: str = "id",
|
||||||
|
response_fields: List[str] = [],
|
||||||
) -> T:
|
) -> T:
|
||||||
|
|
||||||
async def _get_async_object() -> T:
|
async def _get_async_object() -> T:
|
||||||
query = select(db_class).filter(getattr(db_class, lookup_column) == id)
|
if response_fields:
|
||||||
result = await db.execute(query)
|
selected_columns = [
|
||||||
obj = result.scalar_one_or_none()
|
getattr(db_class, field) for field in response_fields if hasattr(db_class, field)
|
||||||
if obj is None:
|
]
|
||||||
raise HTTPException(status_code=404, detail="The object does not exist.") # type: ignore
|
query = select(*selected_columns).where(getattr(db_class, lookup_column) == id)
|
||||||
|
result = await db.execute(query)
|
||||||
|
row = result.first()
|
||||||
|
|
||||||
|
if row is None:
|
||||||
|
raise HTTPException(status_code=404, detail="The object does not exist.")
|
||||||
|
if hasattr(row, "_mapping"):
|
||||||
|
obj_dict = dict(row._mapping)
|
||||||
|
else:
|
||||||
|
obj_dict = {column.key: getattr(row, column.key) for column in selected_columns}
|
||||||
|
else:
|
||||||
|
query = select(db_class).where(getattr(db_class, lookup_column) == id)
|
||||||
|
result = await db.execute(query)
|
||||||
|
row = result.scalar_one_or_none()
|
||||||
|
if row is None:
|
||||||
|
raise HTTPException(status_code=404, detail="The object does not exist.")
|
||||||
|
obj_dict = row
|
||||||
if expunge:
|
if expunge:
|
||||||
await db.expunge(obj)
|
await db.expunge(obj_dict)
|
||||||
return obj
|
return obj_dict
|
||||||
|
|
||||||
def _get_sync_object() -> T:
|
def _get_sync_object() -> T:
|
||||||
obj = db.query(db_class).filter(getattr(db_class, lookup_column) == id).one_or_none()
|
if response_fields:
|
||||||
|
selected_columns = [
|
||||||
|
getattr(db_class, field) for field in response_fields if hasattr(db_class, field)
|
||||||
|
]
|
||||||
|
query = db.query(*selected_columns).filter(getattr(db_class, lookup_column) == id)
|
||||||
|
else:
|
||||||
|
query = db.query(db_class).filter(getattr(db_class, lookup_column) == id)
|
||||||
|
obj = query.one_or_none()
|
||||||
if obj is None:
|
if obj is None:
|
||||||
raise HTTPException(status_code=404, detail="The object does not exist.") # type: ignore
|
raise HTTPException(status_code=404, detail="The object does not exist.") # type: ignore
|
||||||
if expunge:
|
if expunge:
|
||||||
|
|||||||
@@ -1 +1,2 @@
|
|||||||
from .base import * # noqa
|
from .base import * # noqa
|
||||||
|
from .schema_optional import * #noqa
|
||||||
|
|||||||
19
creyPY/fastapi/schemas/schema_optional.py
Normal file
19
creyPY/fastapi/schemas/schema_optional.py
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
from typing import Optional, Type, Union, get_args, get_origin, get_type_hints
|
||||||
|
|
||||||
|
from pydantic import BaseModel, create_model
|
||||||
|
|
||||||
|
|
||||||
|
def optional_fields(cls: Type[BaseModel]) -> Type[BaseModel]:
|
||||||
|
fields = {}
|
||||||
|
for name, hint in get_type_hints(cls).items():
|
||||||
|
if name.startswith("_"):
|
||||||
|
continue
|
||||||
|
|
||||||
|
if get_origin(hint) is not Union or type(None) not in get_args(hint):
|
||||||
|
hint = Optional[hint]
|
||||||
|
|
||||||
|
fields[name] = (hint, None)
|
||||||
|
|
||||||
|
new_model = create_model(cls.__name__, __base__=cls, **fields)
|
||||||
|
|
||||||
|
return new_model
|
||||||
@@ -1,2 +1,3 @@
|
|||||||
from .auth0 import * # noqa
|
from .auth0 import * # noqa
|
||||||
from .stripe import * # noqa
|
from .stripe import * # noqa
|
||||||
|
from .aws import * # noqa
|
||||||
|
|||||||
@@ -120,6 +120,16 @@ def create_user_invite(email: str, company_id: str) -> dict:
|
|||||||
return re.json()
|
return re.json()
|
||||||
|
|
||||||
|
|
||||||
|
def delete_user_invite(user_id: str) -> None:
|
||||||
|
re = requests.delete(
|
||||||
|
f"https://{AUTH0_DOMAIN}/api/v2/users/{user_id}",
|
||||||
|
headers={"Authorization": f"Bearer {get_management_token()}"},
|
||||||
|
timeout=5,
|
||||||
|
)
|
||||||
|
if re.status_code != 204:
|
||||||
|
raise HTTPException(re.status_code, re.json())
|
||||||
|
|
||||||
|
|
||||||
def password_change_mail(email: str) -> bool:
|
def password_change_mail(email: str) -> bool:
|
||||||
re = requests.post(
|
re = requests.post(
|
||||||
f"https://{AUTH0_DOMAIN}/dbconnections/change_password",
|
f"https://{AUTH0_DOMAIN}/dbconnections/change_password",
|
||||||
@@ -135,3 +145,21 @@ def password_change_mail(email: str) -> bool:
|
|||||||
if re.status_code != 200:
|
if re.status_code != 200:
|
||||||
raise HTTPException(re.status_code, re.json())
|
raise HTTPException(re.status_code, re.json())
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
|
||||||
|
def user_password_change_ticket(user_id: str) -> str:
|
||||||
|
re = requests.post(
|
||||||
|
f"https://{AUTH0_DOMAIN}/api/v2/tickets/password-change",
|
||||||
|
headers={"Authorization": f"Bearer {get_management_token()}"},
|
||||||
|
json={
|
||||||
|
"user_id": user_id,
|
||||||
|
"client_id": AUTH0_CLIENT_ID,
|
||||||
|
"ttl_sec": 0,
|
||||||
|
"mark_email_as_verified": False,
|
||||||
|
"includeEmailInRedirect": False,
|
||||||
|
},
|
||||||
|
timeout=5,
|
||||||
|
)
|
||||||
|
if re.status_code != 201:
|
||||||
|
raise HTTPException(re.status_code, re.json())
|
||||||
|
return re.json()["ticket"]
|
||||||
|
|||||||
1
creyPY/services/aws/__init__.py
Normal file
1
creyPY/services/aws/__init__.py
Normal file
@@ -0,0 +1 @@
|
|||||||
|
from .email import * # noqa
|
||||||
32
creyPY/services/aws/email.py
Normal file
32
creyPY/services/aws/email.py
Normal file
@@ -0,0 +1,32 @@
|
|||||||
|
import os
|
||||||
|
|
||||||
|
import boto3
|
||||||
|
from botocore.exceptions import ClientError
|
||||||
|
|
||||||
|
AWS_CLIENT_ID = os.getenv("AWS_CLIENT_ID")
|
||||||
|
AWS_CLIENT_SECRET = os.getenv("AWS_CLIENT_SECRET")
|
||||||
|
AWS_SENDER_EMAIL = os.getenv("AWS_SENDER_EMAIL")
|
||||||
|
AWS_REGION = os.getenv("AWS_REGION", "eu-central-1")
|
||||||
|
|
||||||
|
|
||||||
|
async def send_email_ses(recipient_email, subject, html_body):
|
||||||
|
ses_client = boto3.client(
|
||||||
|
"ses",
|
||||||
|
aws_access_key_id=AWS_CLIENT_ID,
|
||||||
|
aws_secret_access_key=AWS_CLIENT_SECRET,
|
||||||
|
region_name=AWS_REGION,
|
||||||
|
)
|
||||||
|
email_message = {
|
||||||
|
"Source": AWS_SENDER_EMAIL,
|
||||||
|
"Destination": {"ToAddresses": [recipient_email]},
|
||||||
|
"Message": {
|
||||||
|
"Subject": {"Data": subject, "Charset": "UTF-8"},
|
||||||
|
"Body": {"Html": {"Data": html_body, "Charset": "UTF-8"}},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
try:
|
||||||
|
response = ses_client.send_email(**email_message)
|
||||||
|
return response["MessageId"]
|
||||||
|
except ClientError as e:
|
||||||
|
return None
|
||||||
@@ -1 +1 @@
|
|||||||
stripe==11.6.0 # Stripe
|
stripe==12.3.0 # Stripe
|
||||||
|
|||||||
Reference in New Issue
Block a user