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

intentkit/skills/firecrawl/utils.py

@@ -9,7 +9,7 @@ from langchain_community.vectorstores import FAISS
 from langchain_core.documents import Document
 from langchain_openai import OpenAIEmbeddings
 
-from intentkit.abstracts.skill import SkillStoreABC
+from intentkit.config.config import config
 from intentkit.models.skill import AgentSkillData, AgentSkillDataCreate
 
 logger = logging.getLogger(__name__)
@@ -63,15 +63,20 @@ class FirecrawlDocumentProcessor:
 class FirecrawlVectorStoreManager:
     """Manages vector store operations for Firecrawl content."""
 
-    def __init__(self, skill_store: SkillStoreABC):
-        self.skill_store = skill_store
+    def __init__(self, embedding_api_key: Optional[str] = None):
+        self._embedding_api_key = embedding_api_key
+
+    def _resolve_api_key(self) -> str:
+        """Resolve the API key to use for embeddings."""
+        if self._embedding_api_key:
+            return self._embedding_api_key
+        if config.openai_api_key:
+            return config.openai_api_key
+        raise ValueError("OpenAI API key not found in system configuration")
 
     def create_embeddings(self) -> OpenAIEmbeddings:
         """Create OpenAI embeddings instance."""
-        openai_api_key = self.skill_store.get_system_config("openai_api_key")
-        if not openai_api_key:
-            raise ValueError("OpenAI API key not found in system configuration")
-
+        openai_api_key = self._resolve_api_key()
         return OpenAIEmbeddings(
             openai_api_key=openai_api_key, model="text-embedding-3-small"
         )
@@ -179,11 +184,9 @@ class FirecrawlVectorStoreManager:
 class FirecrawlMetadataManager:
     """Manages metadata for Firecrawl indexed content."""
 
-    def __init__(self, skill_store: SkillStoreABC):
-        self.skill_store = skill_store
-
+    @staticmethod
     def create_url_metadata(
-        self, urls: List[str], documents: List[Document], source_type: str
+        urls: List[str], documents: List[Document], source_type: str
     ) -> Dict[str, Any]:
         """Create metadata for indexed URLs."""
         return {
@@ -193,9 +196,9 @@ class FirecrawlMetadataManager:
             "indexed_at": str(len(urls)),  # Simple counter
         }
 
-    async def update_metadata(
-        self, agent_id: str, new_metadata: Dict[str, Any]
-    ) -> None:
+    @staticmethod
+    @staticmethod
+    async def update_metadata(agent_id: str, new_metadata: Dict[str, Any]) -> None:
         """Update metadata for an agent."""
         try:
             metadata_key = f"indexed_urls_{agent_id}"
@@ -214,7 +217,7 @@ class FirecrawlMetadataManager:
 async def index_documents(
     documents: List[Document],
     agent_id: str,
-    skill_store: SkillStoreABC,
+    vector_manager: FirecrawlVectorStoreManager,
     chunk_size: int = 1000,
     chunk_overlap: int = 200,
 ) -> Tuple[int, bool]:
