zenopay-sdk 0.1.0__py3-none-any.whl → 0.2.0__py3-none-any.whl

elusion/zenopay/__init__.py

@@ -4,7 +4,7 @@ A modern Python SDK for the ZenoPay payment API with support for USSD payments,
 order management, and webhook handling.
 """
 
-__version__ = "0.1.0"
+__version__ = "0.2.0"
 __author__ = "Elution Hub"
 __email__ = "elusion.lab@gmail.com"
 

elusion/zenopay/client.py

@@ -8,6 +8,7 @@ from elusion.zenopay.config import ZenoPayConfig
 from elusion.zenopay.http import HTTPClient
 from elusion.zenopay.services import OrderService
 from elusion.zenopay.services import WebhookService
+from elusion.zenopay.services import DisbursementService
 
 logger = logging.getLogger(__name__)
 
@@ -20,33 +21,31 @@ class ZenoPayClient:
 
     Examples:
         Basic usage:
-        >>> client = ZenoPayClient(account_id="zp87778")
+        >>> client = ZenoPayClient(api_key="your-api-key")
 
         Async usage:
-        >>> async with ZenoPayClient(account_id="zp87778") as client:
+        >>> async with ZenoPayClient(api_key="your-api-key") as client:
         ...     order = await client.orders.create({
-        ...         "buyer_email": "jackson@gmail.com",
-        ...         "buyer_name": "Jackson Dastani",
-        ...         "buyer_phone": "0652449389",
+        ...         "buyer_email": "example@example.xyz",
+        ...         "buyer_name": "example name",
+        ...         "buyer_phone": "06XXXXXXXX",
         ...         "amount": 1000,
-        ...         "webhook_url": "https://yourwebsite.com/webhook"
+        ...         "webhook_url": "https://yourwebsite.xyz/webhook"
         ...     })
 
         Sync usage:
-        >>> with ZenoPayClient(account_id="zp87778") as client:
-        ...     order = client.orders.create_sync({
-        ...         "buyer_email": "jackson@gmail.com",
-        ...         "buyer_name": "Jackson Dastani",
-        ...         "buyer_phone": "0652449389",
+        >>> with ZenoPayClient(api_key="your-api-key") as client:
+        ...     order = client.orders.sync.create({
+        ...         "buyer_email": "example@example.xyz",
+        ...         "buyer_name": "example name",
+        ...         "buyer_phone": "06XXXXXXXX",
         ...         "amount": 1000
         ...     })
     """
 
     def __init__(
         self,
-        account_id: str,
         api_key: Optional[str] = None,
-        secret_key: Optional[str] = None,
         base_url: Optional[str] = None,
         timeout: Optional[float] = None,
         max_retries: Optional[int] = None,
@@ -54,30 +53,13 @@ class ZenoPayClient:
         """Initialize the ZenoPay client.
 
         Args:
-            account_id: Your ZenoPay account ID (required).
             api_key: API key (optional, can be set via environment variable).
-            secret_key: Secret key (optional, can be set via environment variable).
             base_url: Base URL for the API (optional, defaults to production).
             timeout: Request timeout in seconds (optional).
             max_retries: Maximum number of retries for failed requests (optional).
-            **kwargs: Additional configuration options.
-
-        Examples:
-            >>> # Using environment variables for API keys
-            >>> client = ZenoPayClient(account_id="zp87778")
-
-            >>> # Explicit configuration
-            >>> client = ZenoPayClient(
-            ...     account_id="zp87778",
-            ...     api_key="your_api_key",
-            ...     secret_key="your_secret_key",
-            ...     timeout=30.0
-            ... )
         """
         self.config = ZenoPayConfig(
-            account_id=account_id,
             api_key=api_key,
-            secret_key=secret_key,
             base_url=base_url,
             timeout=timeout,
             max_retries=max_retries,
@@ -87,12 +69,13 @@ class ZenoPayClient:
 
         # Initialize services
         self.orders = OrderService(self.http_client, self.config)
+        self.disbursements = DisbursementService(self.http_client, self.config)
         self.webhooks = WebhookService()
 
-        logger.info(f"ZenoPay client initialized for account: {account_id}")
+        logger.info(f"ZenoPay client initialized for account: {api_key}")
 
     async def __aenter__(self) -> "ZenoPayClient":
-        """Async context manager entry."""
+        """Enter async context manager."""
         await self.http_client.__aenter__()
         return self
 
@@ -102,12 +85,11 @@ class ZenoPayClient:
         exc_val: Optional[BaseException],
         exc_tb: Optional[TracebackType],
     ) -> None:
-        """Async context manager exit."""
-        await self.http_client.__aexit__(exc_type, exc_val, exc_tb)
+        """Exit async context manager."""
         await self.http_client.__aexit__(exc_type, exc_val, exc_tb)
 
     def __enter__(self) -> "ZenoPayClient":
-        """Sync context manager entry."""
+        """Enter sync context manager."""
         self.http_client.__enter__()
         return self
 
@@ -117,7 +99,7 @@ class ZenoPayClient:
         exc_val: Optional[BaseException],
         exc_tb: Optional[TracebackType],
     ) -> None:
