datamarket 0.8.0__tar.gz → 0.8.1__tar.gz

{datamarket-0.8.0 → datamarket-0.8.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: datamarket
-Version: 0.8.0
+Version: 0.8.1
 Summary: Utilities that integrate advanced scraping knowledge into just one library.
 License: GPL-3.0-or-later
 Author: DataMarket

{datamarket-0.8.0 → datamarket-0.8.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "datamarket"
-version = "0.8.0"
+version = "0.8.1"
 description = "Utilities that integrate advanced scraping knowledge into just one library."
 authors = ["DataMarket <techsupport@datamarket.es>"]
 license = "GPL-3.0-or-later"

{datamarket-0.8.0 → datamarket-0.8.1}/src/datamarket/utils/main.py

@@ -25,7 +25,7 @@ logger = logging.getLogger(__name__)
 
 def get_granular_date(
     granularity: Union[Literal["monthly", "biweekly", "weekly", "daily"], str], tz: str = "Europe/Madrid"
-) -> str:
+) -> pendulum.DateTime:
     """
     Returns the most recent date based on the given granularity or a custom cron expression.
 
@@ -52,7 +52,7 @@ def get_granular_date(
 
     try:
         cron = croniter(cron_pattern, now)
-        return cron.get_prev(pendulum.DateTime).strftime("%Y-%m-%d")
+        return cron.get_prev(pendulum.DateTime)
     except Exception as e:
         raise ValueError("Invalid cron expression or granularity specified.") from e
 
@@ -70,12 +70,21 @@ def get_config(config_file: Path, tz: str = "Europe/Madrid"):
 
     add_converter("read", read_converter)
 
+    today = get_granular_date("daily", tz)
+
     config = Dynaconf(
         environments=True,
         env_switcher="SYSTYPE",
         vars={
-            "today": get_granular_date("daily", tz),
-            "biweekly_date": get_granular_date("biweekly", tz),
+            "now": today.strftime("%Y-%m-%d %H:%M:%S"),
+            "today": today.strftime("%Y-%m-%d"),
+            "year": today.strftime("%Y"),
+            "month": today.strftime("%m"),
+            "day": today.strftime("%d"),
+            "biweekly_date": get_granular_date("biweekly", tz).strftime("%Y-%m-%d"),
+            "today_stripped": today.strftime("%Y%m%d"),
+            "now_stripped": today.strftime("%Y%m%d%H%M%S"),
+            "dynaconf_merge": True,
         },
     )