moexapi 1.6.46__tar.gz → 1.6.48__tar.gz

{moexapi-1.6.46 → moexapi-1.6.48}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: moexapi
-Version: 1.6.46
+Version: 1.6.48
 Summary: Python API for MOEX ISS
 Author-email: Aliaksei Rak <kventinel@gmail.com>
 License: MIT License

{moexapi-1.6.46 → moexapi-1.6.48}/moexapi/candles.py

@@ -57,7 +57,7 @@ class Candle:
             volume=first.volume + second.volume,
             value=first.value + second.value,
         )
-    
+
     def mult(self, mult: float) -> None:
         self.low *= mult
         self.high *= mult
@@ -100,11 +100,15 @@ def _merge_candles_list(candles: list[list[Candle]]) -> list[Candle]:
 def _parse_candles_one_board(
     ticker: tickers.Ticker,
     board: str,
-    start_date: T.Optional[datetime.datetime] = None,
-    end_date: T.Optional[datetime.datetime] = None,
+    start_date: T.Optional[T.Union[datetime.datetime, str]] = None,
+    end_date: T.Optional[T.Union[datetime.datetime, str]] = None,
     interval: T.Optional[int] = None,
 ) -> list[Candle]:
     result = []
+    if isinstance(start_date, str):
+        start_date = datetime.datetime.fromisoformat(start_date)
+    if isinstance(end_date, str):
+        end_date = datetime.datetime.fromisoformat(end_date)
     while True:
         start_str = f"from={start_date.isoformat()}" if start_date else ""
         end_str = f"till={end_date.isoformat()}" if end_date else ""
@@ -145,8 +149,8 @@ def _parse_candles_one_board(
 
 def _parse_candles(
     ticker: tickers.Ticker,
-    start_date: T.Optional[datetime.datetime] = None,
-    end_date: T.Optional[datetime.datetime] = None,
+    start_date: T.Optional[T.Union[datetime.datetime, str]] = None,
+    end_date: T.Optional[T.Union[datetime.datetime, str]] = None,
     interval: T.Optional[int] = None,
 ):
     candles = []
@@ -159,8 +163,8 @@ def _parse_candles(
 
 def get_candles(
     ticker: tickers.Ticker,
-    start_date: T.Optional[datetime.datetime] = None,
-    end_date: T.Optional[datetime.datetime] = None,
+    start_date: T.Optional[T.Union[datetime.datetime, str]] = None,
+    end_date: T.Optional[T.Union[datetime.datetime, str]] = None,
     interval: T.Optional[int] = None,
 ):
     ticker = changeover.get_current_ticker(ticker)
@@ -172,6 +176,6 @@ def get_candles(
     result = _merge_candles_list(candles)
     for split in ticker_splits:
         for candle in result:
-            if candle.end < split.date:
+            if candle.end.date() < split.date:
                 candle.mult(1 / split.mult)
     return result

{moexapi-1.6.46 → moexapi-1.6.48}/moexapi/changeover.py

@@ -45,7 +45,7 @@ def get_prev_tickers(ticker: tickers.Ticker) -> list[tickers.Ticker]:
     for line in changeovers:
         if line.new_secid == result[-1].secid:
             try:
-                result.insert(0, tickers.get_ticker(line.old_secid, market=ticker.market))
+                result.insert(0, tickers.get_ticker(line.old_secid, market=ticker.market, allow_delisted=True))
             except tickers.NotFindTicker as ex:
                 logger.warning(f"Can't find old version {ex.ticker} for {ticker}")
     return result

{moexapi-1.6.46 → moexapi-1.6.48}/moexapi/history.py

@@ -64,14 +64,15 @@ class History:
             volume=_maybe_sum(first.volume, second.volume),
             value=_maybe_sum(first.value, second.value),
         )
-    
+
     def mult(self, mult: float) -> None:
         self.low *= mult
         self.high *= mult
         self.open *= mult
         self.close *= mult
         self.mid_price *= mult
-        self.value *= mult
+        if self.value is not None:
+            self.value *= mult
 
 
 def _merge_history(first: list[History], second: list[History]) -> list[History]:

{moexapi-1.6.46 → moexapi-1.6.48}/moexapi/tickers.py

@@ -215,7 +215,7 @@ class Ticker:
         return result
 
     @classmethod
-    def from_secid(cls, secid: str, market: markets.Market = markets.Markets.ALL) -> "Ticker":
+    def from_secid(cls, secid: str, market: markets.Market = markets.Markets.ALL, allow_delisted: bool = False) -> "Ticker":
         parsed_tickers = _parse_tickers(market=market)
         tickers = [cls.from_listing(ticker) for ticker in parsed_tickers if ticker.secid == secid]
         if len([ticker for ticker in tickers if ticker.is_traded]) == 0:
@@ -255,6 +255,12 @@ class Ticker:
         if len(tickers) != 1:
             if len(tickers) > 1:
                 logger.error(f'Find too many tickers for {secid}: {tickers}')
+            if allow_delisted and len(tickers) == 0:
+                info = TickerInfo.from_secid(secid, market)
+                response = utils.json_api_call(f"https://iss.moex.com/iss/securities/{secid}.json")
+                boards = [line["boardid"] for line in utils.prepare_dict(response, "boards")]
+                if boards:
+                    return cls(secid=secid, alias=secid, is_traded=False, market=market, shortname=info.shortname, isin=info.isin, subtype=info.subtype, listlevel=info.listlevel, boards=boards, listed_till=info.listed_till)
             raise NotFindTicker(secid, len(tickers))
         tickers[0].alias = secid
         return tickers[0]
@@ -292,8 +298,8 @@ def _parse_tickers(market: markets.Market = markets.Markets.ALL) -> list[Listing
     return list(tickers.values())
 
 
-def get_ticker(secid: str, market: markets.Market = markets.Markets.ALL) -> Ticker:
-    return Ticker.from_secid(secid, market=market)
+def get_ticker(secid: str, market: markets.Market = markets.Markets.ALL, allow_delisted: bool = False) -> Ticker:
+    return Ticker.from_secid(secid, market=market, allow_delisted=allow_delisted)
 
 
 def get_tickers(

{moexapi-1.6.46 → moexapi-1.6.48}/moexapi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: moexapi
-Version: 1.6.46
+Version: 1.6.48
 Summary: Python API for MOEX ISS
 Author-email: Aliaksei Rak <kventinel@gmail.com>
 License: MIT License

{moexapi-1.6.46 → moexapi-1.6.48}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "moexapi"
-version = "1.6.46"
+version = "1.6.48"
 description = "Python API for MOEX ISS"
 readme = "README.md"
 authors = [{ name = "Aliaksei Rak", email = "kventinel@gmail.com" }]