-        """Sync context manager exit."""
+        """Exit sync context manager."""
         self.http_client.__exit__(exc_type, exc_val, exc_tb)
 
     async def close(self) -> None:
@@ -128,50 +110,10 @@ class ZenoPayClient:
         """Close the client and cleanup resources (sync version)."""
         self.http_client.close_sync()
 
-    def test_connection(self) -> bool:
-        """Test the connection to ZenoPay API.
-
-        Returns:
-            True if connection is successful, False otherwise.
-
-        Examples:
-            >>> client = ZenoPayClient(account_id="zp87778")
-            >>> if client.test_connection():
-            ...     print("Connection successful!")
-            ... else:
-            ...     print("Connection failed!")
-        """
-        try:
-            self.orders.get_status_sync("test-connection-check")
-            return True
-        except Exception as e:
-            logger.debug(f"Connection test failed: {e}")
-            return False
-
-    async def test_connection_async(self) -> bool:
-        """Test the connection to ZenoPay API (async version).
-
-        Returns:
-            True if connection is successful, False otherwise.
-
-        Examples:
-            >>> async with ZenoPayClient(account_id="zp87778") as client:
-            ...     if await client.test_connection_async():
-            ...         print("Connection successful!")
-            ...     else:
-            ...         print("Connection failed!")
-        """
-        try:
-            await self.orders.get_status("test-connection-check")
-            return True
-        except Exception as e:
-            logger.debug(f"Connection test failed: {e}")
-            return False
-
     @property
-    def account_id(self) -> str:
-        """Get the account ID."""
-        return self.config.account_id or ""
+    def api_key(self) -> str:
+        """Get the current API key."""
+        return self.config.api_key or ""
 
     @property
     def base_url(self) -> str:
@@ -179,29 +121,9 @@ class ZenoPayClient:
         return self.config.base_url
 
     def get_config(self) -> ZenoPayConfig:
-        """Get the current configuration.
-
-        Returns:
-            Current ZenoPayConfig instance.
-        """
+        """Get the current configuration."""
         return self.config
 
-    def update_config(self, **kwargs: object) -> None:
-        """Update client configuration.
-
-        Args:
-            **kwargs: Configuration parameters to update.
-
-        Examples:
-            >>> client = ZenoPayClient(account_id="zp87778")
-            >>> client.update_config(timeout=60.0, max_retries=5)
-        """
-        for key, value in kwargs.items():
-            if hasattr(self.config, key):
-                setattr(self.config, key, value)
-            else:
-                logger.warning(f"Unknown configuration parameter: {key}")
-
     def __repr__(self) -> str:
         """String representation of the client."""
-        return f"ZenoPayClient(account_id='{self.account_id}', base_url='{self.base_url}')"
+        return f"ZenoPayClient(api_key='{self.api_key}', base_url='{self.base_url}')"

elusion/zenopay/config.py

@@ -4,19 +4,15 @@ import os
 from typing import Dict, Optional
 from dotenv import load_dotenv
 
-# Load environment variables from .env file if it exists
 load_dotenv()
 
-# Default configuration
-DEFAULT_BASE_URL = "https://api.zeno.africa"
+DEFAULT_BASE_URL = "https://zenoapi.com"
 DEFAULT_TIMEOUT = 30.0
 DEFAULT_MAX_RETRIES = 3
 DEFAULT_RETRY_DELAY = 1.0
 
 # Environment variable names
 ENV_API_KEY = "ZENOPAY_API_KEY"
