iointel 1.3.3__tar.gz → 1.3.4__tar.gz

{iointel-1.3.3 → iointel-1.3.4}/.github/workflows/tests.yaml

@@ -52,21 +52,31 @@ jobs:
         uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
-
+ 
       - name: download uv
         run: curl -LsSf https://astral.sh/uv/install.sh | sh
-
+ 
       - name: Install dependencies
         run: uv pip install --system -e ".[dev]"
+ 
+      - name: Check readme anchors
+        run: |
+          pip install pipx
+          pipx run hatch-fancy-pypi-readme | grep -vq 'MISSING ANCHOR'
+ 
+      - name: Set up Docker Compose
+        uses: docker/setup-buildx-action@v3
 
-      - name: Prepare for tests
-        run: make prepare_for_tests
+      - name: Start services
+        run: |
+          docker compose up -d
+          # Wait for searxng to be healthy by checking the health endpoint directly
+          timeout 60s bash -c 'until curl -s -f http://localhost:8080/healthz > /dev/null; do sleep 2; done'
 
       - name: Run tests
         run: pytest -vv tests/ --retries 2 --retry-delay 5
         if: ${{ !(github.event.pull_request.head.repo.fork) }}
 
-      - name: Check readme anchors
-        run: |
-          pip install pipx
-          pipx run hatch-fancy-pypi-readme | grep -vq 'MISSING ANCHOR'
+      - name: Remove containers
+        if: always()  # This ensures cleanup happens even if tests fail
+        run: docker compose down -v

{iointel-1.3.3 → iointel-1.3.4}/PKG-INFO

@@ -1,12 +1,14 @@
 Metadata-Version: 2.4
 Name: iointel
-Version: 1.3.3
+Version: 1.3.4
 Summary: A framework to create agents, tasks, and workflows.
 License-File: LICENSE
 Keywords: AI,Agents,LLM,framework,tools
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.10
-Requires-Dist: duckduckgo-search==8.0.0
+Requires-Dist: agno[tools]==1.5.5
+Requires-Dist: backoff==2.2.1
+Requires-Dist: duckduckgo-search==8.0.2
 Requires-Dist: firecrawl-py>=2.2.0
 Requires-Dist: firecrawl>=2.2.0
 Requires-Dist: httpx

iointel-1.3.4/docker-compose.yml

@@ -0,0 +1,33 @@
+version: '3.8'
+
+services:
+  searxng:
+    image: searxng/searxng
+    container_name: iointel-searxng
+    ports:
+      - "8080:8080"
+    volumes:
+      - searxng_config:/etc/searxng
+    environment:
+      - BASE_URL=http://localhost:8080/
+      - INSTANCE_NAME=my-instance
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:8080/healthz"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 5s
+    restart: unless-stopped
+
+  # Service to modify settings.yml
+  setup:
+    image: python:3-slim
+    volumes:
+      - searxng_config:/etc/searxng
+    command: ["bash", "-c", "pip install pyyaml && python3 -c 'import yaml; f=\"/etc/searxng/settings.yml\"; d=yaml.safe_load(open(f)); d.setdefault(\"search\",{}).setdefault(\"formats\",[]).append(\"json\"); open(f,\"w\").write(yaml.safe_dump(d))'"]
+    depends_on:
+      - searxng
+
+volumes:
+  searxng_config:
+    name: iointel-searxng-config

{iointel-1.3.3 → iointel-1.3.4}/iointel/__init__.py

@@ -45,4 +45,4 @@ __all__ = [
 ]
 
 
-__version__ = "1.3.3"
+__version__ = "1.3.4"

{iointel-1.3.3 → iointel-1.3.4}/iointel/src/agent_methods/agents/tool_factory.py

