diff --git a/agents-api/agents_api/queries/agents/__init__.py b/agents-api/agents_api/queries/agents/__init__.py
index ebd169040..c0712c47c 100644
--- a/agents-api/agents_api/queries/agents/__init__.py
+++ b/agents-api/agents_api/queries/agents/__init__.py
@@ -19,3 +19,13 @@
 from .list_agents import list_agents
 from .patch_agent import patch_agent
 from .update_agent import update_agent
+
+__all__ = [
+    "create_agent",
+    "create_or_update_agent",
+    "delete_agent",
+    "get_agent",
+    "list_agents",
+    "patch_agent",
+    "update_agent",
+]
diff --git a/agents-api/agents_api/queries/agents/create_agent.py b/agents-api/agents_api/queries/agents/create_agent.py
index a6b56d84f..2d8df7978 100644
--- a/agents-api/agents_api/queries/agents/create_agent.py
+++ b/agents-api/agents_api/queries/agents/create_agent.py
@@ -19,10 +19,8 @@
     wrap_in_class,
 )
 
-ModelT = TypeVar("ModelT", bound=Any)
-T = TypeVar("T")
-
-raw_query = """
+# Define the raw SQL query
+agent_query = parse_one("""
 INSERT INTO agents (
     developer_id,
     agent_id,
@@ -46,9 +44,7 @@
     $9
 )
 RETURNING *;
-"""
-
-query = parse_one(raw_query).sql(pretty=True)
+""").sql(pretty=True)
 
 
 # @rewrap_exceptions(
@@ -135,4 +131,7 @@ async def create_agent(
         default_settings,
     ]
 
-    return query, params
+    return (
+        agent_query,
+        params,
+    )
diff --git a/agents-api/agents_api/queries/agents/create_or_update_agent.py b/agents-api/agents_api/queries/agents/create_or_update_agent.py
index 2aa0d1501..e96b30c77 100644
--- a/agents-api/agents_api/queries/agents/create_or_update_agent.py
+++ b/agents-api/agents_api/queries/agents/create_or_update_agent.py
@@ -18,10 +18,8 @@
     wrap_in_class,
 )
 
-ModelT = TypeVar("ModelT", bound=Any)
-T = TypeVar("T")
-
-raw_query = """
+# Define the raw SQL query
+agent_query = parse_one("""
 INSERT INTO agents (
     developer_id,
     agent_id,
@@ -45,9 +43,7 @@
     $9
 )
 RETURNING *;
-"""
-
-query = parse_one(raw_query).sql(pretty=True)
+""").sql(pretty=True)
 
 
 # @rewrap_exceptions(
@@ -110,4 +106,7 @@ async def create_or_update_agent(
         default_settings,
     ]
 
-    return (query, params)
+    return (
+        agent_query,
+        params,
+    )
diff --git a/agents-api/agents_api/queries/agents/delete_agent.py b/agents-api/agents_api/queries/agents/delete_agent.py
index df0f0c325..6738374db 100644
--- a/agents-api/agents_api/queries/agents/delete_agent.py
+++ b/agents-api/agents_api/queries/agents/delete_agent.py
@@ -11,17 +11,14 @@
 
 from ...autogen.openapi_model import ResourceDeletedResponse
 from ...common.utils.datetime import utcnow
-from ...metrics.counters import increase_counter
 from ..utils import (
     pg_query,
     rewrap_exceptions,
     wrap_in_class,
 )
 
-ModelT = TypeVar("ModelT", bound=Any)
-T = TypeVar("T")
-
-raw_query = """
+# Define the raw SQL query
+agent_query = parse_one("""
 WITH deleted_docs AS (
     DELETE FROM docs
     WHERE developer_id = $1
@@ -41,13 +38,10 @@
 DELETE FROM agents 
 WHERE agent_id = $2 AND developer_id = $1
 RETURNING developer_id, agent_id;
-"""
-
-
-# Convert the list of queries into a single query string
-query = parse_one(raw_query).sql(pretty=True)
+""").sql(pretty=True)
 
 
+# @rewrap_exceptions(
 # @rewrap_exceptions(
 #     {
 #         psycopg_errors.ForeignKeyViolation: partialclass(
