update

feishu_service.py

@@ -14,26 +14,20 @@ from store import token_store
 # 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:
     """
     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
@@ -42,14 +36,10 @@ async def get_app_secret_from_db(app_id: str) -> str | None:
         # 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}.")
@@ -58,7 +48,6 @@ async def get_app_secret_from_db(app_id: str) -> str | None:
         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.
@@ -71,13 +60,8 @@ async def get_valid_tenant_access_token(app_id: str) -> str | None:
     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')
@@ -119,24 +103,16 @@ async def get_valid_tenant_access_token(app_id: str) -> str | None:
             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:
                 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.")
@@ -179,8 +155,6 @@ async def send_feishu_reply(msg_id: str, tenant_access_token: str, content: dict
         try:
             response = await client.post(url, headers=headers, json=body)
             response.raise_for_status() # Raise an exception for bad status codes
-            print(f"Successfully sent reply: Status Code {response.status_code}")
-            print(f"Reply Response: {response.text}")
         except httpx.HTTPStatusError as e:
             print(f"HTTP error sending reply: {e}")
         except httpx.RequestError as e:

main.py

@@ -85,8 +85,6 @@ async def handle_webhook(request: Request):
 
     # Publish the processed message data to Redis
     await publish_to_redis(REDIS_CHANNEL_NAME, json.dumps(ret_data))
-
-    print('\n\n\nret_data: ', json.dumps(ret_data, indent=2)) # Use indent for readability
     return {'status': 'OK'}
 
 # The /publish endpoint is now handled by the publish_message function in redis_service.py

redis_service.py

@@ -31,9 +31,7 @@ async def connect_redis():
         # Perform SET and GET test after successful connection
         try:
             await r.set("mykey", "myvalue")
-            print("Redis SET test successful: mykey = myvalue")
             value = await r.get("mykey")
-            print(f"Redis GET test successful: mykey = {value.decode()}")
         except Exception as e:
             print(f"Redis SET/GET test failed: {e}")
 
@@ -46,7 +44,7 @@ async def redis_subscriber(redis_client, channel_name):
     """
     Asynchronous function to subscribe to a Redis channel and process messages.
     """
-    print(f"Subscribing to channel: {channel_name}")
+    # print(f"Subscribing to channel: {channel_name}")
     pubsub = redis_client.pubsub()
     await asyncio.sleep(1) # Add a small delay before subscribing
     await pubsub.subscribe(channel_name) # Use await for async subscribe
@@ -55,15 +53,13 @@ async def redis_subscriber(redis_client, channel_name):
     while True:
         message = await pubsub.get_message(ignore_subscribe_messages=True)
         if message:
-            print("\n\n\n**************************\n\nmessage in...")
             channel = message['channel'].decode()
             data_str = message['data'].decode()
-            print(f"\n\n\nReceived message on channel '{channel}': {data_str}")
+            # print(f"\n\n\nReceived message on channel '{channel}': {data_str}")
 
             # Convert the received JSON string back to a Python dictionary
             try:
                 data_dict = json.loads(data_str)
-                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')
@@ -75,9 +71,6 @@ async def redis_subscriber(redis_client, channel_name):
                 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')
@@ -100,7 +93,6 @@ async def redis_subscriber(redis_client, channel_name):
             except Exception as e:
                 print(f"An unexpected error occurred while processing message: {e}")
 
-
         await asyncio.sleep(0.01) # Prevent blocking the event loop
 
 async def publish_message(channel: str, message: str):
@@ -110,7 +102,7 @@ async def publish_message(channel: str, message: str):
     try:
         # Publish the message to the specified channel (publish is asynchronous)
         await r.publish(channel, message)
-        print(f"Published message to channel '{channel}'")
+        # print(f"Published message to channel '{channel}'")
         return {"status": "success", "message": f"Published message to channel '{channel}'"}
 
     except Exception as e: