Merge branch 'master' into feat/anthropic_max_tokens

Author: keenborder786

docs/docs/contributing/how_to/code/setup.mdx

@@ -9,6 +9,14 @@ This project utilizes [uv](https://docs.astral.sh/uv/) v0.5+ as a dependency man
 
 Install `uv`: **[documentation on how to install it](https://docs.astral.sh/uv/getting-started/installation/)**.
 
+### Windows Users
+
+If you're on Windows and don't have `make` installed, you can install it via:
+- **Option 1**: Install via [Chocolatey](https://chocolatey.org/): `choco install make`
+- **Option 2**: Install via [Scoop](https://scoop.sh/): `scoop install make`
+- **Option 3**: Use [Windows Subsystem for Linux (WSL)](https://docs.microsoft.com/en-us/windows/wsl/)
+- **Option 4**: Use the direct `uv` commands shown in the sections below
+
 ## Different packages
 
 This repository contains multiple packages:
@@ -48,7 +56,11 @@ uv sync
 Then verify dependency installation:
 
 ```bash
+# If you have `make` installed:
 make test
+
+# If you don't have `make` (Windows alternative):
+uv run --group test pytest -n auto --disable-socket --allow-unix-socket tests/unit_tests
 ```
 
 ## Testing
@@ -61,7 +73,11 @@ If you add new logic, please add a unit test.
 To run unit tests:
 
 ```bash
+# If you have `make` installed:
 make test
+
+# If you don't have make (Windows alternative):
+uv run --group test pytest -n auto --disable-socket --allow-unix-socket tests/unit_tests
 ```
 
 There are also [integration tests and code-coverage](../testing.mdx) available.
@@ -72,7 +88,12 @@ If you are only developing `langchain_core`, you can simply install the dependen
 
 ```bash
 cd libs/core
+
+# If you have `make` installed:
 make test
+
+# If you don't have `make` (Windows alternative):
+uv run --group test pytest -n auto --disable-socket --allow-unix-socket tests/unit_tests
 ```
 
 ## Formatting and linting
@@ -86,20 +107,37 @@ Formatting for this project is done via [ruff](https://docs.astral.sh/ruff/rules
 To run formatting for docs, cookbook and templates:
 
 ```bash
+# If you have `make` installed:
 make format
+
+# If you don't have make (Windows alternative):
+uv run --all-groups ruff format .
+uv run --all-groups ruff check --fix .
 ```
 
 To run formatting for a library, run the same command from the relevant library directory:
 
 ```bash
 cd libs/{LIBRARY}
+
+# If you have `make` installed:
 make format
+
+# If you don't have make (Windows alternative):
+uv run --all-groups ruff format .
+uv run --all-groups ruff check --fix .
 ```
 
 Additionally, you can run the formatter only on the files that have been modified in your current branch as compared to the master branch using the format_diff command:
 
 ```bash
+# If you have `make` installed:
 make format_diff
+
+# If you don't have `make` (Windows alternative):
+# First, get the list of modified files:
+git diff --relative=libs/langchain --name-only --diff-filter=d master | grep -E '\.py$$|\.ipynb$$' | xargs uv run --all-groups ruff format
+git diff --relative=libs/langchain --name-only --diff-filter=d master | grep -E '\.py$$|\.ipynb$$' | xargs uv run --all-groups ruff check --fix
 ```
 
 This is especially useful when you have made changes to a subset of the project and want to ensure your changes are properly formatted without affecting the rest of the codebase.
@@ -111,20 +149,40 @@ Linting for this project is done via a combination of [ruff](https://docs.astral
 To run linting for docs, cookbook and templates:
 
 ```bash
+# If you have `make` installed:
 make lint
+
+# If you don't have `make` (Windows alternative):
+uv run --all-groups ruff check .
+uv run --all-groups ruff format . --diff
+uv run --all-groups mypy . --cache-dir .mypy_cache
 ```
 
 To run linting for a library, run the same command from the relevant library directory:
 
 ```bash
 cd libs/{LIBRARY}
+
+# If you have `make` installed:
 make lint
+
+# If you don't have `make` (Windows alternative):
+uv run --all-groups ruff check .
+uv run --all-groups ruff format . --diff
+uv run --all-groups mypy . --cache-dir .mypy_cache
 ```
 
 In addition, you can run the linter only on the files that have been modified in your current branch as compared to the master branch using the lint_diff command:
 
 ```bash
+# If you have `make` installed:
 make lint_diff
+
+# If you don't have `make` (Windows alternative):
+# First, get the list of modified files:
+git diff --relative=libs/langchain --name-only --diff-filter=d master | grep -E '\.py$$|\.ipynb$$' | xargs uv run --all-groups ruff check
+git diff --relative=libs/langchain --name-only --diff-filter=d master | grep -E '\.py$$|\.ipynb$$' | xargs uv run --all-groups ruff format --diff
+git diff --relative=libs/langchain --name-only --diff-filter=d master | grep -E '\.py$$|\.ipynb$$' | xargs uv run --all-groups mypy --cache-dir .mypy_cache
 ```
 
 This can be very helpful when you've made changes to only certain parts of the project and want to ensure your changes meet the linting standards without having to check the entire codebase.
@@ -139,13 +197,21 @@ Note that `codespell` finds common typos, so it could have false-positive (corre
 To check spelling for this project:
 
 ```bash
+# If you have `make` installed:
 make spell_check
+
+# If you don't have `make` (Windows alternative):
+uv run --all-groups codespell --toml pyproject.toml
 ```
 
 To fix spelling in place:
 
 ```bash
+# If you have `make` installed:
 make spell_fix
+
+# If you don't have `make` (Windows alternative):
+uv run --all-groups codespell --toml pyproject.toml -w
 ```
 
 If codespell is incorrectly flagging a word, you can skip spellcheck for that word by adding it to the codespell config in the `pyproject.toml` file.

libs/partners/groq/langchain_groq/chat_models.py

@@ -6,15 +6,7 @@
 import warnings
 from collections.abc import AsyncIterator, Iterator, Mapping, Sequence
 from operator import itemgetter
-from typing import (
-    Any,
-    Callable,
-    Literal,
-    Optional,
-    TypedDict,
-    Union,
-    cast,
-)
+from typing import Any, Callable, Literal, Optional, TypedDict, Union, cast
 
 from langchain_core._api import deprecated
 from langchain_core.callbacks import (
@@ -46,10 +38,7 @@
     ToolMessage,
     ToolMessageChunk,
 )
-from langchain_core.output_parsers import (
-    JsonOutputParser,
-    PydanticOutputParser,
-)
+from langchain_core.output_parsers import JsonOutputParser, PydanticOutputParser
 from langchain_core.output_parsers.base import OutputParserLike
 from langchain_core.output_parsers.openai_tools import (
     JsonOutputKeyToolsParser,
@@ -60,23 +49,13 @@
 from langchain_core.outputs import ChatGeneration, ChatGenerationChunk, ChatResult
 from langchain_core.runnables import Runnable, RunnableMap, RunnablePassthrough
 from langchain_core.tools import BaseTool
-from langchain_core.utils import (
-    from_env,
-    get_pydantic_field_names,
-    secret_from_env,
-)
+from langchain_core.utils import from_env, get_pydantic_field_names, secret_from_env
 from langchain_core.utils.function_calling import (
     convert_to_openai_function,
     convert_to_openai_tool,
 )
 from langchain_core.utils.pydantic import is_basemodel_subclass
-from pydantic import (
-    BaseModel,
-    ConfigDict,
-    Field,
-    SecretStr,
-    model_validator,
-)
+from pydantic import BaseModel, ConfigDict, Field, SecretStr, model_validator
 from typing_extensions import Self
 
 from langchain_groq.version import __version__
@@ -122,7 +101,7 @@ class ChatGroq(BaseChatModel):
 
             See the `Groq documentation
             <https://console.groq.com/docs/reasoning#reasoning>`__ for more
-            details and a list of supported reasoning models.
+            details and a list of supported models.
         model_kwargs: Dict[str, Any]
             Holds any model parameters valid for create call not
             explicitly specified.
@@ -328,20 +307,15 @@ class Joke(BaseModel):
       overridden in ``reasoning_effort``.
 
     See the `Groq documentation <https://console.groq.com/docs/reasoning#reasoning>`__
-    for more details and a list of supported reasoning models.
+    for more details and a list of supported models.
     """
-    reasoning_effort: Optional[Literal["none", "default"]] = Field(default=None)
+    reasoning_effort: Optional[str] = Field(default=None)
     """The level of effort the model will put into reasoning. Groq will default to
-    enabling reasoning if left undefined. If set to ``none``, ``reasoning_format`` will
-    not apply and ``reasoning_content`` will not be returned.
-
-    - ``'none'``: Disable reasoning. The model will not use any reasoning tokens when
-      generating a response.
-    - ``'default'``: Enable reasoning.
+    enabling reasoning if left undefined.
 
     See the `Groq documentation
     <https://console.groq.com/docs/reasoning#options-for-reasoning-effort>`__ for more
-    details and a list of models that support setting a reasoning effort.
+    details and a list of options and models that support setting a reasoning effort.
     """
     model_kwargs: dict[str, Any] = Field(default_factory=dict)
     """Holds any model parameters valid for `create` call not explicitly specified."""
@@ -601,6 +575,11 @@ def _stream(
                     generation_info["system_fingerprint"] = system_fingerprint
                 service_tier = params.get("service_tier") or self.service_tier
                 generation_info["service_tier"] = service_tier
+                reasoning_effort = (
+                    params.get("reasoning_effort") or self.reasoning_effort
+                )
+                if reasoning_effort:
+                    generation_info["reasoning_effort"] = reasoning_effort
             logprobs = choice.get("logprobs")
             if logprobs:
                 generation_info["logprobs"] = logprobs
@@ -644,6 +623,11 @@ async def _astream(
                     generation_info["system_fingerprint"] = system_fingerprint
                 service_tier = params.get("service_tier") or self.service_tier
                 generation_info["service_tier"] = service_tier
+                reasoning_effort = (
+                    params.get("reasoning_effort") or self.reasoning_effort
+                )
+                if reasoning_effort:
+                    generation_info["reasoning_effort"] = reasoning_effort
             logprobs = choice.get("logprobs")
             if logprobs:
                 generation_info["logprobs"] = logprobs
@@ -714,6 +698,9 @@ def _create_chat_result(
             "system_fingerprint": response.get("system_fingerprint", ""),
         }
         llm_output["service_tier"] = params.get("service_tier") or self.service_tier
+        reasoning_effort = params.get("reasoning_effort") or self.reasoning_effort
+        if reasoning_effort:
+            llm_output["reasoning_effort"] = reasoning_effort
         return ChatResult(generations=generations, llm_output=llm_output)
 
     def _create_message_dicts(

libs/partners/groq/pyproject.toml

@@ -6,9 +6,9 @@ build-backend = "pdm.backend"
 authors = []
 license = { text = "MIT" }
 requires-python = ">=3.9"
-dependencies = ["langchain-core<1.0.0,>=0.3.68", "groq<1,>=0.29.0"]
+dependencies = ["langchain-core<1.0.0,>=0.3.72", "groq<1,>=0.30.0"]
 name = "langchain-groq"
-version = "0.3.6"
+version = "0.3.7"
 description = "An integration package connecting Groq and LangChain"
 readme = "README.md"
 
@@ -114,4 +114,4 @@ asyncio_mode = "auto"
 "tests/**/*.py" = [
     "S101", # Tests need assertions
     "S311", # Standard pseudo-random generators are not suitable for cryptographic purposes
-]
+]