intentkit 0.8.11.dev1__py3-none-any.whl → 0.8.12.dev2__py3-none-any.whl

intentkit/skills/defillama/base.py

@@ -52,9 +52,7 @@ class DefiLlamaBaseTool(IntentKitSkill):
         Returns:
             Rate limit status and error message if limited
         """
-        rate_limit = await self.skill_store.get_agent_skill_data(
-            context.agent_id, self.name, "rate_limit"
-        )
+        rate_limit = await self.get_agent_skill_data("rate_limit")
         current_time = datetime.now(tz=timezone.utc)
 
         if (
@@ -67,18 +65,14 @@ class DefiLlamaBaseTool(IntentKitSkill):
                 return True, "Rate limit exceeded"
 
             rate_limit["count"] += 1
-            await self.skill_store.save_agent_skill_data(
-                context.agent_id, self.name, "rate_limit", rate_limit
-            )
+            await self.save_agent_skill_data("rate_limit", rate_limit)
             return False, None
 
         new_rate_limit = {
             "count": 1,
             "reset_time": (current_time + timedelta(minutes=interval)).isoformat(),
         }
-        await self.skill_store.save_agent_skill_data(
-            context.agent_id, self.name, "rate_limit", new_rate_limit
-        )
+        await self.save_agent_skill_data("rate_limit", new_rate_limit)
         return False, None
 
     async def validate_chain(self, chain: str | None) -> tuple[bool, str | None]:

intentkit/skills/enso/networks.py

@@ -83,12 +83,7 @@ class EnsoGetNetworks(EnsoBaseTool):
                         exclude_none=True
                     )
 
-                await self.skill_store.save_agent_skill_data(
-                    context.agent_id,
-                    "enso_get_networks",
-                    "networks",
-                    networks_memory,
-                )
+                await self.save_agent_skill_data("networks", networks_memory)
 
                 return EnsoGetNetworksOutput(res=networks)
             except httpx.RequestError as req_err:

intentkit/skills/enso/route.py

@@ -181,7 +181,6 @@ class EnsoRouteShortcut(EnsoBaseTool):
         """
 
         context = self.get_context()
-        agent_id = context.agent_id
         resolved_chain_id = self.resolve_chain_id(context, chainId)
         api_token = self.get_api_token(context)
         # Use the wallet provider to send the transaction
@@ -191,8 +190,8 @@ class EnsoRouteShortcut(EnsoBaseTool):
         async with httpx.AsyncClient() as client:
             try:
                 network_name = None
-                networks = await self.skill_store.get_agent_skill_data(
-                    agent_id, "enso_get_networks", "networks"
+                networks = await self.get_agent_skill_data_raw(
+                    "enso_get_networks", "networks"
                 )
 
                 if networks:
@@ -221,8 +220,7 @@ class EnsoRouteShortcut(EnsoBaseTool):
                     "Authorization": f"Bearer {api_token}",
                 }
 
-                token_decimals = await self.skill_store.get_agent_skill_data(
-                    agent_id,
+                token_decimals = await self.get_agent_skill_data_raw(
                     "enso_get_tokens",
                     "decimals",
                 )

intentkit/skills/enso/tokens.py

@@ -154,7 +154,6 @@ class EnsoGetTokens(EnsoBaseTool):
         url = f"{base_url}/api/v1/tokens"
 
         context = self.get_context()
-        agent_id = context.agent_id
         resolved_chain_id = self.resolve_chain_id(context, chainId)
         api_token = self.get_api_token(context)
         main_tokens = self.get_main_tokens(context)
@@ -178,11 +177,7 @@ class EnsoGetTokens(EnsoBaseTool):
                 response.raise_for_status()
                 json_dict = response.json()
 
-                token_decimals = await self.skill_store.get_agent_skill_data(
-                    agent_id,
-                    "enso_get_tokens",
-                    "decimals",
-                )
+                token_decimals = await self.get_agent_skill_data("decimals")
                 if not token_decimals:
                     token_decimals = {}
 
@@ -203,12 +198,7 @@ class EnsoGetTokens(EnsoBaseTool):
                                 if u_token.address:
                                     token_decimals[u_token.address] = u_token.decimals
 
-                await self.skill_store.save_agent_skill_data(
-                    agent_id,
-                    "enso_get_tokens",
-                    "decimals",
-                    token_decimals,
-                )
+                await self.save_agent_skill_data("decimals", token_decimals)
 
                 return res
             except httpx.RequestError as req_err:

intentkit/skills/firecrawl/clear.py

@@ -3,6 +3,7 @@ from typing import Type
 
 from pydantic import BaseModel, Field
 
+from intentkit.models.skill import AgentSkillData
 from intentkit.skills.firecrawl.base import FirecrawlBaseTool
 
 logger = logging.getLogger(__name__)
@@ -62,15 +63,11 @@ class FirecrawlClearIndexedContent(FirecrawlBaseTool):
         try:
             # Delete vector store data (using web_scraper storage format for compatibility)
             vector_store_key = f"vector_store_{agent_id}"
-            await self.skill_store.delete_agent_skill_data(
-                agent_id, "web_scraper", vector_store_key
-            )
+            await AgentSkillData.delete(agent_id, "web_scraper", vector_store_key)
 
             # Delete metadata
             metadata_key = f"indexed_urls_{agent_id}"
-            await self.skill_store.delete_agent_skill_data(
-                agent_id, "web_scraper", metadata_key
-            )
+            await AgentSkillData.delete(agent_id, "web_scraper", metadata_key)
 
             logger.info(
                 f"firecrawl_clear: Successfully cleared all indexed content for agent {agent_id}"

intentkit/skills/firecrawl/scrape.py

@@ -368,10 +368,8 @@ class FirecrawlScrape(FirecrawlBaseTool):
                             # Update metadata to track all URLs
                             # Get existing metadata to preserve other URLs
                             metadata_key = f"indexed_urls_{agent_id}"
-                            existing_metadata = (
-                                await self.skill_store.get_agent_skill_data(
-                                    agent_id, "firecrawl", metadata_key
-                                )
+                            existing_metadata = await self.get_agent_skill_data_raw(
+                                "firecrawl", metadata_key
                             )
 
                             if existing_metadata and existing_metadata.get("urls"):

intentkit/skills/firecrawl/utils.py

@@ -10,6 +10,7 @@ from langchain_core.documents import Document
 from langchain_openai import OpenAIEmbeddings
 
 from intentkit.abstracts.skill import SkillStoreABC
+from intentkit.models.skill import AgentSkillData, AgentSkillDataCreate
 
 logger = logging.getLogger(__name__)
 
@@ -129,7 +130,7 @@ class FirecrawlVectorStoreManager:
         """Load existing vector store for an agent."""
         try:
             vector_store_key = f"vector_store_{agent_id}"
-            stored_data = await self.skill_store.get_agent_skill_data(
+            stored_data = await AgentSkillData.get(
                 agent_id, "web_scraper", vector_store_key
             )
 
@@ -162,9 +163,13 @@ class FirecrawlVectorStoreManager:
                 "chunk_overlap": chunk_overlap,
             }
 
-            await self.skill_store.save_agent_skill_data(
-                agent_id, "web_scraper", vector_store_key, storage_data
+            skill_data = AgentSkillDataCreate(
+                agent_id=agent_id,
+                skill="web_scraper",
+                key=vector_store_key,
+                data=storage_data,
             )
+            await skill_data.save()
 
         except Exception as e:
             logger.error(f"Error saving vector store for agent {agent_id}: {e}")
@@ -194,9 +199,13 @@ class FirecrawlMetadataManager:
         """Update metadata for an agent."""
         try:
             metadata_key = f"indexed_urls_{agent_id}"
-            await self.skill_store.save_agent_skill_data(
-                agent_id, "web_scraper", metadata_key, new_metadata
+            skill_data = AgentSkillDataCreate(
+                agent_id=agent_id,
+                skill="web_scraper",
+                key=metadata_key,
+                data=new_metadata,
             )
+            await skill_data.save()
         except Exception as e:
             logger.error(f"Error updating metadata for agent {agent_id}: {e}")
             raise

intentkit/skills/twitter/base.py

@@ -63,22 +63,17 @@ class TwitterBaseTool(IntentKitSkill):
     def category(self) -> str:
         return "twitter"
 
-    async def check_rate_limit(
-        self, agent_id: str, max_requests: int = 1, interval: int = 15
-    ) -> None:
+    async def check_rate_limit(self, max_requests: int = 1, interval: int = 15) -> None:
         """Check if the rate limit has been exceeded.
 
         Args:
-            agent_id: The ID of the agent.
             max_requests: Maximum number of requests allowed within the rate limit window.
             interval: Time interval in minutes for the rate limit window.
 
         Raises:
             RateLimitExceeded: If the rate limit has been exceeded.
         """
-        rate_limit = await self.skill_store.get_agent_skill_data(
-            agent_id, self.name, "rate_limit"
-        )
+        rate_limit = await self.get_agent_skill_data("rate_limit")
 
         current_time = datetime.now(tz=timezone.utc)
 
@@ -92,9 +87,7 @@ class TwitterBaseTool(IntentKitSkill):
                 raise RateLimitExceeded("Rate limit exceeded")
 
             rate_limit["count"] += 1
-            await self.skill_store.save_agent_skill_data(
-                agent_id, self.name, "rate_limit", rate_limit
-            )
+            await self.save_agent_skill_data("rate_limit", rate_limit)
 
             return
 
@@ -103,7 +96,5 @@ class TwitterBaseTool(IntentKitSkill):
             "count": 1,
             "reset_time": (current_time + timedelta(minutes=interval)).isoformat(),
         }
-        await self.skill_store.save_agent_skill_data(
-            agent_id, self.name, "rate_limit", new_rate_limit
-        )
+        await self.save_agent_skill_data("rate_limit", new_rate_limit)
         return

intentkit/skills/twitter/follow_user.py

@@ -49,9 +49,7 @@ class TwitterFollowUser(TwitterBaseTool):
 
             # Check rate limit only when not using OAuth
             if not twitter.use_key:
-                await self.check_rate_limit(
-                    context.agent_id, max_requests=5, interval=15
-                )
+                await self.check_rate_limit(max_requests=5, interval=15)
 
             # Follow the user using tweepy client
             response = await client.follow_user(

intentkit/skills/twitter/get_mentions.py

@@ -56,15 +56,12 @@ class TwitterGetMentions(TwitterBaseTool):
             # Check rate limit only when not using OAuth
             if not twitter.use_key:
                 await self.check_rate_limit(
-                    context.agent_id,
                     max_requests=1,
                     interval=15,
                 )
 
             # get since id from store
-            last = await self.skill_store.get_agent_skill_data(
-                context.agent_id, self.name, "last"
-            )
+            last = await self.get_agent_skill_data("last")
             last = last or {}
             max_results = 10
             since_id = last.get("since_id")
@@ -113,9 +110,7 @@ class TwitterGetMentions(TwitterBaseTool):
             # Update since_id in store
             if mentions.get("meta") and mentions["meta"].get("newest_id"):
                 last["since_id"] = mentions["meta"].get("newest_id")
-                await self.skill_store.save_agent_skill_data(
-                    context.agent_id, self.name, "last", last
-                )
+                await self.save_agent_skill_data("last", last)
 
             return mentions
 

intentkit/skills/twitter/get_timeline.py

@@ -52,14 +52,10 @@ class TwitterGetTimeline(TwitterBaseTool):
 
             # Check rate limit only when not using OAuth
             if not twitter.use_key:
-                await self.check_rate_limit(
-                    context.agent_id, max_requests=1, interval=15
-                )
+                await self.check_rate_limit(max_requests=1, interval=15)
 
             # get since id from store
-            last = await self.skill_store.get_agent_skill_data(
-                context.agent_id, self.name, "last"
-            )
+            last = await self.get_agent_skill_data("last")
             last = last or {}
             since_id = last.get("since_id")
 
@@ -101,9 +97,7 @@ class TwitterGetTimeline(TwitterBaseTool):
             # Update the since_id in store for the next request
             if timeline.get("meta") and timeline["meta"].get("newest_id"):
                 last["since_id"] = timeline["meta"]["newest_id"]
-                await self.skill_store.save_agent_skill_data(
-                    context.agent_id, self.name, "last", last
-                )
+                await self.save_agent_skill_data("last", last)
 
             return timeline
 

intentkit/skills/twitter/get_user_by_username.py

@@ -50,9 +50,7 @@ class TwitterGetUserByUsername(TwitterBaseTool):
 
             # Check rate limit only when not using OAuth
             if not twitter.use_key:
-                await self.check_rate_limit(
-                    context.agent_id, max_requests=5, interval=60 * 24
-                )
+                await self.check_rate_limit(max_requests=5, interval=60 * 24)
 
             user_data = await client.get_user(
                 username=username,

intentkit/skills/twitter/get_user_tweets.py

@@ -66,14 +66,10 @@ class TwitterGetUserTweets(TwitterBaseTool):
 
             # Check rate limit only when not using OAuth
             if not twitter.use_key:
-                await self.check_rate_limit(
-                    context.agent_id, max_requests=1, interval=15
-                )
+                await self.check_rate_limit(max_requests=1, interval=15)
 
             # get since id from store
-            last = await self.skill_store.get_agent_skill_data(
-                context.agent_id, self.name, user_id
-            )
+            last = await self.get_agent_skill_data(user_id)
             last = last or {}
             since_id = last.get("since_id")
 
@@ -112,9 +108,7 @@ class TwitterGetUserTweets(TwitterBaseTool):
             # Update the since_id in store for the next request
             if tweets.get("meta") and tweets["meta"].get("newest_id"):
                 last["since_id"] = tweets["meta"]["newest_id"]
-                await self.skill_store.save_agent_skill_data(
-                    context.agent_id, self.name, user_id, last
-                )
+                await self.save_agent_skill_data(user_id, last)
 
             return tweets
 

intentkit/skills/twitter/like_tweet.py

@@ -47,9 +47,7 @@ class TwitterLikeTweet(TwitterBaseTool):
 
             # Check rate limit only when not using OAuth
             if not twitter.use_key:
-                await self.check_rate_limit(
-                    context.agent_id, max_requests=100, interval=1440
-                )
+                await self.check_rate_limit(max_requests=100, interval=1440)
 
             # Like the tweet using tweepy client
             response = await client.like(tweet_id=tweet_id, user_auth=twitter.use_key)

intentkit/skills/twitter/post_tweet.py

@@ -61,9 +61,7 @@ class TwitterPostTweet(TwitterBaseTool):
 
             # Check rate limit only when not using OAuth
             if not twitter.use_key:
-                await self.check_rate_limit(
-                    context.agent_id, max_requests=24, interval=1440
-                )
+                await self.check_rate_limit(max_requests=24, interval=1440)
 
             media_ids = []
             image_warning = ""

intentkit/skills/twitter/reply_tweet.py

@@ -63,9 +63,7 @@ class TwitterReplyTweet(TwitterBaseTool):
 
             # Check rate limit only when not using OAuth
             if not twitter.use_key:
-                await self.check_rate_limit(
-                    context.agent_id, max_requests=48, interval=1440
-                )
+                await self.check_rate_limit(max_requests=48, interval=1440)
 
             media_ids = []
             image_warning = ""

intentkit/skills/twitter/retweet.py

@@ -47,9 +47,7 @@ class TwitterRetweet(TwitterBaseTool):
 
             # Check rate limit only when not using OAuth
             if not twitter.use_key:
-                await self.check_rate_limit(
-                    context.agent_id, max_requests=5, interval=15
-                )
+                await self.check_rate_limit(max_requests=5, interval=15)
 
             # Get authenticated user's ID
             user_id = twitter.self_id

intentkit/skills/twitter/search_tweets.py

@@ -49,14 +49,10 @@ class TwitterSearchTweets(TwitterBaseTool):
 
             # Check rate limit only when not using OAuth
             if not twitter.use_key:
-                await self.check_rate_limit(
-                    context.agent_id, max_requests=1, interval=15
-                )
+                await self.check_rate_limit(max_requests=1, interval=15)
 
             # Get since_id from store to avoid duplicate results
-            last = await self.skill_store.get_agent_skill_data(
-                context.agent_id, self.name, query
-            )
+            last = await self.get_agent_skill_data(query)
             last = last or {}
             since_id = last.get("since_id")
 
@@ -104,9 +100,7 @@ class TwitterSearchTweets(TwitterBaseTool):
             if tweets.get("meta") and tweets.get("meta").get("newest_id"):
                 last["since_id"] = tweets["meta"]["newest_id"]
                 last["timestamp"] = datetime.datetime.now().isoformat()
-                await self.skill_store.save_agent_skill_data(
-                    context.agent_id, self.name, query, last
-                )
+                await self.save_agent_skill_data(query, last)
 
             return tweets
 

intentkit/skills/web_scraper/scrape_and_index.py

@@ -196,9 +196,8 @@ class QueryIndexedContent(WebScraperBaseTool):
 
             logger.info(f"[{agent_id}] Looking for vector store: {vector_store_key}")
 
-            stored_data = await self.skill_store.get_agent_skill_data(
-                agent_id, "web_scraper", vector_store_key
-            )
+            vs_manager = VectorStoreManager(self.skill_store)
+            stored_data = await vs_manager.get_existing_vector_store(agent_id)
 
             if not stored_data:
                 logger.warning(f"[{agent_id}] No vector store found")
@@ -210,7 +209,6 @@ class QueryIndexedContent(WebScraperBaseTool):
 
             # Create embeddings and decode vector store
             logger.info(f"[{agent_id}] Decoding vector store")
-            vs_manager = VectorStoreManager(self.skill_store)
             embeddings = vs_manager.create_embeddings()
             vector_store = vs_manager.decode_vector_store(
                 stored_data["faiss_files"], embeddings

intentkit/skills/web_scraper/utils.py

@@ -18,6 +18,7 @@ from langchain_openai import OpenAIEmbeddings
 from langchain_text_splitters import RecursiveCharacterTextSplitter
 
 from intentkit.abstracts.skill import SkillStoreABC
+from intentkit.models.skill import AgentSkillData, AgentSkillDataCreate
 
 logger = logging.getLogger(__name__)
 
@@ -113,9 +114,7 @@ class VectorStoreManager:
     async def get_existing_vector_store(self, agent_id: str) -> Optional[Dict]:
         """Get existing vector store data if it exists."""
         vector_store_key, _ = self.get_storage_keys(agent_id)
-        return await self.skill_store.get_agent_skill_data(
-            agent_id, "web_scraper", vector_store_key
-        )
+        return await AgentSkillData.get(agent_id, "web_scraper", vector_store_key)
 
     async def merge_with_existing(
         self,
@@ -184,12 +183,13 @@ class VectorStoreManager:
 
         try:
             # Save to storage
-            await self.skill_store.save_agent_skill_data(
+            skill_data = AgentSkillDataCreate(
                 agent_id=agent_id,
                 skill="web_scraper",
                 key=vector_store_key,
                 data=storage_data,
             )
+            await skill_data.save()
 
             logger.info(f"[{agent_id}] Successfully saved vector store")
 
@@ -319,12 +319,7 @@ class MetadataManager:
         """Get existing metadata for an agent."""
         vs_manager = VectorStoreManager(self.skill_store)
         _, metadata_key = vs_manager.get_storage_keys(agent_id)
-        return (
-            await self.skill_store.get_agent_skill_data(
-                agent_id, "web_scraper", metadata_key
-            )
-            or {}
-        )
+        return await AgentSkillData.get(agent_id, "web_scraper", metadata_key) or {}
 
     def create_url_metadata(
         self,
@@ -391,12 +386,13 @@ class MetadataManager:
         existing_metadata.update(new_metadata)
 
         # Save updated metadata
-        await self.skill_store.save_agent_skill_data(
+        skill_data = AgentSkillDataCreate(
             agent_id=agent_id,
             skill="web_scraper",
             key=metadata_key,
             data=existing_metadata,
         )
+        await skill_data.save()
 
 
 class ResponseFormatter:

{intentkit-0.8.11.dev1.dist-info → intentkit-0.8.12.dev2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: intentkit
-Version: 0.8.11.dev1
+Version: 0.8.12.dev2
 Summary: Intent-based AI Agent Platform - Core Package
 Project-URL: Homepage, https://github.com/crestalnetwork/intentkit
 Project-URL: Repository, https://github.com/crestalnetwork/intentkit