Merge pull request #29 from helloissariel/fix/api-call

[Neo]Fix api call

Author: moonpyt

spoon_toolkits/__init__.py

@@ -49,7 +49,7 @@
     GetTotalSentAndReceivedTool,
     GetRawTransactionByAddressTool,
     GetTransferByAddressTool,
-    GetNep11OwnedByAddressTool,
+    GetNep11ByAddressAndHashTool,
 
     # Asset tools (5)
     GetAssetCountTool,
@@ -66,13 +66,12 @@
     GetRecentBlocksInfoTool,
     GetBlockRewardByHashTool,
 
-    # Contract tools (6)
+    # Contract tools (5)
     GetContractCountTool,
     GetContractByHashTool,
     GetContractListByNameTool,
     GetVerifiedContractByContractHashTool,
     GetVerifiedContractTool,
-    GetSourceCodeByContractHashTool,
 
     # Transaction tools (8)
     GetTransactionCountTool,
@@ -95,9 +94,8 @@
     GetVotesByCandidateAddressTool,
     GetTotalVotesTool,
 
-    # NEP tools (12)
+    # NEP tools (11)
     GetNep11BalanceTool,
-    GetNep11OwnedByAddressTool,
     GetNep11ByAddressAndHashTool,
     GetNep11TransferByAddressTool,
     GetNep11TransferByBlockHeightTool,
@@ -110,28 +108,17 @@
     GetNep17TransferCountByAddressTool,
 
     # Smart Contract Call tools (3)
-    InvokeContractTool,
-    TestInvokeContractTool,
-    GetContractStateTool,
+    GetScCallByContractHashTool,
+    GetScCallByContractHashAddressTool,
+    GetScCallByTransactionHashTool,
 
     # Application Log and State tools (2)
     GetApplicationLogTool,
     GetApplicationStateTool,
 
-    # Statistics and Monitoring tools (4)
-    GetNetworkStatisticsTool,
-    GetTransactionStatisticsTool,
-    GetAddressStatisticsTool,
-    GetContractStatisticsTool,
-
     # Governance tools (1)
     GetCommitteeInfoTool,
 
-    # Utility tools (3)
-    ValidateAddressTool,
-    ConvertAddressTool,
-    GetNetworkInfoTool,
-
     # Provider
     NeoProvider,
     get_provider,

spoon_toolkits/crypto/neo/__init__.py

@@ -38,7 +38,6 @@
     GetContractListByNameTool,
     GetVerifiedContractByContractHashTool,
     GetVerifiedContractTool,
-    GetSourceCodeByContractHashTool,
 )
 
 # Transaction tools
@@ -69,7 +68,6 @@
 # NEP tools
 from .nep_tools import (
     GetNep11BalanceTool,
-    GetNep11OwnedByAddressTool,
     GetNep11ByAddressAndHashTool,
     GetNep11TransferByAddressTool,
     GetNep11TransferByBlockHeightTool,
@@ -84,9 +82,9 @@
 
 # Smart Contract Call tools
 from .sc_call_tools import (
-    InvokeContractTool,
-    TestInvokeContractTool,
-    GetContractStateTool,
+    GetScCallByContractHashTool,
+    GetScCallByContractHashAddressTool,
+    GetScCallByTransactionHashTool,
 )
 
 # Application Log and State tools
@@ -95,26 +93,11 @@
     GetApplicationStateTool,
 )
 
-# Statistics and Monitoring tools
-from .statistics_tools import (
-    GetNetworkStatisticsTool,
-    GetTransactionStatisticsTool,
-    GetAddressStatisticsTool,
-    GetContractStatisticsTool,
-)
-
 # Governance tools
 from .governance_tools import (
     GetCommitteeInfoTool,
 )
 
-# Utility tools
-from .utility_tools import (
-    ValidateAddressTool,
-    ConvertAddressTool,
-    GetNetworkInfoTool,
-)
-
 # Provider
 from .neo_provider import NeoProvider
 from .base import get_provider
@@ -145,13 +128,12 @@
     "GetRecentBlocksInfoTool",
     "GetBlockRewardByHashTool",
 
-    # Contract tools (6)
+    # Contract tools (5)
     "GetContractCountTool",
     "GetContractByHashTool",
     "GetContractListByNameTool",
     "GetVerifiedContractByContractHashTool",
     "GetVerifiedContractTool",
-    "GetSourceCodeByContractHashTool",
 
     # Transaction tools (8)
     "GetTransactionCountTool",
@@ -174,9 +156,8 @@
     "GetVotesByCandidateAddressTool",
     "GetTotalVotesTool",
 
-    # NEP tools (12)
+    # NEP tools (11)
     "GetNep11BalanceTool",
