moexapi 1.6.36__tar.gz → 1.6.37__tar.gz

{moexapi-1.6.36 → moexapi-1.6.37}/PKG-INFO

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

{moexapi-1.6.36 → moexapi-1.6.37}/moexapi/tickers.py

@@ -208,15 +208,12 @@ class Ticker:
     def from_secid(cls, secid: str, market: markets.Market = markets.Markets.ALL) -> "Ticker":
         parsed_tickers = _parse_tickers(market=market)
         tickers = [cls.from_listing(ticker) for ticker in parsed_tickers if ticker.secid == secid]
-        tickers_length = len(tickers)
         if len([ticker for ticker in tickers if ticker.is_traded]) == 0:
             tickers.extend([
                 cls.from_listing(ticker) for ticker in parsed_tickers if ticker.shortname.replace(' ', '') == secid
             ])
-            tickers_length = tickers_length if tickers_length > 0 else len(tickers)
         if len([ticker for ticker in tickers if ticker.is_traded]) == 0:
             tickers.extend([cls.from_listing(ticker) for ticker in parsed_tickers if ticker.isin == secid])
-            tickers_length = tickers_length if tickers_length > 0 else len(tickers)
         if (
             len([ticker for ticker in tickers if ticker.is_traded]) == 0 and
             len(secid) == 3 and
@@ -227,18 +224,13 @@ class Ticker:
                 cls.from_listing(ticker)
                 for ticker in parsed_tickers if ticker.secid == cur_secid and market.has(markets.Markets.CURRENCY)
             ])
-            tickers_length = tickers_length if tickers_length > 0 else len(tickers)
             if len([ticker for ticker in tickers if ticker.is_traded]) == 0:
                 tickers.extend([
                     cls.from_listing(ticker) for ticker in parsed_tickers
                     if ticker.shortname == cur_secid and market.has(markets.Markets.CURRENCY)
                 ])
-                tickers_length = tickers_length if tickers_length > 0 else len(tickers)
-        if len(tickers) > 1:
-            if len([ticker for ticker in tickers if ticker.is_traded]) != 0:
-                tickers = [ticker for ticker in tickers if ticker.is_traded]
-            else:
-                tickers = tickers[:tickers_length]
+        if len(tickers) > 1 and len([ticker for ticker in tickers if ticker.is_traded]) != 0:
+            tickers = [ticker for ticker in tickers if ticker.is_traded]
         if len(tickers) != 1:
             if len(tickers) > 1:
                 logger.error(f'Find too many tickers for {secid}: {tickers}')
@@ -282,6 +274,11 @@ def get_ticker(secid: str, market: markets.Market = markets.Markets.ALL) -> Tick
     return Ticker.from_secid(secid, market=market)
 
 
-def get_tickers(market: markets.Market = markets.Markets.ALL) -> list[Ticker]:
+def get_tickers(market: markets.Market = markets.Markets.ALL, limit: int = None) -> list[Ticker]:
     tickers = _parse_tickers(market=market)
-    return [Ticker.from_secid(secid=ticker.secid, market=ticker.market) for ticker in tickers]
+    result = []
+    for idx, ticker in enumerate(tickers):
+        if idx >= limit:
+            break
+        result.append(Ticker.from_secid(secid=ticker.secid, market=ticker.market))
+    return result

{moexapi-1.6.36 → moexapi-1.6.37}/moexapi.egg-info/PKG-INFO

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

{moexapi-1.6.36 → moexapi-1.6.37}/pyproject.toml

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