@@ -63,7 +57,6 @@
     one=True,
     transform=lambda d: {**d, "id": d["agent_id"], "deleted_at": utcnow()},
 )
-@increase_counter("delete_agent")
 @pg_query
 @beartype
 async def delete_agent(*, agent_id: UUID, developer_id: UUID) -> tuple[str, list]:
@@ -80,4 +73,7 @@ async def delete_agent(*, agent_id: UUID, developer_id: UUID) -> tuple[str, list
     # Note: We swap the parameter order because the queries use $1 for developer_id and $2 for agent_id
     params = [developer_id, agent_id]
 
-    return (query, params)
+    return (
+        agent_query,
+        params,
+    )
diff --git a/agents-api/agents_api/queries/agents/get_agent.py b/agents-api/agents_api/queries/agents/get_agent.py
index 2cf1ef28d..916572db1 100644
--- a/agents-api/agents_api/queries/agents/get_agent.py
+++ b/agents-api/agents_api/queries/agents/get_agent.py
@@ -10,14 +10,14 @@
 from sqlglot import parse_one
 
 from ...autogen.openapi_model import Agent
-from ...metrics.counters import increase_counter
 from ..utils import (
     pg_query,
     rewrap_exceptions,
     wrap_in_class,
 )
 
-raw_query = """
+# Define the raw SQL query
+agent_query = parse_one("""
 SELECT 
     agent_id,
     developer_id,
@@ -34,12 +34,7 @@
     agents
 WHERE 
     agent_id = $2 AND developer_id = $1;
-"""
-
-query = parse_one(raw_query).sql(pretty=True)
-
-ModelT = TypeVar("ModelT", bound=Any)
-T = TypeVar("T")
+""").sql(pretty=True)
 
 
 # @rewrap_exceptions(
@@ -53,7 +48,6 @@
 # # TODO: Add more exceptions
 # )
 @wrap_in_class(Agent, one=True, transform=lambda d: {"id": d["agent_id"], **d})
-@increase_counter("get_agent")
 @pg_query
 @beartype
 async def get_agent(*, agent_id: UUID, developer_id: UUID) -> tuple[str, list]:
@@ -68,4 +62,7 @@ async def get_agent(*, agent_id: UUID, developer_id: UUID) -> tuple[str, list]:
         tuple[list[str], dict]: A tuple containing the SQL query and its parameters.
     """
 
-    return (query, [developer_id, agent_id])
+    return (
+        agent_query,
+        [developer_id, agent_id],
+    )
diff --git a/agents-api/agents_api/queries/agents/list_agents.py b/agents-api/agents_api/queries/agents/list_agents.py
index 306b7465b..ce12b32b3 100644
--- a/agents-api/agents_api/queries/agents/list_agents.py
+++ b/agents-api/agents_api/queries/agents/list_agents.py
@@ -10,16 +10,13 @@
 from fastapi import HTTPException
 
 from ...autogen.openapi_model import Agent
-from ...metrics.counters import increase_counter
 from ..utils import (
     pg_query,
     rewrap_exceptions,
     wrap_in_class,
 )
 
-ModelT = TypeVar("ModelT", bound=Any)
-T = TypeVar("T")
-
+# Define the raw SQL query
 raw_query = """
 SELECT 
     agent_id,
@@ -55,7 +52,6 @@
 #     # TODO: Add more exceptions
 # )
 @wrap_in_class(Agent, transform=lambda d: {"id": d["agent_id"], **d})
