openseries 1.5.4__tar.gz → 1.5.5__tar.gz

{openseries-1.5.4 → openseries-1.5.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openseries
-Version: 1.5.4
+Version: 1.5.5
 Summary: Tools for analyzing financial timeseries.
 Home-page: https://github.com/CaptorAB/openseries
 License: BSD-3-Clause

{openseries-1.5.4 → openseries-1.5.5}/openseries/_common_model.py

@@ -38,6 +38,7 @@ from openseries.types import (
     CountriesType,
     DaysInYearType,
     LiteralBarPlotMode,
+    LiteralJsonOutput,
     LiteralLinePlotMode,
     LiteralNanMethod,
     LiteralPlotlyJSlib,
@@ -651,16 +652,18 @@ class _CommonModel(BaseModel):
 
     def to_json(
         self: Self,
+        what_output: LiteralJsonOutput,
         filename: str,
         directory: Optional[DirectoryPath] = None,
     ) -> list[dict[str, Union[str, bool, ValueType, list[str], list[float]]]]:
         """
         Dump timeseries data into a json file.
 
-        The label and tsdf parameters are deleted before the json file is saved
-
         Parameters
         ----------
+        what_output: LiteralJsonOutput
+            Choice on whether the raw values or the tsdf Dataframe values are
+            returned as json and exported as json file.
         filename: str
             Filename including filetype
         directory: DirectoryPath, optional
@@ -669,7 +672,7 @@ class _CommonModel(BaseModel):
         Returns
         -------
         list[Dict[str, Union[str, bool, ValueType, list[str], list[float]]]]
-            A list of dictionaries with the raw original data of the series
+            A list of dictionaries with the data of the series
 
         """
         if directory:
@@ -683,21 +686,31 @@ class _CommonModel(BaseModel):
         data = dict(self.__dict__)
         output = []
         if "label" in data:
+            if what_output == "tsdf":
+                values = self.tsdf.iloc[:, 0].tolist()
+            else:
+                values = list(cast(list[float], data.get("values")))
             for item in cleaner_list:
                 data.pop(item)
+            valuetype = cast(ValueType, data.get("valuetype")).value
+            data.update({"valuetype": valuetype})
+            data.update({"values": values})
             output.append(dict(data))
         else:
             for serie in cast(list[Any], data.get("constituents")):
+                if what_output == "tsdf":
+                    values = serie.tsdf.iloc[:, 0].tolist()
+                else:
+                    values = list(serie.values)
                 itemdata = dict(serie.__dict__)
                 for item in cleaner_list:
                     itemdata.pop(item)
+                valuetype = cast(ValueType, itemdata["valuetype"]).value
+                itemdata.update({"valuetype": valuetype})
+                itemdata.update({"values": values})
                 output.append(dict(itemdata))
 
-        with Path.open(
-            dirpath.joinpath(filename),
-            "w",
-            encoding="utf-8",
-        ) as jsonfile:
+        with dirpath.joinpath(filename).open(mode="w", encoding="utf-8") as jsonfile:
             dump(output, jsonfile, indent=2, sort_keys=False)
 
         return output

{openseries-1.5.4 → openseries-1.5.5}/openseries/types.py

@@ -113,6 +113,7 @@ PlotlyLayoutType = dict[
 
 CaptorLogoType = dict[str, Union[str, float]]
 
+LiteralJsonOutput = Literal["values", "tsdf"]
 LiteralTrunc = Literal["before", "after", "both"]
 LiteralLinePlotMode = Literal[
     "lines",

{openseries-1.5.4 → openseries-1.5.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "openseries"
-version = "1.5.4"
+version = "1.5.5"
 description = "Tools for analyzing financial timeseries."
 authors = ["Martin Karrin <martin.karrin@captor.se>"]
 repository = "https://github.com/CaptorAB/openseries"
@@ -50,16 +50,16 @@ statsmodels = ">=0.14.0,<1.0.0"
 coverage = "^7.5.1"
 coverage-badge = "^1.1.1"
 mypy = "^1.10.0"
-pandas-stubs = "^2.2.1.240316"
-pre-commit = "^3.7.0"
-pytest = "^8.2.0"
-ruff = "^0.4.3"
+pandas-stubs = "^2.2.2.240514"
+pre-commit = "^3.7.1"
+pytest = "^8.2.1"
+ruff = "^0.4.5"
 types-openpyxl = "^3.1.0.20240428"
 types-python-dateutil = "^2.9.0.20240316"
-types-requests = "^2.31.0.20240406"
+types-requests = "^2.32.0.20240523"
 
 [build-system]
-requires = ["poetry-core>=1.8.2"]
+requires = ["poetry-core>=1.8.3"]
 build-backend = "poetry.core.masonry.api"
 
 [tool.pytest.ini_options]