ksxt 1.0.4__tar.gz → 1.0.6__tar.gz

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

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

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

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

{ksxt-1.0.4 → ksxt-1.0.6}/src/ksxt/async_/base/async_exchange.py

@@ -85,7 +85,7 @@ class AsyncExchange(RestExchange):
                 self.rate_limiters[api_name].release()
 
     async def fetch2(
-        self, path, security_type, params={}, headers: Optional[Any] = None, body: Optional[Any] = None, config={}
+        self, path, security_type, params={}, headers: Any | None = None, body: Any | None = None, config={}
     ):
         is_activate = self.apis[self.type][security_type][path]["activate"]
         if not is_activate:
@@ -130,8 +130,8 @@ class AsyncExchange(RestExchange):
         self,
         symbol: str,
         time_frame: str,
-        start: Optional[str] = None,
-        end: Optional[str] = None,
+        start: datetime | None = None,
+        end: datetime | None = None,
         base_market: str = "KRW",
     ) -> ksxt.models.KsxtHistoricalDataResponse:
         raise NotSupportedError(f"{self.id} {self.fetch_historical_data.__qualname__}() is not supported yet.")
@@ -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: 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:
         raise NotSupportedError(f"{self.id} {self.fetch_balance.__qualname__}() is not supported yet.")
 
@@ -157,12 +163,12 @@ class AsyncExchange(RestExchange):
         raise NotSupportedError(f"{self.id} {self.fetch_screener.__qualname__}() is not supported yet.")
 
     async def fetch_deposit_history(
-        self, acc_num: str, base_market: str = "KRW"
+        self, acc_num: str, start: datetime | None = None, end: datetime | None = None, base_market: str = "KRW"
     ) -> ksxt.models.KsxtDepositHistoryResponse:
         raise NotSupportedError(f"{self.id} {self.fetch_deposit_history.__qualname__}() is not supported yet.")
 
     async def fetch_withdrawal_history(
-        self, acc_num: str, base_market: str = "KRW"
+        self, acc_num: str, start: datetime | None = None, end: datetime | None = None, base_market: str = "KRW"
     ) -> ksxt.models.KsxtWithdrawalHistoryResponse:
         raise NotSupportedError(f"{self.id} {self.fetch_withdrawal_history.__qualname__}() is not supported yet.")
 
@@ -172,15 +178,15 @@ class AsyncExchange(RestExchange):
         symbol: str,
         ticket_type: Literal["EntryLong", "EntryShort", "ExitLong", "ExitShort"],
         otype: Literal["limit", "market"],
-        price: Optional[float] = 0,
-        qty: Optional[float] = 0,
-        amount: Optional[float] = 0,
+        price: float | None = 0,
+        qty: float | None = 0,
+        amount: float | None = 0,
         base_market: str = "KRW",
     ) -> ksxt.models.KsxtCreateOrderResponse:
         raise NotSupportedError(f"{self.id} {self.create_order.__qualname__}() is not supported yet.")
 
     async def cancel_order(
-        self, acc_num: str, order_id: str, symbol: Optional[str] = "", qty: float = 0, *args, base_market: str = "KRW"
+        self, acc_num: str, order_id: str, symbol: str | None = "", qty: float = 0, *args, base_market: str = "KRW"
     ) -> ksxt.models.KsxtCancelOrderResponse:
         raise NotSupportedError(f"{self.id} {self.cancel_order.__qualname__}() is not supported yet.")
 
@@ -191,7 +197,7 @@ class AsyncExchange(RestExchange):
         price: float,
         qty: float,
         *args,
-        symbol: Optional[str] = "",
+        symbol: str | None = "",
         base_market: str = "KRW",
     ):
         raise NotSupportedError(f"{self.id} {self.modify_order.__qualname__}() is not supported yet.")
@@ -199,9 +205,9 @@ class AsyncExchange(RestExchange):
     async def fetch_open_order(
         self,
         acc_num: str,
-        symbol: Optional[str] = "",
-        start: Optional[str] = None,
-        end: Optional[str] = None,
+        symbol: str | None = "",
+        start: datetime | None = None,
+        end: datetime | None = None,
         base_market: str = "KRW",
     ) -> ksxt.models.KsxtOpenOrderResponse:
         raise NotSupportedError(f"{self.id} {self.fetch_open_order.__qualname__}() is not supported yet.")