@@ -63,7 +63,11 @@ def resolve_tools(params: AgentParams) -> List[Optional[Callable]]:
     """
     resolved_tools = []
     for tool_data in params.tools:
-        if isinstance(tool_data, dict):
+        if isinstance(tool_data, str):
+            logger.debug(f"Looking up the registry for tool `{tool_data}`")
+            if not (tool_obj := TOOLS_REGISTRY.get(tool_data)):
+                raise ValueError(f"Tool {tool_data} is not known")
+        elif isinstance(tool_data, dict):
             logger.debug(f"Rehydrating tool from dict: {tool_data}")
             tool_obj = Tool.model_validate(tool_data)
             if "body" in tool_data:
@@ -82,7 +86,7 @@ def resolve_tools(params: AgentParams) -> List[Optional[Callable]]:
             tool_obj = Tool.from_function(tool_data)
         else:
             raise ValueError(
-                "Unexpected type for tool_data; expected dict, Tool instance, or callable."
+                "Unexpected type for tool_data; expected str, dict, Tool instance, or callable."
             )
 
         registered_tool_name, registered_tool = next(

{iointel-1.3.3 → iointel-1.3.4}/iointel/src/agent_methods/data_models/datamodels.py

@@ -400,7 +400,7 @@ class AgentParams(BaseModel):
     base_url: Optional[str] = Field(
         None, description="Base URL for the model, if required."
     )
-    tools: Optional[List[dict | Tool | Callable]] = Field(default_factory=list)
+    tools: Optional[List[str | dict | Tool | Callable]] = Field(default_factory=list)
     context: Optional[Dict[str, Any]] = Field(
         None,
         description="Context to be passed to the agent.",

iointel-1.3.4/iointel/src/agent_methods/tools/agno/agentql.py

@@ -0,0 +1,21 @@
+from functools import wraps
+from typing import Optional
+from agno.tools.agentql import AgentQLTools as AgnoAgentQLTools
+
+from ..utils import register_tool
+from .common import DisableAgnoRegistryMixin
+
+
+class AgentQL(DisableAgnoRegistryMixin, AgnoAgentQLTools):
+    def __init__(self, api_key: Optional[str] = None, agentql_query: str = ""):
+        super().__init__(api_key=api_key, scrape=True, agentql_query=agentql_query)
+
+    @register_tool(name="agentql_scrape_website")
+    @wraps(AgnoAgentQLTools.scrape_website)
+    def scrape_website(self, url: str) -> str:
+        return super().scrape_website(url)
+
+    @register_tool(name="agentql_custom_scrape_website")
+    @wraps(AgnoAgentQLTools.custom_scrape_website)
+    def custom_scrape_website(self, url: str) -> str:
+        return super().custom_scrape_website(url)

iointel-1.3.4/iointel/src/agent_methods/tools/agno/airflow.py

@@ -0,0 +1,22 @@
+from pathlib import Path
+from typing import Optional, Union
+from functools import wraps
+from agno.tools.airflow import AirflowTools as AgnoAirflowTools
+
+from ..utils import register_tool
+from .common import DisableAgnoRegistryMixin
+
+
+class Airflow(DisableAgnoRegistryMixin, AgnoAirflowTools):
+    def __init__(self, dags_dir: Optional[Union[Path, str]] = None):
+        super().__init__(dags_dir=dags_dir, save_dag=True, read_dag=True)
+
+    @register_tool(name="airflow_save_dag_file")
+    @wraps(AgnoAirflowTools.save_dag_file)
+    def save_dag_file(self, contents: str, dag_file: str) -> str:
+        return super().save_dag_file(contents=contents, dag_file=dag_file)
+
+    @register_tool(name="airflow_read_dag_file")
+    @wraps(AgnoAirflowTools.read_dag_file)
+    def read_dag_file(self, dag_file: str) -> str:
+        return super().read_dag_file(dag_file=dag_file)

iointel-1.3.4/iointel/src/agent_methods/tools/agno/arxiv.py

@@ -0,0 +1,27 @@
+from pathlib import Path
+from typing import Optional
+from functools import wraps
+from agno.tools.arxiv import ArxivTools as AgnoArxivTools
+
+from ..utils import register_tool
+from .common import DisableAgnoRegistryMixin
+
+
+class Arxiv(DisableAgnoRegistryMixin, AgnoArxivTools):
+    def __init__(self, download_dir: Optional[Path] = None):
+        # TODO: define a better default option for downloading pdfs, agno arxiv has a weird choice
+        super().__init__(download_dir=download_dir)
+
+    @register_tool(name="arxiv_search")
+    @wraps(AgnoArxivTools.search_arxiv_and_return_articles)
+    def search_arxiv_and_return_articles(
+        self, query: str, num_articles: int = 10
+    ) -> str:
+        return super().search_arxiv_and_return_articles(query, num_articles)
+
+    @register_tool(name="arxiv_read_papers")
+    @wraps(AgnoArxivTools.read_arxiv_papers)
+    def read_arxiv_papers(
+        self, id_list: list[str], pages_to_read: Optional[int] = None
+    ) -> str:
+        return super().read_arxiv_papers(id_list, pages_to_read)

iointel-1.3.4/iointel/src/agent_methods/tools/agno/aws_lambda.py

@@ -0,0 +1,20 @@
+from functools import wraps
+from agno.tools.aws_lambda import AWSLambdaTools as AgnoAWSLambdaTools
+
+from ..utils import register_tool
+from .common import DisableAgnoRegistryMixin
+
+
+class AWSLambda(DisableAgnoRegistryMixin, AgnoAWSLambdaTools):
+    def __init__(self, region_name: str = "us-east-1"):
+        super().__init__(region_name=region_name)
+
+    @register_tool(name="aws_lambda_list_functions")
+    @wraps(AgnoAWSLambdaTools.list_functions)
+    def list_functions(self) -> str:
+        return super().list_functions()
+
+    @register_tool(name="aws_lambda_invoke_function")
+    @wraps(AgnoAWSLambdaTools.invoke_function)
+    def invoke_function(self, function_name: str, payload: str = "{}") -> str:
+        return super().invoke_function(function_name=function_name, payload=payload)

iointel-1.3.4/iointel/src/agent_methods/tools/agno/common.py

@@ -0,0 +1,11 @@
+class DisableAgnoRegistryMixin:
+    """
+    Put this as first parent class when inheriting
+    from Agno tool to disable Agno registry,
+    because we only care about our own registry."""
+
+    def _register_tools(self):
+        """Disabled in favour of iointel registry."""
+
+    def register(self, function, name=None):
+        """Disabled in favour of iointel registry."""

{iointel-1.3.3 → iointel-1.3.4}/iointel/src/agent_methods/tools/duckduckgo.py

@@ -1,5 +1,11 @@
 import asyncio
 from typing import Any, Dict, List, Optional
+import backoff
+
+try:
+    from duckduckgo import DuckDuckGoSearchException
+except ImportError:
+    DuckDuckGoSearchException = Exception
 
 from iointel.src.utilities.decorators import register_tool
 from pydantic import BaseModel, ConfigDict, model_validator
@@ -24,7 +30,7 @@ class DuckDuckGoSearchAPIWrapper(BaseModel):
     Options: d, w, m, y
     """
     max_results: int = 5
