moexapi 1.7.15__tar.gz → 1.7.16__tar.gz

{moexapi-1.7.15 → moexapi-1.7.16}/PKG-INFO

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

{moexapi-1.7.15 → moexapi-1.7.16}/moexapi/candles.py

@@ -22,7 +22,8 @@ class Candle:
     open -- open price of the day
     close -- close price of the day
     volume -- number of shares/bonds/currencies sold on the day
-    value -- sum of all transactions in RUB for the day
+    value -- sum of all transactions in currency for the day
+    currency -- currency of transaction value
     """
     start: datetime.datetime
     end: datetime.datetime
@@ -32,9 +33,11 @@ class Candle:
     close: float
     volume: T.Optional[int]
     value: T.Optional[float]
+    currency: T.Optional[str] = None
 
     @classmethod
     def merge(cls, first: 'Candle', second: 'Candle'):
+        assert first.currency == second.currency, "Can't merge candles in different currencies"
         if second.start < first.start:
             start = second.start
             open = second.open
@@ -56,6 +59,7 @@ class Candle:
             close=close,
             volume=first.volume + second.volume,
             value=first.value + second.value,
+            currency=first.currency,
         )
 
     def mult(self, mult: float) -> None:
@@ -141,6 +145,7 @@ def _parse_candles_one_board(
                     close=close,
                     volume=line.get("volume"),
                     value=line.get("value"),
+                    currency=tickers._sur_to_rub(ticker.currency),
                 )
             )
         if len(candles) == 0:

{moexapi-1.7.15 → moexapi-1.7.16}/moexapi/history.py

@@ -38,7 +38,8 @@ class History:
     mid_price -- weighted average price of the day
     numtrades -- number of trades for the day
     volume -- number of shares/bonds/currencies sold on the day
-    value -- sum of all transactions in RUB for the day
+    value -- sum of all transactions in currency for the day
+    currency -- currency of transaction value
     """
     date: datetime.date
     low: float
@@ -49,10 +50,12 @@ class History:
     numtrades: int
     volume: T.Optional[int]
     value: T.Optional[float]
+    currency: T.Optional[str] = None
 
     @classmethod
     def merge(cls, first: 'History', second: 'History'):
         assert first.date == second.date
+        assert first.currency == second.currency, "Can't merge history in different currencies"
         return cls(
             date=first.date,
             low=min(first.low, second.low),
@@ -63,6 +66,7 @@ class History:
             numtrades=first.numtrades + second.numtrades,
             volume=_maybe_sum(first.volume, second.volume),
             value=_maybe_sum(first.value, second.value),
+            currency=first.currency,
         )
 
     def mult(self, mult: float) -> None:
@@ -134,8 +138,10 @@ def _parse_history(
             if low == 0.0 or high == 0.0 or open == 0.0 or close == 0.0:
                 continue
             value = line.get("VALUE")
+            currency = tickers._sur_to_rub(line.get("CURRENCYID") or ticker.currency)
             if ticker.market == markets.Markets.CURRENCY:
                 value = line.get("VOLRUR")
+                currency = "RUB"
             item = History(
                 date=date,
                 low=low,
@@ -146,6 +152,7 @@ def _parse_history(
                 numtrades=line.get("NUMTRADES") or 0,
                 volume=line.get("VOLUME"),
                 value=value,
+                currency=currency,
             )
             if len(result) > 0 and result[-1].date == date:
                 if board in boards:

{moexapi-1.7.15 → moexapi-1.7.16}/moexapi.egg-info/PKG-INFO

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

{moexapi-1.7.15 → moexapi-1.7.16}/pyproject.toml

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