github/langchain
1
0
Fork 0
mirror of https://github.com/hwchase17/langchain.git synced 2025-09-09 06:53:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

infra: update mypy 1.10, ruff 0.5 (#23721)

Browse Source 
```python
"""python scripts/update_mypy_ruff.py"""
import glob
import tomllib
from pathlib import Path

import toml
import subprocess
import re

ROOT_DIR = Path(__file__).parents[1]


def main():
    for path in glob.glob(str(ROOT_DIR / "libs/**/pyproject.toml"), recursive=True):
        print(path)
        with open(path, "rb") as f:
            pyproject = tomllib.load(f)
        try:
            pyproject["tool"]["poetry"]["group"]["typing"]["dependencies"]["mypy"] = (
                "^1.10"
            )
            pyproject["tool"]["poetry"]["group"]["lint"]["dependencies"]["ruff"] = (
                "^0.5"
            )
        except KeyError:
            continue
        with open(path, "w") as f:
            toml.dump(pyproject, f)
        cwd = "/".join(path.split("/")[:-1])
        completed = subprocess.run(
            "poetry lock --no-update; poetry install --with typing; poetry run mypy . --no-color",
            cwd=cwd,
            shell=True,
            capture_output=True,
            text=True,
        )
        logs = completed.stdout.split("\n")

        to_ignore = {}
        for l in logs:
            if re.match("^(.*)\:(\d+)\: error:.*\[(.*)\]", l):
                path, line_no, error_type = re.match(
                    "^(.*)\:(\d+)\: error:.*\[(.*)\]", l
                ).groups()
                if (path, line_no) in to_ignore:
                    to_ignore[(path, line_no)].append(error_type)
                else:
                    to_ignore[(path, line_no)] = [error_type]
        print(len(to_ignore))
        for (error_path, line_no), error_types in to_ignore.items():
            all_errors = ", ".join(error_types)
            full_path = f"{cwd}/{error_path}"
            try:
                with open(full_path, "r") as f:
                    file_lines = f.readlines()
            except FileNotFoundError:
                continue
            file_lines[int(line_no) - 1] = (
                file_lines[int(line_no) - 1][:-1] + f"  # type: ignore[{all_errors}]\n"
            )
            with open(full_path, "w") as f:
                f.write("".join(file_lines))

        subprocess.run(
            "poetry run ruff format .; poetry run ruff --select I --fix .",
            cwd=cwd,
            shell=True,
            capture_output=True,
            text=True,
        )


if __name__ == "__main__":
    main()

```
This commit is contained in:
Bagatur
2024-07-03 13:33:27 -04:00
committed by GitHub
parent 6cd56821dc
commit a0c2281540
915 changed files with 4759 additions and 4047 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libs/partners/openai/langchain_openai/chat_models/azure.py
View File

@@ -664,8 +664,7 @@ class AzureChatOpenAI(BaseChatOpenAI):
method: Literal["function_calling", "json_mode"] = "function_calling",
include_raw: Literal[True] = True,
**kwargs: Any,
) -> Runnable[LanguageModelInput, _AllReturnType]:
...
) -> Runnable[LanguageModelInput, _AllReturnType]: ...
@overload
def with_structured_output(
@@ -675,8 +674,7 @@ class AzureChatOpenAI(BaseChatOpenAI):
method: Literal["function_calling", "json_mode"] = "function_calling",
include_raw: Literal[False] = False,
**kwargs: Any,
) -> Runnable[LanguageModelInput, _DictOrPydantic]:
...
) -> Runnable[LanguageModelInput, _DictOrPydantic]: ...
def with_structured_output(
self,
@@ -868,7 +866,8 @@ class AzureChatOpenAI(BaseChatOpenAI):
llm = self.bind_tools([schema], tool_choice=tool_name)
if is_pydantic_schema:
output_parser: OutputParserLike = PydanticToolsParser(
tools=[schema], first_tool_only=True
tools=[schema], # type: ignore[list-item]
first_tool_only=True, # type: ignore[list-item]
)
else:
output_parser = JsonOutputKeyToolsParser(
@@ -877,7 +876,7 @@ class AzureChatOpenAI(BaseChatOpenAI):
elif method == "json_mode":
llm = self.bind(response_format={"type": "json_object"})
output_parser = (
PydanticOutputParser(pydantic_object=schema)
PydanticOutputParser(pydantic_object=schema) # type: ignore[arg-type]
if is_pydantic_schema
else JsonOutputParser()
)

19
libs/partners/openai/langchain_openai/chat_models/base.py
View File

@@ -147,7 +147,7 @@ def _convert_dict_to_message(_dict: Mapping[str, Any]) -> BaseMessage:
id=id_,
)
else:
return ChatMessage(content=_dict.get("content", ""), role=role, id=id_)
return ChatMessage(content=_dict.get("content", ""), role=role, id=id_) # type: ignore[arg-type]
def _format_message_content(content: Any) -> Any:
@@ -261,7 +261,7 @@ def _convert_delta_to_message_chunk(
content=content,
additional_kwargs=additional_kwargs,
id=id_,
tool_call_chunks=tool_call_chunks,
tool_call_chunks=tool_call_chunks, # type: ignore[arg-type]
)
elif role == "system" or default_class == SystemMessageChunk:
return SystemMessageChunk(content=content, id=id_)
@@ -496,7 +496,7 @@ class BaseChatOpenAI(BaseChatModel):
total_tokens=token_usage.get("total_tokens", 0),
)
generation_chunk = ChatGenerationChunk(
message=default_chunk_class(
message=default_chunk_class( # type: ignore[call-arg]
content="", usage_metadata=usage_metadata
)
)
@@ -621,7 +621,7 @@ class BaseChatOpenAI(BaseChatModel):
total_tokens=token_usage.get("total_tokens", 0),
)
generation_chunk = ChatGenerationChunk(
message=default_chunk_class(
message=default_chunk_class( # type: ignore[call-arg]
content="", usage_metadata=usage_metadata
)
)
@@ -942,8 +942,7 @@ class BaseChatOpenAI(BaseChatModel):
method: Literal["function_calling", "json_mode"] = "function_calling",
include_raw: Literal[True] = True,
**kwargs: Any,
) -> Runnable[LanguageModelInput, _AllReturnType]:
...
) -> Runnable[LanguageModelInput, _AllReturnType]: ...
@overload
def with_structured_output(
@@ -953,8 +952,7 @@ class BaseChatOpenAI(BaseChatModel):
method: Literal["function_calling", "json_mode"] = "function_calling",
include_raw: Literal[False] = False,
**kwargs: Any,
) -> Runnable[LanguageModelInput, _DictOrPydantic]:
...
) -> Runnable[LanguageModelInput, _DictOrPydantic]: ...
def with_structured_output(
self,
@@ -1148,7 +1146,8 @@ class BaseChatOpenAI(BaseChatModel):
)
if is_pydantic_schema:
output_parser: OutputParserLike = PydanticToolsParser(
tools=[schema], first_tool_only=True
tools=[schema], # type: ignore[list-item]
first_tool_only=True, # type: ignore[list-item]
)
else:
output_parser = JsonOutputKeyToolsParser(
@@ -1157,7 +1156,7 @@ class BaseChatOpenAI(BaseChatModel):
elif method == "json_mode":
llm = self.bind(response_format={"type": "json_object"})
output_parser = (
PydanticOutputParser(pydantic_object=schema)
PydanticOutputParser(pydantic_object=schema) # type: ignore[arg-type]
if is_pydantic_schema
else JsonOutputParser()
)