intentkit 0.6.9.dev2__py3-none-any.whl → 0.6.10.dev1__py3-none-any.whl

intentkit/skills/dune_analytics/fetch_nation_metrics.py

@@ -1,237 +1,234 @@
-"""Skill to fetch Crestal Nation metrics from Dune Analytics API.
-
-Supports predefined metrics (e.g., total_users, unique_ai_citizens) or direct query IDs.
-"""
-
-import difflib
-import re
-from typing import Any, Dict, Type
-
-import httpx
-from langchain_core.runnables import RunnableConfig
-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 = {
-    "total_users": 4858003,
-    "weekly_active_users": 4867200,
-    "unique_ai_citizens": 4857629,
-    "unique_creators": 4844506,
-    "ai_citizens_over_time": 4857629,
-    "chat_messages_over_time": 4857870,
-    "onchain_transactions": 4859895,
-    "total_chat_messages": 4857870,
-    "daily_skill_executions": 4861785,
-    "goods_services": 4859895,
-    "agent_tvl": 4859887,
-    "citizen_market_cap": 4859887,
-}
-QUERY_ALIASES = {
-    "agents": "unique_ai_citizens",
-    "citizens": "unique_ai_citizens",
-    "market_cap": "citizen_market_cap",
-    "nation_market_cap": "citizen_market_cap",
-    "number_of_agents": "unique_ai_citizens",
-    "number_of_citizens": "unique_ai_citizens",
-    "ai_citizens": "unique_ai_citizens",
-    "users": "total_users",
-    "active_users": "weekly_active_users",
-    "creators": "unique_creators",
-    "transactions": "onchain_transactions",
-    "messages": "total_chat_messages",
-    "skill_executions": "daily_skill_executions",
-    "tvl": "agent_tvl",
-}
-BASE_URL = "https://api.dune.com/api/v1/query"
-
-
-class NationMetricsInput(BaseModel):
-    """Input schema for fetching Crestal Nation metrics."""
-
-    metric: str = Field(
-        default="",
-        description="Metric name (e.g., total_users, agents) or query ID (e.g., 4858003). Empty for all configured metrics.",
-    )
-    limit: int = Field(
-        default=1000, description="Maximum number of results to fetch (default 1000)."
-    )
-
-
-class MetricData(BaseModel):
-    """Data model for a single metric result."""
-
-    metric: str = Field(description="Metric name or query ID")
-    data: Dict[str, Any] = Field(description="Metric data from Dune API")
-    error: str = Field(default="", description="Error message if fetch failed")
-
-
-class NationMetricsOutput(BaseModel):
-    """Output schema for Crestal Nation metrics."""
-
-    metrics: Dict[str, MetricData] = Field(
-        description="Dictionary of metric names or query IDs to their data"
-    )
-    summary: str = Field(description="Summary of fetched metrics")
-
-
-class FetchNationMetrics(DuneBaseTool):
-    """Skill to fetch Crestal Nation metrics from Dune Analytics API."""
-
-    name: str = "dune_fetch_nation_metrics"
-    description: str = (
-        "Fetches Crestal Nation metrics (e.g., total_users, agents/citizens, market_cap) from Dune Analytics API. "
-        "Supports predefined metrics, direct query IDs, or all configured metrics if none specified. "
-        "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.
-
-        Args:
-            metric: Raw metric string from input.
-
-        Returns:
-            Normalized metric string (lowercase, underscores, no punctuation).
-        """
-        if not metric:
-            return ""
-        metric = re.sub(r"[^\w\s]", "", metric.lower()).replace(" ", "_")
-        return re.sub(r"_+", "_", metric).strip("_")
-
-    def find_closest_metrics(self, metric: str, max_suggestions: int = 3) -> list[str]:
-        """Find the closest matching metrics using fuzzy matching.
-
-        Args:
-            metric: Input metric to match against.
-            max_suggestions: Maximum number of suggestions to return.
-
-        Returns:
-            List of closest metric names.
-        """
-        all_metrics = list(SUPPORTED_QUERIES.keys()) + list(QUERY_ALIASES.keys())
-        if not metric or not all_metrics:
-            return []
-        return difflib.get_close_matches(
-            metric, all_metrics, n=max_suggestions, cutoff=0.6
-        )
-
-    @retry(
-        stop=stop_after_attempt(3), wait=wait_exponential(multiplier=5, min=5, max=60)
-    )
-    async def fetch_data(
-        self, query_id: int, api_key: str, limit: int = 1000
-    ) -> Dict[str, Any]:
-        """Fetch data for a specific Dune query.
-
-        Args:
-            query_id: Dune query ID.
-            api_key: Dune API key.
-            limit: Maximum number of results (default 1000).
-
-        Returns:
-            Dictionary of query results.
-
-        Raises:
-            ToolException: If the API request fails.
-        """
-        from langchain.tools.base import ToolException
-
-        url = f"{BASE_URL}/{query_id}/results?limit={limit}"
-        headers = {"X-Dune-API-Key": api_key}
-
-        async with httpx.AsyncClient() as client:
-            try:
-                response = await client.get(url, headers=headers, timeout=10)
-                response.raise_for_status()
-                return response.json().get("result", {})
-            except (httpx.RequestError, httpx.HTTPStatusError) as e:
-                raise ToolException(f"Error fetching data from Dune API: {e}")
-
-    async def _arun(
-        self,
-        metric: str = "",
-        limit: int = 1000,
-        config: RunnableConfig = None,
-        **kwargs,
-    ) -> NationMetricsOutput:
-        """Fetch Crestal Nation metrics asynchronously.
-
-        Args:
-            metric: Metric name (e.g., total_users) or query ID (e.g., 4858003). Empty for all configured metrics.
-            limit: Maximum number of results (default 1000).
-            config: Runnable configuration.
-            **kwargs: Additional keyword arguments.
-
-        Returns:
-            NationMetricsOutput with metric data and summary.
-        """
-        import logging
-
-        logger = logging.getLogger(__name__)
-        context = self.context_from_config(config)
-        api_key = self.get_api_key(context)
-
-        metric = self.normalize_metric(metric)
-        metric = QUERY_ALIASES.get(metric, metric)
-
-        results = {}
-        metrics_to_fetch = {}
-
-        try:
-            query_id = int(metric)
-            metrics_to_fetch[str(query_id)] = query_id
-        except (ValueError, TypeError):
-            metrics_to_fetch = (
-                SUPPORTED_QUERIES
-                if not metric
-                else (
-                    {metric: SUPPORTED_QUERIES[metric]}
-                    if metric in SUPPORTED_QUERIES
-                    else {}
-                )
-            )
-
-        if not metrics_to_fetch:
-            closest_metrics = self.find_closest_metrics(metric)
-            supported = ", ".join(SUPPORTED_QUERIES.keys())
-            suggestions = (
-                f" Did you mean: {', '.join(closest_metrics)}?"
-                if closest_metrics
-                else ""
-            )
-            logger.warning(
-                "Unrecognized metric or query ID: %s. Suggested: %s",
-                metric,
-                closest_metrics,
-            )
-            return NationMetricsOutput(
-                metrics={},
-                summary=(
-                    f"Invalid metric or query ID: {metric}. Supported metrics include: {supported}.{suggestions} "
-                    "Try 'fetch nation metrics total_users' or a valid query ID, or submit a feature request at "
-                    "https://github.com/crestalnetwork/intentkit."
-                ),
-            )
-
-        for metric_name, query_id in metrics_to_fetch.items():
-            try:
-                data = await self.fetch_data(query_id, api_key, limit)
-                results[metric_name] = MetricData(metric=metric_name, data=data)
-            except Exception as e:
-                results[metric_name] = MetricData(
-                    metric=metric_name, data={}, error=str(e)
-                )
-
-        summary = f"Fetched data for {len([m for m in results.values() if not m.error])}/{len(metrics_to_fetch)} metrics."
-        if any(m.error for m in results.values()):
-            summary += f" Errors occurred for: {', '.join(m.metric for m in results.values() if m.error)}."
-
-        return NationMetricsOutput(metrics=results, summary=summary)
-
-    def _run(self, question: str):
-        raise NotImplementedError("Use _arun for async execution")
+"""Skill to fetch Crestal Nation metrics from Dune Analytics API.
+
+Supports predefined metrics (e.g., total_users, unique_ai_citizens) or direct query IDs.
+"""
+
+import difflib
+import re
+from typing import Any, Dict, Type
+
+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 = {
+    "total_users": 4858003,
+    "weekly_active_users": 4867200,
+    "unique_ai_citizens": 4857629,
+    "unique_creators": 4844506,
+    "ai_citizens_over_time": 4857629,
+    "chat_messages_over_time": 4857870,
+    "onchain_transactions": 4859895,
+    "total_chat_messages": 4857870,
+    "daily_skill_executions": 4861785,
+    "goods_services": 4859895,
+    "agent_tvl": 4859887,
+    "citizen_market_cap": 4859887,
+}
+QUERY_ALIASES = {
+    "agents": "unique_ai_citizens",
+    "citizens": "unique_ai_citizens",
+    "market_cap": "citizen_market_cap",
+    "nation_market_cap": "citizen_market_cap",
+    "number_of_agents": "unique_ai_citizens",
+    "number_of_citizens": "unique_ai_citizens",
+    "ai_citizens": "unique_ai_citizens",
+    "users": "total_users",
+    "active_users": "weekly_active_users",
+    "creators": "unique_creators",
+    "transactions": "onchain_transactions",
+    "messages": "total_chat_messages",
+    "skill_executions": "daily_skill_executions",
+    "tvl": "agent_tvl",
+}
+BASE_URL = "https://api.dune.com/api/v1/query"
+
+
+class NationMetricsInput(BaseModel):
+    """Input schema for fetching Crestal Nation metrics."""
+
+    metric: str = Field(
+        default="",
+        description="Metric name (e.g., total_users, agents) or query ID (e.g., 4858003). Empty for all configured metrics.",
+    )
+    limit: int = Field(
+        default=1000, description="Maximum number of results to fetch (default 1000)."
+    )
+
+
+class MetricData(BaseModel):
+    """Data model for a single metric result."""
+
+    metric: str = Field(description="Metric name or query ID")
+    data: Dict[str, Any] = Field(description="Metric data from Dune API")
+    error: str = Field(default="", description="Error message if fetch failed")
+
+
+class NationMetricsOutput(BaseModel):
+    """Output schema for Crestal Nation metrics."""
+
+    metrics: Dict[str, MetricData] = Field(
+        description="Dictionary of metric names or query IDs to their data"
+    )
+    summary: str = Field(description="Summary of fetched metrics")
+
+
+class FetchNationMetrics(DuneBaseTool):
+    """Skill to fetch Crestal Nation metrics from Dune Analytics API."""
+
+    name: str = "dune_fetch_nation_metrics"
+    description: str = (
+        "Fetches Crestal Nation metrics (e.g., total_users, agents/citizens, market_cap) from Dune Analytics API. "
+        "Supports predefined metrics, direct query IDs, or all configured metrics if none specified. "
+        "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.
+
+        Args:
+            metric: Raw metric string from input.
+
+        Returns:
+            Normalized metric string (lowercase, underscores, no punctuation).
+        """
+        if not metric:
+            return ""
+        metric = re.sub(r"[^\w\s]", "", metric.lower()).replace(" ", "_")
+        return re.sub(r"_+", "_", metric).strip("_")
+
+    def find_closest_metrics(self, metric: str, max_suggestions: int = 3) -> list[str]:
+        """Find the closest matching metrics using fuzzy matching.
+
+        Args:
+            metric: Input metric to match against.
+            max_suggestions: Maximum number of suggestions to return.
+
+        Returns:
+            List of closest metric names.
+        """
+        all_metrics = list(SUPPORTED_QUERIES.keys()) + list(QUERY_ALIASES.keys())
+        if not metric or not all_metrics:
+            return []
+        return difflib.get_close_matches(
+            metric, all_metrics, n=max_suggestions, cutoff=0.6
+        )
+
+    @retry(
+        stop=stop_after_attempt(3), wait=wait_exponential(multiplier=5, min=5, max=60)
+    )
+    async def fetch_data(
+        self, query_id: int, api_key: str, limit: int = 1000
+    ) -> Dict[str, Any]:
+        """Fetch data for a specific Dune query.
+
+        Args:
+            query_id: Dune query ID.
+            api_key: Dune API key.
+            limit: Maximum number of results (default 1000).
+
+        Returns:
+            Dictionary of query results.
+
+        Raises:
+            ToolException: If the API request fails.
+        """
+        from langchain.tools.base import ToolException
+
+        url = f"{BASE_URL}/{query_id}/results?limit={limit}"
+        headers = {"X-Dune-API-Key": api_key}
+
+        async with httpx.AsyncClient() as client:
+            try:
+                response = await client.get(url, headers=headers, timeout=10)
+                response.raise_for_status()
+                return response.json().get("result", {})
+            except (httpx.RequestError, httpx.HTTPStatusError) as e:
+                raise ToolException(f"Error fetching data from Dune API: {e}")
+
+    async def _arun(
+        self,
+        metric: str = "",
+        limit: int = 1000,
+        **kwargs,
+    ) -> NationMetricsOutput:
+        """Fetch Crestal Nation metrics asynchronously.
+
+        Args:
+            metric: Metric name (e.g., total_users) or query ID (e.g., 4858003). Empty for all configured metrics.
+            limit: Maximum number of results (default 1000).
+            config: Runnable configuration.
+            **kwargs: Additional keyword arguments.
+
+        Returns:
+            NationMetricsOutput with metric data and summary.
+        """
+        import logging
+
+        logger = logging.getLogger(__name__)
+        api_key = self.get_api_key()
+
+        metric = self.normalize_metric(metric)
+        metric = QUERY_ALIASES.get(metric, metric)
+
+        results = {}
+        metrics_to_fetch = {}
+
+        try:
+            query_id = int(metric)
+            metrics_to_fetch[str(query_id)] = query_id
+        except (ValueError, TypeError):
+            metrics_to_fetch = (
+                SUPPORTED_QUERIES
+                if not metric
+                else (
+                    {metric: SUPPORTED_QUERIES[metric]}
+                    if metric in SUPPORTED_QUERIES
+                    else {}
+                )
+            )
+
+        if not metrics_to_fetch:
+            closest_metrics = self.find_closest_metrics(metric)
+            supported = ", ".join(SUPPORTED_QUERIES.keys())
+            suggestions = (
+                f" Did you mean: {', '.join(closest_metrics)}?"
+                if closest_metrics
+                else ""
+            )
+            logger.warning(
+                "Unrecognized metric or query ID: %s. Suggested: %s",
+                metric,
+                closest_metrics,
+            )
+            return NationMetricsOutput(
+                metrics={},
+                summary=(
+                    f"Invalid metric or query ID: {metric}. Supported metrics include: {supported}.{suggestions} "
+                    "Try 'fetch nation metrics total_users' or a valid query ID, or submit a feature request at "
+                    "https://github.com/crestalnetwork/intentkit."
+                ),
+            )
+
+        for metric_name, query_id in metrics_to_fetch.items():
+            try:
+                data = await self.fetch_data(query_id, api_key, limit)
+                results[metric_name] = MetricData(metric=metric_name, data=data)
+            except Exception as e:
+                results[metric_name] = MetricData(
+                    metric=metric_name, data={}, error=str(e)
+                )
+
+        summary = f"Fetched data for {len([m for m in results.values() if not m.error])}/{len(metrics_to_fetch)} metrics."
+        if any(m.error for m in results.values()):
+            summary += f" Errors occurred for: {', '.join(m.metric for m in results.values() if m.error)}."
+
+        return NationMetricsOutput(metrics=results, summary=summary)
+
+    def _run(self, question: str):
+        raise NotImplementedError("Use _arun for async execution")

intentkit/skills/elfa/base.py

@@ -1,9 +1,10 @@
-from typing import Optional, Type
+from typing import Type
 
+from langchain.tools.base import ToolException
 from pydantic import BaseModel, Field
 
 from intentkit.abstracts.skill import SkillStoreABC
-from intentkit.skills.base import IntentKitSkill, SkillContext
+from intentkit.skills.base import IntentKitSkill
 
 base_url = "https://api.elfa.ai/v2"
 
@@ -18,10 +19,19 @@ class ElfaBaseTool(IntentKitSkill):
         description="The skill store for persisting data"
     )
 
