Upload folder using huggingface_hub

common/aagents/google_agent.py

@@ -2,9 +2,9 @@
 import os
 from agents import Agent, OpenAIChatCompletionsModel
 from dotenv import load_dotenv
-from mcp.tools.google_tools import google_search, google_search_recent
-from mcp.tools.search_tools import duckduckgo_search, fetch_page_content
-from mcp.tools.time_tools import current_datetime
+from common.mcp.tools.google_tools import google_search, google_search_recent
+from common.mcp.tools.search_tools import duckduckgo_search, fetch_page_content
+from common.mcp.tools.time_tools import current_datetime
 from openai import AsyncOpenAI
 
 # ---------------------------------------------------------

common/aagents/healthcare_agent.py

@@ -5,9 +5,9 @@ from dotenv import load_dotenv
 from openai import AsyncOpenAI
 
 # Import tools
-from mcp.tools.rag_tool import rag_search, UserContext
-from mcp.tools.search_tools import duckduckgo_search, fetch_page_content
-from mcp.tools.time_tools import current_datetime
+from common.mcp.tools.rag_tool import rag_search, UserContext
+from common.mcp.tools.search_tools import duckduckgo_search, fetch_page_content
+from common.mcp.tools.time_tools import current_datetime
 
 
 # ---------------------------------------------------------

common/aagents/news_agent.py

@@ -2,8 +2,8 @@
 import os
 from agents import Agent, OpenAIChatCompletionsModel
 from dotenv import load_dotenv
-from mcp.tools.news_tools import get_top_headlines, search_news, get_news_by_category
-from mcp.tools.time_tools import current_datetime
+from common.mcp.tools.news_tools import get_top_headlines, search_news, get_news_by_category
+from common.mcp.tools.time_tools import current_datetime
 from openai import AsyncOpenAI
 
 # ---------------------------------------------------------

common/aagents/search_agent.py

@@ -3,8 +3,8 @@ import os
 from agents import Agent, OpenAIChatCompletionsModel
 from openai import AsyncOpenAI
 from dotenv import load_dotenv
-from mcp.tools.search_tools import duckduckgo_search, fetch_page_content
-from mcp.tools.time_tools import current_datetime
+from common.mcp.tools.search_tools import duckduckgo_search, fetch_page_content
+from common.mcp.tools.time_tools import current_datetime
 
 # ---------------------------------------------------------
 # Load environment variables

common/aagents/weather_agent.py

@@ -3,8 +3,8 @@ import os
 from agents import Agent
 from dotenv import load_dotenv
 from pydantic import BaseModel, Field
-from mcp.tools.weather_tools import get_weather_forecast, search_weather_fallback_ddgs, search_weather_fallback_bs
-from mcp.tools.time_tools import current_datetime
+from common.mcp.tools.weather_tools import get_weather_forecast, search_weather_fallback_ddgs, search_weather_fallback_bs
+from common.mcp.tools.time_tools import current_datetime
 from agents import Agent, OpenAIChatCompletionsModel
 from openai import AsyncOpenAI
 

common/aagents/web_agent.py

@@ -3,7 +3,7 @@ import os
 from agents import AgentOutputSchema, function_tool, Agent
 from dotenv import load_dotenv
 from pydantic import BaseModel, Field
-from mcp.tools.search_tools import duckduckgo_search, searchQuery, searchResult
+from common.mcp.tools.search_tools import duckduckgo_search, searchQuery, searchResult
 from agents import Agent, OpenAIChatCompletionsModel
 from openai import AsyncOpenAI
 

common/aagents/web_research_agent.py

@@ -3,7 +3,7 @@ import os
 from agents import AgentOutputSchema, function_tool, Agent
 from dotenv import load_dotenv
 from pydantic import BaseModel, Field
-from mcp.tools.search_tools import duckduckgo_search, searchQuery, searchResult, fetch_page_content
+from common.mcp.tools.search_tools import duckduckgo_search, searchQuery, searchResult, fetch_page_content
 from agents import Agent, OpenAIChatCompletionsModel
 from openai import AsyncOpenAI
 