-@increase_counter("list_agents")
 @pg_query
 @beartype
 async def list_agents(
@@ -87,7 +83,7 @@ async def list_agents(
 
     # Build metadata filter clause if needed
 
-    final_query = raw_query.format(
+    agent_query = raw_query.format(
         metadata_filter_query="AND metadata @> $6::jsonb" if metadata_filter else ""
     )
 
@@ -102,4 +98,7 @@ async def list_agents(
     if metadata_filter:
         params.append(metadata_filter)
 
-    return final_query, params
+    return (
+        agent_query,
+        params,
+    )
diff --git a/agents-api/agents_api/queries/agents/patch_agent.py b/agents-api/agents_api/queries/agents/patch_agent.py
index 8d17c9f49..7fb63feda 100644
--- a/agents-api/agents_api/queries/agents/patch_agent.py
+++ b/agents-api/agents_api/queries/agents/patch_agent.py
@@ -17,10 +17,9 @@
     wrap_in_class,
 )
 
-ModelT = TypeVar("ModelT", bound=Any)
-T = TypeVar("T")
 
-raw_query = """
+# Define the raw SQL query
+agent_query = parse_one("""
 UPDATE agents
 SET 
     name = CASE 
@@ -45,9 +44,7 @@
     END
 WHERE agent_id = $2 AND developer_id = $1
 RETURNING *;
-"""
-
-query = parse_one(raw_query).sql(pretty=True)
+""").sql(pretty=True)
 
 
 # @rewrap_exceptions(
@@ -92,4 +89,7 @@ async def patch_agent(
         data.default_settings.model_dump() if data.default_settings else None,
     ]
 
-    return query, params
+    return (
+        agent_query,
+        params,
+    )
diff --git a/agents-api/agents_api/queries/agents/update_agent.py b/agents-api/agents_api/queries/agents/update_agent.py
index fe5e31ac6..79b520cb8 100644
--- a/agents-api/agents_api/queries/agents/update_agent.py
+++ b/agents-api/agents_api/queries/agents/update_agent.py
@@ -17,10 +17,8 @@
     wrap_in_class,
 )
 
-ModelT = TypeVar("ModelT", bound=Any)
-T = TypeVar("T")
-
-raw_query = """
+# Define the raw SQL query
+agent_query = parse_one("""
 UPDATE agents
 SET 
     metadata = $3,
@@ -30,9 +28,7 @@
     default_settings = $7::jsonb
 WHERE agent_id = $2 AND developer_id = $1
 RETURNING *;
-"""
-
-query = parse_one(raw_query).sql(pretty=True)
+""").sql(pretty=True)
 
 
 # @rewrap_exceptions(
@@ -77,4 +73,7 @@ async def update_agent(
         data.default_settings.model_dump() if data.default_settings else {},
     ]
 
-    return (query, params)
+    return (
+        agent_query,
+        params,
+    )
diff --git a/agents-api/agents_api/queries/entries/create_entries.py b/agents-api/agents_api/queries/entries/create_entries.py
index 4c1f7bfa7..7f6e2d4d7 100644
--- a/agents-api/agents_api/queries/entries/create_entries.py
+++ b/agents-api/agents_api/queries/entries/create_entries.py
@@ -10,7 +10,7 @@
 from ...common.utils.datetime import utcnow
 from ...common.utils.messages import content_to_json
 from ...metrics.counters import increase_counter
-from ..utils import pg_query, rewrap_exceptions, wrap_in_class
+from ..utils import pg_query, rewrap_exceptions, wrap_in_class, partialclass
 
 # Query for checking if the session exists
 session_exists_query = """
@@ -53,26 +53,30 @@
 """
 
 
