oagi-core 0.14.2__py3-none-any.whl → 0.15.0__py3-none-any.whl

oagi/converters/oagi.py

@@ -51,21 +51,21 @@ class OagiActionConverter(BaseActionConverter[Action]):
         """
         converted: list[str] = []
         failed: list[tuple[str, str]] = []
-        has_finish = False
+        has_terminal = False
 
         if not actions:
             return converted
 
         for action in actions:
-            # Check for duplicate finish() during iteration
-            is_finish = action.type == ActionType.FINISH
-            if is_finish:
-                if has_finish:
+            # Check for duplicate finish()/fail() during iteration
+            is_terminal = action.type in (ActionType.FINISH, ActionType.FAIL)
+            if is_terminal:
+                if has_terminal:
                     raise ValueError(
-                        "Duplicate finish() detected. "
-                        "Only one finish() is allowed per action sequence."
+                        "Duplicate finish()/fail() detected. "
+                        "Only one finish() or fail() is allowed per action sequence."
                     )
-                has_finish = True
+                has_terminal = True
 
             try:
                 converted.extend(self._convert_action(action))
@@ -172,6 +172,10 @@ class OagiActionConverter(BaseActionConverter[Action]):
             self._log_info("Task completion action -> DONE")
             return ["DONE"]
 
+        if action_type == ActionType.FAIL.value:
+            self._log_info("Task infeasible action -> FAIL")
+            return ["FAIL"]
+
         if action_type == ActionType.CALL_USER.value:
             self._log_info("User intervention requested")
             return []
@@ -179,7 +183,7 @@ class OagiActionConverter(BaseActionConverter[Action]):
         raise ValueError(
             f"Unknown action type: '{action_type}'. "
             "Supported: click, left_double, left_triple, right_single, drag, "
-            "hotkey, type, scroll, wait, finish, call_user"
+            "hotkey, type, scroll, wait, finish, fail, call_user"
         )
 
     def serialize_actions(self, actions: list[Action]) -> list[dict[str, Any]]:

oagi/handler/pyautogui_action_handler.py

@@ -250,8 +250,8 @@ class PyautoguiActionHandler:
                 )
                 pyautogui.scroll(scroll_amount)
 
-            case ActionType.FINISH:
-                # Task completion - reset handler state
+            case ActionType.FINISH | ActionType.FAIL:
+                # Task completion or infeasible - reset handler state
                 self.reset()
 
             case ActionType.WAIT:

oagi/handler/ydotool_action_handler.py

@@ -164,8 +164,8 @@ class YdotoolActionHandler(Ydotool):
                 text = self.caps_manager.transform_text(text)
                 self._run_ydotool(["type", text], count=count)
 
-            case ActionType.FINISH:
-                # Task completion - reset handler state
+            case ActionType.FINISH | ActionType.FAIL:
+                # Task completion or infeasible - reset handler state
                 self.reset()
 
             case ActionType.WAIT:

oagi/server/socketio_server.py

@@ -364,7 +364,7 @@ class SessionNamespace(socketio.AsyncNamespace):
                     timeout=self.config.socketio_timeout,
                 )
 
-            case ActionType.FINISH:
+            case ActionType.FINISH | ActionType.FAIL:
                 return await self.call(
                     "finish",
                     FinishEventData(**common).model_dump(),

oagi/types/models/action.py

@@ -22,6 +22,7 @@ class ActionType(str, Enum):
     TYPE = "type"
     SCROLL = "scroll"
     FINISH = "finish"
+    FAIL = "fail"
     WAIT = "wait"
     CALL_USER = "call_user"
 

oagi/utils/output_parser.py

@@ -45,7 +45,7 @@ def parse_raw_output(raw_output: str) -> Step:
             parsed_action = _parse_action(action_text.strip())
             if parsed_action:
                 actions.append(parsed_action)
-                if parsed_action.type == ActionType.FINISH:
+                if parsed_action.type in (ActionType.FINISH, ActionType.FAIL):
                     stop = True
 
     return Step(reason=reason, actions=actions, stop=stop)
@@ -105,6 +105,7 @@ def _parse_action(action_text: str) -> Action | None:
     - scroll(x, y, direction, c) # scroll at position
     - wait() # wait for a while
     - finish() # indicate task is finished
+    - fail() # indicate task is infeasible
 
     Args:
         action_text: String representation of a single action

oagi/utils/prompt_builder.py

@@ -24,6 +24,7 @@ In the action field, you have the following action formats:
 8. scroll(x, y, direction, c) # scroll the mouse at position (x, y) in the direction of up or down for c times, where x and y are integers normalized between 0 and 1000
 9. wait() # wait for a while
 10. finish() # indicate the task is finished
+11. fail() # indicate the task is infeasible
 
 Directly output the text beginning with <|think_start|>, no additional text is needed for this scenario.
 

{oagi_core-0.14.2.dist-info → oagi_core-0.15.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: oagi-core
-Version: 0.14.2
+Version: 0.15.0
 Summary: Official API of OpenAGI Foundation
 Project-URL: Homepage, https://github.com/agiopen-org/oagi
 Author-email: OpenAGI Foundation <contact@agiopen.org>

{oagi_core-0.14.2.dist-info → oagi_core-0.15.0.dist-info}/RECORD

@@ -39,7 +39,7 @@ oagi/client/base.py,sha256=CWAvE0AcpL8HD_i00n7Fq53AIAQGhBhS_n6LifUCqxE,14736
 oagi/client/sync.py,sha256=4xNqqNihXmgLU385h22mMJ9wmmlw-jeOdWI4fmpEpTk,9369
 oagi/converters/__init__.py,sha256=4ADgInzAQNCvghXT4cKYt8zUnj-V-szjzRnrxJRE5Tw,1875
 oagi/converters/base.py,sha256=0wHVMf9xAqVidBD_VtsqfLDlBPOqUADt6or4JGAha1A,9096
-oagi/converters/oagi.py,sha256=tKvT5Pqq1gMqkVPdqU7p6su8r6IeU5-B4A7hvbHFmMA,7437
+oagi/converters/oagi.py,sha256=iunNs-t9gNU8oFgjMAjNTn1wNC-Z8Ca4pg1JRrSCYHE,7635
 oagi/handler/__init__.py,sha256=ZMQIeN_uJKUK_dn0w7ggsPfdRzzwts7G-Sppsrt22Lg,2528
 oagi/handler/_macos.py,sha256=Gs8GrhA_WAyv9Yw0D41duliP32Xk6vouyMeWjWJJT90,5187
 oagi/handler/_windows.py,sha256=MSgPDYEOetSjbn9eJDSrdzBVlUGgGsTlegaTDc4C4Ss,2828
@@ -49,19 +49,19 @@ oagi/handler/async_screenshot_maker.py,sha256=_myV4Rq6X_evCOuatalFSW5nsUDXi_0ej0
 oagi/handler/async_ydotool_action_handler.py,sha256=HB4QQk3OaG08g37eLb3EwsnkWKWPrpDei0ZsnBxrGZY,2159
 oagi/handler/capslock_manager.py,sha256=40LzWt1_1wbncF5koUTdbd9V3eo5Ex_mEWwjtEmHAf4,1878
 oagi/handler/pil_image.py,sha256=s8UGZ6ALbmOxRO2GL1EUFN7_6ZEFseSE9OHABCe7wek,5380
-oagi/handler/pyautogui_action_handler.py,sha256=vA9c2YGV1dNNx3F4a_MGnpS7O4Ww0A0sWxfvgNTMjnc,11162
+oagi/handler/pyautogui_action_handler.py,sha256=Mk4r2tcQar9NcalUYGKiTy2_ySe-NaxO_QwCHVlQrKI,11194
 oagi/handler/screen_manager.py,sha256=FV0-6ZyTVv9yZlAg4Krga0xW9O_LDsk1iaCJjWgET-g,6565
 oagi/handler/screenshot_maker.py,sha256=740k7NjDRKW6KwVqy_nVoczgVuw9_yTKM0gLFKB1iNs,1600
 oagi/handler/utils.py,sha256=WnYvPkpiNYDnv4EDLfOTdO5gEGuJVpB42G0HQkp6aEg,18173
 oagi/handler/wayland_support.py,sha256=qUIAQMqc3wp1VIypVmZjFDYT8t0yH0QvikTTV8pD-XA,7905
-oagi/handler/ydotool_action_handler.py,sha256=gH3ujZgwc6722ZqKEMqibzH67PCGbw8paMqNP-wM5Sc,8996
+oagi/handler/ydotool_action_handler.py,sha256=eDxhmHoAI5bln5plfnzZHrc8MYAihycGfEzXux8H72M,9028
 oagi/server/__init__.py,sha256=uZx8u3vJUb87kkNzwmmVrgAgbqRu0WxyMIQCLSx56kk,452
 oagi/server/agent_wrappers.py,sha256=j8va0A7u80bzOM82nndAplK1uaO_T3kufHWScK6kfWM,3263
 oagi/server/config.py,sha256=AJ1PLKuxrc6pRuur1hm5DwG2g2otxPwOCfKgzIACkSk,1691
 oagi/server/main.py,sha256=jnTxk7Prc5CzlsUnkBNJp4MOoYN-7HN_Be_m1d3COa8,4829
 oagi/server/models.py,sha256=DXjuf5icpCOgCUGMzzoLfRCoreM541KBWKBZnCk5_S0,2688
 oagi/server/session_store.py,sha256=l7t31rNWuZkIPLnaqrllVusHkJkE8j50PMfyb1di9mI,3750
-oagi/server/socketio_server.py,sha256=8RRf8mAmsArOX2nWylT0g5T5On0gzMod0TWRmk0vrgA,14218
+oagi/server/socketio_server.py,sha256=Fs-8p1LYPrSt226afz2KLjqoUAb0pCT-uQP72GgaV-o,14236
 oagi/task/__init__.py,sha256=8l3z5nxA3RtGHP94Iu4ot1Wo3Lx-U7_Led2CsVwYINg,760
 oagi/types/__init__.py,sha256=_UyzzRnoKvp00BUBjxW9Tv3_xBNf8Lxb2PUC2DkjOkg,1384
 oagi/types/action_handler.py,sha256=NH8E-m5qpGqWcXzTSWfF7W0Xdp8SkzJsbhCmQ0B96cg,1075
@@ -72,15 +72,15 @@ oagi/types/image_provider.py,sha256=IhKEnwCGZ5l_rO3AvJ6xv5RZMTmTDmqsFRynI9h0R_M,
 oagi/types/step_observer.py,sha256=E7igVqpOeoizUkhXbGRRX80ZOuqoM-zcRyjNyOXwWc8,2380
 oagi/types/url.py,sha256=145jLl3yecFBVKhJDbrR63C48D3l9_w0kpA_8C_gM78,868
 oagi/types/models/__init__.py,sha256=VcNrVQvw9p8igBunOv3LQBPnRpp5WEcWBf1Nr9FGkeI,843
-oagi/types/models/action.py,sha256=s3oPBCtbVAmavArjFZBEbL71QyW_akUrXpEDJuHqkYI,2583
+oagi/types/models/action.py,sha256=BcyXus3K_cHNEOME8YAbxm7gXvx7L-4syGLbtqGV-eQ,2601
 oagi/types/models/client.py,sha256=5fUZVTPviTunoh2KXM3jmLPtPIrvPwrr8o2bR6Phj5M,1156
 oagi/types/models/image_config.py,sha256=tl6abVg_-IAPLwpaWprgknXu7wRWriMg-AEVyUX73v0,1567
 oagi/types/models/step.py,sha256=RSI4H_2rrUBq_xyCoWKaq7JHdJWNobtQppaKC1l0aWU,471
 oagi/utils/__init__.py,sha256=vHXyX66hEsf33OJJkmZSUjaTYU0UngfbtjcZgxfOj3A,441
-oagi/utils/output_parser.py,sha256=U7vzmoD8pyzDg23z3vy-L9a_jKPsAlr3x8lIdPszrY8,5322
-oagi/utils/prompt_builder.py,sha256=_Q1HY82YUrq3jSCTZ3Rszu3qmI3Wn_fmq8hf14NuwQM,2180
-oagi_core-0.14.2.dist-info/METADATA,sha256=rb_8vO8vmAfY2wgFWHaO2OqukhFZYYO2KVPBq5SPuGM,16854
-oagi_core-0.14.2.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-oagi_core-0.14.2.dist-info/entry_points.txt,sha256=zzgsOSWX6aN3KUB0Z1it8DMxFFBJBqmZVqMVAJRjYuw,44
-oagi_core-0.14.2.dist-info/licenses/LICENSE,sha256=sy5DLA2M29jFT4UfWsuBF9BAr3FnRkYtnAu6oDZiIf8,1075
-oagi_core-0.14.2.dist-info/RECORD,,
+oagi/utils/output_parser.py,sha256=X75n20eJ2dG9sIragq5wjwQ8nw5V3-c_ksoN6N7sYvs,5384
+oagi/utils/prompt_builder.py,sha256=ILTiSnTNCU6J2zoA7aP4uwNKhi_HKt9WvVTfeY68Tt4,2225
+oagi_core-0.15.0.dist-info/METADATA,sha256=nZkxSJ1gg-eRqdBzKTcmvmvrysFw1fmTdjL074Q0u-s,16854
+oagi_core-0.15.0.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
+oagi_core-0.15.0.dist-info/entry_points.txt,sha256=zzgsOSWX6aN3KUB0Z1it8DMxFFBJBqmZVqMVAJRjYuw,44
+oagi_core-0.15.0.dist-info/licenses/LICENSE,sha256=sy5DLA2M29jFT4UfWsuBF9BAr3FnRkYtnAu6oDZiIf8,1075
+oagi_core-0.15.0.dist-info/RECORD,,