Merge pull request #117 from writer/release-please--branches--main--changes--next

ramedina86 · web-flow · commit f1b91edf7735 · 2024-11-20T11:14:00.000+01:00
release: 1.4.0
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "1.3.0"
+  ".": "1.4.0"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,19 @@
 # Changelog
 
+## 1.4.0 (2024-11-20)
+
+Full Changelog: [v1.3.0...v1.4.0](https://github.com/writer/writer-python/compare/v1.3.0...v1.4.0)
+
+### Features
+
+* **api:** default timeout increase to 3 min ([#119](https://github.com/writer/writer-python/issues/119)) ([f263e59](https://github.com/writer/writer-python/commit/f263e598c17328185c43247c34fa87aca3d9a1ce))
+
+
+### Chores
+
+* rebuild project due to codegen change ([#116](https://github.com/writer/writer-python/issues/116)) ([66d114e](https://github.com/writer/writer-python/commit/66d114e2307f1e1bbcd70052a037e1ba1c5fd7d2))
+* rebuild project due to codegen change ([#118](https://github.com/writer/writer-python/issues/118)) ([c527530](https://github.com/writer/writer-python/commit/c5275300b56cc724795748bfbd9811904fa2e170))
+
 ## 1.3.0 (2024-11-12)
 
 Full Changelog: [v1.2.0...v1.3.0](https://github.com/writer/writer-python/compare/v1.2.0...v1.3.0)
diff --git a/README.md b/README.md
@@ -248,15 +248,15 @@ client.with_options(max_retries=5).chat.chat(
 
 ### Timeouts
 
-By default requests time out after 1 minute. You can configure this with a `timeout` option,
+By default requests time out after 3 minutes. You can configure this with a `timeout` option,
 which accepts a float or an [`httpx.Timeout`](https://www.python-httpx.org/advanced/#fine-tuning-the-configuration) object:
 
 ```python
 from writerai import Writer
 
 # Configure the default for all requests:
 client = Writer(
-    # 20 seconds (default is 1 minute)
+    # 20 seconds (default is 3 minutes)
     timeout=20.0,
 )
 
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "writer-sdk"
-version = "1.3.0"
+version = "1.4.0"
 description = "The official Python library for the writer API"
 dynamic = ["readme"]
 license = "Apache-2.0"
@@ -55,6 +55,7 @@ dev-dependencies = [
     "dirty-equals>=0.6.0",
     "importlib-metadata>=6.7.0",
     "rich>=13.7.1",
+    "nest_asyncio==1.6.0"
 ]
 
 [tool.rye.scripts]
diff --git a/requirements-dev.lock b/requirements-dev.lock
@@ -52,6 +52,7 @@ mdurl==0.1.2
 mypy==1.13.0
 mypy-extensions==1.0.0
     # via mypy
+nest-asyncio==1.6.0
 nodeenv==1.8.0
     # via pyright
 nox==2023.4.22
diff --git a/src/writerai/_constants.py b/src/writerai/_constants.py
@@ -5,8 +5,8 @@
 RAW_RESPONSE_HEADER = "X-Stainless-Raw-Response"
 OVERRIDE_CAST_TO_HEADER = "____stainless_override_cast_to"
 
-# default timeout is 1 minute
-DEFAULT_TIMEOUT = httpx.Timeout(timeout=60.0, connect=5.0)
+# default timeout is 3 minutes
+DEFAULT_TIMEOUT = httpx.Timeout(timeout=180.0, connect=5.0)
 DEFAULT_MAX_RETRIES = 2
 DEFAULT_CONNECTION_LIMITS = httpx.Limits(max_connections=100, max_keepalive_connections=20)
 
diff --git a/src/writerai/_utils/_sync.py b/src/writerai/_utils/_sync.py
@@ -1,56 +1,62 @@
 from __future__ import annotations
 
+import sys
+import asyncio
 import functools
-from typing import TypeVar, Callable, Awaitable
+import contextvars
+from typing import Any, TypeVar, Callable, Awaitable
 from typing_extensions import ParamSpec
 
-import anyio
-import anyio.to_thread
-
-from ._reflection import function_has_argument
-
 T_Retval = TypeVar("T_Retval")
 T_ParamSpec = ParamSpec("T_ParamSpec")
 
 
-# copied from `asyncer`, https://github.com/tiangolo/asyncer
-def asyncify(
-    function: Callable[T_ParamSpec, T_Retval],
-    *,
-    cancellable: bool = False,
-    limiter: anyio.CapacityLimiter | None = None,
-) -> Callable[T_ParamSpec, Awaitable[T_Retval]]:
+if sys.version_info >= (3, 9):
+    to_thread = asyncio.to_thread
+else:
+    # backport of https://docs.python.org/3/library/asyncio-task.html#asyncio.to_thread
+    # for Python 3.8 support
+    async def to_thread(
+        func: Callable[T_ParamSpec, T_Retval], /, *args: T_ParamSpec.args, **kwargs: T_ParamSpec.kwargs
+    ) -> Any:
+        """Asynchronously run function *func* in a separate thread.
+
+        Any *args and **kwargs supplied for this function are directly passed
+        to *func*. Also, the current :class:`contextvars.Context` is propagated,
+        allowing context variables from the main thread to be accessed in the
+        separate thread.
+
+        Returns a coroutine that can be awaited to get the eventual result of *func*.
+        """
+        loop = asyncio.events.get_running_loop()
+        ctx = contextvars.copy_context()
+        func_call = functools.partial(ctx.run, func, *args, **kwargs)
+        return await loop.run_in_executor(None, func_call)
+
+
+# inspired by `asyncer`, https://github.com/tiangolo/asyncer
+def asyncify(function: Callable[T_ParamSpec, T_Retval]) -> Callable[T_ParamSpec, Awaitable[T_Retval]]:
     """
     Take a blocking function and create an async one that receives the same
-    positional and keyword arguments, and that when called, calls the original function
-    in a worker thread using `anyio.to_thread.run_sync()`. Internally,
-    `asyncer.asyncify()` uses the same `anyio.to_thread.run_sync()`, but it supports
-    keyword arguments additional to positional arguments and it adds better support for
-    autocompletion and inline errors for the arguments of the function called and the
-    return value.
-
-    If the `cancellable` option is enabled and the task waiting for its completion is
-    cancelled, the thread will still run its course but its return value (or any raised
-    exception) will be ignored.
+    positional and keyword arguments. For python version 3.9 and above, it uses
+    asyncio.to_thread to run the function in a separate thread. For python version
+    3.8, it uses locally defined copy of the asyncio.to_thread function which was
+    introduced in python 3.9.
 
-    Use it like this:
+    Usage:
 
-    ```Python
-    def do_work(arg1, arg2, kwarg1="", kwarg2="") -> str:
-        # Do work
-        return "Some result"
+    ```python
+    def blocking_func(arg1, arg2, kwarg1=None):
+        # blocking code
+        return result
 
 
-    result = await to_thread.asyncify(do_work)("spam", "ham", kwarg1="a", kwarg2="b")
-    print(result)
+    result = asyncify(blocking_function)(arg1, arg2, kwarg1=value1)
     ```
 
     ## Arguments
 
     `function`: a blocking regular callable (e.g. a function)
-    `cancellable`: `True` to allow cancellation of the operation
-    `limiter`: capacity limiter to use to limit the total amount of threads running
-        (if omitted, the default limiter is used)
 
     ## Return
 
@@ -60,22 +66,6 @@ def do_work(arg1, arg2, kwarg1="", kwarg2="") -> str:
     """
 
     async def wrapper(*args: T_ParamSpec.args, **kwargs: T_ParamSpec.kwargs) -> T_Retval:
-        partial_f = functools.partial(function, *args, **kwargs)
-
-        # In `v4.1.0` anyio added the `abandon_on_cancel` argument and deprecated the old
-        # `cancellable` argument, so we need to use the new `abandon_on_cancel` to avoid
-        # surfacing deprecation warnings.
-        if function_has_argument(anyio.to_thread.run_sync, "abandon_on_cancel"):
-            return await anyio.to_thread.run_sync(
-                partial_f,
-                abandon_on_cancel=cancellable,
-                limiter=limiter,
-            )
-
-        return await anyio.to_thread.run_sync(
-            partial_f,
-            cancellable=cancellable,
-            limiter=limiter,
-        )
+        return await to_thread(function, *args, **kwargs)
 
     return wrapper
diff --git a/src/writerai/_version.py b/src/writerai/_version.py
@@ -1,4 +1,4 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 __title__ = "writerai"
-__version__ = "1.3.0"  # x-release-please-version
+__version__ = "1.4.0"  # x-release-please-version
diff --git a/tests/api_resources/test_applications.py b/tests/api_resources/test_applications.py
@@ -24,16 +24,8 @@ def test_method_generate_content(self, client: Writer) -> None:
             inputs=[
                 {
                     "id": "id",
-                    "value": ["string", "string", "string"],
-                },
-                {
-                    "id": "id",
-                    "value": ["string", "string", "string"],
-                },
-                {
-                    "id": "id",
-                    "value": ["string", "string", "string"],
-                },
+                    "value": ["string"],
+                }
             ],
         )
         assert_matches_type(ApplicationGenerateContentResponse, application, path=["response"])
@@ -45,16 +37,8 @@ def test_raw_response_generate_content(self, client: Writer) -> None:
             inputs=[
                 {
                     "id": "id",
-                    "value": ["string", "string", "string"],
-                },
-                {
-                    "id": "id",
-                    "value": ["string", "string", "string"],
-                },
-                {
-                    "id": "id",
-                    "value": ["string", "string", "string"],
-                },
+                    "value": ["string"],
+                }
             ],
         )
 
@@ -70,16 +54,8 @@ def test_streaming_response_generate_content(self, client: Writer) -> None:
             inputs=[
                 {
                     "id": "id",
-                    "value": ["string", "string", "string"],
-                },
-                {
-                    "id": "id",
-                    "value": ["string", "string", "string"],
-                },
-                {
-                    "id": "id",
-                    "value": ["string", "string", "string"],
-                },
+                    "value": ["string"],
+                }
             ],
         ) as response:
             assert not response.is_closed
@@ -98,16 +74,8 @@ def test_path_params_generate_content(self, client: Writer) -> None:
                 inputs=[
                     {
                         "id": "id",
-                        "value": ["string", "string", "string"],
-                    },
-                    {
-                        "id": "id",
-                        "value": ["string", "string", "string"],
-                    },
-                    {
-                        "id": "id",
-                        "value": ["string", "string", "string"],
-                    },
+                        "value": ["string"],
+                    }
                 ],
             )
 
@@ -122,16 +90,8 @@ async def test_method_generate_content(self, async_client: AsyncWriter) -> None:
             inputs=[
                 {
                     "id": "id",
-                    "value": ["string", "string", "string"],
-                },
-                {
-                    "id": "id",
-                    "value": ["string", "string", "string"],
-                },
-                {
-                    "id": "id",
-                    "value": ["string", "string", "string"],
-                },
+                    "value": ["string"],
+                }
             ],
         )
         assert_matches_type(ApplicationGenerateContentResponse, application, path=["response"])
@@ -143,16 +103,8 @@ async def test_raw_response_generate_content(self, async_client: AsyncWriter) ->
             inputs=[
                 {
                     "id": "id",
-                    "value": ["string", "string", "string"],
-                },
-                {
-                    "id": "id",
-                    "value": ["string", "string", "string"],
-                },
-                {
-                    "id": "id",
-                    "value": ["string", "string", "string"],
-                },
+                    "value": ["string"],
+                }
             ],
         )
 
@@ -168,16 +120,8 @@ async def test_streaming_response_generate_content(self, async_client: AsyncWrit
             inputs=[
                 {
                     "id": "id",
-                    "value": ["string", "string", "string"],
-                },
-                {
-                    "id": "id",
-                    "value": ["string", "string", "string"],
-                },
-                {
-                    "id": "id",
-                    "value": ["string", "string", "string"],
-                },
+                    "value": ["string"],
+                }
             ],
         ) as response:
             assert not response.is_closed
@@ -196,15 +140,7 @@ async def test_path_params_generate_content(self, async_client: AsyncWriter) ->
                 inputs=[
                     {
                         "id": "id",
-                        "value": ["string", "string", "string"],
-                    },
-                    {
-                        "id": "id",
-                        "value": ["string", "string", "string"],
-                    },
-                    {
-                        "id": "id",
-                        "value": ["string", "string", "string"],
-                    },
+                        "value": ["string"],
+                    }
                 ],
             )
diff --git a/tests/api_resources/test_chat.py b/tests/api_resources/test_chat.py
diff --git a/tests/api_resources/test_files.py b/tests/api_resources/test_files.py
diff --git a/tests/test_client.py b/tests/test_client.py

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`{`
`2`		`- ".": "1.3.0"`
	`2`	`+ ".": "1.4.0"`
`3`	`3`	`}`