v15.1.4 (#55)

Author: truemagic-coder

.coverage

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "sakit"
-version = "15.1.3"
+version = "15.1.4"
 description = "Solana Agent Kit"
 authors = ["Bevan Hunt <bevan@bevanhunt.com>"]
 license = "MIT"

pyproject.toml

@@ -32,7 +32,10 @@
 
 from sakit.utils.dflow import DFlowPredictionClient
 from sakit.utils.trigger import replace_blockhash_in_transaction, get_fresh_blockhash
-from sakit.utils.wallet import send_raw_transaction_with_priority
+from sakit.utils.wallet import (
+    send_raw_transaction_with_priority,
+    sanitize_privy_user_id,
+)
 
 logger = logging.getLogger(__name__)
 
@@ -534,6 +537,9 @@ async def execute(
     ) -> Dict[str, Any]:
         """Execute a prediction market action using Privy embedded wallet."""
 
+        # Sanitize privy_user_id to handle LLM formatting errors
+        privy_user_id = sanitize_privy_user_id(privy_user_id)
+
         client = self._get_client(include_risky)
 
         try:

sakit/privy_dflow_prediction.py

@@ -26,7 +26,10 @@
 from solders.message import to_bytes_versioned  # type: ignore
 
 from sakit.utils.dflow import DFlowSwap
-from sakit.utils.wallet import send_raw_transaction_with_priority
+from sakit.utils.wallet import (
+    send_raw_transaction_with_priority,
+    sanitize_privy_user_id,
+)
 
 logger = logging.getLogger(__name__)
 
@@ -260,6 +263,9 @@ async def execute(  # pragma: no cover
         amount: str,
         slippage_bps: int = 0,
     ) -> Dict[str, Any]:
+        # Sanitize user_id to handle LLM formatting errors
+        user_id = sanitize_privy_user_id(user_id) or user_id
+
         if not all([self._app_id, self._app_secret, self._signing_key]):
             return {"status": "error", "message": "Privy config missing."}
 

sakit/privy_dflow_swap.py

@@ -18,6 +18,7 @@
 from solders.message import to_bytes_versioned  # type: ignore
 
 from sakit.utils.recurring import JupiterRecurring
+from sakit.utils.wallet import sanitize_privy_user_id
 
 logger = logging.getLogger(__name__)
 
@@ -292,6 +293,9 @@ async def execute(
         start_at: Optional[str] = None,
         order_pubkey: Optional[str] = None,
     ) -> Dict[str, Any]:
+        # Sanitize user_id to handle LLM formatting errors
+        user_id = sanitize_privy_user_id(user_id) or user_id
+
         if not all([self._app_id, self._app_secret, self._signing_key]):
             return {"status": "error", "message": "Privy config missing."}
 

sakit/privy_recurring.py

@@ -5,7 +5,7 @@
 from privy import AsyncPrivyAPI
 from privy.lib.authorization_signatures import get_authorization_signature
 from cryptography.hazmat.primitives import serialization
-from sakit.utils.wallet import SolanaWalletClient
+from sakit.utils.wallet import SolanaWalletClient, sanitize_privy_user_id
 from sakit.utils.transfer import TokenTransferManager
 
 logger = logging.getLogger(__name__)
@@ -226,6 +226,9 @@ async def execute(
         mint: str,
         memo: str = "",
     ) -> Dict[str, Any]:
+        # Sanitize user_id to handle LLM formatting errors
+        user_id = sanitize_privy_user_id(user_id) or user_id
+
         if not all(
             [
                 self.app_id,

sakit/privy_transfer.py

@@ -24,7 +24,10 @@
     replace_blockhash_in_transaction,
     get_fresh_blockhash,
 )
-from sakit.utils.wallet import send_raw_transaction_with_priority
+from sakit.utils.wallet import (
+    send_raw_transaction_with_priority,
+    sanitize_privy_user_id,
+)
 
 logger = logging.getLogger(__name__)
 
@@ -319,6 +322,9 @@ async def execute(
         expired_at: Optional[str] = None,
         order_pubkey: Optional[str] = None,
     ) -> Dict[str, Any]:
+        # Sanitize user_id to handle LLM formatting errors
+        user_id = sanitize_privy_user_id(user_id) or user_id
+
         if not all([self._app_id, self._app_secret, self._signing_key]):
             return {"status": "error", "message": "Privy config missing."}
 

sakit/privy_trigger.py

@@ -23,7 +23,10 @@
 
 from sakit.utils.ultra import JupiterUltra
 from sakit.utils.trigger import replace_blockhash_in_transaction, get_fresh_blockhash
-from sakit.utils.wallet import send_raw_transaction_with_priority
+from sakit.utils.wallet import (
+    send_raw_transaction_with_priority,
+    sanitize_privy_user_id,
+)
 
 logger = logging.getLogger(__name__)
 
@@ -467,6 +470,9 @@ async def execute(  # pragma: no cover
         output_mint: str,
         amount: int,
     ) -> Dict[str, Any]:
+        # Sanitize user_id to handle LLM formatting errors
+        user_id = sanitize_privy_user_id(user_id) or user_id
+
         if not all([self.app_id, self.app_secret, self.signing_key]):
             return {"status": "error", "message": "Privy config missing."}
 

sakit/privy_ultra.py

@@ -15,6 +15,41 @@
 logger = logging.getLogger(__name__)
 
 
+def sanitize_privy_user_id(user_id: Optional[str]) -> Optional[str]:
+    """
+    Sanitize and normalize privy user_id to handle LLM formatting errors.
+
+    LLMs sometimes mangle the user ID by:
+    - Adding quotes: "did:privy:xxx" or 'did:privy:xxx'
+    - Changing case: Did:privy:xxx or DID:PRIVY:xxx
+    - Adding whitespace
+
+    This function normalizes to the correct format: did:privy:xxx
+
+    Args:
+        user_id: The raw user_id string from LLM
+
+    Returns:
+        Sanitized user_id or None if input was None/empty
+    """
+    if not user_id:
+        return None
+
+    # Strip whitespace and quotes
+    cleaned = user_id.strip().strip('"').strip("'").strip()
+
+    if not cleaned:
+        return None
+
+    # Normalize the did:privy: prefix to lowercase
+    if cleaned.lower().startswith("did:privy:"):
+        # Keep the unique ID part as-is, but normalize prefix
+        unique_part = cleaned[10:]  # Everything after "did:privy:"
+        return f"did:privy:{unique_part}"
+
+    return cleaned
+
+
 class SolanaTransaction:
     """Transaction parameters for Solana."""
 

sakit/utils/wallet.py

@@ -13,6 +13,7 @@
     PrivyDFlowPredictionTool,
     PrivyDFlowPredictionPlugin,
 )
+from sakit.utils.wallet import sanitize_privy_user_id
 from sakit.utils.dflow import (
     DFlowPredictionClient,
     DFlowPredictionOrderResult,
@@ -101,6 +102,83 @@ def sample_event():
     }
 
 
+# =============================================================================
+# PRIVY USER ID SANITIZATION TESTS
+# =============================================================================
+
+
+class TestPrivyUserIdSanitization:
+    """Test privy_user_id sanitization to handle LLM formatting errors."""
+
+    def test_sanitize_none(self):
+        """None should return None."""
+        assert sanitize_privy_user_id(None) is None
+
+    def test_sanitize_empty_string(self):
+        """Empty string should return None."""
+        assert sanitize_privy_user_id("") is None
+
+    def test_sanitize_correct_format(self):
+        """Correctly formatted ID should be returned as-is."""
+        user_id = "did:privy:cmiox5jks01fhk40d0feu1wt8"
+        assert sanitize_privy_user_id(user_id) == user_id
+
+    def test_sanitize_with_leading_quote(self):
+        """Leading quote should be stripped."""
+        user_id = '"did:privy:cmiox5jks01fhk40d0feu1wt8'
+        expected = "did:privy:cmiox5jks01fhk40d0feu1wt8"
+        assert sanitize_privy_user_id(user_id) == expected
+
+    def test_sanitize_with_capitalized_did(self):
+        """Capitalized Did should be normalized."""
+        user_id = "Did:privy:cmiox5jks01fhk40d0feu1wt8"
+        expected = "did:privy:cmiox5jks01fhk40d0feu1wt8"
+        assert sanitize_privy_user_id(user_id) == expected
+
+    def test_sanitize_with_all_caps(self):
+        """All caps DID:PRIVY should be normalized."""
+        user_id = "DID:PRIVY:cmiox5jks01fhk40d0feu1wt8"
+        expected = "did:privy:cmiox5jks01fhk40d0feu1wt8"
+        assert sanitize_privy_user_id(user_id) == expected
+
+    def test_sanitize_with_quotes_and_caps(self):
+        """Leading quote and caps should both be fixed."""
+        user_id = '"Did:privy:cmiox5jks01fhk40d0feu1wt8'
+        expected = "did:privy:cmiox5jks01fhk40d0feu1wt8"
+        assert sanitize_privy_user_id(user_id) == expected
+
+    def test_sanitize_with_single_quotes(self):
+        """Single quotes should be stripped."""
+        user_id = "'did:privy:cmiox5jks01fhk40d0feu1wt8'"
+        expected = "did:privy:cmiox5jks01fhk40d0feu1wt8"
+        assert sanitize_privy_user_id(user_id) == expected
+
+    def test_sanitize_with_whitespace(self):
+        """Whitespace should be stripped."""
+        user_id = "  did:privy:cmiox5jks01fhk40d0feu1wt8  "
+        expected = "did:privy:cmiox5jks01fhk40d0feu1wt8"
+        assert sanitize_privy_user_id(user_id) == expected
+
+    def test_sanitize_preserves_unique_id_case(self):
+        """Unique ID part should preserve its original case."""
+        user_id = "did:privy:CmIoX5jKs01fHk40D0fEu1wT8"
+        expected = "did:privy:CmIoX5jKs01fHk40D0fEu1wT8"
+        assert sanitize_privy_user_id(user_id) == expected
+
+    def test_sanitize_non_privy_id(self):
+        """Non-privy ID should be returned cleaned but not normalized."""
+        user_id = "  some-other-id  "
+        expected = "some-other-id"
+        assert sanitize_privy_user_id(user_id) == expected
+
+    def test_sanitize_only_whitespace_and_quotes(self):
+        """String with only whitespace and quotes should return None."""
+        assert sanitize_privy_user_id("   ") is None
+        assert sanitize_privy_user_id('""') is None
+        assert sanitize_privy_user_id("''") is None
+        assert sanitize_privy_user_id('" "') is None
+
+
 # =============================================================================
 # TOOL INITIALIZATION TESTS
 # =============================================================================