Add optional dep

langchain-ai · Oct 27, 2023 · 1849672 · 1849672
1 parent 0d70e3e
commit 1849672
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 41 deletions.
diff --git a/libs/langchain/langchain/evaluation/parsing/json_schema.py b/libs/langchain/langchain/evaluation/parsing/json_schema.py
@@ -1,6 +1,4 @@
-from typing import Any, Optional, Union
-
-from jsonschema import ValidationError, validate
+from typing import Any, Union
 
 from langchain.evaluation.schema import StringEvaluator
 from langchain.output_parsers.json import parse_json_markdown
@@ -75,6 +73,8 @@ def _parse_json(self, node: Any) -> Union[dict, list, None, float, bool, int, st
         return node
 
     def _validate(self, prediction: Any, schema: Any) -> dict:
+        from jsonschema import ValidationError, validate  # noqa: F401
+
         try:
             validate(instance=prediction, schema=schema)
             return {
@@ -85,9 +85,9 @@ def _validate(self, prediction: Any, schema: Any) -> dict:
 
     def _evaluate_strings(
         self,
-        prediction: str,
-        input: Optional[str] = None,
-        reference: Optional[str] = None,
+        prediction: Union[str, Any],
+        input: Union[str, Any] = None,
+        reference: Union[str, Any] = None,
         **kwargs: Any,
     ) -> dict:
         parsed_prediction = self._parse_json(prediction)

diff --git a/libs/langchain/langchain/evaluation/schema.py b/libs/langchain/langchain/evaluation/schema.py
@@ -6,7 +6,7 @@
 from abc import ABC, abstractmethod
 from enum import Enum
 from functools import partial
-from typing import Any, Optional, Sequence, Tuple
+from typing import Any, Optional, Sequence, Tuple, Union
 from warnings import warn
 
 from langchain.chains.base import Chain
@@ -146,9 +146,9 @@ def requires_reference(self) -> bool:
     def _evaluate_strings(
         self,
         *,
-        prediction: str,
-        reference: Optional[str] = None,
-        input: Optional[str] = None,
+        prediction: Union[str, Any],
+        reference: Optional[Union[str, Any]] = None,
+        input: Optional[Union[str, Any]] = None,
         **kwargs: Any,
     ) -> dict:
         """Evaluate Chain or LLM output, based on optional input and label.
@@ -169,9 +169,9 @@ def _evaluate_strings(
     async def _aevaluate_strings(
         self,
         *,
-        prediction: str,
-        reference: Optional[str] = None,
-        input: Optional[str] = None,
+        prediction: Union[str, Any],
+        reference: Optional[Union[str, Any]] = None,
+        input: Optional[Union[str, Any]] = None,
         **kwargs: Any,
     ) -> dict:
         """Asynchronously evaluate Chain or LLM output, based on optional input and label.

diff --git a/libs/langchain/poetry.lock b/libs/langchain/poetry.lock
diff --git a/libs/langchain/pyproject.toml b/libs/langchain/pyproject.toml
@@ -114,6 +114,7 @@ cassio = {version = "^0.1.0", optional = true}
 rdflib = {version = "^6.3.2", optional = true}
 sympy = {version = "^1.12", optional = true}
 rapidfuzz = {version = "^3.1.1", optional = true}
+jsonschema = {version = ">1", optional = true}
 langsmith = "~0.0.52"
 rank-bm25 = {version = "^0.2.2", optional = true}
 amadeus = {version = ">=8.1.0", optional = true}
@@ -350,6 +351,7 @@ extended_testing = [
  "openai",
  "sympy",
  "rapidfuzz",
+ "jsonschema",
  "openai",
  "rank-bm25",
  "geopandas",