ksxt 1.0.3__tar.gz → 1.0.4__tar.gz

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

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

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

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

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

@@ -142,7 +142,9 @@ class AsyncExchange(RestExchange):
     async def fetch_user_info(self, base_market: str = "KRW"):
         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") -> ksxt.models.KsxtBalanceResponse:
+    async def fetch_balance(
+        self, acc_num: str, base_market: str = "KRW", excluded_symbols: Optional[list[str]] = None
+    ) -> ksxt.models.KsxtBalanceResponse:
         raise NotSupportedError(f"{self.id} {self.fetch_balance.__qualname__}() is not supported yet.")
 
     async def fetch_cash(self, acc_num: str, base_market: str = "KRW") -> ksxt.models.KsxtCashResponse:

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

@@ -219,7 +219,9 @@ 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") -> ksxt.models.KsxtBalanceResponse:
+    async def fetch_balance(
+        self, acc_num: str, base_market: str = "KRW", excluded_symbols: Optional[list[str]] = None
+    ) -> ksxt.models.KsxtBalanceResponse:
         params = {}
 
         common_header = self.create_common_header(request_params=params)
@@ -233,7 +235,7 @@ 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)
+        parsed_info = self.parser.parse_balance(response, base_market, excluded_symbols=excluded_symbols)
 
         return ksxt.models.KsxtBalanceResponse(header=common_header, response=common_response, info=parsed_info)
 

{ksxt-1.0.3 → ksxt-1.0.4}/src/ksxt/async_/koreainvest.py

@@ -124,7 +124,9 @@ class KoreaInvest(AsyncExchange, ImplicitAPI):
         )
 
     @AsyncExchange.check_token
