feat: refactor clients

Author: HinsonSIDAN

.gitignore

@@ -2,3 +2,4 @@ venv/
 __pycache__/
 *.pyc
 *.pyo
+.env

poetry.lock

@@ -26,7 +26,7 @@ idna = "3.10"
 urllib3 = "2.2.3"
 pycardano = "^0.12.3"
 
-[tool.poetry.dev-dependencies]
+[tool.poetry.group.dev.dependencies]
 pytest = "^8.2.0"
 pytest-xdist = "^3.5.0"
 pytest-cov = "^5.0.0"

pyproject.toml

@@ -0,0 +1 @@
+from .clients import ApiClient

src/deltadefi/__init__.py

@@ -1,4 +1,3 @@
 # flake8: noqa
-from .api_config import *
 from .auth import *
 from .validation import *

src/deltadefi/api_resources/__init__.py

@@ -1,9 +1,6 @@
 # flake8: noqa: E501
-from typing import Optional
-
 from sidan_gin import HDWallet
 
-from deltadefi.api_resources.api_config import ApiConfig
 from deltadefi.api_resources.auth import ApiHeaders
 from deltadefi.clients.accounts import Accounts
 from deltadefi.clients.markets import Markets
@@ -19,9 +16,11 @@ class ApiClient:
 
     def __init__(
         self,
-        config: ApiConfig,
-        wallet: HDWallet,
-        base_url: Optional[str] = None,
+        network: str = "preprod",
+        jwt: str = None,
+        api_key: str = None,
+        wallet: HDWallet = None,
+        base_url: str = None,
     ):
         """
         Initialize the ApiClient.
@@ -36,18 +35,20 @@ def __init__(
             "Content-Type": "application/json",
         }
 
-        if config.get("network"):
-            self.network_id = 1 if config["network"] == "mainnet" else 0
-            base_url = (
-                "https://api-dev.deltadefi.io"
-                if config["network"] == "mainnet"
-                else "https://api-dev.deltadefi.io"  # TODO: input production link once available
-            )
-        if config.get("jwt"):
-            headers["Authorization"] = config["jwt"]
-        if config.get("apiKey"):
-            headers["X-API-KEY"] = config["apiKey"]
-        if config.get("signingKey"):
+        if network == "mainnet":
+            self.network_id = 1
+            base_url = "https://api-dev.deltadefi.io"  # TODO: input production link once available
+        else:
+            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.accounts = Accounts(self)

src/deltadefi/api_resources/api_config.py

@@ -0,0 +1,13 @@
+import os
+import sys
+
+# Add the src directory to the Python path
+sys.path.append(os.path.join(os.path.dirname(__file__), "src"))
+
+
+from deltadefi import ApiClient
+
+api = ApiClient(api_key="b13abb5bb86b96da341b59bc66612cc5")
+account_balance = api.accounts.getAccountBalance()
+
+print(account_balance)

src/deltadefi/clients/clients.py

@@ -11,7 +11,7 @@ class TestAccounts(unittest.TestCase):
 
     def test_sign_in(self):
         # Arrange
-        api = ApiClient(config={}, wallet=None, base_url="http://localhost:8080")
+        api = ApiClient()
         sign_in_data: SignInRequest = {
             "wallet_address": "addr_test1qqzgg5pcaeyea69uptl9da5g7fajm4m0yvxndx9f4lxpkehqgezy0s04rtdwlc0tlvxafpdrfxnsg7ww68ge3j7l0lnszsw2wt",
             "auth_key": "test",