Merge pull request #2 from partner-up-dev:copilot/refactor-main-communication-usage

Refactor settings to pydantic-settings with nested models and remove simple CRUD endpoints

Author: xiaoland

.env.example

@@ -1,8 +1,16 @@
 # ====================================
 # Environment Variables Configuration
 # ====================================
-# Copy this file to .env and fill in your actual SECRET values
+# For production: Copy this file to /run/secrets/.env and fill in your actual SECRET values
+# For development: Copy this file to .env and set ENV_FILE=.env
+#
+# The default env file location is /run/secrets/.env
+# Override with: export ENV_FILE=.env (for development)
+#
 # DO NOT commit the .env file to version control
+#
+# Settings use nested delimiter '__' to map to nested model fields.
+# Example: DATABASE__URL maps to settings.database.url
 # ====================================
 
 # Environment (development, production)
@@ -12,59 +20,59 @@ ENV=development
 # Database Configuration
 # ====================================
 # PostgreSQL connection URL
-DATABASE_URL=postgresql://user:password@localhost:5432/partnerup
+DATABASE__URL=postgresql://user:password@localhost:5432/partnerup
 
 # ====================================
 # Redis Configuration
 # ====================================
-REDIS_HOST=localhost
-REDIS_PORT=6379
-REDIS_PASSWORD=your-redis-password
-REDIS_DB=0
+REDIS__HOST=localhost
+REDIS__PORT=6379
+REDIS__PASSWORD=your-redis-password
+REDIS__DB=0
 
 # ====================================
 # Auth / JWT Configuration
 # ====================================
-JWT_SECRET_KEY=your-jwt-secret-key-here
-JWT_ALGORITHMS=["HS256"]
-JWT_ALLOWED_AUDIENCES=authenticated,anon,service_role
+AUTH__JWT_SECRET_KEY=your-jwt-secret-key-here
+AUTH__JWT_ALGORITHMS=["HS256"]
+AUTH__JWT_ALLOWED_AUDIENCES=authenticated,anon,service_role
 
 # ====================================
 # HTTP Server Configuration
 # ====================================
-HTTP_HOST=0.0.0.0
-HTTP_PORT=8000
-HTTP_REAL_HOST=localhost
+HTTP__HOST=0.0.0.0
+HTTP__PORT=8000
+HTTP__REAL_HOST=localhost
 
 # ====================================
 # Supabase Configuration
 # ====================================
-SUPABASE_URL=https://your-project.supabase.co
-SUPABASE_SERV_KEY=your-service-key-here
-SUPABASE_ANON_KEY=your-anon-key-here
+SUPABASE__URL=https://your-project.supabase.co
+SUPABASE__SERV_KEY=your-service-key-here
+SUPABASE__ANON_KEY=your-anon-key-here
 
 # ====================================
 # WeChat Configuration
 # ====================================
 # WeChat Mini Program
-WEIXIN_PARTNER_UP_WXMP_APPID=wx7674f72ff1eb49e6
-WEIXIN_PARTNER_UP_WXMP_SECRET=your-wxmp-secret-here
+WEIXIN__PARTNER_UP_WXMP_APPID=wx7674f72ff1eb49e6
+WEIXIN__PARTNER_UP_WXMP_SECRET=your-wxmp-secret-here
 
 # WeChat Service Account
-WEIXIN_PARTNER_UP_WXSA_APPID=your-wxsa-appid-here
-WEIXIN_PARTNER_UP_WXSA_SECRET=your-wxsa-secret-here
+WEIXIN__PARTNER_UP_WXSA_APPID=your-wxsa-appid-here
+WEIXIN__PARTNER_UP_WXSA_SECRET=your-wxsa-secret-here
 
 # ====================================
 # WeChat Pay Configuration
 # ====================================
-WECHAT_PAY_MCHID=your-merchant-id
-WECHAT_PAY_PRI_KEY_PATH=data/keys/wechat_pay_private_key.pem
-WECHAT_PAY_SERIAL_NO=your-serial-number
-WECHAT_PAY_API_V3_KEY=your-api-v3-key-here
-WECHAT_PAY_SIGN_TYPE=RSA
-WECHAT_PAY_CERT_DIR=data/keys/wechat_pay_certs
+WECHAT_PAY__MCHID=your-merchant-id
+WECHAT_PAY__PRI_KEY_PATH=data/keys/wechat_pay_private_key.pem
+WECHAT_PAY__SERIAL_NO=your-serial-number
+WECHAT_PAY__API_V3_KEY=your-api-v3-key-here
+WECHAT_PAY__SIGN_TYPE=RSA
+WECHAT_PAY__CERT_DIR=data/keys/wechat_pay_certs
 
 # ====================================
 # LBS Configuration
 # ====================================
