aidial-adapter-anthropic 0.1.0rc0__tar.gz → 0.2.0rc0__tar.gz

{aidial_adapter_anthropic-0.1.0rc0 → aidial_adapter_anthropic-0.2.0rc0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: aidial-adapter-anthropic
-Version: 0.1.0rc0
+Version: 0.2.0rc0
 Summary: Package implementing adapter from DIAL Chat Completions API to Anthropic API
 License: Apache-2.0
 Keywords: ai
@@ -12,7 +12,7 @@ Requires-Dist: aidial-sdk (>=0.28.0,<1)
 Requires-Dist: aiohttp (>=3.13.3,<4)
 Requires-Dist: anthropic (>=0.75.0,<1)
 Requires-Dist: pillow (>=10.4.0,<11)
-Requires-Dist: pydantic (>=1.10.17,<3)
+Requires-Dist: pydantic (>=2.8.2,<3)
 Project-URL: Documentation, https://epam-rail.com/dial_api
 Project-URL: Homepage, https://epam-rail.com
 Project-URL: Repository, https://github.com/epam/ai-dial-adapter-anthropic/

aidial_adapter_anthropic-0.2.0rc0/aidial_adapter_anthropic/__init__.py

@@ -0,0 +1,5 @@
+import os
+import warnings
+
+if os.getenv("PYDANTIC_V2", "0").lower() not in ("1", "true"):
+    warnings.warn("PYDANTIC_V2 env variable is expected to be set to True")

{aidial_adapter_anthropic-0.1.0rc0 → aidial_adapter_anthropic-0.2.0rc0}/aidial_adapter_anthropic/_utils/json.py

@@ -57,7 +57,7 @@ def _to_dict(obj: Any, **kwargs) -> Any:
         return tuple(rec(element) for element in obj)
 
     if isinstance(obj, BaseModel):
-        return rec(obj.dict())
+        return rec(obj.model_dump())
 
     if hasattr(obj, "to_dict"):
         return rec(obj.to_dict())

{aidial_adapter_anthropic-0.1.0rc0 → aidial_adapter_anthropic-0.2.0rc0}/aidial_adapter_anthropic/adapter/_base.py

@@ -15,10 +15,7 @@ from aidial_adapter_anthropic.dial.request import (
 )
 
 
-class ChatCompletionAdapter(ABC, BaseModel):
-    class Config:
-        arbitrary_types_allowed = True
-
+class ChatCompletionAdapter(ABC):
     @abstractmethod
     async def chat(
         self,

{aidial_adapter_anthropic-0.1.0rc0 → aidial_adapter_anthropic-0.2.0rc0}/aidial_adapter_anthropic/adapter/_claude/adapter.py

@@ -88,7 +88,7 @@ from aidial_adapter_anthropic.adapter._base import (
 from aidial_adapter_anthropic.adapter._claude.blocks import (
     IMAGE_ATTACHMENT_PROCESSOR,
     PDF_ATTACHMENT_PROCESSOR,
-    TEXT_ATTACHMENT_PROCESSOR,
+    PLAIN_TEXT_ATTACHMENT_PROCESSOR,
     create_text_block,
 )
 from aidial_adapter_anthropic.adapter._claude.citations import create_citations
@@ -210,6 +210,7 @@ async def create_adapter(
     )(model)
 
 
+@dataclass
 class Adapter(ChatCompletionAdapter):
     deployment: str
     storage: Optional[FileStorage]
@@ -227,7 +228,7 @@ class Adapter(ChatCompletionAdapter):
     def attachment_processors(self) -> AttachmentProcessors:
         # Document support: https://docs.anthropic.com/en/docs/build-with-claude/pdf-support#supported-platforms-and-models
         document_processors = (
-            [PDF_ATTACHMENT_PROCESSOR, TEXT_ATTACHMENT_PROCESSOR]
+            [PDF_ATTACHMENT_PROCESSOR, PLAIN_TEXT_ATTACHMENT_PROCESSOR]
             if self.supports_documents
             else []
         )
@@ -426,10 +427,8 @@ class Adapter(ChatCompletionAdapter):
                             case TextBlock(citations=citations):
                                 # The text content is already handled in TextEvent handler.
                                 for citation in citations or []:
-                                    await create_citations(
-                                        consumer,
-                                        request.get_resource,
-                                        citation,
+                                    create_citations(
+                                        consumer, request.get_resource, citation
                                     )
                             case ToolUseBlock():
                                 # Tool Use is processed in ContentBlockStartEvent and InputJsonEvent handlers
@@ -508,7 +507,7 @@ class Adapter(ChatCompletionAdapter):
                 case TextBlock(text=text, citations=citations):
                     consumer.append_content(text)
                     for citation in citations or []:
-                        await create_citations(
+                        create_citations(
                             consumer, request.get_resource, citation
                         )
                 case ToolUseBlock():

{aidial_adapter_anthropic-0.1.0rc0 → aidial_adapter_anthropic-0.2.0rc0}/aidial_adapter_anthropic/adapter/_claude/blocks.py

@@ -50,7 +50,7 @@ def create_text_document_block(
     return RequestDocumentBlockParam(
         source=PlainTextSourceParam(
             data=resource.data.decode("utf-8"),
-            media_type=resource.type,  # type: ignore
+            media_type="text/plain",
             type="text",
         ),
         type="document",
@@ -64,7 +64,7 @@ def create_pdf_document_block(
     return RequestDocumentBlockParam(
         source=Base64PDFSourceParam(
             data=resource.data_base64,
-            media_type=resource.type,  # type: ignore
+            media_type="application/pdf",
             type="base64",
         ),
         type="document",
@@ -106,7 +106,23 @@ PDF_ATTACHMENT_PROCESSOR = AttachmentProcessor(
     handler=create_pdf_document_block,
 )
 
-TEXT_ATTACHMENT_PROCESSOR = AttachmentProcessor(
-    supported_types={"text/plain": {"txt"}},
+PLAIN_TEXT_ATTACHMENT_PROCESSOR = AttachmentProcessor(
+    supported_types={
+        "text/plain": {"txt"},
+        "text/html": {"html", "htm"},
+        "text/css": {"css"},
+        "text/javascript": {"js"},
+        "application/x-javascript": {"js"},
+        "text/x-typescript": {"ts"},
+        "application/x-typescript": {"ts"},
+        "text/csv": {"csv"},
+        "text/markdown": {"md"},
+        "text/x-python": {"py"},
+        "application/x-python-code": {"py"},
+        "application/json": {"json"},
+        "text/xml": {"xml"},
+        "application/rtf": {"rtf"},
+        "text/rtf": {"rtf"},
+    },
     handler=create_text_document_block,
 )

{aidial_adapter_anthropic-0.1.0rc0 → aidial_adapter_anthropic-0.2.0rc0}/aidial_adapter_anthropic/adapter/_claude/citations.py

@@ -21,7 +21,7 @@ from aidial_adapter_anthropic.dial.consumer import Consumer
 from aidial_adapter_anthropic.dial.resource import DialResource
 
 
-async def _add_document_citation(
+def _add_document_citation(
     consumer: Consumer,
     get_document: Callable[[int], DialResource | None],
     document_index: int,
@@ -31,7 +31,7 @@ async def _add_document_citation(
 
     # NOTE: multiple citations to the same document are merged into one citation
     # until we find a better API to handle citations embedded in text.
-    display_index = await consumer.add_citation_attachment(
+    display_index = consumer.add_citation_attachment(
         document_id=document_index, document=document
     )
 
@@ -40,7 +40,7 @@ async def _add_document_citation(
     consumer.append_content(f"[{display_index}]")
 
 
-async def create_citations(
+def create_citations(
     consumer: Consumer,
     get_document: Callable[[int], DialResource | None],
     citation: TextCitation,
@@ -49,7 +49,7 @@ async def create_citations(
         case CitationCharLocation(
             document_index=document_index
         ) | CitationPageLocation(document_index=document_index):
-            await _add_document_citation(consumer, get_document, document_index)
+            _add_document_citation(consumer, get_document, document_index)
 
         # Custom document aren't supported yet
         case CitationContentBlockLocation():

{aidial_adapter_anthropic-0.1.0rc0 → aidial_adapter_anthropic-0.2.0rc0}/aidial_adapter_anthropic/adapter/_claude/config.py

@@ -2,9 +2,11 @@ from typing import List, Literal
 
 from anthropic.types.anthropic_beta_param import AnthropicBetaParam
 from anthropic.types.beta import BetaThinkingConfigParam as ThinkingConfigParam
-from pydantic import Field
+from pydantic import BaseModel, ConfigDict, Field
 
-from aidial_adapter_anthropic._utils.pydantic import ExtraForbidModel
+
+class ExtraForbidModel(BaseModel):
+    model_config = ConfigDict(extra="forbid")
 
 
 class ThinkingConfigEnabled(ExtraForbidModel):

{aidial_adapter_anthropic-0.1.0rc0 → aidial_adapter_anthropic-0.2.0rc0}/aidial_adapter_anthropic/adapter/_claude/state.py

@@ -21,7 +21,7 @@ class MessageState(BaseModel):
     claude_message_content: List[ParsedContentBlock] | List[ContentBlock]
 
     def to_dict(self) -> dict:
-        return self.dict(
+        return self.model_dump(
             # FIXME: a hack to exclude the private __json_buf field
             exclude={"claude_message_content": {"__all__": {"__json_buf"}}},
             # Excluding `citations: null`, since they could not be even parsed
@@ -35,7 +35,7 @@ def get_message_content_from_state(
 ) -> List[ContentBlockParam] | None:
     if (cc := message.custom_content) and (state_dict := cc.state):
         try:
-            state = MessageState.parse_obj(state_dict)
+            state = MessageState.model_validate(state_dict)
             return [block.to_dict() for block in state.claude_message_content]  # type: ignore
         except pydantic.ValidationError as e:
             _log.error(

{aidial_adapter_anthropic-0.1.0rc0 → aidial_adapter_anthropic-0.2.0rc0}/aidial_adapter_anthropic/adapter/_decorator/base.py

@@ -1,3 +1,4 @@
+from dataclasses import dataclass
 from typing import Callable, List
 
 from aidial_sdk.chat_completion import Message
@@ -9,6 +10,7 @@ from aidial_adapter_anthropic.dial.consumer import Consumer
 from aidial_adapter_anthropic.dial.request import ModelParameters
 
 
+@dataclass
 class ChatCompletionDecorator(ChatCompletionAdapter):
     adapter: ChatCompletionAdapter
 

{aidial_adapter_anthropic-0.1.0rc0 → aidial_adapter_anthropic-0.2.0rc0}/aidial_adapter_anthropic/adapter/_decorator/preprocess.py

@@ -1,3 +1,4 @@
+from dataclasses import dataclass
 from typing import Callable, List
 
 from aidial_sdk.chat_completion import Message
@@ -20,6 +21,7 @@ def preprocess_messages_decorator(
     )
 
 
+@dataclass
 class PreprocessMessagesDecorator(ChatCompletionDecorator):
     on_messages: Callable[[List[Message]], ListProjection[Message]]
 

{aidial_adapter_anthropic-0.1.0rc0 → aidial_adapter_anthropic-0.2.0rc0}/aidial_adapter_anthropic/adapter/_decorator/replicator.py

@@ -22,7 +22,7 @@ class ReplicatorDecorator(ChatCompletionDecorator):
         params: ModelParameters,
         messages: List[Message],
     ) -> None:
-        params1 = params.copy()
+        params1 = params.model_copy()
         params1.n = 1
 
         async def _chat(root_consumer: Consumer):

{aidial_adapter_anthropic-0.1.0rc0 → aidial_adapter_anthropic-0.2.0rc0}/aidial_adapter_anthropic/adapter/_truncate_prompt.py

@@ -1,4 +1,5 @@
 from abc import ABC, abstractmethod
+from dataclasses import dataclass
 from typing import Awaitable, Callable, List, Optional, Set, Tuple, TypeVar
 
 from aidial_sdk.exceptions import ContextLengthExceededError
@@ -7,7 +8,6 @@ from aidial_sdk.exceptions import (
     InvalidRequestError,
     TruncatePromptSystemAndLastUserError,
 )
-from pydantic import BaseModel
 
 from aidial_adapter_anthropic._utils.list import (
     omit_by_indices,
@@ -15,7 +15,7 @@ from aidial_adapter_anthropic._utils.list import (
 )
 
 
-class TruncatePromptError(ABC, BaseModel):
+class TruncatePromptError(ABC):
     @abstractmethod
     def to_dial_exception(self) -> DialException:
         pass
@@ -24,6 +24,7 @@ class TruncatePromptError(ABC, BaseModel):
         return self.to_dial_exception().message
 
 
+@dataclass
 class InconsistentLimitsError(TruncatePromptError):
     user_limit: int
     model_limit: int
@@ -35,6 +36,7 @@ class InconsistentLimitsError(TruncatePromptError):
         )
 
 
+@dataclass
 class ModelLimitOverflow(TruncatePromptError):
     model_limit: int
     token_count: int
@@ -43,6 +45,7 @@ class ModelLimitOverflow(TruncatePromptError):
         return ContextLengthExceededError(self.model_limit, self.token_count)
 
 
+@dataclass
 class UserLimitOverflow(TruncatePromptError):
     user_limit: int
     token_count: int

{aidial_adapter_anthropic-0.1.0rc0 → aidial_adapter_anthropic-0.2.0rc0}/aidial_adapter_anthropic/dial/_attachments.py

@@ -50,10 +50,8 @@ class HandlerWithConfig(Protocol, Generic[_T, _Config]):
     def __call__(self, resource: Resource, config: _Config | None) -> _T: ...
 
 
-class AttachmentProcessor(BaseModel, Generic[_T, _Config]):
-    class Config:
-        arbitrary_types_allowed = True
-
+@dataclass
+class AttachmentProcessor(Generic[_T, _Config]):
     supported_types: Dict[str, Set[str]]
     """MIME type to file extensions mapping"""
 
@@ -89,11 +87,12 @@ class WithResources(Generic[_T]):
         return WithResources(payload=payload, resources=resources)
 
 
-class AttachmentProcessors(BaseModel, Generic[_Txt, _T, _Config]):
-    config: _Config | None = None
+@dataclass
+class AttachmentProcessors(Generic[_Txt, _T, _Config]):
     attachment_processors: Sequence[AttachmentProcessor[_T, _Config]]
     text_handler: Callable[[str], _Txt]
     file_storage: FileStorage | None
+    config: _Config | None = field(default=None)
 
     @property
     def supported_types(self) -> Dict[str, Set[str]]:

{aidial_adapter_anthropic-0.1.0rc0 → aidial_adapter_anthropic-0.2.0rc0}/aidial_adapter_anthropic/dial/consumer.py

@@ -57,7 +57,7 @@ class Consumer(ContextManager, ABC):
     def add_attachment(self, attachment: Attachment): ...
 
     @abstractmethod
-    async def add_citation_attachment(
+    def add_citation_attachment(
         self, document_id: int, document: Attachment | None
     ) -> int: ...
 
@@ -169,7 +169,7 @@ class ChoiceConsumer(Consumer):
     def add_attachment(self, attachment: Attachment):
         self.choice.add_attachment(attachment)
 
-    async def add_citation_attachment(
+    def add_citation_attachment(
         self, document_id: int, document: Attachment | None
     ) -> int:
         if document_id in self._citations:
@@ -179,7 +179,7 @@ class ChoiceConsumer(Consumer):
         self._citations[document_id] = (display_index, document)
 
         if document:
-            document = document.copy()
+            document = document.model_copy()
             document.title = f"[{display_index}] {document.title or ''}".strip()
             document.reference_type = document.reference_type or document.type
             document.reference_url = document.reference_url or document.url
@@ -233,63 +233,3 @@ class ChoiceConsumer(Consumer):
     @property
     def has_function_call(self) -> bool:
         return self._choice is not None and self._choice.has_function_call
-
-
-class ConsumerDecorator(Consumer):
-    consumer: Consumer
-
-    def __init__(self, consumer: Consumer):
-        self.consumer = consumer
-
-    def __enter__(self) -> Consumer:
-        return self.consumer.__enter__()
-
-    def __exit__(
-        self,
-        exc_type: type[BaseException] | None,
-        exc: BaseException | None,
-        traceback: TracebackType | None,
-    ) -> bool | None:
-        return self.consumer.__exit__(exc_type, exc, traceback)
-
-    def fork(self) -> Consumer:
-        return self.consumer.fork()
-
-    @property
-    def choice(self) -> Choice:
-        return self.consumer.choice
-
-    def close_content(self, finish_reason: FinishReason | None = None):
-        self.consumer.close_content(finish_reason)
-
-    def append_content(self, content: str):
-        self.consumer.append_content(content)
-
-    def add_attachment(self, attachment: Attachment):
-        self.consumer.add_attachment(attachment)
-
-    async def add_citation_attachment(self, document_id, document):
-        return await self.consumer.add_citation_attachment(
-            document_id, document
-        )
-
-    def add_usage(self, usage: TokenUsage):
-        self.consumer.add_usage(usage)
-
-    def set_discarded_messages(
-        self, discarded_messages: Optional[DiscardedMessages]
-    ):
-        self.consumer.set_discarded_messages(discarded_messages)
-
-    def get_discarded_messages(self) -> Optional[DiscardedMessages]:
-        return self.consumer.get_discarded_messages()
-
-    def create_function_tool_call(self, call: ToolCall) -> ToolUseMessage:
-        return self.consumer.create_function_tool_call(call)
-
-    def create_function_call(self, call: FunctionCall) -> ToolUseMessage:
-        return self.consumer.create_function_call(call)
-
-    @property
-    def has_function_call(self) -> bool:
-        return self.consumer.has_function_call

{aidial_adapter_anthropic-0.1.0rc0 → aidial_adapter_anthropic-0.2.0rc0}/aidial_adapter_anthropic/dial/request.py

@@ -20,7 +20,7 @@ from aidial_sdk.chat_completion.request import (
 )
 from aidial_sdk.exceptions import RequestValidationError
 from pydantic import BaseModel
-from pydantic.v1 import ValidationError as PydanticValidationError
+from pydantic import ValidationError as PydanticValidationError
 
 from aidial_adapter_anthropic.adapter._errors import ValidationError
 from aidial_adapter_anthropic.dial.tools import (
@@ -82,9 +82,6 @@ class ModelParameters(BaseModel):
             configuration=configuration,
         )
 
-    def add_stop_sequences(self, stop: List[str]) -> "ModelParameters":
-        return self.copy(update={"stop": [*self.stop, *stop]})
-
     @property
     def tools_mode(self) -> ToolsMode | None:
         if self.tool_config is not None:
@@ -93,7 +90,7 @@ class ModelParameters(BaseModel):
 
     def parse_configuration(self, cls: Type[_Model]) -> _Model:
         try:
-            return cls.parse_obj(self.configuration or {})
+            return cls.model_validate(self.configuration or {})
         except PydanticValidationError as e:
             if self.configuration is None:
                 msg = "The configuration at path 'custom_fields.configuration' is missing."

{aidial_adapter_anthropic-0.1.0rc0 → aidial_adapter_anthropic-0.2.0rc0}/aidial_adapter_anthropic/dial/resource.py

@@ -4,7 +4,7 @@ from abc import ABC, abstractmethod
 from typing import List
 
 from aidial_sdk.chat_completion import Attachment
-from pydantic import BaseModel, Field, root_validator, validator
+from pydantic import BaseModel, Field, field_validator, model_validator
 
 from aidial_adapter_anthropic._utils.resource import Resource
 from aidial_adapter_anthropic._utils.text import truncate_string
@@ -34,7 +34,7 @@ class UnsupportedContentType(ValidationError):
 
 
 class DialResource(ABC, BaseModel):
-    entity_name: str = Field(default=None)
+    entity_name: str | None = None
     supported_types: List[str] | None = Field(default=None)
 
     @abstractmethod
@@ -77,10 +77,10 @@ class URLResource(DialResource):
     def to_attachment(self) -> Attachment:
         return Attachment(type=self.content_type, url=self.url)
 
-    @root_validator
-    def validator(cls, values):
-        values["entity_name"] = values.get("entity_name") or "URL"
-        return values
+    @model_validator(mode="after")
+    def default_entity_name(self):
+        self.entity_name = self.entity_name or "URL"
+        return self
 
     async def download(self, storage: FileStorage | None) -> Resource:
         type = await self.get_content_type()
@@ -114,10 +114,10 @@ class AttachmentResource(DialResource):
     def to_attachment(self) -> Attachment:
         return self.attachment
 
-    @validator("attachment", pre=True)
+    @field_validator("attachment", mode="before")
     def parse_attachment(cls, value):
         if isinstance(value, dict):
-            attachment = Attachment.parse_obj(value)
+            attachment = Attachment.model_validate(value)
             # Working around the issue of defaulting missing type to a markdown:
             # https://github.com/epam/ai-dial-sdk/blob/2835107e950c89645a2b619fecba2518fa2d7bb1/aidial_sdk/chat_completion/request.py#L22
             if "type" not in value:
@@ -125,10 +125,10 @@ class AttachmentResource(DialResource):
             return attachment
         return value
 
-    @root_validator(pre=True)
-    def validator(cls, values):
-        values["entity_name"] = values.get("entity_name") or "attachment"
-        return values
+    @model_validator(mode="after")
+    def default_entity_name(self):
+        self.entity_name = self.entity_name or "attachment"
+        return self
 
     async def download(self, storage: FileStorage | None) -> Resource:
         type = await self.get_content_type()

{aidial_adapter_anthropic-0.1.0rc0 → aidial_adapter_anthropic-0.2.0rc0}/aidial_adapter_anthropic/dial/storage.py

@@ -3,11 +3,12 @@ import hashlib
 import io
 import logging
 import mimetypes
-from typing import Mapping, Optional, TypedDict
+from typing import Mapping, Optional
 from urllib.parse import unquote, urljoin
 
 import aiohttp
 from pydantic import BaseModel
+from typing_extensions import TypedDict
 
 _log = logging.getLogger(__name__)
 

{aidial_adapter_anthropic-0.1.0rc0 → aidial_adapter_anthropic-0.2.0rc0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "aidial-adapter-anthropic"
-version = "0.1.0rc"
+version = "0.2.0rc"
 description = "Package implementing adapter from DIAL Chat Completions API to Anthropic API"
 authors = [{ name = "EPAM RAIL", email = "SpecialEPM-DIALDevTeam@epam.com" }]
 license = "Apache-2.0"
@@ -11,7 +11,7 @@ requires-python = ">=3.11,<4.0"
 dependencies = [
   "aidial-sdk (>=0.28.0,<1)",
   "anthropic (>=0.75.0,<1)",
-  "pydantic (>=1.10.17,<3)",
+  "pydantic (>=2.8.2,<3)",
   "pillow (>=10.4.0,<11)",
   "aiohttp (>=3.13.3,<4)",
 ]
@@ -47,7 +47,15 @@ addopts = "-n=auto --asyncio-mode=auto --self-contained-html --html=pytest.html
 generate_report_on_test = true
 env_override_existing_values = 1
 testpaths = ["tests"]
-filterwarnings = ["error"]
+filterwarnings = [
+  "error",
+  # "ignore::pydantic.warnings.PydanticDeprecatedSince20",
+  # "ignore::pytest.PytestUnraisableExceptionWarning",
+  # muting warnings coming from opentelemetry and pkg_resources packages
+  # "ignore::DeprecationWarning:opentelemetry.instrumentation.dependencies",
+  # "ignore::DeprecationWarning:pkg_resources",
+
+]
 
 [tool.pyright]
 typeCheckingMode = "basic"

aidial_adapter_anthropic-0.1.0rc0/aidial_adapter_anthropic/_utils/pydantic.py

@@ -1,6 +0,0 @@
-from pydantic import BaseModel
-
-
-class ExtraForbidModel(BaseModel):
-    class Config:
-        extra = "forbid"