diff --git a/agents-api/agents_api/activities/truncation.py b/agents-api/agents_api/activities/truncation.py
index 4742ee6d4..afdb43da4 100644
--- a/agents-api/agents_api/activities/truncation.py
+++ b/agents-api/agents_api/activities/truncation.py
@@ -3,7 +3,7 @@
 from beartype import beartype
 from temporalio import activity
 
-from agents_api.autogen.openapi_model import Entry
+from ..autogen.openapi_model import Entry
 
 # from agents_api.models.entry.entries_summarization import get_toplevel_entries_query
 
diff --git a/agents-api/agents_api/clients/worker/worker.py b/agents-api/agents_api/clients/worker/worker.py
index 1deb8d1c3..55b810c3e 100644
--- a/agents-api/agents_api/clients/worker/worker.py
+++ b/agents-api/agents_api/clients/worker/worker.py
@@ -1,6 +1,6 @@
 import httpx
 
-from agents_api.env import temporal_worker_url
+from ...env import temporal_worker_url
 
 from .types import (
     MemoryManagementTask,
diff --git a/agents-api/agents_api/common/exceptions/__init__.py b/agents-api/agents_api/common/exceptions/__init__.py
index a38a546a2..571691082 100644
--- a/agents-api/agents_api/common/exceptions/__init__.py
+++ b/agents-api/agents_api/common/exceptions/__init__.py
@@ -1,12 +1,14 @@
 """
-This module defines a structured hierarchy of custom exceptions for the agents API, aimed at handling specific error scenarios encountered across various operations. These exceptions are designed to provide clear, actionable error messages and appropriate HTTP status codes, enhancing the API's robustness and usability.
+This module defines a structured hierarchy of custom exceptions for the agents API, aimed at handling specific error scenarios encountered across various operations.
+These exceptions are designed to provide clear, actionable error messages and appropriate HTTP status codes, enhancing the API's robustness and usability.
 
 Exceptions are organized into categories based on the domain of operation, including:
 - Agent-related operations (agents.py): Exceptions such as `AgentNotFoundError` and `AgentToolNotFoundError` cater to errors specific to agent management.
 - Session management (sessions.py): Defines exceptions like `SessionNotFoundError` for handling errors related to session operations.
 - User interactions (users.py): Includes exceptions such as `UserNotFoundError` for addressing issues encountered during user-related operations.
 
-All custom exceptions extend from `BaseCommonException`, which encapsulates common attributes and behavior, including the error message and HTTP status code. This structured approach to exception handling facilitates precise and meaningful error feedback to API consumers, thereby improving the overall developer experience.
+All custom exceptions extend from `BaseCommonException`, which encapsulates common attributes and behavior, including the error message and HTTP status code.
+This structured approach to exception handling facilitates precise and meaningful error feedback to API consumers, thereby improving the overall developer experience.
 """
 
 
diff --git a/agents-api/agents_api/common/exceptions/agents.py b/agents-api/agents_api/common/exceptions/agents.py
index c412eba35..e58f25104 100644
--- a/agents-api/agents_api/common/exceptions/agents.py
+++ b/agents-api/agents_api/common/exceptions/agents.py
@@ -12,7 +12,12 @@ class BaseAgentException(BaseCommonException):
 
 
 class AgentNotFoundError(BaseAgentException):
-    """Exception raised when a requested agent cannot be found."""
+    """
+    Exception raised when a requested agent cannot be found.
+    Attributes:
+        developer_id (UUID | str): The ID of the developer attempting the operation.
+        agent_id (UUID | str): The ID of the agent that was not found.
+    """
 
     def __init__(self, developer_id: UUID | str, agent_id: UUID | str):
         # Initialize the exception with a message indicating the missing agent and developer ID.
@@ -23,7 +28,12 @@ def __init__(self, developer_id: UUID | str, agent_id: UUID | str):
 
 
 class AgentToolNotFoundError(BaseAgentException):
-    """Exception raised when a requested tool associated with an agent cannot be found."""
+    """
+    Exception raised when a requested tool associated with an agent cannot be found.
+    Attributes:
+        agent_id (UUID | str): The ID of the agent that was not found.
+        tool_id (UUID | str): The ID of the tool that was not found.
+    """
 
     def __init__(self, agent_id: UUID | str, tool_id: UUID | str):
         # Initialize the exception with a message indicating the missing tool and agent ID.
@@ -33,7 +43,12 @@ def __init__(self, agent_id: UUID | str, tool_id: UUID | str):
 
 
 class AgentDocNotFoundError(BaseAgentException):
-    """Exception raised when a requested document associated with an agent cannot be found."""
+    """
+    Exception raised when a requested document associated with an agent cannot be found.
+    Attributes:
+        agent_id (UUID | str): The ID of the agent that was not found.
+        doc_id (UUID | str): The ID of the document that was not found.
+    """
 
     def __init__(self, agent_id: UUID | str, doc_id: UUID | str):
         # Initialize the exception with a message indicating the missing document and agent ID.
@@ -43,6 +58,8 @@ def __init__(self, agent_id: UUID | str, doc_id: UUID | str):
 
 
 class AgentModelNotValid(BaseAgentException):
+    """Exception raised when requested model is not recognized."""
+
     def __init__(self, model: str, all_models: list[str]):
         super().__init__(
             f"Unknown model: {model}. Please provide a valid model name."
@@ -52,6 +69,8 @@ def __init__(self, model: str, all_models: list[str]):
 
 
 class MissingAgentModelAPIKeyError(BaseAgentException):
+    """Exception raised when API key for requested model is missing."""
+
     def __init__(self, model: str):
         super().__init__(
             f"API key missing for model: {model}. Please provide a valid API key in the configuration",
diff --git a/agents-api/agents_api/common/exceptions/sessions.py b/agents-api/agents_api/common/exceptions/sessions.py
index d6c04aff5..14d6ff4e7 100644
--- a/agents-api/agents_api/common/exceptions/sessions.py
+++ b/agents-api/agents_api/common/exceptions/sessions.py
@@ -8,29 +8,23 @@
 
 from . import BaseCommonException
 
-"""
-Base exception class for session-related errors.
-
-This class serves as a base for all session-related exceptions, allowing for a structured exception handling approach specific to session operations.
-"""
-
-
 class BaseSessionException(BaseCommonException):
-    pass
-
+    """
+    Base exception class for session-related errors.
 
-"""
-Exception raised when a session cannot be found.
+    This class serves as a base for all session-related exceptions, allowing for a structured exception handling approach specific to session operations.
+    """
 
-This exception is used to indicate that a specific session, identified by its session ID, does not exist or is not accessible for the given developer.
-"""
+    pass
 
 
 class SessionNotFoundError(BaseSessionException):
     """
-    Initializes a new instance of the SessionNotFoundError.
+    Exception raised when a session cannot be found.
+
+    This exception is used to indicate that a specific session, identified by its session ID, does not exist or is not accessible for the given developer.
 
-    Args:
+    Attributes:
         developer_id (UUID | str): The unique identifier of the developer attempting to access the session.
         session_id (UUID | str): The unique identifier of the session that was not found.
     """
diff --git a/agents-api/agents_api/common/exceptions/users.py b/agents-api/agents_api/common/exceptions/users.py
index 2f7f58ed6..cf4e995ad 100644
--- a/agents-api/agents_api/common/exceptions/users.py
+++ b/agents-api/agents_api/common/exceptions/users.py
@@ -6,13 +6,18 @@
 
 
 class BaseUserException(BaseCommonException):
-    """Base exception class for user-related errors. This class serves as a parent for all user-related exceptions to facilitate catching errors specific to user operations."""
+    """
+    Base exception class for user-related errors.
+
+    This class serves as a parent for all user-related exceptions to facilitate catching errors specific to user operations.
+    """
 
     pass
 
 
 class UserNotFoundError(BaseUserException):
-    """Exception raised when a requested user cannot be found.
+    """
+    Exception raised when a requested user cannot be found.
     Attributes:
         developer_id (UUID | str): The ID of the developer attempting the operation.
         user_id (UUID | str): The ID of the user that was not found.
@@ -27,7 +32,8 @@ def __init__(self, developer_id: UUID | str, user_id: UUID | str):
 
 
 class UserDocNotFoundError(BaseUserException):
-    """Exception raised when a specific document related to a user cannot be found.
+    """
+    Exception raised when a specific document related to a user cannot be found.
     Attributes:
         user_id (UUID | str): The ID of the user associated with the document.
         doc_id (UUID | str): The ID of the document that was not found.
diff --git a/agents-api/agents_api/common/protocol/agents.py b/agents-api/agents_api/common/protocol/agents.py
index 222f91f01..fb8b4f063 100644
--- a/agents-api/agents_api/common/protocol/agents.py
+++ b/agents-api/agents_api/common/protocol/agents.py
@@ -4,17 +4,23 @@
 class AgentDefaultSettings(BaseModel):
     """Defines default settings for an agent. These settings control various aspects of the agent's behavior during operation."""
 
-    """Temperature setting influencing the randomness of the agent's responses. Higher values lead to more random responses."""
     temperature: float = 0.0
-    """Top-p sampling setting controlling the nucleus of the probability distribution to sample from."""
+    """Temperature setting influencing the randomness of the agent's responses. Higher values lead to more random responses."""
+
     top_p: float = 1.0
-    """Penalty applied to discourage repetition in the agent's responses."""
+    """Top-p sampling setting controlling the nucleus of the probability distribution to sample from."""
+    
     repetition_penalty: float = 1.0
-    """Penalty for longer responses, encouraging more concise outputs."""
+    """Penalty applied to discourage repetition in the agent's responses."""
+
     length_penalty: float = 1.0
-    """Penalty applied based on the presence of certain words, influencing content generation."""
+    """Penalty for longer responses, encouraging more concise outputs."""
+
     presence_penalty: float = 0.0
-    """Penalty that decreases the likelihood of frequently used words in the agent's responses."""
+    """Penalty applied based on the presence of certain words, influencing content generation."""
+
     frequency_penalty: float = 0.0
-    """Minimum probability threshold for including a word in the agent's response."""
+    """Penalty that decreases the likelihood of frequently used words in the agent's responses."""
+
     min_p: float = 0.01
+    """Minimum probability threshold for including a word in the agent's response."""
diff --git a/agents-api/agents_api/common/utils/json.py b/agents-api/agents_api/common/utils/json.py
index 3157af9c8..ec53ecb27 100644
--- a/agents-api/agents_api/common/utils/json.py
+++ b/agents-api/agents_api/common/utils/json.py
@@ -11,28 +11,35 @@ class CustomJSONEncoder(json.JSONEncoder):
     """A custom JSON encoder subclass that handles None values and UUIDs for JSON serialization. It allows specifying a default value for None objects during initialization."""
 
     def __init__(self, *args, **kwargs) -> None:
-        """Initializes the custom JSON encoder.
+        """
+        Initializes the custom JSON encoder.
         Parameters:
         *args: Variable length argument list.
         **kwargs: Arbitrary keyword arguments. The 'default_empty_value' keyword argument specifies the default value to use for None objects during serialization.
         """
+
         self._default_empty_value = kwargs.pop("default_empty_value")
         super().__init__(*args, **kwargs)
 
     def encode(self, o) -> str:
-        """Encodes the given object into a JSON formatted string.
+        """
+        Encodes the given object into a JSON formatted string.
         Parameters:
         o: The object to encode.
-        Returns: A JSON formatted string representing 'o'."""
+        Returns: A JSON formatted string representing 'o'.
+        """
+
         # Use the overridden default method for serialization before encoding
         return super().encode(self.default(o))
 
     def default(self, obj) -> Any:
-        """Provides a default serialization for objects that the standard JSON encoder cannot serialize.
+        """
+        Provides a default serialization for objects that the standard JSON encoder cannot serialize.
         Parameters:
         obj: The object to serialize.
         Returns: A serializable object or raises a TypeError if the object is not serializable.
         """
+        
         if obj is None:
             return self._default_empty_value
 
@@ -46,12 +53,15 @@ def default(self, obj) -> Any:
 
 
 def dumps(obj: Any, default_empty_value="", cls=None) -> str:
-    """Serializes an object to a JSON formatted string using the custom JSON encoder.
+    """
+    Serializes an object to a JSON formatted string using the custom JSON encoder.
     Parameters:
     obj: The object to serialize.
     default_empty_value: The default value to use for None objects.
     cls: The custom encoder class to use, defaults to CustomJSONEncoder.
-    Returns: A JSON formatted string."""
+    Returns: A JSON formatted string.
+    """
+
     return json.dumps(
         obj, cls=cls or CustomJSONEncoder, default_empty_value=default_empty_value
     )
diff --git a/agents-api/agents_api/common/utils/messages.py b/agents-api/agents_api/common/utils/messages.py
index fd971296c..c94808324 100644
--- a/agents-api/agents_api/common/utils/messages.py
+++ b/agents-api/agents_api/common/utils/messages.py
@@ -1,7 +1,7 @@
 import json
 from typing import cast
 
-from agents_api.autogen.openapi_model import (
+from ...autogen.openapi_model import (
     ChatMLImageContentPart,
     ChatMLTextContentPart,
 )
diff --git a/agents-api/agents_api/exceptions.py b/agents-api/agents_api/exceptions.py
index fbb8f00f8..4fbf8a2b9 100644
--- a/agents-api/agents_api/exceptions.py
+++ b/agents-api/agents_api/exceptions.py
@@ -3,11 +3,15 @@ class AgentsBaseException(Exception):
 
 
 class ModelNotSupportedError(AgentsBaseException):
+    """Exception raised when model is not supported."""
+
     def __init__(self, model_name) -> None:
         super().__init__(f"model {model_name} is not supported")
 
 
 class PromptTooBigError(AgentsBaseException):
+    """Exception raised when prompt is too big."""
+
     def __init__(self, token_count, max_tokens) -> None:
         super().__init__(
             f"prompt is too big, {token_count} tokens provided, exceeds maximum of {max_tokens}"
@@ -15,5 +19,7 @@ def __init__(self, token_count, max_tokens) -> None:
 
 
 class UnknownTokenizerError(AgentsBaseException):
+    """Exception raised when tokenizer is unknown."""
+
     def __init__(self) -> None:
         super().__init__("unknown tokenizer")
diff --git a/agents-api/agents_api/models/agent/create_agent.py b/agents-api/agents_api/models/agent/create_agent.py
index a52a7b771..98daab540 100644
--- a/agents-api/agents_api/models/agent/create_agent.py
+++ b/agents-api/agents_api/models/agent/create_agent.py
@@ -68,12 +68,12 @@ def create_agent(
     Constructs and executes a datalog query to create a new agent in the database.
 
     Parameters:
-    - agent_id (UUID | None): The unique identifier for the agent.
-    - developer_id (UUID): The unique identifier for the developer creating the agent.
-    - data (CreateAgentRequest): The data for the new agent.
+        agent_id (UUID | None): The unique identifier for the agent.
+        developer_id (UUID): The unique identifier for the developer creating the agent.
+        data (CreateAgentRequest): The data for the new agent.
 
     Returns:
-    - Agent: The newly created agent record.
+        Agent: The newly created agent record.
     """
 
     agent_id = agent_id or uuid4()
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 835245787..3902c1bb5 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
@@ -59,18 +59,18 @@ def create_or_update_agent(
     Constructs and executes a datalog query to create a new agent in the database.
 
     Parameters:
-    - agent_id (UUID): The unique identifier for the agent.
-    - developer_id (UUID): The unique identifier for the developer creating the agent.
-    - name (str): The name of the agent.
-    - about (str): A description of the agent.
-    - instructions (list[str], optional): A list of instructions for using the agent. Defaults to an empty list.
-    - model (str, optional): The model identifier for the agent. Defaults to "gpt-4o".
-    - metadata (dict, optional): A dictionary of metadata for the agent. Defaults to an empty dict.
-    - default_settings (dict, optional): A dictionary of default settings for the agent. Defaults to an empty dict.
-    - client (CozoClient, optional): The CozoDB client instance to use for the query. Defaults to a preconfigured client instance.
+        agent_id (UUID): The unique identifier for the agent.
+        developer_id (UUID): The unique identifier for the developer creating the agent.
+        name (str): The name of the agent.
+        about (str): A description of the agent.
+        instructions (list[str], optional): A list of instructions for using the agent. Defaults to an empty list.
+        model (str, optional): The model identifier for the agent. Defaults to "gpt-4o".
+        metadata (dict, optional): A dictionary of metadata for the agent. Defaults to an empty dict.
+        default_settings (dict, optional): A dictionary of default settings for the agent. Defaults to an empty dict.
+        client (CozoClient, optional): The CozoDB client instance to use for the query. Defaults to a preconfigured client instance.
 
     Returns:
-    Agent: The newly created agent record.
+        Agent: The newly created agent record.
     """
 
     # Extract the agent data from the payload
diff --git a/agents-api/agents_api/models/agent/delete_agent.py b/agents-api/agents_api/models/agent/delete_agent.py
index c8bdc2106..60de66292 100644
--- a/agents-api/agents_api/models/agent/delete_agent.py
+++ b/agents-api/agents_api/models/agent/delete_agent.py
@@ -67,12 +67,12 @@ def delete_agent(*, developer_id: UUID, agent_id: UUID) -> tuple[list[str], dict
     Constructs and returns a datalog query for deleting an agent and its default settings from the database.
 
     Parameters:
-    - developer_id (UUID): The UUID of the developer owning the agent.
-    - agent_id (UUID): The UUID of the agent to be deleted.
-    - client (CozoClient, optional): An instance of the CozoClient to execute the query.
+        developer_id (UUID): The UUID of the developer owning the agent.
+        agent_id (UUID): The UUID of the agent to be deleted.
+        client (CozoClient, optional): An instance of the CozoClient to execute the query.
 
     Returns:
-    - ResourceDeletedResponse: The response indicating the deletion of the agent.
+        ResourceDeletedResponse: The response indicating the deletion of the agent.
     """
 
     queries = [
diff --git a/agents-api/agents_api/models/agent/get_agent.py b/agents-api/agents_api/models/agent/get_agent.py
index f8127751a..bdae85fcb 100644
--- a/agents-api/agents_api/models/agent/get_agent.py
+++ b/agents-api/agents_api/models/agent/get_agent.py
@@ -46,12 +46,12 @@ def get_agent(*, developer_id: UUID, agent_id: UUID) -> tuple[list[str], dict]:
     This function constructs and executes a datalog query to retrieve information about a specific agent, including its default settings, based on the provided agent_id and developer_id.
 
     Parameters:
-    - developer_id (UUID): The unique identifier for the developer.
-    - agent_id (UUID): The unique identifier for the agent.
-    - client (CozoClient, optional): The database client used to execute the query.
+        developer_id (UUID): The unique identifier for the developer.
+        agent_id (UUID): The unique identifier for the agent.
+        client (CozoClient, optional): The database client used to execute the query.
 
     Returns:
-    - Agent
+        Agent
     """
     # Constructing a datalog query to retrieve agent details and default settings.
     # The query uses input parameters for agent_id and developer_id to filter the results.
diff --git a/agents-api/agents_api/models/agent/patch_agent.py b/agents-api/agents_api/models/agent/patch_agent.py
index 72fdc7811..364d1a974 100644
--- a/agents-api/agents_api/models/agent/patch_agent.py
+++ b/agents-api/agents_api/models/agent/patch_agent.py
@@ -46,13 +46,13 @@ def patch_agent(
     """Patches agent data based on provided updates.
 
     Parameters:
-    agent_id (UUID): The unique identifier for the agent.
-    developer_id (UUID): The unique identifier for the developer.
-    default_settings (dict, optional): Default settings to apply to the agent.
-    **update_data: Arbitrary keyword arguments representing data to update.
+        agent_id (UUID): The unique identifier for the agent.
+        developer_id (UUID): The unique identifier for the developer.
+        default_settings (dict, optional): Default settings to apply to the agent.
+        **update_data: Arbitrary keyword arguments representing data to update.
 
     Returns:
-    ResourceUpdatedResponse: The updated agent data.
+        ResourceUpdatedResponse: The updated agent data.
     """
     update_data = data.model_dump(exclude_unset=True)
 
diff --git a/agents-api/agents_api/models/agent/update_agent.py b/agents-api/agents_api/models/agent/update_agent.py
index be7e9ea21..992bb9796 100644
--- a/agents-api/agents_api/models/agent/update_agent.py
+++ b/agents-api/agents_api/models/agent/update_agent.py
@@ -46,13 +46,13 @@ def update_agent(
     Constructs and executes a datalog query to update an agent and its default settings in the 'cozodb' database.
 
     Parameters:
-    - agent_id (UUID): The unique identifier of the agent to be updated.
-    - developer_id (UUID): The unique identifier of the developer associated with the agent.
-    - data (UpdateAgentRequest): The request payload containing the updated agent data.
-    - client (CozoClient, optional): The database client used to execute the query. Defaults to a pre-configured client instance.
+        agent_id (UUID): The unique identifier of the agent to be updated.
+        developer_id (UUID): The unique identifier of the developer associated with the agent.
+        data (UpdateAgentRequest): The request payload containing the updated agent data.
+        client (CozoClient, optional): The database client used to execute the query. Defaults to a pre-configured client instance.
 
     Returns:
-    ResourceUpdatedResponse: The updated agent data.
+        ResourceUpdatedResponse: The updated agent data.
     """
     default_settings = (
         data.default_settings.model_dump(exclude_none=True)
diff --git a/agents-api/agents_api/models/chat/gather_messages.py b/agents-api/agents_api/models/chat/gather_messages.py
index c1683653f..b6bfdc217 100644
--- a/agents-api/agents_api/models/chat/gather_messages.py
+++ b/agents-api/agents_api/models/chat/gather_messages.py
@@ -6,8 +6,7 @@
 from pycozo.client import QueryException
 from pydantic import ValidationError
 
-from agents_api.autogen.Chat import ChatInput
-
+from ...autogen.Chat import ChatInput
 from ...autogen.openapi_model import DocReference, History
 from ...clients import litellm
 from ...common.protocol.developers import Developer
diff --git a/agents-api/agents_api/models/docs/create_doc.py b/agents-api/agents_api/models/docs/create_doc.py
index ee26df484..1c667bd51 100644
--- a/agents-api/agents_api/models/docs/create_doc.py
+++ b/agents-api/agents_api/models/docs/create_doc.py
@@ -50,10 +50,10 @@ def create_doc(
     Constructs and executes a datalog query to create a new document and its associated snippets in the 'cozodb' database.
 
     Parameters:
-    - owner_type (Literal["user", "agent"]): The type of the owner of the document.
-    - owner_id (UUID): The UUID of the document owner.
-    - id (UUID): The UUID of the document to be created.
-    - data (CreateDocRequest): The content of the document.
+        owner_type (Literal["user", "agent"]): The type of the owner of the document.
+        owner_id (UUID): The UUID of the document owner.
+        id (UUID): The UUID of the document to be created.
+        data (CreateDocRequest): The content of the document.
     """
 
     doc_id = str(doc_id or uuid4())
diff --git a/agents-api/agents_api/models/docs/embed_snippets.py b/agents-api/agents_api/models/docs/embed_snippets.py
index 993e76396..8d8ae1e62 100644
--- a/agents-api/agents_api/models/docs/embed_snippets.py
+++ b/agents-api/agents_api/models/docs/embed_snippets.py
@@ -49,9 +49,9 @@ def embed_snippets(
     """Embeds document snippets in the cozodb database.
 
     Parameters:
-    doc_id (UUID): The unique identifier for the document.
-    snippet_indices (list[int]): Indices of the snippets in the document.
-    embeddings (list[list[float]]): Embedding vectors for the snippets.
+        doc_id (UUID): The unique identifier for the document.
+        snippet_indices (list[int]): Indices of the snippets in the document.
+        embeddings (list[list[float]]): Embedding vectors for the snippets.
     """
 
     doc_id = str(doc_id)
diff --git a/agents-api/agents_api/models/docs/search_docs_by_embedding.py b/agents-api/agents_api/models/docs/search_docs_by_embedding.py
index d6bed97fc..83418aa21 100644
--- a/agents-api/agents_api/models/docs/search_docs_by_embedding.py
+++ b/agents-api/agents_api/models/docs/search_docs_by_embedding.py
@@ -56,12 +56,12 @@ def search_docs_by_embedding(
     Searches for document snippets in CozoDB by embedding query.
 
     Parameters:
-    - owner_type (Literal["user", "agent"]): The type of the owner of the documents.
-    - owner_id (UUID): The unique identifier of the owner.
-    - query_embedding (list[float]): The embedding vector of the query.
-    - k (int, optional): The number of nearest neighbors to retrieve. Defaults to 3.
-    - confidence (float, optional): The confidence threshold for filtering results. Defaults to 0.8.
-    - mmr_lambda (float, optional): The lambda parameter for MMR. Defaults to 0.25.
+        owner_type (Literal["user", "agent"]): The type of the owner of the documents.
+        owner_id (UUID): The unique identifier of the owner.
+        query_embedding (list[float]): The embedding vector of the query.
+        k (int, optional): The number of nearest neighbors to retrieve. Defaults to 3.
+        confidence (float, optional): The confidence threshold for filtering results. Defaults to 0.8.
+        mmr_lambda (float, optional): The lambda parameter for MMR. Defaults to 0.25.
     """
 
     assert len(query_embedding) == embedding_size
diff --git a/agents-api/agents_api/models/docs/search_docs_by_text.py b/agents-api/agents_api/models/docs/search_docs_by_text.py
index eeae8362c..bb700a494 100644
--- a/agents-api/agents_api/models/docs/search_docs_by_text.py
+++ b/agents-api/agents_api/models/docs/search_docs_by_text.py
@@ -53,9 +53,9 @@ def search_docs_by_text(
     Searches for document snippets in CozoDB by embedding query.
 
     Parameters:
-    - owners (list[tuple[Literal["user", "agent"], UUID]]): The type of the owner of the documents.
-    - query (str): The query string.
-    - k (int, optional): The number of nearest neighbors to retrieve. Defaults to 3.
+        owners (list[tuple[Literal["user", "agent"], UUID]]): The type of the owner of the documents.
+        query (str): The query string.
+        k (int, optional): The number of nearest neighbors to retrieve. Defaults to 3.
     """
 
     owners: list[list[str]] = [
diff --git a/agents-api/agents_api/models/entry/delete_entries.py b/agents-api/agents_api/models/entry/delete_entries.py
index 48c37cd25..c98b6c7d2 100644
--- a/agents-api/agents_api/models/entry/delete_entries.py
+++ b/agents-api/agents_api/models/entry/delete_entries.py
@@ -49,7 +49,7 @@ def delete_entries_for_session(
     Constructs and returns a datalog query for deleting entries associated with a given session ID from the 'cozodb' database.
 
     Parameters:
-    - session_id (UUID): The unique identifier of the session whose entries are to be deleted.
+        session_id (UUID): The unique identifier of the session whose entries are to be deleted.
     """
 
     delete_query = """
diff --git a/agents-api/agents_api/models/session/delete_session.py b/agents-api/agents_api/models/session/delete_session.py
index af9e331c7..81f8e1f7c 100644
--- a/agents-api/agents_api/models/session/delete_session.py
+++ b/agents-api/agents_api/models/session/delete_session.py
@@ -51,11 +51,11 @@ def delete_session(
     Deletes a session and its related data from the 'cozodb' database.
 
     Parameters:
-    - developer_id (UUID): The unique identifier for the developer.
-    - session_id (UUID): The unique identifier for the session to be deleted.
+        developer_id (UUID): The unique identifier for the developer.
+        session_id (UUID): The unique identifier for the session to be deleted.
 
     Returns:
-    - ResourceDeletedResponse: The response indicating the deletion of the session.
+        ResourceDeletedResponse: The response indicating the deletion of the session.
     """
     session_id = str(session_id)
     developer_id = str(developer_id)
diff --git a/agents-api/agents_api/models/session/list_sessions.py b/agents-api/agents_api/models/session/list_sessions.py
index 14f4cad0d..b7d5c0049 100644
--- a/agents-api/agents_api/models/session/list_sessions.py
+++ b/agents-api/agents_api/models/session/list_sessions.py
@@ -41,7 +41,8 @@ def list_sessions(
     direction: Literal["asc", "desc"] = "desc",
     metadata_filter: dict[str, Any] = {},
 ) -> tuple[list[str], dict]:
-    """Lists sessions from the 'cozodb' database based on the provided filters.
+    """
+    Lists sessions from the 'cozodb' database based on the provided filters.
 
     Parameters:
         developer_id (UUID): The developer's ID to filter sessions by.
diff --git a/agents-api/agents_api/models/session/patch_session.py b/agents-api/agents_api/models/session/patch_session.py
index a9f3121b9..4a119a684 100644
--- a/agents-api/agents_api/models/session/patch_session.py
+++ b/agents-api/agents_api/models/session/patch_session.py
@@ -60,12 +60,13 @@ def patch_session(
     developer_id: UUID,
     data: PatchSessionRequest,
 ) -> tuple[list[str], dict]:
-    """Patch session data in the 'cozodb' database.
+    """
+    Patch session data in the 'cozodb' database.
 
     Parameters:
-    - session_id (UUID): The unique identifier for the session to be updated.
-    - developer_id (UUID): The unique identifier for the developer making the update.
-    - data (PatchSessionRequest): The request payload containing the updates to apply.
+        session_id (UUID): The unique identifier for the session to be updated.
+        developer_id (UUID): The unique identifier for the developer making the update.
+        data (PatchSessionRequest): The request payload containing the updates to apply.
     """
 
     update_data = data.model_dump(exclude_unset=True)
diff --git a/agents-api/agents_api/models/tools/create_tools.py b/agents-api/agents_api/models/tools/create_tools.py
index 87ea3a9cf..fe7e28228 100644
--- a/agents-api/agents_api/models/tools/create_tools.py
+++ b/agents-api/agents_api/models/tools/create_tools.py
@@ -51,11 +51,11 @@ def create_tools(
     Constructs a datalog query for inserting tool records into the 'agent_functions' relation in the CozoDB.
 
     Parameters:
-    - agent_id (UUID): The unique identifier for the agent.
-    - data (list[CreateToolRequest]): A list of function definitions to be inserted.
+        agent_id (UUID): The unique identifier for the agent.
+        data (list[CreateToolRequest]): A list of function definitions to be inserted.
 
     Returns:
-    list[Tool]
+        list[Tool]
     """
 
     tools_data = [
diff --git a/agents-api/agents_api/models/tools/patch_tool.py b/agents-api/agents_api/models/tools/patch_tool.py
index 5bbfe1c91..0d8304d7d 100644
--- a/agents-api/agents_api/models/tools/patch_tool.py
+++ b/agents-api/agents_api/models/tools/patch_tool.py
@@ -40,16 +40,16 @@ def patch_tool(
     *, developer_id: UUID, agent_id: UUID, tool_id: UUID, data: PatchToolRequest
 ) -> tuple[list[str], dict]:
     """
-    # Execute the datalog query and return the results as a DataFrame
+    Execute the datalog query and return the results as a DataFrame
     Updates the tool information for a given agent and tool ID in the 'cozodb' database.
 
     Parameters:
-    - agent_id (UUID): The unique identifier of the agent.
-    - tool_id (UUID): The unique identifier of the tool to be updated.
-    - data (PatchToolRequest): The request payload containing the updated tool information.
+        agent_id (UUID): The unique identifier of the agent.
+        tool_id (UUID): The unique identifier of the tool to be updated.
+        data (PatchToolRequest): The request payload containing the updated tool information.
 
     Returns:
-    - ResourceUpdatedResponse: The updated tool data.
+        ResourceUpdatedResponse: The updated tool data.
     """
 
     agent_id = str(agent_id)
diff --git a/agents-api/agents_api/models/user/create_or_update_user.py b/agents-api/agents_api/models/user/create_or_update_user.py
index 9e9045e74..97db913c5 100644
--- a/agents-api/agents_api/models/user/create_or_update_user.py
+++ b/agents-api/agents_api/models/user/create_or_update_user.py
@@ -44,15 +44,15 @@ def create_or_update_user(
     Constructs and executes a datalog query to create a new user in the database.
 
     Parameters:
-    - user_id (UUID): The unique identifier for the user.
-    - developer_id (UUID): The unique identifier for the developer creating the user.
-    - name (str): The name of the user.
-    - about (str): A description of the user.
-    - metadata (dict, optional): A dictionary of metadata for the user. Defaults to an empty dict.
-    - client (CozoClient, optional): The CozoDB client instance to use for the query. Defaults to a preconfigured client instance.
+        user_id (UUID): The unique identifier for the user.
+        developer_id (UUID): The unique identifier for the developer creating the user.
+        name (str): The name of the user.
+        about (str): A description of the user.
+        metadata (dict, optional): A dictionary of metadata for the user. Defaults to an empty dict.
+        client (CozoClient, optional): The CozoDB client instance to use for the query. Defaults to a preconfigured client instance.
 
     Returns:
-    User: The newly created user record.
+        User: The newly created user record.
     """
 
     # Extract the user data from the payload
diff --git a/agents-api/agents_api/models/user/delete_user.py b/agents-api/agents_api/models/user/delete_user.py
index b5fcb8424..0532f5cfa 100644
--- a/agents-api/agents_api/models/user/delete_user.py
+++ b/agents-api/agents_api/models/user/delete_user.py
@@ -49,12 +49,12 @@ def delete_user(*, developer_id: UUID, user_id: UUID) -> tuple[list[str], dict]:
     Constructs and returns a datalog query for deleting an user and its default settings from the database.
 
     Parameters:
-    - developer_id (UUID): The UUID of the developer owning the user.
-    - user_id (UUID): The UUID of the user to be deleted.
-    - client (CozoClient, optional): An instance of the CozoClient to execute the query.
+        developer_id (UUID): The UUID of the developer owning the user.
+        user_id (UUID): The UUID of the user to be deleted.
+        client (CozoClient, optional): An instance of the CozoClient to execute the query.
 
     Returns:
-    - ResourceDeletedResponse: The response indicating the deletion of the user.
+        ResourceDeletedResponse: The response indicating the deletion of the user.
     """
 
     queries = [
diff --git a/agents-api/agents_api/models/user/list_users.py b/agents-api/agents_api/models/user/list_users.py
index 57dc9b8c8..2a810b8e0 100644
--- a/agents-api/agents_api/models/user/list_users.py
+++ b/agents-api/agents_api/models/user/list_users.py
@@ -43,13 +43,13 @@ def list_users(
     Queries the 'cozodb' database to list users associated with a specific developer.
 
     Parameters:
-    - developer_id (UUID): The unique identifier of the developer.
-    - limit (int): The maximum number of users to return. Defaults to 100.
-    - offset (int): The number of users to skip before starting to collect the result set. Defaults to 0.
-    - metadata_filter (dict[str, Any]): A dictionary representing filters to apply on user metadata.
+        developer_id (UUID): The unique identifier of the developer.
+        limit (int): The maximum number of users to return. Defaults to 100.
+        offset (int): The number of users to skip before starting to collect the result set. Defaults to 0.
+        metadata_filter (dict[str, Any]): A dictionary representing filters to apply on user metadata.
 
     Returns:
-    - pd.DataFrame: A DataFrame containing the queried user data.
+        pd.DataFrame: A DataFrame containing the queried user data.
     """
     # Construct a filter string for the metadata based on the provided dictionary.
     metadata_filter_str = ", ".join(
diff --git a/agents-api/agents_api/models/user/patch_user.py b/agents-api/agents_api/models/user/patch_user.py
index faf38298c..4498c6ded 100644
--- a/agents-api/agents_api/models/user/patch_user.py
+++ b/agents-api/agents_api/models/user/patch_user.py
@@ -49,12 +49,12 @@ def patch_user(
     Generates a datalog query for updating a user's information.
 
     Parameters:
-    - developer_id (UUID): The UUID of the developer.
-    - user_id (UUID): The UUID of the user to be updated.
-    - **update_data: Arbitrary keyword arguments representing the data to be updated.
+        developer_id (UUID): The UUID of the developer.
+        user_id (UUID): The UUID of the user to be updated.
+        **update_data: Arbitrary keyword arguments representing the data to be updated.
 
     Returns:
-    - tuple[str, dict]: A pandas DataFrame containing the results of the query execution.
+        tuple[str, dict]: A pandas DataFrame containing the results of the query execution.
     """
 
     update_data = data.model_dump(exclude_unset=True)
diff --git a/agents-api/agents_api/models/user/update_user.py b/agents-api/agents_api/models/user/update_user.py
index 9a13d9369..fd8e7e2c8 100644
--- a/agents-api/agents_api/models/user/update_user.py
+++ b/agents-api/agents_api/models/user/update_user.py
@@ -39,7 +39,8 @@
 def update_user(
     *, developer_id: UUID, user_id: UUID, data: UpdateUserRequest
 ) -> tuple[list[str], dict]:
-    """Updates user information in the 'cozodb' database.
+    """
+    Updates user information in the 'cozodb' database.
 
     Parameters:
         developer_id (UUID): The developer's unique identifier.
diff --git a/agents-api/agents_api/routers/jobs/routers.py b/agents-api/agents_api/routers/jobs/routers.py
index 8bff6c7cc..dff4bed7b 100644
--- a/agents-api/agents_api/routers/jobs/routers.py
+++ b/agents-api/agents_api/routers/jobs/routers.py
@@ -4,8 +4,8 @@
 from fastapi import APIRouter
 from temporalio.client import WorkflowExecutionStatus
 
-from agents_api.autogen.openapi_model import JobStatus
-from agents_api.clients.temporal import get_client
+from ...autogen.openapi_model import JobStatus
+from ...clients.temporal import get_client
 
 router: APIRouter = APIRouter()
 
diff --git a/agents-api/agents_api/routers/tasks/create_or_update_task.py b/agents-api/agents_api/routers/tasks/create_or_update_task.py
index e5245670a..50dbf19d9 100644
--- a/agents-api/agents_api/routers/tasks/create_or_update_task.py
+++ b/agents-api/agents_api/routers/tasks/create_or_update_task.py
@@ -6,15 +6,14 @@
 from jsonschema.exceptions import SchemaError, ValidationError
 from starlette.status import HTTP_201_CREATED
 
-from agents_api.autogen.openapi_model import (
+from ...autogen.openapi_model import (
     CreateOrUpdateTaskRequest,
     ResourceUpdatedResponse,
 )
-from agents_api.dependencies.developer_id import get_developer_id
-from agents_api.models.task.create_or_update_task import (
+from ...dependencies.developer_id import get_developer_id
+from ...models.task.create_or_update_task import (
     create_or_update_task as create_or_update_task_query,
 )
-
 from .router import router
 
 
diff --git a/agents-api/agents_api/routers/tasks/get_execution_details.py b/agents-api/agents_api/routers/tasks/get_execution_details.py
index 8da7b98c8..95bccbc07 100644
--- a/agents-api/agents_api/routers/tasks/get_execution_details.py
+++ b/agents-api/agents_api/routers/tasks/get_execution_details.py
@@ -1,12 +1,11 @@
 from uuid import UUID
 
-from agents_api.autogen.openapi_model import (
+from ...autogen.openapi_model import (
     Execution,
 )
-from agents_api.models.execution.get_execution import (
+from ...models.execution.get_execution import (
     get_execution as get_execution_query,
 )
-
 from .router import router
 
 
diff --git a/agents-api/agents_api/routers/tasks/list_execution_transitions.py b/agents-api/agents_api/routers/tasks/list_execution_transitions.py
index fd7be992a..9ce169509 100644
--- a/agents-api/agents_api/routers/tasks/list_execution_transitions.py
+++ b/agents-api/agents_api/routers/tasks/list_execution_transitions.py
@@ -1,14 +1,13 @@
 from typing import Literal
 from uuid import UUID
 
-from agents_api.autogen.openapi_model import (
+from ...autogen.openapi_model import (
     ListResponse,
     Transition,
 )
-from agents_api.models.execution.list_execution_transitions import (
+from ...models.execution.list_execution_transitions import (
     list_execution_transitions as list_execution_transitions_query,
 )
-
 from .router import router
 
 
diff --git a/agents-api/agents_api/routers/tasks/list_task_executions.py b/agents-api/agents_api/routers/tasks/list_task_executions.py
index f2961e54a..72cbd9b40 100644
--- a/agents-api/agents_api/routers/tasks/list_task_executions.py
+++ b/agents-api/agents_api/routers/tasks/list_task_executions.py
@@ -3,15 +3,14 @@
 
 from fastapi import Depends
 
-from agents_api.autogen.openapi_model import (
+from ...autogen.openapi_model import (
     Execution,
     ListResponse,
 )
-from agents_api.dependencies.developer_id import get_developer_id
-from agents_api.models.execution.list_executions import (
+from ...dependencies.developer_id import get_developer_id
+from ...models.execution.list_executions import (
     list_executions as list_task_executions_query,
 )
-
 from .router import router
 
 
diff --git a/agents-api/agents_api/routers/tasks/list_tasks.py b/agents-api/agents_api/routers/tasks/list_tasks.py
index 43a7e9158..a53983006 100644
--- a/agents-api/agents_api/routers/tasks/list_tasks.py
+++ b/agents-api/agents_api/routers/tasks/list_tasks.py
@@ -3,13 +3,12 @@
 
 from fastapi import Depends
 
-from agents_api.autogen.openapi_model import (
+from ...autogen.openapi_model import (
     ListResponse,
     Task,
 )
-from agents_api.dependencies.developer_id import get_developer_id
-from agents_api.models.task.list_tasks import list_tasks as list_tasks_query
-
+from ...dependencies.developer_id import get_developer_id
+from ...models.task.list_tasks import list_tasks as list_tasks_query
 from .router import router
 
 
diff --git a/agents-api/agents_api/routers/tasks/patch_execution.py b/agents-api/agents_api/routers/tasks/patch_execution.py
index 0eb159c83..3cc45ee37 100644
--- a/agents-api/agents_api/routers/tasks/patch_execution.py
+++ b/agents-api/agents_api/routers/tasks/patch_execution.py
@@ -3,15 +3,14 @@
 
 from fastapi import Depends
 
-from agents_api.autogen.openapi_model import (
+from ...autogen.openapi_model import (
     ResourceUpdatedResponse,
     UpdateExecutionRequest,
 )
-from agents_api.dependencies.developer_id import get_developer_id
-from agents_api.models.execution.update_execution import (
+from ...dependencies.developer_id import get_developer_id
+from ...models.execution.update_execution import (
     update_execution as update_execution_query,
 )
-
 from .router import router
 
 
diff --git a/agents-api/agents_api/routers/tasks/update_execution.py b/agents-api/agents_api/routers/tasks/update_execution.py
index 968b6bdfb..d887c455d 100644
--- a/agents-api/agents_api/routers/tasks/update_execution.py
+++ b/agents-api/agents_api/routers/tasks/update_execution.py
@@ -4,19 +4,18 @@
 
 from fastapi import Depends, HTTPException
 
-from agents_api.autogen.openapi_model import (
+from ...autogen.openapi_model import (
     ResumeExecutionRequest,
     StopExecutionRequest,
 )
-from agents_api.clients.temporal import get_client
-from agents_api.dependencies.developer_id import get_developer_id
-from agents_api.models.execution.get_paused_execution_token import (
+from ...clients.temporal import get_client
+from ...dependencies.developer_id import get_developer_id
+from ...models.execution.get_paused_execution_token import (
     get_paused_execution_token,
 )
-from agents_api.models.execution.get_temporal_workflow_data import (
+from ...models.execution.get_temporal_workflow_data import (
     get_temporal_workflow_data,
 )
-
 from .router import router
 
 
diff --git a/agents-api/tests/fixtures.py b/agents-api/tests/fixtures.py
index d5b032311..b732e750c 100644
--- a/agents-api/tests/fixtures.py
+++ b/agents-api/tests/fixtures.py
@@ -37,7 +37,7 @@
 from agents_api.models.user.delete_user import delete_user
 from agents_api.web import app
 
-from .utils import patch_embed_acompletion as patch_embed_acompletion_ctx
+from tests.utils import patch_embed_acompletion as patch_embed_acompletion_ctx
 
 EMBEDDING_SIZE: int = 1024
 
diff --git a/agents-api/tests/test_activities.py b/agents-api/tests/test_activities.py
index 98dfc97b5..a2f15d179 100644
--- a/agents-api/tests/test_activities.py
+++ b/agents-api/tests/test_activities.py
@@ -7,13 +7,8 @@
 from agents_api.clients import temporal
 from agents_api.env import temporal_task_queue
 from agents_api.workflows.demo import DemoWorkflow
-
-from .fixtures import (
-    cozo_client,
-    test_developer_id,
-    test_doc,
-)
-from .utils import patch_testing_temporal
+from tests.fixtures import cozo_client, test_developer_id, test_doc
+from tests.utils import patch_testing_temporal
 
 
 @test("activity: call direct embed_docs")
diff --git a/agents-api/tests/test_docs_routes.py b/agents-api/tests/test_docs_routes.py
index d4b677d05..d61bfbcb7 100644
--- a/agents-api/tests/test_docs_routes.py
+++ b/agents-api/tests/test_docs_routes.py
@@ -1,6 +1,6 @@
 from ward import test
 
-from .fixtures import (
+from tests.fixtures import (
     make_request,
     patch_embed_acompletion,
     test_agent,
@@ -8,7 +8,7 @@
     test_user,
     test_user_doc,
 )
-from .utils import patch_testing_temporal
+from tests.utils import patch_testing_temporal
 
 
 @test("route: create user doc")
diff --git a/agents-api/tests/test_execution_queries.py b/agents-api/tests/test_execution_queries.py
index 29ddcbd86..7af9f9512 100644
--- a/agents-api/tests/test_execution_queries.py
+++ b/agents-api/tests/test_execution_queries.py
@@ -16,7 +16,7 @@
 from agents_api.models.execution.list_executions import list_executions
 from agents_api.models.execution.lookup_temporal_data import lookup_temporal_data
 
-from .fixtures import (
+from tests.fixtures import (
     cozo_client,
     test_developer_id,
     test_execution,
diff --git a/agents-api/tests/test_execution_workflow.py b/agents-api/tests/test_execution_workflow.py
index b6394f1bc..ecebf34c3 100644
--- a/agents-api/tests/test_execution_workflow.py
+++ b/agents-api/tests/test_execution_workflow.py
@@ -15,8 +15,8 @@
 from agents_api.models.task.create_task import create_task
 from agents_api.routers.tasks.create_task_execution import start_execution
 
-from .fixtures import cozo_client, test_agent, test_developer_id
-from .utils import patch_integration_service, patch_testing_temporal
+from tests.fixtures import cozo_client, test_agent, test_developer_id
+from tests.utils import patch_integration_service, patch_testing_temporal
 
 EMBEDDING_SIZE: int = 1024
 
diff --git a/agents-api/tests/test_task_queries.py b/agents-api/tests/test_task_queries.py
index 2399416db..f14c431f8 100644
--- a/agents-api/tests/test_task_queries.py
+++ b/agents-api/tests/test_task_queries.py
@@ -16,7 +16,7 @@
 from agents_api.models.task.list_tasks import list_tasks
 from agents_api.models.task.update_task import update_task
 
-from .fixtures import cozo_client, test_agent, test_developer_id, test_task
+from tests.fixtures import cozo_client, test_agent, test_developer_id, test_task
 
 
 @test("model: create task")
diff --git a/agents-api/tests/test_task_routes.py b/agents-api/tests/test_task_routes.py
index 4ab708560..5d3c2f998 100644
--- a/agents-api/tests/test_task_routes.py
+++ b/agents-api/tests/test_task_routes.py
@@ -4,14 +4,14 @@
 
 from ward import test
 
-from .fixtures import (
+from tests.fixtures import (
     client,
     make_request,
     test_agent,
     test_execution,
     test_task,
 )
-from .utils import patch_testing_temporal
+from tests.utils import patch_testing_temporal
 
 
 @test("route: unauthorized should fail")
diff --git a/agents-api/tests/test_workflow_routes.py b/agents-api/tests/test_workflow_routes.py
index 34aa0101c..d1538535d 100644
--- a/agents-api/tests/test_workflow_routes.py
+++ b/agents-api/tests/test_workflow_routes.py
@@ -4,8 +4,8 @@
 
 from ward import test
 
-from .fixtures import cozo_client, test_agent, test_developer_id
-from .utils import patch_http_client_with_temporal
+from tests.fixtures import cozo_client, test_agent, test_developer_id
+from tests.utils import patch_http_client_with_temporal
 
 
 @test("workflow route: evaluate step single")
diff --git a/agents-api/tests/utils.py b/agents-api/tests/utils.py
index 3f0f1f94a..dc1007d13 100644
--- a/agents-api/tests/utils.py
+++ b/agents-api/tests/utils.py
@@ -10,6 +10,7 @@
 from agents_api.worker.codec import pydantic_data_converter
 from agents_api.worker.worker import create_worker
 
+# Replicated here to prevent circular import
 EMBEDDING_SIZE: int = 1024