diff --git a/.github/workflows/lint-and-format.yml b/.github/workflows/lint-and-format.yml
index 65e4983c4..ab74c7e9b 100644
--- a/.github/workflows/lint-and-format.yml
+++ b/.github/workflows/lint-and-format.yml
@@ -37,7 +37,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: agents-api/.pytype
-          key: ${{ runner.os }}-agents-api-pytype-${{ hashFiles('agents-api/**/*.py') }}
+          key: ${{ runner.os }}-agents-api-pytype-
           restore-keys: |
             ${{ runner.os }}-agents-api-pytype-
 
diff --git a/agents-api/agents_api/autogen/Docs.py b/agents-api/agents_api/autogen/Docs.py
index a7023ddfc..0c1524e48 100644
--- a/agents-api/agents_api/autogen/Docs.py
+++ b/agents-api/agents_api/autogen/Docs.py
@@ -57,6 +57,13 @@ class Doc(BaseModel):
     """
     Contents of the document
     """
+    embeddings: Annotated[
+        list[float] | list[list[float]] | None,
+        Field(None, json_schema_extra={"readOnly": True}),
+    ]
+    """
+    Embeddings for the document
+    """
 
 
 class DocOwner(BaseModel):
diff --git a/agents-api/agents_api/models/agent/create_agent.py b/agents-api/agents_api/models/agent/create_agent.py
index 73be4ec77..546d0d441 100644
--- a/agents-api/agents_api/models/agent/create_agent.py
+++ b/agents-api/agents_api/models/agent/create_agent.py
@@ -32,9 +32,9 @@
         in str(e): lambda *_: HTTPException(
             detail="developer not found", status_code=403
         ),
-        QueryException: partialclass(HTTPException, status_code=400),
-        ValidationError: partialclass(HTTPException, status_code=400),
-        TypeError: partialclass(HTTPException, status_code=400),
+        QueryException: partialclass(HTTPException, status_code=400, detail="A database query failed to return the expected results. This might occur if the requested resource doesn't exist or your query parameters are incorrect."),
+        ValidationError: partialclass(HTTPException, status_code=400, detail="Input validation failed. Please check the provided data for missing or incorrect fields, and ensure it matches the required format."),
+        TypeError: partialclass(HTTPException, status_code=400, detail="A type mismatch occurred. This likely means the data provided is of an incorrect type (e.g., string instead of integer). Please review the input and try again."),
     }
 )
 @wrap_in_class(
diff --git a/agents-api/agents_api/models/agent/create_or_update_agent.py b/agents-api/agents_api/models/agent/create_or_update_agent.py
index 156c8ae61..17e01fccb 100644
--- a/agents-api/agents_api/models/agent/create_or_update_agent.py
+++ b/agents-api/agents_api/models/agent/create_or_update_agent.py
@@ -27,9 +27,9 @@
 
 @rewrap_exceptions(
     {
-        QueryException: partialclass(HTTPException, status_code=400),
-        ValidationError: partialclass(HTTPException, status_code=400),
-        TypeError: partialclass(HTTPException, status_code=400),
+        QueryException: partialclass(HTTPException, status_code=400,detail="A database query failed to return the expected results. This might occur if the requested resource doesn't exist or your query parameters are incorrect."),
+        ValidationError: partialclass(HTTPException, status_code=400,detail="Input validation failed. Please check the provided data for missing or incorrect fields, and ensure it matches the required format."),
+        TypeError: partialclass(HTTPException, status_code=400,detail="A type mismatch occurred. This likely means the data provided is of an incorrect type (e.g., string instead of integer). Please review the input and try again."),
     }
 )
 @wrap_in_class(
diff --git a/agents-api/agents_api/models/agent/delete_agent.py b/agents-api/agents_api/models/agent/delete_agent.py
index 926007bdf..cb6b16718 100644
--- a/agents-api/agents_api/models/agent/delete_agent.py
+++ b/agents-api/agents_api/models/agent/delete_agent.py
@@ -32,9 +32,9 @@
         in e.resp["display"]: lambda *_: HTTPException(
             detail="developer not found or doesnt own resource", status_code=404
         ),
-        QueryException: partialclass(HTTPException, status_code=400),
-        ValidationError: partialclass(HTTPException, status_code=400),
-        TypeError: partialclass(HTTPException, status_code=400),
+        QueryException: partialclass(HTTPException, status_code=400,detail="A database query failed to return the expected results. This might occur if the requested resource doesn't exist or your query parameters are incorrect."),
+        ValidationError: partialclass(HTTPException, status_code=400,detail="Input validation failed. Please check the provided data for missing or incorrect fields, and ensure it matches the required format."),
+        TypeError: partialclass(HTTPException, status_code=400,detail="A type mismatch occurred. This likely means the data provided is of an incorrect type (e.g., string instead of integer). Please review the input and try again."),
     }
 )
 @wrap_in_class(
diff --git a/agents-api/agents_api/models/docs/get_doc.py b/agents-api/agents_api/models/docs/get_doc.py
index 84cd181ec..4b3996c27 100644
--- a/agents-api/agents_api/models/docs/get_doc.py
+++ b/agents-api/agents_api/models/docs/get_doc.py
@@ -37,6 +37,7 @@
     one=True,
     transform=lambda d: {
         "content": [s[1] for s in sorted(d["snippet_data"], key=lambda x: x[0])],
+        "embeddings": [s[2] for s in sorted(d["snippet_data"], key=lambda x: x[0])],
         **d,
     },
 )
@@ -68,8 +69,9 @@ def get_doc(
                 doc_id,
                 index,
                 content,
+                embedding,
             },
-            snippet_data = [index, content]
+            snippet_data = [index, content, embedding]
 
         ?[
             id,
diff --git a/agents-api/agents_api/models/docs/list_docs.py b/agents-api/agents_api/models/docs/list_docs.py
index afdf06c2d..3c095c2db 100644
--- a/agents-api/agents_api/models/docs/list_docs.py
+++ b/agents-api/agents_api/models/docs/list_docs.py
@@ -34,6 +34,7 @@
     Doc,
     transform=lambda d: {
         "content": [s[1] for s in sorted(d["snippet_data"], key=lambda x: x[0])],
+        "embeddings": [s[2] for s in sorted(d["snippet_data"], key=lambda x: x[0])],
         **d,
     },
 )
@@ -67,8 +68,9 @@ def list_docs(
                 doc_id: id,
                 index,
                 content,
+                embedding,
             }},
-            snippet_data = [index, content]
+            snippet_data = [index, content, embedding]
 
         ?[
             owner_type,
diff --git a/typespec/docs/models.tsp b/typespec/docs/models.tsp
index ee283fe02..f01b379c6 100644
--- a/typespec/docs/models.tsp
+++ b/typespec/docs/models.tsp
@@ -23,6 +23,10 @@ model Doc {
 
     /** Contents of the document */
     content: string | string[];
+
+    /** Embeddings for the document */
+    @visibility("read")
+    embeddings?: float32[] | float32[][];
 }
 
 /** Payload for creating a doc */