janito 3.1.0__py3-none-any.whl → 3.2.0__py3-none-any.whl

janito/tools/loop_protection_decorator.py

@@ -1,143 +1,140 @@
 import functools
 import time
 import threading
-from typing import Callable, Any
-from janito.tools.loop_protection import LoopProtection
-from janito.tools.tool_use_tracker import normalize_path
-
+from typing import Any, Tuple
 
 # Global tracking for decorator-based loop protection
 _decorator_call_tracker = {}
 _decorator_call_tracker_lock = threading.Lock()
 
 
+def _normalize_key_value(key_field: str, key_value: Any) -> Any:
+    """Normalize key values, especially paths, so different representations map to the same key."""
+    if key_value is None:
+        return None
+
+    try:
+        if isinstance(key_field, str) and "path" in key_field.lower():
+            from janito.tools.tool_use_tracker import (
+                normalize_path as _norm,  # reuse existing normalization
+            )
+
+            if isinstance(key_value, str):
+                return _norm(key_value)
+            if isinstance(key_value, (list, tuple)):
+                return tuple(_norm(v) if isinstance(v, str) else v for v in key_value)
+    except Exception:
+        # Best-effort normalization – fall back to original value
+        pass
+
+    return key_value
+
+
+def _get_param_value(func, args, kwargs, key_field: str):
+    """Extract the watched parameter value from args/kwargs using function signature."""
+    if key_field in kwargs:
+        return kwargs[key_field]
+
+    # Handle positional arguments by mapping to parameter names
+    if len(args) > 1:  # args[0] is self
+        import inspect
+
+        try:
+            sig = inspect.signature(func)
+            param_names = list(sig.parameters.keys())
+            if key_field in param_names:
+                idx = param_names.index(key_field)
+                if idx < len(args):
+                    return args[idx]
+        except Exception:
+            return None
+
+    return None
+
+
+def _determine_operation_name(func, args, kwargs, key_field: str) -> str:
+    """Build the operation name for rate limiting, optionally including a normalized key value."""
+    if key_field:
+        raw_value = _get_param_value(func, args, kwargs, key_field)
+        if raw_value is not None:
+            norm_value = _normalize_key_value(key_field, raw_value)
+            return f"{func.__name__}_{norm_value}"
+    return func.__name__
+
+
+def _check_and_record(
+    op_name: str,
+    current_time: float,
+    time_window: float,
+    max_calls: int,
+    tool_instance: Any,
+) -> Tuple[bool, str]:
+    """Check loop limits for op_name and record the call. Returns (exceeded, message)."""
+    with _decorator_call_tracker_lock:
+        # Clean old timestamps
+        if op_name in _decorator_call_tracker:
+            _decorator_call_tracker[op_name] = [
+                ts
+                for ts in _decorator_call_tracker[op_name]
+                if current_time - ts <= time_window
+            ]
+
+        # Check limit
+        if (
+            op_name in _decorator_call_tracker
+            and len(_decorator_call_tracker[op_name]) >= max_calls
+        ):
+            if all(
+                current_time - ts <= time_window
+                for ts in _decorator_call_tracker[op_name]
+            ):
+                msg = (
+                    f"Loop protection: Too many {op_name} operations in a short time period "
+                    f"({max_calls} calls in {time_window}s). Please try a different approach or wait before retrying."
+                )
+                if hasattr(tool_instance, "report_error"):
+                    try:
+                        tool_instance.report_error(msg)
+                    except Exception:
+                        pass
+                return True, msg
+
+        # Record this call
+        if op_name not in _decorator_call_tracker:
+            _decorator_call_tracker[op_name] = []
+        _decorator_call_tracker[op_name].append(current_time)
+
+    return False, ""
+
+
 def protect_against_loops(
     max_calls: int = 5, time_window: float = 10.0, key_field: str = None
 ):
     """
     Decorator that adds loop protection to tool run methods.
 
-    This decorator monitors tool executions and prevents excessive calls within
-    a configurable time window. It helps prevent infinite loops or excessive
-    resource consumption when tools are called repeatedly.
-
-    When the configured limits are exceeded, the decorator raises a RuntimeError
-    with a descriptive message. This exception will propagate up the call stack
-    unless caught by a try/except block in the calling code.
-
-    The decorator works by:
-    1. Tracking the number of calls to the decorated function
-    2. Checking if the calls exceed the configured limits
-    3. Raising a RuntimeError if a potential loop is detected
-    4. Allowing the method to proceed normally if the operation is safe
-
-    Args:
-        max_calls (int): Maximum number of calls allowed within the time window.
-                        Defaults to 5 calls.
-        time_window (float): Time window in seconds for detecting excessive calls.
-                            Defaults to 10.0 seconds.
-        key_field (str, optional): The parameter name to use for key matching instead of function name.
-                                 If provided, the decorator will track calls based on the value of this
-                                 parameter rather than the function name. Useful for tools that operate
-                                 on specific files or resources.
-
-    Example:
-        >>> @protect_against_loops(max_calls=3, time_window=5.0)
-        >>> def run(self, path: str) -> str:
-        >>>     # Implementation here
-        >>>     pass
-
-        >>> @protect_against_loops(max_calls=10, time_window=30.0)
-        >>> def run(self, file_paths: list) -> str:
-        >>>     # Implementation here
-        >>>     pass
-
-        >>> @protect_against_loops(max_calls=5, time_window=10.0, key_field='path')
-        >>> def run(self, path: str) -> str:
-        >>>     # This will track calls per unique path value
-        >>>     pass
-
-    Note:
-        When loop protection is triggered, a RuntimeError will be raised with a
-        descriptive message. This exception will propagate up the call stack
-        unless caught by a try/except block in the calling code.
+    Tracks calls within a sliding time window and prevents excessive repeated operations.
+    When key_field is provided, the limit is applied per unique normalized value of that parameter
+    (e.g., per-path protection for file tools).
     """
 
     def decorator(func):
         @functools.wraps(func)
         def wrapper(*args, **kwargs):
