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

ksxt/base/exchange.py

@@ -3,7 +3,7 @@ import json
 from datetime import datetime
 import time
 import pytz
-from typing import Dict, Optional
+from typing import Dict
 import ast
 
 from requests import Session
@@ -85,8 +85,8 @@ class Exchange:
         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",
     ):
         """
@@ -95,8 +95,8 @@ class Exchange:
         Args:
             symbol (str): 종목코드
             time_frame (str): 봉조회기준
-            start (Optional[str], optional): 조회 시작일. Defaults to None.
-            end (Optional[str], optional): 조회 종료일. Defaults to None.
+            start (datetime | None, optional): 조회 시작일. Defaults to None.
+            end (datetime | None, optional): 조회 종료일. Defaults to None.
             base_market (str, optional): Market 구분 코드. Defaults to 'KRW'.
         """
         pass
@@ -139,14 +139,14 @@ class Exchange:
         """
         pass
 
-    def fetch_balance(self, acc_num: str, base_market: str = "KRW", excluded_symbols: Optional[list[str]] = None):
+    def fetch_balance(self, acc_num: str, base_market: str = "KRW", excluded_symbols: list[str] | None = None):
         """
         보유 자산 조회
 
         Args:
             acc_num (str): 계좌 번호
             base_market (str, optional): Market 구분 코드. Defaults to 'KRW'.
-            excluded_symbols (Optional[list[str]], optional): 제외할 종목 리스트. Defaults to None.
+            excluded_symbols (list[str] | None, optional): 제외할 종목 리스트. Defaults to None.
         """
         pass
 
@@ -179,22 +179,30 @@ class Exchange:
         """
         pass
 
-    def fetch_deposit_history(self, acc_num: str, base_market: str = "KRW"):
+    def fetch_deposit_history(
+        self, acc_num: str, start: datetime | None = None, end: datetime | None = None, base_market: str = "KRW"
+    ):
         """
         입금 내역 조회
 
         Args:
             acc_num (str): 계좌 번호
+            start (datetime | None, optional): 조회 시작일. Defaults to None.
+            end (datetime | None, optional): 조회 종료일. Defaults to None.
             base_market (str, optional): Market 구분 코드. Defaults to 'KRW'.
         """
         pass
 
-    def fetch_withdrawal_history(self, acc_num: str, base_market: str = "KRW"):
+    def fetch_withdrawal_history(
+        self, acc_num: str, start: datetime | None = None, end: datetime | None = None, base_market: str = "KRW"
+    ):
         """
         출금 내역 조회
 
         Args:
             acc_num (str): 계좌 번호
+            start (datetime | None, optional): 조회 시작일. Defaults to None.
+            end (datetime | None, optional): 조회 종료일. Defaults to None.
             base_market (str, optional): Market 구분 코드. Defaults to 'KRW'.
         """
         pass
@@ -229,7 +237,7 @@ class Exchange:
         pass
 
     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"
     ):
         """
         미체결 주문 취소
@@ -237,7 +245,7 @@ class Exchange:
         Args:
             acc_num (str): 계좌정보(계좌번호, 지갑정보)
             order_id (str): 주문 정보(주문 id)
-            symbol (str, optional): 종목정보(종목코드). Defaults to ''.
+            symbol (str | None, optional): 종목정보(종목코드). Defaults to ''.
             qty (float, optional): 수량. Defaults to 0..
             base_market (str, optional): Market 구분 코드. Defaults to 'KRW'.
         """
@@ -246,9 +254,9 @@ class Exchange:
     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",
     ):
         """
@@ -256,9 +264,9 @@ class Exchange:
 
         Args:
             acc_num (str): 계좌정보(계좌번호, 지갑정보)
-            symbol (str, optional): 종목정보(종목코드) Defaults to ''.
-            start (str, optional): 조회 시작일자(YYYYMMDD). Defaults to None.
-            end (str, optional): 조회 종료일자(YYYYMMDD). Defaults to None.
+            symbol (str | None, optional): 종목정보(종목코드) Defaults to ''.
+            start (datetime | None, optional): 조회 시작일자. Defaults to None.
+            end (datetime | None, optional): 조회 종료일자. Defaults to None.
             base_market (str, optional): Market 구분 코드. Defaults to 'KRW'.
         """
         pass
@@ -266,9 +274,9 @@ class Exchange:
     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",
     ):
         """
@@ -276,9 +284,9 @@ class Exchange:
 
         Args:
             acc_num (str): 계좌정보(계좌번호, 지갑정보)
-            symbol (str, optional): 종목정보(종목코드) Defaults to ''.
-            start (str, optional): 조회 시작일자(YYYYMMDD). Defaults to None.
-            end (str, optional): 조회 종료일자(YYYYMMDD). Defaults to None.
+            symbol (str | None, optional): 종목정보(종목코드) Defaults to ''.
+            start (datetime | None, optional): 조회 시작일자. Defaults to None.
+            end (datetime | None, optional): 조회 종료일자. Defaults to None.
             base_market (str, optional): Market 구분 코드. Defaults to 'KRW'.
         """
         pass

