alita-sdk 0.3.532__py3-none-any.whl → 0.3.602__py3-none-any.whl

alita_sdk/tools/confluence/__init__.py

@@ -10,6 +10,7 @@ from ..utils import clean_string, get_max_toolkit_length, parse_list, check_conn
 from ...configurations.confluence import ConfluenceConfiguration
 from ...configurations.pgvector import PgVectorConfiguration
 import requests
+from ...runtime.utils.constants import TOOLKIT_NAME_META, TOOL_NAME_META, TOOLKIT_TYPE_META
 
 name = "confluence"
 
@@ -70,16 +71,16 @@ class ConfluenceToolkit(BaseToolkit):
             name,
             space=(str, Field(description="Space")),
             cloud=(bool, Field(description="Hosting Option", json_schema_extra={'configuration': True})),
-            limit=(int, Field(description="Pages limit per request", default=5)),
+            limit=(int, Field(description="Pages limit per request", default=5, gt=0)),
             labels=(Optional[str], Field(
                 description="List of comma separated labels used for labeling of agent's created or updated entities",
                 default=None,
                 examples="alita,elitea;another-label"
             )),
-            max_pages=(int, Field(description="Max total pages", default=10)),
-            number_of_retries=(int, Field(description="Number of retries", default=2)),
-            min_retry_seconds=(int, Field(description="Min retry, sec", default=10)),
-            max_retry_seconds=(int, Field(description="Max retry, sec", default=60)),
+            max_pages=(int, Field(description="Max total pages", default=10, gt=0)),
+            number_of_retries=(int, Field(description="Number of retries", default=2, ge=0)),
+            min_retry_seconds=(int, Field(description="Min retry, sec", default=10, ge=0)),
+            max_retry_seconds=(int, Field(description="Max retry, sec", default=60, ge=0)),
             # optional field for custom headers as dictionary
             custom_headers=(Optional[dict], Field(description="Custom headers for API requests", default={})),
             confluence_configuration=(ConfluenceConfiguration, Field(description="Confluence Configuration", json_schema_extra={'configuration_types': ['confluence']})),
@@ -131,7 +132,7 @@ class ConfluenceToolkit(BaseToolkit):
                 name=tool["name"],
                 description=description,
                 args_schema=tool["args_schema"],
-                metadata={"toolkit_name": toolkit_name} if toolkit_name else {}
+                metadata={TOOLKIT_NAME_META: toolkit_name, TOOLKIT_TYPE_META: name, TOOL_NAME_META: tool["name"]} if toolkit_name else {TOOL_NAME_META: tool["name"]}
             ))
         return cls(tools=tools)
 

alita_sdk/tools/confluence/api_wrapper.py

@@ -962,6 +962,9 @@ class ConfluenceAPIWrapper(NonCodeIndexerToolkit):
                     created_date = hist.get('createdDate', '') if hist else attachment.get('created', '')
                     last_updated = hist.get('lastUpdated', {}).get('when', '') if hist else ''
 
+                    attachment_path = attachment['_links']['download'] if attachment.get(
+                            '_links', {}).get('download') else ''
+                    download_url = self.client.url.rstrip('/') + attachment_path
                     metadata = {
                         'name': title,
                         'size': attachment.get('extensions', {}).get('fileSize', None),
@@ -971,14 +974,10 @@ class ConfluenceAPIWrapper(NonCodeIndexerToolkit):
                         'media_type': media_type,
                         'labels': [label['name'] for label in
                                    attachment.get('metadata', {}).get('labels', {}).get('results', [])],
-                        'download_url': self.base_url.rstrip('/') + attachment['_links']['download'] if attachment.get(
-                            '_links', {}).get('download') else None
+                        'download_url': download_url
                     }
-
-                    download_url = self.base_url.rstrip('/') + attachment['_links']['download']
-
                     try:
-                        resp = self.client.request(method="GET", path=download_url[len(self.base_url):], advanced_mode=True)
+                        resp = self.client.request(method="GET", path=attachment_path, advanced_mode=True)
                         if resp.status_code == 200:
                             content = resp.content
                         else:
@@ -1731,8 +1730,8 @@ class ConfluenceAPIWrapper(NonCodeIndexerToolkit):
             "page_ids": (Optional[List[str]], Field(description="List of page IDs to retrieve.", default=None)),
             "label": (Optional[str], Field(description="Label to filter pages.", default=None)),
             "cql": (Optional[str], Field(description="CQL query to filter pages.", default=None)),
-            "limit": (Optional[int], Field(description="Limit the number of results.", default=10)),
-            "max_pages": (Optional[int], Field(description="Maximum number of pages to retrieve.", default=1000)),
+            "limit": (Optional[int], Field(description="Limit the number of results.", default=10, gt=0)),
+            "max_pages": (Optional[int], Field(description="Maximum number of pages to retrieve.", default=1000, gt=0)),
             "include_restricted_content": (Optional[bool], Field(description="Include restricted content.", default=False)),
             "include_archived_content": (Optional[bool], Field(description="Include archived content.", default=False)),
             "include_attachments": (Optional[bool], Field(description="Include attachments.", default=False)),

