refactor: rename agent_foundation to agent and untrack conductor (#16)

QueryPlanner · web-flow · commit f3b8b0411f7b · 2026-01-25T14:05:12.000+05:30
diff --git a/.!70083!.coverage b/.!70083!.coverage
diff --git a/.gitignore b/.gitignore
@@ -90,3 +90,4 @@ pip-wheel-metadata/
 # ---------------------------------------------------------------------------
 **/.adk/
 
+\n# Local conductor directory\nconductor/
diff --git a/Dockerfile b/Dockerfile
@@ -77,4 +77,4 @@ EXPOSE 8080
 ENTRYPOINT ["/app/entrypoint.sh"]
 
 # Run the FastAPI server
-CMD ["python", "-m", "agent_foundation.server"]
+CMD ["python", "-m", "agent.server"]
diff --git a/README.md b/README.md
@@ -39,7 +39,7 @@ uv sync
 ### 3) Run Locally
 
 ```bash
-uv run python -m agent_foundation.server
+uv run python -m agent.server
 ```
 Visit `http://127.0.0.1:8080`.
 
diff --git a/compose.yaml b/compose.yaml
@@ -18,7 +18,7 @@ services:
     volumes:
       - agent_artifacts:/app/src/.adk
     restart: always
-    command: python -m agent_foundation.server
+    command: python -m agent.server
 
 volumes:
   agent_artifacts:
diff --git a/docs/architecture.md b/docs/architecture.md
@@ -10,13 +10,13 @@ Google ADK is useful even without Google Cloud:
 
 ### Key choices
 
-- **Entry point**: `python -m agent_foundation.server`
+- **Entry point**: `python -m agent.server`
   - Wraps `google.adk.cli.fast_api.get_fast_api_app(...)`
   - Forces a Postgres-backed session store via `DATABASE_URL`
   - Configures OpenTelemetry for vendor-neutral tracing (Langfuse auto-config included)
 - **Agents directory**: `src/`
   - ADK Dev UI lists *directories* under `agents_dir`.
-- **Main Agent**: `src/agent_foundation/agent.py`
+- **Main Agent**: `src/agent/agent.py`
   - Contains `root_agent` to keep ADK discovery simple.
 - **DB URL normalization**: Handled in `server.py`
   - Converts standard Postgres URLs (e.g. `postgresql://`) to asyncpg-compatible ones (`postgresql+asyncpg://`)
diff --git a/docs/base-infra/dockerfile-strategy.md b/docs/base-infra/dockerfile-strategy.md
@@ -340,7 +340,7 @@ EXPOSE 8080
 ### Startup Command
 ```dockerfile
 # Run the FastAPI server via main() for unified startup logic (logging, etc.)
-CMD ["python", "-m", "agent_foundation.server"]
+CMD ["python", "-m", "agent.server"]
 ```
 **What:** Default command when container starts
 **Why:**
diff --git a/docs/development.md b/docs/development.md
@@ -8,9 +8,9 @@
 
 ### Repo layout
 
-- `src/agent_foundation/server.py`: Main platform entrypoint (FastAPI + ADK + Postgres)
-- `src/agent_foundation/agent.py`: Agent definition (exports `root_agent`)
-- `src/agent_foundation/utils/`: Shared helper modules (config + observability)
+- `src/agent/server.py`: Main platform entrypoint (FastAPI + ADK + Postgres)
+- `src/agent/agent.py`: Agent definition (exports `root_agent`)
+- `src/agent/utils/`: Shared helper modules (config + observability)
 - `tests/`: Unit and integration tests
 - `.env`: Configuration file (API keys, DB URL)
 
@@ -45,7 +45,7 @@ uv sync
 
 **Local Python:**
 ```bash
-uv run python -m agent_foundation.server
+uv run python -m agent.server
 ```
 
 **Docker Compose (Recommended for full stack):**
diff --git a/init_template.py b/init_template.py
@@ -22,10 +22,10 @@
     2. Validates repository name is kebab-case (enforces Python naming)
     3. Derives package name (my-agent → my_agent)
     4. Replaces template names with yours:
-       - agent_foundation → your_package_name
+       - agent → your_package_name
        - google-adk-on-bare-metal → your-repo-name
        - QueryPlanner/google-adk-on-bare-metal → your-owner/your-repo
-    5. Renames src/agent_foundation/ → src/{package_name}/
+    5. Renames src/agent/ → src/{package_name}/
     6. Updates imports, config, and docs in all files
     7. Updates GitHub Actions badge URLs
     8. Resets CODEOWNERS file (remove template owner)
@@ -69,7 +69,7 @@
 from pydantic import BaseModel, Field, ValidationError, computed_field
 
 # Original template names - update these when reusing in other template projects
-ORIGINAL_PACKAGE_NAME = "agent_foundation"
+ORIGINAL_PACKAGE_NAME = "agent"
 ORIGINAL_REPO_NAME = "google-adk-on-bare-metal"
 ORIGINAL_GITHUB_OWNER = "QueryPlanner"
 
diff --git a/pyproject.toml b/pyproject.toml
@@ -26,7 +26,7 @@ dependencies = [
 ]
 
 [project.scripts]
-server = "agent_foundation.server:main"
+server = "agent.server:main"
 
 [dependency-groups]
 dev = [
@@ -44,7 +44,7 @@ requires = ["uv_build>=0.8.21,<0.9.0"]
 build-backend = "uv_build"
 
 [tool.uv.build-backend]
-module-name = "agent_foundation"
+module-name = "agent"
 
 [tool.ruff]
 src = ["src"]
@@ -80,7 +80,7 @@ select = [
 [tool.mypy]
 python_version = "3.13"
 mypy_path = "src"
-packages = ["agent_foundation"]
+packages = ["agent"]
 exclude = ["init_template.py"]
 warn_return_any = true
 warn_unused_configs = true
@@ -100,10 +100,10 @@ show_error_codes = true
 source = ["src"]
 branch = true
 omit = [
-    "src/agent_foundation/**/__init__.py",
-    "src/agent_foundation/server.py",
-    "src/agent_foundation/**/agent.py",
-    "src/agent_foundation/utils/observability.py",
+    "src/agent/**/__init__.py",
+    "src/agent/server.py",
+    "src/agent/**/agent.py",
+    "src/agent/utils/observability.py",
 ]
 
 [tool.coverage.report]
diff --git a/src/agent/__init__.py b/src/agent/__init__.py
diff --git a/src/agent/agent.py b/src/agent/agent.py
@@ -56,7 +56,7 @@
 
 # Optional App configs explicitly set to None for template documentation
 app = App(
-    name="agent_foundation",
+    name="agent",
     root_agent=root_agent,
     plugins=[
         GlobalInstructionPlugin(return_global_instruction),
diff --git a/src/agent/callbacks.py b/src/agent/callbacks.py
diff --git a/src/agent/prompt.py b/src/agent/prompt.py
diff --git a/src/agent/server.py b/src/agent/server.py
diff --git a/src/agent/tools.py b/src/agent/tools.py
diff --git a/src/agent/utils/__init__.py b/src/agent/utils/__init__.py
diff --git a/src/agent/utils/config.py b/src/agent/utils/config.py
diff --git a/src/agent/utils/observability.py b/src/agent/utils/observability.py
diff --git a/systemd/agent.service b/systemd/agent.service
@@ -20,7 +20,7 @@ EnvironmentFile=/home/ubuntu/google-adk-on-bare-metal/.env
 
 # Path to 'uv' or 'python' executable
 # Assuming 'uv sync' has been run, we use the virtualenv python
-ExecStart=/home/ubuntu/google-adk-on-bare-metal/.venv/bin/python -m agent_foundation.server
+ExecStart=/home/ubuntu/google-adk-on-bare-metal/.venv/bin/python -m agent.server
 
 # Restart settings
 Restart=always
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -423,7 +423,7 @@ def mock_load_dotenv() -> Generator[MagicMock]:
     Yields:
         Mock object for load_dotenv function.
     """
-    with patch("agent_foundation.utils.config.load_dotenv") as mock:
+    with patch("agent.utils.config.load_dotenv") as mock:
         yield mock
 
 
diff --git a/tests/test_callbacks.py b/tests/test_callbacks.py
@@ -6,7 +6,7 @@
 import pytest
 
 from conftest import MockMemoryCallbackContext
-from agent_foundation.callbacks import add_session_to_memory
+from agent.callbacks import add_session_to_memory
 from google.adk.agents.callback_context import CallbackContext
 
 
diff --git a/tests/test_config.py b/tests/test_config.py
@@ -6,7 +6,7 @@
 import pytest
 from pydantic import ValidationError
 
-from agent_foundation.utils.config import (
+from agent.utils.config import (
     ServerEnv,
     initialize_environment,
 )
diff --git a/tests/test_integration.py b/tests/test_integration.py
@@ -10,7 +10,7 @@
 from collections.abc import Sequence
 from typing import Any, Protocol, cast
 
-from agent_foundation import app
+from agent import app
 
 
 class AgentConfigLike(Protocol):
diff --git a/tests/test_logging_callbacks.py b/tests/test_logging_callbacks.py
@@ -17,7 +17,7 @@
     MockToolContext,
 )
 
-from agent_foundation.callbacks import LoggingCallbacks
+from agent.callbacks import LoggingCallbacks
 
 # Note: Custom mock classes (conftest.py) use duck typing to match ADK interfaces.
 
@@ -39,7 +39,7 @@ def test_logging_callbacks_default_logger(self) -> None:
         callbacks = LoggingCallbacks()
 
         assert callbacks.logger is not None
-        assert callbacks.logger.name == "agent_foundation.callbacks"
+        assert callbacks.logger.name == "agent.callbacks"
 
     def test_logging_callbacks_custom_logger(
         self, custom_logger: logging.Logger
diff --git a/tests/test_prompt.py b/tests/test_prompt.py
@@ -5,7 +5,7 @@
 
 from conftest import MockReadonlyContext
 
-from agent_foundation.prompt import (
+from agent.prompt import (
     return_description_root,
     return_global_instruction,
     return_instruction_root,
@@ -101,7 +101,7 @@ def test_date_updates_dynamically(
     ) -> None:
         """Test that date updates when function is called on different days."""
         # Mock date.today() to return a specific date
-        with patch("agent_foundation.prompt.date") as mock_date:
+        with patch("agent.prompt.date") as mock_date:
             mock_date.today.return_value = date(2025, 1, 15)
             instruction1 = return_global_instruction(mock_readonly_context)  # type: ignore
 
diff --git a/tests/test_tools.py b/tests/test_tools.py
@@ -7,7 +7,7 @@
 # Import mock classes from conftest
 from conftest import MockState, MockToolContext
 
-from agent_foundation.tools import example_tool
+from agent.tools import example_tool
 
 
 class TestExampleTool:

Original file line number	Diff line number	Diff line change
`@@ -90,3 +90,4 @@ pip-wheel-metadata/`
`90`	`90`	`# ---------------------------------------------------------------------------`
`91`	`91`	`**/.adk/`
`92`	`92`
	`93`	`+\n# Local conductor directory\nconductor/`