SDK regeneration

cohere-ai · Mar 18, 2024 · 372bb05 · 372bb05
1 parent c3314b2
commit 372bb05
Show file tree

Hide file tree

Showing 33 changed files with 607 additions and 177 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -0,0 +1,41 @@
+name: Test SDK
+
+on: [push]
+jobs:
+  compile:
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v3
+      - name: Set up python
+        uses: actions/setup-python@v4
+        with:
+          python-version: 3.8
+      - name: Bootstrap poetry
+        run: |
+          curl -sSL https://install.python-poetry.org | python - -y --version 1.5.1
+      - name: Install dependencies
+        run: poetry install
+      - name: Compile
+        run: poetry run mypy .
+  test:
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v3
+      - name: Set up python
+        uses: actions/setup-python@v4
+        with:
+          python-version: 3.8
+      - name: Bootstrap poetry
+        run: |
+          curl -sSL https://install.python-poetry.org | python - -y --version 1.5.1
+      - name: Install dependencies
+        run: poetry install
+
+      - name: Install Fern
+        run: npm install -g fern-api
+
+      - name: Test
+        run: |
+            poetry run pytest .
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "cohere"
-version = "5.0.0a10"
+version = "5.0.0a11"
 description = ""
 readme = "README.md"
 authors = []
@@ -17,6 +17,16 @@ typing_extensions = ">= 4.0.0"
 [tool.poetry.dev-dependencies]
 mypy = "^1.8.0"
 pytest = "^7.4.0"
+pytest-asyncio = "^0.23.5"
+python-dateutil = "^2.9.0"
+
+[tool.pytest.ini_options]
+testpaths = [ "tests" ]
+asyncio_mode = "auto"
+
+[tool.mypy]
+plugins = ["pydantic.mypy"]
+
 
 [build-system]
 requires = ["poetry-core"]

diff --git a/src/cohere/__init__.py b/src/cohere/__init__.py
@@ -124,7 +124,7 @@
 from .client import AsyncClient, Client
 from .datasets import DatasetsCreateResponse, DatasetsGetResponse, DatasetsGetUsageResponse, DatasetsListResponse
 from .embed_jobs import CreateEmbedJobRequestTruncate
