Merge pull request #22 from baluyotraf/test/new-py

feat: support for python 3.13 and 3.14

Author: baluyotraf

.github/workflows/qa.yml

@@ -33,7 +33,7 @@ jobs:
           - ubuntu-latest
           - macos-latest
           - windows-latest
-        python_version: ["3.9", "3.10", "3.11", "3.12"]
+        python_version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3

pyproject.toml

@@ -24,6 +24,7 @@ keywords = ["database", "SQL"]
 [tool.poetry.dependencies]
 python = "^3.9"
 pydantic = "^2.6.4"
+typing-extensions = "^4.15.0"
 
 [tool.poetry.group.dev.dependencies]
 pyright = "^1.1.354"
@@ -48,10 +49,12 @@ testpaths = ["tests"]
 legacy_tox_ini = """
     [tox]
     min_version = 4.0
-    env_list = py{39,310,311,312}
+    env_list = py{39,310,311,312,313,314}
 
     [gh]
     python =
+        3.14 = py314
+        3.13 = py313
         3.12 = py312
         3.11 = py311
         3.10 = py310

src/altqq/structs.py

@@ -5,7 +5,7 @@
 
 import pydantic.dataclasses as pdc
 from pydantic import ConfigDict
-from typing_extensions import dataclass_transform
+from typing_extensions import dataclass_transform, get_annotations
 
 QUERY_ATTRIB = "__query__"
 
@@ -34,12 +34,13 @@ class QueryMeta(type):
     """
 
     @staticmethod
-    def _check_query_attribute(dataclass: "QueryMeta", dct: Dict[str, Any]):
+    def _check_query_attribute(dataclass: "QueryMeta"):
         try:
             if isinstance(getattr(dataclass, QUERY_ATTRIB), str):
                 return True
         except AttributeError:
-            return QUERY_ATTRIB in dct["__annotations__"]
+            annotations = get_annotations(dataclass)
+            return QUERY_ATTRIB in annotations
 
         return False
 
@@ -57,8 +58,8 @@ def __new__(cls, name: str, bases: Tuple[type, ...], dct: Dict[str, Any]):
         """
         cls._resolve_calculated_fields(dct)
         dataclass = super().__new__(cls, name, bases, dct)
-        if not cls._check_query_attribute(dataclass, dct):
-            raise ValueError(f"A string {QUERY_ATTRIB} must be provided")
+        if not cls._check_query_attribute(dataclass):
+            raise ValueError(f"A {QUERY_ATTRIB} value or type hint must be provided.")
         return pdc.dataclass(dataclass, config=ConfigDict(arbitrary_types_allowed=True))
 
 

tests/test_query.py

@@ -0,0 +1,36 @@
+"""Tests the translations of queries."""
+
+from typing import ClassVar
+
+import altqq
+import pytest
+
+
+def test_query_subclass__no_annotations__raises_error():
+    """If subclass does not have any annotations, raise a ValueError."""
+    with pytest.raises(ValueError):
+
+        class _(altqq.Query):
+            pass
+
+
+def test_query_subclass__without__query__raises_error():
+    """If subclass has annotations, but no __query__, raise a ValueError."""
+    with pytest.raises(ValueError):
+
+        class _(altqq.Query):
+            props: int
+
+
+def test_query_subclass__query_defined__works():
+    """If subclass defines __query__ attribute, all is good."""
+
+    class _(altqq.Query):
+        __query__ = "My query"
+
+
+def test_query_subclass__query_typed__works():
+    """If subclass defines __query__ with a type hint, all is good."""
+
+    class _(altqq.Query):
+        __query__: ClassVar[str]