update

feishu_service.py

@@ -1,24 +1,117 @@
 import os
 import json
 import httpx
+import time # Import time for checking token expiry
 from dotenv import load_dotenv
+from supabase import create_client, Client # Import Supabase client
 
 load_dotenv()
 
-feishu_app_id = os.getenv('FEISHU_APP_ID', 'YOUR_FEISHU_APP_ID') # Placeholder
-feishu_app_secret = os.getenv('FEISHU_APP_SECRET', 'YOUR_FEISHU_APP_SECRET') # Placeholder
+# Import the token_store from store.py
+from store import token_store
 
-async def get_valid_tenant_access_token() -> str:
+# Initialize Supabase client
+# Ensure SUPABASE_URL and SUPABASE_KEY are set in your .env file
+SUPABASE_URL = os.getenv("SUPABASE_URL")
+SUPABASE_KEY = os.getenv("SUPABASE_KEY")
+print('\n\n\n\nSUPABASE_URL', SUPABASE_URL)
+print('SUPABASE_KEY', SUPABASE_KEY)
+
+if not SUPABASE_URL or not SUPABASE_KEY:
+    print("Error: SUPABASE_URL or SUPABASE_KEY not found in environment variables.")
+    # Depending on your application's needs, you might want to exit or handle this differently
+    # For now, we'll just print an error and the client will be None
+    supabase: Client | None = None
+else:
+    print("\n\n\n\n\n\nConnecting to Supabase...")
+    supabase: Client = create_client(SUPABASE_URL, SUPABASE_KEY)
+    print("Supabase client initialized.")
+
+
+async def get_app_secret_from_db(app_id: str) -> str | None:
     """
-    Retrieves a valid tenant access token from Feishu API.
+    Reads the app_secret from the Supabase database based on app_id.
+    Assumes a table named 'feishu_apps' with columns 'app_id' and 'app_secret'.
+    """
+    print('\n\n\n\n************************\nget_app_secret_from_db() app_id:', app_id)
+    if not supabase:
+        print("Supabase client not initialized, cannot fetch app_secret.")
+        return None # Correctly return None if supabase client is not initialized
+
+    try:
+        # Query the 'feishu_bot_config' table for the platform_specific column matching the bot_id
+        # Use maybe_single() as we expect at most one row, and execute() to get the result
+        response = supabase.table('feishu_bot_config').select('platform_specific').eq('bot_id', app_id).single().execute()
+        # print(f"\n\n\n\nResponse from Supabase (maybe_single().execute()): ",response)
+        print('\nresponse.data', response.data)
+
+        # Check if a row was returned and extract the app_secret from platform_specific
+        # The result of maybe_single().execute() will have a 'data' attribute
+        if response.data and 'platform_specific' in response.data and 'app_secret' in response.data['platform_specific']:
+            app_secret = response.data['platform_specific']['app_secret']
+            print(f"Successfully retrieved app_secret for app_id: {app_id} from Supabase. app_secret: ", app_secret)
+            return app_secret
+        else:
+            print(f"No app_secret found in Supabase for app_id: {app_id}.")
+            return None
+    except Exception as e:
+        print(f"Error fetching app_secret from Supabase for app_id {app_id}: {e}")
+        return None
+
+
+async def get_valid_tenant_access_token(app_id: str) -> str | None:
+    """
+    Retrieves a valid tenant access token for the given app_id.
+    Prioritizes fetching from the global store if not expired,
+    otherwise generates a new one and stores it.
+
+    Args:
+        app_id: The Feishu App ID.
+
+    Returns:
+        A valid tenant access token or None if unable to obtain one.
     """
+    print('\n\n\n\n\n\n\n*******************************\n')
+    print('get_valid_tenant_access_token, appid:', app_id)
+    # 1. Prioritize fetching from the global store
+    stored_token_info = token_store.get(app_id)
+    print('\n\n\n\n\n\n\n\n$$$$$$$$$$$$$$$$$$$$$$$$$$$$$\nstored_token_info',stored_token_info)
+    print('\ntoken_store:', token_store)
+
+    if stored_token_info:
+        token = stored_token_info.get('token')
+        created_time = stored_token_info.get('created_time')
+        expires_in = stored_token_info.get('expires_in')
+
+        # 2. Check if the stored token is still valid
+        if token and created_time is not None and expires_in is not None:
+            current_time = time.time()
+            # Add a small buffer (e.g., 60 seconds) to avoid using tokens that are about to expire
+            if current_time < created_time + expires_in - 60:
+                print(f"Using cached tenant access token for app_id: {app_id}")
+                return token
+            else:
+                print(f"Cached tenant access token for app_id: {app_id} has expired.")
+        else:
+            print(f"Incomplete token info found in store for app_id: {app_id}.")
+
+    # If no valid token in store, generate a new one
+    print(f"\n\nGenerating new tenant access token for app_id: {app_id}")
+
+    # Read app_secret from the simulated database
+    app_secret = await get_app_secret_from_db(app_id)
+
+    if not app_secret:
+        print(f"Could not retrieve valid app_secret for app_id: {app_id}")
+        return None
+
     url = "https://open.feishu.cn/open-apis/auth/v3/tenant_access_token/internal"
     headers = {
         "Content-Type": "application/json"
     }
     payload = {
-        "app_id": feishu_app_id,
-        "app_secret": feishu_app_secret
+        "app_id": app_id,
+        "app_secret": app_secret
     }
 
     async with httpx.AsyncClient() as client:
