Merge branch 'main' into annotate-three_way_cmp

Author: donbarbos

pyrightconfig.stricter.json

@@ -80,7 +80,6 @@
         "stubs/PyMySQL",
         "stubs/python-dateutil",
         "stubs/python-jose",
-        "stubs/pytz/pytz/lazy.pyi",
         "stubs/pywin32",
         "stubs/PyYAML",
         "stubs/reportlab",

stdlib/http/client.pyi

@@ -166,6 +166,7 @@ class HTTPResponse(io.BufferedIOBase, BinaryIO):  # type: ignore[misc]  # incomp
     def begin(self) -> None: ...
 
 class HTTPConnection:
+    blocksize: int
     auto_open: int  # undocumented
     debuglevel: int
     default_port: int  # undocumented

stdlib/imaplib.pyi

@@ -26,6 +26,7 @@ class IMAP4:
     class error(Exception): ...
     class abort(error): ...
     class readonly(abort): ...
+    utf8_enabled: bool
     mustquote: Pattern[str]
     debug: int
     state: str

stubs/aws-xray-sdk/@tests/stubtest_allowlist.txt

@@ -1,6 +1,9 @@
 aws_xray_sdk.core.models.subsegment.subsegment_decorator
 aws_xray_sdk.core.sampling.connector.ServiceConnector.fetch_sampling_rules
 
+# Inconsistency because `context_missing` param can be passed in *args or **kwargs:
+aws_xray_sdk.core.async_context.AsyncContext.__init__
+
 # We can not import 3rd-party libraries in teststubs runtime,
 # but we can use Protocol to replace this types:
 aws_xray_sdk.ext.aiobotocore

stubs/aws-xray-sdk/aws_xray_sdk/core/async_context.pyi

@@ -1,13 +1,23 @@
+from asyncio.events import AbstractEventLoop
+from asyncio.tasks import Task, _TaskCompatibleCoro
+from typing import Any, TypeVar
+
 from .context import Context as _Context
 
+_T_co = TypeVar("_T_co", covariant=True)
+
 class AsyncContext(_Context):
-    def __init__(self, *args, loop=None, use_task_factory: bool = True, **kwargs) -> None: ...
+    def __init__(
+        self, context_missing: str = "LOG_ERROR", loop: AbstractEventLoop | None = None, use_task_factory: bool = True
+    ) -> None: ...
     def clear_trace_entities(self) -> None: ...
 
 class TaskLocalStorage:
-    def __init__(self, loop=None) -> None: ...
-    def __setattr__(self, name: str, value) -> None: ...
-    def __getattribute__(self, item: str): ...
+    def __init__(self, loop: AbstractEventLoop | None = None) -> None: ...
+    # Sets unknown items on the current task's context attribute
+    def __setattr__(self, name: str, value: Any) -> None: ...
+    # Returns unknown items from the current tasks context attribute
+    def __getattribute__(self, item: str) -> Any | None: ...
     def clear(self) -> None: ...
 
-def task_factory(loop, coro): ...
+def task_factory(loop: AbstractEventLoop | None, coro: _TaskCompatibleCoro[_T_co]) -> Task[_T_co]: ...

stubs/aws-xray-sdk/aws_xray_sdk/core/async_recorder.pyi

@@ -1,24 +1,43 @@
+from _typeshed import Incomplete
+from collections.abc import Awaitable, Callable, Iterable, Mapping
 from types import TracebackType
+from typing import TypeVar
 
-from .models.segment import SegmentContextManager
-from .models.subsegment import SubsegmentContextManager
+from .models.dummy_entities import DummySegment, DummySubsegment
+from .models.segment import Segment, SegmentContextManager
+from .models.subsegment import Subsegment, SubsegmentContextManager
 from .recorder import AWSXRayRecorder
 
+_T = TypeVar("_T")
+
 class AsyncSegmentContextManager(SegmentContextManager):
-    async def __aenter__(self): ...
+    async def __aenter__(self) -> DummySegment | Segment: ...
     async def __aexit__(
         self, exc_type: type[BaseException] | None, exc_val: BaseException | None, exc_tb: TracebackType | None
     ) -> None: ...
 
 class AsyncSubsegmentContextManager(SubsegmentContextManager):
-    async def __call__(self, wrapped, instance, args, kwargs): ...
-    async def __aenter__(self): ...
+    async def __call__(
+        self, wrapped: Callable[..., Awaitable[_T]], instance, args: Iterable[Incomplete], kwargs: Mapping[str, Incomplete]
+    ) -> _T: ...
+    async def __aenter__(self) -> DummySubsegment | Subsegment | None: ...
     async def __aexit__(
         self, exc_type: type[BaseException] | None, exc_val: BaseException | None, exc_tb: TracebackType | None
     ) -> None: ...
 
 class AsyncAWSXRayRecorder(AWSXRayRecorder):
