aidial-sdk 0.46.0.dev8__tar.gz → 0.47.0.dev2__tar.gz

{aidial_sdk-0.46.0.dev8 → aidial_sdk-0.47.0.dev2}/PKG-INFO

@@ -1,14 +1,13 @@
 Metadata-Version: 2.4
 Name: aidial-sdk
-Version: 0.46.0.dev8
+Version: 0.47.0.dev2
 Summary: Framework to create applications and model adapters for AI DIAL
 License-Expression: Apache-2.0
 License-File: LICENSE
 Author: EPAM RAIL
 Author-email: SpecialEPM-DIALDevTeam@epam.com
-Requires-Python: >=3.10,<4.0
+Requires-Python: >=3.11,<4.0
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
@@ -19,14 +18,14 @@ Requires-Dist: fastapi (>=0.51,<1.0)
 Requires-Dist: httpx (>=0.25.0,<1.0) ; extra == "httpx"
 Requires-Dist: opentelemetry-api (>=1.22.0,<2.0) ; extra == "telemetry"
 Requires-Dist: opentelemetry-exporter-otlp-proto-grpc (>=1.22.0,<2.0) ; extra == "telemetry"
-Requires-Dist: opentelemetry-exporter-prometheus (>=0.43b0) ; extra == "telemetry"
-Requires-Dist: opentelemetry-instrumentation-aiohttp-client (>=0.43b0) ; extra == "telemetry"
-Requires-Dist: opentelemetry-instrumentation-fastapi (>=0.43b0) ; extra == "telemetry"
-Requires-Dist: opentelemetry-instrumentation-httpx (>=0.43b0) ; extra == "telemetry"
-Requires-Dist: opentelemetry-instrumentation-logging (>=0.43b0) ; extra == "telemetry"
-Requires-Dist: opentelemetry-instrumentation-requests (>=0.43b0) ; extra == "telemetry"
-Requires-Dist: opentelemetry-instrumentation-system-metrics (>=0.43b0) ; extra == "telemetry"
-Requires-Dist: opentelemetry-instrumentation-urllib (>=0.43b0) ; extra == "telemetry"
+Requires-Dist: opentelemetry-exporter-prometheus (>=0.64b0) ; extra == "telemetry"
+Requires-Dist: opentelemetry-instrumentation-aiohttp-client (>=0.64b0) ; extra == "telemetry"
+Requires-Dist: opentelemetry-instrumentation-fastapi (>=0.64b0) ; extra == "telemetry"
+Requires-Dist: opentelemetry-instrumentation-httpx (>=0.64b0) ; extra == "telemetry"
+Requires-Dist: opentelemetry-instrumentation-logging (>=0.64b0) ; extra == "telemetry"
+Requires-Dist: opentelemetry-instrumentation-requests (>=0.64b0) ; extra == "telemetry"
+Requires-Dist: opentelemetry-instrumentation-system-metrics (>=0.64b0) ; extra == "telemetry"
+Requires-Dist: opentelemetry-instrumentation-urllib (>=0.64b0) ; extra == "telemetry"
 Requires-Dist: opentelemetry-sdk (>=1.22.0,<2.0) ; extra == "telemetry"
 Requires-Dist: prometheus-client (>=0.17.1,<1.0) ; extra == "telemetry"
 Requires-Dist: pydantic (>=1.10.17,<3)

{aidial_sdk-0.46.0.dev8 → aidial_sdk-0.47.0.dev2}/aidial_sdk/chat_completion/request.py

@@ -1,8 +1,6 @@
 from collections.abc import Mapping
 from enum import Enum
