moexapi 1.7.7__tar.gz → 1.7.9__tar.gz

{moexapi-1.7.7 → moexapi-1.7.9}/PKG-INFO

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

{moexapi-1.7.7 → moexapi-1.7.9}/moexapi/bonds.py

@@ -99,31 +99,34 @@ class Bond:
                 for line in amortization:
                     date = datetime.date.fromisoformat(line["amortdate"])
                     end_date = _max(end_date, date)
-                    self.amortization.append(
-                        Amortization(date=date, value=line["value"], initialfacevalue=line["initialfacevalue"])
+                    item = Amortization(
+                        date=date,
+                        value=line["value"],
+                        initialfacevalue=line["initialfacevalue"],
                     )
+                    if item not in self.amortization:
+                        self.amortization.append(item)
                 for line in coupons:
                     date = datetime.date.fromisoformat(line["recorddate"] if line["recorddate"] else line["coupondate"])
                     end_date = _max(end_date, date)
-                    self.coupons.append(
-                        Coupon(
-                            date=date,
-                            start_date=datetime.date.fromisoformat(line["startdate"])
-                            if line.get("startdate") else None,
-                            value=line["value"],
-                            initialfacevalue=line["initialfacevalue"],
-                        )
+                    item = Coupon(
+                        date=date,
+                        start_date=datetime.date.fromisoformat(line["startdate"])
+                        if line.get("startdate") else None,
+                        value=line["value"],
+                        initialfacevalue=line["initialfacevalue"],
                     )
+                    if item not in self.coupons:
+                        self.coupons.append(item)
                 for line in offers:
                     date = datetime.date.fromisoformat(line["offerdate"])
                     end_date = _max(end_date, date)
-                    self.offers.append(Offer(date=date, value=line["value"]))
+                    item = Offer(date=date, value=line["value"])
+                    if item not in self.offers:
+                        self.offers.append(item)
                 if end_date == start_date:
                     break
                 start_date = end_date
-                self.amortization = [item for item in self.amortization if item.date != start_date]
-                self.coupons = [item for item in self.coupons if item.date != start_date]
-                self.offers = [item for item in self.offers if item.date != start_date]
             original_values = [item.value for item in self.amortization]
             amortization_sum = sum(original_values)
             if abs(amortization_sum - self.initial_face_value) > 1e-9 and len(original_values) > 1:

{moexapi-1.7.7 → moexapi-1.7.9}/moexapi/tickers.py

@@ -131,16 +131,35 @@ class TickerBoardInfo:
             )
         if result:
             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()]
-                if (
-                    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)
+        response = utils.json_api_call(f"https://iss.moex.com/iss/securities/{secid}.json")
+        board_lines = utils.prepare_dict(response, "boards")
+        if result is None:
+            primary_lines = [
+                line for line in board_lines
+                if line[BOARDID.lower()] == primary_board
+            ]
+            if not primary_lines:
+                return None
+            currency = _sur_to_rub(primary_lines[0].get(CURRENCY.lower()))
+            result = cls(
+                boards=[primary_board],
+                currency=currency,
+                raw_price=None,
+                price=None,
+                price_in_rub=None,
+                accumulated_coupon=0,
+                listlevel=None,
+                value=None,
+            )
+        for line in board_lines:
+            board = line[BOARDID.lower()]
+            if (
+                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.7 → moexapi-1.7.9}/moexapi.egg-info/PKG-INFO

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

{moexapi-1.7.7 → moexapi-1.7.9}/pyproject.toml

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