chore: standardize default port to 8080 and finalize project renaming

QueryPlanner · QueryPlanner · commit 8bc8f99b496c · 2026-01-24T19:08:55.000+05:30
diff --git a/Dockerfile b/Dockerfile
@@ -61,13 +61,13 @@ ENV VIRTUAL_ENV=/app/.venv \
     PYTHONUNBUFFERED=1 \
     AGENT_DIR=/app/src \
     HOST=0.0.0.0 \
-    PORT=8000
+    PORT=8080
 
 # Switch to non-root user
 USER app
 
-# Expose port (default 8000)
-EXPOSE 8000
+# Expose port (default 8080)
+EXPOSE 8080
 
 # Set the entrypoint
 ENTRYPOINT ["/app/entrypoint.sh"]
diff --git a/README.md b/README.md
@@ -42,7 +42,7 @@ uv sync
 uv run python -m agent_foundation.server
 ```
 
-Then open `http://127.0.0.1:8000`.
+Then open `http://127.0.0.1:8080`.
 
 ## Deployment (Docker)
 
diff --git a/conductor/workflow.md b/conductor/workflow.md
@@ -96,7 +96,7 @@ All tasks follow a strict lifecycle:
 
         **Manual Verification Steps:**
         1.  **Ensure the server is running:** `uv run python -m agent_foundation.server`
-        2.  **Execute the following command in your terminal:** `curl -X GET http://localhost:8000/health`
+        2.  **Execute the following command in your terminal:** `curl -X GET http://localhost:8080/health`
         3.  **Confirm that you receive:** A JSON response with a status of `{"status": "ok"}`.
         ```
 
diff --git a/docs/base-infra/docker-compose-workflow.md b/docs/base-infra/docker-compose-workflow.md
@@ -147,8 +147,8 @@ SERVE_WEB_INTERFACE=true
 
 ### Port already in use
 ```bash
-# Check what's using port 8000
-lsof -i :8000
+# Check what's using port 8080
+lsof -i :8080
 
 # Stop the conflicting process or change PORT in .env
 PORT=8001
@@ -167,7 +167,7 @@ DOCKER_BUILDKIT=1 docker build -t your-agent-name:latest .
 # Run directly
 docker run \
   -v ./data:/app/data:ro \
-  -p 127.0.0.1:8000:8000 \
+  -p 127.0.0.1:8080:8080 \
   --env-file .env \
   your-agent-name:latest
 ```
diff --git a/docs/base-infra/dockerfile-strategy.md b/docs/base-infra/dockerfile-strategy.md
@@ -266,7 +266,7 @@ ENV VIRTUAL_ENV=/app/.venv \
     PYTHONUNBUFFERED=1 \
     AGENT_DIR=/app/src \
     HOST=0.0.0.0 \
-    PORT=8000
+    PORT=8080
 ```
 **What:** Configure runtime environment
 **Why:**
@@ -277,7 +277,7 @@ ENV VIRTUAL_ENV=/app/.venv \
 | `PATH="/app/.venv/bin:$PATH"` | Make venv binaries available (python, uvicorn) |
 | `PYTHONUNBUFFERED=1` | Don't buffer stdout/stderr (better logs in Docker) |
 | `HOST=0.0.0.0` | Explicitly bind all interfaces for containers (server.py defaults to 127.0.0.1) |
-| `PORT=8000` | Explicitly set default port (matches EXPOSE and server.py default) |
+| `PORT=8080` | Explicitly set default port (matches EXPOSE and server.py default) |
 | `AGENT_DIR=/app/src` | Override agent directory path (see AGENT_DIR section below) |
 
 ---
@@ -330,9 +330,9 @@ USER app
 
 ### Expose Port
 ```dockerfile
-EXPOSE 8000
+EXPOSE 8080
 ```
