querysource 4.5.4__tar.gz → 4.5.6__tar.gz

{querysource-4.5.4 → querysource-4.5.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: querysource
-Version: 4.5.4
+Version: 4.5.6
 Summary: Aiohttp web service for querying several databases easily
 Author-email: Jesus Lara <jesuslarag@gmail.com>
 License: BSD-3-Clause

{querysource-4.5.4 → querysource-4.5.6}/pyproject.toml

@@ -193,6 +193,12 @@ include = ["querysource", "querysource.*"]
 querysource = ["py.typed"]
 "querysource.qs_parsers" = ["*.so", "*.pyd"]
 
+# Exclude Cython-generated intermediate sources from the wheel.
+# These .c/.cpp files are build artifacts (the compiled .so already ships)
+# and only bloat the wheel (~20% of its size). .pxd are kept to allow cimport.
+[tool.setuptools.exclude-package-data]
+"*" = ["*.c", "*.cpp", "*.pyx"]
+
 [tool.pytest.ini_options]
 addopts = [
     "--strict-config",

{querysource-4.5.4 → querysource-4.5.6}/querysource/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '4.5.5.dev0+ge5935df2b.d20260626'
-__version_tuple__ = version_tuple = (4, 5, 5, 'dev0', 'ge5935df2b.d20260626')
+__version__ = version = '4.5.7.dev0+g230b6a865.d20260629'
+__version_tuple__ = version_tuple = (4, 5, 7, 'dev0', 'g230b6a865.d20260629')
 
-__commit_id__ = commit_id = 'ge5935df2b'
+__commit_id__ = commit_id = 'g230b6a865'

{querysource-4.5.4 → querysource-4.5.6}/querysource/queries/multi/sources/base.py

@@ -32,6 +32,11 @@ class ThreadSource(threading.Thread, ABC):
         self._name = name
         self._options = options
         self._request = request
+        # masks: {"{name}": [fn, {args}]} specs resolved at fetch time via
+        # fnExecutor (flowtask-compatible). Popped so it never leaks downstream.
+        self._masks: dict = (
+            options.pop('masks', {}) or {}
+        ) if isinstance(options, dict) else {}
         self.logger = logging.getLogger(__name__)
 
     def resolve_credential(self, key: str, value: str) -> str:
@@ -61,6 +66,40 @@ class ThreadSource(threading.Thread, ABC):
                 pass
         return value
 
+    def resolve_masks(self, text: str) -> str:
+        """Resolve ``masks`` placeholders in a path or filename.
+
+        Masks are declared in the source config under ``masks`` as
+        ``{"{name}": [function, {args}]}`` and resolved at fetch time via
+        :func:`querysource.utils.fn.fnExecutor` (same mechanism, and same
+        function vocabulary, as flowtask). Any function from
+        ``querysource.utils.functions`` is available — ``today``, ``yesterday``,
+        ``fdom``, ``ldom``, ``fdow``, ``ldow``, ``previous_month``,
+        ``last_year``, etc. A plain (non-list) value is used verbatim.
+
+        Example::
+
+            "masks": {"{filedate}": ["today", {"mask": "%Y%m%d"}]}
+            # "extract_{filedate}.csv" -> "extract_20260629.csv"
+
+        Non-string, token-free, or mask-less values are returned unchanged.
+
+        Args:
+            text: The path/filename, possibly containing ``{name}`` tokens.
+
+        Returns:
+            The string with every declared mask replaced.
+        """
+        if not isinstance(text, str) or '{' not in text or not self._masks:
+            return text
+        from ....utils.fn import fnExecutor  # noqa: PLC0415
+
+        for name, spec in self._masks.items():
+            if name in text:
+                value = fnExecutor(spec) if isinstance(spec, list) else spec
+                text = text.replace(name, str(value))
+        return text
+
     @property
     def slug(self) -> str:
         """Return a slug-like identifier for this source.

{querysource-4.5.4 → querysource-4.5.6}/querysource/queries/multi/sources/file.py

@@ -24,6 +24,11 @@ class FileSource(ThreadSource):
     Reads the file (CSV or Excel, optionally compressed with gzip or zip)
     and puts the resulting DataFrame into the shared queue.  Inherits the
     thread/event-loop/queue boilerplate from :class:`ThreadSource`.
+
+    ``path`` may contain ``masks`` placeholders resolved at load time, e.g.
+    ``"masks": {"{filedate}": ["today", {"mask": "%Y%m%d"}]}`` turns
+    ``"/data/report_{filedate}.csv"`` into ``"/data/report_20260629.csv"``
+    (see :meth:`ThreadSource.resolve_masks`).
     """
 
     def __init__(
@@ -34,12 +39,16 @@ class FileSource(ThreadSource):
         queue: asyncio.Queue,
     ):
         # Extract file-specific options BEFORE passing remaining dict to super.
-        self.file_path = file_options.pop('path')
-        if isinstance(self.file_path, str):
-            self.file_path = Path(self.file_path).resolve()
+        raw_path = file_options.pop('path')
         self._mime = file_options.pop('mime')
         self._params: dict = file_options
+        # super() sets self._masks (and pops 'masks' from file_options so it is
+        # not forwarded to pandas), so resolve the path AFTER it.
         super().__init__(name, file_options, request, queue)
+        if isinstance(raw_path, str):
+            self.file_path = Path(self.resolve_masks(raw_path)).resolve()
+        else:
+            self.file_path = raw_path
 
     def _get_file_content(self):
         """Return file content, handling compressed files if needed."""

{querysource-4.5.4 → querysource-4.5.6}/querysource/queries/multi/sources/sharepoint.py

@@ -62,6 +62,17 @@ class SharepointSource(ThreadSource):
         }
 
     ``sheet_name`` and ``pd_args`` still apply when reading the downloaded file.
+
+    For daily-rotated files addressed via ``site``/``directory``/``filename``
+    (not ``url``), declare ``masks`` and reference them in ``directory``/
+    ``filename``; they are resolved at fetch time::
+
+        "source": {
+            "filename": "extract_{filedate}.csv",
+            "masks": {"{filedate}": ["today", {"mask": "%Y%m%d"}]}
+        }
+
+    See :meth:`ThreadSource.resolve_masks` for the available functions.
     """
 
     def __init__(
@@ -107,6 +118,9 @@ class SharepointSource(ThreadSource):
         # /shares endpoint (server-side), so tenant_name/site/directory do NOT
         # need to be configured and subsites work transparently.
         self._url: str = source.get('url', '') or options.get('url', '') or ''
+        # masks may also be declared inside the "source" block.
+        if source.get('masks'):
+            self._masks = {**self._masks, **source['masks']}
 
     @staticmethod
     def _encode_share_url(url: str) -> str:
@@ -224,6 +238,10 @@ class SharepointSource(ThreadSource):
                         "SharePoint tenant_name must be configured (via credentials "
                         "or navconfig SHAREPOINT_TENANT_NAME), or pass a full 'url'."
                     )
+                # Resolve config masks, e.g. {"{filedate}": ["today", {"mask": "%Y%m%d"}]}
+                # turns "extract_{filedate}.csv" -> "extract_20260629.csv".
+                self._directory = self.resolve_masks(self._directory)
+                self._filename = self.resolve_masks(self._filename)
                 # Resolve the site ID
                 site_host = f"{self._tenant_name}.sharepoint.com" if self._tenant_name else None
                 if site_host and self._site:

{querysource-4.5.4 → querysource-4.5.6}/querysource/version.py

@@ -6,7 +6,7 @@ __description__ = (
     'QuerySource Query parser and generator.'
     'Supports SQL, NoSQL, MongoDB, Cassandra, Elasticsearch, etc.'
 )
-__version__ = '4.5.4'
+__version__ = '4.5.6'
 __url__ = 'https://github.com/phenobarbital/querysource'
 __copyright__ = 'Copyright (c) 2018-2025 Jesus Lara'
 __author__ = 'Jesus Lara'

{querysource-4.5.4 → querysource-4.5.6}/querysource.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: querysource
-Version: 4.5.4
+Version: 4.5.6
 Summary: Aiohttp web service for querying several databases easily
 Author-email: Jesus Lara <jesuslarag@gmail.com>
 License: BSD-3-Clause

querysource-4.5.6/querysource.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "4.5.6",
+  "distance": 0,
+  "node": "g230b6a865d130f9f535759b554e906988e77446f",
+  "dirty": true,
+  "branch": "HEAD",
+  "node_date": "2026-06-29"
+}

querysource-4.5.4/querysource.egg-info/scm_version.json

@@ -1,8 +0,0 @@
-{
-  "tag": "4.5.4",
-  "distance": 0,
-  "node": "ge5935df2b20182f314e12bc46cf1bf75eb761db0",
-  "dirty": true,
-  "branch": "HEAD",
-  "node_date": "2026-06-26"
-}