models - move abstract class (#409)

Author: pgrayy

src/strands/agent/agent.py

@@ -30,13 +30,13 @@
     MessageAddedEvent,
 )
 from ..models.bedrock import BedrockModel
+from ..models.model import Model
 from ..telemetry.metrics import EventLoopMetrics
 from ..telemetry.tracer import get_tracer
 from ..tools.registry import ToolRegistry
 from ..tools.watcher import ToolWatcher
 from ..types.content import ContentBlock, Message, Messages
 from ..types.exceptions import ContextWindowOverflowException
-from ..types.models import Model
 from ..types.tools import ToolResult, ToolUse
 from ..types.traces import AttributeValue
 from .agent_result import AgentResult

src/strands/event_loop/streaming.py

@@ -4,8 +4,8 @@
 import logging
 from typing import Any, AsyncGenerator, AsyncIterable, Optional
 
+from ..models.model import Model
 from ..types.content import ContentBlock, Message, Messages
-from ..types.models import Model
 from ..types.streaming import (
     ContentBlockDeltaEvent,
     ContentBlockStart,

src/strands/models/__init__.py

@@ -3,7 +3,8 @@
 This package includes an abstract base Model class along with concrete implementations for specific providers.
 """
 
-from . import bedrock
+from . import bedrock, model
 from .bedrock import BedrockModel
+from .model import Model
 
-__all__ = ["bedrock", "BedrockModel"]
+__all__ = ["bedrock", "model", "BedrockModel", "Model"]

src/strands/models/anthropic.py

@@ -17,9 +17,9 @@
 from ..tools import convert_pydantic_to_tool_spec
 from ..types.content import ContentBlock, Messages
 from ..types.exceptions import ContextWindowOverflowException, ModelThrottledException
-from ..types.models import Model
 from ..types.streaming import StreamEvent
 from ..types.tools import ToolSpec
+from .model import Model
 
 logger = logging.getLogger(__name__)
 
@@ -361,7 +361,7 @@ async def stream(
         """
         logger.debug("formatting request")
         request = self.format_request(messages, tool_specs, system_prompt)
-        logger.debug("formatted request=<%s>", request)
+        logger.debug("request=<%s>", request)
 
         logger.debug("invoking model")
         try:

src/strands/models/bedrock.py

@@ -16,13 +16,13 @@
 from pydantic import BaseModel
 from typing_extensions import TypedDict, Unpack, override
 
-from ..event_loop.streaming import process_stream
+from ..event_loop import streaming
 from ..tools import convert_pydantic_to_tool_spec
 from ..types.content import Messages
 from ..types.exceptions import ContextWindowOverflowException, ModelThrottledException
-from ..types.models import Model
 from ..types.streaming import StreamEvent
 from ..types.tools import ToolSpec
+from .model import Model
 
 logger = logging.getLogger(__name__)
 
@@ -374,7 +374,7 @@ def _stream(
         """
         logger.debug("formatting request")
         request = self.format_request(messages, tool_specs, system_prompt)
-        logger.debug("formatted request=<%s>", request)
+        logger.debug("request=<%s>", request)
 
         logger.debug("invoking model")
         streaming = self.config.get("streaming", True)
@@ -577,7 +577,7 @@ async def structured_output(
         tool_spec = convert_pydantic_to_tool_spec(output_model)
 
         response = self.stream(messages=prompt, tool_specs=[tool_spec])
-        async for event in process_stream(response, prompt):
+        async for event in streaming.process_stream(response, prompt):
             yield event
 
         stop_reason, messages, _, _ = event["stop"]

src/strands/models/litellm.py

@@ -13,9 +13,9 @@
 from typing_extensions import Unpack, override
 
 from ..types.content import ContentBlock, Messages
-from ..types.models.openai import OpenAIModel
 from ..types.streaming import StreamEvent
 from ..types.tools import ToolSpec
+from .openai import OpenAIModel
 
 logger = logging.getLogger(__name__)
 
@@ -119,7 +119,7 @@ async def stream(
         """
         logger.debug("formatting request")
         request = self.format_request(messages, tool_specs, system_prompt)
-        logger.debug("formatted request=<%s>", request)
+        logger.debug("request=<%s>", request)
 
         logger.debug("invoking model")
         response = await litellm.acompletion(**self.client_args, **request)

src/strands/models/llamaapi.py

@@ -17,9 +17,9 @@
 
 from ..types.content import ContentBlock, Messages
 from ..types.exceptions import ModelThrottledException
-from ..types.models import Model
 from ..types.streaming import StreamEvent, Usage
 from ..types.tools import ToolResult, ToolSpec, ToolUse
+from .model import Model
 
 logger = logging.getLogger(__name__)
 
@@ -340,7 +340,7 @@ async def stream(
         """
         logger.debug("formatting request")
         request = self.format_request(messages, tool_specs, system_prompt)
-        logger.debug("formatted request=<%s>", request)
+        logger.debug("request=<%s>", request)
 
         logger.debug("invoking model")
         try:

src/strands/models/mistral.py

@@ -14,9 +14,9 @@
 
 from ..types.content import ContentBlock, Messages
 from ..types.exceptions import ModelThrottledException
-from ..types.models import Model
 from ..types.streaming import StopReason, StreamEvent
 from ..types.tools import ToolResult, ToolSpec, ToolUse
+from .model import Model
 
 logger = logging.getLogger(__name__)
 
@@ -409,7 +409,7 @@ async def stream(
         """
         logger.debug("formatting request")
         request = self.format_request(messages, tool_specs, system_prompt)
-        logger.debug("formatted request=<%s>", request)
+        logger.debug("request=<%s>", request)
 
         logger.debug("invoking model")
         try:

src/strands/types/models/model.py renamed to src/strands/models/model.py

@@ -1,22 +1,22 @@
-"""Model-related type definitions for the SDK."""
+"""Abstract base class for Agent model providers."""
 
 import abc
 import logging
 from typing import Any, AsyncGenerator, AsyncIterable, Optional, Type, TypeVar, Union
 
 from pydantic import BaseModel
 
-from ..content import Messages
-from ..streaming import StreamEvent
-from ..tools import ToolSpec
+from ..types.content import Messages
+from ..types.streaming import StreamEvent
+from ..types.tools import ToolSpec
 
 logger = logging.getLogger(__name__)
 
 T = TypeVar("T", bound=BaseModel)
 
 
 class Model(abc.ABC):
-    """Abstract base class for AI model implementations.
+    """Abstract base class for Agent model providers.
 
     This class defines the interface for all model implementations in the Strands Agents SDK. It provides a
     standardized way to configure and process requests for different AI model providers.

src/strands/models/ollama.py

@@ -12,9 +12,9 @@
 from typing_extensions import TypedDict, Unpack, override
 
 from ..types.content import ContentBlock, Messages
-from ..types.models import Model
 from ..types.streaming import StopReason, StreamEvent
 from ..types.tools import ToolSpec
+from .model import Model
 
 logger = logging.getLogger(__name__)
 
@@ -296,7 +296,7 @@ async def stream(
         """
         logger.debug("formatting request")
         request = self.format_request(messages, tool_specs, system_prompt)
-        logger.debug("formatted request=<%s>", request)
+        logger.debug("request=<%s>", request)
 
         logger.debug("invoking model")
         tool_requested = False