ksxt/base/rest_exchange.py

@@ -5,7 +5,7 @@ import toml
 import os
 from pathlib import Path
 
-from typing import Any, Dict, List, Literal, Optional
+from typing import Any, Dict, List, Literal
 
 from datetime import datetime, UTC
 import pytz
@@ -232,16 +232,14 @@ class RestExchange(Exchange):
         security_type,
         method_type,
         api_type: Any = "public",
-        headers: Optional[Any] = None,
-        body: Optional[Any] = None,
-        params: Optional[Any] = None,
+        headers: Any | None = None,
+        body: Any | None = None,
+        params: Any | None = None,
         config={},
     ):
         pass
 
-    def fetch2(
-        self, path, security_type, params={}, headers: Optional[Any] = None, body: Optional[Any] = None, config={}
-    ):
+    def fetch2(self, path, security_type, params={}, headers: Any | None = None, body: Any | None = None, config={}):
         is_activate = self.is_activate(path=path, security_type=security_type)
         if not is_activate:
             return {
@@ -266,9 +264,7 @@ class RestExchange(Exchange):
         request = self.sign(path, security_type, method_type, api_type, headers, body, params, config)
         return self.fetch(request["url"], request["method"], request["headers"], request["body"], request["params"])
 
-    def request(
-        self, path, security_type, params={}, headers: Optional[Any] = None, body: Optional[Any] = None, config={}
-    ):
+    def request(self, path, security_type, params={}, headers: Any | None = None, body: Any | None = None, config={}):
         return self.fetch2(path, security_type, params, headers, body, config)
 
     # region base method
@@ -296,8 +292,8 @@ class RestExchange(Exchange):
         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_index.__qualname__}() is not supported yet.")
@@ -307,8 +303,8 @@ class RestExchange(Exchange):
         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.")
@@ -323,7 +319,7 @@ class RestExchange(Exchange):
 
     @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
     ) -> ksxt.models.KsxtBalanceResponse:
         raise NotSupportedError(f"{self.id} {self.fetch_balance.__qualname__}() is not supported yet.")
 
@@ -344,12 +340,14 @@ class RestExchange(Exchange):
         raise NotSupportedError(f"{self.id} {self.fetch_screener.__qualname__}() is not supported yet.")
 
     @check_token
-    def fetch_deposit_history(self, acc_num: str, base_market: str = "KRW") -> ksxt.models.KsxtDepositHistoryResponse:
+    def fetch_deposit_history(
+        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.")
 
     @check_token
     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.")
 
@@ -360,16 +358,16 @@ class RestExchange(Exchange):
         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.")
 
     @check_token
     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.")
 
@@ -381,7 +379,7 @@ class RestExchange(Exchange):
         price: float,
         qty: float,
         *args,
-        symbol: Optional[str] = "",
+        symbol: str | None = "",
         base_market: str = "KRW",
     ) -> ksxt.models.KsxtModifyOrderResponse:
         raise NotSupportedError(f"{self.id} {self.modify_order.__qualname__}() is not supported yet.")
@@ -390,9 +388,9 @@ class RestExchange(Exchange):
     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.")
@@ -401,9 +399,9 @@ class RestExchange(Exchange):
     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/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
@@ -119,6 +119,10 @@ class Bithumb(RestExchange, ImplicitAPI):
     ) -> 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 을 어떻게 고정시킬까? 우리는 분봉, 일봉, 주봉, 월봉 만 지원한다고 가정하면?
@@ -142,7 +146,10 @@ class Bithumb(RestExchange, 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
         )
@@ -341,8 +348,8 @@ class Bithumb(RestExchange, ImplicitAPI):
         self,
         acc_num: str,
         symbol: str | None = "",
