intentkit 0.8.12rc0__py3-none-any.whl → 0.8.13__py3-none-any.whl

intentkit/skills/dune_analytics/base.py

@@ -1,52 +1,50 @@
-"""Base module for Dune Analytics skills.
-
-Provides shared functionality for interacting with the Dune Analytics API.
-"""
-
-from typing import Type
-
-from langchain_core.tools.base import ToolException
-from pydantic import BaseModel, Field
-
-from intentkit.abstracts.skill import SkillStoreABC
-from intentkit.skills.base import IntentKitSkill
-
-
-class DuneBaseTool(IntentKitSkill):
-    """Base class for Dune Analytics skills.
-
-    Offers common functionality like API key retrieval and Dune API interaction.
-    """
-
-    name: str = Field(description="Tool name")
-    description: str = Field(description="Tool description")
-    args_schema: Type[BaseModel]
-    skill_store: SkillStoreABC = Field(description="Skill store for data persistence")
-
-    def get_api_key(self) -> str:
-        """Retrieve the Dune Analytics API key from context.
-
-        Returns:
-            API key string.
-
-        Raises:
-            ToolException: If the API key is not found.
-        """
-        context = self.get_context()
-        skill_config = context.agent.skill_config(self.category)
-        api_key_provider = skill_config.get("api_key_provider")
-        if api_key_provider == "agent_owner":
-            api_key = skill_config.get("api_key")
-            if api_key:
-                return api_key
-            else:
-                raise ToolException("No api_key found in agent_owner configuration")
-        else:
-            raise ToolException(
-                f"Invalid API key provider: {api_key_provider}. Only 'agent_owner' is supported for Dune Analytics."
-            )
-
-    @property
-    def category(self) -> str:
-        """Category of the skill."""
-        return "dune_analytics"
+"""Base module for Dune Analytics skills.
+
+Provides shared functionality for interacting with the Dune Analytics API.
+"""
+
+from typing import Type
+
+from langchain_core.tools.base import ToolException
+from pydantic import BaseModel, Field
+
+from intentkit.skills.base import IntentKitSkill
+
+
+class DuneBaseTool(IntentKitSkill):
+    """Base class for Dune Analytics skills.
+
+    Offers common functionality like API key retrieval and Dune API interaction.
+    """
+
+    name: str = Field(description="Tool name")
+    description: str = Field(description="Tool description")
+    args_schema: Type[BaseModel]
+
+    def get_api_key(self) -> str:
+        """Retrieve the Dune Analytics API key from context.
+
+        Returns:
+            API key string.
+
+        Raises:
+            ToolException: If the API key is not found.
+        """
+        context = self.get_context()
+        skill_config = context.agent.skill_config(self.category)
+        api_key_provider = skill_config.get("api_key_provider")
+        if api_key_provider == "agent_owner":
+            api_key = skill_config.get("api_key")
+            if api_key:
+                return api_key
+            else:
+                raise ToolException("No api_key found in agent_owner configuration")
+        else:
+            raise ToolException(
+                f"Invalid API key provider: {api_key_provider}. Only 'agent_owner' is supported for Dune Analytics."
+            )
+
+    @property
+    def category(self) -> str:
+        """Category of the skill."""
+        return "dune_analytics"

intentkit/skills/dune_analytics/fetch_kol_buys.py

@@ -9,7 +9,6 @@ import httpx
 from pydantic import BaseModel, Field
 from tenacity import retry, stop_after_attempt, wait_exponential
 
-from intentkit.abstracts.skill import SkillStoreABC
 from intentkit.skills.dune_analytics.base import DuneBaseTool
 
 BASE_URL = "https://api.dune.com/api/v1/query"
@@ -49,7 +48,6 @@ class FetchKOLBuys(DuneBaseTool):
         "Supports a configurable limit for the number of results. Handles rate limits with retries."
     )
     args_schema: Type[BaseModel] = KOLBuysInput