@@ -26,19 +119,39 @@ async def get_valid_tenant_access_token() -> str:
             response = await client.post(url, headers=headers, json=payload)
             response.raise_for_status() # Raise an exception for bad status codes
             data = response.json()
+            print('\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n^^^^^data',data)
             if data.get("code") == 0:
-                return data.get("tenant_access_token")
+                new_token = data.get("tenant_access_token")
+                expire = data.get("expire") # Note: Feishu API returns 'expire_in'
+                print('\nnew_token',new_token)
+                print('\nexpires',expire)
+
+
+                if new_token and expire is not None:
+                    print("\n\n%%%%%%%%%%%%%%%%%%%%%%%%%%%%%New token received")
+                    # 4. Store the new token and its expiry information
+                    token_store[app_id] = {
+                        'token': new_token,
+                        'created_time': time.time(),
+                        'expire': expire
+                    }
+                    print(f"Successfully generated and stored new tenant access token for app_id: {app_id}")
+                    print('\ntoken_store',token_store)
+                    return new_token
+                else:
+                    print(f"Error generating new tenant access token: Missing token or expiry info in response.")
+                    return None
             else:
-                print(f"Error getting tenant access token: {data.get('msg')}")
+                print(f"Error getting tenant access token from API: {data.get('msg')}")
                 return None
         except httpx.HTTPStatusError as e:
-            print(f"HTTP error occurred: {e}")
+            print(f"HTTP error occurred while generating token: {e}")
             return None
         except httpx.RequestError as e:
-            print(f"An error occurred while requesting {e.request.url!r}: {e}")
+            print(f"An error occurred while requesting {e.request.url!r} to generate token: {e}")
             return None
         except Exception as e:
-            print(f"An unexpected error occurred: {e}")
+            print(f"An unexpected error occurred while generating token: {e}")
             return None
 
 async def send_feishu_reply(msg_id: str, tenant_access_token: str, content: dict, msg_type: str):

redis_service.py

@@ -63,8 +63,21 @@ async def redis_subscriber(redis_client, channel_name):
             # Convert the received JSON string back to a Python dictionary
             try:
                 data_dict = json.loads(data_str)
-                # Get valid tenant access token using the Feishu service function
-                tenant_access_token = await get_valid_tenant_access_token()
+                print(f"\nParsed message data as dictionary: {data_dict}")
+
+                # Extract app_id from platform_specific
+                app_id = data_dict.get('platform_specific', {}).get('app_id')
+
+                # Get valid tenant access token using the Feishu service function, passing only app_id
+                tenant_access_token = None
+                if app_id:
+                    tenant_access_token = await get_valid_tenant_access_token(app_id)
+                else:
+                    print("Missing app_id in received data, cannot get tenant access token.")
+
+                print(f"\n\n\n\n&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&\ntenant_access_token: {tenant_access_token}")
+
+
                 if tenant_access_token:
                     # Extract necessary info from data_dict for sending reply
                     msg_id = data_dict.get('msg_id')

requirements.txt

@@ -1,6 +1,6 @@
-# clear && uvicorn app:app --host 0.0.0.0 --port 7860 --reload
 fastapi
-uvicorn[standard]
+uvicorn
 redis
 python-dotenv
 httpx
+supabase

store.py

@@ -0,0 +1,11 @@
+# store.py
+
+# This file is used to store global scalar values.
+# You can define your global variables here.
+
+# Dictionary to store tenant access tokens and their expiry information
+# Key: app_id (str)
+# Value: Dictionary {'token': str, 'created_time': float, 'expires_in': int}
+token_store = {}
+
+# Add any other global variables as needed.