updated dotenv resolution

itsskofficial · itsskofficial · commit 14ed59a02ce5 · 2025-07-01T09:45:00.000+05:30
diff --git a/src/server/main/config.py b/src/server/main/config.py
@@ -7,6 +7,8 @@
 if os.path.exists(dotenv_path):
     print(f"[{datetime.datetime.now()}] [MainServer_Config] Loading .env from: {dotenv_path}")
     load_dotenv(dotenv_path=dotenv_path)
+else:
+    load_dotenv()  # Load from default .env if not found
 
 APP_SERVER_PORT = int(os.getenv("APP_SERVER_PORT", "5000"))
 
diff --git a/src/server/main/scripts/healthcheck.py b/src/server/main/scripts/healthcheck.py
@@ -11,6 +11,8 @@
 dotenv_path = os.path.join(os.path.dirname(__file__), '..', '..', '.env')
 if os.path.exists(dotenv_path):
     load_dotenv(dotenv_path=dotenv_path)
+else:
+    load_dotenv()  # Load from default .env if not found
 
 # Configure logging
 logging.basicConfig(level=logging.INFO, format="[%(asctime)s] [%(levelname)s] [%(name)s] - %(message)s")
diff --git a/src/server/mcp-hub/accuweather/auth.py b/src/server/mcp-hub/accuweather/auth.py
@@ -7,6 +7,8 @@
 dotenv_path = os.path.join(os.path.dirname(__file__), '..', '..', '.env')
 if os.path.exists(dotenv_path):
     load_dotenv(dotenv_path=dotenv_path)
