intentkit 0.8.6.dev2__py3-none-any.whl → 0.8.17__py3-none-any.whl

intentkit/skills/heurist/image_generation_arthemy_comics.py

@@ -1,10 +1,10 @@
 import logging
-from typing import Optional, Type
 
 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
 
@@ -17,16 +17,16 @@ class ImageGenerationArthemyComicsInput(BaseModel):
     prompt: str = Field(
         description="Text prompt describing the image to generate.",
     )
-    neg_prompt: Optional[str] = Field(
+    neg_prompt: str | None = Field(
         default="(worst quality: 1.4), bad quality, nsfw",
         description="Negative prompt describing what to avoid in the generated image.",
     )
-    width: Optional[int] = Field(
+    width: int | None = Field(
         default=1024,
         le=1024,
         description="Width of the generated image.",
     )
-    height: Optional[int] = Field(
+    height: int | None = Field(
         default=1024,
         le=1024,
         description="Height of the generated image.",
@@ -52,14 +52,14 @@ class ImageGenerationArthemyComics(HeuristBaseTool):
         "ArthemyComics specializes in creating vibrant, stylized comic book illustrations.\n"
         "If you have height and width, remember to specify them.\n"
     )
-    args_schema: Type[BaseModel] = ImageGenerationArthemyComicsInput
+    args_schema: type[BaseModel] = ImageGenerationArthemyComicsInput
 
     async def _arun(
         self,
         prompt: str,
-        neg_prompt: Optional[str] = "(worst quality: 1.4), bad quality, nsfw",
-        width: Optional[int] = 1024,
-        height: Optional[int] = 680,
+        neg_prompt: str | None = "(worst quality: 1.4), bad quality, nsfw",
+        width: int | None = 1024,
+        height: int | None = 680,
         **kwargs,
     ) -> str:
         """Implementation of the tool to generate comic-style images using Heurist AI's ArthemyComics model.
@@ -78,20 +78,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

@@ -1,10 +1,10 @@
 import logging
-from typing import Optional, Type
 
 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
 
@@ -17,16 +17,16 @@ class ImageGenerationArthemyRealInput(BaseModel):
     prompt: str = Field(
         description="Text prompt describing the image to generate.",
     )
-    neg_prompt: Optional[str] = Field(
+    neg_prompt: str | None = Field(
         default="(worst quality: 1.4), bad quality, nsfw",
         description="Negative prompt describing what to avoid in the generated image.",
     )
-    width: Optional[int] = Field(
+    width: int | None = Field(
         default=1024,
         le=1024,
         description="Width of the generated image.",
     )
-    height: Optional[int] = Field(
+    height: int | None = Field(
         default=1024,
         le=1024,
         description="Height of the generated image.",
@@ -52,14 +52,14 @@ class ImageGenerationArthemyReal(HeuristBaseTool):
         "ArthemyReal specializes in creating photorealistic, lifelike images with fine details.\n"
         "If you have height and width, remember to specify them.\n"
     )
-    args_schema: Type[BaseModel] = ImageGenerationArthemyRealInput
+    args_schema: type[BaseModel] = ImageGenerationArthemyRealInput
 
     async def _arun(
         self,
         prompt: str,
-        neg_prompt: Optional[str] = "(worst quality: 1.4), bad quality, nsfw",
-        width: Optional[int] = 1024,
-        height: Optional[int] = 680,
+        neg_prompt: str | None = "(worst quality: 1.4), bad quality, nsfw",
+        width: int | None = 1024,
+        height: int | None = 680,
         **kwargs,
     ) -> str:
         """Implementation of the tool to generate realistic images using Heurist AI's ArthemyReal model.
@@ -78,20 +78,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

@@ -1,10 +1,10 @@
 import logging
-from typing import Optional, Type
 
 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
 
@@ -17,16 +17,16 @@ class ImageGenerationBrainDanceInput(BaseModel):
     prompt: str = Field(
         description="Text prompt describing the image to generate.",
     )
-    neg_prompt: Optional[str] = Field(
+    neg_prompt: str | None = Field(
         default="(worst quality: 1.4), bad quality, nsfw",
         description="Negative prompt describing what to avoid in the generated image.",
     )
-    width: Optional[int] = Field(
+    width: int | None = Field(
         default=1024,
         le=1024,
         description="Width of the generated image.",
     )
-    height: Optional[int] = Field(
+    height: int | None = Field(
         default=1024,
         le=1024,
         description="Height of the generated image.",
@@ -52,14 +52,14 @@ class ImageGenerationBrainDance(HeuristBaseTool):
         "BrainDance specializes in creating unique, artistic interpretations with creative flair.\n"
         "If you have height and width, remember to specify them.\n"
     )
-    args_schema: Type[BaseModel] = ImageGenerationBrainDanceInput
+    args_schema: type[BaseModel] = ImageGenerationBrainDanceInput
 
     async def _arun(
         self,
         prompt: str,
-        neg_prompt: Optional[str] = "(worst quality: 1.4), bad quality, nsfw",
-        width: Optional[int] = 1024,
-        height: Optional[int] = 680,
+        neg_prompt: str | None = "(worst quality: 1.4), bad quality, nsfw",
+        width: int | None = 1024,
+        height: int | None = 680,
         **kwargs,
     ) -> str:
         """Implementation of the tool to generate artistic images using Heurist AI's BrainDance model.
@@ -78,20 +78,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

@@ -1,10 +1,10 @@
 import logging
-from typing import Optional, Type
 
 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
 
@@ -17,16 +17,16 @@ class ImageGenerationCyberRealisticXLInput(BaseModel):
     prompt: str = Field(
         description="Text prompt describing the image to generate.",
     )
-    neg_prompt: Optional[str] = Field(
+    neg_prompt: str | None = Field(
         default="(worst quality: 1.4), bad quality, nsfw",
         description="Negative prompt describing what to avoid in the generated image.",
     )
-    width: Optional[int] = Field(
+    width: int | None = Field(
         default=1024,
         le=1024,
         description="Width of the generated image.",
     )
-    height: Optional[int] = Field(
+    height: int | None = Field(
         default=680,
         le=1024,
         description="Height of the generated image.",
@@ -52,14 +52,14 @@ class ImageGenerationCyberRealisticXL(HeuristBaseTool):
         "CyberRealisticXL specializes in creating high-quality hyperrealistic photographs with a cyberpunk aesthetic.\n"
         "If you have height and width, remember to specify them.\n"
     )
-    args_schema: Type[BaseModel] = ImageGenerationCyberRealisticXLInput
+    args_schema: type[BaseModel] = ImageGenerationCyberRealisticXLInput
 
     async def _arun(
         self,
         prompt: str,
-        neg_prompt: Optional[str] = "(worst quality: 1.4), bad quality, nsfw",
-        width: Optional[int] = 1024,
-        height: Optional[int] = 680,
+        neg_prompt: str | None = "(worst quality: 1.4), bad quality, nsfw",
+        width: int | None = 1024,
+        height: int | None = 680,
         **kwargs,
     ) -> str:
         """Implementation of the tool to generate hyperrealistic cyberpunk images using Heurist AI's CyberRealisticXL model.
@@ -78,20 +78,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

@@ -1,10 +1,10 @@
 import logging
-from typing import Optional, Type
 
 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
 
@@ -17,16 +17,16 @@ class ImageGenerationFlux1DevInput(BaseModel):
     prompt: str = Field(
         description="Text prompt describing the image to generate.",
     )
-    neg_prompt: Optional[str] = Field(
+    neg_prompt: str | None = Field(
         default="",
         description="Negative prompt describing what to avoid in the generated image.",
     )
-    width: Optional[int] = Field(
+    width: int | None = Field(
         default=1024,
         le=2048,
         description="Width of the generated image.",
     )
-    height: Optional[int] = Field(
+    height: int | None = Field(
         default=1024,
         le=2048,
         description="Height of the generated image.",
@@ -52,14 +52,14 @@ class ImageGenerationFlux1Dev(HeuristBaseTool):
         "Flux.1-dev is a versatile, general-purpose model capable of generating images in any style.\n"
         "If you have height and width, remember to specify them.\n"
     )
-    args_schema: Type[BaseModel] = ImageGenerationFlux1DevInput
+    args_schema: type[BaseModel] = ImageGenerationFlux1DevInput
 
     async def _arun(
         self,
         prompt: str,
-        neg_prompt: Optional[str] = "",
-        width: Optional[int] = 1024,
-        height: Optional[int] = 680,
+        neg_prompt: str | None = "",
+        width: int | None = 1024,
+        height: int | None = 680,
         **kwargs,
     ) -> str:
         """Implementation of the tool to generate images using Heurist AI's Flux.1-dev model.
@@ -78,20 +78,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

@@ -1,10 +1,10 @@
 import logging
-from typing import Optional, Type
 
 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
 
@@ -17,16 +17,16 @@ class ImageGenerationSDXLInput(BaseModel):
     prompt: str = Field(
         description="Text prompt describing the image to generate.",
     )
-    neg_prompt: Optional[str] = Field(
+    neg_prompt: str | None = Field(
         default="(worst quality: 1.4), bad quality, nsfw",
         description="Negative prompt describing what to avoid in the generated image.",
     )
-    width: Optional[int] = Field(
+    width: int | None = Field(
         default=1024,
         le=1024,
         description="Width of the generated image.",
     )
-    height: Optional[int] = Field(
+    height: int | None = Field(
         default=1024,
         le=1024,
         description="Height of the generated image.",
@@ -52,14 +52,14 @@ class ImageGenerationSDXL(HeuristBaseTool):
         "SDXL is a versatile, general-purpose model capable of generating high-quality images in any style.\n"
         "If you have height and width, remember to specify them.\n"
     )
-    args_schema: Type[BaseModel] = ImageGenerationSDXLInput
+    args_schema: type[BaseModel] = ImageGenerationSDXLInput
 
     async def _arun(
         self,
         prompt: str,
-        neg_prompt: Optional[str] = "(worst quality: 1.4), bad quality, nsfw",
-        width: Optional[int] = 1024,
-        height: Optional[int] = 680,
+        neg_prompt: str | None = "(worst quality: 1.4), bad quality, nsfw",
+        width: int | None = 1024,
+        height: int | None = 680,
         **kwargs,
     ) -> str:
         """Implementation of the tool to generate images using Heurist AI's SDXL model.
@@ -78,20 +78,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

@@ -1,8 +1,5 @@
-from typing import Type
-
 from pydantic import BaseModel, Field
 
-from intentkit.abstracts.skill import SkillStoreABC
 from intentkit.skills.base import IntentKitSkill
 
 
@@ -11,10 +8,7 @@ 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"
-    )
+    args_schema: type[BaseModel]
 
     @property
     def category(self) -> str:

intentkit/skills/http/get.py

@@ -1,7 +1,8 @@
 import logging
-from typing import Any, Dict, Optional, Type
+from typing import Any
 
 import httpx
+from langchain_core.tools import ToolException
 from pydantic import BaseModel, Field
 
 from intentkit.skills.http.base import HttpBaseTool
@@ -13,15 +14,15 @@ class HttpGetInput(BaseModel):
     """Input for HTTP GET request."""
 
     url: str = Field(description="The URL to send the GET request to")
-    headers: Optional[Dict[str, str]] = Field(
+    headers: dict[str, str] | None = Field(
         description="Optional headers to include in the request",
         default=None,
     )
-    params: Optional[Dict[str, Any]] = Field(
+    params: dict[str, Any] | None = Field(
         description="Optional query parameters to include in the request",
         default=None,
     )
-    timeout: Optional[float] = Field(
+    timeout: float | None = Field(
         description="Request timeout in seconds (default: 30)",
         default=30.0,
     )
@@ -46,13 +47,13 @@ class HttpGet(HttpBaseTool):
         "Returns the response content as text. "
         "Use this when you need to fetch data from web APIs or websites."
     )
-    args_schema: Type[BaseModel] = HttpGetInput
+    args_schema: type[BaseModel] = HttpGetInput
 
     async def _arun(
         self,
         url: str,
-        headers: Optional[Dict[str, str]] = None,
-        params: Optional[Dict[str, Any]] = None,
+        headers: dict[str, str] | None = None,
+        params: dict[str, Any] | None = None,
         timeout: float = 30.0,
         **kwargs,
     ) -> str:
@@ -83,12 +84,16 @@ class HttpGet(HttpBaseTool):
                 # Return response content
                 return f"Status: {response.status_code}\nContent: {response.text}"
 
-        except httpx.TimeoutException:
-            return f"Error: Request to {url} timed out after {timeout} seconds"
-        except httpx.HTTPStatusError as e:
-            return f"Error: HTTP {e.response.status_code} - {e.response.text}"
-        except httpx.RequestError as e:
-            return f"Error: Failed to connect to {url} - {str(e)}"
-        except Exception as e:
-            logger.error(f"Unexpected error in HTTP GET request: {e}")
-            return f"Error: Unexpected error occurred - {str(e)}"
+        except httpx.TimeoutException as exc:
+            raise ToolException(
+                f"Request to {url} timed out after {timeout} seconds"
+            ) from exc
+        except httpx.HTTPStatusError as exc:
+            raise ToolException(
+                f"HTTP {exc.response.status_code} - {exc.response.text}"
+            ) from exc
+        except httpx.RequestError as exc:
+            raise ToolException(f"Failed to connect to {url} - {str(exc)}") from exc
+        except Exception as exc:  # noqa: BLE001
+            logger.error("Unexpected error in HTTP GET request", exc_info=exc)
+            raise ToolException(f"Unexpected error occurred - {str(exc)}") from exc