querysource 4.1.11__tar.gz → 4.1.12__tar.gz

{querysource-4.1.11/querysource.egg-info → querysource-4.1.12}/PKG-INFO

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

{querysource-4.1.11 → querysource-4.1.12}/querysource/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '4.1.12.dev0+g996ef7518.d20260423'
-__version_tuple__ = version_tuple = (4, 1, 12, 'dev0', 'g996ef7518.d20260423')
+__version__ = version = '4.1.13.dev0+gd6d474e05.d20260424'
+__version_tuple__ = version_tuple = (4, 1, 13, 'dev0', 'gd6d474e05.d20260424')
 
-__commit_id__ = commit_id = 'g996ef7518'
+__commit_id__ = commit_id = 'gd6d474e05'

{querysource-4.1.11 → querysource-4.1.12}/querysource/interfaces/connections.py

@@ -71,14 +71,13 @@ class Connection:
         self._connection = None
         if loop:
             self._loop = loop
+        elif 'loop' in kwargs and kwargs['loop'] is not None:
+            self._loop = kwargs['loop']
         else:
             try:
-                self._loop: asyncio.AbstractEventLoop = kwargs.get(
-                    'loop',
-                    asyncio.get_event_loop()
-                )
+                self._loop: asyncio.AbstractEventLoop = asyncio.get_running_loop()
             except RuntimeError:
-                self._loop = asyncio.get_running_loop()
+                self._loop = asyncio.new_event_loop()
         self._dsn: str = kwargs.get('dsn', asyncpg_url)
         self._default_driver: str = kwargs.get('driver', 'pg')
         self.logger = logging.getLogger(name='QS.Connection')
@@ -92,10 +91,14 @@ class Connection:
 
     def get_redis(self, dsn=QUERYSET_REDIS):
         ### redis connection:
+        try:
+            loop = asyncio.get_running_loop()
+        except RuntimeError:
+            loop = self._loop
         return AsyncDB(
             'redis',
             dsn=dsn,
-            loop=asyncio.get_event_loop()
+            loop=loop
         )
 
     def set_connection(self, conn):
@@ -108,11 +111,11 @@ class Connection:
             loop = evt
         else:
             try:
-                loop = asyncio.get_event_loop()
-            except RuntimeError:
+                loop = asyncio.get_running_loop()
+            except RuntimeError as ex:
                 raise RuntimeError(
-                    "No Event Loop available"
-                )
+                    "get_connection must be called from a running event loop"
+                ) from ex
         return AsyncDB(
             driver,
             dsn=asyncpg_url,
@@ -390,9 +393,9 @@ class Connection:
         evt: asyncio.AbstractEventLoop = None,
         max_retries: int = 3
     ) -> BaseModel:
-        db = self.get_connection(driver='pg', evt=evt)
         attempt = 0
         while attempt < max_retries:
+            db = self.get_connection(driver='pg', evt=evt)
             try:
                 async with await db.connection() as conn:
                     QueryModel.Meta.connection = conn

{querysource-4.1.11 → querysource-4.1.12}/querysource/queries/multi/__init__.py

@@ -105,23 +105,37 @@ class MultiQS(BaseQuery):
         """
         tasks = {}
         if self.slug:
-            try:
-                query = await self.get_slug(slug=self.slug)
+            query = await self.get_slug(slug=self.slug)
+            slug_data = None
+            query_raw = getattr(query, 'query_raw', None) or ''
+            if isinstance(query_raw, str) and query_raw.strip():
                 try:
-                    if slug_data := self._encoder.load(query.query_raw):
-                        self._options = slug_data
-                        self._queries = slug_data.pop('queries', {})
-                        self._files = slug_data.pop('files', {})
-                        # TODO: making replacements based on POST data.
-                except Exception as exc:
-                    self.logger.error(
-                        f"Unable to decode JSON from Slug {self.slug}: {exc}"
-                    )
-                    raise DriverError(
-                        f"Unable to decode JSON from Slug {self.slug}: {exc}"
-                    ) from exc
-            except Exception:
-                raise
+                    slug_data = self._encoder.load(query_raw)
+                except Exception:
+                    # query_raw is not a multi-query JSON payload
+                    # (e.g. plain SQL) — fall back to single-query mode.
+                    slug_data = None
+            if isinstance(slug_data, dict) and (
+                'queries' in slug_data or 'files' in slug_data
+            ):
+                self._options = slug_data
+                self._queries = slug_data.pop('queries', {})
+                self._files = slug_data.pop('files', {})
+                # TODO: making replacements based on POST data.
+            else:
+                # Single-query slug: wrap it for the multi-query executor
+                # so the provider layer handles it like the v2 endpoint.
+                slug_conditions = (
+                    dict(self._conditions)
+                    if isinstance(self._conditions, dict)
+                    else {}
+                )
+                self._queries = {
+                    self.slug: {"slug": self.slug, **slug_conditions}
+                }
+                if isinstance(self._conditions, dict):
+                    self._conditions.clear()
+                self._options = {}
         if self._queries:
             for name, query in self._queries.items():
                 conditions = self._conditions.pop(name, {})

{querysource-4.1.11 → querysource-4.1.12}/querysource/version.py

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

{querysource-4.1.11 → querysource-4.1.12/querysource.egg-info}/PKG-INFO

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