ksxt 1.0.5__tar.gz → 1.0.6__tar.gz

{ksxt-1.0.5/src/ksxt.egg-info → ksxt-1.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ksxt
-Version: 1.0.5
+Version: 1.0.6
 License: MIT License
         
         Copyright © 2023 AMOSA

{ksxt-1.0.5 → ksxt-1.0.6}/pyproject.toml

@@ -8,7 +8,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ksxt"
-version = "1.0.5"
+version = "1.0.6"
 readme = "README.md"
 license = { file="LICENSE.txt" }
 

{ksxt-1.0.5 → ksxt-1.0.6}/src/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-1.0.5 → ksxt-1.0.6}/src/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-1.0.5 → ksxt-1.0.6}/src/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-1.0.5 → ksxt-1.0.6}/src/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-1.0.5 → ksxt-1.0.6}/src/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-1.0.5 → ksxt-1.0.6}/src/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-1.0.5 → ksxt-1.0.6}/src/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-1.0.6/src/ksxt/config/token.toml

@@ -0,0 +1,3 @@
+[PSXkvBM1hQXJDRHg2rLvC7Tr8SoyPudlbx9o]
+token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJ0b2tlbiIsImF1ZCI6IjEyYzYxZWIxLTU3YzQtNGFiZC1iN2JhLTM0OGIwOTBjY2NlMyIsInByZHRfY2QiOiIiLCJpc3MiOiJ1bm9ndyIsImV4cCI6MTcxOTM1OTE1NiwiaWF0IjoxNzE5MjcyNzU2LCJqdGkiOiJQU1hrdkJNMWhRWEpEUkhnMnJMdkM3VHI4U295UHVkbGJ4OW8ifQ.B1CJ7IMEkkqVpQ7ECM8otr6lVVmV2Yp_bRaBBRlcOo29MIQZ5z8g5oEcXyO-ghaUa8UJZguuo8Q7iQreRBYkZg"
+expired = "2024-06-26 08:45:56"

{ksxt-1.0.5 → ksxt-1.0.6}/src/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-1.0.6/src/ksxt/models/balance.py

@@ -0,0 +1,43 @@
+from pydantic import BaseModel, model_validator
+from typing import List
+
+from ksxt.models.common import GeneralResponse
+
+
+class BalanceData(BaseModel):
+    symbol: str
+    name: str
+
+    price: 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
+    total_amount: float
+    total_evaluation_amount: float
+    total_pnl_amount: float
+    total_pnl_ratio: float
+    balances: List[BalanceData]
+
+
+# Balance에 대한 구체적인 Response 타입
+class KsxtBalanceResponse(GeneralResponse[BalanceInfo]):
+    pass

{ksxt-1.0.5 → ksxt-1.0.6}/src/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]):