slipstream/discordbot
slipstream/discordbot
1
1
Fork 0
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity

aaa

Browse Source
This commit is contained in:
Slipstream 2025-05-03 15:44:20 -06:00
parent 1c94b958f3
commit d4f5c255f9
Signed by: slipstream
GPG Key ID: 13E498CE010AC6FD
2 changed files with 40 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
api_service/api_server.py
View File

@ -118,12 +118,16 @@ from api_models import (
import code_verifier_store
# Ensure discordbot is in path to import settings_manager
sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..')))
discordbot_path = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
if discordbot_path not in sys.path:
sys.path.insert(0, discordbot_path)
try:
from discordbot import settings_manager
log.info("Successfully imported settings_manager module")
except ImportError as e:
print(f"ERROR: Could not import discordbot.settings_manager: {e}")
print("Ensure the API is run from the project root or discordbot is in PYTHONPATH.")
log.error(f"Could not import discordbot.settings_manager: {e}")
log.error("Ensure the API is run from the project root or discordbot is in PYTHONPATH.")
settings_manager = None # Set to None to indicate failure
# ============= API Setup =============
@ -145,13 +149,20 @@ async def lifespan(_: FastAPI): # Underscore indicates unused but required para
http_session = aiohttp.ClientSession()
log.info("aiohttp session started.")
# Initialize settings_manager pools if available
# REMOVED: Pool initialization is handled by the main bot process (discordbot/main.py)
# The API will rely on the pools being initialized before it receives requests.
if not settings_manager:
# Initialize settings_manager pools for the API server
# This is necessary because the API server runs in a different thread/event loop
# than the main bot, so it needs its own connection pools
if settings_manager:
log.info("Initializing database and cache connection pools for API server...")
try:
# Initialize the pools in the settings_manager module
await settings_manager.initialize_pools()
log.info("Database and cache connection pools initialized for API server.")
except Exception as e:
log.exception(f"Failed to initialize connection pools for API server: {e}")
log.error("Dashboard endpoints requiring DB/cache will fail.")
else:
log.error("settings_manager not imported. Dashboard endpoints requiring DB/cache will fail.")
elif not settings_manager.pg_pool or not settings_manager.redis_pool:
log.warning("settings_manager pools appear uninitialized. Ensure the main bot initializes them.")
yield
@ -162,6 +173,12 @@ async def lifespan(_: FastAPI): # Underscore indicates unused but required para
db.save_data()
log.info("Existing database saved.")
# Close database/cache pools if they were initialized
if settings_manager and (settings_manager.pg_pool or settings_manager.redis_pool):
log.info("Closing database and cache connection pools for API server...")
await settings_manager.close_pools()
log.info("Database and cache connection pools closed for API server.")
# Close aiohttp session
if http_session:
await http_session.close()
@ -698,10 +715,14 @@ async def dashboard_get_user_guilds(current_user: dict = Depends(get_dashboard_u
log.debug(f"Dashboard: Fetched {len(user_guilds)} guilds for user {current_user['user_id']}")
# 2. Fetch guilds the bot is in from our DB
try:
bot_guild_ids = await settings_manager.get_bot_guild_ids()
if bot_guild_ids is None:
log.error("Dashboard: Failed to fetch bot guild IDs from settings_manager.")
raise HTTPException(status_code=500, detail="Could not retrieve bot's guild list.")
except Exception as e:
log.exception("Dashboard: Exception while fetching bot guild IDs from settings_manager.")
raise HTTPException(status_code=500, detail="Database error while retrieving bot's guild list.")
# 3. Filter user guilds
manageable_guilds = []

5
run_unified_api.py
View File

@ -7,6 +7,11 @@ from dotenv import load_dotenv
# Add the api_service directory to the Python path
sys.path.append(os.path.join(os.path.dirname(__file__), '..', 'api_service'))
# Add the discordbot directory to the Python path (for settings_manager)
discordbot_path = os.path.dirname(__file__)
if discordbot_path not in sys.path:
sys.path.append(discordbot_path)
# Load environment variables
load_dotenv()