feat: simplify model and model provider configuration

Author: adi-wan-askui

README.md

@@ -204,3 +204,19 @@ We'd love your help! Contributions, ideas, and feedback are always welcome. A pr
 ## 📜 License
 
 This project is licensed under the MIT License - see the [LICENSE](LICENSE) file for details.
+
+
+
+
+
+class AnthropicMessagesApiSettings(BaseModel):
+    api_provider: ApiProvider = Field(
+        default="askui",
+        description="The API provider/platform to use for the model",
+        validation_alias="ANTHROPIC_API_PROVIDER",
+    )
+
+    @field_validator("api_provider", mode="before")  # noqa: F821
+    @classmethod
+    def _normalize_api_provider(cls, v: Any) -> str:
+        return v.lower() if isinstance(v, str) else v

pdm.lock

@@ -5,7 +5,7 @@ authors = [
     {name = "askui GmbH", email = "info@askui.com"},
 ]
 dependencies = [
-    "anthropic>=0.54.0",
+    "anthropic>=0.72.0",
     "fastapi>=0.115.12",
     "fastmcp>=2.3.0",
     "gradio-client>=1.4.3",
@@ -214,10 +214,13 @@ known-first-party = ["askui"]
 known-third-party = ["pytest", "mypy"]
 
 [project.optional-dependencies]
-all = ["askui[android,chat,pynput,web]"]
+all = ["askui[android,bedrock,chat,pynput,vertex,web]"]
 android = [
     "pure-python-adb>=0.3.0.dev0"
 ]
+bedrock = [
+    "anthropic[bedrock]>=0.72.0"
+]
 chat = [
     "askui[android,web]",
     "uvicorn>=0.34.3",
@@ -231,6 +234,10 @@ pynput = [
     "mss>=10.0.0",
     "pynput>=1.8.1",
 ]
+vertex = [
+    "google-cloud-aiplatform>=1.122.0",
+    "anthropic[vertex]>=0.72.0",
+]
 web = [
     "playwright>=1.41.0",
 ]

pyproject.toml

@@ -29,15 +29,6 @@
 
 logger = logging.getLogger(__name__)
 
-_CLAUDE__SONNET__4__20250514__ACT_SETTINGS = ActSettings(
-    messages=MessageSettings(
-        model=ModelName.CLAUDE__SONNET__4__20250514,
-        system=COMPUTER_AGENT_SYSTEM_PROMPT,
-        betas=[COMPUTER_USE_20250124_BETA_FLAG],
-        thinking={"type": "enabled", "budget_tokens": 2048},
-    ),
-)
-
 
 class VisionAgent(AgentBase):
     """
@@ -76,6 +67,7 @@ def __init__(
         retry: Retry | None = None,
         models: ModelRegistry | None = None,
         act_tools: list[Tool] | None = None,
+        model_provider: str | None = None,
     ) -> None:
         reporter = CompositeReporter(reporters=reporters)
         self.tools = tools or AgentToolbox(
@@ -97,6 +89,7 @@ def __init__(
             ]
             + (act_tools or []),
             agent_os=self.tools.os,
+            model_provider=model_provider,
         )
 
     @telemetry.record_call(exclude={"locator"})
@@ -370,11 +363,13 @@ def mouse_down(
 
     @override
     def _get_default_settings_for_act(self, model_choice: str) -> ActSettings:
-        match model_choice:
-            case ModelName.CLAUDE__SONNET__4__20250514 | ModelName.ASKUI:
-                return _CLAUDE__SONNET__4__20250514__ACT_SETTINGS
-            case _:
-                return ActSettings()
+        return ActSettings(
+            messages=MessageSettings(
+                system=COMPUTER_AGENT_SYSTEM_PROMPT,
+                betas=[COMPUTER_USE_20250124_BETA_FLAG],
+                thinking={"type": "enabled", "budget_tokens": 2048},
+            ),
+        )
 
     @override
     def _get_default_tools_for_act(self, model_choice: str) -> list[Tool]:

src/askui/agent.py

@@ -47,6 +47,7 @@ def __init__(
         models: ModelRegistry | None,
         tools: list[Tool] | None,
         agent_os: AgentOs | AndroidAgentOs,
+        model_provider: str | None,
     ) -> None:
         load_dotenv()
         self._reporter = reporter
@@ -56,8 +57,8 @@ def __init__(
         self._model_router = self._init_model_router(
             reporter=self._reporter,
             models=models or {},
+            model_provider=model_provider,
         )
-        self.model = model
         self._retry = retry or ConfigurableRetry(
             strategy="Exponential",
             base_delay=1000,
@@ -73,6 +74,7 @@ def _init_model_router(
         self,
         reporter: Reporter,
         models: ModelRegistry,
+        model_provider: str | None,
     ) -> ModelRouter:
         _models = initialize_default_model_registry(
             reporter=reporter,
@@ -81,6 +83,7 @@ def _init_model_router(
         return ModelRouter(
             reporter=reporter,
             models=_models,
+            provider=model_provider,
         )
 
     def _init_model_choice(
@@ -98,18 +101,18 @@ def _init_model_choice(
         """
         if isinstance(model_choice, ModelComposition):
             return {
-                "act": ModelName.ASKUI,
+                "act": ModelName.CLAUDE__SONNET__4__20250514,
                 "get": ModelName.ASKUI,
                 "locate": model_choice,
             }
         if isinstance(model_choice, str) or model_choice is None:
             return {
-                "act": model_choice or ModelName.ASKUI,
+                "act": model_choice or ModelName.CLAUDE__SONNET__4__20250514,
                 "get": model_choice or ModelName.ASKUI,
                 "locate": model_choice or ModelName.ASKUI,
             }
         return {
-            "act": model_choice.get("act", ModelName.ASKUI),
+            "act": model_choice.get("act", ModelName.CLAUDE__SONNET__4__20250514),
             "get": model_choice.get("get", ModelName.ASKUI),
             "locate": model_choice.get("locate", ModelName.ASKUI),
         }
@@ -178,7 +181,7 @@ def act(
         _tools = self._build_tools(tools, model_choice)
         self._model_router.act(
             messages=messages,
-            model_choice=model_choice,
+            model=model_choice,
             on_message=on_message,
             settings=_settings,
             tools=_tools,
@@ -359,7 +362,7 @@ def locate_with_screenshot() -> PointList:
             return self._model_router.locate(
                 screenshot=_screenshot,
                 locator=locator,
-                model_choice=model or self._model_choice["locate"],
+                model=model or self._model_choice["locate"],
             )
 
         points = self._retry.attempt(locate_with_screenshot)

src/askui/agent_base.py

@@ -30,21 +30,12 @@
 from askui.tools.exception_tool import ExceptionTool
 
 from .models import ModelComposition
-from .models.models import ModelChoice, ModelName, ModelRegistry, Point
+from .models.models import ModelChoice, ModelRegistry, Point
 from .reporting import CompositeReporter, Reporter
 from .retry import Retry
 
 logger = logging.getLogger(__name__)
 
-_CLAUDE__SONNET__4__20250514__ACT_SETTINGS = ActSettings(
-    messages=MessageSettings(
-        model=ModelName.CLAUDE__SONNET__4__20250514,
-        system=ANDROID_AGENT_SYSTEM_PROMPT,
-        thinking={"type": "enabled", "budget_tokens": 2048},
-        betas=[],
-    ),
-)
-
 
 class AndroidVisionAgent(AgentBase):
     @telemetry.record_call(exclude={"model_router", "reporters", "tools"})
@@ -55,6 +46,7 @@ def __init__(
         model: ModelChoice | ModelComposition | str | None = None,
         retry: Retry | None = None,
         models: ModelRegistry | None = None,
+        model_provider: str | None = None,
     ) -> None:
         self.os = PpadbAgentOs()
         reporter = CompositeReporter(reporters=reporters)
@@ -81,6 +73,7 @@ def __init__(
                 ExceptionTool(),
             ],
             agent_os=self.os,
+            model_provider=model_provider,
         )
 
     @overload
@@ -317,8 +310,10 @@ def set_device_by_serial_number(
 
     @override
     def _get_default_settings_for_act(self, model_choice: str) -> ActSettings:
-        match model_choice:
-            case ModelName.CLAUDE__SONNET__4__20250514 | ModelName.ASKUI:
-                return _CLAUDE__SONNET__4__20250514__ACT_SETTINGS
-            case _:
-                return ActSettings()
+        return ActSettings(
+            messages=MessageSettings(
+                system=ANDROID_AGENT_SYSTEM_PROMPT,
+                thinking={"type": "enabled", "budget_tokens": 2048},
+                betas=[],
+            ),
+        )

src/askui/android_agent.py

@@ -150,13 +150,12 @@ def _run_agent_inner() -> None:
             custom_agent = CustomAgent()
             custom_agent.act(
                 messages,
-                model=ModelName.ASKUI,
+                model=model,
                 on_message=on_message,
                 tools=tools,
                 settings=ActSettings(
                     messages=MessageSettings(
                         betas=betas,
-                        model=model,
                         system=system,
                         thinking={"type": "enabled", "budget_tokens": 4096},
                         max_tokens=8192,

src/askui/chat/api/runs/runner/runner.py

@@ -43,7 +43,7 @@ def act(
         _tools = self._build_tools(tools)
         self._model_router.act(
             messages=messages,
-            model_choice=model or ModelName.CLAUDE__SONNET__4__20250514,
+            model=model or ModelName.CLAUDE__SONNET__4__20250514,
             on_message=on_message,
             settings=_settings,
             tools=_tools,

src/askui/custom_agent.py

@@ -86,7 +86,7 @@ def get(
             source=_source,
             query=query,
             response_schema=response_schema,
-            model_choice=model,
+            model=model,
         )
         message_content = (
             str(response)

src/askui/data_extractor.py

@@ -2,8 +2,8 @@
 from .models.exceptions import (
     AutomationError,
     ElementNotFoundError,
-    ModelNotFoundError,
     ModelTypeMismatchError,
+    ProviderNotFoundError,
     QueryNoResponseError,
     QueryUnexpectedResponseError,
 )
@@ -16,7 +16,7 @@
     "ConflictError",
     "ElementNotFoundError",
     "NotFoundError",
-    "ModelNotFoundError",
+    "ProviderNotFoundError",
     "ModelTypeMismatchError",
     "QueryNoResponseError",
     "QueryUnexpectedResponseError",