Skip to content

🕷️ The BEST Web Scraping framework that handles everything from a single request to a full-scale crawl! Don't be shy, join here: https://discord.gg/EMgGbDceNQ and follow here for daily tips and tricks: https://x.com/Scrapling_dev

perf(mcp): lower the tokens used by tools definition more.

Karim shoair7372361683bc
diff --git a/scrapling/core/ai/_browser_actions.py b/scrapling/core/ai/_browser_actions.py
index 8bdb54a..763bbf9 100644
--- a/scrapling/core/ai/_browser_actions.py
+++ b/scrapling/core/ai/_browser_actions.py
@@ -10,6 +10,7 @@ from scrapling.core._types import (
Literal,
Union,
TypedDict,
+ TypeAliasType,
NotRequired,
List,
Any,
@@ -20,11 +21,19 @@ from scrapling.core._types import (
MouseButton = Literal["left", "right", "middle"]
NonNegativeFiniteFloat = Annotated[float, Field(ge=0, allow_inf_nan=False)]
NonEmptyString = Annotated[str, Field(min_length=1)]
+_Selector = TypeAliasType("_Selector", Annotated[Optional[NonEmptyString], Field(title="Selector")])
+_Ref = TypeAliasType("_Ref", Annotated[Optional[NonEmptyString], Field(title="Ref")])
+_FieldTimeout = TypeAliasType(
+ "_FieldTimeout",
+ Annotated[
+ NonNegativeFiniteFloat, Field(title="Timeout", description="Limit per native operation in ms; 0 disables it.")
+ ],
+)
class _MouseTarget(TypedDict, total=False):
- selector: Optional[NonEmptyString]
- ref: Optional[NonEmptyString]
+ selector: _Selector
+ ref: _Ref
x: Optional[FiniteFloat]
y: Optional[FiniteFloat]
timeout: Annotated[
@@ -87,11 +96,9 @@ class _KeyPress(TypedDict):
class _FormTarget(TypedDict, total=False):
- selector: Optional[NonEmptyString]
- ref: Optional[NonEmptyString]
- timeout: Annotated[
- NonNegativeFiniteFloat, Field(default=30000, description="Limit per native operation in ms; 0 disables it.")
- ]
+ selector: _Selector
+ ref: _Ref
+ timeout: Annotated[_FieldTimeout, Field(default=30000)]
class _TextFormField(_FormTarget):
diff --git a/tests/ai/test_browser_fill_fields.py b/tests/ai/test_browser_fill_fields.py
index a1e3db9..3214c3b 100644
--- a/tests/ai/test_browser_fill_fields.py
+++ b/tests/ai/test_browser_fill_fields.py
@@ -91,11 +91,20 @@ async def test_browser_actions_fields_schema() -> None:
{"clear"} if kind == "textbox" else set()
)
assert variant["properties"]["type"]["const"] == kind
- assert variant["properties"]["timeout"]["default"] == 30000
- assert variant["properties"]["timeout"]["minimum"] == 0
+ timeout = variant["properties"]["timeout"]
+ assert timeout["default"] == 30000
+ assert schema["$defs"][timeout["$ref"].rsplit("/", 1)[1]] == {
+ "description": "Limit per native operation in ms; 0 disables it.",
+ "minimum": 0,
+ "title": "Timeout",
+ "type": "number",
+ }
for target in ("selector", "ref"):
- assert {"type": "null"} in variant["properties"][target]["anyOf"]
- assert any(option.get("minLength") == 1 for option in variant["properties"][target]["anyOf"])
+ reference = variant["properties"][target]["$ref"]
+ assert schema["$defs"][reference.rsplit("/", 1)[1]] == {
+ "anyOf": [{"minLength": 1, "type": "string"}, {"type": "null"}],
+ "title": target.title(),
+ }
assert variants["textbox"]["properties"]["value"]["type"] == "string"
assert variants["textbox"]["properties"]["clear"]["type"] == "boolean"
assert variants["textbox"]["properties"]["clear"]["default"] is True
@@ -295,6 +304,7 @@ async def test_browser_actions_fields_invalid_later_field_prevents_all_actions(i
{"actions": [{"type": "textbox", "selector": "#name"}]},
{"actions": [{"selector": "#name", "value": "value"}]},
{"actions": [{**TEXT_FIELD, "timeout": -1}]},
+ {"actions": [{**TEXT_FIELD, "timeout": None}]},
{"actions": [TEXT_FIELD], "slowly": "invalid"},
],
)
diff --git a/tests/ai/test_browser_mouse.py b/tests/ai/test_browser_mouse.py
index 9d085fe..45628fd 100644
--- a/tests/ai/test_browser_mouse.py
+++ b/tests/ai/test_browser_mouse.py
@@ -93,6 +93,13 @@ async def test_browser_mouse_schema_and_annotations() -> None:
variant = variants[kind]
assert variant["required"] == ["type"]
assert variant["properties"]["type"]["const"] == kind
+ for kind in ("move", "click"):
+ for target in ("selector", "ref"):
+ reference = variants[kind]["properties"][target]["$ref"]
+ assert schema["$defs"][reference.rsplit("/", 1)[1]] == {
+ "anyOf": [{"minLength": 1, "type": "string"}, {"type": "null"}],
+ "title": target.title(),
+ }
move = variants["move"]["properties"]
assert set(move) == {"type", "x", "y", "steps", "selector", "ref", "timeout"}
assert move["steps"]["exclusiveMinimum"] == 0