kabukit 0.4.0__py3-none-any.whl → 0.5.0__py3-none-any.whl

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"})
@@ -80,7 +79,7 @@ class Prices(Base):
             .select(
                 "Date",
                 "Code",
-                (pl.col("TotalShares", "TreasuryShares") * pl.col("CumulativeRatio"))
+                (pl.col("IssuedShares", "TreasuryShares") * pl.col("CumulativeRatio"))
                 .round(0)
                 .cast(pl.Int64)
                 .name.prefix("Adjusted"),
@@ -90,3 +89,16 @@ class Prices(Base):
         data = self.data.join(adjusted, on=["Date", "Code"], how="left")
 
         return self.__class__(data)
+
+    # def with_yields(self, statements: Statements) -> Self:
+    #     """各種利回り指標（収益利回り、純資産利回り、配当利回り）を計算し、列として追加する。
+
+    #     Args:
+    #         statements (Statements): 財務データを提供する`Statements`オブジェクト。
+
+    #     Returns:
+    #         Self: 各種利回り指標が追加された、新しいPricesオブジェクト。
+    #     """
+    #     prices_with_adjusted_shares = self.with_adjusted_shares(statements)
+    #     data_with_yields = calculate_all_yields(prices_with_adjusted_shares, statements)
+    #     return self.__class__(data_with_yields)

kabukit/core/statements.py

@@ -14,11 +14,11 @@ class Statements(Base):
     def number_of_shares(self) -> DataFrame:
         """発行済株式数を取得する。"""
         return self.data.filter(
-            pl.col("TotalShares").is_not_null(),
+            pl.col("IssuedShares").is_not_null(),
         ).select(
             "Date",
             "Code",
-            "TotalShares",
+            "IssuedShares",
             "TreasuryShares",
             "AverageOutstandingShares",
         )

kabukit/jquants/schema.py

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

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.dist-info → kabukit-0.5.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: kabukit
-Version: 0.4.0
+Version: 0.5.0
 Summary: A Python toolkit for Japanese financial market data, supporting J-Quants and EDINET APIs.
 Author: daizutabi
 Author-email: daizutabi <daizutabi@gmail.com>

{kabukit-0.4.0.dist-info → kabukit-0.5.0.dist-info}/RECORD

@@ -13,9 +13,9 @@ kabukit/core/base.py,sha256=YQfGw3P2QshRdut3KhtrAleVvnFsIPOw5oGA9azypAA,1695
 kabukit/core/client.py,sha256=tVq1r3zpOfjmOtnRI1KPZHgTgBZYIpJzfw15i2kAM48,676
 kabukit/core/info.py,sha256=5BX7mDavF6g-b0KzHgKIFHUS5701BoaHtw1JcHSsy94,174
 kabukit/core/list.py,sha256=AjnXzC9XIu21l6IBEHHAS5VAnfxTfkAA9m1WAOZJNa8,174
-kabukit/core/prices.py,sha256=9v_eu-ylYJmDNLgruUeH6clW-mtwO-VRxrlLkWXp8VE,3601
+kabukit/core/prices.py,sha256=8bVNmLulH28cx0xyxa6XjGTOEMWHooAsvqq6kfGiqCI,4209
 kabukit/core/reports.py,sha256=ch_xe84GbB17JTfmY3ArQqneQ2XOuvrAykBTAyNmWuM,177
-kabukit/core/statements.py,sha256=iHa3zHH4HNLbOJF-GgC4HbpyrfFi-KUmrY1M3wzECZc,535
+kabukit/core/statements.py,sha256=FQDfCn8EBpMHabo5suPEQ49EwgFE4D_kltAXOb0TZjI,537
 kabukit/edinet/__init__.py,sha256=PKa4D-jVpeoOkdVp9NwwpgAiGEBjqvmJLmpzF-9SlVk,101
 kabukit/edinet/client.py,sha256=BlM7pjXpKweOo-ses41JiKinqRn4qerMN5NF7hgYKgg,3275
 kabukit/edinet/concurrent.py,sha256=2YPzIFuuOB8-gL3CnHIlP486QH5d21qjKNKGCFK7Hzk,4707
@@ -25,15 +25,15 @@ kabukit/jquants/client.py,sha256=shAyJoOHUa3h1fFfHdlm2ZYdQL3Oauy2S9VTJfNb_RI,115
 kabukit/jquants/concurrent.py,sha256=VGpWRq2NoDJCpyLAXegsJYPXvkY1hdjuuxxAprQzwEc,3294
 kabukit/jquants/info.py,sha256=AUymo6EtLdJ_L-0yNG1gd7rJ8Jkjw7tvsDM5Vw4QNFA,843
 kabukit/jquants/prices.py,sha256=oApQpdgzHwPw11XHpdg8ccZS7kybGtV8APZlpD2L3Yw,882
-kabukit/jquants/schema.py,sha256=dFbjkTglVcwR0YjQskLrphHIkM85Tc03yFJKm9xBL7g,9767
-kabukit/jquants/statements.py,sha256=tdxGVIchJImAqTL-lNYLD0yPsSVm-mDzXA8jPMRRne4,3067
+kabukit/jquants/schema.py,sha256=aILl9cp9JDOaT2o3UlfavPGQC5s7n0ZkVBGKiTzdogs,9768
+kabukit/jquants/statements.py,sha256=b5eS1_XEc9LzVffzjvP9-sXD-11tkY3IDQNP82E64Ww,3069
 kabukit/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 kabukit/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 kabukit/utils/concurrent.py,sha256=m2zVqJUz4xFVpNbEc9YEaj3Jmbl82njupdm4_rBOoYQ,4510
 kabukit/utils/config.py,sha256=Jp-2TCnIj_QqA71FzYCkHXbvXvhw_1JVl4PR0foA1vM,618
 kabukit/utils/date.py,sha256=DEC6Ac5LS8eiW6JtrmcD3U1pX4qzXtx4ale0swpO4Ag,937
 kabukit/utils/params.py,sha256=qcaJbf6CWPUoZAZsYDTaZSnBUWeAersbWnR_iiYW9GM,1108
-kabukit-0.4.0.dist-info/WHEEL,sha256=-neZj6nU9KAMg2CnCY6T3w8J53nx1kFGw_9HfoSzM60,79
-kabukit-0.4.0.dist-info/entry_points.txt,sha256=vvX771TemoM-35vVizW3JJ70HvRXnd2tX4P1Btzyoxs,46
-kabukit-0.4.0.dist-info/METADATA,sha256=Ku0jupeK7kRZUq_4OX-N5RXE-CJM02CzdnswxpOvd_g,3187
-kabukit-0.4.0.dist-info/RECORD,,
+kabukit-0.5.0.dist-info/WHEEL,sha256=-neZj6nU9KAMg2CnCY6T3w8J53nx1kFGw_9HfoSzM60,79
+kabukit-0.5.0.dist-info/entry_points.txt,sha256=vvX771TemoM-35vVizW3JJ70HvRXnd2tX4P1Btzyoxs,46
+kabukit-0.5.0.dist-info/METADATA,sha256=6TCfh48vd6SQb5V4dMVnp7rFpjf2uN8Y5pCWXFtqri0,3187
+kabukit-0.5.0.dist-info/RECORD,,