-            # Get the tool instance (self)
+            # Methods should always have self; if not, execute directly.
             if not args:
-                # This shouldn't happen in normal usage as methods need self
                 return func(*args, **kwargs)
 
-            # Determine the operation key
-            if key_field:
-                # Use the key_field parameter value as the operation key
-                key_value = None
-                if key_field in kwargs:
-                    key_value = kwargs[key_field]
-                elif len(args) > 1:
-                    # Handle positional arguments - need to map parameter names
-                    import inspect
-
-                    try:
-                        sig = inspect.signature(func)
-                        param_names = list(sig.parameters.keys())
-                        if key_field in param_names:
-                            field_index = param_names.index(key_field)
-                            if field_index < len(args):
-                                key_value = args[field_index]
-                    except (ValueError, TypeError):
-                        pass
-
-                if key_value is not None:
-                    op_name = f"{func.__name__}_{key_value}"
-                else:
-                    op_name = func.__name__
-            else:
-                # Use the function name as the operation name
-                op_name = func.__name__
-
-            # Check call limits
-            current_time = time.time()
-
-            with _decorator_call_tracker_lock:
-                # Clean up old entries outside the time window
-                if op_name in _decorator_call_tracker:
-                    _decorator_call_tracker[op_name] = [
-                        timestamp
-                        for timestamp in _decorator_call_tracker[op_name]
-                        if current_time - timestamp <= time_window
-                    ]
-
-                # Check if we're exceeding the limit
-                if op_name in _decorator_call_tracker:
-                    if len(_decorator_call_tracker[op_name]) >= max_calls:
-                        # Check if all recent calls are within the time window
-                        if all(
-                            current_time - timestamp <= time_window
-                            for timestamp in _decorator_call_tracker[op_name]
-                        ):
-                            # Return loop protection message as string instead of raising exception
-                            error_msg = f"Loop protection: Too many {op_name} operations in a short time period ({max_calls} calls in {time_window}s). Please try a different approach or wait before retrying."
-
-                            # Try to report the error through the tool's reporting mechanism
-                            tool_instance = args[0] if args else None
-                            if hasattr(tool_instance, "report_error"):
-                                try:
-                                    tool_instance.report_error(error_msg)
-                                except Exception:
-                                    pass  # If reporting fails, we still return the message
-
-                            return error_msg
-
-                # Record this call
-                if op_name not in _decorator_call_tracker:
-                    _decorator_call_tracker[op_name] = []
-                _decorator_call_tracker[op_name].append(current_time)
-
-            # Proceed with the original function
+            op_name = _determine_operation_name(func, args, kwargs, key_field)
+            exceeded, msg = _check_and_record(
+                op_name=op_name,
+                current_time=time.time(),
+                time_window=time_window,
+                max_calls=max_calls,
+                tool_instance=args[0],
+            )
+            if exceeded:
+                return msg
             return func(*args, **kwargs)
 
         return wrapper