@@ -209,9 +215,9 @@ class AsyncExchange(RestExchange):
     async def fetch_closed_order(
         self,
         acc_num: str,
-        symbol: Optional[str] = "",
-        start: Optional[str] = None,
-        end: Optional[str] = None,
+        symbol: str | None = "",
+        start: datetime | None = None,
+        end: datetime | None = None,
         base_market: str = "KRW",
     ) -> ksxt.models.KsxtClosedOrderResponse:
         raise NotSupportedError(f"{self.id} {self.fetch_closed_order.__qualname__}() is not supported yet.")

{ksxt-1.0.4 → ksxt-1.0.6}/src/ksxt/async_/bithumb.py

@@ -3,7 +3,7 @@ import hashlib
 import hmac
 import json
 import time
-from datetime import datetime
+from datetime import datetime, timezone
 from typing import Any, Dict, List, Literal, Optional
 from urllib.parse import urlencode
 import uuid
@@ -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(
@@ -108,10 +112,19 @@ class Bithumb(AsyncExchange, ImplicitAPI):
         return ksxt.models.KsxtMarketResponse(header=common_header, response=common_response, info=parsed_info)
 
     async def fetch_historical_data(
-        self, symbol: str, time_frame: str, start: str | None = None, end: str | None = None, base_market: str = "KRW"
+        self,
+        symbol: str,
+        time_frame: str,
+        start: datetime | None = None,
+        end: datetime | None = None,
+        base_market: str = "KRW",
     ) -> ksxt.models.KsxtHistoricalDataResponse:
         params = {"market": self.safe_symbol(base_market=base_market, security=symbol), "count": 200}
 
+        if end:
+            end_utc = end.astimezone(timezone.utc)
+            params.update({"to": end_utc.strftime("%Y-%m-%d %H:%M:%S")})
+
         common_header = self.create_common_header(request_params=params)
 
         # TODO : time_frame 을 어떻게 고정시킬까? 우리는 분봉, 일봉, 주봉, 월봉 만 지원한다고 가정하면?
@@ -135,7 +148,10 @@ class Bithumb(AsyncExchange, ImplicitAPI):
         if common_response.success != "0":
             return ksxt.models.KsxtHistoricalDataResponse(header=common_header, response=common_response, info=None)
 
-        parsed_response = self.parser.parse_historical_data(response=response, symbol=symbol, base_market=base_market)
+        parsed_response = self.parser.parse_historical_data(
+            response=response, symbol=symbol, start=start, end=end, base_market=base_market
+        )
+
         return ksxt.models.KsxtHistoricalDataResponse(
             header=common_header, response=common_response, info=parsed_response
         )
@@ -220,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 = {}
 
@@ -235,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)
 
@@ -294,9 +323,9 @@ class Bithumb(AsyncExchange, ImplicitAPI):
     async def fetch_open_order(
         self,
         acc_num: str,
-        symbol: str | None = "",
-        start: str | None = None,
-        end: str | None = None,
+        symbol: Optional[str] = "",
+        start: datetime | None = None,
+        end: datetime | None = None,
         base_market: str = "KRW",
     ) -> ksxt.models.KsxtOpenOrderResponse:
         params = {
@@ -316,7 +345,9 @@ class Bithumb(AsyncExchange, ImplicitAPI):
             return ksxt.models.KsxtOpenOrderResponse(header=common_header, response=common_response, info=None)
 
         # 데이터 파싱
-        parsed_info = self.parser.parse_open_order_history(response, base_market)
+        parsed_info = self.parser.parse_open_order_history(
+            response=response, start=start, end=end, base_market=base_market
+        )
 
         return ksxt.models.KsxtOpenOrderResponse(header=common_header, response=common_response, info=parsed_info)
 
@@ -324,8 +355,8 @@ class Bithumb(AsyncExchange, ImplicitAPI):
         self,
         acc_num: str,
         symbol: Optional[str] = "",
-        start: Optional[str] = None,
-        end: Optional[str] = None,
+        start: datetime | None = None,
+        end: datetime | None = None,
         base_market: str = "KRW",
     ) -> ksxt.models.KsxtClosedOrderResponse:
         params = {"market": self.safe_symbol(base_market, symbol), "uuids": "", "state": "done"}