-        start: str | None = None,
-        end: str | None = None,
+        start: datetime | None = None,
+        end: datetime | None = None,
         base_market: str = "KRW",
     ) -> ksxt.models.KsxtOpenOrderResponse:
         params = {
@@ -362,7 +369,9 @@ class Bithumb(RestExchange, 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)
 
@@ -370,8 +379,8 @@ class Bithumb(RestExchange, 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"}
@@ -387,7 +396,9 @@ class Bithumb(RestExchange, 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)
 
@@ -464,7 +475,7 @@ class Bithumb(RestExchange, ImplicitAPI):
         return ksxt.models.KsxtCreateOrderResponse(header=common_header, response=common_response, info=parsed_info)
 
     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": ""}
 
@@ -479,13 +490,17 @@ class Bithumb(RestExchange, 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
         )
 
-    def fetch_deposit_history(self, acc_num: str, base_market: str = "KRW") -> ksxt.models.KsxtDepositHistoryResponse:
+    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)
@@ -499,7 +514,9 @@ class Bithumb(RestExchange, ImplicitAPI):
             return ksxt.models.KsxtWithdrawalHistoryResponse(header=common_header, response=common_response, info=None)
 
         # 데이터 파싱
-        parsed_info = self.parser.parse_deposit_history(response)
+        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

ksxt/config/token.toml

@@ -1,7 +1,7 @@
-[PS80UIBxOj1XGF1Dl9eRdJa8mVRtQqvnV2y1]
-token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJ0b2tlbiIsImF1ZCI6IjJkMWE4MjI0LTVlMjgtNGMwYy1hMTZmLWZmNTFhOGFmMDY2MiIsInByZHRfY2QiOiIiLCJpc3MiOiJ1bm9ndyIsImV4cCI6MTcxNzMxNDQ2MywiaWF0IjoxNzE3MjI4MDYzLCJqdGkiOiJQUzgwVUlCeE9qMVhHRjFEbDllUmRKYThtVlJ0UXF2blYyeTEifQ.8G5fotvUupZonIAsEEGEC0810sqGayj08-recM4smwdRA23-fE2HISzl4HY9wHlPtkYwVMr0svZlo9HIrR-mlw"
-expired = "2024-06-02 16:47:43"
+[PSXkvBM1hQXJDRHg2rLvC7Tr8SoyPudlbx9o]
+token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJ0b2tlbiIsImF1ZCI6ImQ0N2EzYjY4LTlkMjQtNGE3YS04YmU2LTNjOWI5MzVmZDZhZCIsInByZHRfY2QiOiIiLCJpc3MiOiJ1bm9ndyIsImV4cCI6MTcyMzAzOTYzOSwiaWF0IjoxNzIyOTUzMjM5LCJqdGkiOiJQU1hrdkJNMWhRWEpEUkhnMnJMdkM3VHI4U295UHVkbGJ4OW8ifQ.573I5Sdj6339IWT5gxhdTFFeWCJDu_ukVAu5QbH9X_SU_laTjhFPttlKBn3HJZzmhYBV89BBcwnYiCwGFU9PFg"
+expired = 2024-08-07T23:07:19
 
-[PSCWKArP3T1L4qMgyZ4DXIDlqcaK48jJW1J5]
-token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJ0b2tlbiIsImF1ZCI6IjVjMWYzMWZhLTViYzEtNGM1OS04OGY1LTk5OTU5NmExMmMzMCIsInByZHRfY2QiOiIiLCJpc3MiOiJ1bm9ndyIsImV4cCI6MTcxODAwNDQ4NywiaWF0IjoxNzE3OTE4MDg3LCJqdGkiOiJQU0NXS0FyUDNUMUw0cU1neVo0RFhJRGxxY2FLNDhqSlcxSjUifQ.D6R4xlYKqZQykIyQUA5SgB6vxIEG33f_m_MzSrB9xGRdVKjcr0CyMleWeenyTZLAu6hQpu-3133uYachjI1zjw"
-expired = "2024-06-10 16:28:07"
+[PSo9UuHWHtg1QzRkyu1WeXYERyUkpRK9LSii]
+token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJ0b2tlbiIsImF1ZCI6ImNhY2NjNGZhLWMxMzktNGE5MC1hNjg2LTI2OTVmZmNiZmQ0NyIsInByZHRfY2QiOiIiLCJpc3MiOiJ1bm9ndyIsImV4cCI6MTcyMzM3ODExNSwiaWF0IjoxNzIzMjkxNzE1LCJqdGkiOiJQU285VXVIV0h0ZzFRelJreXUxV2VYWUVSeVVrcFJLOUxTaWkifQ.EnsBporS5hoD7Prx_fvXoklkxvx1u0Swp3jL9MXv3GnXtU_totbAtfDqsHWexQGJNqgEAPe6Bd2L2M0rCNUpCg"
+expired = 2024-08-11T21:08:35

ksxt/koreainvest.py

@@ -248,7 +248,12 @@ class KoreaInvest(RestExchange, ImplicitAPI):
 
     @RestExchange.check_token
     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 +290,22 @@ class KoreaInvest(RestExchange, 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
+        )
 
     @RestExchange.check_token
     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 +355,13 @@ class KoreaInvest(RestExchange, 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_info)
+        return ksxt.models.KsxtHistoricalDataResponse(
+            header=common_header, response=common_response, info=parsed_response
+        )
 
     @RestExchange.check_token
     def modify_order(

ksxt/models/transaction.py

@@ -13,6 +13,8 @@ class TransactionInfo(BaseModel):
 
     # 금액
     amount: float
+    # 세금
+    tax: Optional[float] = 0
     # 수수료
     fee: Optional[float] = 0