{janito-3.1.0.dist-info → janito-3.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: janito
-Version: 3.1.0
+Version: 3.2.0
 Summary: A new Python package called janito.
 Author-email: João Pinto <janito@ikignosis.org>
 Project-URL: Homepage, https://github.com/ikignosis/janito

{janito-3.1.0.dist-info → janito-3.2.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-janito/README.md,sha256=Kd4GcEYIt04520J2AIMCZbp1enAGRzlLswCfyi1g5AY,4737
+janito/README.md,sha256=Wrt6pMVT9UaXsFpoE3m9hgn28OAHWhkZ_vwWTNcSH8Q,4947
 janito/__init__.py,sha256=a0pFui3A_AfWJiUfg93yE-Vf4868bqG3y9yg2fkTIuY,244
 janito/__main__.py,sha256=lPQ8kAyYfyeS1KopmJ8EVY5g1YswlIqCS615mM_B_rM,70
 janito/_version.py,sha256=PtAVr2K9fOS5sv6aXzmcb7UaR5NLGMFOofL7Ndjh75o,2344
@@ -30,17 +30,17 @@ janito/cli/config.py,sha256=HkZ14701HzIqrvaNyDcDhGlVHfpX_uHlLp2rHmhRm_k,872
 janito/cli/console.py,sha256=gJolqzWL7jEPLxeuH-CwBDRFpXt976KdZOEAB2tdBDs,64
 janito/cli/main.py,sha256=s5odou0txf8pzTf1ADk2yV7T5m8B6cejJ81e7iu776U,312
 janito/cli/main_cli.py,sha256=_OOQqeLiqvmYeB_928Av920Gk43rbXecMIOTL6JeT0Y,16674
-janito/cli/prompt_core.py,sha256=RRDhmiZTF1X-sxeGag2ODT9DSgtVDlqVwBlzl2voIIo,12082
+janito/cli/prompt_core.py,sha256=GSpq0_J-PS455SPkF-nCe9WtOQqseR08DWN7XhGIJXA,12044
 janito/cli/prompt_handler.py,sha256=SnPTlL64noeAMGlI08VBDD5IDD8jlVMIYA4-fS8zVLg,215
 janito/cli/prompt_setup.py,sha256=s48gvNfZhKjsEhf4EzL1tKIGm4wDidPMDvlM6TAPYes,2116
 janito/cli/rich_terminal_reporter.py,sha256=Hitf5U13gncad4GPVAcDMfdSwlfzQzOn9KdeX4TjTWU,6806
 janito/cli/utils.py,sha256=plCQiDKIf3V8mFhhX5H9-MF2W86i-xRdWf8Xi117Z0w,677
 janito/cli/verbose_output.py,sha256=wY_B4of5e8Vv7w1fRwOZzNGU2JqbMdcFnGjtEr4hLus,7686
-janito/cli/chat_mode/bindings.py,sha256=m2KA-0TKMPpmfaYF3XQ9qsAIfDRJ40a1FGVoPs8FaHo,2074
+janito/cli/chat_mode/bindings.py,sha256=vyaT5k454dSqxXPFWW0bOCHwBDCpTuxhcAu0AsDO-Gg,2013
 janito/cli/chat_mode/chat_entry.py,sha256=RFdPd23jsA2DMHRacpjAdwI_1dFBaWrtnwyQEgb2fHA,475
 janito/cli/chat_mode/prompt_style.py,sha256=vsqQ9xxmrYjj1pWuVe9CayQf39fo2EIXrkKPkflSVn4,805
 janito/cli/chat_mode/script_runner.py,sha256=WFTFVWzg_VQrD2Ujj02XWjscfGgHwmjBeRxaEjWw9ps,6505
-janito/cli/chat_mode/session.py,sha256=7RSFM6VccZLEHPaZTmZCpyEUe0JArto9DoHQCiYkUDg,18777
+janito/cli/chat_mode/session.py,sha256=QYJ2wpA3IlB756ooFXTSkUVa5mOWgllAkONG3Dgqm8I,19002
 janito/cli/chat_mode/toolbar.py,sha256=SzdWAJdcY1g2rTPZCPL6G5X8jO6ZQYjwko2-nw54_nU,3397
 janito/cli/chat_mode/shell/autocomplete.py,sha256=lE68MaVaodbA2VfUM0_YLqQVLBJAE_BJsd5cMtwuD-g,793
 janito/cli/chat_mode/shell/commands.bak.zip,sha256=I7GFjXg2ORT5NzFpicH1vQ3kchhduQsZinzqo0xO8wU,74238
@@ -73,7 +73,7 @@ janito/cli/chat_mode/shell/commands/utility.py,sha256=K982P-UwgPLzpEvSuSBGwiQ3zC
 janito/cli/chat_mode/shell/commands/verbose.py,sha256=HDTe0NhdcjBuhh-eJSW8iLPDeeBO95K5iSDAMAljxa4,953
 janito/cli/chat_mode/shell/commands/write.py,sha256=NHPj2xe8icUBcpxALIoZZ1zAsX6bhBFqBhnQPqq7fHs,2341
 janito/cli/chat_mode/shell/commands/security/__init__.py,sha256=od-vkuI7LqmUqz2Q42YToWauRM6IPHGeNj14867yIgM,50
-janito/cli/chat_mode/shell/commands/security/allowed_sites.py,sha256=K_izmERZlumlTVxiTMvMXbMhADlJBvhyeeM5IGva_X8,3240
+janito/cli/chat_mode/shell/commands/security/allowed_sites.py,sha256=pmyQnLD7Do_CaIITDlZ9Md7PqSpQAhRdnnVMMdQVFGk,3679
 janito/cli/chat_mode/shell/session/__init__.py,sha256=uTYE_QpZFEn7v9QE5o1LdulpCWa9vmk0OsefbBGWg_c,37
 janito/cli/chat_mode/shell/session/history.py,sha256=tYav6GgjAZkvWhlI_rfG6OArNqW6Wn2DTv39Hb20QYc,1262
 janito/cli/chat_mode/shell/session/manager.py,sha256=MwD9reHsRaly0CyRB-S1JJ0wPKz2g8Xdj2VvlU35Hgc,1001
@@ -96,7 +96,7 @@ janito/cli/cli_commands/show_system_prompt.py,sha256=WQclY_bmJrHbIBRU1qx1WV4Vyoo
 janito/cli/core/__init__.py,sha256=YH95fhgY9yBX8RgqX9dSrEkl4exjV0T4rbmJ6xUpG-Y,196
 janito/cli/core/event_logger.py,sha256=1X6lR0Ax7AgF8HlPWFoY5Ystuu7Bh4ooTo78vXzeGB0,2008
 janito/cli/core/getters.py,sha256=53umV7aab6WrmcCle8WqU2aYnww7a7IiqtM1YZN0YvE,3016
-janito/cli/core/model_guesser.py,sha256=V7LBkIllSp_tP9-2B1gcl5b4b-La7mrOvE3AZQQm8lk,1716
+janito/cli/core/model_guesser.py,sha256=557c0FckGIVmPYCgp2hBNsjsmHAiORtoxvLTKnOk8kg,2082
 janito/cli/core/runner.py,sha256=gi8xke6re9AoHHNCivV50i0eUAliw8QTUdXyqMkMplM,9044
 janito/cli/core/setters.py,sha256=zjSUxy6iUzcrmEunFk7dA90KqbMaq2O7LTGP8wn2HxA,5378
 janito/cli/core/unsetters.py,sha256=FEw9gCt0vRvoCt0kRSNfVB2tzi_TqppJIx2nHPP59-k,2012
@@ -117,35 +117,35 @@ janito/event_bus/event.py,sha256=MtgcBPD7cvCuubiLIyo-BWcsNSO-941HLk6bScHTJtQ,427
 janito/event_bus/handler.py,sha256=RhBtT1E48VEM2-k8u3HYsESw7VX5qAgiB8ZTJeKXhHc,1322
 janito/event_bus/queue_bus.py,sha256=l4phun3pxXxi8ZlIq8ChYaiYDVO1PZeXoOzyi3vyu20,1558
 janito/i18n/__init__.py,sha256=6zCIu6pSQpoMJvIRK9oOD3pkzbNeJik3lFDXse0X6ag,994
-janito/i18n/it.py,sha256=jpWyCrwoZXxHaLEbmYL2B1ouOa854ecdCfpXq4mqroc,4052
+janito/i18n/it.py,sha256=57xW4YE1kkMz8oNO5fBqK_YllWkHT97asaThDsGsBdM,4097
 janito/i18n/messages.py,sha256=fBuwOTFoygyHPkYphm6Y0r1iE8497Z4iryVAmPhMEkg,1851
 janito/i18n/pt.py,sha256=NlTgpDSftUfFG7FGbs7TK54vQlJVMyaZDHGcWjelwMc,4168
 janito/llm/README.md,sha256=6GRqCu_a9va5HCB1YqNqbshyWKFyAGlnXugrjom-xj8,1213
 janito/llm/__init__.py,sha256=dpyVH51qVRCw-PDyAFLAxq0zd4jl5MDcuV6Cri0D-dQ,134
-janito/llm/agent.py,sha256=zUmax9uJCvfNMfzDLQjGDdCZMFmmXzaRz2M_cG0HdMo,21914
+janito/llm/agent.py,sha256=R3jzva-Er5W1TmHXHf9APxYB51H0z1vxOF6jVda7m7U,21940
 janito/llm/auth.py,sha256=8Dl_orUEPhn2X6XjkO2Nr-j1HFT2YDxk1qJl9hSFI88,2286
 janito/llm/auth_utils.py,sha256=mcPWT2p2kGMhvR9QsHqk84utDejPJh3uyjrDOJ0dKYA,1068
-janito/llm/cancellation_manager.py,sha256=lkMFIqXEc1PjU2a96rOIcxcHVRx4WvSr3gk_L9oumi4,2238
-janito/llm/driver.py,sha256=i6CIA4yEaMfsVJ0TIfwwO5S9gHn0IYyDxB9GjVa67og,10392
+janito/llm/cancellation_manager.py,sha256=u-hzuuVjQmLV15YPp3cZdF8KmyQLoLv8P5ZTvgYWr7o,2194
+janito/llm/driver.py,sha256=iVCYGUE5bqa_MTF6p_l2VUl_2y_-IOStNeC0IWfkA3I,10394
 janito/llm/driver_config.py,sha256=OW0ae49EfgKDqaThuDjZBiaN78voNzwiZ6szERMqJos,1406
 janito/llm/driver_config_builder.py,sha256=BvWGx7vaBR5NyvPY1XNAP3lAgo1uf-T25CSsIo2kkCU,1401
 janito/llm/driver_input.py,sha256=Zq7IO4KdQPUraeIo6XoOaRy1IdQAyYY15RQw4JU30uA,389
-janito/llm/enter_cancellation.py,sha256=NrySoeXM8M6PO6rMUPd9atW49GjPGF30YsTWIcAuZ7M,3393
+janito/llm/enter_cancellation.py,sha256=sE6yadsFGnKDQVBKenv1sF96wIcAP2LqymiUFJBlijU,3312
 janito/llm/message_parts.py,sha256=QY_0kDjaxdoErDgKPRPv1dNkkYJuXIBmHWNLiOEKAH4,1365
 janito/llm/model.py,sha256=EioBkdgn8hJ0iQaKN-0KbXlsrk3YKmwR9IbvoEbdVTE,1159
 janito/llm/provider.py,sha256=3FbhQPrWBSEoIdIi-5DWIh0DD_CM570EFf1NcuGyGko,7961
 janito/plugin_system/__init__.py,sha256=HoTBUooSTEsp_1FaBn-5BmzZX_p_982e4T_fCOeUlD0,290
 janito/plugin_system/base.py,sha256=Z0PSIj7R-hAKOeCSXC2JyBqm4rlsJoZSqkqxLe-juks,4346
-janito/plugin_system/core_loader.py,sha256=LPOJRQwSqjZ8P2G6sh5lN4enA8hc2An-kO4dgr8e0as,4361
-janito/plugin_system/core_loader_fixed.py,sha256=VQsEIucX-NFjAnimzzAtK1o3Y4R9gq_a9IuxSrhJZxU,4586
+janito/plugin_system/core_loader.py,sha256=3zhKPWWSFlThzaRTLjGDPI_DVNRafMP5LZ5r7ei6Jo0,6843
+janito/plugin_system/core_loader_fixed.py,sha256=3JZnEkM4i0x4k3SJhomtVevmNl4uWhozhVyh6rcMtvE,7159
 janito/plugins/__init__.py,sha256=q-z28oV-0BaagZ43f__qeg13R9oA7kK7XnVEUHNRZbs,910
-janito/plugins/auto_loader.py,sha256=8DRpPZtAUtP-et4Lzaam93MH4s_sqQXXKI8Ly5-GQf8,2329
+janito/plugins/auto_loader.py,sha256=-uVDTKQToGCw1nqwAxrt4IDvgP3z3pvZoC5EXFWNm_k,2288
 janito/plugins/auto_loader_fixed.py,sha256=3JnGDp1enombEHsR8spRDpVrD6tSPdudysWvhyuk5Ec,2304
 janito/plugins/builtin.py,sha256=kbIOVmqucJKyISC5kWcgda_6IhHGA6yWoxUghc1Qtk0,3409
 janito/plugins/config.py,sha256=ex5f1XsKPEgIO4DgJCohPzMKAQoUdx1OdSVU0FlSr5o,2331
-janito/plugins/core_adapter.py,sha256=WfFDb_DzG2gqNYlwlAaXVsh4VjIRZ5VPszhQFg0IXZs,1857
+janito/plugins/core_adapter.py,sha256=tFi9VYvb15n3yUGDF7ihALbjL7pz_PDeeEgu_3JFqTQ,4430
 janito/plugins/discovery.py,sha256=IGQAFPzzzZjlpMzPNdChD7ZJrCYN8QmvXPsvLBOSSjY,10120
-janito/plugins/discovery_core.py,sha256=O5OccNWNyrSXGeeTk5xSG0qbsjNsajclNNCiHljFRpI,1613
+janito/plugins/discovery_core.py,sha256=3pL8kinyFuz1owqIpZDYYIvj3RrJVJHulUa36Aqsc6g,1617
 janito/plugins/example_plugin.py,sha256=1B0PYOSFsb2ya2VCwHr1pMJC9ivUJ7t9TtQkc8lkaGU,3136
 janito/plugins/manager.py,sha256=R1B-2sUD5YFLOTnp4Pfx1wZ-3Hzff--PqaOJHfllc5g,8155
 janito/plugins/core/__init__.py,sha256=74-nOHG97Jo7cSm_sOLwYYhS0maB1kgKdB69-bmi03k,144
@@ -164,7 +164,7 @@ janito/plugins/core/codeanalyzer/tools/search_text/traverse_directory.py,sha256=
 janito/plugins/core/filemanager/__init__.py,sha256=waUhGQ2OL59Ooes4cQOOlQdBsFQSIffevJkcZq_kaCQ,3241
 janito/plugins/core/filemanager/tools/copy_file.py,sha256=SBJm19Ipe5dqRE1Mxl6JSrn4bNmfObVnDr5b1mcEu6c,3682
 janito/plugins/core/filemanager/tools/create_directory.py,sha256=LxwqQEsnOrEphCIoaMRRx9P9bu0MzidP3Fc5q6letxc,2584
-janito/plugins/core/filemanager/tools/create_file.py,sha256=nZf8iPScO9_nrvmHwXqOcqpLZkLABTh9uLVNddC4PCk,3760
+janito/plugins/core/filemanager/tools/create_file.py,sha256=MDMTt3ocp1Ejo3vo7K5Ht2cMPObXiQTr5OTtLv9qOuw,3821
 janito/plugins/core/filemanager/tools/delete_text_in_file.py,sha256=uEeedRxXAR7_CqUc_qhbEdM0OzRi_pgnP-iDjs2Zvjk,5087
 janito/plugins/core/filemanager/tools/find_files.py,sha256=Zbag3aP34vc7ffJh8bOqAwXj3KiZhV--uzTVHtNb-fI,6250
 janito/plugins/core/filemanager/tools/move_file.py,sha256=LMGm8bn3NNyIPJG4vrlO09smXQcgzA09EwoooZxkIA8,4695
@@ -203,9 +203,9 @@ janito/plugins/dev/visualization/tools/read_chart.py,sha256=qQebp_MEE_x2AL_pl85u
 janito/plugins/tools/__init__.py,sha256=vNqUVWA0guwAYuPgdmiDsjmgibj9siP0e61pfTHZ8-8,271
 janito/plugins/tools/ask_user.py,sha256=7Wgl_9XEPWty3qTG_xcQdwJWypXRorMv3WYM_AZDrBY,4050
 janito/plugins/tools/copy_file.py,sha256=A0LxkN9b4eDBD7Ww_4LO412kldbx-DlrUELUB-27jOk,3672
-janito/plugins/tools/core_tools_plugin.py,sha256=J186ZSA0FjZtAmzBwGYSrE7SFmO8lUEOCZ3apDg4RBA,2685
+janito/plugins/tools/core_tools_plugin.py,sha256=QgRE3KcbF-KgRR5y-ADYeuTTLDlenxuKM-68wliVfbs,2683
 janito/plugins/tools/create_directory.py,sha256=f8fccqwRR3xj_IJ7KZacsxBo2k754bLgVyAefC4jsnI,2574
-janito/plugins/tools/create_file.py,sha256=UaQbKUFl8LXMfNq1UlMjgdOo8b2LCC5EsgDVyGwk6fE,6368
+janito/plugins/tools/create_file.py,sha256=8yv1Mkxsg9KCE7o8B2e0fQdvqMcmBHohRV2z5AQ8fIs,6417
 janito/plugins/tools/decorators.py,sha256=BRAjjo4NF4_JxwPPVrrF2wtzsJXuZJkwv_QhZgPFMS4,382
 janito/plugins/tools/delete_text_in_file.py,sha256=nZb-QuJopA3NDfOW3BEsG6Aj9EaMlfpuEYiG9aGp4z4,5070
 janito/plugins/tools/fetch_url.py,sha256=hqtllaqx5rgZ-5wAih6-R1tvX5sIFUHy3DTP68JImQM,18202
@@ -257,7 +257,7 @@ janito/plugins/web/webtools/__init__.py,sha256=vGFtbZvV2DnooPmw4B8hHd0UgpVfNugLs
 janito/plugins/web/webtools/tools/fetch_url.py,sha256=VjB89FjLNrqLmOVL6wm1RHyixB3n-RViC0DJjW33iRM,17804
 janito/plugins/web/webtools/tools/open_html_in_browser.py,sha256=XqICIwVx5vEE77gHkaNAC-bAeEEy0DBmDksATiL-sRY,2101
 janito/plugins/web/webtools/tools/open_url.py,sha256=V3Sv7iLynUreLjVl5-bl-XFH_LzpTeBrS8-cvzp_7rM,1552
-janito/providers/__init__.py,sha256=EvOFeiqucAY9tgCosJ81p0QA6wQwMT1cR3EeIGrhSQQ,528
+janito/providers/__init__.py,sha256=LZcyllhmGyOXQ8duQA2Qbg0fSrahog5ATNZppNOxFK0,571
 janito/providers/dashscope.bak.zip,sha256=BwXxRmZreEivvRtmqbr5BR62IFVlNjAf4y6DrF2BVJo,5998
 janito/providers/registry.py,sha256=Ygwv9eVrTXOKhv0EKxSWQXO5WMHvajWE2Q_Lc3p7dKo,730
 janito/providers/alibaba/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -290,6 +290,9 @@ janito/providers/openai/__init__.py,sha256=f0m16-sIqScjL9Mp4A0CQBZx6H3PTEy0cnE08
 janito/providers/openai/model_info.py,sha256=VTkq3xcx2vk0tXlFVHQxKeFzl-DL1T1J2elVOEwCdHI,4265
 janito/providers/openai/provider.py,sha256=PPr_qmSe5GyysnZCxhjeUVhE2LWKjKOSRel-8aaxq_U,4761
 janito/providers/openai/schema_generator.py,sha256=hTqeLcPTR8jeKn5DUUpo7b-EZ-V-g1WwXiX7MbHnFzE,2234
+janito/providers/together/__init__.py,sha256=8JguGMgLW_QUJ-G6VIypp_Uq6avi3LGwKWpEiyGRWOU,33
+janito/providers/together/model_info.py,sha256=4EsluZgPfZW68Uc9o5vDnUmo-hQAGIs5eTDWuR24kPg,2407
+janito/providers/together/provider.py,sha256=BiM8p8rlqPem_PHdOyXq08J3LZFrAKtP7PDqDSToLdI,3847
 janito/providers/zai/__init__.py,sha256=qtIr9_QBFaXG8xB6cRDGhS7se6ir11CWseI9azLMRBo,24
 janito/providers/zai/model_info.py,sha256=ldwD8enpxXv1G-YsDw4YJn31YsVueQ4vj5HgoYvnPxo,1183
 janito/providers/zai/provider.py,sha256=aKqDTdcwWk-FT70wTbTrTzlWx2NwRWkLoB64upiliU8,5066
@@ -304,11 +307,10 @@ janito/tools/__init__.py,sha256=PoMIw_JgsEGP5SO77mqsZFl0Z-p2W2WnyHaaAKSnirk,1961
 janito/tools/base.py,sha256=R38A9xWYh3JRYZMDSom2d1taNDy9J7HpLbZo9X2wH_o,316
 janito/tools/cli_initializer.py,sha256=KJbUL6_iAsaeBZl_AVrdtczSZRQBJ9RPZufHJVKwAtU,2632
 janito/tools/disabled_tools.py,sha256=Tx__16wtMWZ9z34cYLdH1gukwot5MCL-9kLjd5MPX6Y,2110
-janito/tools/function_adapter.py,sha256=kjU15jy2gLmKw__BRFe99lRrLCXoHdcgVMFf2W4LEw0,4870
 janito/tools/initialize.py,sha256=BSwzCPCmis2n4q5W3tWBEr4MgVS4tAwBjfKoNM4CefI,2002
 janito/tools/inspect_registry.py,sha256=Jo7PrMPRKLuR-j_mBAk9PBcTzeJf1eQrS1ChGofgQk0,538
 janito/tools/loop_protection.py,sha256=WQ2Cqt459vXvrO0T1EqkEHynHlRkPzfaC83RSmXzjkM,4718
-janito/tools/loop_protection_decorator.py,sha256=R1j2ouscKbVcDm2wlxRZ6zQuKExgj633ijeDq4j0oO0,6457
+janito/tools/loop_protection_decorator.py,sha256=ZCccrg24B_titDeOhaEORPq8wnRyLf1bdb8YEHK25lo,4957
 janito/tools/outline_file.bak.zip,sha256=EeI2cBXCwTdWVgJDNiroxKeYlkjwo6NLKeXz3J-2iZI,15607
 janito/tools/path_security.py,sha256=40b0hV0X3449Dht93A04Q3c9AYSsBQsBFy2BjzM83lA,8214
 janito/tools/path_utils.py,sha256=Rg5GE4kiu7rky6I2KTtivW6wPXzc9Qmq0_lOjwkPYlI,832
@@ -325,9 +327,9 @@ janito/tools/url_whitelist.py,sha256=0CPLkHTp5HgnwgjxwgXnJmwPeZQ30q4j3YjW59hiUUE
 janito/tools/adapters/__init__.py,sha256=H25uYM2ETMLKpKPPEPAu9-AFjxkKfSyfx3pnoXSQlVA,255
 janito/tools/adapters/local/__init__.py,sha256=1DVnka4iEQp8Xrs7rJVVx45fPpuVahjTFmuJhv-gN8s,249
 janito/tools/adapters/local/adapter.py,sha256=u4nLHTaYdwZXMi1J8lsKvlG6rOmdq9xjey_3zeyCG4k,8707
-janito-3.1.0.dist-info/licenses/LICENSE,sha256=dXV4fOF2ZErugtN8l_Nrj5tsRTYgtjE3cgiya0UfBio,11356
-janito-3.1.0.dist-info/METADATA,sha256=lbkmz3Msw06EXZzWwc_Ur9At-zlyvSVNGqRv8tkp0eI,2265
-janito-3.1.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-janito-3.1.0.dist-info/entry_points.txt,sha256=wIo5zZxbmu4fC-ZMrsKD0T0vq7IqkOOLYhrqRGypkx4,48
-janito-3.1.0.dist-info/top_level.txt,sha256=m0NaVCq0-ivxbazE2-ND0EA9Hmuijj_OGkmCbnBcCig,7
-janito-3.1.0.dist-info/RECORD,,
+janito-3.2.0.dist-info/licenses/LICENSE,sha256=dXV4fOF2ZErugtN8l_Nrj5tsRTYgtjE3cgiya0UfBio,11356
+janito-3.2.0.dist-info/METADATA,sha256=FgU9kTrodtpQrm-Ky5X_IArx59u80QV--sW2HHTmw1M,2265
+janito-3.2.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+janito-3.2.0.dist-info/entry_points.txt,sha256=wIo5zZxbmu4fC-ZMrsKD0T0vq7IqkOOLYhrqRGypkx4,48
+janito-3.2.0.dist-info/top_level.txt,sha256=m0NaVCq0-ivxbazE2-ND0EA9Hmuijj_OGkmCbnBcCig,7
+janito-3.2.0.dist-info/RECORD,,

janito/tools/function_adapter.py

@@ -1,142 +0,0 @@
-"""
-Function-to-Tool adapter for core plugins.
-
-This module provides a way to wrap function-based tools into proper ToolBase classes.
-"""
-
-import inspect
-from typing import Any, Dict, List, Optional, get_type_hints
-from janito.tools.tool_base import ToolBase, ToolPermissions
-
-
-class FunctionToolAdapter(ToolBase):
-    """Adapter that wraps a function into a ToolBase class."""
-
-    def __init__(self, func, tool_name: str = None, description: str = None):
-        super().__init__()
-        self._func = func
-        self.tool_name = tool_name or getattr(func, "tool_name", func.__name__)
-        self._description = description or func.__doc__ or f"Tool: {self.tool_name}"
-        self.permissions = ToolPermissions(read=True, write=True, execute=True)
-
-    def run(
-        self,
-        path: str = None,
-        content: str = None,
-        overwrite: bool = None,
-        sources: str = None,
-        target: str = None,
-        recursive: bool = None,
-        from_line: int = None,
-        to_line: int = None,
-        search_text: str = None,
-        replacement_text: str = None,
-        use_regex: bool = None,
-        case_sensitive: bool = None,
-        max_depth: int = None,
-        include_gitignored: bool = None,
-        timeout: int = None,
-        require_confirmation: bool = None,
-        data: dict = None,
-        title: str = None,
-        width: int = None,
-        height: int = None,
-        query: str = None,
-        paths: str = None,
-        src_path: str = None,
-        dest_path: str = None,
-        code: str = None,
-        pattern: str = None,
-    ) -> str:
-        """Execute the wrapped function."""
-        # Build kwargs from non-None parameters
-        import inspect
-
-        sig = inspect.signature(self._func)
-        filtered_kwargs = {}
-
-        # Map parameter names to their actual values
-        param_map = {
-            "path": path,
-            "content": content,
-            "overwrite": overwrite,
-            "sources": sources,
-            "target": target,
-            "recursive": recursive,
-            "from_line": from_line,
-            "to_line": to_line,
-            "search_text": search_text,
-            "replacement_text": replacement_text,
-            "use_regex": use_regex,
-            "case_sensitive": case_sensitive,
-            "max_depth": max_depth,
-            "include_gitignored": include_gitignored,
-            "timeout": timeout,
-            "require_confirmation": require_confirmation,
-            "data": data,
-            "title": title,
-            "width": width,
-            "height": height,
-            "query": query,
-            "paths": paths,
-            "src_path": src_path,
-            "dest_path": dest_path,
-            "code": code,
-            "pattern": pattern,
-        }
-
-        # Only include parameters that exist in the function signature
-        for name, param in sig.parameters.items():
-            if name in param_map and param_map[name] is not None:
-                filtered_kwargs[name] = param_map[name]
-
-        result = self._func(**filtered_kwargs)
-        return str(result) if result is not None else ""
-
-    def get_signature(self) -> Dict[str, Any]:
-        """Get function signature for documentation."""
-        sig = inspect.signature(self._func)
-        type_hints = get_type_hints(self._func)
-
-        params = {}
-        for name, param in sig.parameters.items():
-            param_info = {
-                "type": str(type_hints.get(name, Any)),
-                "default": (
-                    param.default if param.default != inspect.Parameter.empty else None
-                ),
-                "required": param.default == inspect.Parameter.empty,
-            }
-            params[name] = param_info
-
-        return {
-            "name": self.tool_name,
-            "description": self._description,
-            "parameters": params,
-            "return_type": str(type_hints.get("return", Any)),
-        }
-
-
-def create_function_tool(func, tool_name: str = None, description: str = None) -> type:
-    """
-    Create a ToolBase class from a function.
-
-    Args:
-        func: The function to wrap
-        tool_name: Optional custom tool name
-        description: Optional custom description
-
-    Returns:
-        A ToolBase subclass that wraps the function
-    """
-    # Resolve tool_name in outer scope
-    resolved_tool_name = tool_name or getattr(func, "tool_name", func.__name__)
-
-    class DynamicFunctionTool(FunctionToolAdapter):
-        permissions = ToolPermissions(read=True, write=True, execute=True)
-        tool_name = resolved_tool_name
-
-        def __init__(self):
-            super().__init__(func, DynamicFunctionTool.tool_name, description)
-
-    return DynamicFunctionTool