deltadefi 0.0.1__py3-none-any.whl → 0.0.2__py3-none-any.whl

deltadefi/api.py

@@ -0,0 +1,77 @@
+import json
+
+import requests
+
+from deltadefi.error import ClientError, ServerError
+from deltadefi.lib.utils import clean_none_value, encoded_string
+
+
+class API(object):
+    def __init__(self, base_url=None, api_key=None, timeout=None, **kwargs):
+        self.base_url = base_url
+        self.api_key = api_key
+        self.timeout = timeout
+        self.session = requests.Session()
+        self.session.headers.update(
+            {
+                "Content-Type": "application/json;charset=utf-8",
+                "X-API-KEY": api_key if api_key is not None else "",
+            }
+        )
+
+    def send_request(self, http_method, url_path, payload=None):
+        if payload is None:
+            payload = {}
+        url = self.base_url + url_path
+        params = clean_none_value(
+            {
+                "url": url,
+                "params": self._prepare_params(payload),
+                "timeout": self.timeout,
+            }
+        )
+        response = self._dispatch_request(http_method)(**params)
+        self._handle_exception(response)
+
+        try:
+            data = response.json()
+        except ValueError:
+            data = response.text
+        result = {}
+
+        if len(result) != 0:
+            result["data"] = data
+            return result
+
+        return data
+
+    def _dispatch_request(self, http_method):
+        return {
+            "GET": self.session.get,
+            "DELETE": self.session.delete,
+            "PUT": self.session.put,
+            "POST": self.session.post,
+        }.get(http_method, "GET")
+
+    def _prepare_params(self, params):
+        return encoded_string(clean_none_value(params))
+
+    def _handle_exception(self, response):
+        status_code = response.status_code
+        if status_code < 400:
+            return
+        if 400 <= status_code < 500:
+            try:
+                err = json.loads(response.text)
+            except json.JSONDecodeError:
+                raise ClientError(
+                    status_code, None, response.text, response.headers, None
+                )
+            error_data = None
+            if "data" in err:
+                error_data = err["data"]
+            print("Error?", err)
+            raise ClientError(
+                status_code, err["code"], err["msg"], response.headers, error_data
+            )
+        raise ServerError(status_code, response.text)

deltadefi/clients/__init__.py

@@ -1,6 +1,2 @@
 # flake8: noqa
-from .accounts import *
-from .app import *
 from .clients import *
-from .markets import *
-from .orders import *

deltadefi/clients/accounts.py

@@ -1,12 +1,10 @@
-import requests
-
-from deltadefi.requests import (
-    BuildDepositTransactionRequest,
-    BuildWithdrawalTransactionRequest,
-    SignInRequest,
-    SubmitDepositTransactionRequest,
-    SubmitWithdrawalTransactionRequest,
-)
+#
+from typing import List
+
+from sidan_gin import Asset, UTxO
+
+from deltadefi.api import API
+from deltadefi.lib.utils import check_required_parameter, check_required_parameters
 from deltadefi.responses import (
     BuildDepositTransactionResponse,
     BuildWithdrawalTransactionResponse,
@@ -14,124 +12,75 @@ from deltadefi.responses import (
     GetAccountBalanceResponse,
     GetDepositRecordsResponse,
     GetOrderRecordResponse,
-    GetTermsAndConditionResponse,
     GetWithdrawalRecordsResponse,
-    SignInResponse,
     SubmitDepositTransactionResponse,
     SubmitWithdrawalTransactionResponse,
 )
 
 
-class Accounts:
+class Accounts(API):
     """
     Accounts client for interacting with the DeltaDeFi API.
     """
 
-    def __init__(self, api_client):
-        """
-        Initialize the Accounts client.
-
-        Args:
-            api_client: An instance of the ApiClient.
-        """
-        self.api_client = api_client
-
-    def sign_in(self, data: SignInRequest) -> SignInResponse:
-        """
-        Sign in to the DeltaDeFi API.
-
-        Args:
-            data: A SignInRequest object containing the authentication key and wallet address.
+    group_url_path = "/accounts"
 
-        Returns:
-            A SignInResponse object containing the sign-in response.
-        """
-        auth_key = data["auth_key"]
-        wallet_address = data["wallet_address"]
-        headers = {
-            "X-API-KEY": auth_key,
-            "Content-Type": "application/json",
-        }
-        response = requests.post(
-            f"{self.api_client.base_url}/accounts/signin",
-            json={"wallet_address": wallet_address},
-            headers=headers,
-        )
-        response.raise_for_status()
-        return response.json()
+    def __init__(self, api_key=None, base_url=None, **kwargs):
+        super().__init__(api_key=api_key, base_url=base_url, **kwargs)
 
-    def createNewApiKey(self) -> CreateNewAPIKeyResponse:
+    def create_new_api_key(self, **kwargs) -> CreateNewAPIKeyResponse:
         """
         Create a new API key.
 
         Returns:
             A CreateNewAPIKeyResponse object containing the new API key.
         """
-        response = requests.get(
-            f"{self.api_client.base_url}/accounts/new-api-key",
-            headers=self.api_client.headers,
-        )
-        response.raise_for_status()
-        return response.json()
 
-    def getDepositRecords(self) -> GetDepositRecordsResponse:
+        url_path = "/new-api-key"
+        return self.send_request("GET", self.group_url_path + url_path, kwargs)
+
+    def get_deposit_records(self, **kwargs) -> GetDepositRecordsResponse:
         """
         Get deposit records.
 
         Returns:
             A GetDepositRecordsResponse object containing the deposit records.
         """
-        response = requests.get(
-            f"{self.api_client.base_url}/accounts/deposit-records",
-            headers=self.api_client.headers,
-        )
-        response.raise_for_status()
-        return response.json()
+        url_path = "/deposit-records"
+        return self.send_request("GET", self.group_url_path + url_path, kwargs)
 
-    def getWithdrawalRecords(self) -> GetWithdrawalRecordsResponse:
+    def get_withdrawal_records(self, **kwargs) -> GetWithdrawalRecordsResponse:
         """
         Get withdrawal records.
 
         Returns:
             A GetWithdrawalRecordsResponse object containing the withdrawal records.
         """
-        response = requests.get(
-            f"{self.api_client.base_url}/accounts/withdrawal-records",
-            headers=self.api_client.headers,
-        )
-        response.raise_for_status()
-        return response.json()
+        url_path = "/withdrawal-records"
+        return self.send_request("GET", self.group_url_path + url_path, kwargs)
 
-    def getOrderRecords(self) -> GetOrderRecordResponse:
+    def get_order_records(self, **kwargs) -> GetOrderRecordResponse:
         """
         Get order records.
 
         Returns:
             A GetOrderRecordResponse object containing the order records.
         """
-        response = requests.get(
-            f"{self.api_client.base_url}/accounts/order-records",
-            headers=self.api_client.headers,
-        )
-        response.raise_for_status()
-        return response.json()
+        url_path = "/order-records"
+        return self.send_request("GET", self.group_url_path + url_path, kwargs)
 
-    def getAccountBalance(self) -> GetAccountBalanceResponse:
+    def get_account_balance(self, **kwargs) -> GetAccountBalanceResponse:
         """
         Get account balance.
 
         Returns:
             A GetAccountBalanceResponse object containing the account balance.
         """
-        response = requests.get(
-            f"{self.api_client.base_url}/accounts/balance",
-            headers=self.api_client.headers,
-        )
-        response.raise_for_status()
-        return response.json()
+        url_path = "/balance"
+        return self.send_request("GET", self.group_url_path + url_path, kwargs)
 
-    def buildDepositTransaction(
-        self, data: BuildDepositTransactionRequest
+    def build_deposit_transaction(
+        self, deposit_amount: List[Asset], input_utxos: List[UTxO], **kwargs
     ) -> BuildDepositTransactionResponse:
         """
         Build a deposit transaction.
@@ -142,16 +91,21 @@ class Accounts:
         Returns:
             A BuildDepositTransactionResponse object containing the built deposit transaction.
         """
-        response = requests.post(
-            f"{self.api_client.base_url}/accounts/deposit/build",
-            json=data,
-            headers=self.api_client.headers,
+
+        check_required_parameters(
+            [[deposit_amount, "deposit_amount"], [input_utxos, "input_utxos"]]
         )
-        response.raise_for_status()
-        return response.json()
+        payload = {
+            "deposit_amount": deposit_amount,
+            "input_utxos": input_utxos,
+            **kwargs,
+        }
 
-    def buildWithdrawalTransaction(
-        self, data: BuildWithdrawalTransactionRequest
+        url_path = "/deposit/build"
+        return self.send_request("POST", self.group_url_path + url_path, payload)
+
+    def build_withdrawal_transaction(
+        self, withdrawal_amount: List[Asset], **kwargs
     ) -> BuildWithdrawalTransactionResponse:
         """
         Build a withdrawal transaction.
@@ -162,16 +116,15 @@ class Accounts:
         Returns:
             A BuildWithdrawalTransactionResponse object containing the built withdrawal transaction.
         """
-        response = requests.post(
-            f"{self.api_client.base_url}/accounts/withdrawal/build",
-            json=data,
-            headers=self.api_client.headers,
-        )
-        response.raise_for_status()
-        return response.json()
 
-    def submitDepositTransaction(
-        self, data: SubmitDepositTransactionRequest
+        check_required_parameter(withdrawal_amount, "withdrawal_amount")
+        payload = {"withdrawal_amount": withdrawal_amount, **kwargs}
+
+        url_path = "/withdrawal/build"
+        return self.send_request("POST", self.group_url_path + url_path, payload)
+
+    def submit_deposit_transaction(
+        self, signed_tx: str, **kwargs
     ) -> SubmitDepositTransactionResponse:
         """
         Submit a deposit transaction.
@@ -182,16 +135,15 @@ class Accounts:
         Returns:
             A SubmitDepositTransactionResponse object containing the submitted deposit transaction.
         """
-        response = requests.post(
-            f"{self.api_client.base_url}/accounts/deposit/submit",
-            json=data,
-            headers=self.api_client.headers,
-        )
-        response.raise_for_status()
-        return response.json()
 
-    def submitWithdrawalTransaction(
-        self, data: SubmitWithdrawalTransactionRequest
+        check_required_parameter(signed_tx, "signed_tx")
+        payload = {"signed_tx": signed_tx, **kwargs}
+
+        url_path = "/deposit/submit"
+        return self.send_request("POST", self.group_url_path + url_path, payload)
+
+    def submit_withdrawal_transaction(
+        self, signed_tx: str, **kwargs
     ) -> SubmitWithdrawalTransactionResponse:
         """
         Submit a withdrawal transaction.
@@ -202,24 +154,9 @@ class Accounts:
         Returns:
             A SubmitWithdrawalTransactionResponse object containing the submitted withdrawal transaction.
         """
-        response = requests.post(
-            f"{self.api_client.base_url}/accounts/withdrawal/submit",
-            json=data,
-            headers=self.api_client.headers,
-        )
-        response.raise_for_status()
-        return response.json()
 
-    def getTermsAndCondition(self) -> GetTermsAndConditionResponse:
-        """
-        Get terms and conditions.
+        check_required_parameter(signed_tx, "signed_tx")
+        payload = {"signed_tx": signed_tx, **kwargs}
 
-        Returns:
-            A GetTermsAndConditionResponse object containing the terms and conditions.
-        """
-        response = requests.get(
-            f"{self.api_client.base_url}/accounts/terms-and-condition",
-            headers=self.api_client.headers,
-        )
-        response.raise_for_status()
-        return response.json()
+        url_path = "/withdrawal/submit"
+        return self.send_request("POST", self.group_url_path + url_path, payload)

deltadefi/clients/app.py

@@ -1,32 +1,23 @@
-import requests
-
+from deltadefi.api import API
 from deltadefi.responses import GetTermsAndConditionResponse
 
 
-class App:
+class App(API):
     """
     App client for interacting with the DeltaDeFi API.
     """
 
-    def __init__(self, api_client):
-        """
-        Initialize the App client.
+    group_url_path = "/app"
 
-        Args:
-            api_client: An instance of the ApiClient.
-        """
-        self.api_client = api_client
+    def __init__(self, api_key=None, base_url=None, **kwargs):
+        super().__init__(api_key=api_key, base_url=base_url, **kwargs)
 
-    def getTermsAndCondition(self) -> GetTermsAndConditionResponse:
+    def get_terms_and_condition(self, **kwargs) -> GetTermsAndConditionResponse:
         """
         Get terms and conditions.
 
         Returns:
             A GetTermsAndConditionResponse object containing the terms and conditions.
         """
-        response = requests.get(
-            f"{self.api_client.base_url}/terms-and-conditions",
-            headers=self.api_client.headers,
-        )
-        response.raise_for_status()
-        return response.json()
+        url_path = "/terms-and-conditions"
+        return self.send_request("GET", self.group_url_path + url_path, kwargs)

deltadefi/clients/clients.py

@@ -3,9 +3,9 @@ from sidan_gin import HDWallet
 
 from deltadefi.api_resources.auth import ApiHeaders
 from deltadefi.clients.accounts import Accounts
+from deltadefi.clients.app import App
 from deltadefi.clients.markets import Markets
-from deltadefi.clients.orders import Orders
-from deltadefi.requests import PostOrderRequest
+from deltadefi.clients.order import Order
 from deltadefi.responses import PostOrderResponse
 
 
@@ -17,7 +17,6 @@ class ApiClient:
     def __init__(
         self,
         network: str = "preprod",
-        jwt: str = None,
         api_key: str = None,
         wallet: HDWallet = None,
         base_url: str = None,
@@ -30,11 +29,6 @@ class ApiClient:
             wallet: An instance of HDWallet for signing transactions.
             base_url: Optional; The base URL for the API. Defaults to "https://api-dev.deltadefi.io".
         """
-        self.base_url = base_url or "https://api-dev.deltadefi.io"
-        headers: ApiHeaders = {
-            "Content-Type": "application/json",
-        }
-
         if network == "mainnet":
             self.network_id = 1
             base_url = "https://api-dev.deltadefi.io"  # TODO: input production link once available
@@ -42,20 +36,16 @@ class ApiClient:
             self.network_id = 0
             base_url = "https://api-dev.deltadefi.io"
 
-        if jwt is not None:
-            headers["Authorization"] = jwt
-
-        if api_key is not None:
-            headers["X-API-KEY"] = api_key
-
-        if wallet is not None:
-            self.wallet = wallet.signing_key
+        self.api_key = api_key
+        self.wallet = wallet
+        self.base_url = base_url
 
-        self.accounts = Accounts(self)
-        self.orders = Orders(self)
-        self.markets = Markets(self)
+        self.accounts = Accounts(base_url=base_url, api_key=api_key)
+        self.app = App(base_url=base_url, api_key=api_key)
+        self.order = Order(base_url=base_url, api_key=api_key)
+        self.markets = Markets(base_url=base_url, api_key=api_key)
 
-    async def post_order(self, data: PostOrderRequest) -> PostOrderResponse:
+    async def post_order(self, **kwargs) -> PostOrderResponse:
         """
         Post an order to the DeltaDeFi API.
 

deltadefi/clients/markets.py

@@ -1,12 +1,9 @@
 # flake8: noqa: E501
 
-import requests
+from typing import Literal
 
-from deltadefi.requests import (
-    GetAggregatedPriceRequest,
-    GetMarketDepthRequest,
-    GetMarketPriceRequest,
-)
+from deltadefi.api import API
+from deltadefi.lib.utils import check_required_parameter, check_required_parameters
 from deltadefi.responses import (
     GetAggregatedPriceResponse,
     GetMarketDepthResponse,
@@ -14,21 +11,17 @@ from deltadefi.responses import (
 )
 
 
-class Markets:
+class Markets(API):
     """
     Markets client for interacting with the DeltaDeFi API.
     """
 
-    def __init__(self, api_client):
-        """
-        Initialize the Markets client.
+    group_url_path = "/market"
 
-        Args:
-            api_client: An instance of the ApiClient.
-        """
-        self.api_client = api_client
+    def __init__(self, api_key=None, base_url=None, **kwargs):
+        super().__init__(api_key=api_key, base_url=base_url, **kwargs)
 
-    def getDepth(self, data: GetMarketDepthRequest) -> GetMarketDepthResponse:
+    def get_depth(self, symbol: str, **kwargs) -> GetMarketDepthResponse:
         """
         Get market depth.
 
@@ -38,14 +31,14 @@ class Markets:
         Returns:
             A GetMarketDepthResponse object containing the market depth.
         """
-        response = requests.get(
-            f"{self.api_client.base_url}/market/depth?pair={data['pair']}",
-            headers=self.api_client.headers,
-        )
-        response.raise_for_status()
-        return response.json()
 
-    def getMarketPrice(self, data: GetMarketPriceRequest) -> GetMarketPriceResponse:
+        check_required_parameter(symbol, "symbol")
+        payload = {"symbol": symbol, **kwargs}
+        url_path = "/depth"
+
+        return self.send_request("GET", self.group_url_path + url_path, payload)
+
+    def get_market_price(self, symbol: str, **kwargs) -> GetMarketPriceResponse:
         """
         Get market price.
 
@@ -55,15 +48,17 @@ class Markets:
         Returns:
             A GetMarketPriceResponse object containing the market price.
         """
-        response = requests.get(
-            f"{self.api_client.base_url}/market/market-price?pair={data['pair']}",
-            headers=self.api_client.headers,
-        )
-        response.raise_for_status()
-        return response.json()
+        check_required_parameter(symbol, "symbol")
+        payload = {"symbol": symbol, **kwargs}
+        url_path = "/market-price"
+        return self.send_request("GET", self.group_url_path + url_path, payload)
 
-    def getAggregatedPrice(
-        self, data: GetAggregatedPriceRequest
+    def get_aggregated_price(
+        self,
+        symbol: str,
+        interval: Literal["15m", "30m", "1h", "1d", "1w", "1M"],
+        start: int,
+        end: int,
     ) -> GetAggregatedPriceResponse:
         """
         Get aggregated price.
@@ -74,9 +69,22 @@ class Markets:
         Returns:
             A GetAggregatedPriceResponse object containing the aggregated price.
         """
-        response = requests.get(
-            f"{self.api_client.base_url}/market/aggregate/{data['pair']}?interval={data['interval']}&start={data.get('start', '')}&end={data.get('end', '')}",
-            headers=self.api_client.headers,
+
+        check_required_parameters(
+            [
+                [symbol, "symbol"],
+                [interval, "interval"],
+                [start, "start"],
+                [end, "end"],
+            ]
+        )
+        url_path = f"/aggregated-trade/{symbol}"
+        return self.send_request(
+            "GET",
+            self.group_url_path + url_path,
+            {
+                "interval": interval,
+                "start": start,
+                "end": end,
+            },
         )
-        response.raise_for_status()
-        return response.json()

deltadefi/clients/order.py

@@ -0,0 +1,122 @@
+from deltadefi.api import API
+from deltadefi.lib.utils import check_required_parameter, check_required_parameters
+from deltadefi.models.models import OrderSide, OrderType
+from deltadefi.responses import (
+    BuildCancelOrderTransactionResponse,
+    BuildPlaceOrderTransactionResponse,
+    SubmitCancelOrderTransactionResponse,
+    SubmitPlaceOrderTransactionResponse,
+)
+
+
+class Order(API):
+    """
+    Orders client for interacting with the DeltaDeFi API.
+    """
+
+    group_url_path = "/order"
+
+    def __init__(self, api_key=None, base_url=None, **kwargs):
+        super().__init__(api_key=api_key, base_url=base_url, **kwargs)
+
+    def build_place_order_transaction(
+        self,
+        symbol: str,
+        side: OrderSide,
+        type: OrderType,
+        quantity: int,
+        price: int,
+        max_slippage_basis_point: int,
+        limit_slippage: bool,
+        **kwargs,
+    ) -> BuildPlaceOrderTransactionResponse:
+        """
+        Build a place order transaction.
+
+        Args:
+            data: A BuildPlaceOrderTransactionRequest object containing the order details.
+
+        Returns:
+            A BuildPlaceOrderTransactionResponse object containing the built order transaction.
+        """
+
+        check_required_parameters(
+            [symbol, "symbol"],
+            [side, "side"],
+            [type, "type"],
+        )
+
+        if type == "limit":
+            check_required_parameter(price, "price")
+
+        if type == "market" and limit_slippage:
+            check_required_parameter(
+                max_slippage_basis_point, "max_slippage_basis_point"
+            )
+
+        payload = {
+            "symbol": symbol,
+            "side": side,
+            "type": type,
+            "quantity": quantity,
+            "max_slippage_basis_point": max_slippage_basis_point,
+            "limit_slippage": limit_slippage,
+            **kwargs,
+        }
+
+        url_path = "/build"
+        return self.send_request("POST", self.group_url_path + url_path, payload)
+
+    def build_cancel_order_transaction(
+        self, order_id: str, **kwargs
+    ) -> BuildCancelOrderTransactionResponse:
+        """
+        Build a cancel order transaction.
+
+        Args:
+            order_id: The ID of the order to be canceled.
+
+        Returns:
+            A BuildCancelOrderTransactionResponse object containing the built cancel order transaction.
+        """
+
+        check_required_parameter(order_id, "order_id")
+
+        url_path = f"/{order_id}/build"
+        return self.send_request("DELETE", self.group_url_path + url_path, **kwargs)
+
+    def submit_place_order_transaction(
+        self, order_id: str, signed_tx: str, **kwargs
+    ) -> SubmitPlaceOrderTransactionResponse:
+        """
+        Submit a place order transaction.
+
+        Args:
+            data: A SubmitPlaceOrderTransactionRequest object containing the order details.
+
+        Returns:
+            A SubmitPlaceOrderTransactionResponse object containing the submitted order transaction.
+        """
+        check_required_parameters([order_id, "order_id"], [signed_tx, "signed_tx"])
+        payload = {"order_id": order_id, "signed_tx": signed_tx, **kwargs}
+
+        url_path = "/submit"
+        return self.send_request("POST", self.group_url_path + url_path, payload)
+
+    def submit_cancel_order_transaction(
+        self, signed_tx: str, **kwargs
+    ) -> SubmitCancelOrderTransactionResponse:
+        """
+        Submit a cancel order transaction.
+
+        Args:
+            data: A SubmitCancelOrderTransactionRequest object containing the cancel order details.
+
+        Returns:
+            A SubmitCancelOrderTransactionResponse object containing the submitted cancel order transaction.
+        """
+        check_required_parameter(signed_tx, "signed_tx")
+        payload = {"signed_tx": signed_tx, **kwargs}
+
+        path_url = "/submit"
+        return self.send_request("DELETE", self.group_url_path + path_url, payload)

deltadefi/error.py

@@ -1,63 +1,62 @@
-from __future__ import absolute_import, division, print_function
-
-
-class deltadefi_sdkError(Exception):
-    def __init__(
-        self,
-        message=None,
-        http_body=None,
-        http_status=None,
-        json_body=None,
-        headers=None,
-        code=None,
-    ):
-        super(deltadefi_sdkError, self).__init__(message)
-
-        self._message = message
-        self.http_body = http_body
-        self.http_status = http_status
-        self.json_body = json_body
-        self.headers = headers or {}
-        self.code = code
-        self.request_id = self.headers.get("request-id", None)
-
-
-class APIError(deltadefi_sdkError):
+class Error(Exception):
     pass
 
 
-class deltadefi_sdkErrorWithParamCode(deltadefi_sdkError):
-    def __repr__(self):
-        return "%s(message=%r, param=%r, code=%r, http_status=%r, " "request_id=%r)" % (
-            self.__class__.__name__,
-            self._message,
-            self.param,
-            self.code,
-            self.http_status,
-            self.request_id,
-        )
-
-
-class InvalidRequestError(deltadefi_sdkErrorWithParamCode):
-    def __init__(
-        self,
-        message,
-        param,
-        code=None,
-        http_body=None,
-        http_status=None,
-        json_body=None,
-        headers=None,
-    ):
-        super(InvalidRequestError, self).__init__(
-            message, http_body, http_status, json_body, headers, code
-        )
-        self.param = param
-
-
-class AuthenticationError(deltadefi_sdkError):
-    pass
+class ClientError(Error):
+    def __init__(self, status_code, error_code, error_message, header, error_data=None):
+        # https status code
+        self.status_code = status_code
+        # error code returned from server
+        self.error_code = error_code
+        # error message returned from server
+        self.error_message = error_message
+        # the whole response header returned from server
+        self.header = header
+        # return data if it's returned from server
+        self.error_data = error_data
 
 
-class PermissionError(deltadefi_sdkError):
-    pass
+class ServerError(Error):
+    def __init__(self, status_code, message):
+        self.status_code = status_code
+        self.message = message
+
+
+class ParameterRequiredError(Error):
+    def __init__(self, params):
+        self.params = params
+
+    def __str__(self):
+        return "%s is mandatory, but received empty." % (", ".join(self.params))
+
+
+class ParameterValueError(Error):
+    def __init__(self, params):
+        self.params = params
+
+    def __str__(self):
+        return "the enum value %s is invalid." % (", ".join(self.params))
+
+
+class ParameterTypeError(Error):
+    def __init__(self, params):
+        self.params = params
+
+    def __str__(self):
+        return f"{self.params[0]} data type has to be {self.params[1]}"
+
+
+class ParameterArgumentError(Error):
+    def __init__(self, error_message):
+        self.error_message = error_message
+
+    def __str__(self):
+        return self.error_message
+
+
+class WebsocketClientError(Error):
+    def __init__(self, error_message):
+        self.error_message = error_message
+
+    def __str__(self):
+        return self.error_message

deltadefi/lib/utils.py

@@ -0,0 +1,46 @@
+from urllib.parse import urlencode
+
+from deltadefi.error import (
+    ParameterRequiredError,
+    ParameterTypeError,
+    ParameterValueError,
+)
+
+
+def clean_none_value(d) -> dict:
+    out = {}
+    for k in d.keys():
+        if d[k] is not None:
+            out[k] = d[k]
+    return out
+
+
+def check_required_parameter(value, name):
+    if not value and value != 0:
+        raise ParameterRequiredError([name])
+
+
+def check_required_parameters(params):
+    """Validate multiple parameters
+    params = [
+        ['btcusdt', 'symbol'],
+        [10, 'price']
+    ]
+
+    """
+    for p in params:
+        check_required_parameter(p[0], p[1])
+
+
+def check_enum_parameter(value, enum_class):
+    if value not in set(item.value for item in enum_class):
+        raise ParameterValueError([value])
+
+
+def check_type_parameter(value, name, data_type):
+    if value is not None and not isinstance(value, data_type):
+        raise ParameterTypeError([name, data_type])
+
+
+def encoded_string(query):
+    return urlencode(query, True).replace("%40", "@")

deltadefi/models/models.py

@@ -3,8 +3,6 @@ from typing import List, Literal
 
 from sidan_gin import Asset
 
-TradingSymbol = Literal["ADAUSDX"]
-
 OrderStatus = Literal["building", "open", "closed", "failed"]
 
 OrderSide = Literal["buy", "sell"]
@@ -35,7 +33,7 @@ class TransactionStatus:
 class OrderJSON:
     order_id: str
     status: OrderStatus
-    symbol: TradingSymbol
+    symbol: str
     orig_qty: str
     executed_qty: str
     side: OrderSide

deltadefi/responses/accounts.py

@@ -9,12 +9,6 @@ from deltadefi.models.models import (
 )
 
 
-@dataclass
-class SignInResponse:
-    token: str
-    is_first_time: bool
-
-
 @dataclass
 class CreateNewAPIKeyResponse:
     api_key: str

{deltadefi-0.0.1.dist-info → deltadefi-0.0.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: deltadefi
-Version: 0.0.1
+Version: 0.0.2
 Summary: Python SDK for DeltaDeFi protocol.
 License: Apache-2.0
 Keywords: cardano
@@ -34,7 +34,7 @@ The DeltaDeFi Python SDK provides a convenient way to interact with the DeltaDeF
 To install the SDK, use `pip`:
 
 ```sh
-pip install deltadefi-python-sdk
+pip install deltadefi
 ```
 
 ## Requirements
@@ -48,19 +48,18 @@ pip install deltadefi-python-sdk
 To use the SDK, you need to initialize the ApiClient with your API configuration and wallet.
 
 ```python
-from deltadefi.api_resources.api_config import ApiConfig
-from deltadefi.clients.clients import ApiClient
+from deltadefi.clients import ApiClient
 from sidan_gin import HDWallet
 
 # Initialize API configuration
-network="mainnet",
+network="preprod",
 api_key="your_api_key",
 
 # Initialize HDWallet
 wallet = HDWallet("your_wallet_mnemonic")
 
 # Initialize ApiClient
-api_client = ApiClient(network=network, api_key=api_key, wallet=wallet)
+api = ApiClient(network=network, api_key=api_key, wallet=wallet)
 ```
 
 ### Accounts
@@ -68,17 +67,8 @@ api_client = ApiClient(network=network, api_key=api_key, wallet=wallet)
 The Accounts client allows you to interact with account-related endpoints.
 
 ```python
-from deltadefi.clients.accounts import Accounts
-
-accounts_client = api_client.accounts
-
-# Sign in
-sign_in_request = SignInRequest(auth_key="your_auth_key", wallet_address="your_wallet_address")
-sign_in_response = accounts_client.sign_in(sign_in_request)
-print(sign_in_response)
-
 # Get account balance
-account_balance = accounts_client.get_account_balance()
+account_balance = api.accounts.get_account_balance()
 print(account_balance)
 ```
 
@@ -87,46 +77,31 @@ print(account_balance)
 The Markets client allows you to interact with market-related endpoints.
 
 ```python
-from deltadefi.clients.markets import Markets
-
-markets_client = api_client.markets
-
 # Get market depth
-market_depth_request = GetMarketDepthRequest(pair="BTC/USD")
-market_depth_response = markets_client.getDepth(market_depth_request)
+market_depth = api.markets.get_depth("ADAUSDX")
 print(market_depth_response)
 
 # Get market price
-market_price_request = GetMarketPriceRequest(pair="BTC/USD")
-market_price_response = markets_client.getMarketPrice(market_price_request)
+market_price_response = api.markets.get_market_price("ADAUSDX")
 print(market_price_response)
 ```
 
-### Orders
+### Order
 
-The Orders client allows you to interact with order-related endpoints.
+The Order client allows you to interact with order-related endpoints.
 
 ```python
-from deltadefi.clients.orders import Orders
-
-orders_client = api_client.orders
-
 # Build place order transaction
 place_order_request = BuildPlaceOrderTransactionRequest(pair="BTC/USD", amount=1, price=50000)
-place_order_response = orders_client.build_place_order_transaction(place_order_request)
+place_order_response = api.order.build_place_order_transaction(symbol="ADAUSDX", amount=50, price=0.75, type="limit")
 print(place_order_response)
 
 # Submit place order transaction
-submit_order_request = SubmitPlaceOrderTransactionRequest(order_id="order_id")
-submit_order_response = orders_client.submit_place_order_transaction(submit_order_request)
+submit_order_response = api.order.submit_place_order_transaction(signed_tx="<signed_tx>", order_id="<order_id>")
 print(submit_order_response)
 ```
 
 ## License
 
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
-
-```
-http://www.apache.org/licenses/LICENSE-2.0
-```
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at <http://www.apache.org/licenses/LICENSE-2.0>
 

deltadefi-0.0.2.dist-info/RECORD

@@ -0,0 +1,24 @@
+deltadefi/__init__.py,sha256=_dbB-toNXZvwZxj5DnEY0nW5noDnDpF4QsJNEwGO_IA,46
+deltadefi/api.py,sha256=TKlP9yWwZhz2HrmqWYvhB7YUvSfzxKkN219dJsduLVs,2371
+deltadefi/api_resources/__init__.py,sha256=_SGHTpaQTIBvh9Rm868IT5pXpvvGBPqz3bxkY6YapZ4,61
+deltadefi/api_resources/auth.py,sha256=Mpl4Dbh_d_gGhwLo2CtBSKxZ21DC74x-qjVhlczZCDE,278
+deltadefi/api_resources/validation.py,sha256=vz-hovpLy9SMOIFGcBHC8vWZH8CJRlQP8rcbbTSM-PM,1375
+deltadefi/clients/__init__.py,sha256=AoK_kj_UKpxtCa3_if3yeHFAzHli9Mg-tsrUKOX7eH8,38
+deltadefi/clients/accounts.py,sha256=I3Yh82iHVK932u2Luvewbxk_KJ-WVLYqH048XBFgrsQ,5347
+deltadefi/clients/app.py,sha256=TOgRlP83p91r7oS4ez8Gfm8soQzFHrJAmOHZJoGZ4SM,712
+deltadefi/clients/clients.py,sha256=KtKWTr3-dgMgmJc8jVqzZ9qJ8I41T8G8KkNNTe9SEz0,2253
+deltadefi/clients/markets.py,sha256=EK1VRtLRtmUtIISdJtDthmWsjx_sDWkgJgdjqeQ8lXc,2581
+deltadefi/clients/order.py,sha256=1IfYf4uqNz9nchv4l7ulxhUDd_Yink2r8hGWmDf85Jc,3927
+deltadefi/constants/__init__.py,sha256=7LkrzfLTJsCCUl5IgZYrl-AbY_cf1fftcLklgnBYDTs,40
+deltadefi/constants/constants.py,sha256=9Ksb8_4t78KJpHVUnRArKlvgQk-CzcYsLRmA5qUnMwc,168
+deltadefi/error.py,sha256=Pq55p7FQbVn1GTih7NQBI7ZcVUUrlkaFKn-SwZUxBA8,1650
+deltadefi/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+deltadefi/lib/utils.py,sha256=zuQFAKQphbGxDdPzBURw4A2n3AkRSbzmjMLHPLm9Ed4,1035
+deltadefi/models/__init__.py,sha256=oDJj6Y4gXN6C7Oz_t2fq8hej-D0G9OqfXjL4Jaeq8z8,37
+deltadefi/models/models.py,sha256=vnNFFPMQcOOSKhONHNHXJIx4wddV4IKeBszykiqWCwk,1182
+deltadefi/responses/__init__.py,sha256=JKSIUQu6qI_XhbAR2mVMCKNvR6x_vFZdyLGOuQTVrVY,64
+deltadefi/responses/accounts.py,sha256=aVQq1CqebIQz0YuNphFlA2fGBgvmf8FpboJzToEiY2g,939
+deltadefi/responses/responses.py,sha256=etlx83GgZC2noLKo8GKrmDo3Xhwup-g8Ob29f0WYA4I,993
+deltadefi-0.0.2.dist-info/METADATA,sha256=_Md2KzsVrl6HX1wuEuiJIBS3F8Fwti4KFoX_gf3tI74,3085
+deltadefi-0.0.2.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+deltadefi-0.0.2.dist-info/RECORD,,

deltadefi/clients/orders.py

@@ -1,107 +0,0 @@
-import requests
-
-from deltadefi.requests import (
-    BuildPlaceOrderTransactionRequest,
-    SubmitCancelOrderTransactionRequest,
-    SubmitPlaceOrderTransactionRequest,
-)
-from deltadefi.responses import (
-    BuildCancelOrderTransactionResponse,
-    BuildPlaceOrderTransactionResponse,
-    SubmitCancelOrderTransactionResponse,
-    SubmitPlaceOrderTransactionResponse,
-)
-
-
-class Orders:
-    """
-    Orders client for interacting with the DeltaDeFi API.
-    """
-
-    def __init__(self, api_client):
-        """
-        Initialize the Orders client.
-
-        Args:
-            api_client: An instance of the ApiClient.
-        """
-        self.api_client = api_client
-
-    def build_place_order_transaction(
-        self, data: BuildPlaceOrderTransactionRequest
-    ) -> BuildPlaceOrderTransactionResponse:
-        """
-        Build a place order transaction.
-
-        Args:
-            data: A BuildPlaceOrderTransactionRequest object containing the order details.
-
-        Returns:
-            A BuildPlaceOrderTransactionResponse object containing the built order transaction.
-        """
-        response = requests.post(
-            f"{self.api_client.base_url}/order/build",
-            json=data,
-            headers=self.api_client.headers,
-        )
-        response.raise_for_status()
-        return response.json()
-
-    def build_cancel_order_transaction(
-        self, order_id: str
-    ) -> BuildCancelOrderTransactionResponse:
-        """
-        Build a cancel order transaction.
-
-        Args:
-            order_id: The ID of the order to be canceled.
-
-        Returns:
-            A BuildCancelOrderTransactionResponse object containing the built cancel order transaction.
-        """
-        response = requests.delete(
-            f"{self.api_client.base_url}/order/{order_id}/build",
-            headers=self.api_client.headers,
-        )
-        response.raise_for_status()
-        return response.json()
-
-    def submit_place_order_transaction(
-        self, data: SubmitPlaceOrderTransactionRequest
-    ) -> SubmitPlaceOrderTransactionResponse:
-        """
-        Submit a place order transaction.
-
-        Args:
-            data: A SubmitPlaceOrderTransactionRequest object containing the order details.
-
-        Returns:
-            A SubmitPlaceOrderTransactionResponse object containing the submitted order transaction.
-        """
-        response = requests.post(
-            f"{self.api_client.base_url}/order/submit",
-            json=data,
-            headers=self.api_client.headers,
-        )
-        response.raise_for_status()
-        return response.json()
-
-    def submit_cancel_order_transaction(
-        self, data: SubmitCancelOrderTransactionRequest
-    ) -> SubmitCancelOrderTransactionResponse:
-        """
-        Submit a cancel order transaction.
-
-        Args:
-            data: A SubmitCancelOrderTransactionRequest object containing the cancel order details.
-
-        Returns:
-            A SubmitCancelOrderTransactionResponse object containing the submitted cancel order transaction.
-        """
-        response = requests.delete(
-            f"{self.api_client.base_url}/order/submit",
-            json=data,
-            headers=self.api_client.headers,
-        )
-        response.raise_for_status()
-        return response.json()

deltadefi/requests/__init__.py

@@ -1,3 +0,0 @@
-# flake8: noqa
-from .accounts import *
-from .requests import *

deltadefi/requests/accounts.py

@@ -1,31 +0,0 @@
-from dataclasses import dataclass
-from typing import List
-
-from sidan_gin import Asset, UTxO
-
-
-@dataclass
-class SignInRequest:
-    wallet_address: str
-    auth_key: str
-
-
-@dataclass
-class BuildDepositTransactionRequest:
-    deposit_amount: List[Asset]
-    input_utxos: List[UTxO]
-
-
-@dataclass
-class BuildWithdrawalTransactionRequest:
-    withdrawal_amount: List[Asset]
-
-
-@dataclass
-class SubmitDepositTransactionRequest:
-    signed_tx: str
-
-
-@dataclass
-class SubmitWithdrawalTransactionRequest:
-    signed_txs: List[str]

deltadefi/requests/requests.py

@@ -1,67 +0,0 @@
-from dataclasses import dataclass
-from typing import Literal, Optional
-
-from deltadefi.models import OrderSide, OrderType, TradingSymbol
-
-
-@dataclass
-class GetMarketDepthRequest:
-    pair: str
-
-
-@dataclass
-class GetMarketPriceRequest:
-    pair: str
-
-
-Interval = Literal["15m", "30m", "1h", "1d", "1w", "1M"]
-
-
-@dataclass
-class GetAggregatedPriceRequest:
-    pair: str
-    interval: Interval
-    start: Optional[int]
-    end: Optional[int]
-
-
-# class TradingSymbol(str):
-#     pass
-
-
-# class OrderSide(str):
-#     pass
-
-
-# class OrderType(str):
-#     pass
-
-
-@dataclass
-class BuildPlaceOrderTransactionRequest:
-    pair: TradingSymbol
-    side: OrderSide
-    type: OrderType
-    quantity: float
-    price: Optional[float]
-    basis_point: Optional[float]
-
-
-class PostOrderRequest(BuildPlaceOrderTransactionRequest):
-    pass
-
-
-@dataclass
-class SubmitPlaceOrderTransactionRequest:
-    order_id: str
-    signed_tx: str
-
-
-@dataclass
-class BuildCancelOrderTransactionRequest:
-    order_id: str
-
-
-@dataclass
-class SubmitCancelOrderTransactionRequest:
-    signed_tx: str

deltadefi-0.0.1.dist-info/RECORD

@@ -1,24 +0,0 @@
-deltadefi/__init__.py,sha256=_dbB-toNXZvwZxj5DnEY0nW5noDnDpF4QsJNEwGO_IA,46
-deltadefi/api_resources/__init__.py,sha256=_SGHTpaQTIBvh9Rm868IT5pXpvvGBPqz3bxkY6YapZ4,61
-deltadefi/api_resources/auth.py,sha256=Mpl4Dbh_d_gGhwLo2CtBSKxZ21DC74x-qjVhlczZCDE,278
-deltadefi/api_resources/validation.py,sha256=vz-hovpLy9SMOIFGcBHC8vWZH8CJRlQP8rcbbTSM-PM,1375
-deltadefi/clients/__init__.py,sha256=EsZ3uPvBHMmxzx29tAddhDd4Nk1tDZ6eFewLG1Hh6fs,126
-deltadefi/clients/accounts.py,sha256=vWIVsftRA2TYgtmRxTqD2Ex1BYO2EFOkvbnSZyCGdpA,7044
-deltadefi/clients/app.py,sha256=nt1jULimogIk70qR9De5r6NnL1O1ursmfnfIm6pmtJs,815
-deltadefi/clients/clients.py,sha256=kFmGa2pgNgFrfKnYCt_aZb9brLCWi5GtQKVGydaHb3M,2446
-deltadefi/clients/markets.py,sha256=byWzMenDJehTV3Ro5v9okXAGi3erdJ1c8iVuvBKNJDw,2388
-deltadefi/clients/orders.py,sha256=c53D67Iu6-xb_ucsu3TK6HR5fKmHttz-JT6NhvlCYJA,3285
-deltadefi/constants/__init__.py,sha256=7LkrzfLTJsCCUl5IgZYrl-AbY_cf1fftcLklgnBYDTs,40
-deltadefi/constants/constants.py,sha256=9Ksb8_4t78KJpHVUnRArKlvgQk-CzcYsLRmA5qUnMwc,168
-deltadefi/error.py,sha256=KIOHxGgv5Qa2IYUBByCE0uEM8fjBfyasVb2Acz3B77Y,1524
-deltadefi/models/__init__.py,sha256=oDJj6Y4gXN6C7Oz_t2fq8hej-D0G9OqfXjL4Jaeq8z8,37
-deltadefi/models/models.py,sha256=4vU2vVJpMDSPKYQH41JKC1raKf2kelEcAik45qUyopc,1228
-deltadefi/requests/__init__.py,sha256=LmC-3pphj__BcvaPzFpJ1fvJDrCHtvstQ9y6zSW67JE,63
-deltadefi/requests/accounts.py,sha256=zCzmNCLNW75Xcmy_JbVWtAJOqqLavDqZLmh-Ll-TQqU,521
-deltadefi/requests/requests.py,sha256=3-LM2p-JHp8F8gGujtZcTAxb7um8C2WG9rgFap4hnSU,1062
-deltadefi/responses/__init__.py,sha256=JKSIUQu6qI_XhbAR2mVMCKNvR6x_vFZdyLGOuQTVrVY,64
-deltadefi/responses/accounts.py,sha256=6MvyAvrJ5Mc1hJ6BhQovtRiOsZZJzY_PsPpO5CNfe_c,1013
-deltadefi/responses/responses.py,sha256=etlx83GgZC2noLKo8GKrmDo3Xhwup-g8Ob29f0WYA4I,993
-deltadefi-0.0.1.dist-info/METADATA,sha256=A0iBWAGnqgwosUTeRsP529CDKpQOP6cW-3WqcyGk4Q8,3806
-deltadefi-0.0.1.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-deltadefi-0.0.1.dist-info/RECORD,,