feat(deps): update paulhatch/semantic-version action to v6

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

.github/workflows/ci.yml

@@ -76,7 +76,7 @@ jobs:
           fi
 
       - name: Git Version
-        uses: PaulHatch/semantic-version@v5.4.0
+        uses: PaulHatch/semantic-version@v6.0.2
         id: git_version
         with:
           tag_prefix: ""

.gitignore

@@ -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_*

creyPY/const/__init__.py

@@ -1,3 +1,4 @@
+from .fields import *  # noqa
 from .groups import *  # noqa
 from .i18n import *  # noqa
 from .stripe import *  # noqa

creyPY/const/fields.py

@@ -0,0 +1,17 @@
+from sqlalchemy import types
+
+
+class LowerCaseString(types.TypeDecorator):
+    """Converts strings to lower case on the way in."""
+
+    impl = types.String
+    cache_ok = True
+
+    def process_bind_param(self, value, dialect):
+        if value is None:
+            return value
+        return value.lower()
+
+    @property
+    def python_type(self):
+        return str

creyPY/fastapi/crud.py

@@ -1,12 +1,13 @@
-from typing import Type, TypeVar, overload, List
+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)
@@ -50,16 +51,26 @@ def get_object_or_404(
             selected_columns = [
                 getattr(db_class, field) for field in response_fields if hasattr(db_class, field)
             ]
-            query = select(*selected_columns).select_from(db_class)
+            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).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
+            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:
         if response_fields:

creyPY/fastapi/models/base.py

@@ -1,7 +1,7 @@
 import uuid
 from datetime import datetime
 
-from sqlalchemy import Column, DateTime, String
+from sqlalchemy import Column, DateTime, PrimaryKeyConstraint, String
 from sqlalchemy.dialects.postgresql import UUID
 from sqlalchemy.ext.declarative import declared_attr
 from sqlalchemy.orm import as_declarative
@@ -23,6 +23,11 @@ class Base(AutoAnnotateMixin, AutoInitMixin):
 
     # TODO: Add automated foreign key resolution
 
+    # Add name to primary key constraint to ensure alembic can pick it up later
+    @declared_attr
+    def __table_args__(cls):
+        return (PrimaryKeyConstraint("id", name=f"pk_{cls.__tablename__}"),)
+
     # Generate __tablename__ automatically
     @declared_attr
     def __tablename__(cls) -> str:

creyPY/fastapi/schemas/__init__.py

@@ -1,2 +1,2 @@
 from .base import *  # noqa
-from .response_schema import * #noqa
+from .schema_optional import * #noqa

creyPY/fastapi/schemas/response_schema.py

@@ -1,40 +0,0 @@
-from typing import List, Optional, Type
-from pydantic import BaseModel, create_model
-from fastapi import Query
-
-
-class ResponseModelDependency:
-    def __init__(self, model_class: Type[BaseModel]):
-        self.model_class = model_class
-
-    def __call__(self, response_fields: Optional[List[str]] = Query(None)) -> Type[BaseModel]:
-        def process_result(result, fields=None):
-            if not fields:
-                return result
-
-            if hasattr(result, "_fields"):
-                row_fields = result._fields
-                return dict(zip(row_fields, result))
-            elif isinstance(result, tuple):
-                return dict(zip(fields, result))
-            elif isinstance(result, dict):
-                return result
-            else:
-                return {field: getattr(result, field) for field in fields if hasattr(result, field)}
-
-        if not response_fields:
-            return self.model_class, None, process_result
-
-        all_annotations = {}
-        for cls in self.model_class.__mro__:
-            if hasattr(cls, "__annotations__"):
-                all_annotations.update(cls.__annotations__)
-
-        fields = {}
-        for field in response_fields:
-            if field in all_annotations:
-                fields[field] = (all_annotations[field], None)
-
-        dynamic_model = create_model(f"Dynamic{self.model_class.__name__}", **fields)
-
-        return dynamic_model, response_fields, process_result

creyPY/fastapi/schemas/schema_optional.py

@@ -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

creyPY/services/__init__.py

@@ -1,2 +1,3 @@
 from .auth0 import *  # noqa
 from .stripe import *  # noqa
+from .aws import *  # noqa

creyPY/services/auth0/utils.py

@@ -145,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"]

creyPY/services/aws/__init__.py

@@ -0,0 +1 @@
+from .email import *  # noqa

creyPY/services/aws/email.py

@@ -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

requirements.stripe.txt

@@ -1 +1 @@
-stripe==11.6.0 # Stripe
+stripe==12.3.0 # Stripe