Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: max_retries typing #1135

Merged
merged 5 commits into from
Nov 8, 2024
Merged

fix: max_retries typing #1135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fce914c
feat: fix `max_retries` typing
jordyjwilliams Oct 30, 2024
9b5f8e2
Merge branch 'main' into chore-000_fix_type_issue_max_retries
ivanleomk Nov 8, 2024
24d910e
fix: modified type hints
ivanleomk Nov 8, 2024
16abe4f
fix: updating types so that they're async and sync specific
ivanleomk Nov 8, 2024
4d3bd38
fix: reverted the type:ignore
ivanleomk Nov 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 22 additions & 18 deletions instructor/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@
Literal,
Any,
)
from tenacity import (
AsyncRetrying,
Retrying,
)
from collections.abc import Generator, Iterable, Awaitable, AsyncGenerator
from typing_extensions import Self
from pydantic import BaseModel
Expand Down Expand Up @@ -114,7 +118,7 @@ def create(
self: AsyncInstructor,
response_model: type[T],
messages: list[ChatCompletionMessageParam],
max_retries: int = 3,
max_retries: int | AsyncRetrying = 3,
validation_context: dict[str, Any] | None = None,
context: dict[str, Any] | None = None, # {{ edit_1 }}
strict: bool = True,
Expand All @@ -126,7 +130,7 @@ def create(
self: Self,
response_model: type[T],
messages: list[ChatCompletionMessageParam],
max_retries: int = 3,
max_retries: int | Retrying = 3,
validation_context: dict[str, Any] | None = None,
context: dict[str, Any] | None = None, # {{ edit_1 }}
strict: bool = True,
Expand All @@ -138,7 +142,7 @@ def create(
self: AsyncInstructor,
response_model: None,
messages: list[ChatCompletionMessageParam],
max_retries: int = 3,
max_retries: int | AsyncRetrying = 3,
validation_context: dict[str, Any] | None = None,
context: dict[str, Any] | None = None, # {{ edit_1 }}
strict: bool = True,
Expand All @@ -150,7 +154,7 @@ def create(
self: Self,
response_model: None,
messages: list[ChatCompletionMessageParam],
max_retries: int = 3,
max_retries: int | Retrying = 3,
validation_context: dict[str, Any] | None = None,
context: dict[str, Any] | None = None, # {{ edit_1 }}
strict: bool = True,
Expand All @@ -161,7 +165,7 @@ def create(
self,
response_model: type[T] | None,
messages: list[ChatCompletionMessageParam],
max_retries: int = 3,
max_retries: int | Retrying | AsyncRetrying = 3,
validation_context: dict[str, Any] | None = None,
context: dict[str, Any] | None = None,
strict: bool = True,
Expand All @@ -185,7 +189,7 @@ def create_partial(
self: AsyncInstructor,
response_model: type[T],
messages: list[ChatCompletionMessageParam],
max_retries: int = 3,
max_retries: int | AsyncRetrying = 3,
validation_context: dict[str, Any] | None = None,
context: dict[str, Any] | None = None, # {{ edit_1 }}
strict: bool = True,
Expand All @@ -197,7 +201,7 @@ def create_partial(
self: Self,
response_model: type[T],
messages: list[ChatCompletionMessageParam],
max_retries: int = 3,
max_retries: int | Retrying = 3,
validation_context: dict[str, Any] | None = None, # Deprecate in 2.0
context: dict[str, Any] | None = None,
strict: bool = True,
Expand All @@ -208,7 +212,7 @@ def create_partial(
self,
response_model: type[T],
messages: list[ChatCompletionMessageParam],
max_retries: int = 3,
max_retries: int | Retrying | AsyncRetrying = 3,
validation_context: dict[str, Any] | None = None, # Deprecate in 2.0
context: dict[str, Any] | None = None,
strict: bool = True,
Expand All @@ -235,7 +239,7 @@ def create_iterable(
self: AsyncInstructor,
messages: list[ChatCompletionMessageParam],
response_model: type[T],
max_retries: int = 3,
max_retries: int | AsyncRetrying = 3,
validation_context: dict[str, Any] | None = None, # Deprecate in 2.0
context: dict[str, Any] | None = None,
strict: bool = True,
Expand All @@ -247,7 +251,7 @@ def create_iterable(
self: Self,
messages: list[ChatCompletionMessageParam],
response_model: type[T],
max_retries: int = 3,
max_retries: int | Retrying = 3,
validation_context: dict[str, Any] | None = None, # Deprecate in 2.0
context: dict[str, Any] | None = None,
strict: bool = True,
Expand All @@ -258,7 +262,7 @@ def create_iterable(
self,
messages: list[ChatCompletionMessageParam],
response_model: type[T],
max_retries: int = 3,
max_retries: int | Retrying | AsyncRetrying = 3,
validation_context: dict[str, Any] | None = None, # Deprecate in 2.0
context: dict[str, Any] | None = None,
strict: bool = True,
Expand All @@ -284,7 +288,7 @@ def create_with_completion(
self: AsyncInstructor,
messages: list[ChatCompletionMessageParam],
response_model: type[T],
max_retries: int = 3,
max_retries: int | AsyncRetrying = 3,
validation_context: dict[str, Any] | None = None, # Deprecate in 2.0
context: dict[str, Any] | None = None,
strict: bool = True,
Expand All @@ -296,7 +300,7 @@ def create_with_completion(
self: Self,
messages: list[ChatCompletionMessageParam],
response_model: type[T],
max_retries: int = 3,
max_retries: int | Retrying = 3,
validation_context: dict[str, Any] | None = None, # Deprecate in 2.0
context: dict[str, Any] | None = None,
strict: bool = True,
Expand All @@ -307,7 +311,7 @@ def create_with_completion(
self,
messages: list[ChatCompletionMessageParam],
response_model: type[T],
max_retries: int = 3,
max_retries: int | Retrying | AsyncRetrying = 3,
validation_context: dict[str, Any] | None = None, # Deprecate in 2.0
context: dict[str, Any] | None = None,
strict: bool = True,
Expand Down Expand Up @@ -373,7 +377,7 @@ async def create(
self,
response_model: type[T] | None,
messages: list[ChatCompletionMessageParam],
max_retries: int = 3,
max_retries: int | AsyncRetrying = 3,
validation_context: dict[str, Any] | None = None, # Deprecate in 2.0
context: dict[str, Any] | None = None,
strict: bool = True,
Expand All @@ -395,7 +399,7 @@ async def create_partial(
self,
response_model: type[T],
messages: list[ChatCompletionMessageParam],
max_retries: int = 3,
max_retries: int | AsyncRetrying = 3,
validation_context: dict[str, Any] | None = None, # Deprecate in 2.0
context: dict[str, Any] | None = None,
strict: bool = True,
Expand All @@ -419,7 +423,7 @@ async def create_iterable(
self,
messages: list[ChatCompletionMessageParam],
response_model: type[T],
max_retries: int = 3,
max_retries: int | AsyncRetrying = 3,
validation_context: dict[str, Any] | None = None, # Deprecate in 2.0
context: dict[str, Any] | None = None,
strict: bool = True,
Expand All @@ -443,7 +447,7 @@ async def create_with_completion(
self,
messages: list[ChatCompletionMessageParam],
response_model: type[T],
max_retries: int = 3,
max_retries: int | AsyncRetrying = 3,
validation_context: dict[str, Any] | None = None, # Deprecate in 2.0
context: dict[str, Any] | None = None,
strict: bool = True,
Expand Down
10 changes: 7 additions & 3 deletions instructor/dsl/partial.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,9 @@ def model_from_chunks(
partial_model = cls.get_partial_model()
for chunk in json_chunks:
potential_object += chunk
obj = from_json((potential_object.strip() or "{}").encode(), partial_mode="on")
obj = from_json(
(potential_object.strip() or "{}").encode(), partial_mode="on"
)
obj = partial_model.model_validate(obj, strict=None, **kwargs)
yield obj

Expand All @@ -141,7 +143,9 @@ async def model_from_chunks_async(
partial_model = cls.get_partial_model()
async for chunk in json_chunks:
potential_object += chunk
obj = from_json((potential_object.strip() or "{}").encode(), partial_mode="on")
obj = from_json(
(potential_object.strip() or "{}").encode(), partial_mode="on"
)
obj = partial_model.model_validate(obj, strict=None, **kwargs)
yield obj

Expand All @@ -163,7 +167,7 @@ def extract_json(
import json

resp = chunk.candidates[0].content.parts[0].function_call
resp_dict = type(resp).to_dict(resp) # type:ignore
resp_dict = type(resp).to_dict(resp) # type:ignore
if "args" in resp_dict:
yield json.dumps(resp_dict["args"])
elif chunk.choices:
Expand Down
13 changes: 9 additions & 4 deletions instructor/patch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@
from instructor.mode import Mode
import logging

from tenacity import (
AsyncRetrying,
Retrying,
)

logger = logging.getLogger("instructor")

T_Model = TypeVar("T_Model", bound=BaseModel)
Expand All @@ -35,7 +40,7 @@ def __call__(
response_model: type[T_Model] | None = None,
validation_context: dict[str, Any] | None = None, # Deprecate in 2.0
context: dict[str, Any] | None = None,
max_retries: int = 1,
max_retries: int | Retrying = 1,
*args: Any,
**kwargs: Any,
) -> T_Model: ...
Expand All @@ -47,7 +52,7 @@ async def __call__(
response_model: type[T_Model] | None = None,
validation_context: dict[str, Any] | None = None, # Deprecate in 2.0
context: dict[str, Any] | None = None,
max_retries: int = 1,
max_retries: int | AsyncRetrying = 1,
*args: Any,
**kwargs: Any,
) -> T_Model: ...
Expand Down Expand Up @@ -140,7 +145,7 @@ async def new_create_async(
response_model: type[T_Model] | None = None,
validation_context: dict[str, Any] | None = None,
context: dict[str, Any] | None = None,
max_retries: int = 1,
max_retries: int | AsyncRetrying = 1,
strict: bool = True,
hooks: Hooks | None = None,
*args: T_ParamSpec.args,
Expand Down Expand Up @@ -171,7 +176,7 @@ def new_create_sync(
response_model: type[T_Model] | None = None,
validation_context: dict[str, Any] | None = None,
context: dict[str, Any] | None = None,
max_retries: int = 1,
max_retries: int | Retrying = 1,
strict: bool = True,
hooks: Hooks | None = None,
*args: T_ParamSpec.args,
Expand Down
Loading