-ENV_SECRET_KEY = "ZENOPAY_SECRET_KEY"
-ENV_ACCOUNT_ID = "ZENOPAY_ACCOUNT_ID"
 ENV_BASE_URL = "ZENOPAY_BASE_URL"
 ENV_TIMEOUT = "ZENOPAY_TIMEOUT"
 
@@ -24,13 +20,14 @@ ENV_TIMEOUT = "ZENOPAY_TIMEOUT"
 DEFAULT_HEADERS = {
     "User-Agent": "zenopay-python-sdk",
     "Accept": "application/json",
-    "Content-Type": "application/x-www-form-urlencoded",
+    "Content-Type": "application/json",
 }
 
 # API endpoints
 ENDPOINTS = {
-    "create_order": "",
-    "order_status": "/order-status",
+    "create_order": "/api/payments/mobile_money_tanzania",
+    "order_status": "/api/payments/order-status",
+    "disbursement": "/api/payments/walletcashin/process/",
 }
 
 # Payment statuses
@@ -48,8 +45,6 @@ class ZenoPayConfig:
     def __init__(
         self,
         api_key: Optional[str] = None,
-        secret_key: Optional[str] = None,
-        account_id: Optional[str] = None,
         base_url: Optional[str] = None,
         timeout: Optional[float] = None,
         max_retries: Optional[int] = None,
@@ -60,22 +55,18 @@ class ZenoPayConfig:
 
         Args:
             api_key: ZenoPay API key. If not provided, will try to get from environment.
-            secret_key: ZenoPay secret key. If not provided, will try to get from environment.
-            account_id: ZenoPay account ID. If not provided, will try to get from environment.
             base_url: Base URL for the ZenoPay API.
             timeout: Request timeout in seconds.
             max_retries: Maximum number of retries for failed requests.
             retry_delay: Delay between retries in seconds.
             headers: Additional headers to include in requests.
         """
-        self.api_key = api_key or os.getenv(ENV_API_KEY)
-        self.secret_key = secret_key or os.getenv(ENV_SECRET_KEY)
-        self.account_id = account_id or os.getenv(ENV_ACCOUNT_ID)
+        self.api_key = os.getenv(ENV_API_KEY) or api_key
 
-        if not self.account_id:
-            raise ValueError(f"Account ID is required. Set {ENV_ACCOUNT_ID} environment variable " "or pass account_id parameter.")
+        if not self.api_key:
+            raise ValueError(f"API key is required. Set {ENV_API_KEY} environment variable " "or pass api_key parameter.")
 
-        self.base_url = base_url or os.getenv(ENV_BASE_URL, DEFAULT_BASE_URL)
+        self.base_url = os.getenv(ENV_BASE_URL) or base_url or DEFAULT_BASE_URL
 
         # Parse timeout from environment if provided
         env_timeout = os.getenv(ENV_TIMEOUT)
@@ -91,8 +82,12 @@ class ZenoPayConfig:
         self.max_retries = max_retries or DEFAULT_MAX_RETRIES
         self.retry_delay = retry_delay or DEFAULT_RETRY_DELAY
 
-        # Merge default headers with custom headers
         self.headers = DEFAULT_HEADERS.copy()
+
+        if self.api_key:
+            self.headers["x-api-key"] = self.api_key
+
+        # Add any additional custom headers
         if headers:
             self.headers.update(headers)
 
@@ -104,13 +99,21 @@ class ZenoPayConfig:
 
         Returns:
             Full URL for the endpoint.
+
+        Raises:
+            ValueError: If endpoint is not found in ENDPOINTS.
         """
         if endpoint not in ENDPOINTS:
-            raise ValueError(f"Unknown endpoint: {endpoint}")
+            raise ValueError(f"Unknown endpoint: {endpoint}. Available endpoints: {list(ENDPOINTS.keys())}")
 
         endpoint_path = ENDPOINTS[endpoint]
         if endpoint_path:
             return f"{self.base_url.rstrip('/')}{endpoint_path}"
         else:
-            # For create_order, the base URL is the endpoint
             return self.base_url
+
+    def __repr__(self) -> str:
+        """String representation of the config."""
+        # Mask API key for security
+        masked_api_key = f"{self.api_key[:8]}..." if self.api_key and len(self.api_key) > 8 else self.api_key
+        return f"ZenoPayConfig(api_key='{masked_api_key}', base_url='{self.base_url}')"