querysource 4.0.2__tar.gz → 4.1.1__tar.gz

{querysource-4.0.2 → querysource-4.1.1}/PKG-INFO

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

querysource-4.1.1/querysource/_version.py

@@ -0,0 +1,24 @@
+# file generated by vcs-versioning
+# don't change, don't track in version control
+from __future__ import annotations
+
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
+
+version: str
+__version__: str
+__version_tuple__: tuple[int | str, ...]
+version_tuple: tuple[int | str, ...]
+commit_id: str | None
+__commit_id__: str | None
+
+__version__ = version = '4.1.2.dev0+g686589f73.d20260405'
+__version_tuple__ = version_tuple = (4, 1, 2, 'dev0', 'g686589f73.d20260405')
+
+__commit_id__ = commit_id = 'g686589f73'

{querysource-4.0.2 → querysource-4.1.1}/querysource/conf.py

@@ -339,6 +339,12 @@ CSV_DEFAULT_QUOTING = config.get('CSV_DEFAULT_QUOTING', fallback='string')
 QS_QUERIES_SCHEMA = config.get('QS_QUERIES_SCHEMA', fallback='public')
 QS_QUERIES_TABLE = config.get('QS_QUERIES_TABLE', fallback='queries')
 
+## QSScheduler (APScheduler-based query scheduler):
+ENABLE_QS_SCHEDULER = config.getboolean('ENABLE_QS_SCHEDULER', fallback=False)
+QS_SCHEDULER_TIMEZONE = config.get('QS_SCHEDULER_TIMEZONE', fallback=TIMEZONE)
+QS_SCHEDULER_MAX_INSTANCES = config.getint('QS_SCHEDULER_MAX_INSTANCES', fallback=1)
+QS_SCHEDULER_COALESCE = config.getboolean('QS_SCHEDULER_COALESCE', fallback=True)
+
 ## QuerySource Query Timeout:
 DEFAULT_QUERY_TIMEOUT = config.getint('DEFAULT_QUERY_TIMEOUT', fallback=3600)
 DEFAULT_QUERY_FORMAT = config.get(

{querysource-4.0.2 → querysource-4.1.1}/querysource/datasources/drivers/abstract.py

@@ -124,7 +124,7 @@ class BaseDriver(BaseModel):
                 "type": _type,
                 "is_secret": secret
             }
-            value = getattr(cls, field)
+            value = getattr(cls, field, None)
             default = hasattr(f, 'default')
             if not value and default:
                 value = f.default

{querysource-4.0.2 → querysource-4.1.1}/querysource/datasources/handlers/datasource.py

@@ -508,7 +508,7 @@ class DatasourceView(BaseView):
                 if ds is not None:
                     try:
                         dt = await DataSource.get(**ds)
-                        attributes = {**dt.dict(), **data}
+                        attributes = {**dt.to_dict(), **data}
                         datasource = DataSource(**attributes)
                         found = True
                     except NoDataFound:

{querysource-4.0.2 → querysource-4.1.1}/querysource/handlers/manager.py

@@ -119,7 +119,7 @@ class QueryManager(QueryView):
                     query = await QueryModel.filter(**qp)
                 else:
                     query = await QueryModel.all(**args)
-                    query = [row.dict() for row in query]
+                    query = [row.to_dict() for row in query]
                 return self.json_response(query)
         except NoDataFound as err:
             headers = {

{querysource-4.0.2 → querysource-4.1.1}/querysource/handlers/service.py

@@ -70,15 +70,14 @@ class QueryService(AbstractHandler):
             options = {}
         queryformat = self.format(request, params, _format)
         try:
-            query = options['query']
+            query = options.pop('query')
         except KeyError as ex:
             raise self.Error(
                 message="Option *query* was not found in payload.",
                 code=400
             ) from ex
         try:
-            driver = options['driver']
-            del options['driver']
+            driver = options.pop('driver')
         except KeyError:
             driver = 'db'
         if not options: