mirror of
https://github.com/creyD/creyPY.git
synced 2026-04-12 19:30:30 +02:00
Compare commits
35 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 | ||
|
|
be260b0ee6 | ||
|
|
b0f2815568 | ||
|
|
6ac609f3f4 | ||
|
|
53ed939451 | ||
| c56d14c2fd | |||
|
|
1e9bcb92b6 | ||
| 5e16bd5cbc | |||
|
|
50b444be89 | ||
| e12c86e352 | |||
|
|
0708a48301 | ||
| 34595d52f2 | |||
|
|
421725ad10 | ||
| 31c4cbb055 |
4
.github/workflows/ci.yml
vendored
4
.github/workflows/ci.yml
vendored
@@ -38,7 +38,7 @@ jobs:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: actions/setup-python@v5
|
||||
with:
|
||||
python-version: '3.12'
|
||||
python-version: '3.13'
|
||||
- run: python -m pip install --upgrade pip
|
||||
- run: |
|
||||
python -m pip install -r requirements.txt
|
||||
@@ -93,7 +93,7 @@ jobs:
|
||||
- name: Set up Python
|
||||
uses: actions/setup-python@v5
|
||||
with:
|
||||
python-version: '3.12'
|
||||
python-version: '3.13'
|
||||
|
||||
- name: Install dependencies
|
||||
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
|
||||
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
|
||||
#.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 fastapi import HTTPException
|
||||
from pydantic import BaseModel
|
||||
from sqlalchemy.orm import Session
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
from sqlalchemy.future import select
|
||||
import asyncio
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from .models.base import Base
|
||||
|
||||
T = TypeVar("T", bound=Base)
|
||||
@@ -19,13 +20,19 @@ async def get_object_or_404(
|
||||
db: AsyncSession,
|
||||
expunge: bool = False,
|
||||
lookup_column: str = "id",
|
||||
response_fields: List[str] = [],
|
||||
) -> T:
|
||||
pass
|
||||
|
||||
|
||||
@overload
|
||||
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:
|
||||
pass
|
||||
|
||||
@@ -36,20 +43,44 @@ def get_object_or_404(
|
||||
db: Session | AsyncSession,
|
||||
expunge: bool = False,
|
||||
lookup_column: str = "id",
|
||||
response_fields: List[str] = [],
|
||||
) -> T:
|
||||
|
||||
async def _get_async_object() -> T:
|
||||
query = select(db_class).filter(getattr(db_class, lookup_column) == id)
|
||||
result = await db.execute(query)
|
||||
obj = result.scalar_one_or_none()
|
||||
if obj is None:
|
||||
raise HTTPException(status_code=404, detail="The object does not exist.") # type: ignore
|
||||
if response_fields:
|
||||
selected_columns = [
|
||||
getattr(db_class, field) for field in response_fields if hasattr(db_class, field)
|
||||
]
|
||||
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:
|
||||
await db.expunge(obj)
|
||||
return obj
|
||||
await db.expunge(obj_dict)
|
||||
return obj_dict
|
||||
|
||||
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:
|
||||
raise HTTPException(status_code=404, detail="The object does not exist.") # type: ignore
|
||||
if expunge:
|
||||
|
||||
@@ -1,3 +1,8 @@
|
||||
from .async_session import * # noqa
|
||||
from .helpers import * # noqa
|
||||
from .session import * # noqa
|
||||
try:
|
||||
import sqlalchemy
|
||||
|
||||
from .async_session import *
|
||||
from .helpers import *
|
||||
from .session import *
|
||||
except ImportError:
|
||||
print("SQLAlchemy not installed. Database functionality will be disabled.")
|
||||
|
||||
@@ -1,15 +1,14 @@
|
||||
from typing import AsyncGenerator
|
||||
|
||||
from sqlalchemy.ext.asyncio import AsyncSession, create_async_engine
|
||||
from sqlalchemy.orm import sessionmaker
|
||||
from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker, create_async_engine
|
||||
|
||||
from .common import SQLALCHEMY_DATABASE_URL, name
|
||||
from .common import SQLALCHEMY_DATABASE_URL, name, ssl_mode
|
||||
|
||||
async_engine = create_async_engine(
|
||||
SQLALCHEMY_DATABASE_URL + name, pool_pre_ping=True, connect_args={"sslmode": "require"}
|
||||
SQLALCHEMY_DATABASE_URL + name, pool_pre_ping=True, connect_args={"sslmode": ssl_mode}
|
||||
)
|
||||
|
||||
AsyncSessionLocal = sessionmaker(
|
||||
AsyncSessionLocal = async_sessionmaker(
|
||||
bind=async_engine,
|
||||
class_=AsyncSession,
|
||||
expire_on_commit=False,
|
||||
|
||||
@@ -1 +1,2 @@
|
||||
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
|
||||
@@ -20,7 +20,6 @@ class AbstractTestAPI(unittest.IsolatedAsyncioTestCase):
|
||||
transport=ASGITransport(app=app), base_url="http://testserver", follow_redirects=True
|
||||
)
|
||||
cls.default_headers = headers
|
||||
print("setting up abstract")
|
||||
|
||||
@classmethod
|
||||
def setup_database(
|
||||
@@ -52,7 +51,7 @@ class AbstractTestAPI(unittest.IsolatedAsyncioTestCase):
|
||||
async_db_url,
|
||||
echo=False,
|
||||
pool_pre_ping=True,
|
||||
connect_args={"sslmode": "require"},
|
||||
connect_args={"sslmode": ssl_mode},
|
||||
)
|
||||
|
||||
async def get(self, url: str, r_code: int = 200, parse_json=True) -> dict | bytes:
|
||||
@@ -141,6 +140,7 @@ class AbstractTestAPI(unittest.IsolatedAsyncioTestCase):
|
||||
pagination: bool = True,
|
||||
id_field: str = "id",
|
||||
created_at_check: bool = True,
|
||||
patch: dict | None = None,
|
||||
):
|
||||
# GET LIST
|
||||
re = await self.get(url)
|
||||
@@ -165,6 +165,14 @@ class AbstractTestAPI(unittest.IsolatedAsyncioTestCase):
|
||||
re = await self.get(f"{url}{obj_id}/")
|
||||
self.assertEqual(re[id_field], obj_id)
|
||||
|
||||
# PATCH
|
||||
if patch:
|
||||
for key, value in patch.items():
|
||||
input_obj[key] = value
|
||||
re = await self.patch(f"{url}{obj_id}/", obj=input_obj)
|
||||
for key, value in patch.items():
|
||||
self.assertEqual(re[key], value)
|
||||
|
||||
# GET LIST
|
||||
re = await self.get(url)
|
||||
if pagination:
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
import secrets
|
||||
import string
|
||||
import csv
|
||||
from pathlib import Path
|
||||
|
||||
|
||||
def create_random_password(length: int = 12) -> str:
|
||||
@@ -14,3 +16,11 @@ def create_random_password(length: int = 12) -> str:
|
||||
password += [secrets.choice(all_characters) for _ in range(length - 4)]
|
||||
secrets.SystemRandom().shuffle(password)
|
||||
return "".join(password)
|
||||
|
||||
|
||||
def data_to_csv(file: Path, data: list) -> None:
|
||||
|
||||
with file.open(mode="w", newline="", encoding="utf-8") as f:
|
||||
writer = csv.DictWriter(f, fieldnames=data[0].keys(), delimiter=";")
|
||||
writer.writeheader()
|
||||
writer.writerows(data)
|
||||
|
||||
@@ -1,2 +1,3 @@
|
||||
from .auth0 import * # noqa
|
||||
from .stripe import * # noqa
|
||||
from .aws import * # noqa
|
||||
|
||||
@@ -101,7 +101,7 @@ def request_verification_mail(sub: str) -> None:
|
||||
return re.json()
|
||||
|
||||
|
||||
def create_user_invite(email: str) -> dict:
|
||||
def create_user_invite(email: str, company_id: str) -> dict:
|
||||
re = requests.post(
|
||||
f"https://{AUTH0_DOMAIN}/api/v2/users",
|
||||
headers={"Authorization": f"Bearer {get_management_token()}"},
|
||||
@@ -111,6 +111,7 @@ def create_user_invite(email: str) -> dict:
|
||||
"password": create_random_password(),
|
||||
"verify_email": False,
|
||||
"app_metadata": {"invitedToMyApp": True},
|
||||
"user_metadata": {"company_ids": [company_id]},
|
||||
},
|
||||
timeout=5,
|
||||
)
|
||||
@@ -119,6 +120,16 @@ def create_user_invite(email: str) -> dict:
|
||||
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:
|
||||
re = requests.post(
|
||||
f"https://{AUTH0_DOMAIN}/dbconnections/change_password",
|
||||
@@ -134,3 +145,21 @@ def password_change_mail(email: str) -> bool:
|
||||
if re.status_code != 200:
|
||||
raise HTTPException(re.status_code, re.json())
|
||||
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.4.1 # Stripe
|
||||
stripe==12.3.0 # Stripe
|
||||
|
||||
Reference in New Issue
Block a user