-**What:** Document that container listens on port 8000
+**What:** Document that container listens on port 8080
 **Why:**
 - Documentation only (doesn't actually publish port)
 - Tools like docker-compose read this for defaults
diff --git a/docs/base-infra/environment-variables.md b/docs/base-infra/environment-variables.md
@@ -51,14 +51,14 @@ Complete reference for all environment variables used in this project.
 - **Purpose:** Server bind address (use `0.0.0.0` for Docker)
 
 **PORT**
-- **Default:** `8000`
+- **Default:** `8080`
 - **Purpose:** Server listening port
 
 ### Feature Flags
 
 **SERVE_WEB_INTERFACE**
 - **Default:** `FALSE`
-- **Purpose:** Enables ADK web UI at http://127.0.0.1:8000
+- **Purpose:** Enables ADK web UI at http://127.0.0.1:8080
 - **Options:** `TRUE` / `FALSE`
 
 **RELOAD_AGENTS**
diff --git a/docs/development.md b/docs/development.md
@@ -31,7 +31,7 @@ Observability (Optional):
 Optional:
 
 - `HOST`: server bind host (default: `127.0.0.1`)
-- `PORT`: server port (default: `8000`)
+- `PORT`: server port (default: `8080`)
 - `LOG_LEVEL`: Logging verbosity (default: `INFO`)
 - `SERVE_WEB_INTERFACE`: Whether to serve the ADK web UI (default: `false`)
 
diff --git a/init_template.py b/init_template.py
@@ -23,8 +23,8 @@
     3. Derives package name (my-agent → my_agent)
     4. Replaces template names with yours:
        - agent_foundation → your_package_name
-       - agent-foundation → your-repo-name
-       - template-owner/agent-foundation → your-owner/your-repo
+       - 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}/
     6. Updates imports, config, and docs in all files
     7. Updates GitHub Actions badge URLs
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,10 +1,10 @@
 [project]
-name = "agent-foundation"
+name = "google-adk-on-bare-metal"
 version = "0.8.0"
