Merge branch 'release/0.0.10'

Author: Davidson Gomes

.env.example

@@ -34,9 +34,22 @@ JWT_EXPIRATION_TIME=3600
 # Encryption key for API keys
 ENCRYPTION_KEY="your-encryption-key"
 
+# Email provider settings
+EMAIL_PROVIDER="sendgrid"
+
 # SendGrid
 SENDGRID_API_KEY="your-sendgrid-api-key"
 EMAIL_FROM="noreply@yourdomain.com"
+
+# SMTP settings
+SMTP_HOST="your-smtp-host"
+SMTP_FROM="noreply-smtp@yourdomain.com"
+SMTP_USER="your-smtp-username"
+SMTP_PASSWORD="your-smtp-password"
+SMTP_PORT=587
+SMTP_USE_TLS=true
+SMTP_USE_SSL=false
+
 APP_URL="https://yourdomain.com"
 
 LANGFUSE_PUBLIC_KEY="your-langfuse-public-key"

.github/workflows/docker-image.yml

@@ -7,8 +7,10 @@ on:
     branches: ["main", "develop"]
 
 env:
-  REGISTRY: ghcr.io
+  GHCR_REGISTRY: ghcr.io
+  DOCKERHUB_REGISTRY: docker.io
   IMAGE_NAME: ${{ github.repository }}
+  DOCKERHUB_IMAGE: ${{ secrets.DOCKERHUB_USERNAME }}/${{ github.event.repository.name }}
 
 jobs:
   build-and-push:
@@ -21,18 +23,27 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Log in to the Container registry
+      - name: Log in to GitHub Container Registry
         uses: docker/login-action@v3
         with:
-          registry: ${{ env.REGISTRY }}
+          registry: ${{ env.GHCR_REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
+      
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.DOCKERHUB_REGISTRY }}
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Extract metadata (tags, labels) for Docker
+      - name: Extract metadata for Docker
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          images: |
+            ${{ env.GHCR_REGISTRY }}/${{ env.IMAGE_NAME }}
+            ${{ env.DOCKERHUB_REGISTRY }}/${{ env.DOCKERHUB_IMAGE }}
           tags: |
             type=raw,value=develop,enable=${{ github.ref == format('refs/heads/{0}', 'develop') }}
             type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }}

CHANGELOG.md

@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Improve context management in agent execution
 - Add file support for A2A protocol (Agent-to-Agent) endpoints
 - Implement multimodal content processing in A2A messages
+- Add SMTP email provider support as alternative to SendGrid
 
 ## [0.0.9] - 2025-05-13
 

README.md

@@ -331,7 +331,7 @@ Authorization: Bearer your-token-jwt
 - **Uvicorn**: ASGI server
 - **Redis**: Cache and session management
 - **JWT**: Secure token authentication
-- **SendGrid**: Email service for notifications
+- **SendGrid/SMTP**: Email service for notifications (configurable)
 - **Jinja2**: Template engine for email rendering
 - **Bcrypt**: Password hashing and security
 - **LangGraph**: Framework for building stateful, multi-agent workflows
@@ -469,7 +469,9 @@ You'll also need the following accounts/API keys:
 - Python 3.10+
 - PostgreSQL
 - Redis
-- SendGrid Account (for email sending)
+- Email provider:
+  - SendGrid Account (if using SendGrid email provider)
+  - SMTP Server (if using SMTP email provider)
 
 ## 🔧 Installation
 
@@ -566,11 +568,23 @@ JWT_SECRET_KEY="your-jwt-secret-key"
 JWT_ALGORITHM="HS256"
 JWT_EXPIRATION_TIME=30  # In seconds
 
-# SendGrid for emails
+# Email provider configuration
+EMAIL_PROVIDER="sendgrid"  # Options: "sendgrid" or "smtp"
+
+# SendGrid (if EMAIL_PROVIDER=sendgrid)
 SENDGRID_API_KEY="your-sendgrid-api-key"
 EMAIL_FROM="noreply@yourdomain.com"
 APP_URL="https://yourdomain.com"
 
+# SMTP (if EMAIL_PROVIDER=smtp)
+SMTP_FROM="noreply-smtp@yourdomain.com"
+SMTP_USER="your-smtp-username"
+SMTP_PASSWORD="your-smtp-password"
+SMTP_HOST="your-smtp-host"
+SMTP_PORT=587
+SMTP_USE_TLS=true
+SMTP_USE_SSL=false
+
 # Encryption for API keys
 ENCRYPTION_KEY="your-encryption-key"
 ```
@@ -787,8 +801,12 @@ The main environment variables used by the API container:
 - `POSTGRES_CONNECTION_STRING`: PostgreSQL connection string
 - `REDIS_HOST`: Redis host (use "redis" when running with Docker)
 - `JWT_SECRET_KEY`: Secret key for JWT token generation
-- `SENDGRID_API_KEY`: SendGrid API key for sending emails
-- `EMAIL_FROM`: Email used as sender
+- `EMAIL_PROVIDER`: Email provider to use ("sendgrid" or "smtp")
+- `SENDGRID_API_KEY`: SendGrid API key (if using SendGrid)
+- `EMAIL_FROM`: Email used as sender (for SendGrid)
+- `SMTP_FROM`: Email used as sender (for SMTP)
+- `SMTP_HOST`, `SMTP_PORT`, `SMTP_USER`, `SMTP_PASSWORD`: SMTP server configuration
+- `SMTP_USE_TLS`, `SMTP_USE_SSL`: SMTP security settings
 - `APP_URL`: Base URL of the application
 
 ## 🔒 Secure API Key Management

src/config/settings.py

@@ -81,9 +81,22 @@ class Settings(BaseSettings):
     # Encryption settings
     ENCRYPTION_KEY: str = os.getenv("ENCRYPTION_KEY", secrets.token_urlsafe(32))
 
+    # Email provider settings
+    EMAIL_PROVIDER: str = os.getenv("EMAIL_PROVIDER", "sendgrid")
+    
     # SendGrid settings
     SENDGRID_API_KEY: str = os.getenv("SENDGRID_API_KEY", "")
     EMAIL_FROM: str = os.getenv("EMAIL_FROM", "noreply@yourdomain.com")
+    
+    # SMTP settings
+    SMTP_HOST: str = os.getenv("SMTP_HOST", "")
+    SMTP_PORT: int = int(os.getenv("SMTP_PORT", 587))
+    SMTP_USER: str = os.getenv("SMTP_USER", "")
+    SMTP_PASSWORD: str = os.getenv("SMTP_PASSWORD", "")
+    SMTP_USE_TLS: bool = os.getenv("SMTP_USE_TLS", "true").lower() == "true"
+    SMTP_USE_SSL: bool = os.getenv("SMTP_USE_SSL", "false").lower() == "true"
+    SMTP_FROM: str = os.getenv("SMTP_FROM", "")
+    
     APP_URL: str = os.getenv("APP_URL", "http://localhost:8000")
 
     # Server settings