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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: aidial-adapter-anthropic
-Version: 0.1.0
+Version: 0.1.0rc0
 Summary: Package implementing adapter from DIAL Chat Completions API to Anthropic API
 License: Apache-2.0
 Keywords: ai

{aidial_adapter_anthropic-0.1.0 → aidial_adapter_anthropic-0.1.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,
-    PLAIN_TEXT_ATTACHMENT_PROCESSOR,
+    TEXT_ATTACHMENT_PROCESSOR,
     create_text_block,
 )
 from aidial_adapter_anthropic.adapter._claude.citations import create_citations
@@ -227,7 +227,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, PLAIN_TEXT_ATTACHMENT_PROCESSOR]
+            [PDF_ATTACHMENT_PROCESSOR, TEXT_ATTACHMENT_PROCESSOR]
             if self.supports_documents
             else []
         )
@@ -426,8 +426,10 @@ class Adapter(ChatCompletionAdapter):
                             case TextBlock(citations=citations):
                                 # The text content is already handled in TextEvent handler.
                                 for citation in citations or []:
-                                    create_citations(
-                                        consumer, request.get_resource, citation
+                                    await create_citations(
+                                        consumer,
+                                        request.get_resource,
+                                        citation,
                                     )
                             case ToolUseBlock():
                                 # Tool Use is processed in ContentBlockStartEvent and InputJsonEvent handlers
@@ -506,7 +508,7 @@ class Adapter(ChatCompletionAdapter):
                 case TextBlock(text=text, citations=citations):
                     consumer.append_content(text)
                     for citation in citations or []:
-                        create_citations(
+                        await create_citations(
                             consumer, request.get_resource, citation
                         )
                 case ToolUseBlock():

{aidial_adapter_anthropic-0.1.0 → aidial_adapter_anthropic-0.1.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="text/plain",
+            media_type=resource.type,  # type: ignore
             type="text",
         ),
         type="document",
@@ -64,7 +64,7 @@ def create_pdf_document_block(
     return RequestDocumentBlockParam(
         source=Base64PDFSourceParam(
             data=resource.data_base64,
-            media_type="application/pdf",
+            media_type=resource.type,  # type: ignore
             type="base64",
         ),
         type="document",
@@ -106,23 +106,7 @@ PDF_ATTACHMENT_PROCESSOR = AttachmentProcessor(
     handler=create_pdf_document_block,
 )
 
-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"},
-    },
+TEXT_ATTACHMENT_PROCESSOR = AttachmentProcessor(
+    supported_types={"text/plain": {"txt"}},
     handler=create_text_document_block,
 )

{aidial_adapter_anthropic-0.1.0 → aidial_adapter_anthropic-0.1.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
 
 
-def _add_document_citation(
+async def _add_document_citation(
     consumer: Consumer,
     get_document: Callable[[int], DialResource | None],
     document_index: int,
@@ -31,7 +31,7 @@ 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 = consumer.add_citation_attachment(
+    display_index = await consumer.add_citation_attachment(
         document_id=document_index, document=document
     )
 
@@ -40,7 +40,7 @@ def _add_document_citation(
     consumer.append_content(f"[{display_index}]")
 
 
-def create_citations(
+async def create_citations(
     consumer: Consumer,
     get_document: Callable[[int], DialResource | None],
     citation: TextCitation,
@@ -49,7 +49,7 @@ def create_citations(
         case CitationCharLocation(
             document_index=document_index
         ) | CitationPageLocation(document_index=document_index):
-            _add_document_citation(consumer, get_document, document_index)
+            await _add_document_citation(consumer, get_document, document_index)
 
         # Custom document aren't supported yet
         case CitationContentBlockLocation():

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

@@ -57,7 +57,7 @@ class Consumer(ContextManager, ABC):
     def add_attachment(self, attachment: Attachment): ...
 
     @abstractmethod
-    def add_citation_attachment(
+    async 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)
 
-    def add_citation_attachment(
+    async def add_citation_attachment(
         self, document_id: int, document: Attachment | None
     ) -> int:
         if document_id in self._citations:
@@ -233,3 +233,63 @@ 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.0 → aidial_adapter_anthropic-0.1.0rc0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "aidial-adapter-anthropic"
-version = "0.1.0"
+version = "0.1.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"