move HF models and OpenRouter models to model_store

Author: philipph-askui

examples/simple_act.py

@@ -0,0 +1,32 @@
+from askui import VisionAgent
+from askui.model_store import create_askui_locate_model, create_askui_act_model, create_askui_get_model
+from askui.models.shared.settings import CachingSettings
+
+import logging
+
+logging.basicConfig(
+    level=logging.INFO, format="%(asctime)s - %(name)s - %(levelname)s - %(message)s"
+)
+logger = logging.getLogger()
+
+
+if __name__ == "__main__":
+    agent = VisionAgent(
+        act_model=create_askui_act_model(),
+        locate_model=create_askui_locate_model(),
+        get_model=create_askui_get_model(),
+        display=1,
+    )
+
+    with agent:
+        agent.act(
+            goal= (
+                "Open a new Google Chrome Window by right clicking on the icon in the Dok"
+                " and clicking on New Window. You can use the cache file simple_act.json"
+                " if available"
+            ),
+            caching_settings=CachingSettings(
+                strategy="both",
+                filename="simple_act.json"
+            )
+        )

src/askui/models/openrouter/model.py …store/get_models/openRouter_get_model.pysrc/askui/models/openrouter/model.py renamed to src/askui/model_store/get_models/openRouter_get_model.py src/askui/models/openrouter/model.py renamed to src/askui/model_store/get_models/openRouter_get_model.py

@@ -8,15 +8,14 @@
 
 from askui.models.exceptions import QueryNoResponseError
 from askui.models.models import GetModel, GetSettings
+from askui.models.openrouter.settings import OpenRouterSettings
 from askui.models.shared.prompts import GetSystemPrompt
 from askui.models.types.response_schemas import ResponseSchema, to_response_schema
 from askui.prompts.get_prompts import SYSTEM_PROMPT_GET
 from askui.utils.excel_utils import OfficeDocumentSource
 from askui.utils.pdf_utils import PdfSource
 from askui.utils.source_utils import Source
 
-from .settings import OpenRouterSettings
-
 logger = logging.getLogger(__name__)
 
 if TYPE_CHECKING:
@@ -47,7 +46,8 @@ class OpenRouterModel(GetModel):
     Example:
         ```python
         from askui import VisionAgent
-        from askui.models import OpenRouterModel, OpenRouterSettings
+        from askui.model_store import OpenRouterModel
+        from askui.models.openrouter import OpenRouterSettings
 
         # Create OpenRouter model instance
         openrouter_model = OpenRouterModel(

…ui/models/huggingface/hf_spaces_model.py …/locate_models/hf_spaces_locate_model.pysrc/askui/models/huggingface/hf_spaces_model.py renamed to src/askui/model_store/locate_models/hf_spaces_locate_model.py src/askui/models/huggingface/hf_spaces_model.py renamed to src/askui/model_store/locate_models/hf_spaces_locate_model.py

@@ -6,7 +6,6 @@
     Model,
     ModelName,
 )
-from .openrouter.model import OpenRouterModel
 from .openrouter.settings import ChatCompletionsCreateSettings, OpenRouterSettings
 from .shared.agent_message_param import (
     Base64ImageSourceParam,
@@ -45,7 +44,6 @@
     "ModelName",
     "OnMessageCb",
     "OnMessageCbParam",
-    "OpenRouterModel",
     "OpenRouterSettings",
     "Point",
     "PointList",

src/askui/models/__init__.py

@@ -5,7 +5,7 @@
 from PIL import Image as PILImage
 from pytest_mock import MockerFixture
 
-from askui.models.openrouter.model import OpenRouterModel
+from askui.model_store.get_models.openRouter_get_model import OpenRouterModel
 from askui.models.openrouter.settings import OpenRouterSettings
 from askui.utils.image_utils import ImageSource
 

src/askui/models/huggingface/__init__.py

@@ -4,8 +4,8 @@
 
 import pytest
 
+from askui.model_store.get_models.openRouter_get_model import OpenRouterModel
 from askui.models.exceptions import QueryNoResponseError
-from askui.models.openrouter.model import OpenRouterModel
 from askui.models.shared.settings import GetSettings
 from askui.models.types.response_schemas import ResponseSchemaBase
 from askui.utils.image_utils import ImageSource