-from typing import Annotated, Any, Literal
-
-from typing_extensions import assert_never
+from typing import Annotated, Any, Literal, assert_never
 
 from aidial_sdk._pydantic import (
     PYDANTIC_V2,

{aidial_sdk-0.46.0.dev8 → aidial_sdk-0.47.0.dev2}/aidial_sdk/chat_completion/response.py

@@ -1,11 +1,9 @@
 import asyncio
 from collections.abc import Callable, Coroutine
 from time import time
-from typing import Any
+from typing import Any, assert_never
 from uuid import uuid4
 
-from typing_extensions import assert_never
-
 from aidial_sdk.chat_completion._cache import CacheBreakpointPath
 from aidial_sdk.chat_completion._types import ChunkQueue
 from aidial_sdk.chat_completion.choice import Choice

{aidial_sdk-0.46.0.dev8 → aidial_sdk-0.47.0.dev2}/aidial_sdk/telemetry/init.py

@@ -18,7 +18,7 @@ from opentelemetry.instrumentation.system_metrics import (
 )
 from opentelemetry.instrumentation.urllib import URLLibInstrumentor
 from opentelemetry.metrics import set_meter_provider
-from opentelemetry.sdk._logs import LoggerProvider, LoggingHandler
+from opentelemetry.sdk._logs import LoggerProvider
 from opentelemetry.sdk._logs.export import (
     BatchLogRecordProcessor,
     ConsoleLogRecordExporter,
@@ -86,13 +86,6 @@ def init_telemetry(app: FastAPI | None, config: TelemetryConfig):
         except ImportError:
             pass
 
-        set_logging_format = config.tracing.logging
-        if set_logging_format:
-            # Remove any competing handlers to avoid duplicate logging
-            remove_stream_handlers(logging.getLogger(), sys.stderr)
-
-        LoggingInstrumentor().instrument(set_logging_format=set_logging_format)
-
     if config.logs is not None:
         # Adding a handler to the root logger which exports the logs to OTLP or to the console as JSON.
         provider = LoggerProvider(resource=resource)
@@ -120,7 +113,24 @@ def init_telemetry(app: FastAPI | None, config: TelemetryConfig):
             )
 
         set_logger_provider(provider)
-        root.addHandler(LoggingHandler())
+
+    if config.tracing is not None or config.logs is not None:
+        # OTel's text format writes to stderr, which `console_export` takes over.
+        set_logging_format = (
+            config.tracing is not None
+            and config.tracing.logging
+            and not (config.logs is not None and config.logs.console_export)
+        )
+
+        if set_logging_format:
+            # Remove any competing handlers to avoid duplicate logging
+            remove_stream_handlers(logging.getLogger(), sys.stderr)
+
+        LoggingInstrumentor().instrument(
+            set_logging_format=set_logging_format,
+            inject_trace_context=config.tracing is not None,
+            enable_log_auto_instrumentation=config.logs is not None,
+        )
 
     if config.metrics is not None:
         metric_readers = []

{aidial_sdk-0.46.0.dev8 → aidial_sdk-0.47.0.dev2}/aidial_sdk/utils/streaming.py

@@ -4,11 +4,10 @@ from collections.abc import AsyncIterator, Awaitable, Callable
 from typing import (
     Any,
     TypeVar,
+    assert_never,
     cast,
 )
 
-from typing_extensions import assert_never
-
 from aidial_sdk.chat_completion.chunks import BaseChunkWithDefaults
 from aidial_sdk.exceptions import HTTPException as DIALException
 from aidial_sdk.utils._cancel_scope import CancelScope

{aidial_sdk-0.46.0.dev8 → aidial_sdk-0.47.0.dev2}/pyproject.toml

@@ -1,11 +1,11 @@
 [project]
 name = "aidial-sdk"
-version = "0.46.0.dev8"
+version = "0.47.0.dev2"
 description = "Framework to create applications and model adapters for AI DIAL"
 authors = [{ name = "EPAM RAIL", email = "SpecialEPM-DIALDevTeam@epam.com" }]
 license = "Apache-2.0"
 readme = "README.md"
-requires-python = ">=3.10,<4.0"
+requires-python = ">=3.11,<4.0"
 dependencies = [
     "fastapi (>=0.51,<1.0)",
     "uvicorn (>=0.19,<1.0)",
@@ -23,14 +23,14 @@ telemetry = [
     "opentelemetry-sdk (>=1.22.0,<2.0)",
     "opentelemetry-api (>=1.22.0,<2.0)",
     "opentelemetry-exporter-otlp-proto-grpc (>=1.22.0,<2.0)",
-    "opentelemetry-instrumentation-aiohttp-client (>=0.43b0)",
-    "opentelemetry-instrumentation-fastapi (>=0.43b0)",
-    "opentelemetry-instrumentation-httpx (>=0.43b0)",
-    "opentelemetry-instrumentation-logging (>=0.43b0)",
-    "opentelemetry-instrumentation-requests (>=0.43b0)",
-    "opentelemetry-instrumentation-system-metrics (>=0.43b0)",
-    "opentelemetry-instrumentation-urllib (>=0.43b0)",
-    "opentelemetry-exporter-prometheus (>=0.43b0)",
+    "opentelemetry-instrumentation-aiohttp-client (>=0.64b0)",
+    "opentelemetry-instrumentation-fastapi (>=0.64b0)",
+    "opentelemetry-instrumentation-httpx (>=0.64b0)",
+    "opentelemetry-instrumentation-logging (>=0.64b0)",
+    "opentelemetry-instrumentation-requests (>=0.64b0)",
+    "opentelemetry-instrumentation-system-metrics (>=0.64b0)",
+    "opentelemetry-instrumentation-urllib (>=0.64b0)",
+    "opentelemetry-exporter-prometheus (>=0.64b0)",
     "prometheus-client (>=0.17.1,<1.0)",
 ]
 httpx = ["httpx (>=0.25.0,<1.0)"]
@@ -39,14 +39,14 @@ httpx = ["httpx (>=0.25.0,<1.0)"]
 pytest = "^9.0.3"
 pytest-asyncio = "^1.3.0"
 nox = "^2023.4.22"
-pillow = "^12.3.0"
+pillow = "^13.0.0"
 httpx = "^0.25.0"
 respx = "^0.21.1"
 aiohttp = "^3.14.4"
 aiointercept = "^0.1.7"
 requests = "^2.33"
 responses = "^0.25.3"
-httpx2 = "^2.12.0"         # required for Starlette.TestClient
+httpx2 = "^2.12.0"        # required for Starlette.TestClient
 openai = "^2.46.0"        # third-party logger for log-takeover tests
 
 [tool.poetry.group.lint.dependencies]
@@ -86,7 +86,7 @@ exclude = [
 
 [tool.ruff]
 line-length = 80
-target-version = "py310"
+target-version = "py311"
 
 [tool.ruff.lint]
 select = [