-    def capture_async(self, name=None): ...
-    def in_segment_async(self, name=None, **segment_kwargs): ...
-    def in_subsegment_async(self, name=None, **subsegment_kwargs): ...
-    async def record_subsegment_async(self, wrapped, instance, args, kwargs, name, namespace, meta_processor): ...
+    def capture_async(self, name: str | None = None) -> AsyncSubsegmentContextManager: ...
+    def in_segment_async(
+        self, name: str | None = None, *, traceid: str | None = None, parent_id: str | None = None, sampling: bool | None = None
+    ) -> AsyncSegmentContextManager: ...
+    def in_subsegment_async(self, name: str | None = None, *, namespace: str = "local") -> AsyncSubsegmentContextManager: ...
+    async def record_subsegment_async(
+        self,
+        wrapped: Callable[..., Awaitable[_T]],
+        instance,
+        args: Iterable[Incomplete],
+        kwargs: Mapping[str, Incomplete],
+        name: str,
+        namespace: str,
+        meta_processor: Callable[..., object] | None,
+    ) -> _T: ...

stubs/aws-xray-sdk/aws_xray_sdk/core/context.pyi

@@ -1,27 +1,27 @@
 import time
 from logging import Logger
-from typing import Any
+from typing import Final
 
 from .models.entity import Entity
 from .models.segment import Segment
 from .models.subsegment import Subsegment
 
 log: Logger
-SUPPORTED_CONTEXT_MISSING: Any
-MISSING_SEGMENT_MSG: str
-CXT_MISSING_STRATEGY_KEY: str
+MISSING_SEGMENT_MSG: Final[str]
+SUPPORTED_CONTEXT_MISSING: Final = ("RUNTIME_ERROR", "LOG_ERROR", "IGNORE_ERROR")
+CXT_MISSING_STRATEGY_KEY: Final = "AWS_XRAY_CONTEXT_MISSING"
 
 class Context:
     def __init__(self, context_missing: str = "LOG_ERROR") -> None: ...
     def put_segment(self, segment: Segment) -> None: ...
     def end_segment(self, end_time: time.struct_time | None = None) -> None: ...
     def put_subsegment(self, subsegment: Subsegment) -> None: ...
-    def end_subsegment(self, end_time: time.struct_time | None = None): ...
-    def get_trace_entity(self): ...
+    def end_subsegment(self, end_time: time.struct_time | None = None) -> bool: ...
+    def get_trace_entity(self) -> Entity: ...
     def set_trace_entity(self, trace_entity: Entity) -> None: ...
     def clear_trace_entities(self) -> None: ...
     def handle_context_missing(self) -> None: ...
     @property
-    def context_missing(self): ...
+    def context_missing(self) -> str: ...
     @context_missing.setter
     def context_missing(self, value: str) -> None: ...

stubs/aws-xray-sdk/aws_xray_sdk/core/daemon_config.pyi

@@ -1,13 +1,15 @@
-DAEMON_ADDRESS_KEY: str
-DEFAULT_ADDRESS: str
+from typing import Final
+
+DAEMON_ADDRESS_KEY: Final = "AWS_XRAY_DAEMON_ADDRESS"
+DEFAULT_ADDRESS: Final = "127.0.0.1:2000"
 
 class DaemonConfig:
-    def __init__(self, daemon_address="127.0.0.1:2000") -> None: ...
+    def __init__(self, daemon_address: str | None = "127.0.0.1:2000") -> None: ...
     @property
-    def udp_ip(self): ...
+    def udp_ip(self) -> str: ...
     @property
-    def udp_port(self): ...
+    def udp_port(self) -> int: ...
     @property
-    def tcp_ip(self): ...
+    def tcp_ip(self) -> str: ...
     @property
-    def tcp_port(self): ...
+    def tcp_port(self) -> int: ...

stubs/aws-xray-sdk/aws_xray_sdk/core/emitters/udp_emitter.pyi

@@ -13,6 +13,6 @@ class UDPEmitter:
     def send_entity(self, entity: Entity) -> None: ...
     def set_daemon_address(self, address: str | None) -> None: ...
     @property
-    def ip(self): ...
+    def ip(self) -> str: ...
     @property
-    def port(self): ...
+    def port(self) -> int: ...

stubs/aws-xray-sdk/aws_xray_sdk/core/lambda_launcher.pyi

@@ -1,23 +1,19 @@
 from logging import Logger
+from typing import Final
 
 from .context import Context
 
 log: Logger
-LAMBDA_TRACE_HEADER_KEY: str
-LAMBDA_TASK_ROOT_KEY: str
-TOUCH_FILE_DIR: str
-TOUCH_FILE_PATH: str
+LAMBDA_TRACE_HEADER_KEY: Final = "_X_AMZN_TRACE_ID"
+LAMBDA_TASK_ROOT_KEY: Final = "LAMBDA_TASK_ROOT"
+TOUCH_FILE_DIR: Final = "/tmp/.aws-xray/"
+TOUCH_FILE_PATH: Final = "/tmp/.aws-xray/initialized"
 
-def check_in_lambda(): ...
+def check_in_lambda() -> LambdaContext | None: ...
 
 class LambdaContext(Context):
     def __init__(self) -> None: ...
-    def put_segment(self, segment) -> None: ...
-    def end_segment(self, end_time=None) -> None: ...
-    def put_subsegment(self, subsegment) -> None: ...
-    def get_trace_entity(self): ...
-    @property
+    @property  # type: ignore[override]
     def context_missing(self) -> None: ...
     @context_missing.setter
-    def context_missing(self, value) -> None: ...
-    def handle_context_missing(self) -> None: ...
+    def context_missing(self, value: str) -> None: ...