Merge pull request #172 from Pentusha/feature/pyright

style: add pyright

.github/workflows/tests.yml

@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        python-version: [ '3.10', '3.11' ]
+        python-version: [ '3.10', '3.11', '3.12' ]
 
     steps:
       - uses: actions/checkout@v4
@@ -36,17 +36,20 @@ jobs:
 
       - uses: snok/[email protected]
         with:
-          version: 1.4.0
+          version: 1.7.1
 
       - name: Install dependencies
         run: poetry install
 
-      - name: Run linter
+      - name: Run ruff
         run: poetry run ruff check .
 
       - name: Run mypy
         run: poetry run mypy .
 
+      - name: Run pyright
+        run: poetry run pyright .
+
       - name: Run tests
         run: poetry run pytest
         env:

edgeql_qb/expression.py

@@ -87,10 +87,10 @@ def __call__(self, *columns: Union['Column', Shape]) -> Shape:
     def __getattr__(self, name: str) -> 'Column':
         return Column(name, self)
 
-    def __eq__(self, other: Any) -> BinaryOp:  # type: ignore
+    def __eq__(self, other: Any) -> BinaryOp:  # type: ignore[override]
         return BinaryOp('=', self, other)
 
-    def __ne__(self, other: Any) -> BinaryOp:  # type: ignore
+    def __ne__(self, other: Any) -> BinaryOp:  # type: ignore[override]
         return BinaryOp('!=', self, other)
 
 

edgeql_qb/operators.py

@@ -155,7 +155,7 @@ class BinaryOp(OperationsMixin):
     left: OperationsMixin
     right: Union[OperationsMixin, 'SubQuery', GenericHolder[Any]]
 
-    def __eq__(self, other: Any) -> 'BinaryOp':  # type: ignore
+    def __eq__(self, other: Any) -> 'BinaryOp':  # type: ignore[override]
         return BinaryOp('=', self, other)
 
 

edgeql_qb/render/condition.py

@@ -34,7 +34,7 @@ def render_filters(filters: tuple[Expression, ...], generator: Iterator[int]) ->
 
 
 def render_conditions(filters: tuple[Expression, ...], generator: Iterator[int]) -> RenderedQuery:
-    return filters and render_filters(filters, generator) or RenderedQuery()
+    return render_filters(filters, generator) if filters else RenderedQuery()
 
 
 @singledispatch

edgeql_qb/render/group.py

@@ -19,9 +19,9 @@ def render_group(
         RenderedQuery(f'group {model_name}')
         .map(
             lambda r: (
-                select
-                and combine_renderers(r, render_select_columns(select, generator))
-                or r
+                combine_renderers(r, render_select_columns(select, generator))
+                if select
+                else r
             ),
         )
     )
@@ -42,7 +42,7 @@ def render_using_expressions(
         using: tuple[Expression, ...],
         generator: Iterator[int],
 ) -> RenderedQuery:
-    return using and render_using(using, generator) or RenderedQuery()
+    return render_using(using, generator) if using else RenderedQuery()
 
 
 @singledispatch

edgeql_qb/render/insert.py

@@ -101,7 +101,7 @@ def _(on: Column, generator: Iterator[int]) -> RenderedQuery:
 
 @render_unless_conflict_on.register
 def _(
-    on: tuple,  # type: ignore
+    on: tuple,  # type: ignore[type-arg]
     generator: Iterator[int],
 ) -> RenderedQuery:
     renderers = [
@@ -124,20 +124,20 @@ def _(conflict: None, generator: Iterator[int]) -> RenderedQuery:
 @render_unless_conflict.register
 def _(conflict: UnlessConflict, generator: Iterator[int]) -> RenderedQuery:
     rendered_on = (
-        conflict.on
-        and combine_many_renderers(
+        combine_many_renderers(
             RenderedQuery(' on '),
             render_unless_conflict_on(conflict.on, generator),
         )
-        or RenderedQuery()
+        if conflict.on
+        else RenderedQuery()
     )
     rendered_else = (
-        conflict.else_
-        and combine_many_renderers(
+        combine_many_renderers(
             RenderedQuery(' else '),
             render_unless_conflict_else(conflict.else_, generator),
         )
-        or RenderedQuery()
+        if conflict.else_
+        else RenderedQuery()
     )
     return combine_many_renderers(
         RenderedQuery(' unless conflict'),

edgeql_qb/render/order_by.py

@@ -35,7 +35,7 @@ def render_order_by_expressions(
 
 
 def render_order_by(ordered_by: tuple[Expression, ...], generator: Iterator[int]) -> RenderedQuery:
-    return ordered_by and render_order_by_expressions(ordered_by, generator) or RenderedQuery()
+    return render_order_by_expressions(ordered_by, generator) if ordered_by else RenderedQuery()
 
 
 @singledispatch

edgeql_qb/render/query_literal.py

@@ -20,7 +20,7 @@ def render_query_literal(value: Any, name: str) -> RenderedQuery:
 
 
 @render_query_literal.register
-def _(value: GenericHolder, name: str) -> RenderedQuery:  # type: ignore
+def _(value: GenericHolder, name: str) -> RenderedQuery:  # type: ignore[type-arg]
     return RenderedQuery(f'<{value.edgeql_name}>${name}', FrozenDict({name: value.value}))
 
 

edgeql_qb/render/select.py

@@ -48,18 +48,18 @@ def render_select(
     select_from_query: SubQuery | None = None,
 ) -> RenderedQuery:
     rendered_select = (
-        select_from_query
-        and render_parentheses(select_from_query.build(generator))
-        or RenderedQuery(model_name)
+        render_parentheses(select_from_query.build(generator))
+        if select_from_query
+        else RenderedQuery(model_name)
     )
     return combine_many_renderers(
         RenderedQuery('select '),
         rendered_select,
     ).map(
         lambda r: (
-            select
-            and combine_renderers(r, render_select_columns(select, generator))
-            or r
+            combine_renderers(r, render_select_columns(select, generator))
+            if select
+            else r
         ),
     )
 

edgeql_qb/render/update.py

@@ -63,7 +63,7 @@ def _(expression: Node, generator: Iterator[int], column_prefix: str = '') -> Re
         left=render_update_expression(
             expression.left,
             generator,
-            expression.op != ':=' and '.' or '',
+            '.' if expression.op != ':=' else '',
         ),
         right=render_update_expression(expression.right, generator, '.'),
         expression=expression,

edgeql_qb/render/with_expr.py

@@ -12,25 +12,25 @@ def render_with_expressions(
 ) -> Callable[[RenderedQuery], RenderedQuery]:
     def inner(rendered_with: RenderedQuery) -> RenderedQuery:
         return (
-            expressions
-            and combine_many_renderers(
+            combine_many_renderers(
                 rendered_with,
                 reduce(join_renderers(', '), expressions),
             )
-            or rendered_with
+            if expressions
+            else rendered_with
         )
     return inner
 
 
 def render_with_module(module: str | None = None) -> Callable[[RenderedQuery], RenderedQuery]:
     def inner(rendered_with: RenderedQuery) -> RenderedQuery:
         return (
-            module
-            and combine_many_renderers(
+            combine_many_renderers(
                 rendered_with,
                 RenderedQuery(f'module {module}'),
             )
-            or rendered_with
+            if module
+            else rendered_with
         )
     return inner
 
@@ -43,9 +43,9 @@ def render_with_separator(
     def inner(rendered_with: RenderedQuery) -> RenderedQuery:
         comma = RenderedQuery(', ')
         return (
-            (module and expressions)
-            and combine_many_renderers(rendered_with, comma)
-            or rendered_with
+            combine_many_renderers(rendered_with, comma)
+            if (module and expressions)
+            else rendered_with
         )
     return inner
 
@@ -59,9 +59,9 @@ def inner(rendered_with: RenderedQuery) -> RenderedQuery:
         space = RenderedQuery(' ')
         empty = RenderedQuery()
         return (
-            (module or expressions)
-            and combine_many_renderers(rendered_with, space)
-            or ((not module and not expressions) and empty or space)
+            combine_many_renderers(rendered_with, space)
+            if module or expressions else space
+            if module and expressions else empty
         )
     return inner