moexapi 1.7.3__tar.gz → 1.7.5__tar.gz

{moexapi-1.7.3 → moexapi-1.7.5}/PKG-INFO

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

{moexapi-1.7.3 → moexapi-1.7.5}/moexapi/dividends.py

@@ -17,7 +17,10 @@ Dividends = list[Dividend]
 
 
 def _get_dividends_for_one_ticker(ticker: tickers.Ticker):
-    resp = utils.json_api_call(f"https://iss.moex.com/iss/securities/{ticker.secid}/dividends.json")['dividends']
+    response = utils.json_api_call(f"https://iss.moex.com/iss/securities/{ticker.secid}/dividends.json")
+    resp = response.get('dividends')
+    if resp is None:
+        return []
     columns = resp['columns']
     data = resp['data']
     dividends: Dividends = []

{moexapi-1.7.3 → moexapi-1.7.5}/moexapi/markets.py

@@ -102,8 +102,23 @@ _EQUITY = Market("equity", parent=_STOCK, markets={"shares"})
 _SHARES = Market("shares", parent=_EQUITY, security_types={"common_share", "preferred_share", "depositary_receipt"})
 _ETFS = Market("etfs", parent=_EQUITY, security_types={"exchange_ppif"})
 _BONDS = Market("bonds", parent=_STOCK, markets={"bonds"})
-_FEDERAL_BONDS = Market("federal bonds", parent=_BONDS, boards={"TQOB"})
-_COMPANY_BONDS = Market("company bonds", parent=_BONDS, boards={"TQCB"})
+_FEDERAL_BONDS = Market(
+    "federal bonds",
+    parent=_BONDS,
+    security_types={"cb_bond", "euro_bond", "ofz_bond"},
+)
+_COMPANY_BONDS = Market(
+    "company bonds",
+    parent=_BONDS,
+    security_types={
+        "corporate_bond",
+        "exchange_bond",
+        "ifi_bond",
+        "municipal_bond",
+        "state_bond",
+        "subfederal_bond",
+    },
+)
 _INDEX = Market("index", parent=_STOCK, markets={"index"})
 _CURRENCY = Market("currency", parent=_ALL, engines={"currency"}, markets={"selt"}, boards={"CETS"})
 

{moexapi-1.7.3 → moexapi-1.7.5}/moexapi/tickers.py

@@ -37,6 +37,12 @@ def _sur_to_rub(currency: T.Optional[str]) -> T.Optional[str]:
     return currency
 
 
+def _get_security_currency(security: dict) -> T.Optional[str]:
+    if FACEVALUEONSETTLEDATE in security or LOTVALUE in security:
+        return _sur_to_rub(security.get(FACEUNIT, "RUB"))
+    return _sur_to_rub(security.get(CURRENCY, "RUB"))
+
+
 class NotFindTicker(RuntimeError):
     def __init__(self, ticker, candidates):
         self.ticker = ticker
@@ -76,12 +82,12 @@ class TickerBoardInfo:
         securities = utils.prepare_dict(response, "securities")
         marketdata = utils.prepare_dict(response, "marketdata")
         assert len(securities) == len(marketdata)
-        boards = []
+        boards: list[tuple[str, T.Optional[str]]] = []
         result = None
         for sec_line, market_line in zip(securities, marketdata):
             board = sec_line[BOARDID]
             if board != primary_board:
-                boards.append(board)
+                boards.append((board, _get_security_currency(sec_line)))
                 continue
             else:
                 assert result is None, f"Second accurance of ticker {secid}: {result.boards[0]} vs {board}"
@@ -97,10 +103,7 @@ class TickerBoardInfo:
             lotvalue = sec_line.get(FACEVALUEONSETTLEDATE)
             if lotvalue is None:
                 lotvalue = sec_line.get(LOTVALUE)
-            if lotvalue is not None:
-                currency = _sur_to_rub(sec_line.get(FACEUNIT, "RUB"))
-            else:
-                currency = _sur_to_rub(sec_line.get(CURRENCY, "RUB"))
+            currency = _get_security_currency(sec_line)
             rate = 1
             price = raw_price
             if currency is not None and currency != "RUB" and market != markets.Markets.CURRENCY and price is not None:
@@ -126,7 +129,7 @@ class TickerBoardInfo:
                 value=market_line[VALTODAY],
             )
         if result:
-            result.boards.extend(boards)
+            result.boards.extend(board for board, currency in boards if currency == result.currency)
             response = utils.json_api_call(f"https://iss.moex.com/iss/securities/{secid}.json")
             for line in utils.prepare_dict(response, "boards"):
                 board = line[BOARDID.lower()]
@@ -134,6 +137,7 @@ class TickerBoardInfo:
                     board not in result.boards
                     and line["engine"] in market.engines
                     and line["market"] in market.markets
+                    and _sur_to_rub(line.get(CURRENCY.lower())) == result.currency
                 ):
                     result.boards.append(board)
         return result

{moexapi-1.7.3 → moexapi-1.7.5}/moexapi.egg-info/PKG-INFO

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

{moexapi-1.7.3 → moexapi-1.7.5}/pyproject.toml

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