-    "GetNep11OwnedByAddressTool",
     "GetNep11ByAddressAndHashTool",
     "GetNep11TransferByAddressTool",
     "GetNep11TransferByBlockHeightTool",
@@ -189,28 +170,17 @@
     "GetNep17TransferCountByAddressTool",
 
     # Smart Contract Call tools (3)
-    "InvokeContractTool",
-    "TestInvokeContractTool",
-    "GetContractStateTool",
+    "GetScCallByContractHashTool",
+    "GetScCallByContractHashAddressTool",
+    "GetScCallByTransactionHashTool",
 
     # Application Log and State tools (2)
     "GetApplicationLogTool",
     "GetApplicationStateTool",
-    
-    # Statistics and Monitoring tools (4)
-    "GetNetworkStatisticsTool",
-    "GetTransactionStatisticsTool",
-    "GetAddressStatisticsTool",
-    "GetContractStatisticsTool",
-    
+
     # Governance tools (1)
     "GetCommitteeInfoTool",
 
-    # Utility tools (3)
-    "ValidateAddressTool",
-    "ConvertAddressTool",
-    "GetNetworkInfoTool",
-    
     # Provider
     "NeoProvider",
     "get_provider",

spoon_toolkits/crypto/neo/address_tools.py

@@ -21,9 +21,9 @@ class GetAddressCountTool(BaseTool):
 
     async def execute(self, network: str = "testnet") -> ToolResult:
         try:
-            provider = get_provider(network)
-            result = await provider.get_address_count()
-            return ToolResult(output=f"Address count: {result}")
+            async with get_provider(network) as provider:
+                result = await provider.get_address_count()
+                return ToolResult(output=f"Address count: {result}")
         except Exception as e:
             return ToolResult(error=str(e))
 
@@ -49,9 +49,9 @@ class GetAddressInfoTool(BaseTool):
 
     async def execute(self, address: str, network: str = "testnet") -> ToolResult:
         try:
-            provider = get_provider(network)
-            result = await provider.get_address_info(address)
-            return ToolResult(output=f"Address info: {result}")
+            async with get_provider(network) as provider:
+                result = await provider.get_address_info(address)
+                return ToolResult(output=f"Address info: {result}")
         except Exception as e:
             return ToolResult(error=str(e))
 
@@ -81,11 +81,11 @@ class GetActiveAddressesTool(BaseTool):
 
     async def execute(self, days: int, network: str = "testnet") -> ToolResult:
         try:
-            provider = get_provider(network)
-            result = await provider.get_active_addresses(days)
-            if not result:
-                return ToolResult(output="Active addresses data not available with current neo-mamba implementation")
-            return ToolResult(output=f"Active addresses: {result}")
+            async with get_provider(network) as provider:
+                result = await provider.get_active_addresses(days)
+                if not result:
+                    return ToolResult(output="Active addresses data not available with current neo-mamba implementation")
+                return ToolResult(output=f"Active addresses: {result}")
         except Exception as e:
             return ToolResult(error=str(e))
 
@@ -112,26 +112,26 @@ class GetTagByAddressesTool(BaseTool):
         "required": ["addresses"]
     }
 
-    async def execute(self, addresses: str, network: str = "testnet") -> ToolResult:
-        try:
-            provider = get_provider(network)
-            # Convert string to list if needed
-            if isinstance(addresses, str):
-                addresses = [addr.strip() for addr in addresses.split(",")]
-
-            # Note: neo-mamba doesn't have a direct GetTagByAddresses method
-            # For now, we'll get basic balance information for each address
-            results = {}
-            for addr in addresses:
-                try:
-                    addr_info = await provider.get_address_info(addr)
-                    results[addr] = addr_info
-                except Exception as e:
-                    results[addr] = {"error": str(e)}
-
-            return ToolResult(output=f"Address information: {results}")
-        except Exception as e:
-            return ToolResult(error=str(e))
+    async def execute(self, addresses: str, network: str = "testnet") -> ToolResult:
+        try:
+            async with get_provider(network) as provider:
+                # Convert string to list if needed
+                if isinstance(addresses, str):
+                    addresses = [addr.strip() for addr in addresses.split(",")]
+
+                # Note: neo-mamba doesn't have a direct GetTagByAddresses method
+                # For now, we'll get basic balance information for each address
+                results = {}
+                for addr in addresses:
+                    try:
+                        addr_info = await provider.get_address_info(addr)
+                        results[addr] = addr_info
+                    except Exception as e:
+                        results[addr] = {"error": str(e)}
+
+                return ToolResult(output=f"Address information: {results}")
+        except Exception as e:
+            return ToolResult(error=str(e))
 
 class GetTotalSentAndReceivedTool(BaseTool):
     name: str = "get_total_sent_and_received"
