Merge pull request #23 from ChipaDevTeam/fix-tools

Fix tools

Author: theshadow76

axiomtradeapi/client.py

@@ -428,7 +428,7 @@ def get_dev_tokens(self, dev_address: str) -> Dict:
         except Exception as e:
             raise Exception(f"Failed to get dev tokens: {e}")
 
-    async def get_active_axiom_users(self, callback=None, duration: int = None):
+    async def get_active_axiom_users(self, callback=None, duration: int = None, token_address: str = "FFcYgSSgWHforA9rXXkA48p8YFoz8TSW85Jpo3CQHDyS"):
         """
         Subscribe to active Axiom users count updates via WebSocket.
         
@@ -440,6 +440,7 @@ async def get_active_axiom_users(self, callback=None, duration: int = None):
                      If not provided, prints the count to console.
             duration: Optional duration in seconds to listen for updates. 
                      If None, listens indefinitely until interrupted.
+            token_address: The token address to track active users for (default is Axiom token)
         
         Returns:
             None - runs until interrupted or duration expires
@@ -471,7 +472,7 @@ async def default_callback(count: int):
         ws_client = self.get_websocket_client()
 
         # Subscribe to active users
-        await ws_client.subscribe_active_users(callback)
+        await ws_client.subscribe_active_users(callback, token_address=token_address)
 
         # Start message handler
         if duration:

axiomtradeapi/websocket/_client.py

@@ -245,11 +245,12 @@ async def subscribe_wallet_transactions(self, wallet_address: str, callback: Cal
             self.logger.error(f"Failed to subscribe to wallet transactions: {e}")
             return False
 
-    async def subscribe_active_users(self, callback: Callable[[int], None]):
-        """Subscribe to active Axiom users count updates.
+    async def subscribe_active_users(self, callback: Callable[[int], None], token_address: str = "FFcYgSSgWHforA9rXXkA48p8YFoz8TSW85Jpo3CQHDyS"):
+        """Subscribe to active Axiom users count updates for a specific token.
         
         Args:
             callback: Async function that receives the active user count as an integer
+            token_address: The token address to track active users for (default is Axiom token)
             
         Returns:
             bool: True if subscription was successful, False otherwise
@@ -262,22 +263,22 @@ async def handle_user_count(count: int):
             
         Response format:
         {
-            "room": "e-FFcYgSSgWHforA9rXXkA48p8YFoz8TSW85Jpo3CQHDyS",
+            "room": "e-<TOKEN_ADDRESS>",
             "content": "49"
         }
         """
         if not self.ws:
             if not await self.connect():
                 return False
 
-        self._callbacks["active_users"] = callback
+        self._callbacks[f"active_users_{token_address}"] = callback
 
         try:
             await self.ws.send(json.dumps({
                 "action": "join",
-                "room": "e-FFcYgSSgWHforA9rXXkA48p8YFoz8TSW85Jpo3CQHDyS"
+                "room": f"e-{token_address}"
             }))
-            self.logger.info("Subscribed to active Axiom users updates")
+            self.logger.info(f"Subscribed to active users updates for token {token_address}")
             return True
         except Exception as e:
             self.logger.error(f"Failed to subscribe to active users: {e}")
@@ -298,15 +299,18 @@ async def _message_handler(self):
                             await self._callbacks["new_pairs"]([content])
 
                     # Handle active users updates
-                    if "active_users" in self._callbacks and data.get("room") == "e-FFcYgSSgWHforA9rXXkA48p8YFoz8TSW85Jpo3CQHDyS":
-                        content = data.get("content")
-                        if content is not None:
-                            # Convert string content to integer
-                            try:
-                                user_count = int(content)
-                                await self._callbacks["active_users"](user_count)
-                            except (ValueError, TypeError):
-                                self.logger.error(f"Failed to parse active users count: {content}")
+                    for key, callback in self._callbacks.items():
+                        if key.startswith("active_users_"):
+                            token_addr = key.replace("active_users_", "")
+                            if data.get("room") == f"e-{token_addr}":
+                                content = data.get("content")
+                                if content is not None:
+                                    # Convert string content to integer
+                                    try:
+                                        user_count = int(content)
+                                        await callback(user_count)
+                                    except (ValueError, TypeError):
+                                        self.logger.error(f"Failed to parse active users count: {content}")
 
                     # Handle token price updates
                     for key, callback in self._callbacks.items():

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "axiomtradeapi"
-version = "1.0.8"
+version = "1.0.9"
 description = "A comprehensive Python client for the AxiomTrade API with automatic token management, secure authentication, and extensive trading analytics for Solana meme tokens."
 readme = "README.md"
 license = "MIT"

setup.py

@@ -5,7 +5,7 @@
 
 setup(
     name="axiomtradeapi",
-    version="1.0.8",
+    version="1.0.9",
     description="A comprehensive Python client for the AxiomTrade API with automatic token management, secure authentication, and extensive trading analytics for Solana meme tokens.",
     author="ChipaDevTeam",
     author_email="",

test_active_users.py

@@ -58,7 +58,7 @@ async def tracking_callback(count: int):
         print(f"Update #{update_count[0]}: {count} active users")
 
     try:
-        await client.get_active_axiom_users(callback=tracking_callback, duration=15)
+        await client.get_active_axiom_users(callback=tracking_callback, duration=15, token_address="8P5kBTzvG7xyjTZRzi4ftzpy6mnL74AHLtHDqyDq44ST")
     except KeyboardInterrupt:
         print("\n\n⚠️  Test interrupted by user")
     except Exception as e: