kabukit 0.4.0__tar.gz → 0.5.1__tar.gz

{kabukit-0.4.0 → kabukit-0.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: kabukit
-Version: 0.4.0
+Version: 0.5.1
 Summary: A Python toolkit for Japanese financial market data, supporting J-Quants and EDINET APIs.
 Author: daizutabi
 Author-email: daizutabi <daizutabi@gmail.com>
@@ -28,13 +28,13 @@ License: MIT License
 Classifier: Development Status :: 4 - Beta
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.13
-Requires-Dist: async-typer>=0.1
+Requires-Dist: async-typer>=0.1.10
 Requires-Dist: holidays>=0.81
-Requires-Dist: httpx>=0.28
-Requires-Dist: platformdirs>=4
-Requires-Dist: polars>=1
-Requires-Dist: python-dotenv>=1
-Requires-Dist: typer>=0.19
+Requires-Dist: httpx>=0.28.1
+Requires-Dist: platformdirs>=4.4.0
+Requires-Dist: polars>=1.34.0
+Requires-Dist: python-dotenv>=1.1.1
+Requires-Dist: typer>=0.19.2
 Requires-Python: >=3.13
 Project-URL: Documentation, https://daizutabi.github.io/kabukit/
 Project-URL: Issues, https://github.com/daizutabi/kabukit/issues

{kabukit-0.4.0 → kabukit-0.5.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "uv_build"
 
 [project]
 name = "kabukit"
-version = "0.4.0"
+version = "0.5.1"
 description = "A Python toolkit for Japanese financial market data, supporting J-Quants and EDINET APIs."
 readme = "README.md"
 license = { file = "LICENSE" }
@@ -16,13 +16,13 @@ classifiers = [
 ]
 requires-python = ">=3.13"
 dependencies = [
-  "async-typer>=0.1",
+  "async-typer>=0.1.10",
   "holidays>=0.81",
-  "httpx>=0.28",
-  "platformdirs>=4",
-  "polars>=1",
-  "python-dotenv>=1",
-  "typer>=0.19",
+  "httpx>=0.28.1",
+  "platformdirs>=4.4.0",
+  "polars>=1.34.0",
+  "python-dotenv>=1.1.1",
+  "typer>=0.19.2",
 ]
 
 [project.scripts]
@@ -35,10 +35,10 @@ Issues = "https://github.com/daizutabi/kabukit/issues"
 
 [dependency-groups]
 dev = [
-  "altair>=5",
-  "basedpyright>=1.31.4",
-  "marimo[lsp]>=0.16",
-  "numpy>=2.3.3",                 # polars 1.33 type hinting workaround,
+  "altair>=5.5.0",
+  "basedpyright>=1.31.6",
+  "marimo[lsp]>=0.16.5",
+  "numpy>=2.3.3",                   # polars 1.33 type hinting workaround,
   "pytest-asyncio>=1.2.0",
   "pytest-clarity>=1.0.1",
   "pytest-cov>=7.0.0",
@@ -47,9 +47,9 @@ dev = [
   "pytest-xdist>=3.8.0",
   "rich>=14.1.0",
   "tqdm>=4.67.1",
-  "vegafusion-python-embed>=1.6",
-  "vegafusion>=2",
-  "vl-convert-python>=1.8",
+  "vegafusion-python-embed>=1.6.9",
+  "vegafusion>=2.0.3",
+  "vl-convert-python>=1.8.0",
 ]
 docs = ["mkapi>=4.4", "mkdocs-marimo", "mkdocs-material"]
 

{kabukit-0.4.0 → kabukit-0.5.1}/src/kabukit/core/prices.py

@@ -41,10 +41,10 @@ class Prices(Base):
         (`AdjustmentFactor`) を用いて補正し、日次ベースの時系列データとして
         提供します。これにより、日々の時価総額計算などが正確に行えるようになります。
 
-        具体的には、`statements`から`TotalShares`（発行済株式総数）と
+        具体的には、`statements`から`IssuedShares`（発行済株式総数）と
         `TreasuryShares`（自己株式数）を取得し、それぞれを調整します。
         計算結果は、元の列名との混同を避けるため、接頭辞`Adjusted`を付与した
-        新しい列（`AdjustedTotalShares`, `AdjustedTreasuryShares`）として
+        新しい列（`AdjustedIssuedShares`, `AdjustedTreasuryShares`）として
         追加されます。
 
         .. note::
@@ -54,11 +54,10 @@ class Prices(Base):
             反映されないイベントによる株式数の変動は考慮されません。
 
         Args:
-            statements (Statements): `number_of_shares()`メソッドを通じて
-                株式数データを提供できる`Statements`オブジェクト。
+            statements (Statements): 財務データを提供する`Statements`オブジェクト。
 
         Returns:
-            Self: `AdjustedTotalShares`および`AdjustedTreasuryShares`列が
+            Self: `AdjustedIssuedShares`および`AdjustedTreasuryShares`列が
             追加された、新しいPricesオブジェクト。
         """
         shares = statements.number_of_shares().rename({"Date": "ReportDate"})
@@ -77,16 +76,32 @@ class Prices(Base):
                 .over("Code", "ReportDate")
                 .alias("CumulativeRatio"),
             )
-            .select(
-                "Date",
-                "Code",
-                (pl.col("TotalShares", "TreasuryShares") * pl.col("CumulativeRatio"))
+            .with_columns(
+                (pl.col("IssuedShares", "TreasuryShares") * pl.col("CumulativeRatio"))
                 .round(0)
                 .cast(pl.Int64)
                 .name.prefix("Adjusted"),
             )
+            .select("Date", "Code", "AdjustedIssuedShares", "AdjustedTreasuryShares")
         )
 
         data = self.data.join(adjusted, on=["Date", "Code"], how="left")
 
         return self.__class__(data)
+
+    def with_forecast_profit(self, statements: Statements) -> Self:
+        """時系列の予想純利益を列として追加する。
+
+        Args:
+            statements (Statements): 財務データを提供する`Statements`オブジェクト。
+
+        Returns:
+            Self: `ForecastProfit` 列が追加された、新しいPricesオブジェクト。
+        """
+        data = self.data.join_asof(
+            statements.forecast_profit(),
+            on="Date",
+            by="Code",
+            check_sortedness=False,
+        )
+        return self.__class__(data)

kabukit-0.5.1/src/kabukit/core/statements.py

@@ -0,0 +1,41 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+import polars as pl
+
+from .base import Base
+
+if TYPE_CHECKING:
+    from polars import DataFrame
+
+
+class Statements(Base):
+    def number_of_shares(self) -> DataFrame:
+        """発行済株式数を取得する。"""
+        return self.data.filter(
+            pl.col("IssuedShares").is_not_null(),
+        ).select(
+            "Date",
+            "Code",
+            "IssuedShares",
+            "TreasuryShares",
+            "AverageOutstandingShares",
+        )
+
+    def forecast_profit(self) -> DataFrame:
+        """予想純利益を抽出する。
+
+        Returns:
+            DataFrame: Date, Code, ForecastProfit を含むDataFrame
+        """
+        return (
+            self.data.with_columns(
+                pl.when(pl.col("TypeOfDocument").str.starts_with("FY"))
+                .then(pl.col("NextYearForecastProfit"))
+                .otherwise(pl.col("ForecastProfit"))
+                .alias("ForecastProfit"),
+            )
+            .filter(pl.col("ForecastProfit").is_not_null())
+            .select("Date", "Code", "ForecastProfit")
+        )

{kabukit-0.4.0 → kabukit-0.5.1}/src/kabukit/jquants/concurrent.py

@@ -41,7 +41,7 @@ async def fetch(
         DataFrame:
             すべての銘柄の財務情報を含む単一のDataFrame。
     """
-    return await concurrent.fetch(
+    data = await concurrent.fetch(
         JQuantsClient,
         resource,
         codes,
@@ -49,6 +49,7 @@ async def fetch(
         progress=progress,
         callback=callback,
     )
+    return data.sort("Code", "Date")
 
 
 async def fetch_all(

{kabukit-0.4.0 → kabukit-0.5.1}/src/kabukit/jquants/schema.py

@@ -130,7 +130,7 @@ class StatementColumns(BaseColumns):
     ChangesInAccountingEstimates = "会計上の見積りの変更"
     RetrospectiveRestatement = "修正再表示"
 
-    TotalShares = "期末発行済株式数" # 自己株式を含む (NumberOfIssuedAndOutstandingSharesAtTheEndOfFiscalYearIncludingTreasuryStock)
+    IssuedShares = "期末発行済株式数" # 自己株式を含む (NumberOfIssuedAndOutstandingSharesAtTheEndOfFiscalYearIncludingTreasuryStock)
     TreasuryShares = "期末自己株式数" # (NumberOfTreasuryStockAtTheEndOfFiscalYear)
     AverageOutstandingShares = "期中平均株式数" # 自己株式を除く。EPSなどの計算に使用される (AverageNumberOfShares)
 

{kabukit-0.4.0 → kabukit-0.5.1}/src/kabukit/jquants/statements.py

@@ -17,7 +17,7 @@ def clean(df: DataFrame) -> DataFrame:
         .rename(
             {
                 "LocalCode": "Code",
-                "NumberOfIssuedAndOutstandingSharesAtTheEndOfFiscalYearIncludingTreasuryStock": "TotalShares",  # noqa: E501
+                "NumberOfIssuedAndOutstandingSharesAtTheEndOfFiscalYearIncludingTreasuryStock": "IssuedShares",  # noqa: E501
                 "NumberOfTreasuryStockAtTheEndOfFiscalYear": "TreasuryShares",
                 "AverageNumberOfShares": "AverageOutstandingShares",
             },
@@ -49,7 +49,7 @@ def _cast_float(df: DataFrame) -> DataFrame:
         ]
     ).with_columns(
         pl.col(
-            "TotalShares",
+            "IssuedShares",
             "TreasuryShares",
         ).cast(pl.Int64, strict=False),
         pl.col(

kabukit-0.4.0/src/kabukit/core/statements.py

@@ -1,24 +0,0 @@
-from __future__ import annotations
-
-from typing import TYPE_CHECKING
-
-import polars as pl
-
-from .base import Base
-
-if TYPE_CHECKING:
-    from polars import DataFrame
-
-
-class Statements(Base):
-    def number_of_shares(self) -> DataFrame:
-        """発行済株式数を取得する。"""
-        return self.data.filter(
-            pl.col("TotalShares").is_not_null(),
-        ).select(
-            "Date",
-            "Code",
-            "TotalShares",
-            "TreasuryShares",
-            "AverageOutstandingShares",
-        )