NO-JIRA: chore(pyright): fix types in the checked code so that Pyright passes (opendatahub-io#1008)

* NO-JIRA: chore(pyright): fix types in the checked code so that Pyright passes

* /Users/jdanek/IdeaProjects/notebooks/tests/containers/socket_proxy.py:129:20 - error: Module cannot be used as a type (reportGeneralTypeIssues)

* /Users/jdanek/IdeaProjects/notebooks/tests/containers/conftest.py:174:40 - error: Expected class but received "(iterable: Iterable[object], /) -> bool" (reportGeneralTypeIssues)

* /Users/jdanek/IdeaProjects/notebooks/tests/containers/conftest.py:174:40 - error: Expected class but received "(iterable: Iterable[object], /) -> bool" (reportGeneralTypeIssues)

* /Users/jdanek/IdeaProjects/notebooks/tests/containers/kubernetes_utils.py:97:32 - error: Attribute type cannot use type variable "T@__init__" scoped to local method (reportGeneralTypeIssues)

* /Users/jdanek/IdeaProjects/notebooks/ci/package_versions.py:63:34 - warning: "TypedDict" cannot be used in this context (reportInvalidTypeForm)
  /Users/jdanek/IdeaProjects/notebooks/ci/package_versions.py:63:52 - warning: "Software" is not defined (reportUndefinedVariable)
  /Users/jdanek/IdeaProjects/notebooks/ci/package_versions.py:63:63 - error: Expected class but received "dict[str, type[str]]" (reportGeneralTypeIssues)
  /Users/jdanek/IdeaProjects/notebooks/ci/package_versions.py:63:63 - warning: Dictionary expression not allowed in type expression (reportInvalidTypeForm)
  /Users/jdanek/IdeaProjects/notebooks/ci/package_versions.py:67:33 - warning: Call expression not allowed in type expression (reportInvalidTypeForm)

Author: jiridanek

.pre-commit-config.yaml

@@ -6,27 +6,27 @@ repos:
     rev: 0.6.13
     hooks:
       - id: uv-lock
-#  # https://github.com/astral-sh/ruff-pre-commit
-#  - repo: https://github.com/astral-sh/ruff-pre-commit
-#    rev: v0.11.4
-#    hooks:
-#      - id: ruff
-#        types_or: [ python, pyi ]
-#        args: [ --fix ]
-#        files: 'ci/.*|tests/.*'
-#      - id: ruff-format
-#        types_or: [ python, pyi ]
-#        files: 'ci/.*|tests/.*'
-#  # https://pre-commit.com/#new-hooks
-#  - repo: local
-#    hooks:
-#      # https://github.com/microsoft/pyright/issues/3612
-#      # https://github.com/RobertCraigie/pyright-python#pre-commit
-#      - id: pyright
-#        name: Run Pyright on all files
-#        # entry: /bin/bash -c 'find. -name "*.py" | xargs pyright --pythonversion 3.12'
-#        entry: uv run pyright --pythonversion 3.12
-#        pass_filenames: true
-#        types_or: [ python, pyi ]
-#        language: system
-#        files: 'ci/.*|tests/.*'
+      #  # https://github.com/astral-sh/ruff-pre-commit
+      #  - repo: https://github.com/astral-sh/ruff-pre-commit
+      #    rev: v0.11.4
+      #    hooks:
+      #      - id: ruff
+      #        types_or: [python, pyi]
+      #        args: [ --fix ]
+      #        files: 'ci/.*|tests/.*'
+      #      - id: ruff-format
+      #        types_or: [python, pyi]
+      #        files: 'ci/.*|tests/.*'
+      #  # https://pre-commit.com/#new-hooks
+  - repo: local
+    hooks:
+      # https://github.com/microsoft/pyright/issues/3612
+      # https://github.com/RobertCraigie/pyright-python#pre-commit
+      - id: pyright
+        name: Run Pyright on all files
+        # entry: /bin/bash -c 'find. -name "*.py" | xargs pyright --pythonversion 3.12'
+        entry: uv run pyright --pythonversion 3.12
+        pass_filenames: true
+        types_or: [python, pyi]
+        language: system
+        files: 'ci/.*|tests/.*'

ci/cached-builds/konflux_generate_component_build_pipelines.py

@@ -2,6 +2,7 @@
 
 import re
 import pathlib
+from typing import Any
 
 import yaml
 
@@ -760,7 +761,7 @@ def component_build_pipeline(component_name, dockerfile_path, is_pr: bool = True
     }
 
 
-def when[T: any](condition: bool, if_true: T, if_false: T) -> T:
+def when[T: Any](condition: bool, if_true: T, if_false: T) -> T:
     """Returns either if_true or if_false depending on condition.
     The if_true and if_false expressions are always evaluated.
 

ci/package_versions.py

@@ -9,6 +9,7 @@
 import pathlib
 import typing
 import unittest
+from typing import Any
 
 import yaml
 
@@ -23,7 +24,7 @@
 # unused for now
 @dataclasses.dataclass
 class Manifest:
-    _data: any
+    _data: Any
 
     @property
     def name(self) -> str:
@@ -38,9 +39,14 @@ def tags(self) -> list[Tag]:
         return [Tag(tag) for tag in self._data['spec']['tags']]
 
 
+class _Software(typing.TypedDict):
+    name: str
+    version: str
+
+
 @dataclasses.dataclass()
 class Tag:
-    _data: any
+    _data: Any
 
     @property
     def name(self) -> str:
@@ -59,11 +65,11 @@ def outdated(self) -> bool:
         return self._data['annotations']['opendatahub.io/image-tag-outdated'] == 'true'
 
     @property
-    def sw_general(self) -> list[typing.TypedDict("Software", {"name": str, "version": str})]:
+    def sw_general(self) -> list[_Software]:
         return json.loads(self._data['annotations']['opendatahub.io/notebook-software'])
 
     @property
-    def sw_python(self) -> list[typing.TypedDict("Software", {"name": str, "version": str})]:
+    def sw_python(self) -> list[_Software]:
         return json.loads(self._data['annotations']['opendatahub.io/notebook-python-dependencies'])
 
 

tests/containers/conftest.py

@@ -3,7 +3,7 @@
 import logging
 import os
 import platform
-from typing import Iterable, Callable, TYPE_CHECKING
+from typing import Any, Callable, TYPE_CHECKING
 
 import testcontainers.core.config
 import testcontainers.core.container
@@ -171,7 +171,7 @@ class TestFrame:
         """
 
         def __init__(self):
-            self.resources: list[tuple[any, callable]] = []
+            self.resources: list[tuple[Any, Callable]] = []
 
         def append[T](self, resource: T, cleanup_func: Callable[[T], None] = None) -> T:
             """Runs the Context manager lifecycle on the resource,

tests/containers/kubernetes_utils.py

@@ -92,9 +92,9 @@ def test_get_username(self):
         assert username is not None and len(username) > 0
 
 
-class TestFrame:
-    def __init__[T](self):
-        self.stack: list[tuple[T, Callable[[T], None] | None]] = []
+class TestFrame[S]:
+    def __init__(self):
+        self.stack: list[tuple[S, Callable[[S], None] | None]] = []
 
     def defer_resource[T: ocp_resources.resource.Resource](self, resource: T, wait=False,
                                                            destructor: Callable[[T], None] | None = None) -> T:

tests/containers/socket_proxy.py

@@ -126,7 +126,7 @@ def _handle_client(self, client_socket):
                     client_socket.send(data)
 
 
-def _rst_socket(s: socket):
+def _rst_socket(s: socket.socket) -> None:
     """Closing a SO_LINGER socket will RST it
     https://stackoverflow.com/questions/46264404/how-can-i-reset-a-tcp-socket-in-python
     """