Union pipe (#113)

* replace all Union types to a pipe operator now that we are python 3.10+

* replace Optional with pipe or None

* minor fix ellipsis comment

Author: dinmukhamedm

src/lmnr/cli.py

@@ -4,7 +4,6 @@
 import os
 import re
 import sys
-from typing import Optional
 
 from lmnr.sdk.evaluations import Evaluation
 
@@ -55,7 +54,7 @@ async def run_evaluation(args):
             sys.modules[name] = mod
 
             spec.loader.exec_module(mod)
-            evaluations: Optional[list[Evaluation]] = EVALUATION_INSTANCES.get()
+            evaluations: list[Evaluation] | None = EVALUATION_INSTANCES.get()
             if evaluations is None:
                 LOG.warning("Evaluation instance not found")
                 if args.fail_on_error:

src/lmnr/opentelemetry_lib/__init__.py

@@ -1,7 +1,6 @@
 import logging
 import sys
 
-from typing import Optional, Set
 from opentelemetry.sdk.trace.export import SpanExporter
 from opentelemetry.sdk.resources import SERVICE_NAME
 
@@ -16,17 +15,17 @@ class TracerManager:
 
     @staticmethod
     def init(
-        app_name: Optional[str] = sys.argv[0],
+        app_name: str | None = sys.argv[0],
         disable_batch=False,
-        exporter: Optional[SpanExporter] = None,
+        exporter: SpanExporter | None = None,
         resource_attributes: dict = {},
-        instruments: Optional[Set[Instruments]] = None,
-        block_instruments: Optional[Set[Instruments]] = None,
+        instruments: set[Instruments] | None = None,
+        block_instruments: set[Instruments] | None = None,
         base_url: str = "https://api.lmnr.ai",
         port: int = 8443,
         http_port: int = 443,
-        project_api_key: Optional[str] = None,
-        max_export_batch_size: Optional[int] = None,
+        project_api_key: str | None = None,
+        max_export_batch_size: int | None = None,
         force_http: bool = False,
         timeout_seconds: int = 30,
         set_global_tracer_provider: bool = True,

src/lmnr/opentelemetry_lib/decorators/__init__.py

@@ -3,7 +3,7 @@
 import logging
 import pydantic
 import types
-from typing import Any, Literal, Optional, Union
+from typing import Any, Literal
 
 from opentelemetry import trace
 from opentelemetry import context as context_api
@@ -41,12 +41,12 @@ def json_dumps(data: dict) -> str:
 
 
 def entity_method(
-    name: Optional[str] = None,
+    name: str | None = None,
     ignore_input: bool = False,
-    ignore_inputs: Optional[list[str]] = None,
+    ignore_inputs: list[str] | None = None,
     ignore_output: bool = False,
-    span_type: Union[Literal["DEFAULT"], Literal["LLM"], Literal["TOOL"]] = "DEFAULT",
-    association_properties: Optional[dict[str, Any]] = None,
+    span_type: Literal["DEFAULT", "LLM", "TOOL"] = "DEFAULT",
+    association_properties: dict[str, Any] | None = None,
 ):
     def decorate(fn):
         @wraps(fn)
@@ -130,12 +130,12 @@ def wrap(*args, **kwargs):
 
 # Async Decorators
 def aentity_method(
-    name: Optional[str] = None,
+    name: str | None = None,
     ignore_input: bool = False,
-    ignore_inputs: Optional[list[str]] = None,
+    ignore_inputs: list[str] | None = None,
     ignore_output: bool = False,
-    span_type: Union[Literal["DEFAULT"], Literal["LLM"], Literal["TOOL"]] = "DEFAULT",
-    association_properties: Optional[dict[str, Any]] = None,
+    span_type: Literal["DEFAULT", "LLM", "TOOL"] = "DEFAULT",
+    association_properties: dict[str, Any] | None = None,
 ):
     def decorate(fn):
         @wraps(fn)

src/lmnr/opentelemetry_lib/opentelemetry/instrumentation/google_genai/__init__.py

@@ -3,7 +3,7 @@
 from collections import defaultdict
 import logging
 import os
-from typing import AsyncGenerator, Callable, Collection, Generator, Optional
+from typing import AsyncGenerator, Callable, Collection, Generator
 
 from google.genai import types
 
@@ -152,7 +152,7 @@ def _set_request_attributes(span, args, kwargs):
 
     if should_send_prompts():
         i = 0
-        system_instruction: Optional[types.ContentUnion] = config_dict.get(
+        system_instruction: types.ContentUnion | None = config_dict.get(
             "system_instruction"
         )
         if system_instruction:

src/lmnr/opentelemetry_lib/opentelemetry/instrumentation/google_genai/config.py

@@ -1,9 +1,9 @@
-from typing import Callable, Coroutine, Optional
+from typing import Callable, Coroutine
 
 
 class Config:
     exception_logger = None
-    upload_base64_image: Optional[
-        Callable[[str, str, str, str], Coroutine[None, None, str]]
-    ] = None
+    upload_base64_image: (
+        Callable[[str, str, str, str], Coroutine[None, None, str]] | None
+    ) = None
     convert_image_to_openai_format: bool = True

src/lmnr/opentelemetry_lib/opentelemetry/instrumentation/google_genai/utils.py

@@ -9,7 +9,7 @@
 from google.genai._common import BaseModel
 import pydantic
 from opentelemetry.trace import Span
-from typing import Any, Optional, Union
+from typing import Any
 
 
 def set_span_attribute(span: Span, name: str, value: str):
@@ -44,7 +44,7 @@ def wrapper(*args, **kwargs):
     return wrapper
 
 
-def to_dict(obj: Union[BaseModel, pydantic.BaseModel, dict]) -> dict[str, Any]:
+def to_dict(obj: BaseModel | pydantic.BaseModel | dict) -> dict[str, Any]:
     try:
         if isinstance(obj, BaseModel):
             return obj.model_dump()
@@ -59,11 +59,11 @@ def to_dict(obj: Union[BaseModel, pydantic.BaseModel, dict]) -> dict[str, Any]:
 
 
 def process_content_union(
-    content: Union[types.ContentUnion, types.ContentUnionDict],
-    trace_id: Optional[str] = None,
-    span_id: Optional[str] = None,
+    content: types.ContentUnion | types.ContentUnionDict,
+    trace_id: str | None = None,
+    span_id: str | None = None,
     message_index: int = 0,
-) -> Optional[str]:
+) -> str | None:
     parts = _process_content_union(content, trace_id, span_id, message_index)
     if parts is None:
         return None
@@ -83,11 +83,11 @@ def process_content_union(
 
 
 def _process_content_union(
-    content: Union[types.ContentUnion, types.ContentUnionDict],
-    trace_id: Optional[str] = None,
-    span_id: Optional[str] = None,
+    content: types.ContentUnion | types.ContentUnionDict,
+    trace_id: str | None = None,
+    span_id: str | None = None,
     message_index: int = 0,
-) -> Union[str, list[str], None]:
+) -> str | list[str] | None:
     if isinstance(content, types.Content):
         parts = to_dict(content).get("parts", [])
         return [_process_part(part) for part in parts]
@@ -111,12 +111,12 @@ def _process_content_union(
 
 
 def _process_part_union(
-    content: Union[types.PartDict, types.File, types.Part, str],
-    trace_id: Optional[str] = None,
-    span_id: Optional[str] = None,
+    content: types.PartDict | types.File | types.Part | str,
+    trace_id: str | None = None,
+    span_id: str | None = None,
     message_index: int = 0,
     content_index: int = 0,
-) -> Optional[str]:
+) -> str | None:
     if isinstance(content, str):
         return content
     elif isinstance(content, types.File):
@@ -135,11 +135,11 @@ def _process_part_union(
 
 def _process_part(
     content: types.Part,
-    trace_id: Optional[str] = None,
-    span_id: Optional[str] = None,
+    trace_id: str | None = None,
+    span_id: str | None = None,
     message_index: int = 0,
     content_index: int = 0,
-) -> Optional[str]:
+) -> str | None:
     part_dict = to_dict(content)
     if part_dict.get("text") is not None:
         return part_dict.get("text")
@@ -157,8 +157,8 @@ def _process_part(
 
 
 def role_from_content_union(
-    content: Union[types.ContentUnion, types.ContentUnionDict],
-) -> Optional[str]:
+    content: types.ContentUnion | types.ContentUnionDict,
+) -> str | None:
     if isinstance(content, types.Content):
         return to_dict(content).get("role")
     elif isinstance(content, list) and len(content) > 0:

src/lmnr/opentelemetry_lib/tracing/__init__.py

@@ -15,7 +15,6 @@
 from opentelemetry.sdk.resources import Resource
 from opentelemetry.sdk.trace import TracerProvider, SpanProcessor
 from opentelemetry.sdk.trace.export import SpanExporter
-from typing import Optional, Set
 
 module_logger = logging.getLogger(__name__)
 console_log_handler = logging.StreamHandler()
@@ -31,7 +30,7 @@
 class TracerWrapper(object):
     resource_attributes: dict = {}
     enable_content_tracing: bool = True
-    __tracer_provider: Optional[TracerProvider] = None
+    __tracer_provider: TracerProvider | None = None
     __logger: logging.Logger
     __client: LaminarClient
     __async_client: AsyncLaminarClient
@@ -41,14 +40,14 @@ class TracerWrapper(object):
     def __new__(
         cls,
         disable_batch=False,
-        exporter: Optional[SpanExporter] = None,
-        instruments: Optional[Set[Instruments]] = None,
-        block_instruments: Optional[Set[Instruments]] = None,
+        exporter: SpanExporter | None = None,
+        instruments: set[Instruments] | None = None,
+        block_instruments: set[Instruments] | None = None,
         base_url: str = "https://api.lmnr.ai",
         port: int = 8443,
         http_port: int = 443,
-        project_api_key: Optional[str] = None,
-        max_export_batch_size: Optional[int] = None,
+        project_api_key: str | None = None,
+        max_export_batch_size: int | None = None,
         force_http: bool = False,
         timeout_seconds: int = 10,
         set_global_tracer_provider: bool = True,