feat: remove metadata

Author: brian14708

src/duron/_core/context.py

@@ -2,7 +2,6 @@
 
 import asyncio
 import contextvars
-from contextlib import contextmanager
 from contextvars import ContextVar
 from random import Random
 from typing import TYPE_CHECKING, cast
@@ -29,15 +28,14 @@
 from duron.typing import inspect_function
 
 if TYPE_CHECKING:
-    from collections.abc import Callable, Coroutine, Generator, Mapping
+    from collections.abc import Callable, Coroutine
     from contextvars import Token
     from types import TracebackType
 
     from duron._core.signal import Signal, SignalWriter
     from duron._core.stream import Stream, StreamWriter
     from duron._decorator.durable import DurableFn
     from duron._loop import EventLoop
-    from duron.codec import JSONValue
     from duron.typing import TypeHint
 
     _T = TypeVar("_T")
@@ -243,29 +241,6 @@ def random(self) -> Random:
             raise RuntimeError(msg)
         return Random(self._loop.generate_op_id())  # noqa: S311
 
-    @contextmanager
-    def annotate(
-        self,
-        *,
-        labels: Mapping[str, str] | None = None,
-        metadata: Mapping[str, JSONValue] | None = None,
-    ) -> Generator[None, None, None]:
-        if asyncio.get_running_loop() is not self._loop:
-            msg = "Context labels can only be used in the context loop"
-            raise RuntimeError(msg)
-        if not labels and not metadata:
-            yield
-            return
-
-        current = _annotation.get()
-        token = _annotation.set(
-            OpAnnotations.extend(current, metadata=metadata, labels=labels)
-        )
-        try:
-            yield
-        finally:
-            _annotation.reset(token)
-
     @overload
     async def complete_promise(
         self,

src/duron/_core/invoke.py

@@ -530,7 +530,6 @@ async def enqueue_op(self, id_: str, fut: OpFuture[object]) -> None:
 
                 set_annotations(
                     promise_create_entry,
-                    metadata=op.annotations.metadata,
                     labels=op.annotations.labels,
                 )
                 if self._tracer:
@@ -550,9 +549,7 @@ async def cb() -> None:
                         "promise_id": id_,
                     }
                     with (
-                        op_span.new_span(op.annotations.name, op.annotations.metadata)
-                        if op_span
-                        else NULL_SPAN
+                        op_span.new_span(op.annotations.name) if op_span else NULL_SPAN
                     ):
                         try:
                             result = op.callable(*op.args, **op.kwargs)
@@ -619,7 +616,6 @@ def done(f: OpFuture[object]) -> None:
 
                 set_annotations(
                     stream_create_entry,
-                    metadata=op.annotations.metadata,
                     labels=op.annotations.labels,
                 )
                 await self.enqueue_log(stream_create_entry)
@@ -685,7 +681,6 @@ def done(f: OpFuture[object]) -> None:
                 }
                 set_annotations(
                     promise_create_entry,
-                    metadata=op.annotations.metadata,
                     labels=op.annotations.labels,
                 )
                 if self._tracer:

src/duron/_core/ops.py

@@ -10,7 +10,6 @@
     from contextvars import Context
 
     from duron._loop import EventLoop, OpFuture
-    from duron.codec import JSONValue
     from duron.typing import TypeHint
 
     _T = TypeVar("_T")
@@ -28,14 +27,9 @@ def frozen(_cls: type[_T]) -> type[_T]: ...
 
 @frozen
 class OpAnnotations:
-    _metadata: dict[str, JSONValue]
     _labels: dict[str, str]
     _name: str | None
 
-    @property
-    def metadata(self) -> Mapping[str, JSONValue]:
-        return self._metadata
-
     @property
     def labels(self) -> Mapping[str, str]:
         return self._labels
@@ -51,19 +45,16 @@ def extend(
         base: OpAnnotations | None,
         *,
         name: str | None = None,
-        metadata: Mapping[str, JSONValue] | None = None,
         labels: Mapping[str, str] | None = None,
     ) -> OpAnnotations:
         if not base:
             return OpAnnotations(
-                _metadata={**metadata} if metadata else _EMPTY_DICT,
                 _labels={**labels} if labels else _EMPTY_DICT,
                 _name=name,
             )
 
         # OpAnnotations is immutable, so it's safe to use the existing dicts
         return OpAnnotations(
-            _metadata={**base._metadata, **metadata} if metadata else base._metadata,  # noqa: SLF001
             _labels={**base._labels, **labels} if labels else base._labels,  # noqa: SLF001
             _name=name if name is not None else base._name,  # noqa: SLF001
         )

tests/test_invoke.py

@@ -240,8 +240,7 @@ async def bg() -> list[int]:
 async def test_watch_stream() -> None:
     @durable
     async def activity(ctx: Context) -> int:
-        with ctx.annotate(labels={"name": "output"}):
-            _, sink = await ctx.create_stream(int)
+        _, sink = await ctx.create_stream(int, name="output")
         for i in range(10):
             await sink.send(i)
         await sink.close()