-from .environment import CohereEnvironment
+from .environment import ClientEnvironment
 
 __all__ = [
     "ApiMeta",
@@ -169,7 +169,7 @@
     "ClassifyResponseClassificationsItemClassificationType",
     "ClassifyResponseClassificationsItemLabelsValue",
     "Client",
-    "CohereEnvironment",
+    "ClientEnvironment",
     "CompatibleEndpoint",
     "Connector",
     "ConnectorAuthStatus",

diff --git a/src/cohere/base_client.py b/src/cohere/base_client.py
diff --git a/src/cohere/connectors/client.py b/src/cohere/connectors/client.py
@@ -53,9 +53,9 @@ def list(
 
             - request_options: typing.Optional[RequestOptions]. Request-specific configuration.
         ---
-        from cohere.client import Cohere
+        from cohere.client import Client
 
-        client = Cohere(
+        client = Client(
             client_name="YOUR_CLIENT_NAME",
             token="YOUR_TOKEN",
         )
@@ -140,9 +140,9 @@ def create(
 
             - request_options: typing.Optional[RequestOptions]. Request-specific configuration.
         ---
-        from cohere.client import Cohere
+        from cohere.client import Client
 
-        client = Cohere(
+        client = Client(
             client_name="YOUR_CLIENT_NAME",
             token="YOUR_TOKEN",
         )
@@ -215,9 +215,9 @@ def get(self, id: str, *, request_options: typing.Optional[RequestOptions] = Non
 
             - request_options: typing.Optional[RequestOptions]. Request-specific configuration.
         ---
-        from cohere.client import Cohere
+        from cohere.client import Client
 
-        client = Cohere(
+        client = Client(
             client_name="YOUR_CLIENT_NAME",
             token="YOUR_TOKEN",
         )
@@ -270,9 +270,9 @@ def delete(self, id: str, *, request_options: typing.Optional[RequestOptions] =
 
             - request_options: typing.Optional[RequestOptions]. Request-specific configuration.
         ---
-        from cohere.client import Cohere
+        from cohere.client import Client
 
-        client = Cohere(
+        client = Client(
             client_name="YOUR_CLIENT_NAME",
             token="YOUR_TOKEN",
         )
@@ -353,9 +353,9 @@ def update(
 
             - request_options: typing.Optional[RequestOptions]. Request-specific configuration.
         ---
-        from cohere.client import Cohere
+        from cohere.client import Client
 
-        client = Cohere(
+        client = Client(
             client_name="YOUR_CLIENT_NAME",
             token="YOUR_TOKEN",
         )
@@ -439,9 +439,9 @@ def o_auth_authorize(
 
             - request_options: typing.Optional[RequestOptions]. Request-specific configuration.
         ---
-        from cohere.client import Cohere
+        from cohere.client import Client
 
-        client = Cohere(
+        client = Client(
             client_name="YOUR_CLIENT_NAME",
             token="YOUR_TOKEN",
         )
@@ -521,9 +521,9 @@ async def list(
 
             - request_options: typing.Optional[RequestOptions]. Request-specific configuration.
         ---
-        from cohere.client import AsyncCohere
+        from cohere.client import AsyncClient
 
-        client = AsyncCohere(
+        client = AsyncClient(
             client_name="YOUR_CLIENT_NAME",
             token="YOUR_TOKEN",
         )
@@ -608,9 +608,9 @@ async def create(
 
             - request_options: typing.Optional[RequestOptions]. Request-specific configuration.
         ---
-        from cohere.client import AsyncCohere
+        from cohere.client import AsyncClient
 
-        client = AsyncCohere(
+        client = AsyncClient(
             client_name="YOUR_CLIENT_NAME",
             token="YOUR_TOKEN",
         )
@@ -683,9 +683,9 @@ async def get(self, id: str, *, request_options: typing.Optional[RequestOptions]
 
             - request_options: typing.Optional[RequestOptions]. Request-specific configuration.
         ---
-        from cohere.client import AsyncCohere
+        from cohere.client import AsyncClient
 
-        client = AsyncCohere(
+        client = AsyncClient(
             client_name="YOUR_CLIENT_NAME",
             token="YOUR_TOKEN",
         )
@@ -740,9 +740,9 @@ async def delete(
 
             - request_options: typing.Optional[RequestOptions]. Request-specific configuration.
         ---
-        from cohere.client import AsyncCohere
+        from cohere.client import AsyncClient
 
-        client = AsyncCohere(
+        client = AsyncClient(
             client_name="YOUR_CLIENT_NAME",
             token="YOUR_TOKEN",
         )
@@ -823,9 +823,9 @@ async def update(
 
             - request_options: typing.Optional[RequestOptions]. Request-specific configuration.
         ---
-        from cohere.client import AsyncCohere
+        from cohere.client import AsyncClient
 
-        client = AsyncCohere(
+        client = AsyncClient(
             client_name="YOUR_CLIENT_NAME",
             token="YOUR_TOKEN",
         )
@@ -909,9 +909,9 @@ async def o_auth_authorize(
 
             - request_options: typing.Optional[RequestOptions]. Request-specific configuration.
         ---
-        from cohere.client import AsyncCohere
+        from cohere.client import AsyncClient
 
-        client = AsyncCohere(
+        client = AsyncClient(
             client_name="YOUR_CLIENT_NAME",
             token="YOUR_TOKEN",
         )

diff --git a/src/cohere/core/client_wrapper.py b/src/cohere/core/client_wrapper.py
@@ -23,7 +23,7 @@ def get_headers(self) -> typing.Dict[str, str]:
         headers: typing.Dict[str, str] = {
             "X-Fern-Language": "Python",
             "X-Fern-SDK-Name": "cohere",
-            "X-Fern-SDK-Version": "5.0.0a10",
+            "X-Fern-SDK-Version": "5.0.0a11",
         }
         if self._client_name is not None:
             headers["X-Client-Name"] = self._client_name

diff --git a/src/cohere/core/http_client.py b/src/cohere/core/http_client.py
@@ -5,6 +5,7 @@
 import re
 import time
 import typing
+from contextlib import asynccontextmanager, contextmanager
 from functools import wraps
 from random import random
 
@@ -98,8 +99,10 @@ def request(
         return response
 
     @wraps(httpx.Client.stream)
+    @contextmanager
     def stream(self, *args: typing.Any, max_retries: int = 0, retries: int = 0, **kwargs: typing.Any) -> typing.Any:
-        return self.httpx_client.stream(*args, **kwargs)
+        with self.httpx_client.stream(*args, **kwargs) as stream:
+            yield stream
 
 
 class AsyncHttpClient:
@@ -118,8 +121,10 @@ async def request(
                 return await self.request(max_retries=max_retries, retries=retries + 1, *args, **kwargs)
         return response
 
-    @wraps(httpx.AsyncClient.request)
+    @wraps(httpx.AsyncClient.stream)
+    @asynccontextmanager
     async def stream(
         self, *args: typing.Any, max_retries: int = 0, retries: int = 0, **kwargs: typing.Any
     ) -> typing.Any:
-        return self.httpx_client.stream(*args, **kwargs)
+        async with self.httpx_client.stream(*args, **kwargs) as stream:
+            yield stream
diff --git a/src/cohere/core/jsonable_encoder.py b/src/cohere/core/jsonable_encoder.py
@@ -65,10 +65,10 @@ def jsonable_encoder(obj: Any, custom_encoder: Optional[Dict[Any, Callable[[Any]
         return str(obj)
     if isinstance(obj, (str, int, float, type(None))):
         return obj
-    if isinstance(obj, dt.date):
-        return str(obj)
     if isinstance(obj, dt.datetime):
         return serialize_datetime(obj)
+    if isinstance(obj, dt.date):
+        return str(obj)
     if isinstance(obj, dict):
         encoded_dict = {}
         allowed_keys = set(obj.keys())