moexapi 1.6.45__tar.gz → 1.6.47__tar.gz

{moexapi-1.6.45 → moexapi-1.6.47}/PKG-INFO

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

{moexapi-1.6.45 → moexapi-1.6.47}/moexapi/bonds.py

@@ -103,7 +103,7 @@ class Bond:
                         Amortization(date=date, value=line["value"], initialfacevalue=line["initialfacevalue"])
                     )
                 for line in coupons:
-                    date = datetime.date.fromisoformat(line["coupondate"])
+                    date = datetime.date.fromisoformat(line["recorddate"])
                     end_date = _max(end_date, date)
                     self.coupons.append(
                         Coupon(
@@ -178,7 +178,7 @@ class Bond:
         date_from = date_from or datetime.date.today()
         result = [offer for offer in self.offers if offer.date >= date_from]
         return result[0] if len(result) > 0 else None
-    
+
     def has_next_offer(self, date_from: T.Optional[datetime.date] = None) -> bool:
         return self.next_offer(date_from=date_from) is not None
 

{moexapi-1.6.45 → moexapi-1.6.47}/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.45 → moexapi-1.6.47}/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.45 → moexapi-1.6.47}/moexapi.egg-info/PKG-INFO

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

{moexapi-1.6.45 → moexapi-1.6.47}/pyproject.toml

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