-    async def fetch_balance(self, acc_num: str, base_market: str = "KRW") -> ksxt.models.KsxtBalanceResponse:
+    async def fetch_balance(
+        self, acc_num: str, base_market: str = "KRW", excluded_symbols: Optional[list[str]] = None
+    ) -> ksxt.models.KsxtBalanceResponse:
         if base_market == "KRW":
             params = {
                 "CANO": acc_num[:8],
@@ -150,7 +152,9 @@ class KoreaInvest(AsyncExchange, ImplicitAPI):
         if common_response.success != "0":
             return ksxt.models.KsxtBalanceResponse(header=common_header, response=common_response, info=None)
 
-        parsed_info = self.parser.parse_balance(response=response, base_market=base_market)
+        parsed_info = self.parser.parse_balance(
+            response=response, base_market=base_market, excluded_symbols=excluded_symbols
+        )
 
         return ksxt.models.KsxtBalanceResponse(header=common_header, response=common_response, info=parsed_info)
 

{ksxt-1.0.3 → ksxt-1.0.4}/src/ksxt/async_/upbit.py

@@ -209,7 +209,9 @@ 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") -> ksxt.models.KsxtBalanceResponse:
+    async def fetch_balance(
+        self, acc_num: str, base_market: str = "KRW", excluded_symbols: Optional[list[str]] = None
+    ) -> ksxt.models.KsxtBalanceResponse:
         params = {}
 
         common_header = self.create_common_header(request_params=params)
@@ -220,7 +222,9 @@ class Upbit(AsyncExchange, ImplicitAPI):
         if common_response.success != "0":
             return ksxt.models.KsxtBalanceResponse(header=common_header, response=common_response, info=None)
 
-        parsed_info = self.parser.parse_balance(response=response, base_market=base_market)
+        parsed_info = self.parser.parse_balance(
+            response=response, base_market=base_market, excluded_symbols=excluded_symbols
+        )
 
         return ksxt.models.KsxtBalanceResponse(header=common_header, response=common_response, info=parsed_info)
 

{ksxt-1.0.3 → ksxt-1.0.4}/src/ksxt/base/exchange.py

@@ -24,7 +24,7 @@ class Exchange:
     session_lifetime = 10
     # 세션의 마지막 사용 시간
     session_last_used: time = None
-    
+
     timeout = 10000  # milliseconds = seconds * 1000
     synchronous = True
 
@@ -139,13 +139,14 @@ class Exchange:
         """
         pass
 
-    def fetch_balance(self, acc_num: str, base_market: str = "KRW"):
+    def fetch_balance(self, acc_num: str, base_market: str = "KRW", excluded_symbols: Optional[list[str]] = None):
         """
         보유 자산 조회
 
         Args:
             acc_num (str): 계좌 번호
             base_market (str, optional): Market 구분 코드. Defaults to 'KRW'.
+            excluded_symbols (Optional[list[str]], optional): 제외할 종목 리스트. Defaults to None.
         """
         pass
 
@@ -300,48 +301,6 @@ class Exchange:
 
     # endregion broker
 
-    # TODO : @abstractmethod로 제약을 하는게 나을까?는 고민 필요.
-    def get_success_response(self, result):
-        pass
-
-    def get_success_response(self, response_code, msg_code, msg, org_data):
-        return {
-            "response": {
-                # 성공 실패 여부
-                "success": response_code,
-                # 응답코드
-                "code": msg_code,
-                # 응답메세지
-                "message": msg,
-                # 원본 데이터
-                "info": org_data,
-            },
-            "header": {},
-        }
-
-    def get_error_response(self, error_code, error_message, org_data=None):
-        return {
-            "response": {
-                # 성공 실패 여부
-                "success": "-1",
-                # 응답코드
-                "code": error_code,
-                # 응답메세지
-                "message": error_message,
-                # 원본 데이터
-                "info": org_data,
-            },
-            "header": {},
-        }
-
-    def update_success_response_header(self, response: dict, header: dict):
-        response["header"].update(header)
-        return response
-
-    def update_success_response_body(self, response: dict, body: dict):
-        response.update(body)
-        return response
-
     def create_common_response(self, success: str, msg_code: str, msg: str, info: dict) -> CommonResponse:
         return CommonResponse(success=success, msg_code=msg_code, msg=msg, info=info)
 
@@ -370,7 +329,7 @@ class Exchange:
     def set_attr(self, attrs):
         for key in attrs:
             if hasattr(self, key) and isinstance(getattr(self, key), dict):
-                setattr(self, key, self.deep_extend(getattr(self, key), attrs[key]))
+                setattr(self, key, Exchange.deep_extend(getattr(self, key), attrs[key]))
             else:
                 setattr(self, key, attrs[key])
 

{ksxt-1.0.3 → ksxt-1.0.4}/src/ksxt/base/rest_exchange.py

@@ -44,7 +44,6 @@ class RestExchange(Exchange):
     def __init__(self, config: Dict = None, filename: str = None) -> None:
         super().__init__()
 
-        
         self.rate_limiters: Dict[str, RateLimiterContext] = {}
 
         self.headers = dict() if self.headers is None else self.headers
@@ -323,7 +322,9 @@ class RestExchange(Exchange):
         raise NotSupportedError(f"{self.id} {self.fetch_user_info.__qualname__}() is not supported yet.")
 
     @check_token
-    def fetch_balance(self, acc_num: str, base_market: str = "KRW") -> ksxt.models.KsxtBalanceResponse:
+    def fetch_balance(
+        self, acc_num: str, base_market: str = "KRW", excluded_symbols: Optional[list[str]] = None
+    ) -> ksxt.models.KsxtBalanceResponse:
         raise NotSupportedError(f"{self.id} {self.fetch_balance.__qualname__}() is not supported yet.")
 
     @check_token

{ksxt-1.0.3 → ksxt-1.0.4}/src/ksxt/bithumb.py

@@ -221,7 +221,9 @@ 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") -> ksxt.models.KsxtBalanceResponse:
+    def fetch_balance(
+        self, acc_num: str, base_market: str = "KRW", excluded_symbols: Optional[list[str]] = None
+    ) -> ksxt.models.KsxtBalanceResponse:
         params = {}
 
         common_header = self.create_common_header(request_params=params)
@@ -235,7 +237,7 @@ 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)
+        parsed_info = self.parser.parse_balance(response, base_market, excluded_symbols=excluded_symbols)
 
         return ksxt.models.KsxtBalanceResponse(header=common_header, response=common_response, info=parsed_info)
 

ksxt-1.0.4/src/ksxt/config/token.toml

@@ -0,0 +1,7 @@
+[PS80UIBxOj1XGF1Dl9eRdJa8mVRtQqvnV2y1]
+token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJ0b2tlbiIsImF1ZCI6IjJkMWE4MjI0LTVlMjgtNGMwYy1hMTZmLWZmNTFhOGFmMDY2MiIsInByZHRfY2QiOiIiLCJpc3MiOiJ1bm9ndyIsImV4cCI6MTcxNzMxNDQ2MywiaWF0IjoxNzE3MjI4MDYzLCJqdGkiOiJQUzgwVUlCeE9qMVhHRjFEbDllUmRKYThtVlJ0UXF2blYyeTEifQ.8G5fotvUupZonIAsEEGEC0810sqGayj08-recM4smwdRA23-fE2HISzl4HY9wHlPtkYwVMr0svZlo9HIrR-mlw"
+expired = "2024-06-02 16:47:43"
+
+[PSCWKArP3T1L4qMgyZ4DXIDlqcaK48jJW1J5]
+token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJ0b2tlbiIsImF1ZCI6IjVjMWYzMWZhLTViYzEtNGM1OS04OGY1LTk5OTU5NmExMmMzMCIsInByZHRfY2QiOiIiLCJpc3MiOiJ1bm9ndyIsImV4cCI6MTcxODAwNDQ4NywiaWF0IjoxNzE3OTE4MDg3LCJqdGkiOiJQU0NXS0FyUDNUMUw0cU1neVo0RFhJRGxxY2FLNDhqSlcxSjUifQ.D6R4xlYKqZQykIyQUA5SgB6vxIEG33f_m_MzSrB9xGRdVKjcr0CyMleWeenyTZLAu6hQpu-3133uYachjI1zjw"
+expired = "2024-06-10 16:28:07"

{ksxt-1.0.3 → ksxt-1.0.4}/src/ksxt/koreainvest.py

@@ -124,7 +124,9 @@ class KoreaInvest(RestExchange, ImplicitAPI):
         )
 
     @RestExchange.check_token
-    def fetch_balance(self, acc_num: str, base_market: str = "KRW") -> ksxt.models.KsxtBalanceResponse:
+    def fetch_balance(
+        self, acc_num: str, base_market: str = "KRW", excluded_symbols: Optional[list[str]] = None
+    ) -> ksxt.models.KsxtBalanceResponse:
         if base_market == "KRW":
             params = {
                 "CANO": acc_num[:8],
@@ -150,7 +152,9 @@ class KoreaInvest(RestExchange, ImplicitAPI):
         if common_response.success != "0":
             return ksxt.models.KsxtBalanceResponse(header=common_header, response=common_response, info=None)
 
-        parsed_info = self.parser.parse_balance(response=response, base_market=base_market)
+        parsed_info = self.parser.parse_balance(
+            response=response, base_market=base_market, excluded_symbols=excluded_symbols
+        )
 
         return ksxt.models.KsxtBalanceResponse(header=common_header, response=common_response, info=parsed_info)
 

{ksxt-1.0.3 → ksxt-1.0.4}/src/ksxt/parser/bithumb.py

@@ -1,6 +1,6 @@
 from datetime import datetime
 from operator import attrgetter
-from typing import Dict, List
+from typing import Dict, List, Optional
 
 from ksxt.models.transaction import (
     ClosedOrderHistory,
@@ -160,9 +160,19 @@ class BithumbParser(BaseParser):
 
         return ask_data, bid_data
 
-    def parse_balance(self, response: List[Dict], base_market: str = "KRW") -> BalanceInfo:
-        # currency가 'KRW'가 아닌 항목만 필터링
-        filtered_data = [data for data in response if data["currency"] != base_market]
+    def parse_balance(
+        self, response: List[Dict], base_market: str = "KRW", excluded_symbols: Optional[list[str]] = None
+    ) -> BalanceInfo:
+        # 1. Filter out entries where 'currency' is not the base_market
+        # 2. Ensure 'unit_currency' is the base_market
+        # 3. Exclude entries where 'currency' is in excluded_symbols
+        filtered_data = [
+            data
+            for data in response
+            if data["currency"] != base_market
+            and data["unit_currency"] == base_market
+            and (excluded_symbols is None or data["currency"] not in excluded_symbols)
+        ]
 
         # Initialize balance list
         balances = [self._parse_balance(data, base_market) for data in filtered_data]
@@ -196,8 +206,11 @@ class BithumbParser(BaseParser):
         )
 
     def parse_cash(self, response: List[Dict], base_market: str = "KRW") -> CashInfo:
-        # currency가 'KRW'인 항목만 필터링
-        filtered_data = [data for data in response if data["currency"] == base_market]
+        # 1. Filter entries where 'currency' is equal to 'base_market'
+        # 2. Ensure 'unit_currency' is also equal to 'base_market'
+        filtered_data = [
+            data for data in response if data["currency"] == base_market and data["unit_currency"] == base_market
+        ]
 
         # 필터링된 데이터가 없으면 기본값으로 CashInfo 반환
         if not filtered_data:

{ksxt-1.0.3 → ksxt-1.0.4}/src/ksxt/parser/koreainvest.py

@@ -1,5 +1,5 @@
 from datetime import datetime
-from typing import Dict, List
+from typing import Dict, List, Optional
 
 from ksxt.models.balance import BalanceData, BalanceInfo
 from ksxt.models.cash import CashInfo
@@ -153,11 +153,17 @@ class KoreaInvestParser(BaseParser):
 
         return ask_data, bid_data
 
-    def parse_balance(self, response: List[Dict], base_market: str = "KRW") -> BalanceInfo:
+    def parse_balance(
+        self, response: List[Dict], base_market: str = "KRW", excluded_symbols: Optional[list[str]] = None
+    ) -> BalanceInfo:
         safe_response = safer.safe_value(response, "output1")
 
-        # Initialize balance list
-        balances = [self._parse_balance(_, base_market) for _ in safe_response]
+        # Initialize balance list with filtering
+        balances = [
+            self._parse_balance(_, base_market)
+            for _ in safe_response
+            if excluded_symbols is None or safer.safe_string(_, "pdno") not in excluded_symbols
+        ]
 
         # 총 매입금액
         total_amount = sum(bal.price * bal.qty for bal in balances)

{ksxt-1.0.3 → ksxt-1.0.4}/src/ksxt/parser/parser.py

@@ -1,4 +1,4 @@
-from typing import Dict, List
+from typing import Dict, List, Optional
 import inspect
 
 from ksxt.models.balance import BalanceData, BalanceInfo
@@ -62,7 +62,9 @@ class BaseParser:
     ) -> tuple[OrderBookData, OrderBookData]:
         self._raise_not_implemented_error()
 
-    def parse_balance(self, response: List[Dict], base_market: str = "KRW") -> BalanceInfo:
+    def parse_balance(
+        self, response: List[Dict], base_market: str = "KRW", excluded_symbols: Optional[list[str]] = None
+    ) -> BalanceInfo:
         self._raise_not_implemented_error()
 
     def _parse_balance(self, data: Dict, base_market: str = "KRW") -> BalanceData:

{ksxt-1.0.3 → ksxt-1.0.4}/src/ksxt/parser/upbit.py

@@ -1,6 +1,6 @@
 from datetime import datetime
 from operator import attrgetter
-from typing import Dict, List
+from typing import Dict, List, Optional
 
 from ksxt.models.balance import BalanceData, BalanceInfo
 from ksxt.models.cash import CashInfo
@@ -166,9 +166,19 @@ class UpbitParser(BaseParser):
 
         return ask_data, bid_data
 
-    def parse_balance(self, response: List[Dict], base_market: str = "KRW") -> BalanceInfo:
-        # currency가 'KRW'가 아닌 항목만 필터링
-        filtered_data = [data for data in response if data["currency"] != base_market]
+    def parse_balance(
+        self, response: List[Dict], base_market: str = "KRW", excluded_symbols: Optional[list[str]] = None
+    ) -> BalanceInfo:
+        # 1. Filter out entries where 'currency' is not the base_market
+        # 2. Ensure 'unit_currency' is the base_market
+        # 3. Exclude entries where 'currency' is in excluded_symbols
+        filtered_data = [
+            data
+            for data in response
+            if data["currency"] != base_market
+            and data["unit_currency"] == base_market
+            and (excluded_symbols is None or data["currency"] not in excluded_symbols)
+        ]
 
         # Initialize balance list
         balances = [self._parse_balance(data, base_market) for data in filtered_data]
@@ -202,8 +212,11 @@ class UpbitParser(BaseParser):
         )
 
     def parse_cash(self, response: List[Dict], base_market: str = "KRW") -> CashInfo:
-        # currency가 'KRW'인 항목만 필터링
-        filtered_data = [data for data in response if data["currency"] == base_market]
+        # 1. Filter entries where 'currency' is equal to 'base_market'
+        # 2. Ensure 'unit_currency' is also equal to 'base_market'
+        filtered_data = [
+            data for data in response if data["currency"] == base_market and data["unit_currency"] == base_market
+        ]
 
         # 필터링된 데이터가 없으면 기본값으로 CashInfo 반환
         if not filtered_data:

{ksxt-1.0.3 → ksxt-1.0.4}/src/ksxt/upbit.py

@@ -224,7 +224,9 @@ class Upbit(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") -> ksxt.models.KsxtBalanceResponse:
+    def fetch_balance(
+        self, acc_num: str, base_market: str = "KRW", excluded_symbols: Optional[list[str]] = None
+    ) -> ksxt.models.KsxtBalanceResponse:
         params = {}
 
         common_header = self.create_common_header(request_params=params)
@@ -235,7 +237,9 @@ class Upbit(RestExchange, ImplicitAPI):
         if common_response.success != "0":
             return ksxt.models.KsxtBalanceResponse(header=common_header, response=common_response, info=None)
 
-        parsed_info = self.parser.parse_balance(response=response, base_market=base_market)
+        parsed_info = self.parser.parse_balance(
+            response=response, base_market=base_market, excluded_symbols=excluded_symbols
+        )
 
         return ksxt.models.KsxtBalanceResponse(header=common_header, response=common_response, info=parsed_info)
 

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

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

{ksxt-1.0.3 → ksxt-1.0.4}/src/ksxt.egg-info/SOURCES.txt

@@ -27,9 +27,6 @@ src/ksxt/api/auto/api_generator.py
 src/ksxt/api/auto/bithumb.py
 src/ksxt/api/auto/koreainvest.py
 src/ksxt/api/auto/upbit.py
-src/ksxt/api/auto/__pycache__/bithumb.cpython-312.pyc
-src/ksxt/api/auto/__pycache__/koreainvest.cpython-312.pyc
-src/ksxt/api/auto/__pycache__/upbit.cpython-312.pyc
 src/ksxt/async_/__init__.py
 src/ksxt/async_/bithumb.py
 src/ksxt/async_/koreainvest.py

{ksxt-1.0.3 → ksxt-1.0.4}/src/ksxt.egg-info/top_level.txt

@@ -1 +1,2 @@
+base
 ksxt

ksxt-1.0.3/src/ksxt/config/token.toml

@@ -1,7 +0,0 @@
-[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