-LBS_APIKEY=your-lbs-api-key-here
+LBS__APIKEY=your-lbs-api-key-here

account/managers/account.py

@@ -24,20 +24,20 @@ class SupabaseAuth:
     def get_anon_client(cls) -> AsyncGoTrueClient:
         settings = get_settings()
         return AsyncGoTrueClient(
-            url=settings.supabase_url + "/auth/v1",
+            url=settings.supabase.url + "/auth/v1",
             headers={
-                "apiKey": settings.supabase_anon_key,
-                "authorization": f"Bearer {settings.supabase_anon_key}",
+                "apiKey": settings.supabase.anon_key,
+                "authorization": f"Bearer {settings.supabase.anon_key}",
             },
         )
 
     @classmethod
     def get_authenticated_client(cls, access_token: str) -> AsyncGoTrueClient:
         settings = get_settings()
         return AsyncGoTrueClient(
-            url=settings.supabase_url + "/auth/v1",
+            url=settings.supabase.url + "/auth/v1",
             headers={
-                "apiKey": settings.supabase_anon_key,
+                "apiKey": settings.supabase.anon_key,
                 "authorization": f"Bearer {access_token}",
             },
         )
@@ -46,10 +46,10 @@ def get_authenticated_client(cls, access_token: str) -> AsyncGoTrueClient:
     def get_serv_client(cls) -> AsyncGoTrueClient:
         settings = get_settings()
         return AsyncGoTrueClient(
-            url=settings.supabase_url + "/auth/v1",
+            url=settings.supabase.url + "/auth/v1",
             headers={
-                "apiKey": settings.supabase_serv_key,
-                "authorization": f"Bearer {settings.supabase_serv_key}",
+                "apiKey": settings.supabase.serv_key,
+                "authorization": f"Bearer {settings.supabase.serv_key}",
             },
         )
 

account/managers/wxmp.py

@@ -97,8 +97,8 @@ async def wxmp_login(
     }
     access_token = jwt.encode(
         payload,
-        key=settings.jwt_secret_key,
-        algorithm=settings.jwt_algorithms[0],
+        key=settings.auth.jwt_secret_key,
+        algorithm=settings.auth.jwt_algorithms[0],
     )
 
     profile = db.get(BaseProfile, wxmp_account.id)

account/routes.py

@@ -1,4 +1,9 @@
-"""Account App Routes."""
+"""Account App Routes.
+
+Business logic endpoints for account management.
+Simple CRUD operations (get, create, put, delete, upsert) are handled by direct
+database access from the client.
+"""
 
 import fastapi
 from fastapi import Depends, HTTPException
@@ -8,7 +13,6 @@
 import sqlmodel
 
 from .schemas import (
-    AccountRef,
     BaseProfile,
     BaseProfileEditable,
     AccountConfig,
@@ -18,18 +22,6 @@
 router = fastapi.APIRouter()
 
 
-@router.get("/profile/{account_id}")
-def get_profile(
-    account_id: AccountRef,
-    db: sqlmodel.Session = Depends(get_db_session),
-) -> BaseProfile:
-    """Get account profile by ID."""
-    profile = db.get(BaseProfile, account_id)
-    if not profile:
-        raise HTTPException(status_code=404, detail="Profile not found")
-    return profile
-
-
 @router.get("/profile/me")
 def get_my_profile(
     auth: AuthInfo = Depends(require_auth),
@@ -48,7 +40,10 @@ def update_my_profile(
     auth: AuthInfo = Depends(require_auth),
     db: sqlmodel.Session = Depends(get_db_session),
 ) -> BaseProfile:
-    """Update current user's profile."""
+    """Update current user's profile.
+
+    Only updates fields that are provided (partial update).
+    """
     profile = db.get(BaseProfile, auth.user_id)
     if not profile:
         raise HTTPException(status_code=404, detail="Profile not found")

communication/managers/__init__.py

@@ -1 +1,9 @@
 """沟通服务的管理器模块"""
+
+__all__ = [
+    "ChatManager",
+    "MessageManager",
+]
+
+from .chat import ChatManager
+from .message import MessageManager