alita_sdk/tools/confluence/loader.py

@@ -48,7 +48,8 @@ class AlitaConfluenceLoader(ConfluenceLoader):
                 del kwargs[key]
             except:
                 pass
-        self.base_url = kwargs.get('url')
+        # utilize adjusted URL from Confluence instance for base_url
+        self.base_url = confluence_client.url
         self.space_key = kwargs.get('space_key')
         self.page_ids = kwargs.get('page_ids')
         self.label = kwargs.get('label')
@@ -108,7 +109,8 @@ class AlitaConfluenceLoader(ConfluenceLoader):
         texts = []
         for attachment in attachments:
             media_type = attachment["metadata"]["mediaType"]
-            absolute_url = self.base_url + attachment["_links"]["download"]
+            # utilize adjusted URL from Confluence instance for attachment download URL
+            absolute_url = self.confluence.url + attachment["_links"]["download"]
             title = attachment["title"]
             try:
                 if media_type == "application/pdf":

alita_sdk/tools/custom_open_api/__init__.py

@@ -6,6 +6,7 @@ from pydantic import create_model, BaseModel, ConfigDict, Field
 from .api_wrapper import OpenApiWrapper
 from ..base.tool import BaseAction
 from ..utils import clean_string
+from ...runtime.utils.constants import TOOLKIT_NAME_META, TOOL_NAME_META, TOOLKIT_TYPE_META
 
 name = "openapi"
 
@@ -57,7 +58,7 @@ class OpenApiToolkit(BaseToolkit):
                 name=tool["name"],
                 description=description,
                 args_schema=tool["args_schema"],
-                metadata={"toolkit_name": toolkit_name} if toolkit_name else {}
+                metadata={TOOLKIT_NAME_META: toolkit_name, TOOLKIT_TYPE_META: name, TOOL_NAME_META: tool["name"]} if toolkit_name else {TOOL_NAME_META: tool["name"]}
             ))
         return cls(tools=tools)
 

alita_sdk/tools/elastic/__init__.py

@@ -6,6 +6,7 @@ from pydantic import BaseModel, ConfigDict, create_model, Field, SecretStr
 from .api_wrapper import ELITEAElasticApiWrapper
 from ..base.tool import BaseAction
 from ..utils import clean_string, get_max_toolkit_length
+from ...runtime.utils.constants import TOOLKIT_NAME_META, TOOL_NAME_META, TOOLKIT_TYPE_META
 
 name = "elastic"
 
@@ -58,7 +59,7 @@ class ElasticToolkit(BaseToolkit):
                 name=tool["name"],
                 description=description,
                 args_schema=tool["args_schema"],
-                metadata={"toolkit_name": toolkit_name} if toolkit_name else {}
+                metadata={TOOLKIT_NAME_META: toolkit_name, TOOLKIT_TYPE_META: name, TOOL_NAME_META: tool["name"]} if toolkit_name else {TOOL_NAME_META: tool["name"]}
             ))
         return cls(tools=tools)
 

alita_sdk/tools/elitea_base.py