+else:
+    load_dotenv()  # Load from default .env if not found
 
 def get_accuweather_api_key() -> str:
     """
diff --git a/src/server/mcp-hub/accuweather/main.py b/src/server/mcp-hub/accuweather/main.py
@@ -12,6 +12,8 @@
 dotenv_path = os.path.join(os.path.dirname(__file__), '..', '..', '.env')
 if os.path.exists(dotenv_path):
     load_dotenv(dotenv_path=dotenv_path)
+else:
+    load_dotenv()  # Load from default .env if not found
 
 mcp = FastMCP(
     name="AccuWeatherServer",
diff --git a/src/server/mcp-hub/chat_tools/config.py b/src/server/mcp-hub/chat_tools/config.py
@@ -5,6 +5,8 @@
 dotenv_path = os.path.join(os.path.dirname(__file__), '..', '..', '.env')
 if os.path.exists(dotenv_path):
     load_dotenv(dotenv_path=dotenv_path)
+else:
+    load_dotenv()  # Load from default .env if not found
 
 MONGO_URI = os.getenv("MONGO_URI", "mongodb://localhost:27017/")
 MONGO_DB_NAME = os.getenv("MONGO_DB_NAME", "sentient_agent_db")
diff --git a/src/server/mcp-hub/chat_tools/main.py b/src/server/mcp-hub/chat_tools/main.py
@@ -10,6 +10,8 @@
 dotenv_path = os.path.join(os.path.dirname(__file__), '..', '..', '.env')
 if os.path.exists(dotenv_path):
     load_dotenv(dotenv_path=dotenv_path)
+else:
+    load_dotenv()  # Load from default .env if not found
 
 mcp = FastMCP(
     name="ChatToolsServer",
diff --git a/src/server/mcp-hub/gcal/auth.py b/src/server/mcp-hub/gcal/auth.py
@@ -17,6 +17,8 @@
 dotenv_path = os.path.join(os.path.dirname(__file__), '..', '..', '.env')
 if os.path.exists(dotenv_path):
     load_dotenv(dotenv_path=dotenv_path)
+else:
+    load_dotenv()  # Load from default .env if not found
 
 MONGO_URI = os.getenv("MONGO_URI")
 MONGO_DB_NAME = os.getenv("MONGO_DB_NAME")
diff --git a/src/server/mcp-hub/gcal/main.py b/src/server/mcp-hub/gcal/main.py
@@ -16,6 +16,8 @@
 dotenv_path = os.path.join(os.path.dirname(__file__), '..', '..', '.env')
 if os.path.exists(dotenv_path):
     load_dotenv(dotenv_path=dotenv_path)
+else:
+    load_dotenv()  # Load from default .env if not found
 
 # --- Server Initialization ---
 mcp = FastMCP(
diff --git a/src/server/mcp-hub/gdocs/auth.py b/src/server/mcp-hub/gdocs/auth.py
@@ -16,6 +16,8 @@
 dotenv_path = os.path.join(os.path.dirname(__file__), '..', '..', '.env')
 if os.path.exists(dotenv_path):
     load_dotenv(dotenv_path=dotenv_path)
+else:
+    load_dotenv()  # Load from default .env if not found
 
 MONGO_URI = os.getenv("MONGO_URI")
 MONGO_DB_NAME = os.getenv("MONGO_DB_NAME")
diff --git a/src/server/mcp-hub/gdocs/main.py b/src/server/mcp-hub/gdocs/main.py
@@ -11,6 +11,8 @@
 dotenv_path = os.path.join(os.path.dirname(__file__), '..', '..', '.env')
 if os.path.exists(dotenv_path):
     load_dotenv(dotenv_path=dotenv_path)
+else:
+    load_dotenv()  # Load from default .env if not found
 
 mcp = FastMCP(
     name="GDocsServer",
diff --git a/src/server/mcp-hub/gdrive/auth.py b/src/server/mcp-hub/gdrive/auth.py
@@ -16,6 +16,8 @@
 dotenv_path = os.path.join(os.path.dirname(__file__), '..', '..', '.env')
 if os.path.exists(dotenv_path):
     load_dotenv(dotenv_path=dotenv_path)
+else:
+    load_dotenv()  # Load from default .env if not found
 
 MONGO_URI = os.getenv("MONGO_URI")
 MONGO_DB_NAME = os.getenv("MONGO_DB_NAME")
diff --git a/src/server/mcp-hub/gdrive/main.py b/src/server/mcp-hub/gdrive/main.py
@@ -14,6 +14,8 @@
 dotenv_path = os.path.join(os.path.dirname(__file__), '..', '..', '.env')
 if os.path.exists(dotenv_path):
     load_dotenv(dotenv_path=dotenv_path)
+else:
+    load_dotenv()  # Load from default .env if not found
 
 # --- Server Initialization ---
 mcp = FastMCP(
diff --git a/src/server/mcp-hub/github/auth.py b/src/server/mcp-hub/github/auth.py
@@ -17,6 +17,8 @@
 dotenv_path = os.path.join(os.path.dirname(__file__), '..', '..', '.env')
 if os.path.exists(dotenv_path):
     load_dotenv(dotenv_path=dotenv_path)
+else:
+    load_dotenv()  # Load from default .env if not found
 
 MONGO_URI = os.getenv("MONGO_URI")
 MONGO_DB_NAME = os.getenv("MONGO_DB_NAME")
diff --git a/src/server/mcp-hub/github/main.py b/src/server/mcp-hub/github/main.py
@@ -10,6 +10,8 @@
 dotenv_path = os.path.join(os.path.dirname(__file__), '..', '..', '.env')
 if os.path.exists(dotenv_path):
     load_dotenv(dotenv_path=dotenv_path)
+else:
+    load_dotenv()  # Load from default .env if not found
 
 mcp = FastMCP(
     name="GitHubServer",
diff --git a/src/server/mcp-hub/gmail/auth.py b/src/server/mcp-hub/gmail/auth.py
@@ -16,6 +16,8 @@
 dotenv_path = os.path.join(os.path.dirname(__file__), '..', '..', '.env')
 if os.path.exists(dotenv_path):
     load_dotenv(dotenv_path=dotenv_path)
+else:
+    load_dotenv()  # Load from default .env if not found
 
 MONGO_URI = os.getenv("MONGO_URI")
 MONGO_DB_NAME = os.getenv("MONGO_DB_NAME")
diff --git a/src/server/mcp-hub/gmail/main.py b/src/server/mcp-hub/gmail/main.py
@@ -19,6 +19,8 @@
 dotenv_path = os.path.join(os.path.dirname(__file__), '..', '..', '.env')
 if os.path.exists(dotenv_path):
     load_dotenv(dotenv_path=dotenv_path)
+else:
+    load_dotenv()  # Load from default .env if not found
 
 # --- Server Initialization ---
 mcp = FastMCP(
diff --git a/src/server/mcp-hub/gmaps/auth.py b/src/server/mcp-hub/gmaps/auth.py
@@ -9,6 +9,8 @@
 dotenv_path = os.path.join(os.path.dirname(__file__), "..", "..", ".env")
 if os.path.exists(dotenv_path):
     load_dotenv(dotenv_path=dotenv_path)
+else:
+    load_dotenv()  # Load from default .env if not found
 
 # Configs
 MONGO_URI = os.getenv("MONGO_URI")
diff --git a/src/server/mcp-hub/gmaps/main.py b/src/server/mcp-hub/gmaps/main.py
@@ -10,6 +10,8 @@
 dotenv_path = os.path.join(os.path.dirname(__file__), '..', '..', '.env')
 if os.path.exists(dotenv_path):
     load_dotenv(dotenv_path=dotenv_path)
+else:
+    load_dotenv()  # Load from default .env if not found
 
 mcp = FastMCP(
     name="GMapsServer",
diff --git a/src/server/mcp-hub/google_search/auth.py b/src/server/mcp-hub/google_search/auth.py
@@ -14,6 +14,8 @@
 dotenv_path = os.path.join(os.path.dirname(__file__), '..', '..', '.env')
 if os.path.exists(dotenv_path):
     load_dotenv(dotenv_path=dotenv_path)
+else:
+    load_dotenv()  # Load from default .env if not found
 
 # Default keys from .env
 DEFAULT_GOOGLE_API_KEY = os.getenv("GOOGLE_API_KEY")
diff --git a/src/server/mcp-hub/google_search/main.py b/src/server/mcp-hub/google_search/main.py
@@ -13,6 +13,8 @@
 dotenv_path = os.path.join(os.path.dirname(__file__), '..', '..', '.env')
 if os.path.exists(dotenv_path):
     load_dotenv(dotenv_path=dotenv_path)
+else:
+    load_dotenv()  # Load from default .env if not found
 
 # --- Server Initialization ---
 mcp = FastMCP(
diff --git a/src/server/mcp-hub/gsheets/auth.py b/src/server/mcp-hub/gsheets/auth.py
@@ -16,6 +16,8 @@
 dotenv_path = os.path.join(os.path.dirname(__file__), '..', '..', '.env')
 if os.path.exists(dotenv_path):
     load_dotenv(dotenv_path=dotenv_path)
+else:
+    load_dotenv()  # Load from default .env if not found
 
 MONGO_URI = os.getenv("MONGO_URI")
 MONGO_DB_NAME = os.getenv("MONGO_DB_NAME")
diff --git a/src/server/mcp-hub/gsheets/main.py b/src/server/mcp-hub/gsheets/main.py
@@ -11,6 +11,8 @@
 dotenv_path = os.path.join(os.path.dirname(__file__), '..', '..', '.env')
 if os.path.exists(dotenv_path):
     load_dotenv(dotenv_path=dotenv_path)
+else:
+    load_dotenv()  # Load from default .env if not found
 
 mcp = FastMCP(
     name="GSheetsServer",
diff --git a/src/server/mcp-hub/gshopping/auth.py b/src/server/mcp-hub/gshopping/auth.py
@@ -15,6 +15,8 @@
 dotenv_path = os.path.join(os.path.dirname(__file__), '..', '..', '.env')
 if os.path.exists(dotenv_path):
     load_dotenv(dotenv_path=dotenv_path)
+else:
+    load_dotenv()  # Load from default .env if not found
 
 # --- Config ---
 MONGO_URI = os.getenv("MONGO_URI")
diff --git a/src/server/mcp-hub/gshopping/main.py b/src/server/mcp-hub/gshopping/main.py
@@ -9,6 +9,8 @@
 dotenv_path = os.path.join(os.path.dirname(__file__), '..', '..', '.env')
 if os.path.exists(dotenv_path):
     load_dotenv(dotenv_path=dotenv_path)
+else:
+    load_dotenv()  # Load from default .env if not found
 
 mcp = FastMCP(
     name="GShoppingServer",
diff --git a/src/server/mcp-hub/gslides/auth.py b/src/server/mcp-hub/gslides/auth.py
@@ -16,6 +16,8 @@
 dotenv_path = os.path.join(os.path.dirname(__file__), '..', '..', '.env')
 if os.path.exists(dotenv_path):
     load_dotenv(dotenv_path=dotenv_path)
+else:
+    load_dotenv()  # Load from default .env if not found
 
 MONGO_URI = os.getenv("MONGO_URI")
 MONGO_DB_NAME = os.getenv("MONGO_DB_NAME")
diff --git a/src/server/mcp-hub/gslides/main.py b/src/server/mcp-hub/gslides/main.py
@@ -11,6 +11,8 @@
 dotenv_path = os.path.join(os.path.dirname(__file__), '..', '..', '.env')
 if os.path.exists(dotenv_path):
     load_dotenv(dotenv_path=dotenv_path)
+else:
+    load_dotenv()  # Load from default .env if not found
 
 mcp = FastMCP(
     name="GSlidesServer",
diff --git a/src/server/mcp-hub/journal/main.py b/src/server/mcp-hub/journal/main.py
@@ -9,6 +9,8 @@
 dotenv_path = os.path.join(os.path.dirname(__file__), '..', '..', '.env')
 if os.path.exists(dotenv_path):
     load_dotenv(dotenv_path=dotenv_path)
+else:
+    load_dotenv()  # Load from default .env if not found
 
 mcp = FastMCP(
     name="JournalServer",
diff --git a/src/server/mcp-hub/journal/utils.py b/src/server/mcp-hub/journal/utils.py
@@ -9,6 +9,8 @@
 if os.path.exists(dotenv_path):
     from dotenv import load_dotenv
     load_dotenv(dotenv_path=dotenv_path)
+else:
+    load_dotenv()  # Load from default .env if not found
 
 MONGO_URI = os.getenv("MONGO_URI")
 MONGO_DB_NAME = os.getenv("MONGO_DB_NAME")
diff --git a/src/server/mcp-hub/news/auth.py b/src/server/mcp-hub/news/auth.py
@@ -7,6 +7,8 @@
 dotenv_path = os.path.join(os.path.dirname(__file__), '..', '..', '.env')
 if os.path.exists(dotenv_path):
     load_dotenv(dotenv_path=dotenv_path)
+else:
+    load_dotenv()  # Load from default .env if not found
 
 def get_user_id_from_context(ctx: Context) -> str:
     """
