kabukit 0.7.0__tar.gz → 0.7.2__tar.gz

{kabukit-0.7.0 → kabukit-0.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: kabukit
-Version: 0.7.0
+Version: 0.7.2
 Summary: A Python toolkit for Japanese financial market data, supporting J-Quants and EDINET APIs.
 Author: daizutabi
 Author-email: daizutabi <daizutabi@gmail.com>
@@ -28,15 +28,17 @@ License: MIT License
 Classifier: Development Status :: 4 - Beta
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Requires-Dist: async-typer>=0.1.10
-Requires-Dist: holidays>=0.82
 Requires-Dist: httpx>=0.28.1
-Requires-Dist: platformdirs>=4.4.0
+Requires-Dist: platformdirs>=4.5.0
 Requires-Dist: polars>=1.34.0
 Requires-Dist: python-dotenv>=1.1.1
-Requires-Dist: rich>=14.1.0
+Requires-Dist: rich>=14.2.0
+Requires-Dist: tenacity>=9.1.2
 Requires-Dist: tqdm>=4.67.1
 Requires-Dist: typer>=0.19.2
+Requires-Dist: tzdata ; sys_platform == 'win32'
 Requires-Python: >=3.13
 Project-URL: Documentation, https://daizutabi.github.io/kabukit/
 Project-URL: Issues, https://github.com/daizutabi/kabukit/issues

{kabukit-0.7.0 → kabukit-0.7.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "uv_build"
 
 [project]
 name = "kabukit"
-version = "0.7.0"
+version = "0.7.2"
 description = "A Python toolkit for Japanese financial market data, supporting J-Quants and EDINET APIs."
 readme = "README.md"
 license = { file = "LICENSE" }
@@ -13,18 +13,20 @@ classifiers = [
   "Development Status :: 4 - Beta",
   "Programming Language :: Python",
   "Programming Language :: Python :: 3.13",
+  "Programming Language :: Python :: 3.14",
 ]
 requires-python = ">=3.13"
 dependencies = [
   "async-typer>=0.1.10",
-  "holidays>=0.82",
   "httpx>=0.28.1",
-  "platformdirs>=4.4.0",
+  "platformdirs>=4.5.0",
   "polars>=1.34.0",
   "python-dotenv>=1.1.1",
-  "rich>=14.1.0",
+  "rich>=14.2.0",
+  "tenacity>=9.1.2",
   "tqdm>=4.67.1",
   "typer>=0.19.2",
+  "tzdata; sys_platform == 'win32'",
 ]
 
 [project.scripts]
@@ -37,17 +39,18 @@ Issues = "https://github.com/daizutabi/kabukit/issues"
 
 [dependency-groups]
 dev = [
-  "altair>=5.5.0",
+  "altair @ git+https://github.com/vega/altair.git@main",
   "basedpyright>=1.31.6",
   "marimo[lsp]>=0.16.5",
-  "numpy>=2.3.3",                   # polars 1.33 type hinting workaround,
+  "numpy>=2.3.3",
+  "pre-commit>=4.3.0",
   "pytest-asyncio>=1.2.0",
   "pytest-clarity>=1.0.1",
   "pytest-cov>=7.0.0",
   "pytest-mock>=3.15.1",
   "pytest-randomly>=4.0.1",
   "pytest-xdist>=3.8.0",
-  "scipy",
+  "scipy>=1.16.2",
   "vegafusion-python-embed>=1.6.9",
   "vegafusion>=2.0.3",
   "vl-convert-python>=1.8.0",
@@ -69,7 +72,7 @@ skip_covered = true
 [tool.ruff]
 line-length = 88
 target-version = "py313"
-include = ["src", "tests"]
+include = ["src/**/*.py", "tests/**/*.py"]
 
 [tool.ruff.lint]
 select = ["ALL"]
@@ -91,14 +94,14 @@ ignore = [
 ]
 
 [tool.ruff.lint.per-file-ignores]
-"tests/*" = ["ANN", "FBT", "S101", "S607", "PLC2401"]
+"tests/**/*.py" = ["ANN", "FBT", "S101", "S607", "PLC2401"]
 "schema.py" = ["E501"]
-"notebooks/*" = ["F704", "PLE1142"]
+"notebooks/**/*.py" = ["F704", "PLE1142"]
 
 [tool.ruff.format]
 exclude = ["schema.py"]
 
-[tool.basedpyright]
+[tool.pyright]
 include = ["src", "tests"]
 reportAny = false
 reportExplicitAny = false

{kabukit-0.7.0 → kabukit-0.7.2}/src/kabukit/analysis/visualization/__init__.py

@@ -4,4 +4,4 @@ from .prices import plot_prices
 __all__ = [
     "plot_prices",
     "plot_topix_timeseries",
-]
+]

{kabukit-0.7.0 → kabukit-0.7.2}/src/kabukit/core/base.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 import datetime
 from typing import TYPE_CHECKING
+from zoneinfo import ZoneInfo
 
 import polars as pl
 
@@ -30,7 +31,7 @@ class Base:
     def write(self) -> Path:
         data_dir = self.data_dir()
         data_dir.mkdir(parents=True, exist_ok=True)
-        path = datetime.datetime.today().strftime("%Y%m%d")  # noqa: DTZ002
+        path = datetime.datetime.now(ZoneInfo("Asia/Tokyo")).strftime("%Y%m%d")
         filename = data_dir / f"{path}.parquet"
         self.data.write_parquet(filename)
         return filename

{kabukit-0.7.0 → kabukit-0.7.2}/src/kabukit/core/info.py

@@ -1,12 +1,7 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
-
 from .base import Base
 
-if TYPE_CHECKING:
-    from polars import DataFrame
-
 
 class Info(Base):
     pass

{kabukit-0.7.0 → kabukit-0.7.2}/src/kabukit/core/list.py

@@ -1,12 +1,7 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
-
 from .base import Base
 
-if TYPE_CHECKING:
-    from polars import DataFrame
-
 
 class List(Base):
     pass

{kabukit-0.7.0 → kabukit-0.7.2}/src/kabukit/core/reports.py

@@ -1,12 +1,7 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
-
 from .base import Base
 
-if TYPE_CHECKING:
-    from polars import DataFrame
-
 
 class Reports(Base):
     pass

{kabukit-0.7.0 → kabukit-0.7.2}/src/kabukit/edinet/client.py

@@ -6,7 +6,9 @@ import zipfile
 from enum import StrEnum
 from typing import TYPE_CHECKING
 
+import httpx
 from polars import DataFrame
+from tenacity import retry, retry_if_exception, stop_after_attempt, wait_exponential
 
 from kabukit.core.client import Client
 from kabukit.utils.config import load_dotenv
@@ -24,6 +26,11 @@ API_VERSION = "v2"
 BASE_URL = f"https://api.edinet-fsa.go.jp/api/{API_VERSION}"
 
 
+def is_retryable(e: BaseException) -> bool:
+    """Return True if the exception is a retryable network error."""
+    return isinstance(e, (httpx.ConnectTimeout, httpx.ReadTimeout, httpx.ConnectError))
+
+
 class AuthKey(StrEnum):
     """Environment variable keys for EDINET authentication."""
 
@@ -43,6 +50,12 @@ class EdinetClient(Client):
         if api_key:
             self.client.params = {"Subscription-Key": api_key}
 
+    @retry(
+        reraise=True,
+        stop=stop_after_attempt(3),
+        wait=wait_exponential(multiplier=1, min=2, max=10),
+        retry=retry_if_exception(is_retryable),
+    )
     async def get(self, url: str, params: QueryParamTypes) -> Response:
         resp = await self.client.get(url, params=params)
         resp.raise_for_status()

{kabukit-0.7.0 → kabukit-0.7.2}/src/kabukit/edinet/doc.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 import datetime
 from typing import TYPE_CHECKING
+from zoneinfo import ZoneInfo
 
 import polars as pl
 
@@ -11,7 +12,11 @@ if TYPE_CHECKING:
 
 def clean_list(df: DataFrame, date: str | datetime.date) -> DataFrame:
     if isinstance(date, str):
-        date = datetime.datetime.strptime(date, "%Y-%m-%d").date()  # noqa: DTZ007
+        date = (
+            datetime.datetime.strptime(date, "%Y-%m-%d")
+            .replace(tzinfo=ZoneInfo("Asia/Tokyo"))
+            .date()
+        )
 
     null_columns = [c for c in df.columns if df[c].dtype == pl.Null]
 
@@ -21,7 +26,11 @@ def clean_list(df: DataFrame, date: str | datetime.date) -> DataFrame:
         )
         .with_columns(
             pl.lit(date).alias("Date"),
-            pl.col("^.+DateTime$").str.to_datetime("%Y-%m-%d %H:%M", strict=False),
+            pl.col("^.+DateTime$").str.to_datetime(
+                "%Y-%m-%d %H:%M",
+                strict=False,
+                time_zone="Asia/Tokyo",
+            ),
             pl.col("^period.+$").str.to_date("%Y-%m-%d", strict=False),
             pl.col("^.+Flag$").cast(pl.Int8).cast(pl.Boolean),
             pl.col("^.+Code$").cast(pl.String),

kabukit-0.7.2/src/kabukit/jquants/calendar.py

@@ -0,0 +1,12 @@
+from __future__ import annotations
+
+import polars as pl
+from polars import DataFrame
+
+
+def clean(df: DataFrame) -> DataFrame:
+    return df.with_columns(
+        pl.col("Date").str.to_date("%Y-%m-%d"),
+        pl.col("HolidayDivision").cast(pl.Categorical),
+        pl.col("HolidayDivision").eq("1").not_().alias("IsHoliday"),
+    )

{kabukit-0.7.0 → kabukit-0.7.2}/src/kabukit/jquants/client.py

@@ -1,9 +1,11 @@
 from __future__ import annotations
 
+import asyncio
 import datetime
 import os
 from enum import StrEnum
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, final
+from zoneinfo import ZoneInfo
 
 import polars as pl
 from polars import DataFrame
@@ -12,7 +14,7 @@ from kabukit.core.client import Client
 from kabukit.utils.config import load_dotenv, set_key
 from kabukit.utils.params import get_params
 
-from . import info, prices, statements, topix
+from . import calendar, info, prices, statements, topix
 
 if TYPE_CHECKING:
     from collections.abc import AsyncIterator
@@ -21,6 +23,25 @@ if TYPE_CHECKING:
     from httpx import HTTPStatusError  # noqa: F401
     from httpx._types import QueryParamTypes
 
+
+@final
+class _CalendarCache:
+    def __init__(self) -> None:
+        self._holidays: list[datetime.date] | None = None
+        self._lock = asyncio.Lock()
+
+    async def get_holidays(self, client: JQuantsClient) -> list[datetime.date]:
+        async with self._lock:
+            if self._holidays is None:
+                df = await client.get_calendar()
+                holidays = df.filter(pl.col("IsHoliday"))["Date"]
+                self._holidays = holidays.to_list()
+            return self._holidays
+
+
+_calendar_cache_manager = _CalendarCache()
+
+
 API_VERSION = "v1"
 BASE_URL = f"https://api.jquants.com/{API_VERSION}"
 
@@ -128,32 +149,6 @@ class JQuantsClient(Client):
         self.set_id_token(id_token)
         return self
 
-    async def get_info(
-        self,
-        code: str | None = None,
-        date: str | datetime.date | None = None,
-        *,
-        clean: bool = True,
-    ) -> DataFrame:
-        """銘柄情報を取得する。
-
-        Args:
-            code (str, optional): 情報を取得する銘柄のコード。
-            date (str | datetime.date, optional): 情報を取得する日付。
-            clean (bool, optional): 取得したデータをクリーンアップするかどうか。
-
-        Returns:
-            銘柄情報を含むDataFrame。
-
-        Raises:
-            HTTPStatusError: APIリクエストが失敗した場合。
-        """
-        params = get_params(code=code, date=date)
-        url = "/listed/info"
-        data = await self.get(url, params)
-        df = DataFrame(data["info"])
-        return info.clean(df) if clean else df
-
     async def iter_pages(
         self,
         url: str,
@@ -183,6 +178,32 @@ class JQuantsClient(Client):
             else:
                 break
 
+    async def get_info(
+        self,
+        code: str | None = None,
+        date: str | datetime.date | None = None,
+        *,
+        clean: bool = True,
+    ) -> DataFrame:
+        """銘柄情報を取得する。
+
+        Args:
+            code (str, optional): 情報を取得する銘柄のコード。
+            date (str | datetime.date, optional): 情報を取得する日付。
+            clean (bool, optional): 取得したデータをクリーンアップするかどうか。
+
+        Returns:
+            銘柄情報を含むDataFrame。
+
+        Raises:
+            HTTPStatusError: APIリクエストが失敗した場合。
+        """
+        params = get_params(code=code, date=date)
+        url = "/listed/info"
+        data = await self.get(url, params)
+        df = DataFrame(data["info"])
+        return info.clean(df) if clean else df
+
     async def get_prices(
         self,
         code: str | None = None,
@@ -240,7 +261,7 @@ class JQuantsClient(Client):
         clean: bool = True,
     ) -> DataFrame:
         """直近利用可能な日付の株価を取得する。"""
-        today = datetime.date.today()  # noqa: DTZ011
+        today = datetime.datetime.now(ZoneInfo("Asia/Tokyo")).date()
 
         for days in range(num_days):
             date = today - datetime.timedelta(days)
@@ -291,7 +312,11 @@ class JQuantsClient(Client):
 
         df = statements.clean(df)
 
-        return statements.with_date(df) if with_date else df
+        if not with_date:
+            return df
+
+        holidays = await _calendar_cache_manager.get_holidays(self)
+        return statements.with_date(df, holidays=holidays)
 
     async def get_announcement(self) -> DataFrame:
         """翌日発表予定の決算情報を取得する。
@@ -310,7 +335,7 @@ class JQuantsClient(Client):
         if df.is_empty():
             return df
 
-        return df.with_columns(pl.col("Date").str.to_date("%Y-%m-%d", strict=False))
+        return df.with_columns(pl.col("Date").str.to_date("%Y-%m-%d"))
 
     async def get_trades_spec(
         self,
@@ -341,7 +366,7 @@ class JQuantsClient(Client):
         if df.is_empty():
             return df
 
-        return df.with_columns(pl.col("^.*Date$").str.to_date("%Y-%m-%d", strict=False))
+        return df.with_columns(pl.col("^.*Date$").str.to_date("%Y-%m-%d"))
 
     async def get_topix(
         self,
@@ -371,3 +396,38 @@ class JQuantsClient(Client):
             return df
 
         return topix.clean(df)
+
+    async def get_calendar(
+        self,
+        holidaydivision: str | None = None,
+        from_: str | datetime.date | None = None,
+        to: str | datetime.date | None = None,
+    ) -> DataFrame:
+        """東証およびOSEにおける営業日、休業日、ならびにOSEにおける祝日取引の有無の情報を取得する。
+
+        Args:
+            holidaydivision: 祝日区分。
+                - 非営業日: "0"
+                - 営業日: "1"
+                - 東証半日立会日: "2"
+                - 非営業日(祝日取引あり): "3"
+            from_: 取得期間の開始日。
+            to: 取得期間の終了日。
+
+        Returns:
+            営業日・非営業日データを含むPolars DataFrame。
+
+        Raises:
+            HTTPStatusError: APIリクエストが失敗した場合。
+        """
+        params = get_params(holidaydivision=holidaydivision, from_=from_, to=to)
+
+        url = "/markets/trading_calendar"
+        name = "trading_calendar"
+
+        dfs = [df async for df in self.iter_pages(url, params, name)]
+        df = pl.concat(dfs)
+        if df.is_empty():
+            return df
+
+        return calendar.clean(df)

{kabukit-0.7.0 → kabukit-0.7.2}/src/kabukit/jquants/statements.py

@@ -1,10 +1,8 @@
 from __future__ import annotations
 
 import datetime
-from functools import cache
 from typing import TYPE_CHECKING
 
-import holidays
 import polars as pl
 
 if TYPE_CHECKING:
@@ -80,27 +78,15 @@ def _cast_bool(df: DataFrame) -> DataFrame:
     )
 
 
-@cache
-def get_holidays(year: int | None = None, n: int = 10) -> list[datetime.date]:
-    """指定した過去年数の日本の祝日を取得する。"""
-    if year is None:
-        year = datetime.datetime.now().year  # noqa: DTZ005
-
-    dates = holidays.country_holidays("JP", years=range(year - n, year + 1))
-    return sorted(dates.keys())
-
-
-def with_date(df: DataFrame, year: int | None = None) -> DataFrame:
+def with_date(df: DataFrame, holidays: list[datetime.date]) -> DataFrame:
     """`Date`列を追加する。
 
-    開示日が休日のとき、あるいは、開示時刻が15時以降の場合、Dateを開示日の翌営業日に設定する。
+    開示日が休日のとき、あるいは、開示時刻が15時30分以降の場合、Dateを開示日の翌営業日に設定する。
     """
     is_after_hours = pl.col("DisclosedTime").is_null() | (
-        pl.col("DisclosedTime") > datetime.time(15, 0)
+        pl.col("DisclosedTime") >= datetime.time(15, 30)
     )
 
-    holidays = get_holidays(year=year)
-
     return df.select(
         pl.when(is_after_hours)
         .then(pl.col("DisclosedDate") + datetime.timedelta(days=1))

{kabukit-0.7.0 → kabukit-0.7.2}/src/kabukit/utils/concurrent.py

@@ -150,5 +150,5 @@ async def fetch(
         if callback:
             stream = (x if (r := callback(x)) is None else r async for x in stream)
 
-        dfs = [df async for df in stream if not df.is_empty()]
+        dfs = [df async for df in stream if not df.is_empty()]  # ty: ignore[not-iterable]
         return pl.concat(dfs) if dfs else pl.DataFrame()

{kabukit-0.7.0 → kabukit-0.7.2}/src/kabukit/utils/date.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import datetime
+from zoneinfo import ZoneInfo
 
 
 def get_dates(days: int | None = None, years: int | None = None) -> list[datetime.date]:
@@ -11,7 +12,7 @@ def get_dates(days: int | None = None, years: int | None = None) -> list[datetim
         years (int | None): 過去years年の日付リストを取得する。
             daysが指定されている場合は無視される。
     """
-    end_date = datetime.date.today()  # noqa: DTZ011
+    end_date = datetime.datetime.now(ZoneInfo("Asia/Tokyo")).date()
 
     if days is not None:
         start_date = end_date - datetime.timedelta(days=days)