Make type hints backwards compatible

includes preparing 2.13 release
Aleph-Alpha · Feb 14, 2023 · 6ba8e38 · 6ba8e38
1 parent b17ea26
commit 6ba8e38
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 6 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.13.0
+
+- Add attention manipulation parameters on character level
+
 ## 2.12.0
 
 - Introduce offline tokenizer

diff --git a/aleph_alpha_client/aleph_alpha_model.py b/aleph_alpha_client/aleph_alpha_model.py
@@ -98,7 +98,7 @@ def from_model_name(
     def complete(self, request: CompletionRequest) -> CompletionResponse:
         """
         Examples:
-            >>> prompt = Prompt(["Provide a short description of AI:"])
+            >>> prompt = Prompt.from_text("Provide a short description of AI:")
             >>> request = CompletionRequest(prompt=prompt, maximum_tokens=20)
             >>> result = model.complete(request)
         """

diff --git a/aleph_alpha_client/prompt.py b/aleph_alpha_client/prompt.py
@@ -121,7 +121,7 @@ def from_text(text: str) -> "Text":
         return Text(text, [])
 
 
-PromptItem = Union[Text, Tokens, Image]
+PromptItem = Union[Text, Tokens, Image, str, Sequence[int]]
 
 
 class Prompt(NamedTuple):
@@ -130,7 +130,7 @@ class Prompt(NamedTuple):
         >>> prompt = Prompt.from_text("Provide a short description of AI:")
         >>> prompt = Prompt([
                 Image.from_url(url),
-                "Provide a short description of AI:",
+                Text.from_text("Provide a short description of AI:"),
             ])
     """
 

diff --git a/aleph_alpha_client/version.py b/aleph_alpha_client/version.py
@@ -1 +1 @@
-__version__ = "2.12.0"
+__version__ = "2.13.0"
diff --git a/tests/test_complete.py b/tests/test_complete.py
@@ -2,7 +2,7 @@
 from aleph_alpha_client.aleph_alpha_client import AlephAlphaClient, AsyncClient, Client
 from aleph_alpha_client.aleph_alpha_model import AlephAlphaModel
 from aleph_alpha_client.completion import CompletionRequest
-from aleph_alpha_client.prompt import Prompt
+from aleph_alpha_client.prompt import Prompt, Text, TextControl
 
 from tests.common import (
     client,
@@ -36,7 +36,14 @@ async def test_can_complete_with_async_client(
 @pytest.mark.system_test
 def test_complete(sync_client: Client, model_name: str):
     request = CompletionRequest(
-        prompt=Prompt.from_text(""),
+        prompt=Prompt(
+            [
+                Text(
+                    "Hello, World!",
+                    controls=[TextControl(start=1, length=5, factor=0.5)],
+                )
+            ]
+        ),
         maximum_tokens=7,
         tokens=False,
         log_probs=0,