@@ -842,7 +842,7 @@ class BaseCodeToolApiWrapper(BaseVectorStoreToolApiWrapper):
         Raises:
             ToolException: If file is not text-editable or edit fails
         """
-        from .utils.text_operations import parse_old_new_markers, is_text_editable
+        from .utils.text_operations import parse_old_new_markers, is_text_editable, try_apply_edit
         from langchain_core.callbacks import dispatch_custom_event
         
         # Validate file is text-editable
@@ -863,26 +863,45 @@ class BaseCodeToolApiWrapper(BaseVectorStoreToolApiWrapper):
         # Read current file content
         try:
             current_content = self._read_file(file_path, branch)
+            if not isinstance(current_content, str):
+                # If current_content is a ToolException or any non-str, raise or return it
+                raise current_content if isinstance(current_content, Exception) else ToolException(str(current_content))
         except Exception as e:
             raise ToolException(f"Failed to read file {file_path}: {e}")
         
-        # Apply all edits
+        # Apply all edits (with tolerant fallback)
         updated_content = current_content
+        fallbacks_used = 0
+        edits_applied = 0
         for old_text, new_text in edits:
             if not old_text.strip():
                 continue
             
-            if old_text not in updated_content:
+            new_updated, used_fallback = try_apply_edit(
+                content=updated_content,
+                old_text=old_text,
+                new_text=new_text,
+                file_path=file_path,
+            )
+
+            if new_updated == updated_content:
+                # No change applied for this pair (exact nor fallback)
                 logger.warning(
-                    f"Old content not found in {file_path}. "
-                    f"Looking for: {old_text[:100]}..."
+                    "Old content not found or could not be safely matched in %s. Snippet: %s...",
+                    file_path,
+                    old_text[:100].replace("\n", "\\n"),
                 )
                 continue
-            
-            updated_content = updated_content.replace(old_text, new_text)
+
+            # A replacement was applied
+            edits_applied += 1
+            if used_fallback:
+                fallbacks_used += 1
+
+            updated_content = new_updated
         
         # Check if any changes were made
-        if current_content == updated_content:
+        if current_content == updated_content or edits_applied == 0:
             return (
                 f"No changes made to {file_path}. "
                 "Old content was not found or is empty. "
@@ -908,7 +927,7 @@ class BaseCodeToolApiWrapper(BaseVectorStoreToolApiWrapper):
                 "tool_name": "edit_file",
                 "toolkit": self.__class__.__name__,
                 "operation_type": "modify",
-                "edits_applied": len(edits)
+                "edits_applied": edits_applied,
             })
         except Exception as e:
             logger.warning(f"Failed to dispatch file_modified event: {e}")

alita_sdk/tools/figma/__init__.py

@@ -1,14 +1,20 @@
-from typing import List, Literal, Optional
+from typing import Dict, List, Literal, Optional
 
 from langchain_core.tools import BaseTool, BaseToolkit
 from pydantic import BaseModel, ConfigDict, Field, create_model
 
 from ..base.tool import BaseAction
-from .api_wrapper import FigmaApiWrapper, GLOBAL_LIMIT
+from .api_wrapper import (
+    FigmaApiWrapper,
+    GLOBAL_LIMIT,
+    DEFAULT_FIGMA_IMAGES_PROMPT,
+    DEFAULT_FIGMA_SUMMARY_PROMPT,
+    DEFAULT_NUMBER_OF_THREADS,
+)
 from ..elitea_base import filter_missconfigured_index_tools
-from ..utils import clean_string, get_max_toolkit_length
 from ...configurations.figma import FigmaConfiguration
 from ...configurations.pgvector import PgVectorConfiguration
+from ...runtime.utils.constants import TOOLKIT_NAME_META, TOOL_NAME_META, TOOLKIT_TYPE_META
 
 name = "figma"
 
@@ -28,7 +34,14 @@ def get_tools(tool):
             collection_name=str(tool['toolkit_name']),
             doctype='doc',
             embedding_model=tool['settings'].get('embedding_model'),
-            vectorstore_type="PGVector"
+            vectorstore_type="PGVector",
+            # figma summary/image prompt settings (toolkit-level)
+            # TODO disabled until new requirements
+            # apply_images_prompt=tool["settings"].get("apply_images_prompt"),
+            # images_prompt=tool["settings"].get("images_prompt"),
+            # apply_summary_prompt=tool["settings"].get("apply_summary_prompt"),
+            # summary_prompt=tool["settings"].get("summary_prompt"),
+            # number_of_threads=tool["settings"].get("number_of_threads"),
         )
         .get_tools()
     )
@@ -45,7 +58,40 @@ class FigmaToolkit(BaseToolkit):
         }
         return create_model(
             name,
-            global_limit=(Optional[int], Field(description="Global limit", default=GLOBAL_LIMIT)),
+            # TODO disabled until new requirements
+            # apply_images_prompt=(Optional[bool], Field(
+            #     description="Enable advanced image processing instructions for Figma image nodes.",
+            #     default=True,
+            # )),
+            # images_prompt=(Optional[Dict[str, str]], Field(
+            #     description=(
+            #         "Instruction for how to analyze image-based nodes "
+            #         "(screenshots, diagrams, etc.) during Figma file retrieving. "
+            #         "Must contain a single 'prompt' key with the text."
+            #     ),
+            #     default=DEFAULT_FIGMA_IMAGES_PROMPT,
+            # )),
+            # apply_summary_prompt=(Optional[bool], Field(
+            #     description="Enable LLM-based summarization over loaded Figma data.",
+            #     default=True,
+            # )),
+            # summary_prompt=(Optional[Dict[str, str]], Field(
+            #     description=(
+            #         "Instruction for the LLM on how to summarize loaded Figma data. "
+            #         "Must contain a single 'prompt' key with the text."
+            #     ),
+            #     default=DEFAULT_FIGMA_SUMMARY_PROMPT,
+            # )),
+            number_of_threads=(Optional[int], Field(
+                description=(
+                    "Number of worker threads to use when downloading and processing Figma images. "
+                    f"Valid values are from 1 to 5. Default is {DEFAULT_NUMBER_OF_THREADS}."
+                ),
+                default=DEFAULT_NUMBER_OF_THREADS,
+                ge=1,
+                le=5,
+            )),
+            global_limit=(Optional[int], Field(description="Global limit", default=GLOBAL_LIMIT, gt=0)),
             global_regexp=(Optional[str], Field(description="Global regex pattern", default=None)),
             selected_tools=(
                 List[Literal[tuple(selected_tools)]],
@@ -98,7 +144,7 @@ class FigmaToolkit(BaseToolkit):
                     name=tool["name"],
                     description=description,
                     args_schema=tool["args_schema"],
-                    metadata={"toolkit_name": toolkit_name} if toolkit_name else {}
+                    metadata={TOOLKIT_NAME_META: toolkit_name, TOOLKIT_TYPE_META: name, TOOL_NAME_META: tool["name"]} if toolkit_name else {TOOL_NAME_META: tool["name"]}
                 )
             )
         return cls(tools=tools)