yjdata 0.1.0__tar.gz → 0.1.2__tar.gz

{yjdata-0.1.0 → yjdata-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yjdata
-Version: 0.1.0
+Version: 0.1.2
 Summary: yjdata SDK for Python
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown

{yjdata-0.1.0 → yjdata-0.1.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "yjdata"
-version = "0.1.0"
+version = "0.1.2"
 description = "yjdata SDK for Python"
 readme = "README.md"
 requires-python = ">=3.10"

{yjdata-0.1.0 → yjdata-0.1.2}/src/yjdata/dataset/common.py

@@ -212,11 +212,11 @@ def write_chunked_parquet(
     """
     groups = list(df.group_by(chunked_by))
     if sort_chunks:
-        groups.sort(key=lambda g: g[0])
+        groups.sort(key=lambda g: g[0][0])
 
     base_table = _normalize_string_type(df.head(0).to_arrow())
     metadata = dict(base_table.schema.metadata or {})
-    metadata[metadata_key] = ','.join(str(key) for key, _ in groups).encode('utf-8')
+    metadata[metadata_key] = ','.join(str(key[0]) for key, _ in groups).encode('utf-8')
 
     with pq.ParquetWriter(path, base_table.schema.with_metadata(metadata)) as writer:
         for _, group in groups:

{yjdata-0.1.0 → yjdata-0.1.2}/src/yjdata/db/adapter.py

@@ -25,19 +25,43 @@ def validate_delete_args(filter: Expression | None) -> None:
         raise TypeError("filter must be an Expression or None")
 
 
-def validate_select_args(filter: Expression | None, columns: Sequence[str] | None) -> None:
-    """Require an optional expression and a nonempty sequence of column names."""
+def validate_select_args(
+    filter: Expression | None,
+    columns: Sequence[str] | None,
+    order_by: Sequence[str] | None = None,
+    descending: Sequence[bool] | None = None,
+    offset: int | None = None,
+    limit: int | None = None,
+) -> None:
+    """Validate selection, ordering, and pagination before opening a connection."""
     if filter is not None and not isinstance(filter, Expression):
         raise TypeError("filter must be an Expression or None")
-    if columns is not None:
-        if isinstance(columns, (str, bytes)) or not isinstance(columns, Sequence):
-            raise TypeError("columns must be a sequence of column names")
-        if not columns:
-            raise ValueError("columns must contain at least one column")
-        if any(not isinstance(column, str) for column in columns):
+    for name, names in (("columns", columns), ("order_by", order_by)):
+        if names is None:
+            continue
+        if isinstance(names, (str, bytes)) or not isinstance(names, Sequence):
+            raise TypeError(f"{name} must be a sequence of column names")
+        if not names:
+            raise ValueError(f"{name} must contain at least one column")
+        if any(not isinstance(column, str) for column in names):
             raise TypeError("Column names must be strings")
-        if any(not column or "\x00" in column for column in columns):
+        if any(not column or "\x00" in column for column in names):
             raise ValueError("Column names must be nonempty and contain no NUL characters")
+    if descending is not None:
+        if isinstance(descending, (str, bytes)) or not isinstance(descending, Sequence):
+            raise TypeError("descending must be a sequence of booleans")
+        if any(not isinstance(direction, bool) for direction in descending):
+            raise TypeError("descending must contain only booleans")
+        if order_by is None:
+            raise ValueError("descending requires order_by")
+        if len(descending) != len(order_by):
+            raise ValueError("descending must have the same length as order_by")
+    for name, value in (("offset", offset), ("limit", limit)):
+        if value is not None:
+            if isinstance(value, bool) or not isinstance(value, int):
+                raise TypeError(f"{name} must be a nonnegative integer or None")
+            if value < 0:
+                raise ValueError(f"{name} must be a nonnegative integer")
 
 
 def validate_update_args(
@@ -134,6 +158,10 @@ class DbAdapter(ABC):
         *,
         filter: Expression | None = None,
         columns: Sequence[str] | None = None,
+        order_by: Sequence[str] | None = None,
+        descending: Sequence[bool] | None = None,
+        offset: int | None = None,
+        limit: int | None = None,
     ) -> list[dict[str, Any]]:
         """Select rows from one table as dictionaries.
 
@@ -145,11 +173,23 @@ class DbAdapter(ABC):
             Condition to match; None selects all rows.
         columns : sequence of str, optional
             Nonempty sequence of column names; None selects all columns.
+        order_by : sequence of str, optional
+            Nonempty sequence of column names in sorting priority order.
+            None applies no sorting.
+        descending : sequence of bool, optional
+            One flag per order_by column: True for descending, False for
+            ascending. Requires order_by. None uses SQL's default ascending order.
+        offset : int, optional
+            Nonnegative number of rows to skip; None applies no offset.
+        limit : int, optional
+            Nonnegative maximum number of rows; None applies no row limit.
+            Zero returns no rows.
 
         Returns
         -------
         list of dict
-            Matching rows keyed by column name, without a guaranteed order.
+            Matching rows keyed by column name. Order is unspecified unless
+            order_by is provided.
         """
         raise NotImplementedError("This adapter does not implement selection")
 
@@ -159,6 +199,10 @@ class DbAdapter(ABC):
         *,
         filter: Expression | None = None,
         columns: Sequence[str] | None = None,
+        order_by: Sequence[str] | None = None,
+        descending: Sequence[bool] | None = None,
+        offset: int | None = None,
+        limit: int | None = None,
     ) -> pl.DataFrame:
         """Select rows from one table as a Polars DataFrame.
 
@@ -170,12 +214,23 @@ class DbAdapter(ABC):
             Condition to match; None selects all rows.
         columns : sequence of str, optional
             Nonempty sequence of column names; None selects all columns.
+        order_by : sequence of str, optional
+            Nonempty sequence of column names in sorting priority order.
+            None applies no sorting.
+        descending : sequence of bool, optional
+            One flag per order_by column: True for descending, False for
+            ascending. Requires order_by. None uses SQL's default ascending order.
+        offset : int, optional
+            Nonnegative number of rows to skip; None applies no offset.
+        limit : int, optional
+            Nonnegative maximum number of rows; None applies no row limit.
+            Zero returns no rows.
 
         Returns
         -------
         polars.DataFrame
-            Matching rows with types inferred from all rows, without a
-            guaranteed order. An empty result has no columns.
+            Matching rows with types inferred from all rows. Order is unspecified
+            unless order_by is provided. An empty result has no columns.
         """
         raise NotImplementedError("This adapter does not implement selection")
 

{yjdata-0.1.0 → yjdata-0.1.2}/src/yjdata/db/mysql.py

@@ -20,6 +20,12 @@ class MysqlAdapter(SqlAdapter):
         self._conn_kwargs.update(conn_kwargs)
         super().__init__()
 
+    def _select_pagination_sql(self, offset: int | None, limit: int | None) -> tuple[str, list[int]]:
+        if offset is not None and limit is None:
+            # MySQL requires LIMIT with OFFSET; this value means all remaining rows.
+            return " LIMIT 18446744073709551615 OFFSET %s", [offset]
+        return super()._select_pagination_sql(offset, limit)
+
     def _build_upsert_sql(
         self,
         table: str,

{yjdata-0.1.0 → yjdata-0.1.2}/src/yjdata/db/sql.py

@@ -7,7 +7,6 @@ import polars as pl
 
 from .adapter import (
     DbAdapter,
-    QueryArgs,
     validate_insert_args,
     validate_delete_args,
     validate_select_args,
@@ -77,14 +76,29 @@ class SqlAdapter(DbAdapter):
         *,
         filter: Expression | None = None,
         columns: Sequence[str] | None = None,
+        order_by: Sequence[str] | None = None,
+        descending: Sequence[bool] | None = None,
+        offset: int | None = None,
+        limit: int | None = None,
     ) -> list[dict[str, Any]]:
-        validate_select_args(filter, columns)
+        validate_select_args(filter, columns, order_by, descending, offset, limit)
         projection = "*" if columns is None else ", ".join(self._quote_identifier(column) for column in columns)
         qry = f"SELECT {projection} FROM {self._table_identifier(table)}"
         args: list[Any] = []
         if filter is not None:
             condition, args = filter.to_param_sql(quote_identifier=self._quote_identifier)
             qry += f" WHERE {condition}"
+        if order_by is not None:
+            ordering = []
+            for index, column in enumerate(order_by):
+                term = self._quote_identifier(column)
+                if descending is not None:
+                    term += " DESC" if descending[index] else " ASC"
+                ordering.append(term)
+            qry += " ORDER BY " + ", ".join(ordering)
+        pagination, pagination_args = self._select_pagination_sql(offset, limit)
+        qry += pagination
+        args.extend(pagination_args)
         return self._fetch_data(qry, args)
 
     def select_polars(
@@ -93,12 +107,30 @@ class SqlAdapter(DbAdapter):
         *,
         filter: Expression | None = None,
         columns: Sequence[str] | None = None,
+        order_by: Sequence[str] | None = None,
+        descending: Sequence[bool] | None = None,
+        offset: int | None = None,
+        limit: int | None = None,
     ) -> pl.DataFrame:
         return pl.DataFrame(
-            self.select_data(table, filter=filter, columns=columns),
+            self.select_data(
+                table, filter=filter, columns=columns, order_by=order_by,
+                descending=descending, offset=offset, limit=limit,
+            ),
             infer_schema_length=None,
         )
 
+    def _select_pagination_sql(self, offset: int | None, limit: int | None) -> tuple[str, list[int]]:
+        clause = ""
+        args = []
+        if limit is not None:
+            clause += " LIMIT %s"
+            args.append(limit)
+        if offset is not None:
+            clause += " OFFSET %s"
+            args.append(offset)
+        return clause, args
+
     def update_polars(
         self,
         table: str,

{yjdata-0.1.0 → yjdata-0.1.2}/src/yjdata/web/calendar.py

@@ -1,10 +1,15 @@
+from abc import abstractmethod
 from typing import Awaitable, List, Union
 
 from ._context import RequestContext
 from ._input import DateStrArgType, parse_date_str_arg
 
 
-__all__ = ['CalendarWebClient']
+__all__ = [
+    'CalendarWebClient',
+    'SyncCalenderWebClient',
+    'AsyncCalendarWebClient'
+]
 
 
 class CalendarWebClient:
@@ -115,3 +120,41 @@ class CalendarWebClient:
             'end': parse_date_str_arg(end, False),
             'calendar': calendar
         })
+
+    @abstractmethod
+    def is_trading_day(self, date: DateStrArgType, calendar: str = 'XSHG') -> Union[bool, Awaitable[bool]]:
+        """Check if the specified date is a trading day.
+
+        Parameters
+        ----------
+        date : str
+            The date to check.
+        calendar : str, default: 'XSHG'
+
+        Returns
+        ----------
+        bool
+            True if the date is a trading day, False otherwise.
+
+        Examples
+        ----------
+        >>> import yjdata
+        >>> cli = yjdata.WebDataClient()
+        >>> cli.calendar.is_trading_day('2025-07-18')
+        True
+        >>> cli.calendar.is_trading_day('2025-07-19')
+        False
+        """
+        pass
+
+
+class SyncCalenderWebClient(CalendarWebClient):
+    def is_trading_day(self, date: DateStrArgType, calendar: str = 'XSHG') -> bool:
+        trading_days = self.range(date, date, calendar)
+        return len(trading_days) > 0
+
+
+class AsyncCalendarWebClient(CalendarWebClient):
+    async def is_trading_day(self, date: DateStrArgType, calendar: str = 'XSHG') -> bool:
+        trading_days = await self.range(date, date, calendar)
+        return len(trading_days) > 0

{yjdata-0.1.0 → yjdata-0.1.2}/src/yjdata/web/client.py

@@ -1,6 +1,6 @@
 import os
 
-from .calendar import CalendarWebClient
+from .calendar import SyncCalenderWebClient, AsyncCalendarWebClient
 from ._context import RequestContext, SyncRequestContext, AsyncRequestContext
 
 
@@ -23,11 +23,6 @@ class _WebClient:
             self._host = host
         self._context = context
 
-    @property
-    def calendar(self) -> CalendarWebClient:
-        """API set for calendar services."""
-        return CalendarWebClient(self._host, self._context)
-
 
 class WebDataClient(_WebClient):
     """Client for accessing YJData web API."""
@@ -35,9 +30,19 @@ class WebDataClient(_WebClient):
     def __init__(self, host: str = _YJDATA_WEB_BASE_URL):
         super().__init__(host, SyncRequestContext())
 
+    @property
+    def calendar(self) -> SyncCalenderWebClient:
+        """API set for calendar services."""
+        return SyncCalenderWebClient(self._host, self._context)
+
 
 class AsyncWebDataClient(_WebClient):
     """Async client for accessing YJData web API."""
 
     def __init__(self, host: str = _YJDATA_WEB_BASE_URL):
         super().__init__(host, AsyncRequestContext())
+
+    @property
+    def calendar(self) -> AsyncCalendarWebClient:
+        """API set for calendar services."""
+        return AsyncCalendarWebClient(self._host, self._context)

{yjdata-0.1.0 → yjdata-0.1.2}/src/yjdata.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yjdata
-Version: 0.1.0
+Version: 0.1.2
 Summary: yjdata SDK for Python
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown

{yjdata-0.1.0 → yjdata-0.1.2}/src/yjdata.egg-info/SOURCES.txt

@@ -24,4 +24,5 @@ src/yjdata/web/_context.py
 src/yjdata/web/_input.py
 src/yjdata/web/calendar.py
 src/yjdata/web/client.py
-src/yjdata/web/time_util.py
+src/yjdata/web/time_util.py
+test/test.py

yjdata-0.1.2/test/test.py

@@ -0,0 +1,4 @@
+import yjdata
+
+cli = yjdata.WebDataClient()
+print(cli.calendar.is_trading_day('2026-01-01'))