alpha-python 0.7.7__tar.gz → 0.7.9__tar.gz

{alpha_python-0.7.7 → alpha_python-0.7.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: alpha-python
-Version: 0.7.7
+Version: 0.7.9
 Summary: Alpha is intended to be the first dependency you need to add to your Python application. It is a Python library which contains standard building blocks that can be used in applications that are used as APIs and/or make use of database interaction.
 Author-email: Bart Reijling <bart@reijling.eu>
 License-Expression: MIT

{alpha_python-0.7.7 → alpha_python-0.7.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "alpha-python"
-version = "0.7.7"
+version = "0.7.9"
 description = "Alpha is intended to be the first dependency you need to add to your Python application. It is a Python library which contains standard building blocks that can be used in applications that are used as APIs and/or make use of database interaction."
 readme = "README.md"
 authors = [

{alpha_python-0.7.7 → alpha_python-0.7.9}/src/alpha/domain/models/user.py

@@ -205,3 +205,16 @@ class User(LifeCycleBase, BaseDomainModel):
         self.admin = obj.admin
 
         return cast(DomainModel, self)
+
+    def update_from_identity(self, identity: Identity) -> Self:
+        """Update the User instance with data from an Identity instance. Only
+        the email and display name are updated.
+
+        Parameters
+        ----------
+        identity
+            Identity object to update from.
+        """
+        self.email = identity.email
+        self.display_name = identity.display_name
+        return self

{alpha_python-0.7.7 → alpha_python-0.7.9}/src/alpha/factories/field_iterator.py

@@ -131,6 +131,8 @@ class Field:
 
         Parameters
         ----------
+        key
+            Name of the pydantic field
         obj
             pydantic Field
 
@@ -140,6 +142,7 @@ class Field:
             Field object
         """
         init = getattr(obj, "init", True)
+        init = init if init is not None else True
         type = getattr(obj, "annotation", None)
         default = getattr(obj, "default", MISSING)
 

{alpha_python-0.7.7 → alpha_python-0.7.9}/src/alpha/factories/request_factory.py

@@ -160,7 +160,9 @@ class RequestFactory:
                 for item in value
             ]
 
-        if isinstance(cls, DataclassInstance):
+        if isinstance(
+            cls, (DataclassInstance | AttrsInstance | PydanticInstance)
+        ):
             return self._to_dataclass(value=value, cls=cls)
 
         if isinstance(cls, type(Enum)):
@@ -181,7 +183,9 @@ class RequestFactory:
         return value
 
     def _to_dataclass(
-        self, value: OpenAPIModel | Any, cls: DataclassInstance
+        self,
+        value: OpenAPIModel | Any,
+        cls: DataclassInstance | AttrsInstance | PydanticInstance,
     ) -> (
         DataclassInstance
         | AttrsInstance

{alpha_python-0.7.7 → alpha_python-0.7.9}/src/alpha/handlers/templates/python-flask/__main__.mustache

@@ -36,9 +36,6 @@ if os.getenv('FLASK_ENV') != 'production':
 
 app = connexion.App(__name__, specification_dir='./openapi/')
 app.app.json_encoder = JSONEncoder
-app.add_api('openapi.yaml',
-            arguments={'title': '{{appName}}'},
-            pythonic_params=True)
 
 compress = Compress()
 compress.init_app(app.app)
@@ -57,19 +54,37 @@ LoggingConfigurator(
 )
 {{/disableLoggingConfigurator}}
 {{#featureCORS}}
-cors_origins = container.config.cors.origins()
-if cors_origins is None:
+origins = container.config.cors.origins()
+supports_credentials = container.config.cors.supports_credentials()
+
+if origins is None:
     logging.info(
         "CORS origins not configured, defaulting to allow all origins"
     )
-    cors_origins = ["*"]
-logging.info(f"Enabling CORS for origins: {cors_origins}")
-CORS(app.app, origins=cors_origins)
+    origins = ["*"]
+logging.info(f"Enabling CORS for origins: {origins}")
+CORS(
+    app.app,
+    origins=origins,
+    supports_credentials=supports_credentials or False,
+    resources=container.config.cors.resources() or r"/*",
+    methods=container.config.cors.methods() or ["GET", "HEAD", "POST", "OPTIONS", "PUT", "PATCH", "DELETE"],
+    allow_headers=container.config.cors.allow_headers() or "*",
+    expose_headers=container.config.cors.expose_headers(),
+    max_age=container.config.cors.max_age(),
+    vary_header=container.config.cors.vary_header() or True,
+    send_wildcard=container.config.cors.send_wildcard() or False,
+)
 {{/featureCORS}}
-
-app.container = container
 {{/initContainerFunction}}
 
+app.add_api(
+    'openapi.yaml',
+    arguments={'title': '{{appName}}'},
+    pythonic_params=True
+)
+{{#initContainerFunction}}app.container = container{{/initContainerFunction}}
+
 
 @app.app.after_request
 def add_headers(response: Response):
@@ -93,6 +108,12 @@ def add_headers(response: Response):
         ):
             continue
         response.headers[header] = value
+    {{#featureCORS}}
+    request_origin = request.headers.get("Origin", None)
+    if supports_credentials and request_origin:
+        response.headers["Access-Control-Allow-Origin"] = request_origin
+        response.headers["Access-Control-Allow-Credentials"] = "true"
+    {{/featureCORS}}
     return response
 
 logging.info(f'Started {{servicePackage}} API on \'{socket.gethostname()}\'')

{alpha_python-0.7.7 → alpha_python-0.7.9}/src/alpha/infra/connectors/sql_alchemy.py

@@ -32,7 +32,7 @@ class SqlAlchemyDatabase:
     db_name
         Database name, by default ""
     db_type
-        Database type, by default "postgresql"
+        Database type and driver, by default "postgresql+psycopg2"
     conn_str
         Connection string. Can be used instead of host, port, username,
         password, and db_name, by default None
@@ -55,7 +55,7 @@ class SqlAlchemyDatabase:
         username: str = "",
         password: str = "",
         db_name: str = "",
-        db_type: str = "postgresql",
+        db_type: str = "postgresql+psycopg2",
         conn_str: str | None = None,
         schema_name: str = "public",
         create_schema: bool = True,

{alpha_python-0.7.7 → alpha_python-0.7.9}/src/alpha/providers/models/identity.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
+from enum import Enum
 from typing import Mapping, Any, Self, Sequence, TYPE_CHECKING, cast
 from datetime import datetime, timezone
 
@@ -321,18 +322,24 @@ class Identity:
             User object to update from.
         """
         self.username = user.username
-        if not self.email:
-            self.email = user.email
-        if not self.display_name:
-            self.display_name = user.display_name
+        self.role = (
+            user.role.name if isinstance(user.role, Enum) else user.role
+        )
+        self.admin = user.admin
         for permission in user.permissions or []:
             self.permissions = self._append_on_sequence(
                 self.permissions, str(permission)
             )
         for group in user.groups or []:
             self.groups = self._append_on_sequence(self.groups, str(group))
-        self.role = user.role  # type: ignore
-        self.admin = user.admin
+
+        # Update email and display name only if they are not already set. This
+        # ensures that existing values which are provided by an identity
+        # provider are not overwritten.
+        if not self.email:
+            self.email = user.email
+        if not self.display_name:
+            self.display_name = user.display_name
 
     def update_from_groups(self, groups: list[Group]) -> None:
         """Update the Identity permissions with data from a list of Group

{alpha_python-0.7.7 → alpha_python-0.7.9}/src/alpha/services/authentication_service.py

@@ -622,12 +622,13 @@ class AuthenticationService:
             )
             if user:
                 identity.update_from_user(user)
+                user.update_from_identity(identity)
 
             else:
                 # Create new user from identity if not found in database
                 user = self._user_model.from_identity(identity)
                 users.add(user)
-                self.uow.commit()
+            self.uow.commit()
 
         return identity
 

{alpha_python-0.7.7 → alpha_python-0.7.9}/src/alpha/utils/openapi_test/container.py

@@ -147,7 +147,9 @@ def init_container():
                 "username": os.getenv("TEST_PSQL_USERNAME", "postgres"),
                 "password": os.getenv("TEST_PSQL_PASSWORD", "postgres"),
                 "db_name": os.getenv("TEST_PSQL_DB_NAME", "postgres"),
-                "db_type": os.getenv("TEST_PSQL_DB_TYPE", "postgresql"),
+                "db_type": os.getenv(
+                    "TEST_PSQL_DB_TYPE", "postgresql+psycopg2"
+                ),
             },
             "authentication": {
                 "use_cookies": True,
@@ -175,6 +177,7 @@ def init_container():
             },
             "cors": {
                 "origins": ["*"],
+                "supports_credentials": True,
             },
             "jwt": {
                 "secret": "supersecretkey0123456789",

{alpha_python-0.7.7 → alpha_python-0.7.9}/src/alpha/utils/openapi_test/models.py

@@ -1,7 +1,10 @@
-from dataclasses import dataclass
-from datetime import datetime, timedelta, timezone
-from typing import Any, Literal, Self, Sequence
+from datetime import datetime, timedelta, timezone, date
+from typing import Any, Literal, Self, Sequence, Optional, Type, TypeVar
 from uuid import UUID
+from dataclasses import dataclass, field
+from attrs import define
+from pydantic import BaseModel
+from enum import Enum, auto
 
 from alpha.domain.models.base_model import BaseDomainModel
 from alpha.providers.models.identity import Identity
@@ -59,6 +62,9 @@ class TestUser(LifeCycleBase, BaseDomainModel):
             display_name=identity.display_name,
         )
 
+    def update_from_identity(self, identity: Identity) -> None:
+        return None
+
 
 @dataclass
 class TestToken(BaseDomainModel):
@@ -119,3 +125,66 @@ class TestToken(BaseDomainModel):
             obj["expires_at"] = self.expires_at.isoformat()
 
         return obj
+
+
+P = TypeVar("P", bound="Pet")
+
+
+class PetType(Enum):
+    NONE = 0
+    DOG = auto()
+    CAT = auto()
+    RABBIT = auto()
+
+
+@dataclass
+class Pet:
+    name: str
+    pet_type: PetType
+    date_of_birth: date
+    weight: Optional[float] = None
+    good_boy: Optional[bool] = None
+    id: int = field(default=1)
+
+    @property
+    def age(self) -> int:
+        delta = date(2022, 2, 2) - self.date_of_birth
+        return delta.days // 365
+
+    def to_dict(self) -> dict[str, Any]:
+        return {
+            "id": 1,
+            "name": self.name,
+            "pet_type": self.pet_type.name,
+            "age": self.age,
+            "weight": self.weight,
+            "good_boy": self.good_boy,
+        }
+
+    @classmethod
+    def factory(cls: Type[P], **kwargs) -> P:
+        return cls(
+            name=kwargs["name"],
+            pet_type=PetType[kwargs["pet_type"]],
+            date_of_birth=kwargs["date_of_birth"],
+            good_boy=kwargs["good_boy"],
+        )
+
+
+@define
+class AttrsPet:
+    name: str
+    pet_type: PetType
+    date_of_birth: date
+    weight: Optional[float] = None
+    good_boy: Optional[bool] = None
+    id: int = 1
+
+
+class PydanticPet(BaseModel):
+    name: str
+    pet_type: PetType
+    date_of_birth: date
+    weight: Optional[float] = None
+    good_boy: Optional[bool] = None
+    id: int = 1

{alpha_python-0.7.7 → alpha_python-0.7.9}/src/alpha/utils/openapi_test/service.py

@@ -1,9 +1,6 @@
 from copy import deepcopy
 import datetime
-from dataclasses import dataclass, field
-from enum import Enum, auto
-from typing import Any, Optional, Type, TypeVar
-
+from typing import Any
 import dateutil
 from werkzeug.datastructures import FileStorage
 
@@ -23,52 +20,10 @@ from alpha.exceptions import (
     UnauthorizedException,
     UnprocessableContentException,
 )
+from alpha.utils.openapi_test.models import AttrsPet, Pet, PetType, PydanticPet
 
 from . import exceptions
 
-P = TypeVar("P", bound="Pet")
-
-
-class PetType(Enum):
-    NONE = 0
-    DOG = auto()
-    CAT = auto()
-    RABBIT = auto()
-
-
-@dataclass
-class Pet:
-    name: str
-    pet_type: PetType
-    date_of_birth: datetime.date
-    weight: Optional[float] = None
-    good_boy: Optional[bool] = None
-    id: int = field(default=1)
-
-    @property
-    def age(self) -> int:
-        delta = datetime.date(2022, 2, 2) - self.date_of_birth
-        return delta.days // 365
-
-    def to_dict(self) -> dict[str, Any]:
-        return {
-            "id": 1,
-            "name": self.name,
-            "pet_type": self.pet_type.name,
-            "age": self.age,
-            "weight": self.weight,
-            "good_boy": self.good_boy,
-        }
-
-    @classmethod
-    def factory(cls: Type[P], **kwargs) -> P:
-        return cls(
-            name=kwargs["name"],
-            pet_type=PetType[kwargs["pet_type"]],
-            date_of_birth=kwargs["date_of_birth"],
-            good_boy=kwargs["good_boy"],
-        )
-
 
 class TestService:
     @staticmethod
@@ -103,15 +58,44 @@ class TestService:
             "The object is not an instance of Pet"
         )
 
+    def check_attrs_class(self, pet: AttrsPet) -> AttrsPet:
+        if isinstance(pet, AttrsPet):
+            return pet
+        raise exceptions.InvalidInstance(
+            "The object is not an instance of AttrsPet; received type: "
+            f"{type(pet)}"
+        )
+
+    def check_pydantic_class(self, pet: PydanticPet) -> PydanticPet:
+        if isinstance(pet, PydanticPet):
+            return pet
+        raise exceptions.InvalidInstance(
+            "The object is not an instance of PydanticPet; received type: "
+            f"{type(pet)}"
+        )
+
     def check_dataclass_return_list(self, pet: Pet) -> list[Pet]:
         if isinstance(pet, Pet):
             pet2 = deepcopy(pet)
             pet2.id = 2
             pet2.name = "Dug"
             return [pet, pet2]
-        # raise exceptions.InvalidInstance(
-        #     "The object is not an instance of Pet"
-        # )
+
+    def check_attrs_class_return_list(self, pet: AttrsPet) -> list[AttrsPet]:
+        if isinstance(pet, AttrsPet):
+            pet2 = deepcopy(pet)
+            pet2.id = 2
+            pet2.name = "Dug"
+            return [pet, pet2]
+
+    def check_pydantic_class_return_list(
+        self, pet: PydanticPet
+    ) -> list[PydanticPet]:
+        if isinstance(pet, PydanticPet):
+            pet2 = deepcopy(pet)
+            pet2.id = 2
+            pet2.name = "Dug"
+            return [pet, pet2]
 
     def handle4xx(self, pet: Pet) -> Any:
         if pet.weight and pet.weight < 0:

{alpha_python-0.7.7 → alpha_python-0.7.9}/src/alpha_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: alpha-python
-Version: 0.7.7
+Version: 0.7.9
 Summary: Alpha is intended to be the first dependency you need to add to your Python application. It is a Python library which contains standard building blocks that can be used in applications that are used as APIs and/or make use of database interaction.
 Author-email: Bart Reijling <bart@reijling.eu>
 License-Expression: MIT