ping-dataexport 0.4.0__tar.gz → 0.4.1__tar.gz

{ping_dataexport-0.4.0/src/ping_dataexport.egg-info → ping_dataexport-0.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ping-dataexport
-Version: 0.4.0
+Version: 0.4.1
 Summary: PING's Data Export Tool - To Parquet/CSV/TEXT as Accelerator for Data & AI Project
 Author: Vorapol Ping (ping-godhand)
 Maintainer: Godhand.DEV
@@ -396,8 +396,8 @@ All options:
 | `-m` | `--mode` | export mode: `groupby` \| `date` \| `relativedate` \| `monthbydate` \| `splitrow` \| `watermark` — see section 3 |
 | `-col` | `--column` | column the mode partitions on |
 | `-row` | `--row` | rows per file (`-m splitrow`) |
-| `-df` | `--datefrom` | start / anchor date `yyyy-MM-dd`; omitted with `-dr`/`-mr` ⇒ today (system date) |
-| `-dt` | `--dateto` | end date `yyyy-MM-dd` (`-m date`) |
+| `-df` | `--datefrom` | start / anchor date `yyyy-MM-dd` or `@@CURRENT_DATE@@[±N@@]` (see *Date tokens*); omitted with `-dr`/`-mr` ⇒ today (system date) |
+| `-dt` | `--dateto` | end date `yyyy-MM-dd` or `@@CURRENT_DATE@@[±N@@]` (`-m date`) |
 | `-dr` | `--daysrelative` | days back from `-df` (`-m relativedate`) |
 | `-mr` | `--monthsrelative` | months back from `-df` (`-m monthbydate`) |
 | `-rm` | `--removeexisting` | `Yes`: clear the output directory before exporting |
@@ -430,6 +430,39 @@ All options:
 Modes split one query into multiple files. All need `-dir` (output directory)
 + `-pf` (filename prefix); partition values are always bound SQL parameters.
 
+### Date tokens for `-df` / `-dt` (`DateFrom` / `DateTo`)
+
+Instead of a fixed `yyyy-MM-dd`, both accept the current date of the machine
+running the export, optionally shifted by whole days:
+
+| Token | Meaning |
+|-------|---------|
+| `@@CURRENT_DATE@@` | today |
+| `@@CURRENT_DATE@@-N@@` | today minus N days, e.g. `@@CURRENT_DATE@@-7@@` |
+| `@@CURRENT_DATE@@+N@@` | today plus N days, e.g. `@@CURRENT_DATE@@+1@@` |
+
+`N` is a plain integer (`-1`, `-30`, `-100`, `+10` …). The token is
+case-insensitive. Anything else — a missing closing `@@`, a non-integer, a
+space, a double sign — is rejected with a validation error before anything runs.
+Handy in job files that run daily:
+
+```ini
+[Last7Days]
+Source=DB01
+Query=SELECT * FROM sales
+Mode=date
+Column=txn_date
+DateFrom=@@CURRENT_DATE@@-7@@
+DateTo=@@CURRENT_DATE@@-1@@
+OutputDir=out/last7
+BaseName=sales
+```
+
+```bash
+ping-dataexport -s DB01 -q "SELECT * FROM sales" -m date -col txn_date \
+    -df "@@CURRENT_DATE@@-7@@" -dt "@@CURRENT_DATE@@" -dir last7 -pf sales
+```
+
 **`groupby` — one file per distinct value of a column:**
 
 ```bash
@@ -576,8 +609,8 @@ Every job.ini key and the CLI option it mirrors (keys are case-insensitive):
 | `Mode` | `-m` / `--mode` | `groupby` / `date` / `relativedate` / `monthbydate` / `splitrow` / `watermark` |
 | `Column` | `-col` / `--column` | the column the mode partitions on |
 | `Row` | `-row` / `--row` | rows per file (`Mode=splitrow`) |
-| `DateFrom` | `-df` / `--datefrom` | start / anchor date, `yyyy-MM-dd` |
-| `DateTo` | `-dt` / `--dateto` | end date, `yyyy-MM-dd` (`Mode=date`) |
+| `DateFrom` | `-df` / `--datefrom` | start / anchor date, `yyyy-MM-dd` or `@@CURRENT_DATE@@[±N@@]` |
+| `DateTo` | `-dt` / `--dateto` | end date, `yyyy-MM-dd` or `@@CURRENT_DATE@@[±N@@]` (`Mode=date`) |
 | `DaysRelative` | `-dr` / `--daysrelative` | days back from `DateFrom` (`Mode=relativedate`) |
 | `MonthsRelative` | `-mr` / `--monthsrelative` | months back from `DateFrom` (`Mode=monthbydate`) |
 | `RemoveExisting` | `-rm` / `--removeexisting` | `Yes`: clear `OutputDir` before exporting |

{ping_dataexport-0.4.0 → ping_dataexport-0.4.1}/README.md

@@ -352,8 +352,8 @@ All options:
 | `-m` | `--mode` | export mode: `groupby` \| `date` \| `relativedate` \| `monthbydate` \| `splitrow` \| `watermark` — see section 3 |
 | `-col` | `--column` | column the mode partitions on |
 | `-row` | `--row` | rows per file (`-m splitrow`) |
-| `-df` | `--datefrom` | start / anchor date `yyyy-MM-dd`; omitted with `-dr`/`-mr` ⇒ today (system date) |
-| `-dt` | `--dateto` | end date `yyyy-MM-dd` (`-m date`) |
+| `-df` | `--datefrom` | start / anchor date `yyyy-MM-dd` or `@@CURRENT_DATE@@[±N@@]` (see *Date tokens*); omitted with `-dr`/`-mr` ⇒ today (system date) |
+| `-dt` | `--dateto` | end date `yyyy-MM-dd` or `@@CURRENT_DATE@@[±N@@]` (`-m date`) |
 | `-dr` | `--daysrelative` | days back from `-df` (`-m relativedate`) |
 | `-mr` | `--monthsrelative` | months back from `-df` (`-m monthbydate`) |
 | `-rm` | `--removeexisting` | `Yes`: clear the output directory before exporting |
@@ -386,6 +386,39 @@ All options:
 Modes split one query into multiple files. All need `-dir` (output directory)
 + `-pf` (filename prefix); partition values are always bound SQL parameters.
 
+### Date tokens for `-df` / `-dt` (`DateFrom` / `DateTo`)
+
+Instead of a fixed `yyyy-MM-dd`, both accept the current date of the machine
+running the export, optionally shifted by whole days:
+
+| Token | Meaning |
+|-------|---------|
+| `@@CURRENT_DATE@@` | today |
+| `@@CURRENT_DATE@@-N@@` | today minus N days, e.g. `@@CURRENT_DATE@@-7@@` |
+| `@@CURRENT_DATE@@+N@@` | today plus N days, e.g. `@@CURRENT_DATE@@+1@@` |
+
+`N` is a plain integer (`-1`, `-30`, `-100`, `+10` …). The token is
+case-insensitive. Anything else — a missing closing `@@`, a non-integer, a
+space, a double sign — is rejected with a validation error before anything runs.
+Handy in job files that run daily:
+
+```ini
+[Last7Days]
+Source=DB01
+Query=SELECT * FROM sales
+Mode=date
+Column=txn_date
+DateFrom=@@CURRENT_DATE@@-7@@
+DateTo=@@CURRENT_DATE@@-1@@
+OutputDir=out/last7
+BaseName=sales
+```
+
+```bash
+ping-dataexport -s DB01 -q "SELECT * FROM sales" -m date -col txn_date \
+    -df "@@CURRENT_DATE@@-7@@" -dt "@@CURRENT_DATE@@" -dir last7 -pf sales
+```
+
 **`groupby` — one file per distinct value of a column:**
 
 ```bash
@@ -532,8 +565,8 @@ Every job.ini key and the CLI option it mirrors (keys are case-insensitive):
 | `Mode` | `-m` / `--mode` | `groupby` / `date` / `relativedate` / `monthbydate` / `splitrow` / `watermark` |
 | `Column` | `-col` / `--column` | the column the mode partitions on |
 | `Row` | `-row` / `--row` | rows per file (`Mode=splitrow`) |
-| `DateFrom` | `-df` / `--datefrom` | start / anchor date, `yyyy-MM-dd` |
-| `DateTo` | `-dt` / `--dateto` | end date, `yyyy-MM-dd` (`Mode=date`) |
+| `DateFrom` | `-df` / `--datefrom` | start / anchor date, `yyyy-MM-dd` or `@@CURRENT_DATE@@[±N@@]` |
+| `DateTo` | `-dt` / `--dateto` | end date, `yyyy-MM-dd` or `@@CURRENT_DATE@@[±N@@]` (`Mode=date`) |
 | `DaysRelative` | `-dr` / `--daysrelative` | days back from `DateFrom` (`Mode=relativedate`) |
 | `MonthsRelative` | `-mr` / `--monthsrelative` | months back from `DateFrom` (`Mode=monthbydate`) |
 | `RemoveExisting` | `-rm` / `--removeexisting` | `Yes`: clear `OutputDir` before exporting |

{ping_dataexport-0.4.0 → ping_dataexport-0.4.1}/job.sample.ini

@@ -20,3 +20,16 @@ Source=SQLITE01
 Query=SELECT * FROM sales
 Output=out/full_dump.parquet
 Format=parquet
+
+[Last7Days]
+; DateFrom/DateTo accept @@CURRENT_DATE@@, @@CURRENT_DATE@@-N@@, @@CURRENT_DATE@@+N@@
+; (N = whole days; the date is the system date of the machine running the export)
+Source=SQLITE01
+Query=SELECT * FROM sales
+Mode=date
+Column=txn_date
+DateFrom=@@CURRENT_DATE@@-7@@
+DateTo=@@CURRENT_DATE@@-1@@
+OutputDir=out/last7
+BaseName=sales
+Format=csv

{ping_dataexport-0.4.0 → ping_dataexport-0.4.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ping-dataexport"
-version = "0.4.0"
+version = "0.4.1"
 description = "PING's Data Export Tool - To Parquet/CSV/TEXT as Accelerator for Data & AI Project"
 readme = "README.md"
 license = "Apache-2.0"

{ping_dataexport-0.4.0 → ping_dataexport-0.4.1}/src/ping_dataexport/__init__.py

@@ -11,7 +11,7 @@ The package uses relative imports only and has no import-time side effects, so
 the directory can be copied into any project and imported directly.
 """
 
-__version__ = "0.4.0"
+__version__ = "0.4.1"
 __author__ = "Vorapol Ping (ping-godhand)"
 __organization__ = "Godhand.DEV"
 __url__ = "https://github.com/ping-godhand"

{ping_dataexport-0.4.0 → ping_dataexport-0.4.1}/src/ping_dataexport/job/spec.py

@@ -5,6 +5,7 @@
 
 from __future__ import annotations
 
+import re
 from dataclasses import dataclass, replace
 from datetime import date, datetime, timedelta
 from typing import Optional, Tuple
@@ -86,14 +87,42 @@ class JobSpec:
         return self.output is None and self.outputdir is None
 
 
-def parse_strict_date(value: str, *, what: str) -> date:
-    """Strict yyyy-MM-dd — anything else is a validation error (exit 1)."""
+#: DateFrom / DateTo token: the machine's current date, optionally shifted by whole days.
+CURRENT_DATE_TOKEN = "@@CURRENT_DATE@@"
+_CURRENT_DATE_RE = re.compile(r"^@@CURRENT_DATE@@(?:([+-]\d+)@@)?$")
+
+
+def parse_strict_date(value: str, *, what: str, today: Optional[date] = None) -> date:
+    """Strict yyyy-MM-dd, or the @@CURRENT_DATE@@ token — anything else is a
+    validation error (exit 1).
+
+    Token forms (case-insensitive, days offset parsed as a plain int):
+      @@CURRENT_DATE@@         today (system date of the machine running the export)
+      @@CURRENT_DATE@@-7@@     today minus 7 days
+      @@CURRENT_DATE@@+1@@     today plus 1 day
+    """
+    text = value.strip()
+    if text.upper().startswith(CURRENT_DATE_TOKEN):
+        m = _CURRENT_DATE_RE.match(text.upper())
+        if not m:
+            raise JobValidationError(
+                f"{what}: bad date token {value!r} — use @@CURRENT_DATE@@, "
+                f"@@CURRENT_DATE@@-N@@ or @@CURRENT_DATE@@+N@@ (N = whole days)"
+            )
+        base = today or date.today()
+        offset = int(m.group(1)) if m.group(1) else 0
+        try:
+            return base + timedelta(days=offset)
+        except OverflowError:
+            raise JobValidationError(f"{what}: day offset {offset:+d} is out of range") from None
     try:
-        parsed = datetime.strptime(value.strip(), "%Y-%m-%d").date()
+        parsed = datetime.strptime(text, "%Y-%m-%d").date()
     except ValueError:
-        raise JobValidationError(f"{what} must be yyyy-MM-dd, got {value!r}") from None
+        raise JobValidationError(
+            f"{what} must be yyyy-MM-dd or @@CURRENT_DATE@@[±N@@], got {value!r}"
+        ) from None
     # strptime accepts e.g. '2026-1-2'; enforce the canonical zero-padded form
-    if parsed.isoformat() != value.strip():
+    if parsed.isoformat() != text:
         raise JobValidationError(f"{what} must be yyyy-MM-dd, got {value!r}")
     return parsed
 
@@ -170,8 +199,10 @@ class JobSpecBuilder:
         datefrom_v = layered("datefrom")
         dateto_v = layered("dateto")
 
-        datefrom = parse_strict_date(datefrom_v, what="--datefrom") if datefrom_v else None
-        dateto = parse_strict_date(dateto_v, what="--dateto") if dateto_v else None
+        datefrom = (parse_strict_date(datefrom_v, what="--datefrom", today=self.today)
+                    if datefrom_v else None)
+        dateto = (parse_strict_date(dateto_v, what="--dateto", today=self.today)
+                  if dateto_v else None)
         if mode in ("relativedate", "monthbydate") and datefrom is None:
             datefrom = self.today  # -dr/-mr without -df: anchor = current system date
 

{ping_dataexport-0.4.0 → ping_dataexport-0.4.1/src/ping_dataexport.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ping-dataexport
-Version: 0.4.0
+Version: 0.4.1
 Summary: PING's Data Export Tool - To Parquet/CSV/TEXT as Accelerator for Data & AI Project
 Author: Vorapol Ping (ping-godhand)
 Maintainer: Godhand.DEV
@@ -396,8 +396,8 @@ All options:
 | `-m` | `--mode` | export mode: `groupby` \| `date` \| `relativedate` \| `monthbydate` \| `splitrow` \| `watermark` — see section 3 |
 | `-col` | `--column` | column the mode partitions on |
 | `-row` | `--row` | rows per file (`-m splitrow`) |
-| `-df` | `--datefrom` | start / anchor date `yyyy-MM-dd`; omitted with `-dr`/`-mr` ⇒ today (system date) |
-| `-dt` | `--dateto` | end date `yyyy-MM-dd` (`-m date`) |
+| `-df` | `--datefrom` | start / anchor date `yyyy-MM-dd` or `@@CURRENT_DATE@@[±N@@]` (see *Date tokens*); omitted with `-dr`/`-mr` ⇒ today (system date) |
+| `-dt` | `--dateto` | end date `yyyy-MM-dd` or `@@CURRENT_DATE@@[±N@@]` (`-m date`) |
 | `-dr` | `--daysrelative` | days back from `-df` (`-m relativedate`) |
 | `-mr` | `--monthsrelative` | months back from `-df` (`-m monthbydate`) |
 | `-rm` | `--removeexisting` | `Yes`: clear the output directory before exporting |
@@ -430,6 +430,39 @@ All options:
 Modes split one query into multiple files. All need `-dir` (output directory)
 + `-pf` (filename prefix); partition values are always bound SQL parameters.
 
+### Date tokens for `-df` / `-dt` (`DateFrom` / `DateTo`)
+
+Instead of a fixed `yyyy-MM-dd`, both accept the current date of the machine
+running the export, optionally shifted by whole days:
+
+| Token | Meaning |
+|-------|---------|
+| `@@CURRENT_DATE@@` | today |
+| `@@CURRENT_DATE@@-N@@` | today minus N days, e.g. `@@CURRENT_DATE@@-7@@` |
+| `@@CURRENT_DATE@@+N@@` | today plus N days, e.g. `@@CURRENT_DATE@@+1@@` |
+
+`N` is a plain integer (`-1`, `-30`, `-100`, `+10` …). The token is
+case-insensitive. Anything else — a missing closing `@@`, a non-integer, a
+space, a double sign — is rejected with a validation error before anything runs.
+Handy in job files that run daily:
+
+```ini
+[Last7Days]
+Source=DB01
+Query=SELECT * FROM sales
+Mode=date
+Column=txn_date
+DateFrom=@@CURRENT_DATE@@-7@@
+DateTo=@@CURRENT_DATE@@-1@@
+OutputDir=out/last7
+BaseName=sales
+```
+
+```bash
+ping-dataexport -s DB01 -q "SELECT * FROM sales" -m date -col txn_date \
+    -df "@@CURRENT_DATE@@-7@@" -dt "@@CURRENT_DATE@@" -dir last7 -pf sales
+```
+
 **`groupby` — one file per distinct value of a column:**
 
 ```bash
@@ -576,8 +609,8 @@ Every job.ini key and the CLI option it mirrors (keys are case-insensitive):
 | `Mode` | `-m` / `--mode` | `groupby` / `date` / `relativedate` / `monthbydate` / `splitrow` / `watermark` |
 | `Column` | `-col` / `--column` | the column the mode partitions on |
 | `Row` | `-row` / `--row` | rows per file (`Mode=splitrow`) |
-| `DateFrom` | `-df` / `--datefrom` | start / anchor date, `yyyy-MM-dd` |
-| `DateTo` | `-dt` / `--dateto` | end date, `yyyy-MM-dd` (`Mode=date`) |
+| `DateFrom` | `-df` / `--datefrom` | start / anchor date, `yyyy-MM-dd` or `@@CURRENT_DATE@@[±N@@]` |
+| `DateTo` | `-dt` / `--dateto` | end date, `yyyy-MM-dd` or `@@CURRENT_DATE@@[±N@@]` (`Mode=date`) |
 | `DaysRelative` | `-dr` / `--daysrelative` | days back from `DateFrom` (`Mode=relativedate`) |
 | `MonthsRelative` | `-mr` / `--monthsrelative` | months back from `DateFrom` (`Mode=monthbydate`) |
 | `RemoveExisting` | `-rm` / `--removeexisting` | `Yes`: clear `OutputDir` before exporting |