-    def get_api_key(self, context: SkillContext) -> Optional[str]:
-        if "api_key" in context.config and context.config["api_key"]:
-            return context.config["api_key"]
-        return self.skill_store.get_system_config("elfa_api_key")
+    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")
+        # for backward compatibility, may only have api_key in skill_config
+        elif 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"
+            )
 
     @property
     def category(self) -> str:

intentkit/skills/elfa/mention.py

@@ -2,7 +2,6 @@
 
 from typing import Any, Dict, List, Optional, Type
 
-from langchain_core.runnables import RunnableConfig
 from pydantic import BaseModel, Field
 
 from .base import ElfaBaseTool
@@ -55,7 +54,6 @@ class ElfaGetTopMentions(ElfaBaseTool):
         timeWindow: str = "1h",
         page: int = 1,
         pageSize: int = 10,
-        config: RunnableConfig = None,
         **kwargs,
     ) -> ElfaGetTopMentionsOutput:
         """
@@ -76,8 +74,7 @@ class ElfaGetTopMentions(ElfaBaseTool):
             ValueError: If API key is not found
             ToolException: If there's an error with the API request
         """
-        context = self.context_from_config(config)
-        api_key = self.get_api_key(context)
+        api_key = self.get_api_key()
 
         # Prepare parameters according to API spec
         params = {
@@ -163,7 +160,6 @@ class ElfaSearchMentions(ElfaBaseTool):
         limit: int = 20,
         searchType: str = "or",
         cursor: Optional[str] = None,
-        config: RunnableConfig = None,
         **kwargs,
     ) -> ElfaSearchMentionsOutput:
         """
@@ -186,8 +182,7 @@ class ElfaSearchMentions(ElfaBaseTool):
             ValueError: If API key is not found or neither keywords nor accountName provided
             ToolException: If there's an error with the API request
         """
