Stub fixes.

Author: s3rius

pyproject.toml

@@ -25,6 +25,7 @@ email = "s3riussan@gmail.com"
 [dependency-groups]
 dev = [
   "anyio>=4,<5",
+  "mypy>=1.19.1,<2",
   "pytest>=9,<10",
   "pytest-xdist>=3,<4",
 ]

python/natsrpy/_natsrpy_rs/__init__.pyi

@@ -1,24 +1,28 @@
 from collections.abc import Awaitable, Callable
 from datetime import timedelta
-from typing import Any, overload
+from typing import Any, final, overload
 
 from natsrpy._natsrpy_rs.js import JetStream
 from natsrpy._natsrpy_rs.message import Message
+from typing_extensions import Self
 
+@final
 class IteratorSubscription:
     def __aiter__(self) -> IteratorSubscription: ...
     async def __anext__(self) -> Message: ...
     async def next(self, timeout: float | timedelta | None = None) -> Message: ...
     async def unsubscribe(self, limit: int | None = None) -> None: ...
     async def drain(self) -> None: ...
 
+@final
 class CallbackSubscription:
     async def unsubscribe(self, limit: int | None = None) -> None: ...
     async def drain(self) -> None: ...
 
+@final
 class Nats:
-    def __init__(
-        self,
+    def __new__(
+        cls,
         /,
         addrs: list[str] = ["nats://localhost:4222"],
         user_and_pass: tuple[str, str] | None = None,
@@ -30,7 +34,7 @@ class Nats:
         max_reconnects: int | None = None,
         connection_timeout: float | timedelta = ...,
         request_timeout: float | timedelta = ...,
-    ) -> None: ...
+    ) -> Self: ...
     async def startup(self) -> None: ...
     async def shutdown(self) -> None: ...
     async def publish(

python/natsrpy/_natsrpy_rs/js/consumers.pyi

@@ -1,6 +1,7 @@
 from datetime import timedelta
 
 from natsrpy._natsrpy_rs.js import JetStreamMessage
+from typing_extensions import Self
 
 class DeliverPolicy:
     ALL: DeliverPolicy
@@ -55,8 +56,8 @@ class PullConsumerConfig:
     priority_groups: list[str]
     pause_until: int | None
 
-    def __init__(
-        self,
+    def __new__(
+        cls,
         name: str | None = None,
         durable_name: str | None = None,
         description: str | None = None,
@@ -85,7 +86,7 @@ class PullConsumerConfig:
         priority_policy: PriorityPolicy | None = None,
         priority_groups: list[str] | None = None,
         pause_until: int | None = None,
-    ) -> None: ...
+    ) -> Self: ...
 
 class PushConsumerConfig:
     deliver_subject: str
@@ -116,8 +117,8 @@ class PushConsumerConfig:
     inactive_threshold: timedelta
     pause_until: int | None
 
-    def __init__(
-        self,
+    def __new__(
+        cls,
         deliver_subject: str,
         name: str | None = None,
         durable_name: str | None = None,
@@ -145,7 +146,7 @@ class PushConsumerConfig:
         backoff: list[timedelta] | None = None,
         inactive_threshold: timedelta | None = None,
         pause_until: int | None = None,
-    ) -> None: ...
+    ) -> Self: ...
 
 class MessagesIterator:
     def __aiter__(self) -> MessagesIterator: ...

python/natsrpy/_natsrpy_rs/js/kv.pyi

@@ -1,4 +1,5 @@
 from natsrpy._natsrpy_rs.js.stream import Placement, Republish, Source, StorageType
+from typing_extensions import Self
 
 class KVConfig:
     """
@@ -23,8 +24,8 @@ class KVConfig:
     placement: Placement | None
     limit_markers: float | None
 
-    def __init__(
-        self,
+    def __new__(
+        cls,
         bucket: str,
         description: str | None = None,
         max_value_size: int | None = None,
@@ -40,7 +41,7 @@ class KVConfig:
         compression: bool | None = None,
         placement: Placement | None = None,
         limit_markers: float | None = None,
-    ) -> None: ...
+    ) -> Self: ...
 
 class KeyValue:
     @property

python/natsrpy/_natsrpy_rs/js/object_store.pyi

@@ -1,6 +1,6 @@
 from datetime import timedelta
 
-from typing_extensions import Writer
+from typing_extensions import Self, Writer
 
 from .stream import Placement, StorageType
 
@@ -14,8 +14,8 @@ class ObjectStoreConfig:
     compression: bool
     placement: Placement | None
 
-    def __init__(
-        self,
+    def __new__(
+        cls,
         bucket: str,
         description: str | None = None,
         max_age: float | timedelta | None = None,
@@ -24,7 +24,7 @@ class ObjectStoreConfig:
         num_replicas: int | None = None,
         compression: bool | None = None,
         placement: Placement | None = None,
-    ) -> None: ...
+    ) -> Self: ...
 
 class ObjectStore:
     async def get(

python/natsrpy/_natsrpy_rs/js/stream.pyi

@@ -1,6 +1,8 @@
 from datetime import datetime, timedelta
 from typing import Any
 
+from typing_extensions import Self
+
 from .managers import ConsumersManager
 
 class StorageType:
@@ -28,27 +30,31 @@ class ConsumerLimits:
     inactive_threshold: timedelta
     max_ack_pending: int
 
-    def __init__(self, inactive_threshold: timedelta, max_ack_pending: int) -> None: ...
+    def __new__(
+        cls,
+        inactive_threshold: timedelta,
+        max_ack_pending: int,
+    ) -> Self: ...
 
 class External:
     api_prefix: str
     delivery_prefix: str | None
 
-    def __init__(
-        self,
+    def __new__(
+        cls,
         api_prefix: str,
         delivery_prefix: str | None = None,
-    ) -> None: ...
+    ) -> Self: ...
 
 class SubjectTransform:
     source: str
     destination: str
 
-    def __init__(
-        self,
+    def __new__(
+        cls,
         source: str,
         destination: str,
-    ) -> None: ...
+    ) -> Self: ...
 
 class Source:
     name: str
@@ -59,38 +65,38 @@ class Source:
     domain: str | None = None
     subject_transforms: SubjectTransform | None = None
 
-    def __init__(
-        self,
+    def __new__(
+        cls,
         name: str,
         filter_subject: str | None = None,
         external: External | None = None,
         start_sequence: int | None = None,
         start_time: int | None = None,
         domain: str | None = None,
         subject_transforms: SubjectTransform | None = None,
-    ) -> None: ...
+    ) -> Self: ...
 
 class Placement:
     cluster: str | None
     tags: list[str] | None
 
-    def __init__(
-        self,
+    def __new__(
+        cls,
         cluster: str | None = None,
         tags: list[str] | None = None,
-    ) -> None: ...
+    ) -> Self: ...
 
 class Republish:
     source: str
     destination: str
     headers_only: bool
 
-    def __init__(
-        self,
+    def __new__(
+        cls,
         source: str,
         destination: str,
         headers_only: bool,
-    ) -> None: ...
+    ) -> Self: ...
 
 class StreamConfig:
     name: str
@@ -133,8 +139,8 @@ class StreamConfig:
     allow_message_schedules: bool | None
     allow_message_counter: bool | None
 
-    def __init__(
-        self,
+    def __new__(
+        cls,
         name: str,
         subjects: list[str],
         max_bytes: int | None = None,
@@ -174,7 +180,7 @@ class StreamConfig:
         allow_atomic_publish: bool | None = None,
         allow_message_schedules: bool | None = None,
         allow_message_counter: bool | None = None,
-    ) -> None: ...
+    ) -> Self: ...
 
 class StreamMessage:
     subject: str

test.py

@@ -0,0 +1,68 @@
+import asyncio
+import logging
+from datetime import timedelta
+
+from natsrpy import Nats, Message
+from natsrpy.js import PullConsumerConfig, StreamConfig
+
+logging.basicConfig(level=logging.DEBUG)
+
+
+async def do_things(nats: Nats) -> None:
+    """Do things."""
+    js = await nats.jetstream()
+    stream = await js.streams.create_or_update(
+        StreamConfig(
+            subjects=["test.one", "test.two"],
+            name="test-stream",
+        ),
+    )
+    await js.publish("test.one", b"Hello lib!")
+
+    consumer = await stream.consumers.create(
+        PullConsumerConfig(
+            name="test-cons",
+            durable_name="test-cons",
+        ),
+    )
+    while True:
+        for message in await consumer.fetch():
+            print(
+                message.subject,
+                message.reply,
+                message.payload,
+                message.headers,
+                message.domain,
+                message.acc_hash,
+                message.stream,
+                message.consumer,
+                message.stream_sequence,
+                message.consumer_sequence,
+                message.delivered,
+                message.pending,
+                message.published,
+                message.token,
+                sep="||",
+            )
+            await message.ack()
+
+    await asyncio.Future()
+
+
+async def main() -> None:
+    """We do logic here."""
+    nats = Nats(
+        addrs=["nats://localhost:4222"],
+        connection_timeout=timedelta(seconds=1),
+        request_timeout=timedelta(seconds=3),
+    )
+    await nats.startup()
+
+    try:
+        await do_things(nats)
+    finally:
+        await nats.shutdown()
+
+
+if __name__ == "__main__":
+    asyncio.run(main())