common/aagents/yf_agent.py

@@ -2,8 +2,8 @@
 import os
 from agents import Agent, OpenAIChatCompletionsModel
 from dotenv import load_dotenv
-from mcp.tools.yf_tools import get_summary, get_market_sentiment, get_history, get_analyst_recommendations, get_earnings_calendar
-from mcp.tools.time_tools import current_datetime
+from common.mcp.tools.yf_tools import get_summary, get_market_sentiment, get_history, get_analyst_recommendations, get_earnings_calendar
+from common.mcp.tools.time_tools import current_datetime
 from openai import AsyncOpenAI
 
 # ---------------------------------------------------------

common/mcp/tools/search_tools.py

@@ -1,8 +1,8 @@
+import requests
 from ddgs import DDGS
 from agents import function_tool
 from dotenv import load_dotenv
 from pydantic import BaseModel, Field
-import requests
 from bs4 import BeautifulSoup
 from typing import Optional
 

pyproject.toml

@@ -65,7 +65,7 @@ dependencies = [
     "httpx>=0.28.1",
     "speedtest-cli>=2.1.3",
     "logfire",
-    "serpapi",
+    "google-search-results",
     "smithery>=0.4.4",
     "sendgrid",
 
@@ -125,26 +125,30 @@ dev = [
 # ============================================================
 # BUILD SYSTEM
 # ============================================================
+# Defines how to build the project.
+# We use setuptools as the build backend, ensuring consistent packaging.
 [build-system]
 requires = ["setuptools>=80.9.0"]
 build-backend = "setuptools.build_meta"
 
 # ============================================================
-# CORRECT: TELL SETUPTOOLS YOUR CODE LIVES IN src/
+# PACKAGING & DISCOVERY
 # ============================================================
-[tool.setuptools]
-package-dir = {"" = "src"}
-
-# ensures src and common become importable
+# Tells setuptools where to find the source code.
+# This makes 'common' and 'src' importable when installed (pip install -e .).
 [tool.setuptools.packages.find]
-where = ["src", "common"]
-
+where = ["."]  # Look in the project root
+include = ["common*", "src*"]  # Treat 'common' and 'src' folders as packages
 
 
 # ============================================================
 # PYTEST SETTINGS
 # ============================================================
+# Configures the test runner to automatically find code.
 [tool.pytest.ini_options]
+# Adds 'src' and 'common' to the python path during tests.
+# This allows tests to import modules (e.g., 'import travel_agent')
+# just like the apps do locally, preventing ModuleNotFoundError.
 pythonpath = ["src", "common"]
-testpaths = ["tests"]
-addopts = "-q"
+testpaths = ["tests"]  # Only look for tests in the 'tests' directory
+addopts = "-q"  # Run in quiet mode (less verbose output)

run.py

@@ -144,10 +144,15 @@ def launch_app(app_name: str, port: Optional[int] = None):
     print("\n" + "=" * 70)
     print("\n🎯 Starting application...\n")
     
+    # Prepare environment with project root in PYTHONPATH to fix imports
+    env = os.environ.copy()
+    env["PYTHONPATH"] = str(project_root) + os.pathsep + env.get("PYTHONPATH", "")
+    print(f"\n\nPYTHONPATH: {env['PYTHONPATH']}")
+
     try:
         # Change to app directory and run
         os.chdir(app_dir)
-        subprocess.run(cmd)
+        subprocess.run(cmd, env=env)
     except KeyboardInterrupt:
         print("\n\n👋 Application stopped by user")
     except FileNotFoundError:

src/chatbot/app.py

@@ -1,16 +1,8 @@
-import streamlit as st
 import os
 import glob
-import asyncio
-import sys
 import uuid
-from pathlib import Path
-# Add project root
-# sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), ".")))
-# Add common directory to path for imports
-project_root = Path(__file__).resolve().parent.parent.parent
-sys.path.insert(0, str(project_root))
-
+import asyncio
+import streamlit as st
 from aagents.orchestrator_agent import orchestrator_agent
 from agents import Runner, trace, SQLiteSession
 from agents.exceptions import InputGuardrailTripwireTriggered

uv.lock

@@ -18,6 +18,7 @@ dependencies = [
     { name = "ddgs" },
     { name = "duckduckgo-search" },
     { name = "faiss-cpu" },
+    { name = "google-search-results" },
     { name = "html2text" },
     { name = "httpx" },
     { name = "huggingface-hub" },
@@ -55,7 +56,6 @@ dependencies = [
     { name = "scikit-learn" },
     { name = "sendgrid" },
     { name = "sentence-transformers" },
-    { name = "serpapi" },
     { name = "smithery" },
     { name = "speedtest-cli" },
     { name = "streamlit" },
@@ -85,6 +85,7 @@ requires-dist = [
     { name = "ddgs", specifier = ">=9.9.2" },
     { name = "duckduckgo-search" },
     { name = "faiss-cpu", specifier = ">=1.13.0" },
+    { name = "google-search-results" },
     { name = "html2text", specifier = ">=2025.4.15" },
     { name = "httpx", specifier = ">=0.28.1" },
     { name = "huggingface-hub", specifier = "<=1.1.4" },
@@ -122,7 +123,6 @@ requires-dist = [
     { name = "scikit-learn", specifier = ">=1.7.2" },
     { name = "sendgrid" },
     { name = "sentence-transformers", specifier = ">=5.1.2" },
-    { name = "serpapi" },
     { name = "smithery", specifier = ">=0.4.4" },
     { name = "speedtest-cli", specifier = ">=2.1.3" },
     { name = "streamlit", specifier = ">=1.51.0" },
@@ -1036,6 +1036,15 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/6f/d1/385110a9ae86d91cc14c5282c61fe9f4dc41c0b9f7d423c6ad77038c4448/google_auth-2.43.0-py2.py3-none-any.whl", hash = "sha256:af628ba6fa493f75c7e9dbe9373d148ca9f4399b5ea29976519e0a3848eddd16", size = 223114, upload-time = "2025-11-06T00:13:35.209Z" },
 ]
 
+[[package]]
+name = "google-search-results"
+version = "2.4.2"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "requests" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/77/30/b3a6f6a2e00f8153549c2fa345c58ae1ce8e5f3153c2fe0484d444c3abcb/google_search_results-2.4.2.tar.gz", hash = "sha256:603a30ecae2af8e600b22635757a6df275dad4b934f975e67878ccd640b78245", size = 18818, upload-time = "2023-03-10T11:13:09.953Z" }
+
 [[package]]
 name = "googleapis-common-protos"
 version = "1.72.0"
@@ -3465,18 +3474,6 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/bb/a6/a607a737dc1a00b7afe267b9bfde101b8cee2529e197e57471d23137d4e5/sentence_transformers-5.1.2-py3-none-any.whl", hash = "sha256:724ce0ea62200f413f1a5059712aff66495bc4e815a1493f7f9bca242414c333", size = 488009, upload-time = "2025-10-22T12:47:53.433Z" },
 ]
 
-[[package]]
-name = "serpapi"
-version = "0.1.5"
-source = { registry = "https://pypi.org/simple" }
-dependencies = [
-    { name = "requests" },
-]
-sdist = { url = "https://files.pythonhosted.org/packages/f0/fa/3fd8809287f3977a3e752bb88610e918d49cb1038b14f4bc51e13e594197/serpapi-0.1.5.tar.gz", hash = "sha256:b9707ed54750fdd2f62dc3a17c6a3fb7fa421dc37902fd65b2263c0ac765a1a5", size = 14191, upload-time = "2023-11-01T14:00:43.602Z" }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/df/6a/21deade04100d64844e494353a5d65e7971fbdfddf78eb1f248423593ad0/serpapi-0.1.5-py2.py3-none-any.whl", hash = "sha256:6467b6adec1231059f754ccaa952b229efeaa8b9cae6e71f879703ec9e5bb3d1", size = 10966, upload-time = "2023-11-01T14:00:38.885Z" },
-]
-
 [[package]]
 name = "setuptools"
 version = "80.9.0"