@@ -224,7 +227,7 @@ async def index_documents(
     Args:
         documents: List of documents to index
         agent_id: Agent ID for storage
-        skill_store: Skill store for persistence
+        vector_manager: Vector store manager
         chunk_size: Size of text chunks
         chunk_overlap: Overlap between chunks
 
@@ -233,8 +236,6 @@ async def index_documents(
     """
     try:
         # Initialize managers
-        vs_manager = FirecrawlVectorStoreManager(skill_store)
-
         # Split documents into chunks
         split_docs = FirecrawlDocumentProcessor.split_documents(
             documents, chunk_size, chunk_overlap
@@ -245,10 +246,10 @@ async def index_documents(
             return 0, False
 
         # Create embeddings
-        embeddings = vs_manager.create_embeddings()
+        embeddings = vector_manager.create_embeddings()
 
         # Try to load existing vector store
-        existing_vector_store = await vs_manager.load_vector_store(agent_id)
+        existing_vector_store = await vector_manager.load_vector_store(agent_id)
 
         if existing_vector_store:
             # Add to existing vector store
@@ -261,7 +262,7 @@ async def index_documents(
             was_merged = False
 
         # Save the vector store
-        await vs_manager.save_vector_store(
+        await vector_manager.save_vector_store(
             agent_id, vector_store, chunk_size, chunk_overlap
         )
 
@@ -278,7 +279,7 @@ async def index_documents(
 async def query_indexed_content(
     query: str,
     agent_id: str,
-    skill_store: SkillStoreABC,
+    vector_manager: FirecrawlVectorStoreManager,
     max_results: int = 4,
 ) -> List[Document]:
     """
@@ -287,7 +288,7 @@ async def query_indexed_content(
     Args:
         query: Search query
         agent_id: Agent ID
-        skill_store: Skill store for persistence
+        vector_manager: Manager for vector store persistence
         max_results: Maximum number of results to return
 
     Returns:
@@ -295,10 +296,8 @@ async def query_indexed_content(
     """
     try:
         # Initialize vector store manager
-        vs_manager = FirecrawlVectorStoreManager(skill_store)
-
         # Load vector store
-        vector_store = await vs_manager.load_vector_store(agent_id)
+        vector_store = await vector_manager.load_vector_store(agent_id)
 
         if not vector_store:
             logger.warning(f"No vector store found for agent {agent_id}")

intentkit/skills/github/__init__.py

@@ -1,6 +1,5 @@
 from typing import TypedDict
 
-from intentkit.abstracts.skill import SkillStoreABC
 from intentkit.skills.base import SkillConfig, SkillState
 from intentkit.skills.github.base import GitHubBaseTool
 from intentkit.skills.github.github_search import GitHubSearch
@@ -22,7 +21,6 @@ class Config(SkillConfig):
 async def get_skills(
     config: "Config",
     is_private: bool,
-    store: SkillStoreABC,
     **_,
 ) -> list[GitHubBaseTool]:
     """Get all GitHub skills."""
@@ -36,19 +34,16 @@ async def get_skills(
             available_skills.append(skill_name)
 
     # Get each skill using the cached getter
-    return [get_github_skill(name, store) for name in available_skills]
+    return [get_github_skill(name) for name in available_skills]
 
 
 def get_github_skill(
     name: str,
-    store: SkillStoreABC,
 ) -> GitHubBaseTool:
     """Get a GitHub skill by name."""
     if name == "github_search":
         if name not in _cache:
-            _cache[name] = GitHubSearch(
-                skill_store=store,
-            )
+            _cache[name] = GitHubSearch()
         return _cache[name]
     else:
         raise ValueError(f"Unknown GitHub skill: {name}")

intentkit/skills/github/base.py

@@ -2,7 +2,6 @@ from typing import Type
 
 from pydantic import BaseModel, Field
 
-from intentkit.abstracts.skill import SkillStoreABC
 from intentkit.skills.base import IntentKitSkill
 
 
@@ -12,9 +11,6 @@ class GitHubBaseTool(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"
-    )
 
     @property
     def category(self) -> str:

intentkit/skills/heurist/__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.heurist.base import HeuristBaseTool
 from intentkit.skills.heurist.image_generation_animagine_xl import (
@@ -52,7 +51,6 @@ class Config(SkillConfig):
 async def get_skills(
     config: "Config",
     is_private: bool,
-    store: SkillStoreABC,
     **_,
 ) -> list[HeuristBaseTool]:
     """Get all Heurist AI skills.
@@ -60,7 +58,6 @@ async def get_skills(
     Args:
         config: The configuration for Heurist AI skills.
         is_private: Whether to include private skills.
-        store: The skill store for persisting data.
 
     Returns:
         A list of Heurist AI skills.
@@ -77,7 +74,7 @@ async def get_skills(
     # Get each skill using the cached getter
     result = []
     for name in available_skills:
-        skill = get_heurist_skill(name, store)
+        skill = get_heurist_skill(name)
         if skill:
             result.append(skill)
     return result
@@ -85,58 +82,42 @@ async def get_skills(
 
 def get_heurist_skill(
     name: str,
-    store: SkillStoreABC,
 ) -> HeuristBaseTool:
     """Get a Heurist AI skill by name.
 
     Args:
         name: The name of the skill to get
-        store: The skill store for persisting data
 
     Returns:
         The requested Heurist AI skill
     """
     if name == "image_generation_animagine_xl":
         if name not in _cache:
-            _cache[name] = ImageGenerationAnimagineXL(
-                skill_store=store,
-            )
+            _cache[name] = ImageGenerationAnimagineXL()
         return _cache[name]
     elif name == "image_generation_arthemy_comics":
         if name not in _cache:
-            _cache[name] = ImageGenerationArthemyComics(
-                skill_store=store,
-            )
+            _cache[name] = ImageGenerationArthemyComics()
         return _cache[name]
     elif name == "image_generation_arthemy_real":
         if name not in _cache:
-            _cache[name] = ImageGenerationArthemyReal(
-                skill_store=store,
-            )
+            _cache[name] = ImageGenerationArthemyReal()
         return _cache[name]
     elif name == "image_generation_braindance":
         if name not in _cache:
-            _cache[name] = ImageGenerationBrainDance(
-                skill_store=store,
-            )
+            _cache[name] = ImageGenerationBrainDance()
         return _cache[name]
     elif name == "image_generation_cyber_realistic_xl":
         if name not in _cache:
-            _cache[name] = ImageGenerationCyberRealisticXL(
-                skill_store=store,
-            )
+            _cache[name] = ImageGenerationCyberRealisticXL()
         return _cache[name]
     elif name == "image_generation_flux_1_dev":
         if name not in _cache:
-            _cache[name] = ImageGenerationFlux1Dev(
-                skill_store=store,
-            )
+            _cache[name] = ImageGenerationFlux1Dev()
         return _cache[name]
     elif name == "image_generation_sdxl":
         if name not in _cache:
-            _cache[name] = ImageGenerationSDXL(
-                skill_store=store,
-            )
+            _cache[name] = ImageGenerationSDXL()
         return _cache[name]
     else:
         logger.warning(f"Unknown Heurist skill: {name}")

intentkit/skills/heurist/base.py

@@ -5,7 +5,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
 
 
@@ -18,16 +18,13 @@ class HeuristBaseTool(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("heurist_api_key")
+            return config.heurist_api_key
         # for backward compatibility, may only have api_key in skill_config
         elif skill_config.get("api_key"):
             return skill_config.get("api_key")

intentkit/skills/heurist/image_generation_animagine_xl.py

@@ -5,6 +5,7 @@ import httpx
 from epyxid import XID
 from pydantic import BaseModel, Field
 
+from intentkit.config.config import config
 from intentkit.skills.heurist.base import HeuristBaseTool
 from intentkit.utils.s3 import store_image
 
@@ -79,20 +80,19 @@ class ImageGenerationAnimagineXL(HeuristBaseTool):
         skill_config = context.agent.skill_config(self.category)
         skill_config = skill_config
 
-        # Get the Heurist API key from the skill store
+        # Get the Heurist API key from configuration
         if "api_key" in skill_config and skill_config["api_key"]:
             api_key = skill_config["api_key"]
             if skill_config.get("rate_limit_number") and skill_config.get(
                 "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,
                 )
         else:
-            api_key = self.skill_store.get_system_config("heurist_api_key")
-            await self.user_rate_limit_by_category(context.user_id, 10, 1440)
+            api_key = config.heurist_api_key
+            await self.user_rate_limit_by_category(10, 1440 * 60)
 
         # Generate a unique job ID
         job_id = str(XID())

intentkit/skills/heurist/image_generation_arthemy_comics.py

@@ -5,6 +5,7 @@ import httpx
 from epyxid import XID
 from pydantic import BaseModel, Field
 
+from intentkit.config.config import config
 from intentkit.skills.heurist.base import HeuristBaseTool
 from intentkit.utils.s3 import store_image
 
@@ -78,20 +79,19 @@ class ImageGenerationArthemyComics(HeuristBaseTool):
         skill_config = context.agent.skill_config(self.category)
         skill_config = skill_config
 
-        # Get the Heurist API key from the skill store
+        # Get the Heurist API key from configuration
         if "api_key" in skill_config and skill_config["api_key"]:
             api_key = skill_config["api_key"]
             if skill_config.get("rate_limit_number") and skill_config.get(
                 "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,
                 )
         else:
-            api_key = self.skill_store.get_system_config("heurist_api_key")
-            await self.user_rate_limit_by_category(context.user_id, 10, 1440)
+            api_key = config.heurist_api_key
+            await self.user_rate_limit_by_category(10, 1440 * 60)
 
         # Generate a unique job ID
         job_id = str(XID())

intentkit/skills/heurist/image_generation_arthemy_real.py

@@ -5,6 +5,7 @@ import httpx
 from epyxid import XID
 from pydantic import BaseModel, Field
 
+from intentkit.config.config import config
 from intentkit.skills.heurist.base import HeuristBaseTool
 from intentkit.utils.s3 import store_image
 
@@ -78,20 +79,19 @@ class ImageGenerationArthemyReal(HeuristBaseTool):
         skill_config = context.agent.skill_config(self.category)
         skill_config = skill_config
 
-        # Get the Heurist API key from the skill store
+        # Get the Heurist API key from configuration
         if "api_key" in skill_config and skill_config["api_key"]:
             api_key = skill_config["api_key"]
             if skill_config.get("rate_limit_number") and skill_config.get(
                 "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,
                 )
         else:
-            api_key = self.skill_store.get_system_config("heurist_api_key")
-            await self.user_rate_limit_by_category(context.user_id, 10, 1440)
+            api_key = config.heurist_api_key
+            await self.user_rate_limit_by_category(10, 1440 * 60)
 
         # Generate a unique job ID
         job_id = str(XID())

intentkit/skills/heurist/image_generation_braindance.py

@@ -5,6 +5,7 @@ import httpx
 from epyxid import XID
 from pydantic import BaseModel, Field
 
+from intentkit.config.config import config
 from intentkit.skills.heurist.base import HeuristBaseTool
 from intentkit.utils.s3 import store_image
 
@@ -78,20 +79,19 @@ class ImageGenerationBrainDance(HeuristBaseTool):
         skill_config = context.agent.skill_config(self.category)
         skill_config = skill_config
 
-        # Get the Heurist API key from the skill store
+        # Get the Heurist API key from configuration
         if "api_key" in skill_config and skill_config["api_key"]:
             api_key = skill_config["api_key"]
             if skill_config.get("rate_limit_number") and skill_config.get(
                 "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,
                 )
         else:
-            api_key = self.skill_store.get_system_config("heurist_api_key")
-            await self.user_rate_limit_by_category(context.user_id, 10, 1440)
+            api_key = config.heurist_api_key
+            await self.user_rate_limit_by_category(10, 1440 * 60)
 
         # Generate a unique job ID
         job_id = str(XID())

intentkit/skills/heurist/image_generation_cyber_realistic_xl.py

@@ -5,6 +5,7 @@ import httpx
 from epyxid import XID
 from pydantic import BaseModel, Field
 
+from intentkit.config.config import config
 from intentkit.skills.heurist.base import HeuristBaseTool
 from intentkit.utils.s3 import store_image
 
@@ -78,20 +79,19 @@ class ImageGenerationCyberRealisticXL(HeuristBaseTool):
         skill_config = context.agent.skill_config(self.category)
         skill_config = skill_config
 
-        # Get the Heurist API key from the skill store
+        # Get the Heurist API key from configuration
         if "api_key" in skill_config and skill_config["api_key"]:
             api_key = skill_config["api_key"]
             if skill_config.get("rate_limit_number") and skill_config.get(
                 "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,
                 )
         else:
-            api_key = self.skill_store.get_system_config("heurist_api_key")
-            await self.user_rate_limit_by_category(context.user_id, 10, 1440)
+            api_key = config.heurist_api_key
+            await self.user_rate_limit_by_category(10, 1440 * 60)
 
         # Generate a unique job ID
         job_id = str(XID())

intentkit/skills/heurist/image_generation_flux_1_dev.py

@@ -5,6 +5,7 @@ import httpx
 from epyxid import XID
 from pydantic import BaseModel, Field
 
+from intentkit.config.config import config
 from intentkit.skills.heurist.base import HeuristBaseTool
 from intentkit.utils.s3 import store_image
 
@@ -78,20 +79,19 @@ class ImageGenerationFlux1Dev(HeuristBaseTool):
         skill_config = context.agent.skill_config(self.category)
         skill_config = skill_config
 
-        # Get the Heurist API key from the skill store
+        # Get the Heurist API key from configuration
         if "api_key" in skill_config and skill_config["api_key"]:
             api_key = skill_config["api_key"]
             if skill_config.get("rate_limit_number") and skill_config.get(
                 "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,
                 )
         else:
-            api_key = self.skill_store.get_system_config("heurist_api_key")
-            await self.user_rate_limit_by_category(context.user_id, 10, 1440)
+            api_key = config.heurist_api_key
+            await self.user_rate_limit_by_category(10, 1440 * 60)
 
         # Generate a unique job ID
         job_id = str(XID())

intentkit/skills/heurist/image_generation_sdxl.py

@@ -5,6 +5,7 @@ import httpx
 from epyxid import XID
 from pydantic import BaseModel, Field
 
+from intentkit.config.config import config
 from intentkit.skills.heurist.base import HeuristBaseTool
 from intentkit.utils.s3 import store_image
 
@@ -78,20 +79,19 @@ class ImageGenerationSDXL(HeuristBaseTool):
         skill_config = context.agent.skill_config(self.category)
         skill_config = skill_config
 
-        # Get the Heurist API key from the skill store
+        # Get the Heurist API key from configuration
         if "api_key" in skill_config and skill_config["api_key"]:
             api_key = skill_config["api_key"]
             if skill_config.get("rate_limit_number") and skill_config.get(
                 "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,
                 )
         else:
-            api_key = self.skill_store.get_system_config("heurist_api_key")
-            await self.user_rate_limit_by_category(context.user_id, 10, 1440)
+            api_key = config.heurist_api_key
+            await self.user_rate_limit_by_category(10, 1440 * 60)
 
         # Generate a unique job ID
         job_id = str(XID())

intentkit/skills/http/__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.http.base import HttpBaseTool
 from intentkit.skills.http.get import HttpGet
@@ -33,7 +32,6 @@ class Config(SkillConfig):
 async def get_skills(
     config: "Config",
     is_private: bool,
-    store: SkillStoreABC,
     **_,
 ) -> list[HttpBaseTool]:
     """Get all HTTP client skills.
@@ -41,7 +39,6 @@ async def get_skills(
     Args:
         config: The configuration for HTTP client skills.
         is_private: Whether to include private skills.
-        store: The skill store for persisting data.
 
     Returns:
         A list of HTTP client skills.
@@ -58,7 +55,7 @@ async def get_skills(
     # Get each skill using the cached getter
     result = []
     for name in available_skills:
-        skill = get_http_skill(name, store)
+        skill = get_http_skill(name)
         if skill:
             result.append(skill)
     return result
@@ -66,34 +63,26 @@ async def get_skills(
 
 def get_http_skill(
     name: str,
-    store: SkillStoreABC,
 ) -> HttpBaseTool:
     """Get an HTTP client skill by name.
 
     Args:
         name: The name of the skill to get
-        store: The skill store for persisting data
 
     Returns:
         The requested HTTP client skill
     """
     if name == "http_get":
         if name not in _cache:
-            _cache[name] = HttpGet(
-                skill_store=store,
-            )
+            _cache[name] = HttpGet()
         return _cache[name]
     elif name == "http_post":
         if name not in _cache:
-            _cache[name] = HttpPost(
-                skill_store=store,
-            )
+            _cache[name] = HttpPost()
         return _cache[name]
     elif name == "http_put":
         if name not in _cache:
-            _cache[name] = HttpPut(
-                skill_store=store,
-            )
+            _cache[name] = HttpPut()
         return _cache[name]
     else:
         logger.warning(f"Unknown HTTP skill: {name}")

intentkit/skills/http/base.py

@@ -2,7 +2,6 @@ from typing import Type
 
 from pydantic import BaseModel, Field
 
-from intentkit.abstracts.skill import SkillStoreABC
 from intentkit.skills.base import IntentKitSkill
 
 
@@ -12,9 +11,6 @@ class HttpBaseTool(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"
-    )
 
     @property
     def category(self) -> str: