uprev pyright, fix typing (#1283)

Author: samuelcolvin

mcp-run-python/src/prepare_env.py

@@ -6,7 +6,6 @@
 from __future__ import annotations as _annotations
 
 import importlib
-import importlib.util
 import logging
 import re
 import sys

pydantic_ai_slim/pydantic_ai/_result.py

@@ -161,7 +161,10 @@ def __init__(self, response_type: type[ResultDataT], name: str, description: str
             # noinspection PyArgumentList
             parameters_json_schema = _utils.check_object_json_schema(self.type_adapter.json_schema())
         else:
-            response_data_typed_dict = TypedDict('response_data_typed_dict', {'response': response_type})  # noqa
+            response_data_typed_dict = TypedDict(  # noqa: UP013
+                'response_data_typed_dict',
+                {'response': response_type},  # pyright: ignore[reportInvalidTypeForm]
+            )
             self.type_adapter = TypeAdapter(response_data_typed_dict)
             outer_typed_dict_key = 'response'
             # noinspection PyArgumentList

pydantic_ai_slim/pydantic_ai/_utils.py

@@ -40,7 +40,7 @@ def is_model_like(type_: Any) -> bool:
     return (
         isinstance(type_, type)
         and not isinstance(type_, GenericAlias)
-        and (issubclass(type_, BaseModel) or is_dataclass(type_) or is_typeddict(type_))
+        and (issubclass(type_, BaseModel) or is_dataclass(type_) or is_typeddict(type_))  # pyright: ignore[reportUnknownArgumentType]
     )
 
 

pydantic_ai_slim/pydantic_ai/agent.py

@@ -212,16 +212,16 @@ def __init__(
 
         self._result_tool_name = result_tool_name
         self._result_tool_description = result_tool_description
-        self._result_schema: _result.ResultSchema[ResultDataT] | None = _result.ResultSchema[result_type].build(
+        self._result_schema = _result.ResultSchema[result_type].build(
             result_type, result_tool_name, result_tool_description
         )
-        self._result_validators: list[_result.ResultValidator[AgentDepsT, ResultDataT]] = []
+        self._result_validators = []
 
         self._system_prompts = (system_prompt,) if isinstance(system_prompt, str) else tuple(system_prompt)
-        self._system_prompt_functions: list[_system_prompt.SystemPromptRunner[AgentDepsT]] = []
-        self._system_prompt_dynamic_functions: dict[str, _system_prompt.SystemPromptRunner[AgentDepsT]] = {}
+        self._system_prompt_functions = []
+        self._system_prompt_dynamic_functions = {}
 
-        self._function_tools: dict[str, Tool[AgentDepsT]] = {}
+        self._function_tools = {}
 
         self._default_retries = retries
         self._max_result_retries = result_retries if result_retries is not None else retries

pydantic_ai_slim/pydantic_ai/messages.py

@@ -9,7 +9,7 @@
 
 import pydantic
 import pydantic_core
-from opentelemetry._events import Event
+from opentelemetry._events import Event  # pyright: ignore[reportPrivateImportUsage]
 from typing_extensions import TypeAlias
 
 from ._utils import generate_tool_call_id as _generate_tool_call_id, now_utc as _now_utc

pydantic_ai_slim/pydantic_ai/models/__init__.py

@@ -12,7 +12,7 @@
 from dataclasses import dataclass, field
 from datetime import datetime
 from functools import cache
-from typing import TYPE_CHECKING, cast
+from typing import TYPE_CHECKING
 
 import httpx
 from typing_extensions import Literal, TypeAliasType
@@ -386,7 +386,6 @@ def infer_model(model: Model | KnownModelName) -> Model:
 
     try:
         provider, model_name = model.split(':', maxsplit=1)
-        provider = cast(str, provider)
     except ValueError:
         model_name = model
         # TODO(Marcelo): We should deprecate this way.

pydantic_ai_slim/pydantic_ai/models/instrumented.py

@@ -7,7 +7,12 @@
 from typing import Any, Callable, Literal
 from urllib.parse import urlparse
 
-from opentelemetry._events import Event, EventLogger, EventLoggerProvider, get_event_logger_provider
+from opentelemetry._events import (
+    Event,  # pyright: ignore[reportPrivateImportUsage]
+    EventLogger,  # pyright: ignore[reportPrivateImportUsage]
+    EventLoggerProvider,  # pyright: ignore[reportPrivateImportUsage]
+    get_event_logger_provider,  # pyright: ignore[reportPrivateImportUsage]
+)
 from opentelemetry.trace import Span, Tracer, TracerProvider, get_tracer_provider
 from opentelemetry.util.types import AttributeValue
 from pydantic import TypeAdapter

pydantic_evals/pydantic_evals/dataset.py

@@ -54,7 +54,7 @@
 else:
     from pathlib import Path
 
-    logfire._internal.stack_info.NON_USER_CODE_PREFIXES += (str(Path(__file__).parent.absolute()),)
+    logfire._internal.stack_info.NON_USER_CODE_PREFIXES += (str(Path(__file__).parent.absolute()),)  # pyright: ignore[reportPrivateImportUsage]
 
 _logfire = logfire_api.Logfire(otel_scope='pydantic-evals')
 
@@ -628,9 +628,9 @@ def _make_typed_dict(cls_name_prefix: str, fields: dict[str, Any]) -> Any:
 
         class ClsDatasetRow(BaseModel, extra='forbid'):
             name: str
-            inputs: in_type
-            metadata: meta_type
-            expected_output: out_type | None = None
+            inputs: in_type  # pyright: ignore[reportInvalidTypeForm]
+            metadata: meta_type  # pyright: ignore[reportInvalidTypeForm]
+            expected_output: out_type | None = None  # pyright: ignore[reportInvalidTypeForm,reportUnknownVariableType]
             if evaluator_schema_types:
                 evaluators: list[Union[tuple(evaluator_schema_types)]] = []  # pyright: ignore  # noqa UP007
 

pydantic_evals/pydantic_evals/otel/_context_in_memory_span_exporter.py

@@ -14,7 +14,7 @@
 
 try:
     from logfire._internal.tracer import (
-        ProxyTracerProvider as LogfireProxyTracerProvider,  # pyright: ignore[reportAssignmentType]
+        ProxyTracerProvider as LogfireProxyTracerProvider,  # pyright: ignore[reportAssignmentType,reportPrivateImportUsage]
     )
 
     _LOGFIRE_IS_INSTALLED = True

pydantic_evals/pydantic_evals/otel/span_tree.py

@@ -416,12 +416,12 @@ def _matches(span: SpanNode, query: SpanQuery) -> bool:  # noqa C901
         return False
 
     # Timing conditions
-    if (min_duration := query.get('min_duration')) is not None and span.duration is not None:
+    if (min_duration := query.get('min_duration')) is not None and span.duration is not None:  # pyright: ignore[reportUnnecessaryComparison]
         if not isinstance(min_duration, timedelta):
             min_duration = timedelta(seconds=min_duration)
         if span.duration < min_duration:
             return False
-    if (max_duration := query.get('max_duration')) is not None and span.duration is not None:
+    if (max_duration := query.get('max_duration')) is not None and span.duration is not None:  # pyright: ignore[reportUnnecessaryComparison]
         if not isinstance(max_duration, timedelta):
             max_duration = timedelta(seconds=max_duration)
         if span.duration > max_duration:

pydantic_graph/pydantic_graph/graph.py

@@ -27,7 +27,7 @@
 else:
     from pathlib import Path
 
-    logfire._internal.stack_info.NON_USER_CODE_PREFIXES += (str(Path(__file__).parent.absolute()),)
+    logfire._internal.stack_info.NON_USER_CODE_PREFIXES += (str(Path(__file__).parent.absolute()),)  # pyright: ignore[reportPrivateImportUsage]
 
 
 __all__ = 'Graph', 'GraphRun', 'GraphRunResult'
@@ -111,7 +111,7 @@ def __init__(
         self.auto_instrument = auto_instrument
 
         parent_namespace = _utils.get_parent_namespace(inspect.currentframe())
-        self.node_defs: dict[str, NodeDef[StateT, DepsT, RunEndT]] = {}
+        self.node_defs = {}
         for node in nodes:
             self._register_node(node, parent_namespace)
 

pyproject.toml

@@ -60,11 +60,17 @@ pydantic-ai-examples = { workspace = true }
 mcp-run-python = { workspace = true }
 
 [tool.uv.workspace]
-members = ["pydantic_ai_slim", "pydantic_evals", "pydantic_graph", "mcp-run-python", "examples"]
+members = [
+    "pydantic_ai_slim",
+    "pydantic_evals",
+    "pydantic_graph",
+    "mcp-run-python",
+    "examples",
+]
 
 [dependency-groups]
 # dev dependencies are defined in `pydantic-ai-slim/pyproject.toml` to allow for minimal testing
-lint = ["mypy>=1.11.2", "pyright>=1.1.388,<1.1.390", "ruff>=0.6.9"]
+lint = ["mypy>=1.11.2", "pyright>=1.1.390", "ruff>=0.6.9"]
 docs = [
     "black>=24.10.0",
     "bs4>=0.0.2",
@@ -132,12 +138,24 @@ reportMissingTypeStubs = false
 reportUnnecessaryIsInstance = false
 reportUnnecessaryTypeIgnoreComment = true
 reportMissingModuleSource = false
-include = ["pydantic_ai_slim", "pydantic_evals", "pydantic_graph", "mcp-run-python", "examples", "tests"]
+include = [
+    "pydantic_ai_slim",
+    "pydantic_evals",
+    "pydantic_graph",
+    "mcp-run-python",
+    "tests",
+    "examples",
+]
 venvPath = ".venv"
 # see https://github.com/microsoft/pyright/issues/7771 - we don't want to error on decorated functions in tests
 # which are not otherwise used
-executionEnvironments = [{ root = "tests", reportUnusedFunction = false }]
-exclude = ["examples/pydantic_ai_examples/weather_agent_gradio.py", "mcp-run-python/node_modules"]
+executionEnvironments = [
+    { root = "tests", reportUnusedFunction = false, reportPrivateImportUsage = false },
+]
+exclude = [
+    "examples/pydantic_ai_examples/weather_agent_gradio.py",
+    "mcp-run-python/node_modules",
+]
 extraPaths = ["mcp-run-python/stubs"]
 
 [tool.mypy]
@@ -154,7 +172,7 @@ filterwarnings = [
     "ignore::RuntimeWarning:pydantic_ai.mcp",
     # uvicorn (mcp server)
     "ignore:websockets.legacy is deprecated.*:DeprecationWarning:websockets.legacy",
-    "ignore:websockets.server.WebSocketServerProtocol is deprecated:DeprecationWarning"
+    "ignore:websockets.server.WebSocketServerProtocol is deprecated:DeprecationWarning",
 ]
 
 # https://coverage.readthedocs.io/en/latest/config.html#run

tests/json_body_serializer.py

@@ -63,13 +63,13 @@ def serialize(cassette_dict: Any):
             content_type = headers.get('content-type', [])
             if any(isinstance(header, str) and header.startswith('application/json') for header in content_type):
                 # Parse the body as JSON
-                body: Any = data.get('body', None)
+                body = data.get('body', None)
                 assert body is not None, data
                 if isinstance(body, dict):
                     # Responses will have the body under a field called 'string'
                     body = body.get('string')
                 if body is not None:
-                    data['parsed_body'] = json.loads(body)
+                    data['parsed_body'] = json.loads(body)  # pyright: ignore[reportUnknownArgumentType]
                     if 'access_token' in data['parsed_body']:
                         data['parsed_body']['access_token'] = 'scrubbed'
                     del data['body']