-        context = self.context_from_config(config)
-        api_key = self.get_api_key(context)
+        api_key = self.get_api_key()
 
         # Validate that at least one search criteria is provided
         if not keywords and not accountName:

intentkit/skills/elfa/stats.py

@@ -2,7 +2,6 @@
 
 from typing import Any, Dict, Optional, Type
 
-from langchain_core.runnables import RunnableConfig
 from pydantic import BaseModel, Field
 
 from .base import ElfaBaseTool
@@ -46,9 +45,7 @@ class ElfaGetSmartStats(ElfaBaseTool):
     and social media performance audits."""
     args_schema: Type[BaseModel] = ElfaGetSmartStatsInput
 
-    async def _arun(
-        self, username: str, config: RunnableConfig = None, **kwargs
-    ) -> ElfaGetSmartStatsOutput:
+    async def _arun(self, username: str, **kwargs) -> ElfaGetSmartStatsOutput:
         """
         Execute the smart stats request.
 
@@ -64,8 +61,7 @@ class ElfaGetSmartStats(ElfaBaseTool):
             ValueError: If API key is not found
             ToolException: If there's an error with the API request
         """
-        context = self.context_from_config(config)
-        api_key = self.get_api_key(context)
+        api_key = self.get_api_key()
 
         # Prepare parameters according to API spec
         params = {"username": username}

intentkit/skills/elfa/tokens.py

@@ -2,7 +2,6 @@
 
 from typing import Any, Dict, List, Optional, Type
 
-from langchain_core.runnables import RunnableConfig
 from pydantic import BaseModel, Field
 
 from .base import ElfaBaseTool
@@ -69,7 +68,6 @@ class ElfaGetTrendingTokens(ElfaBaseTool):
         page: int = 1,
         pageSize: int = 50,
         minMentions: int = 5,
-        config: RunnableConfig = None,
         **kwargs,
     ) -> ElfaGetTrendingTokensOutput:
         """
@@ -90,8 +88,7 @@ class ElfaGetTrendingTokens(ElfaBaseTool):
             ValueError: If API key is not found
             ToolException: If there's an error with the API request
         """
-        context = self.context_from_config(config)
-        api_key = self.get_api_key(context)
+        api_key = self.get_api_key()
 
         # Prepare parameters according to API spec
         params = {