-description = "Opinionated, production-ready LLM Agent deployment with enterprise-grade infrastructure"
+description = "Production-ready template for building and deploying AI agents using Google ADK, LiteLLM, and Postgres on self-hosted infrastructure"
 readme = "README.md"
 authors = [
-    { name = "doug", email = "110487462+doughayden@users.noreply.github.com" }
+    { name = "queryplanner", email = "queryplanner@users.noreply.github.com" }
 ]
 requires-python = ">=3.13,<3.14"
 dependencies = [
@@ -43,6 +43,9 @@ dev = [
 requires = ["uv_build>=0.8.21,<0.9.0"]
 build-backend = "uv_build"
 
+[tool.uv.build-backend]
+module-name = "agent_foundation"
+
 [tool.ruff]
 src = ["src"]
 target-version = "py313"
diff --git a/src/agent_foundation/agent.py b/src/agent_foundation/agent.py
@@ -2,6 +2,7 @@
 
 import logging
 import os
+from typing import Any
 
 from google.adk.agents import LlmAgent
 from google.adk.apps import App
@@ -23,7 +24,7 @@
 
 # Determine model configuration
 model_name = os.getenv("ROOT_AGENT_MODEL", "gemini-2.5-flash")
-model = model_name
+model: Any = model_name
 
 # Explicitly use LiteLlm for OpenRouter or other provider-prefixed models
 # that might not be auto-detected by ADK's registry.
diff --git a/src/agent_foundation/server.py b/src/agent_foundation/server.py
@@ -87,7 +87,7 @@ def main() -> None:
         OPENROUTER_API_KEY: Key for LiteLLM/OpenRouter
         ALLOW_ORIGINS: JSON array string of allowed CORS origins
         HOST: Server host (default: 127.0.0.1, set to 0.0.0.0 for containers)
-        PORT: Server port (default: 8000)
+        PORT: Server port (default: 8080)
     """
     uvicorn.run(
         app,
diff --git a/src/agent_foundation/utils/config.py b/src/agent_foundation/utils/config.py
@@ -130,7 +130,7 @@ class ServerEnv(BaseModel):
     )
 
     allow_origins: str = Field(
-        default='["http://127.0.0.1", "http://127.0.0.1:8000"]',
+        default='["http://127.0.0.1", "http://127.0.0.1:8080"]',
         alias="ALLOW_ORIGINS",
         description="JSON array string of allowed CORS origins",
     )
@@ -142,7 +142,7 @@ class ServerEnv(BaseModel):
     )
 
     port: int = Field(
-        default=8000,
+        default=8080,
         alias="PORT",
         description="Server port",
     )
diff --git a/tests/test_callbacks.py b/tests/test_callbacks.py
@@ -1,10 +1,18 @@
 """Unit tests for the callbacks module."""
 
 import logging
+from typing import cast
 
 import pytest
 
+from conftest import MockMemoryCallbackContext
 from agent_foundation.callbacks import add_session_to_memory
+from google.adk.agents.callback_context import CallbackContext
+
+
+def as_callback_context(context: MockMemoryCallbackContext) -> CallbackContext:
+    """Treat mock callback contexts as real CallbackContext objects for typing."""
+    return cast(CallbackContext, context)
 
 
 class TestAddSessionToMemory:
@@ -13,17 +21,14 @@ class TestAddSessionToMemory:
     @pytest.mark.asyncio
     async def test_add_session_to_memory_success(
         self,
-        mock_memory_callback_context,
+        mock_memory_callback_context: MockMemoryCallbackContext,
         caplog: pytest.LogCaptureFixture,
     ) -> None:
         """Test that callback succeeds when context.add_session_to_memory succeeds."""
         caplog.set_level(logging.INFO)
 
         # Execute callback
-        result = await add_session_to_memory(mock_memory_callback_context)
-
-        # Verify callback returns None
-        assert result is None
+        await add_session_to_memory(as_callback_context(mock_memory_callback_context))
 
         # Verify add_session_to_memory was called on the context
         assert mock_memory_callback_context.add_session_to_memory_called
@@ -34,17 +39,16 @@ async def test_add_session_to_memory_success(
     @pytest.mark.asyncio
     async def test_add_session_to_memory_handles_value_error(
         self,
-        mock_memory_callback_context_no_service,
+        mock_memory_callback_context_no_service: MockMemoryCallbackContext,
         caplog: pytest.LogCaptureFixture,
     ) -> None:
         """Test that callback handles ValueError (e.g., no memory service)."""
         caplog.set_level(logging.WARNING)
 
         # Execute callback - should not raise
-        result = await add_session_to_memory(mock_memory_callback_context_no_service)
-
-        # Verify callback returns None (doesn't propagate exception)
-        assert result is None
+        await add_session_to_memory(
+            as_callback_context(mock_memory_callback_context_no_service)
+        )
 
         # Verify the method was attempted
         assert mock_memory_callback_context_no_service.add_session_to_memory_called
@@ -58,20 +62,17 @@ async def test_add_session_to_memory_handles_value_error(
     @pytest.mark.asyncio
     async def test_add_session_to_memory_handles_attribute_error(
         self,
-        mock_memory_callback_context_with_attribute_error,
+        mock_memory_callback_context_with_attribute_error: MockMemoryCallbackContext,
         caplog: pytest.LogCaptureFixture,
     ) -> None:
         """Test that callback handles AttributeError gracefully."""
         caplog.set_level(logging.WARNING)
 
         # Execute callback - should not raise
-        result = await add_session_to_memory(
-            mock_memory_callback_context_with_attribute_error
+        await add_session_to_memory(
+            as_callback_context(mock_memory_callback_context_with_attribute_error)
         )
 
-        # Verify callback returns None
-        assert result is None
-
         # Verify the method was attempted
         ctx = mock_memory_callback_context_with_attribute_error
         assert ctx.add_session_to_memory_called
@@ -83,20 +84,17 @@ async def test_add_session_to_memory_handles_attribute_error(
     @pytest.mark.asyncio
     async def test_add_session_to_memory_handles_runtime_error(
         self,
-        mock_memory_callback_context_with_runtime_error,
+        mock_memory_callback_context_with_runtime_error: MockMemoryCallbackContext,
         caplog: pytest.LogCaptureFixture,
     ) -> None:
         """Test that callback handles RuntimeError gracefully."""
         caplog.set_level(logging.WARNING)
 
         # Execute callback - should not raise
-        result = await add_session_to_memory(
-            mock_memory_callback_context_with_runtime_error
+        await add_session_to_memory(
+            as_callback_context(mock_memory_callback_context_with_runtime_error)
         )
 
-        # Verify callback returns None (doesn't propagate exception)
-        assert result is None
-
         # Verify the method was attempted
         ctx = mock_memory_callback_context_with_runtime_error
         assert ctx.add_session_to_memory_called
@@ -109,16 +107,16 @@ async def test_add_session_to_memory_handles_runtime_error(
     @pytest.mark.asyncio
     async def test_add_session_to_memory_logging_levels(
         self,
-        mock_memory_callback_context,
-        mock_memory_callback_context_no_service,
+        mock_memory_callback_context: MockMemoryCallbackContext,
+        mock_memory_callback_context_no_service: MockMemoryCallbackContext,
         caplog: pytest.LogCaptureFixture,
     ) -> None:
         """Test that callback uses appropriate logging levels."""
         # Test case 1: Success (INFO level)
         caplog.set_level(logging.INFO)
         caplog.clear()
 
-        await add_session_to_memory(mock_memory_callback_context)
+        await add_session_to_memory(as_callback_context(mock_memory_callback_context))
 
         # Check for INFO log (starting callback)
         info_records = [r for r in caplog.records if r.levelname == "INFO"]
@@ -129,7 +127,9 @@ async def test_add_session_to_memory_logging_levels(
         caplog.set_level(logging.WARNING)
         caplog.clear()
 
-        await add_session_to_memory(mock_memory_callback_context_no_service)
+        await add_session_to_memory(
+            as_callback_context(mock_memory_callback_context_no_service)
+        )
 
         warning_records = [r for r in caplog.records if r.levelname == "WARNING"]
         assert len(warning_records) == 1
@@ -141,14 +141,10 @@ async def test_add_session_to_memory_logging_levels(
     @pytest.mark.asyncio
     async def test_add_session_to_memory_returns_none(
         self,
-        mock_memory_callback_context,
+        mock_memory_callback_context: MockMemoryCallbackContext,
     ) -> None:
         """Test that callback always returns None."""
-        # Execute callback
-        result = await add_session_to_memory(mock_memory_callback_context)
-
-        # Verify callback returns None (doesn't short-circuit)
-        assert result is None
+        await add_session_to_memory(as_callback_context(mock_memory_callback_context))
 
     @pytest.mark.asyncio
     async def test_add_session_to_memory_multiple_calls(
@@ -165,12 +161,10 @@ async def test_add_session_to_memory_multiple_calls(
         ctx2 = MockMemoryCallbackContext()
 
         # Execute callbacks
-        result1 = await add_session_to_memory(ctx1)
-        result2 = await add_session_to_memory(ctx2)
+        await add_session_to_memory(as_callback_context(ctx1))
+        await add_session_to_memory(as_callback_context(ctx2))
 
         # Verify both completed successfully
-        assert result1 is None
-        assert result2 is None
         assert ctx1.add_session_to_memory_called
         assert ctx2.add_session_to_memory_called
 
diff --git a/tests/test_config.py b/tests/test_config.py
@@ -46,9 +46,9 @@ def test_server_env_optional_fields_use_defaults(
         assert env.agent_engine is None
         assert env.database_url is None
         assert env.openrouter_api_key is None
-        assert env.allow_origins == '["http://127.0.0.1", "http://127.0.0.1:8000"]'
+        assert env.allow_origins == '["http://127.0.0.1", "http://127.0.0.1:8080"]'
         assert env.host == "127.0.0.1"
-        assert env.port == 8000
+        assert env.port == 8080
 
     def test_server_env_optional_fields_with_values(
         self, valid_server_env: dict[str, str]
diff --git a/tests/test_integration.py b/tests/test_integration.py
diff --git a/tests/test_logging_callbacks.py b/tests/test_logging_callbacks.py
diff --git a/tests/test_prompt.py b/tests/test_prompt.py
diff --git a/tests/test_tools.py b/tests/test_tools.py
diff --git a/uv.lock b/uv.lock