-@rewrap_exceptions(
-    {
-        asyncpg.ForeignKeyViolationError: lambda exc: HTTPException(
-            status_code=404,
-            detail=str(exc),
-        ),
-        asyncpg.UniqueViolationError: lambda exc: HTTPException(
-            status_code=409,
-            detail=str(exc),
-        ),
-        asyncpg.NotNullViolationError: lambda exc: HTTPException(
-            status_code=400,
-            detail=str(exc),
-        ),
-        asyncpg.NoDataFoundError: lambda exc: HTTPException(
-            status_code=404,
-            detail="Session not found",
-        ),
-    }
-)
+# @rewrap_exceptions(
+#     {
+#         asyncpg.ForeignKeyViolationError: partialclass(
+#             HTTPException,
+#             status_code=404,
+#             detail="Session not found",
+#         ),
+#         asyncpg.UniqueViolationError: partialclass(
+#             HTTPException,
+#             status_code=409,
+#             detail="Entry already exists",
+#         ),
+#         asyncpg.NotNullViolationError: partialclass(
+#             HTTPException,
+#             status_code=400,
+#             detail="Not null violation",
+#         ),
+#         asyncpg.NoDataFoundError: partialclass(
+#             HTTPException,
+#             status_code=404,
+#             detail="Session not found",
+#         ),
+#     }
+# )
 @wrap_in_class(
     Entry,
     transform=lambda d: {
@@ -128,18 +132,20 @@ async def create_entries(
     ]
 
 
-@rewrap_exceptions(
-    {
-        asyncpg.ForeignKeyViolationError: lambda exc: HTTPException(
-            status_code=404,
-            detail=str(exc),
-        ),
-        asyncpg.UniqueViolationError: lambda exc: HTTPException(
-            status_code=409,
-            detail=str(exc),
-        ),
-    }
-)
+# @rewrap_exceptions(
+#     {
+#         asyncpg.ForeignKeyViolationError: partialclass(
+#             HTTPException,
+#             status_code=404,
+#             detail="Session not found",
+#         ),
+#         asyncpg.UniqueViolationError: partialclass(
+#             HTTPException,
+#             status_code=409,
+#             detail="Entry already exists",
+#         ),
+#     }
+# )
 @wrap_in_class(Relation)
 @increase_counter("add_entry_relations")
 @pg_query
diff --git a/agents-api/agents_api/queries/entries/delete_entries.py b/agents-api/agents_api/queries/entries/delete_entries.py
index dfdadb8da..ce1590fd4 100644
--- a/agents-api/agents_api/queries/entries/delete_entries.py
+++ b/agents-api/agents_api/queries/entries/delete_entries.py
@@ -9,7 +9,7 @@
 from ...autogen.openapi_model import ResourceDeletedResponse
 from ...common.utils.datetime import utcnow
 from ...metrics.counters import increase_counter
-from ..utils import pg_query, rewrap_exceptions, wrap_in_class
+from ..utils import pg_query, rewrap_exceptions, wrap_in_class, partialclass
 
 # Define the raw SQL query for deleting entries with a developer check
 delete_entry_query = parse_one("""
@@ -57,18 +57,20 @@
 """
 
 
-@rewrap_exceptions(
-    {
-        asyncpg.ForeignKeyViolationError: lambda exc: HTTPException(
-            status_code=404,
-            detail="The specified session or developer does not exist.",
-        ),
-        asyncpg.UniqueViolationError: lambda exc: HTTPException(
-            status_code=409,
-            detail="The specified session has already been deleted.",
-        ),
-    }
-)
+# @rewrap_exceptions(
+#     {
+#         asyncpg.ForeignKeyViolationError: partialclass(
+#             HTTPException,
+#             status_code=404,
+#             detail="The specified session or developer does not exist.",
+#         ),
+#         asyncpg.UniqueViolationError: partialclass(
+#             HTTPException,
+#             status_code=409,
+#             detail="The specified session has already been deleted.",
+#         ),
+#     }
+# )
 @wrap_in_class(
     ResourceDeletedResponse,
     one=True,
@@ -94,18 +96,20 @@ async def delete_entries_for_session(
     ]
 
 
-@rewrap_exceptions(
-    {
-        asyncpg.ForeignKeyViolationError: lambda exc: HTTPException(
-            status_code=404,
-            detail="The specified entries, session, or developer does not exist.",
-        ),
-        asyncpg.UniqueViolationError: lambda exc: HTTPException(
-            status_code=409,
-            detail="One or more specified entries have already been deleted.",
-        ),
-    }
-)
+# @rewrap_exceptions(
+#     {
+#         asyncpg.ForeignKeyViolationError: partialclass(
+#             HTTPException,
+#             status_code=404,
+#             detail="The specified entries, session, or developer does not exist.",
+#         ),
+#         asyncpg.UniqueViolationError: partialclass(
+#             HTTPException,
+#             status_code=409,
+#             detail="One or more specified entries have already been deleted.",
+#         ),
+#     }
+# )
 @wrap_in_class(
     ResourceDeletedResponse,
     transform=lambda d: {
diff --git a/agents-api/agents_api/queries/entries/get_history.py b/agents-api/agents_api/queries/entries/get_history.py
index 8f0ddf4a1..2c28b4f21 100644
--- a/agents-api/agents_api/queries/entries/get_history.py
+++ b/agents-api/agents_api/queries/entries/get_history.py
@@ -6,7 +6,7 @@
 from sqlglot import parse_one
 
 from ...autogen.openapi_model import History
-from ..utils import pg_query, rewrap_exceptions, wrap_in_class
+from ..utils import pg_query, rewrap_exceptions, wrap_in_class, partialclass
 
 # Define the raw SQL query for getting history with a developer check
 history_query = parse_one("""
@@ -30,18 +30,20 @@
 """).sql(pretty=True)
 
 
-@rewrap_exceptions(
-    {
-        asyncpg.ForeignKeyViolationError: lambda exc: HTTPException(
-            status_code=404,
-            detail=str(exc),
-        ),
-        asyncpg.UniqueViolationError: lambda exc: HTTPException(
-            status_code=404,
-            detail=str(exc),
-        ),
-    }
-)
+# @rewrap_exceptions(
+#     {
+#         asyncpg.ForeignKeyViolationError: partialclass(
+#             HTTPException,
+#             status_code=404,
+#             detail="Session not found",
+#         ),
+#         asyncpg.UniqueViolationError: partialclass(
+#             HTTPException,
+#             status_code=404,
+#             detail="Session not found",
+#         ),
+#     }
+# )
 @wrap_in_class(
     History,
     one=True,
diff --git a/agents-api/agents_api/queries/entries/list_entries.py b/agents-api/agents_api/queries/entries/list_entries.py
index 1c398f0ab..657f5563b 100644
--- a/agents-api/agents_api/queries/entries/list_entries.py
+++ b/agents-api/agents_api/queries/entries/list_entries.py
@@ -7,7 +7,7 @@
 
 from ...autogen.openapi_model import Entry
 from ...metrics.counters import increase_counter
-from ..utils import pg_query, rewrap_exceptions, wrap_in_class
+from ..utils import pg_query, rewrap_exceptions, wrap_in_class, partialclass
 
 # Query for checking if the session exists
 session_exists_query = """
@@ -48,26 +48,30 @@
 """
 
 
-@rewrap_exceptions(
-    {
-        asyncpg.ForeignKeyViolationError: lambda exc: HTTPException(
-            status_code=404,
-            detail=str(exc),
-        ),
-        asyncpg.UniqueViolationError: lambda exc: HTTPException(
-            status_code=409,
-            detail=str(exc),
-        ),
-        asyncpg.NotNullViolationError: lambda exc: HTTPException(
-            status_code=400,
-            detail=str(exc),
-        ),
-        asyncpg.NoDataFoundError: lambda exc: HTTPException(
-            status_code=404,
-            detail="Session not found",
-        ),
-    }
-)
+# @rewrap_exceptions(
+#     {
+#         asyncpg.ForeignKeyViolationError: partialclass(
+#             HTTPException,
+#             status_code=404,
+#             detail="Session not found",
+#         ),
+#         asyncpg.UniqueViolationError: partialclass(
+#             HTTPException,
+#             status_code=409,
+#             detail="Entry already exists",
+#         ),
+#         asyncpg.NotNullViolationError: partialclass(
+#             HTTPException,
+#             status_code=400,
+#             detail="Entry is required",
+#         ),
+#         asyncpg.NoDataFoundError: partialclass(
+#             HTTPException,
+#             status_code=404,
+#             detail="Session not found",
+#         ),
+#     }
+# )
 @wrap_in_class(Entry)
 @increase_counter("list_entries")
 @pg_query
@@ -108,5 +112,8 @@ async def list_entries(
             [session_id, developer_id],
             "fetchrow",
         ),
-        (query, entry_params),
+        (
+            query,
+            entry_params,
+        ),
     ]