@@ -159,26 +159,26 @@ class GetTotalSentAndReceivedTool(BaseTool):
 
     async def execute(self, contract_hash: str, address: str, network: str = "testnet") -> ToolResult:
         try:
-            provider = get_provider(network)
-            validated_address = provider._validate_address(address)
+            async with get_provider(network) as provider:
+                validated_address = await provider._validate_address(address)
 
-            # Note: neo-mamba doesn't have GetTotalSentAndReceived method
-            # We'll use get_nep17_transfers to get transfer history
-            transfers = await provider.rpc_client.get_nep17_transfers(validated_address)
+                # Note: neo-mamba doesn't have GetTotalSentAndReceived method
+                # We'll use get_nep17_transfers to get transfer history
+                transfers = await provider.rpc_client.get_nep17_transfers(validated_address)
 
             # Calculate totals from transfer history
             sent_total = 0
             received_total = 0
 
-            if transfers and 'sent' in transfers:
-                for transfer in transfers['sent']:
-                    if transfer.get('contract') == contract_hash:
-                        sent_total += int(transfer.get('amount', 0))
+            if transfers and hasattr(transfers, 'sent') and transfers.sent:
+                for transfer in transfers.sent:
+                    if hasattr(transfer, 'contract') and str(transfer.contract) == contract_hash:
+                        sent_total += int(getattr(transfer, 'amount', 0))
 
-            if transfers and 'received' in transfers:
-                for transfer in transfers['received']:
-                    if transfer.get('contract') == contract_hash:
-                        received_total += int(transfer.get('amount', 0))
+            if transfers and hasattr(transfers, 'received') and transfers.received:
+                for transfer in transfers.received:
+                    if hasattr(transfer, 'contract') and str(transfer.contract) == contract_hash:
+                        received_total += int(getattr(transfer, 'amount', 0))
 
             result = {
                 "address": address,
@@ -213,12 +213,12 @@ class GetRawTransactionByAddressTool(BaseTool):
 
     async def execute(self, address: str, network: str = "testnet") -> ToolResult:
         try:
-            provider = get_provider(network)
-            validated_address = provider._validate_address(address)
-            # Note: neo-mamba doesn't have GetRawTransactionByAddress method
-            # We'll use get_nep17_transfers as an alternative
-            transfers = await provider.rpc_client.get_nep17_transfers(validated_address)
-            return ToolResult(output=f"Transfer data: {transfers}")
+            async with get_provider(network) as provider:
+                validated_address = await provider._validate_address(address)
+                # Note: neo-mamba doesn't have GetRawTransactionByAddress method
+                # We'll use get_nep17_transfers as an alternative
+                transfers = await provider.rpc_client.get_nep17_transfers(validated_address)
+                return ToolResult(output=f"Transfer data: {transfers}")
         except Exception as e:
             return ToolResult(error=str(e))
 
@@ -244,11 +244,11 @@ class GetTransferByAddressTool(BaseTool):
 
     async def execute(self, address: str, network: str = "testnet") -> ToolResult:
         try:
-            provider = get_provider(network)
-            validated_address = provider._validate_address(address)
-            # Use neo-mamba's get_nep17_transfers method
-            transfers = await provider.rpc_client.get_nep17_transfers(validated_address)
-            return ToolResult(output=f"Transfer data: {transfers}")
+            async with get_provider(network) as provider:
+                validated_address = await provider._validate_address(address)
+                # Use neo-mamba's get_nep17_transfers method
+                transfers = await provider.rpc_client.get_nep17_transfers(validated_address)
+                return ToolResult(output=f"Transfer data: {transfers}")
         except Exception as e:
             return ToolResult(error=str(e))
 
@@ -274,10 +274,10 @@ class GetNep11OwnedByAddressTool(BaseTool):
 
     async def execute(self, address: str, network: str = "testnet") -> ToolResult:
         try:
-            provider = get_provider(network)
-            validated_address = provider._validate_address(address)
-            # Note: neo-mamba doesn't have a direct NEP-11 method
-            # NEP-11 tokens would need to be queried through contract interactions
-            return ToolResult(output="NEP-11 token ownership query not available with current neo-mamba implementation")
+            async with get_provider(network) as provider:
+                validated_address = await provider._validate_address(address)
+                # Note: neo-mamba doesn't have a direct NEP-11 method
+                # NEP-11 tokens would need to be queried through contract interactions
+                return ToolResult(output="NEP-11 token ownership query not available with current neo-mamba implementation")
         except Exception as e:
-            return ToolResult(error=str(e))
+            return ToolResult(error=str(e))