@@ -341,7 +372,9 @@ class Bithumb(AsyncExchange, ImplicitAPI):
             return ksxt.models.KsxtClosedOrderResponse(header=common_header, response=common_response, info=None)
 
         # 데이터 파싱
-        parsed_info = self.parser.parse_closed_order_history(response, base_market)
+        parsed_info = self.parser.parse_closed_order_history(
+            response=response, start=start, end=end, base_market=base_market
+        )
 
         return ksxt.models.KsxtClosedOrderResponse(header=common_header, response=common_response, info=parsed_info)
 
@@ -413,9 +446,9 @@ class Bithumb(AsyncExchange, ImplicitAPI):
         return ksxt.models.KsxtCreateOrderResponse(header=common_header, response=common_response, info=parsed_info)
 
     async def fetch_withdrawal_history(
-        self, acc_num: str, base_market: str = "KRW"
+        self, acc_num: str, start: datetime | None = None, end: datetime | None = None, base_market: str = "KRW"
     ) -> ksxt.models.KsxtWithdrawalHistoryResponse:
-        params = {"state": "done", "uuids": "", "txids": ""}
+        params = {"state": "DONE", "uuids": "", "txids": ""}
 
         common_header = self.create_common_header(request_params=params)
 
@@ -428,14 +461,16 @@ class Bithumb(AsyncExchange, ImplicitAPI):
             return ksxt.models.KsxtWithdrawalHistoryResponse(header=common_header, response=common_response, info=None)
 
         # 데이터 파싱
-        parsed_info = self.parser.parse_withdrawal_history(response)
+        parsed_info = self.parser.parse_withdrawal_history(
+            response=response, start=start, end=end, base_market=base_market
+        )
 
         return ksxt.models.KsxtWithdrawalHistoryResponse(
             header=common_header, response=common_response, info=parsed_info
         )
 
     async def fetch_deposit_history(
-        self, acc_num: str, base_market: str = "KRW"
+        self, acc_num: str, start: datetime | None = None, end: datetime | None = None, base_market: str = "KRW"
     ) -> ksxt.models.KsxtDepositHistoryResponse:
         params = {"state": "ACCEPTED", "uuids": "", "txids": ""}
 
@@ -447,11 +482,11 @@ class Bithumb(AsyncExchange, ImplicitAPI):
 
         # 실패 시 오류 응답 반환
         if common_response.success != "0":
-            return ksxt.models.KsxtWithdrawalHistoryResponse(header=common_header, response=common_response, info=None)
+            return ksxt.models.KsxtDepositHistoryResponse(header=common_header, response=common_response, info=None)
 
         # 데이터 파싱
