ksxt 1.0.5__py3-none-any.whl → 1.0.7__py3-none-any.whl

ksxt/async_/base/async_exchange.py

@@ -143,7 +143,13 @@ class AsyncExchange(RestExchange):
         raise NotSupportedError(f"{self.id} {self.fetch_user_info.__qualname__}() is not supported yet.")
 
     async def fetch_balance(
-        self, acc_num: str, base_market: str = "KRW", excluded_symbols: list[str] | None = None
+        self,
+        acc_num: str,
+        base_market: str = "KRW",
+        excluded_symbols: list[str] | None = None,
+        included_symbols: list[str] | None = None,
+        filter_delisted: bool = True,
+        min_amount: float = 0,
     ) -> ksxt.models.KsxtBalanceResponse:
         raise NotSupportedError(f"{self.id} {self.fetch_balance.__qualname__}() is not supported yet.")
 

ksxt/async_/bithumb.py

@@ -23,6 +23,10 @@ class Bithumb(AsyncExchange, ImplicitAPI):
         self.parser = BithumbParser()
 
     def safe_symbol(self, base_market: str, security: str) -> str:
+        # If security already contains a hyphen, assume it's correctly formatted
+        if "-" in security:
+            return security
+
         return f"{base_market}-{security}"
 
     def sign(
@@ -232,7 +236,13 @@ class Bithumb(AsyncExchange, ImplicitAPI):
         return ksxt.models.KsxtMultiOrderBookResponse(header=common_header, response=common_response, info=parsed_info)
 
     async def fetch_balance(
-        self, acc_num: str, base_market: str = "KRW", excluded_symbols: Optional[list[str]] = None
+        self,
+        acc_num: str,
+        base_market: str = "KRW",
+        excluded_symbols: list[str] | None = None,
+        included_symbols: list[str] | None = None,
+        filter_delisted: bool = True,
+        min_amount: float = 0,
     ) -> ksxt.models.KsxtBalanceResponse:
         params = {}
 
@@ -247,7 +257,14 @@ class Bithumb(AsyncExchange, ImplicitAPI):
             return ksxt.models.KsxtBalanceResponse(header=common_header, response=common_response, info=None)
 
         # 데이터 파싱
-        parsed_info = self.parser.parse_balance(response, base_market, excluded_symbols=excluded_symbols)
+        parsed_info = self.parser.parse_balance(
+            response=response,
+            base_market=base_market,
+            excluded_symbols=excluded_symbols,
+            included_symbols=included_symbols,
+            filter_delisted=filter_delisted,
+            min_amount=min_amount,
+        )
 
         return ksxt.models.KsxtBalanceResponse(header=common_header, response=common_response, info=parsed_info)
 

ksxt/async_/koreainvest.py

@@ -125,7 +125,13 @@ class KoreaInvest(AsyncExchange, ImplicitAPI):
 
     @AsyncExchange.check_token
     async def fetch_balance(
-        self, acc_num: str, base_market: str = "KRW", excluded_symbols: Optional[list[str]] = None
+        self,
+        acc_num: str,
+        base_market: str = "KRW",
+        excluded_symbols: list[str] | None = None,
+        included_symbols: list[str] | None = None,
+        filter_delisted: bool = True,
+        min_amount: float = 0,
     ) -> ksxt.models.KsxtBalanceResponse:
         if base_market == "KRW":
             params = {
@@ -153,7 +159,12 @@ class KoreaInvest(AsyncExchange, ImplicitAPI):
             return ksxt.models.KsxtBalanceResponse(header=common_header, response=common_response, info=None)
 
         parsed_info = self.parser.parse_balance(
-            response=response, base_market=base_market, excluded_symbols=excluded_symbols
+            response=response,
+            base_market=base_market,
+            excluded_symbols=excluded_symbols,
+            included_symbols=included_symbols,
+            filter_delisted=filter_delisted,
+            min_amount=min_amount,
         )
 
         return ksxt.models.KsxtBalanceResponse(header=common_header, response=common_response, info=parsed_info)

ksxt/async_/upbit.py

@@ -90,7 +90,7 @@ class Upbit(AsyncExchange, ImplicitAPI):
             info=response,
         )
 
-    async def fetch_markets(self, base_market: str = "KRW") -> ksxt.models.KsxtMarketResponse:
+    async def fetch_markets(self, market_name: str = "KRW") -> ksxt.models.KsxtMarketResponse:
         params = {"isDetails": "True"}
 
         common_header = self.create_common_header(request_params=params)
@@ -101,7 +101,7 @@ class Upbit(AsyncExchange, ImplicitAPI):
         if common_response.success != "0":
             return ksxt.models.KsxtMarketResponse(header=common_header, response=common_response, info=None)
 
-        parsed_info = self.parser.parse_markets(response=response, base_market=base_market)
+        parsed_info = self.parser.parse_markets(response=response, base_market=market_name)
 
         return ksxt.models.KsxtMarketResponse(header=common_header, response=common_response, info=parsed_info)
 
@@ -218,7 +218,13 @@ class Upbit(AsyncExchange, ImplicitAPI):
         return ksxt.models.KsxtMultiOrderBookResponse(header=common_header, response=common_response, info=parsed_info)
 
     async def fetch_balance(
-        self, acc_num: str, base_market: str = "KRW", excluded_symbols: Optional[list[str]] = None
+        self,
+        acc_num: str,
+        base_market: str = "KRW",
+        excluded_symbols: list[str] | None = None,
+        included_symbols: list[str] | None = None,
+        filter_delisted: bool = True,
+        min_amount: float = 0,
     ) -> ksxt.models.KsxtBalanceResponse:
         params = {}
 
@@ -231,7 +237,12 @@ class Upbit(AsyncExchange, ImplicitAPI):
             return ksxt.models.KsxtBalanceResponse(header=common_header, response=common_response, info=None)
 
         parsed_info = self.parser.parse_balance(
-            response=response, base_market=base_market, excluded_symbols=excluded_symbols
+            response=response,
+            base_market=base_market,
+            excluded_symbols=excluded_symbols,
+            included_symbols=included_symbols,
+            filter_delisted=filter_delisted,
+            min_amount=min_amount,
         )
 
         return ksxt.models.KsxtBalanceResponse(header=common_header, response=common_response, info=parsed_info)

ksxt/base/exchange.py

@@ -139,7 +139,15 @@ class Exchange:
         """
         pass
 
-    def fetch_balance(self, acc_num: str, base_market: str = "KRW", excluded_symbols: list[str] | None = None):
+    def fetch_balance(
+        self,
+        acc_num: str,
+        base_market: str = "KRW",
+        excluded_symbols: list[str] | None = None,
+        included_symbols: list[str] | None = None,
+        filter_delisted: bool = True,
+        min_amount: float = 0,
+    ):
         """
         보유 자산 조회
 
@@ -147,6 +155,9 @@ class Exchange:
             acc_num (str): 계좌 번호
             base_market (str, optional): Market 구분 코드. Defaults to 'KRW'.
             excluded_symbols (list[str] | None, optional): 제외할 종목 리스트. Defaults to None.
+            included_symbols (list[str] | None, optional): 포함할 종목 리스트. Defaults to None.
+            filter_delisted (bool, optional): 거래 지원 종료되거나 상장 폐지된 종목 필터링 여부. Defaults to True.
+            min_amount (float, optional): 최소 자산 금액 필터링. Defaults to 0.
         """
         pass
 

ksxt/base/rest_exchange.py

@@ -319,7 +319,13 @@ class RestExchange(Exchange):
 
     @check_token
     def fetch_balance(
-        self, acc_num: str, base_market: str = "KRW", excluded_symbols: list[str] | None = None
+        self,
+        acc_num: str,
+        base_market: str = "KRW",
+        excluded_symbols: list[str] | None = None,
+        included_symbols: list[str] | None = None,
+        filter_delisted: bool = True,
+        min_amount: float = 0,
     ) -> ksxt.models.KsxtBalanceResponse:
         raise NotSupportedError(f"{self.id} {self.fetch_balance.__qualname__}() is not supported yet.")
 

ksxt/bithumb.py

@@ -25,6 +25,10 @@ class Bithumb(RestExchange, ImplicitAPI):
         self.timezone = pytz.timezone("Asia/Seoul")
 
     def safe_symbol(self, base_market: str, security: str) -> str:
+        # If security already contains a hyphen, assume it's correctly formatted
+        if "-" in security:
+            return security
+
         return f"{base_market}-{security}"
 
     def safe_security(self, symbol: str) -> str:
@@ -229,7 +233,13 @@ class Bithumb(RestExchange, ImplicitAPI):
         return ksxt.models.KsxtMultiOrderBookResponse(header=common_header, response=common_response, info=parsed_info)
 
     def fetch_balance(
-        self, acc_num: str, base_market: str = "KRW", excluded_symbols: Optional[list[str]] = None
+        self,
+        acc_num: str,
+        base_market: str = "KRW",
+        excluded_symbols: list[str] | None = None,
+        included_symbols: list[str] | None = None,
+        filter_delisted: bool = True,
+        min_amount: float = 0,
     ) -> ksxt.models.KsxtBalanceResponse:
         params = {}
 
@@ -244,7 +254,14 @@ class Bithumb(RestExchange, ImplicitAPI):
             return ksxt.models.KsxtBalanceResponse(header=common_header, response=common_response, info=None)
 
         # 데이터 파싱
-        parsed_info = self.parser.parse_balance(response, base_market, excluded_symbols=excluded_symbols)
+        parsed_info = self.parser.parse_balance(
+            response=response,
+            base_market=base_market,
+            excluded_symbols=excluded_symbols,
+            included_symbols=included_symbols,
+            filter_delisted=filter_delisted,
+            min_amount=min_amount,
+        )
 
         return ksxt.models.KsxtBalanceResponse(header=common_header, response=common_response, info=parsed_info)
 

ksxt/config/token.toml

@@ -1,7 +1,3 @@
 [PSXkvBM1hQXJDRHg2rLvC7Tr8SoyPudlbx9o]
-token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJ0b2tlbiIsImF1ZCI6ImQ0N2EzYjY4LTlkMjQtNGE3YS04YmU2LTNjOWI5MzVmZDZhZCIsInByZHRfY2QiOiIiLCJpc3MiOiJ1bm9ndyIsImV4cCI6MTcyMzAzOTYzOSwiaWF0IjoxNzIyOTUzMjM5LCJqdGkiOiJQU1hrdkJNMWhRWEpEUkhnMnJMdkM3VHI4U295UHVkbGJ4OW8ifQ.573I5Sdj6339IWT5gxhdTFFeWCJDu_ukVAu5QbH9X_SU_laTjhFPttlKBn3HJZzmhYBV89BBcwnYiCwGFU9PFg"
-expired = 2024-08-07T23:07:19
-
-[PSo9UuHWHtg1QzRkyu1WeXYERyUkpRK9LSii]
-token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJ0b2tlbiIsImF1ZCI6ImNhY2NjNGZhLWMxMzktNGE5MC1hNjg2LTI2OTVmZmNiZmQ0NyIsInByZHRfY2QiOiIiLCJpc3MiOiJ1bm9ndyIsImV4cCI6MTcyMzM3ODExNSwiaWF0IjoxNzIzMjkxNzE1LCJqdGkiOiJQU285VXVIV0h0ZzFRelJreXUxV2VYWUVSeVVrcFJLOUxTaWkifQ.EnsBporS5hoD7Prx_fvXoklkxvx1u0Swp3jL9MXv3GnXtU_totbAtfDqsHWexQGJNqgEAPe6Bd2L2M0rCNUpCg"
-expired = 2024-08-11T21:08:35
+token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJ0b2tlbiIsImF1ZCI6IjEyYzYxZWIxLTU3YzQtNGFiZC1iN2JhLTM0OGIwOTBjY2NlMyIsInByZHRfY2QiOiIiLCJpc3MiOiJ1bm9ndyIsImV4cCI6MTcxOTM1OTE1NiwiaWF0IjoxNzE5MjcyNzU2LCJqdGkiOiJQU1hrdkJNMWhRWEpEUkhnMnJMdkM3VHI4U295UHVkbGJ4OW8ifQ.B1CJ7IMEkkqVpQ7ECM8otr6lVVmV2Yp_bRaBBRlcOo29MIQZ5z8g5oEcXyO-ghaUa8UJZguuo8Q7iQreRBYkZg"
+expired = "2024-06-26 08:45:56"

ksxt/koreainvest.py

@@ -125,7 +125,13 @@ class KoreaInvest(RestExchange, ImplicitAPI):
 
     @RestExchange.check_token
     def fetch_balance(
-        self, acc_num: str, base_market: str = "KRW", excluded_symbols: Optional[list[str]] = None
+        self,
+        acc_num: str,
+        base_market: str = "KRW",
+        excluded_symbols: list[str] | None = None,
+        included_symbols: list[str] | None = None,
+        filter_delisted: bool = True,
+        min_amount: float = 0,
     ) -> ksxt.models.KsxtBalanceResponse:
         if base_market == "KRW":
             params = {
@@ -153,7 +159,12 @@ class KoreaInvest(RestExchange, ImplicitAPI):
             return ksxt.models.KsxtBalanceResponse(header=common_header, response=common_response, info=None)
 
         parsed_info = self.parser.parse_balance(
-            response=response, base_market=base_market, excluded_symbols=excluded_symbols
+            response=response,
+            base_market=base_market,
+            excluded_symbols=excluded_symbols,
+            included_symbols=included_symbols,
+            filter_delisted=filter_delisted,
+            min_amount=min_amount,
         )
 
         return ksxt.models.KsxtBalanceResponse(header=common_header, response=common_response, info=parsed_info)

ksxt/models/balance.py

@@ -1,4 +1,4 @@
-from pydantic import BaseModel
+from pydantic import BaseModel, model_validator
 from typing import List
 
 from ksxt.models.common import GeneralResponse
@@ -7,14 +7,27 @@ from ksxt.models.common import GeneralResponse
 class BalanceData(BaseModel):
     symbol: str
     name: str
-    evaluation_price: float
+
     price: float
-    pnl_amount: float
-    pnl_ratio: float
+    evaluation_price: float
+
     qty: float
     free_qty: float
     used_qty: float
 
+    amount: float | None = 0.0
+    evaluation_amount: float | None = 0.0
+    pnl: float | None = 0.0
+    pnl_ratio: float | None = 0.0
+
+    @model_validator(mode="after")
+    def calculate_fields(cls, values):
+        values.amount = values.price * values.qty
+        values.evaluation_amount = values.evaluation_price * values.qty
+        values.pnl = values.evaluation_price - values.price
+        values.pnl_ratio = values.pnl / values.price if values.price != 0 else 0.0
+        return values
+
 
 class BalanceInfo(BaseModel):
     currency: str

ksxt/models/transaction.py

@@ -1,5 +1,5 @@
 from datetime import datetime
-from typing import List, Optional
+from typing import List
 from pydantic import BaseModel
 
 from ksxt.models.common import GeneralResponse
@@ -8,45 +8,37 @@ from ksxt.models.common import GeneralResponse
 class TransactionInfo(BaseModel):
     # 주문 고유 아이디
     uuid: str
-    # 주문 종류 (ask, bid, deposit, withdrawal)
-    type: str
-
-    # 금액
-    amount: float
-    # 세금
-    tax: Optional[float] = 0
-    # 수수료
-    fee: Optional[float] = 0
-
     # 계좌 번호
-    account_id: Optional[str] = None
-    # 화폐 통화 정보
-    currency: Optional[str] = None
+    account_id: str | None = None
 
-    # 주문 생성 시간
-    created_at: datetime
+    # 주문 종류 (ask, bid, deposit, withdrawal)
+    transaction_type: str
 
+    # order type (limit, market, default)
+    order_type: str | None = None
+
+    # position (long, short)
+    tr_position: str | None = None
 
-class OpenedOrderInfo(TransactionInfo):
     # 종목 정보
     symbol: str
     # 가격
     price: float
     # 수량
     qty: float
-    # 주문 방식
-    order_type: Optional[str]
+    # 금액
+    amount: float
 
+    # 세금
+    tax: float | None = 0
+    # 수수료
+    fee: float | None = 0
 
-class ClosedOrderInfo(TransactionInfo):
-    # 종목 정보
-    symbol: str
-    # 가격
-    price: float
-    # 수량
-    qty: float
-    # 주문 방식
-    order_type: Optional[str]
+    # 화폐 통화 정보
+    currency: str | None = None
+
+    # 주문 생성 시간
+    created_at: datetime
 
 
 class WithdrawalHistory(BaseModel):
@@ -58,11 +50,11 @@ class DepositHistory(BaseModel):
 
 
 class OpenedOrderHistory(BaseModel):
-    history: List[OpenedOrderInfo]
+    history: List[TransactionInfo]
 
 
 class ClosedOrderHistory(BaseModel):
-    history: List[ClosedOrderInfo]
+    history: List[TransactionInfo]
 
 
 class KsxtWithdrawalHistoryResponse(GeneralResponse[WithdrawalHistory]):

ksxt/parser/bithumb.py

@@ -1,13 +1,10 @@
 from datetime import datetime, timezone
-from operator import attrgetter
 from typing import Dict, List, Optional
 
 from ksxt.models.transaction import (
     ClosedOrderHistory,
-    ClosedOrderInfo,
     DepositHistory,
     OpenedOrderHistory,
-    OpenedOrderInfo,
     TransactionInfo,
     WithdrawalHistory,
 )
@@ -24,6 +21,10 @@ from ksxt.utils import safer, sorter
 
 class BithumbParser(BaseParser):
     def safe_symbol(self, base_market: str, security: str) -> str:
+        # If security already contains a hyphen, assume it's correctly formatted
+        if "-" in security:
+            return security
+
         return f"{base_market}-{security}"
 
     def parse_markets(self, response: List[Dict], base_market: str = "KRW") -> MarketInfo:
@@ -175,7 +176,13 @@ class BithumbParser(BaseParser):
         return ask_data, bid_data
 
     def parse_balance(
-        self, response: List[Dict], base_market: str = "KRW", excluded_symbols: Optional[list[str]] = None
+        self,
+        response: List[Dict],
+        base_market: str = "KRW",
+        excluded_symbols: Optional[list[str]] = None,
+        included_symbols: Optional[list[str]] = None,
+        filter_delisted: bool = True,
+        min_amount: float = 0,
     ) -> BalanceInfo:
         # 1. Filter out entries where 'currency' is not the base_market
         # 2. Ensure 'unit_currency' is the base_market
@@ -186,11 +193,18 @@ class BithumbParser(BaseParser):
             if data["currency"] != base_market
             and data["unit_currency"] == base_market
             and (excluded_symbols is None or data["currency"] not in excluded_symbols)
+            and (included_symbols is None or self.safe_symbol(base_market, data["currency"]) in included_symbols)
         ]
 
         # Initialize balance list
         balances = [self._parse_balance(data, base_market) for data in filtered_data]
 
+        if filter_delisted:
+            balances = [balance for balance in balances if balance.price > 0]
+
+        if min_amount > 0:
+            balances = [balance for balance in balances if balance.amount > min_amount]
+
         # 총 매입금액
         total_amount = sum(bal.price * bal.qty for bal in balances)
         total_evaluation_amount = sum(bal.evaluation_price * bal.qty for bal in balances)
@@ -212,8 +226,6 @@ class BithumbParser(BaseParser):
             name=self.safe_symbol(base_market, safer.safe_string(data, "currency")),
             evaluation_price=0,  # 필요에 따라 적절히 설정
             price=safer.safe_number(data, "avg_buy_price"),
-            pnl_amount=0,  # 필요에 따라 적절히 설정
-            pnl_ratio=0,  # 필요에 따라 적절히 설정
             qty=safer.safe_number(data, "balance"),
             free_qty=safer.safe_number(data, "balance") - safer.safe_number(data, "locked"),
             used_qty=safer.safe_number(data, "locked"),
@@ -287,18 +299,21 @@ class BithumbParser(BaseParser):
 
         return OpenedOrderHistory(history=orders)
 
-    def _parse_open_order_info(self, order: dict, base_market: str = "KRW") -> OpenedOrderInfo:
-        return OpenedOrderInfo(
+    def _parse_open_order_info(self, order: dict, base_market: str = "KRW") -> TransactionInfo:
+        return TransactionInfo(
             uuid=safer.safe_string(order, "uuid"),
-            type=safer.safe_string(order, "side"),
+            account_id="",
+            transaction_type=safer.safe_string(order, "side"),
+            order_type=safer.safe_string(order, "ord_type"),
+            tr_position="long",
             symbol=self.safe_symbol(base_market, safer.safe_string(order, "market")),
             price=safer.safe_number(order, "price"),
             qty=safer.safe_number(order, "volume"),
             amount=safer.safe_number(order, "price") * safer.safe_number(order, "volume"),
             tax=0,
             fee=safer.safe_number(order, "reserved_fee"),
+            currency=base_market,
             created_at=datetime.fromisoformat(safer.safe_string(order, "created_at")),
-            order_type=safer.safe_string(order, "ord_type"),
         )
 
     def parse_closed_order_history(
@@ -318,18 +333,21 @@ class BithumbParser(BaseParser):
 
         return ClosedOrderHistory(history=orders)
 
-    def _parse_closed_order_info(self, order: dict, base_market: str = "KRW") -> ClosedOrderInfo:
-        return ClosedOrderInfo(
+    def _parse_closed_order_info(self, order: dict, base_market: str = "KRW") -> TransactionInfo:
+        return TransactionInfo(
             uuid=safer.safe_string(order, "uuid"),
-            type=safer.safe_string(order, "side"),
-            symbol=safer.safe_string(order, "market"),
+            account_id="",
+            transaction_type=safer.safe_string(order, "side"),
+            order_type=safer.safe_string(order, "ord_type"),
+            tr_position="long",
+            symbol=self.safe_symbol(base_market, safer.safe_string(order, "market")),
             price=safer.safe_number(order, "price"),
             qty=safer.safe_number(order, "volume"),
             amount=safer.safe_number(order, "price") * safer.safe_number(order, "volume"),
             tax=0,
             fee=safer.safe_number(order, "reserved_fee"),
+            currency=base_market,
             created_at=datetime.fromisoformat(safer.safe_string(order, "created_at")),
-            order_type=safer.safe_string(order, "ord_type"),
         )
 
     def parse_cancel_order(self, response: dict, base_market: str = "KRW") -> CancelOrderResponse:
@@ -383,10 +401,16 @@ class BithumbParser(BaseParser):
     def _parse_transaction_history_item(self, item: Dict, base_market: str = "KRW") -> TransactionInfo:
         return TransactionInfo(
             uuid=safer.safe_string(item, "uuid"),
-            type=safer.safe_string(item, "type"),
+            account_id="",
+            transaction_type=safer.safe_string(item, "type"),
+            order_type=safer.safe_string(item, "transaction_type"),
+            tr_position="",
+            symbol=safer.safe_string(item, "currency"),
+            price=1,
+            qty=safer.safe_number(item, "amount"),
             amount=safer.safe_number(item, "amount"),
             tax=0,
             fee=safer.safe_number(item, "fee"),
             currency=safer.safe_string(item, "currency"),
-            created_at=datetime.fromisoformat(safer.safe_string(item, "created_at")),
+            created_at=datetime.fromisoformat(safer.safe_string(item, "done_at")),
         )