-    backend: str = "auto"
+    backend: str = "html"
     """
     Options: auto, html, lite
     """
@@ -46,6 +52,12 @@ class DuckDuckGoSearchAPIWrapper(BaseModel):
             ) from e
         return values
 
+    @backoff.on_exception(
+        backoff.expo,
+        exception=(DuckDuckGoSearchException,),
+        max_tries=5,
+        jitter=backoff.random_jitter,
+    )
     def _ddgs(
         self, query: str, max_results: Optional[int] = None
     ) -> List[Dict[str, str]]:

{iointel-1.3.3 → iointel-1.3.4}/iointel/src/utilities/decorators.py

@@ -97,7 +97,7 @@ def register_tool(_fn=None, name: Optional[str] = None):
             logger.debug(f"Tool '{tool_name}' is already safely registered.")
             return executor_fn
 
-        TOOLS_REGISTRY[tool_name] = Tool.from_function(executor_fn)
+        TOOLS_REGISTRY[tool_name] = Tool.from_function(executor_fn, name=tool_name)
         logger.debug(f"Registered tool '{tool_name}' safely.")
         return executor_fn
 

{iointel-1.3.3 → iointel-1.3.4}/pyproject.toml

@@ -10,7 +10,7 @@ dependencies = [
     "python-multipart>=0.0.20",
     "pydantic-ai>=0.1.0",
     "pyyaml>=6.0.2",
-    "duckduckgo-search==8.0.0",
+    "duckduckgo-search==8.0.2",
     "pgvector>=0.4.0",
     "sqlalchemy-utils>=0.41.2",
     "sqlalchemy>=2.0.36",
@@ -18,6 +18,8 @@ dependencies = [
     # For some reason both firecrawl-py and firecrawl are necessary
     "firecrawl-py>=2.2.0",
     "firecrawl>=2.2.0",
+    "backoff==2.2.1",
+    "agno[tools]==1.5.5",
 ]
 keywords = ["Agents", "LLM", "framework", "AI", "tools"]
 classifiers = [

{iointel-1.3.3 → iointel-1.3.4}/tests/test_tools_with_agents/test_basic_agent_tools.py

@@ -34,7 +34,7 @@ async def test_basic_tools():
         Complete tasks to the best of your ability by using the appropriate tool. Follow all instructions carefully.
         When you need to add numbers, call the tool and use its result.
         """,
-        tools=[add_two_numbers, get_current_datetime],
+        tools=["add_two_numbers", get_current_datetime],
     )
     numbers = [22122837493142, 159864395786239452]
 

iointel-1.3.3/Makefile

@@ -1,38 +0,0 @@
-prepare_for_tests:
-	export PORT=8080
-	docker pull searxng/searxng
-	docker stop iointel-searxng || true
-
-	# Run searxng to generate default settings.yml
-	# Then edit settings.yml to support json format in the output, and restart docker with updated settings
-	docker run --rm -d \
-		-p ${PORT}:8080 \
-		-v "${PWD}/searxng:/etc/searxng" \
-		-e "BASE_URL=http://localhost:${PORT}/" \
-		-e "INSTANCE_NAME=my-instance" \
-		--name iointel-searxng \
-		searxng/searxng
-	sleep 5
-	docker stop iointel-searxng || true
-
-	sudo python3 -c "import yaml; f='searxng/settings.yml'; d=yaml.safe_load(open(f)); d.setdefault('search',{}).setdefault('formats',[]).append('json'); open(f,'w').write(yaml.safe_dump(d))"
-
-	docker run --rm -d \
-		-p ${PORT}:8080 \
-		-v "${PWD}/searxng:/etc/searxng" \
-		-e "BASE_URL=http://localhost:${PORT}/" \
-		-e "INSTANCE_NAME=my-instance" \
-		--name iointel-searxng \
-		searxng/searxng
-	sleep 5
-# 	# Retrieve the response from localhost:8080 silently.
-# 	@response=$$(curl -s localhost:8080) ; \
-# 	if [ -n "$$response" ]; then \
-# 	  echo "Success: Server returned output."; \
-# 	else \
-# 	  echo "Error: No output received from server."; \
-# 	  exit 1; \
-# 	fi
-
-
-.PHONY: prepare_for_tests