moexapi 1.7.1__tar.gz → 1.7.3__tar.gz

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

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

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

@@ -9,11 +9,13 @@ class Market:
         engines: set[str] = frozenset(),
         markets: set[str] = frozenset(),
         boards: set[str] = frozenset(),
+        security_types: set[str] = frozenset(),
     ):
         self._name = name
         self._engines = engines
         self._markets = markets
         self._boards = boards
+        self._security_types = security_types
         self._parent = parent
         self._childs: list["Market"] = []
         if parent:
@@ -51,6 +53,10 @@ class Market:
     @property
     def boards(self) -> set[str]:
         return self._join("_boards")
+
+    @property
+    def security_types(self) -> set[str]:
+        return self._join("_security_types")
     
     def childs(self) -> list["Market"]:
         if len(self._childs) == 0:
@@ -93,8 +99,8 @@ class Market:
 _ALL = Market("all")
 _STOCK = Market("stock", parent=_ALL, engines={"stock"})
 _EQUITY = Market("equity", parent=_STOCK, markets={"shares"})
-_SHARES = Market("shares", parent=_EQUITY, boards={"TQBR", "EQBR", "EQNE", "EQNL", "EQBS"})
-_ETFS = Market("etfs", parent=_EQUITY, boards={"TQTF", "TQTD", "TQTY"})
+_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"})

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

@@ -80,7 +80,7 @@ class TickerBoardInfo:
         result = None
         for sec_line, market_line in zip(securities, marketdata):
             board = sec_line[BOARDID]
-            if market.boards and board != primary_board:
+            if board != primary_board:
                 boards.append(board)
                 continue
             else:
@@ -127,6 +127,15 @@ class TickerBoardInfo:
             )
         if result:
             result.boards.extend(boards)
+            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()]
+                if (
+                    board not in result.boards
+                    and line["engine"] in market.engines
+                    and line["market"] in market.markets
+                ):
+                    result.boards.append(board)
         return result
 
 
@@ -197,7 +206,7 @@ class Ticker:
         result = cls(
             secid=listing.secid,
             alias=listing.secid,
-            is_traded=info.is_traded,
+            is_traded=listing.is_traded,
             market=listing.market,
             shortname=listing.shortname,
             isin=info.isin,
@@ -279,6 +288,8 @@ def _parse_tickers(market: markets.Market = markets.Markets.ALL) -> list[Listing
             if len(securities) == 0:
                 break
             for line in securities:
+                if child_market.security_types and line.get("type") not in child_market.security_types:
+                    continue
                 isin = line["isin"]
                 if isin is None and child_market != markets.Markets.CURRENCY:
                     continue
@@ -305,7 +316,7 @@ def get_ticker(secid: str, market: markets.Market = markets.Markets.ALL, allow_d
 def get_tickers(
     market: markets.Market = markets.Markets.ALL,
     is_traded: T.Optional[bool] = None,
-    limit: int = None
+    limit: T.Optional[int] = None
 ) -> list[Ticker]:
     tickers = _parse_tickers(market=market)
     result = []

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

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

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

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