diff --git a/src/server/mcp-hub/news/main.py b/src/server/mcp-hub/news/main.py
@@ -9,6 +9,8 @@
 dotenv_path = os.path.join(os.path.dirname(__file__), '..', '..', '.env')
 if os.path.exists(dotenv_path):
     load_dotenv(dotenv_path=dotenv_path)
+else:
+    load_dotenv()  # Load from default .env if not found
 
 mcp = FastMCP(
     name="NewsServer",
diff --git a/src/server/mcp-hub/notion/auth.py b/src/server/mcp-hub/notion/auth.py
@@ -17,6 +17,8 @@
 dotenv_path = os.path.join(os.path.dirname(__file__), '..', '..', '.env')
 if os.path.exists(dotenv_path):
     load_dotenv(dotenv_path=dotenv_path)
+else:
+    load_dotenv()  # Load from default .env if not found
 
 MONGO_URI = os.getenv("MONGO_URI")
 MONGO_DB_NAME = os.getenv("MONGO_DB_NAME")
diff --git a/src/server/mcp-hub/notion/main.py b/src/server/mcp-hub/notion/main.py
@@ -11,6 +11,8 @@
 dotenv_path = os.path.join(os.path.dirname(__file__), '..', '..', '.env')
 if os.path.exists(dotenv_path):
     load_dotenv(dotenv_path=dotenv_path)
+else:
+    load_dotenv()  # Load from default .env if not found
 
 mcp = FastMCP(
     name="NotionServer",
diff --git a/src/server/mcp-hub/progress_updater/main.py b/src/server/mcp-hub/progress_updater/main.py
@@ -10,6 +10,8 @@
 dotenv_path = os.path.join(os.path.dirname(__file__), '..', '..', '.env')
 if os.path.exists(dotenv_path):
     load_dotenv(dotenv_path=dotenv_path)
+else:
+    load_dotenv()  # Load from default .env if not found
 # --- DB Setup ---
 MONGO_URI = os.getenv("MONGO_URI")
 MONGO_DB_NAME = os.getenv("MONGO_DB_NAME")
diff --git a/src/server/mcp-hub/quickchart/main.py b/src/server/mcp-hub/quickchart/main.py
@@ -11,6 +11,8 @@
 dotenv_path = os.path.join(os.path.dirname(__file__), '..', '..', '.env')
 if os.path.exists(dotenv_path):
     load_dotenv(dotenv_path=dotenv_path)
+else:
+    load_dotenv()  # Load from default .env if not found
 
 mcp = FastMCP(
     name="QuickChartServer",
diff --git a/src/server/mcp-hub/slack/auth.py b/src/server/mcp-hub/slack/auth.py
@@ -16,6 +16,8 @@
 dotenv_path = os.path.join(os.path.dirname(__file__), '..', '..', '.env')
 if os.path.exists(dotenv_path):
     load_dotenv(dotenv_path=dotenv_path)
+else:
+    load_dotenv()  # Load from default .env if not found
 
 MONGO_URI = os.getenv("MONGO_URI")
 MONGO_DB_NAME = os.getenv("MONGO_DB_NAME")
diff --git a/src/server/mcp-hub/slack/main.py b/src/server/mcp-hub/slack/main.py
@@ -11,6 +11,8 @@
 dotenv_path = os.path.join(os.path.dirname(__file__), '..', '..', '.env')
 if os.path.exists(dotenv_path):
     load_dotenv(dotenv_path=dotenv_path)
+else:
+    load_dotenv()  # Load from default .env if not found
 
 mcp = FastMCP(
     name="SlackServer",
diff --git a/src/server/workers/celery_app.py b/src/server/workers/celery_app.py
@@ -7,6 +7,8 @@
 dotenv_path = os.path.join(os.path.dirname(__file__), '..', '.env')
 if os.path.exists(dotenv_path):
     load_dotenv(dotenv_path=dotenv_path)
+else:
+    load_dotenv()  # Load from default .env if not found
 
 CELERY_BROKER_URL = os.getenv('CELERY_BROKER_URL', 'redis://localhost:6379/0')
 CELERY_RESULT_BACKEND = os.getenv('CELERY_RESULT_BACKEND', 'redis://localhost:6379/0')
diff --git a/src/server/workers/extractor/config.py b/src/server/workers/extractor/config.py
@@ -7,6 +7,8 @@
 dotenv_path = os.path.join(os.path.dirname(__file__), '..', '..', '.env')
 if os.path.exists(dotenv_path):
     load_dotenv(dotenv_path=dotenv_path)
+else:
+    load_dotenv()  # Load from default .env if not found
     logging.info(f"Loaded .env config from {dotenv_path}")
 
 # LLM Configuration
diff --git a/src/server/workers/memory/config.py b/src/server/workers/memory/config.py
@@ -7,6 +7,8 @@
 dotenv_path = os.path.join(os.path.dirname(__file__), '..', '..', '.env')
 if os.path.exists(dotenv_path):
     load_dotenv(dotenv_path=dotenv_path)
+else:
+    load_dotenv()  # Load from default .env if not found
     logging.info(f"Loaded memory worker .env config from {dotenv_path}")
 
 # LLM Configuration
diff --git a/src/server/workers/planner/config.py b/src/server/workers/planner/config.py
@@ -6,6 +6,8 @@
 dotenv_path = os.path.join(os.path.dirname(__file__), '..', '..', '.env')
 if os.path.exists(dotenv_path):
     load_dotenv(dotenv_path=dotenv_path)
+else:
+    load_dotenv()  # Load from default .env if not found
     logging.info(f"Loaded planner worker .env config from {dotenv_path}")
 
 # LLM Configuration
diff --git a/src/server/workers/poller/gcalendar/config.py b/src/server/workers/poller/gcalendar/config.py
@@ -5,6 +5,8 @@
 if os.path.exists(dotenv_path):
     print(f"[{datetime.datetime.now()}] [GCalendarPoller_Config] Loading .env from: {dotenv_path}")
     load_dotenv(dotenv_path=dotenv_path)
+else:
+    load_dotenv()  # Load from default .env if not found
 
 MONGO_URI = os.getenv("MONGO_URI", "mongodb://localhost:27017/")
 MONGO_DB_NAME = os.getenv("MONGO_DB_NAME", "sentient_agent_db")
diff --git a/src/server/workers/poller/gmail/config.py b/src/server/workers/poller/gmail/config.py
@@ -7,6 +7,8 @@
 if os.path.exists(dotenv_path):
     print(f"[{datetime.datetime.now()}] [GmailPoller_Config] Loading .env from: {dotenv_path}")
     load_dotenv(dotenv_path=dotenv_path)
+else:
+    load_dotenv()  # Load from default .env if not found
 
 MONGO_URI = os.getenv("MONGO_URI", "mongodb://localhost:27017/")
 MONGO_DB_NAME = os.getenv("MONGO_DB_NAME", "sentient_agent_db")