-        parsed_info = self.parser.parse_deposit_history(response)
-
-        return ksxt.models.KsxtWithdrawalHistoryResponse(
-            header=common_header, response=common_response, info=parsed_info
+        parsed_info = self.parser.parse_deposit_history(
+            response=response, start=start, end=end, base_market=base_market
         )
+
+        return ksxt.models.KsxtDepositHistoryResponse(header=common_header, response=common_response, info=parsed_info)

{ksxt-1.0.4 → 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)
@@ -248,7 +259,12 @@ class KoreaInvest(AsyncExchange, ImplicitAPI):
 
     @AsyncExchange.check_token
     async def fetch_historical_data_index(
-        self, symbol: str, time_frame: str, start: str | None = None, end: str | None = None, base_market: str = "KRW"
+        self,
+        symbol: str,
+        time_frame: str,
+        start: datetime | None = None,
+        end: datetime | None = None,
+        base_market: str = "KRW",
     ) -> ksxt.models.KsxtHistoricalDataResponse:
         if time_frame.endswith("D"):
             param_code = "D"
@@ -285,13 +301,22 @@ class KoreaInvest(AsyncExchange, ImplicitAPI):
         if common_response.success != "0":
             return ksxt.models.KsxtHistoricalDataResponse(header=common_header, response=common_response, info=None)
 
-        parsed_info = self.parser.parse_historical_index_data(response=response, symbol=symbol, base_market=base_market)
+        parsed_response = self.parser.parse_historical_index_data(
+            response=response, symbol=symbol, start=start, end=end, base_market=base_market
+        )
 
-        return ksxt.models.KsxtHistoricalDataResponse(header=common_header, response=common_response, info=parsed_info)
+        return ksxt.models.KsxtHistoricalDataResponse(
+            header=common_header, response=common_response, info=parsed_response
+        )
 
     @AsyncExchange.check_token
     async def fetch_historical_data(
-        self, symbol: str, time_frame: str, start: str | None = None, end: str | None = None, base_market: str = "KRW"
+        self,
+        symbol: str,
+        time_frame: str,
+        start: datetime | None = None,
+        end: datetime | None = None,
+        base_market: str = "KRW",
     ) -> ksxt.models.KsxtHistoricalDataResponse:
         if time_frame.endswith("D"):
             param_code = "D"
@@ -341,9 +366,63 @@ class KoreaInvest(AsyncExchange, ImplicitAPI):
         if common_response.success != "0":
             return ksxt.models.KsxtHistoricalDataResponse(header=common_header, response=common_response, info=None)
 
-        parsed_info = self.parser.parse_historical_data(response=response, symbol=symbol, base_market=base_market)
+        parsed_response = self.parser.parse_historical_data(
+            response=response, symbol=symbol, start=start, end=end, base_market=base_market
+        )
+
+        return ksxt.models.KsxtHistoricalDataResponse(
+            header=common_header, response=common_response, info=parsed_response
+        )
+
+    @AsyncExchange.check_token
+    async def fetch_deposit_history(
+        self, acc_num: str, start: datetime | None = None, end: datetime | None = None, base_market: str = "KRW"
+    ) -> ksxt.models.KsxtDepositHistoryResponse:
+        params = {"state": "ACCEPTED", "uuids": "", "txids": ""}
+
+        common_header = self.create_common_header(request_params=params)
 
-        return ksxt.models.KsxtHistoricalDataResponse(header=common_header, response=common_response, info=parsed_info)
+        response = await self.private_get_fetch_deposit_history(self.extend(params))
+
+        common_response = self.get_common_response(response=response)
+
+        # 실패 시 오류 응답 반환
+        if common_response.success != "0":
+            return ksxt.models.KsxtWithdrawalHistoryResponse(header=common_header, response=common_response, info=None)
+
+        # 데이터 파싱
+        parsed_info = self.parser.parse_deposit_history(
+            response=response, start=start, end=end, base_market=base_market
+        )
+
+        return ksxt.models.KsxtWithdrawalHistoryResponse(
+            header=common_header, response=common_response, info=parsed_info
+        )
+
+    @AsyncExchange.check_token
+    async def fetch_withdrawal_history(
+        self, acc_num: str, start: datetime | None = None, end: datetime | None = None, base_market: str = "KRW"
+    ) -> ksxt.models.KsxtWithdrawalHistoryResponse:
+        params = {"state": "done", "uuids": "", "txids": ""}
+
+        common_header = self.create_common_header(request_params=params)
+
+        response = await self.private_get_fetch_withdrawal_history(self.extend(params))
+
+        common_response = self.get_common_response(response=response)
+
+        # 실패 시 오류 응답 반환
+        if common_response.success != "0":
+            return ksxt.models.KsxtWithdrawalHistoryResponse(header=common_header, response=common_response, info=None)
+
+        # 데이터 파싱
+        parsed_info = self.parser.parse_withdrawal_history(
+            response=response, start=start, end=end, base_market=base_market
+        )
+
+        return ksxt.models.KsxtWithdrawalHistoryResponse(
+            header=common_header, response=common_response, info=parsed_info
+        )
 
     @AsyncExchange.check_token
     async def modify_order(