fix: in viewport retriever JS

lavague-ai · Oct 8, 2024 · e15cb6b · e15cb6b
1 parent a3190b6
commit e15cb6b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/lavague-integrations/drivers/lavague-drivers-selenium/lavague/drivers/selenium/base.py b/lavague-integrations/drivers/lavague-drivers-selenium/lavague/drivers/selenium/base.py
@@ -39,6 +39,7 @@
 from selenium.webdriver.support.ui import WebDriverWait
 from selenium.webdriver.chrome.service import Service
 
+
 class SeleniumDriver(BaseDriver[SeleniumNode]):
     driver: WebDriver
 
@@ -186,6 +187,7 @@ def get_possible_interactions(
         self,
         in_viewport=True,
         foreground_only=True,
+        include_non_interactives=False,
         types: List[InteractionType] = [
             InteractionType.CLICK,
             InteractionType.TYPE,
@@ -197,12 +199,14 @@ def get_possible_interactions(
             JS_GET_INTERACTIVES,
             in_viewport,
             foreground_only,
-            False,
+            include_non_interactives,
             [t.name for t in types],
         )
         res = dict()
         for k, v in exe.items():
-            res[k] = set(InteractionType[i] for i in v)
+            res[k] = set(
+                InteractionType[i] for i in v if i in InteractionType.__members__
+            )
         return res
 
     def scroll_into_view(self, xpath: str):

diff --git a/lavague-sdk/lavague/sdk/base_driver/base.py b/lavague-sdk/lavague/sdk/base_driver/base.py
@@ -139,6 +139,7 @@ def get_possible_interactions(
         self,
         in_viewport=True,
         foreground_only=True,
+        include_non_interactives=False,
         types: List[InteractionType] = [
             InteractionType.CLICK,
             InteractionType.TYPE,
@@ -232,7 +233,9 @@ def get_obs(self) -> DriverObservation:
 
     def get_in_viewport(self) -> List[str]:
         """Get xpath of elements in the viewport"""
-        interactions = self.get_possible_interactions(in_viewport=True, types=[])
+        interactions = self.get_possible_interactions(
+            include_non_interactives=True, types=[]
+        )
         return list(interactions.keys())
 
     def get_scroll_containers(self) -> List[str]: