Merge pull request #476 from mraniki/dev

🎨 update main.py

cefi/config.py

@@ -1,6 +1,7 @@
 """
  DEX SWAP CONFIG
 """
+
 import os
 
 from dynaconf import Dynaconf
@@ -18,6 +19,7 @@
         ".op.toml",
     ],
     load_dotenv=True,
+    merge_enabled=True,
     environments=True,
     default_env="default",
 )

cefi/main.py

@@ -100,6 +100,7 @@ def __init__(self):
             logger.warning(
                 "No Client were created. Check your settings or disable the module."
             )
+            return None
 
     def _create_client(self, **kwargs):
         """
@@ -192,7 +193,7 @@ async def get_quotes(self, symbol):
         Returns:
             quotes
         """
-        _info = ["⚖️\n"]
+        _info = []
         for client in self.clients:
             _info.append(f"{client.name}: {await client.get_quote(symbol)}")
         return "\n".join(_info)
@@ -208,7 +209,7 @@ async def get_balances(self):
             balance
 
         """
-        _info = ["💵\n"]
+        _info = []
         for client in self.clients:
             _info.append(f"{client.name}:\n{await client.get_account_balance()}")
         return "\n".join(_info)
@@ -224,7 +225,7 @@ async def get_positions(self):
             position
 
         """
-        _info = ["📊\n"]
+        _info = []
         for client in self.clients:
             _info.append(f"{client.name}:\n{await client.get_account_position()}")
         return "\n".join(_info)
@@ -239,7 +240,7 @@ async def get_pnls(self, **kwargs):
         Returns:
             pnl
         """
-        _info = ["🏆\n"]
+        _info = []
         for client in self.clients:
             client_name = f"{client.name}:\n"
             account_pnl = await client.get_account_pnl(
@@ -263,7 +264,7 @@ async def submit_order(self, order_params):
             trade_confirmation(dict)
 
         """
-        _order = ["🧾 Order\n"]
+        _order = []
         for client in self.clients:
             _order.append(
                 f"{client.name}:\n{await client.execute_order(order_params)}\n"
@@ -281,7 +282,7 @@ async def modify_position(self, order_params):
             trade_confirmation(dict)
 
         """
-        _order = ["🧾 Order\n"]
+        _order = []
         for client in self.clients:
             _order.append(
                 f"{client.name}:\n{await client.modify_position(order_params)}\n"

tests/test_unit.py

@@ -56,7 +56,7 @@ async def test_cefi(CXTrader):
     print(type(CXTrader))
     result = await CXTrader.get_info()
     assert "ℹ️" in result
-    assert "💱 binance" in result
+    assert ("binance" in result) or ("huobi" in result) or ("capital" in result)
     assert CXTrader is not None
     assert isinstance(CXTrader, CexTrader)
     assert callable(CXTrader.get_balances)
@@ -69,7 +69,6 @@ async def test_quote(CXTrader, caplog):
     """Test quote"""
     result = await CXTrader.get_quotes("BTC")
     assert result is not None
-    assert "⚖️" in result
     assert ("binance" in result) or ("huobi" in result) or ("capital" in result)
     assert ("5" in result) or ("6" in result)
 
@@ -79,29 +78,27 @@ async def test_get_balances(CXTrader):
     """Test balance"""
     result = await CXTrader.get_balances()
     assert result is not None
-    assert "💵" in result
-    assert ("binance" in result) or ("huobi" in result)
+    assert ("binance" in result) or ("huobi" in result) or ("capital" in result)
 
 
 @pytest.mark.asyncio
 async def test_get_positions(CXTrader):
     result = await CXTrader.get_positions()
-    assert "📊" in result
+    assert ("binance" in result) or ("huobi" in result) or ("capital" in result)
 
 
 @pytest.mark.asyncio
 async def test_get_pnls(CXTrader):
     """Test pnl"""
     result = await CXTrader.get_pnls()
-    assert "🏆" in result
+    assert ("binance" in result) or ("huobi" in result) or ("capital" in result)
 
 
 @pytest.mark.asyncio
 async def test_submit_order(CXTrader, order):
     result = await CXTrader.submit_order(order)
     assert result is not None
     print(result)
-    assert ("🧾" in result)
     assert ("binance" in result) or ("huobi" in result) or ("capital" in result)
     assert ("🔵" in result) or ("Error" in result)