-    skill_store: SkillStoreABC = Field(description="Skill store for data persistence")
 
     @retry(
         stop=stop_after_attempt(3), wait=wait_exponential(multiplier=5, min=5, max=60)

intentkit/skills/dune_analytics/fetch_nation_metrics.py

@@ -11,7 +11,6 @@ import httpx
 from pydantic import BaseModel, Field
 from tenacity import retry, stop_after_attempt, wait_exponential
 
-from intentkit.abstracts.skill import SkillStoreABC
 from intentkit.skills.dune_analytics.base import DuneBaseTool
 
 SUPPORTED_QUERIES = {
@@ -86,7 +85,6 @@ class FetchNationMetrics(DuneBaseTool):
         "Handles rate limits with retries."
     )
     args_schema: Type[BaseModel] = NationMetricsInput
-    skill_store: SkillStoreABC = Field(description="Skill store for data persistence")
 
     def normalize_metric(self, metric: str) -> str:
         """Normalize a metric string for matching.

intentkit/skills/elfa/__init__.py

@@ -3,7 +3,6 @@
 import logging
 from typing import NotRequired, TypedDict
 
-from intentkit.abstracts.skill import SkillStoreABC
 from intentkit.skills.base import SkillConfig, SkillState
 from intentkit.skills.elfa.base import ElfaBaseTool
 from intentkit.skills.elfa.mention import (
@@ -36,7 +35,6 @@ class Config(SkillConfig):
 async def get_skills(
     config: "Config",
     is_private: bool,
-    store: SkillStoreABC,
     **_,
 ) -> list[ElfaBaseTool]:
     """Get all Elfa skills.
@@ -44,7 +42,6 @@ async def get_skills(
     Args:
         config: The configuration for Elfa skills.
         is_private: Whether to include private skills.
-        store: The skill store for persisting data.
 
     Returns:
         A list of Elfa skills.
@@ -61,7 +58,7 @@ async def get_skills(
     # Get each skill using the cached getter
     result = []
     for name in available_skills:
-        skill = get_elfa_skill(name, store)
+        skill = get_elfa_skill(name)
         if skill:
             result.append(skill)
     return result
@@ -69,13 +66,11 @@ async def get_skills(
 
 def get_elfa_skill(
     name: str,
-    store: SkillStoreABC,
 ) -> ElfaBaseTool:
     """Get an Elfa skill by name.
 
     Args:
         name: The name of the skill to get
-        store: The skill store for persisting data
 
     Returns:
         The requested Elfa skill
@@ -83,30 +78,22 @@ def get_elfa_skill(
 
     if name == "get_top_mentions":
         if name not in _cache:
-            _cache[name] = ElfaGetTopMentions(
-                skill_store=store,
-            )
+            _cache[name] = ElfaGetTopMentions()
         return _cache[name]
 
     elif name == "search_mentions":
         if name not in _cache:
-            _cache[name] = ElfaSearchMentions(
-                skill_store=store,
-            )
+            _cache[name] = ElfaSearchMentions()
         return _cache[name]
 
     elif name == "get_trending_tokens":
         if name not in _cache:
-            _cache[name] = ElfaGetTrendingTokens(
-                skill_store=store,
-            )
+            _cache[name] = ElfaGetTrendingTokens()
         return _cache[name]
 
     elif name == "get_smart_stats":
         if name not in _cache:
-            _cache[name] = ElfaGetSmartStats(
-                skill_store=store,
-            )
+            _cache[name] = ElfaGetSmartStats()
         return _cache[name]
 
     else:

intentkit/skills/elfa/base.py

@@ -3,7 +3,7 @@ from typing import Type
 from langchain_core.tools.base import ToolException
 from pydantic import BaseModel, Field
 
-from intentkit.abstracts.skill import SkillStoreABC
+from intentkit.config.config import config
 from intentkit.skills.base import IntentKitSkill
 
 base_url = "https://api.elfa.ai/v2"
@@ -15,23 +15,21 @@ class ElfaBaseTool(IntentKitSkill):
     name: str = Field(description="The name of the tool")
     description: str = Field(description="A description of what the tool does")
     args_schema: Type[BaseModel]
-    skill_store: SkillStoreABC = Field(
-        description="The skill store for persisting data"
-    )
 
     def get_api_key(self) -> str:
         context = self.get_context()
         skill_config = context.agent.skill_config(self.category)
         api_key_provider = skill_config.get("api_key_provider")
         if api_key_provider == "platform":
-            return self.skill_store.get_system_config("elfa_api_key")
+            if not config.elfa_api_key:
+                raise ToolException("Elfa API key is not configured")
+            return config.elfa_api_key
         # for backward compatibility, may only have api_key in skill_config
-        elif skill_config.get("api_key"):
+        if skill_config.get("api_key"):
             return skill_config.get("api_key")
-        else:
-            raise ToolException(
-                f"Invalid API key provider: {api_key_provider}, or no api_key in config"
-            )
+        raise ToolException(
+            f"Invalid API key provider: {api_key_provider}, or no api_key in config"
+        )
 
     @property
     def category(self) -> str:

intentkit/skills/enso/__init__.py

@@ -3,7 +3,6 @@
 import logging
 from typing import List, NotRequired, TypedDict
 
-from intentkit.abstracts.skill import SkillStoreABC
 from intentkit.skills.base import SkillConfig, SkillState
 from intentkit.skills.enso.base import EnsoBaseTool
 from intentkit.skills.enso.best_yield import EnsoGetBestYield
@@ -42,7 +41,6 @@ class Config(SkillConfig):
 async def get_skills(
     config: Config,
     is_private: bool,
-    store: SkillStoreABC,
     **_,
 ) -> list[EnsoBaseTool]:
     """Get all Enso skills."""
@@ -58,7 +56,7 @@ async def get_skills(
     # Get each skill using the cached getter
     result = []
     for name in available_skills:
-        skill = get_enso_skill(name, store)
+        skill = get_enso_skill(name)
         if skill:
             result.append(skill)
     return result
@@ -66,49 +64,31 @@ async def get_skills(
 
 def get_enso_skill(
     name: str,
-    skill_store: SkillStoreABC,
 ) -> EnsoBaseTool:
     """Get an Enso skill by name.
 
     Args:
         name: The name of the skill to get
-        skill_store: The skill store for persisting data
 
     Returns:
         The requested Enso skill
     """
     if name == "get_networks":
-        return EnsoGetNetworks(
-            skill_store=skill_store,
-        )
+        return EnsoGetNetworks()
     if name == "get_tokens":
-        return EnsoGetTokens(
-            skill_store=skill_store,
-        )
+        return EnsoGetTokens()
     if name == "get_prices":
-        return EnsoGetPrices(
-            skill_store=skill_store,
-        )
+        return EnsoGetPrices()
     if name == "get_wallet_approvals":
-        return EnsoGetWalletApprovals(
-            skill_store=skill_store,
-        )
+        return EnsoGetWalletApprovals()
     if name == "get_wallet_balances":
-        return EnsoGetWalletBalances(
-            skill_store=skill_store,
-        )
+        return EnsoGetWalletBalances()
     if name == "wallet_approve":
-        return EnsoWalletApprove(
-            skill_store=skill_store,
-        )
+        return EnsoWalletApprove()
     if name == "route_shortcut":
-        return EnsoRouteShortcut(
-            skill_store=skill_store,
-        )
+        return EnsoRouteShortcut()
     if name == "get_best_yield":
-        return EnsoGetBestYield(
-            skill_store=skill_store,
-        )
+        return EnsoGetBestYield()
     else:
         logger.warning(f"Unknown Enso skill: {name}")
         return None

intentkit/skills/enso/base.py

@@ -6,8 +6,8 @@ from langchain_core.tools.base import ToolException
 from pydantic import BaseModel, Field
 
 from intentkit.abstracts.graph import AgentContext
-from intentkit.abstracts.skill import SkillStoreABC
 from intentkit.clients import get_wallet_provider as get_agent_wallet_provider
+from intentkit.config.config import config
 from intentkit.skills.base import IntentKitSkill
 from intentkit.utils.chain import ChainProvider, Network, network_to_id
 
@@ -20,9 +20,6 @@ class EnsoBaseTool(IntentKitSkill):
     name: str = Field(description="The name of the tool")
     description: str = Field(description="A description of what the tool does")
     args_schema: Type[BaseModel]
-    skill_store: SkillStoreABC = Field(
-        description="The skill store for persisting data"
-    )
 
     async def get_wallet_provider(self, context: AgentContext) -> CdpEvmWalletProvider:
         """Get the wallet provider from the CDP client.
@@ -40,7 +37,7 @@ class EnsoBaseTool(IntentKitSkill):
         return provider.get_address()
 
     def get_chain_provider(self, context: AgentContext) -> Optional[ChainProvider]:
-        return self.skill_store.get_system_config("chain_provider")
+        return config.chain_provider
 
     def get_main_tokens(self, context: AgentContext) -> list[str]:
         skill_config = context.agent.skill_config(self.category)
@@ -52,7 +49,7 @@ class EnsoBaseTool(IntentKitSkill):
         skill_config = context.agent.skill_config(self.category)
         api_key_provider = skill_config.get("api_key_provider")
         if api_key_provider == "platform":
-            return self.skill_store.get_system_config("enso_api_token")
+            return config.enso_api_token
         # for backward compatibility, may only have api_token in skill_config
         elif skill_config.get("api_token"):
             return skill_config.get("api_token")

intentkit/skills/enso/route.py

@@ -202,9 +202,7 @@ class EnsoRouteShortcut(EnsoBaseTool):
                         else None
                     )
                 if network_name is None:
-                    networks = await EnsoGetNetworks(
-                        skill_store=self.skill_store,
-                    ).arun()
+                    networks = await EnsoGetNetworks().arun()
 
                     for network in networks.res:
                         if network.id == resolved_chain_id:

intentkit/skills/erc20/__init__.py

@@ -4,7 +4,6 @@ from typing import TYPE_CHECKING, Optional, TypedDict
 
 from coinbase_agentkit import erc20_action_provider
 
-from intentkit.abstracts.skill import SkillStoreABC
 from intentkit.skills.base import (
     SkillConfig,
     SkillState,
@@ -31,7 +30,6 @@ class Config(SkillConfig):
 async def get_skills(
     config: "Config",
     is_private: bool,
-    store: SkillStoreABC,
     agent_id: str,
     agent: Optional["Agent"] = None,
     **_,
@@ -45,9 +43,7 @@ async def get_skills(
         if state == "public" or (state == "private" and is_private):
             available_skills.append(skill_name)
 
-    actions = await get_agentkit_actions(
-        agent_id, store, [erc20_action_provider], agent=agent
-    )
+    actions = await get_agentkit_actions(agent_id, [erc20_action_provider], agent=agent)
     tools: list[ERC20BaseTool] = []
     for skill in available_skills:
         for action in actions:

intentkit/skills/erc721/__init__.py

@@ -4,7 +4,6 @@ from typing import TYPE_CHECKING, Optional, TypedDict
 
 from coinbase_agentkit import erc721_action_provider
 
-from intentkit.abstracts.skill import SkillStoreABC
 from intentkit.skills.base import (
     SkillConfig,
     SkillState,
@@ -32,7 +31,6 @@ class Config(SkillConfig):
 async def get_skills(
     config: "Config",
     is_private: bool,
-    store: SkillStoreABC,
     agent_id: str,
     agent: Optional["Agent"] = None,
     **_,
@@ -47,7 +45,7 @@ async def get_skills(
             available_skills.append(skill_name)
 
     actions = await get_agentkit_actions(
-        agent_id, store, [erc721_action_provider], agent=agent
+        agent_id, [erc721_action_provider], agent=agent
     )
     tools: list[ERC721BaseTool] = []
     for skill in available_skills:

intentkit/skills/firecrawl/__init__.py

@@ -3,7 +3,6 @@
 import logging
 from typing import TypedDict
 
-from intentkit.abstracts.skill import SkillStoreABC
 from intentkit.skills.base import SkillConfig, SkillState
 from intentkit.skills.firecrawl.base import FirecrawlBaseTool
 from intentkit.skills.firecrawl.clear import FirecrawlClearIndexedContent
@@ -37,7 +36,6 @@ class Config(SkillConfig):
 async def get_skills(
     config: "Config",
     is_private: bool,
-    store: SkillStoreABC,
     **_,
 ) -> list[FirecrawlBaseTool]:
     """Get all Firecrawl skills.
@@ -45,7 +43,6 @@ async def get_skills(
     Args:
         config: The configuration for Firecrawl skills.
         is_private: Whether to include private skills.
-        store: The skill store for persisting data.
 
     Returns:
         A list of Firecrawl skills.
@@ -60,18 +57,16 @@ async def get_skills(
             available_skills.append(skill_name)
 
     # Get each skill using the cached getter
-    return [get_firecrawl_skill(name, store) for name in available_skills]
+    return [get_firecrawl_skill(name) for name in available_skills]
 
 
 def get_firecrawl_skill(
     name: str,
-    store: SkillStoreABC,
 ) -> FirecrawlBaseTool:
     """Get a Firecrawl skill by name.
 
     Args:
         name: The name of the skill to get
-        store: The skill store for persisting data
 
     Returns:
         The requested Firecrawl skill
@@ -81,27 +76,19 @@ def get_firecrawl_skill(
     """
     if name == "firecrawl_scrape":
         if name not in _cache:
-            _cache[name] = FirecrawlScrape(
-                skill_store=store,
-            )
+            _cache[name] = FirecrawlScrape()
         return _cache[name]
     elif name == "firecrawl_crawl":
         if name not in _cache:
-            _cache[name] = FirecrawlCrawl(
-                skill_store=store,
-            )
+            _cache[name] = FirecrawlCrawl()
         return _cache[name]
     elif name == "firecrawl_query_indexed_content":
         if name not in _cache:
-            _cache[name] = FirecrawlQueryIndexedContent(
-                skill_store=store,
-            )
+            _cache[name] = FirecrawlQueryIndexedContent()
         return _cache[name]
     elif name == "firecrawl_clear_indexed_content":
         if name not in _cache:
-            _cache[name] = FirecrawlClearIndexedContent(
-                skill_store=store,
-            )
+            _cache[name] = FirecrawlClearIndexedContent()
         return _cache[name]
     else:
         raise ValueError(f"Unknown Firecrawl skill: {name}")

intentkit/skills/firecrawl/base.py

@@ -3,7 +3,7 @@ from typing import Type
 from langchain_core.tools.base import ToolException
 from pydantic import BaseModel, Field
 
-from intentkit.abstracts.skill import SkillStoreABC
+from intentkit.config.config import config
 from intentkit.skills.base import IntentKitSkill
 
 
@@ -13,9 +13,6 @@ class FirecrawlBaseTool(IntentKitSkill):
     name: str = Field(description="The name of the tool")
     description: str = Field(description="A description of what the tool does")
     args_schema: Type[BaseModel]
-    skill_store: SkillStoreABC = Field(
-        description="The skill store for persisting data"
-    )
 
     def get_api_key(self) -> str:
         """Get the Firecrawl API key from configuration."""
@@ -29,7 +26,7 @@ class FirecrawlBaseTool(IntentKitSkill):
             else:
                 raise ToolException("No api_key found in agent_owner configuration")
         else:
-            return self.skill_store.get_system_config("firecrawl_api_key")
+            return config.firecrawl_api_key
 
     @property
     def category(self) -> str:

intentkit/skills/firecrawl/crawl.py

@@ -137,9 +137,8 @@ class FirecrawlCrawl(FirecrawlBaseTool):
                 "rate_limit_minutes"
             ):
                 await self.user_rate_limit_by_category(
-                    context.user_id,
                     skill_config["rate_limit_number"],
-                    skill_config["rate_limit_minutes"],
+                    skill_config["rate_limit_minutes"] * 60,
                 )
 
         # Get the API key from the agent's configuration
@@ -279,6 +278,7 @@ class FirecrawlCrawl(FirecrawlBaseTool):
                                 # Import indexing utilities from firecrawl utils
                                 from intentkit.skills.firecrawl.utils import (
                                     FirecrawlMetadataManager,
+                                    FirecrawlVectorStoreManager,
                                     index_documents,
                                 )
 
@@ -309,24 +309,25 @@ class FirecrawlCrawl(FirecrawlBaseTool):
                                 # Get agent ID for indexing
                                 agent_id = context.agent_id
                                 if agent_id and documents:
+                                    vector_manager = FirecrawlVectorStoreManager()
+
                                     # Index all documents
                                     total_chunks, was_merged = await index_documents(
                                         documents,
                                         agent_id,
-                                        self.skill_store,
+                                        vector_manager,
                                         chunk_size,
                                         chunk_overlap,
                                     )
 
                                     # Update metadata
-                                    metadata_manager = FirecrawlMetadataManager(
-                                        self.skill_store
-                                    )
                                     urls = [doc.metadata["source"] for doc in documents]
-                                    new_metadata = metadata_manager.create_url_metadata(
-                                        urls, documents, "firecrawl_crawl"
+                                    new_metadata = (
+                                        FirecrawlMetadataManager.create_url_metadata(
+                                            urls, documents, "firecrawl_crawl"
+                                        )
                                     )
-                                    await metadata_manager.update_metadata(
+                                    await FirecrawlMetadataManager.update_metadata(
                                         agent_id, new_metadata
                                     )
 

intentkit/skills/firecrawl/query.py

@@ -62,12 +62,14 @@ class FirecrawlQueryIndexedContent(FirecrawlBaseTool):
             # Import query utilities from firecrawl utils
             from intentkit.skills.firecrawl.utils import (
                 FirecrawlDocumentProcessor,
+                FirecrawlVectorStoreManager,
                 query_indexed_content,
             )
 
             # Query the indexed content
+            vector_manager = FirecrawlVectorStoreManager()
             docs = await query_indexed_content(
-                query, agent_id, self.skill_store, max_results
+                query, agent_id, vector_manager, max_results
             )
 
             if not docs:

intentkit/skills/firecrawl/scrape.py

@@ -124,9 +124,8 @@ class FirecrawlScrape(FirecrawlBaseTool):
                 "rate_limit_minutes"
             ):
                 await self.user_rate_limit_by_category(
-                    context.user_id,
                     skill_config["rate_limit_number"],
-                    skill_config["rate_limit_minutes"],
+                    skill_config["rate_limit_minutes"] * 60,
                 )
 
         # Get the API key from the agent's configuration
@@ -265,11 +264,8 @@ class FirecrawlScrape(FirecrawlBaseTool):
                         # Get agent ID for indexing
                         agent_id = context.agent_id
                         if agent_id:
-                            # Initialize managers
-                            vs_manager = FirecrawlVectorStoreManager(self.skill_store)
-                            metadata_manager = FirecrawlMetadataManager(
-                                self.skill_store
-                            )
+                            # Initialize vector store manager
+                            vs_manager = FirecrawlVectorStoreManager()
 
                             # Load existing vector store
                             existing_vector_store = await vs_manager.load_vector_store(
@@ -386,11 +382,13 @@ class FirecrawlScrape(FirecrawlBaseTool):
                                 }
                             else:
                                 # Create new metadata
-                                updated_metadata = metadata_manager.create_url_metadata(
-                                    [url], [document], "firecrawl_scrape"
+                                updated_metadata = (
+                                    FirecrawlMetadataManager.create_url_metadata(
+                                        [url], [document], "firecrawl_scrape"
+                                    )
                                 )
 
-                            await metadata_manager.update_metadata(
+                            await FirecrawlMetadataManager.update_metadata(
                                 agent_id, updated_metadata
                             )