langchain-google-genai 0.0.8__tar.gz → 0.0.10rc0__tar.gz

{langchain_google_genai-0.0.8 → langchain_google_genai-0.0.10rc0}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.1
 Name: langchain-google-genai
-Version: 0.0.8
+Version: 0.0.10rc0
 Summary: An integration package connecting Google's genai package and LangChain
-Home-page: https://github.com/langchain-ai/langchain
+Home-page: https://github.com/langchain-ai/langchain-google
 License: MIT
 Requires-Python: >=3.9,<4.0
 Classifier: License :: OSI Approved :: MIT License
@@ -15,8 +15,8 @@ Provides-Extra: images
 Requires-Dist: google-generativeai (>=0.3.1,<0.4.0)
 Requires-Dist: langchain-core (>=0.1,<0.2)
 Requires-Dist: pillow (>=10.1.0,<11.0.0) ; extra == "images"
-Project-URL: Repository, https://github.com/langchain-ai/langchain
-Project-URL: Source Code, https://github.com/langchain-ai/langchain/tree/master/libs/partners/google-genai
+Project-URL: Repository, https://github.com/langchain-ai/langchain-google
+Project-URL: Source Code, https://github.com/langchain-ai/langchain-google/tree/main/libs/genai
 Description-Content-Type: text/markdown
 
 # langchain-google-genai

{langchain_google_genai-0.0.8 → langchain_google_genai-0.0.10rc0}/langchain_google_genai/__init__.py

@@ -54,6 +54,8 @@ embeddings = GoogleGenerativeAIEmbeddings(model="models/embedding-001")
 embeddings.embed_query("hello, world!")
 ```
 """  # noqa: E501
+
+from langchain_google_genai._enums import HarmBlockThreshold, HarmCategory
 from langchain_google_genai.chat_models import ChatGoogleGenerativeAI
 from langchain_google_genai.embeddings import GoogleGenerativeAIEmbeddings
 from langchain_google_genai.llms import GoogleGenerativeAI
@@ -62,4 +64,6 @@ __all__ = [
     "ChatGoogleGenerativeAI",
     "GoogleGenerativeAIEmbeddings",
     "GoogleGenerativeAI",
+    "HarmBlockThreshold",
+    "HarmCategory",
 ]

langchain_google_genai-0.0.10rc0/langchain_google_genai/_enums.py

@@ -0,0 +1,6 @@
+from google.generativeai.types.safety_types import (  # type: ignore
+    HarmBlockThreshold,
+    HarmCategory,
+)
+
+__all__ = ["HarmBlockThreshold", "HarmCategory"]

{langchain_google_genai-0.0.8 → langchain_google_genai-0.0.10rc0}/langchain_google_genai/chat_models.py

@@ -517,6 +517,7 @@ class ChatGoogleGenerativeAI(_BaseGoogleGenerativeAI, BaseChatModel):
             "temperature": self.temperature,
             "top_k": self.top_k,
             "n": self.n,
+            "safety_settings": self.safety_settings,
         }
 
     def _prepare_params(
@@ -549,7 +550,7 @@ class ChatGoogleGenerativeAI(_BaseGoogleGenerativeAI, BaseChatModel):
         params, chat, message = self._prepare_chat(
             messages,
             stop=stop,
-            functions=kwargs.get("functions"),
+            **kwargs,
         )
         response: genai.types.GenerateContentResponse = _chat_with_retry(
             content=message,
@@ -568,7 +569,7 @@ class ChatGoogleGenerativeAI(_BaseGoogleGenerativeAI, BaseChatModel):
         params, chat, message = self._prepare_chat(
             messages,
             stop=stop,
-            functions=kwargs.get("functions"),
+            **kwargs,
         )
         response: genai.types.GenerateContentResponse = await _achat_with_retry(
             content=message,
@@ -587,7 +588,7 @@ class ChatGoogleGenerativeAI(_BaseGoogleGenerativeAI, BaseChatModel):
         params, chat, message = self._prepare_chat(
             messages,
             stop=stop,
-            functions=kwargs.get("functions"),
+            **kwargs,
         )
         response: genai.types.GenerateContentResponse = _chat_with_retry(
             content=message,
@@ -598,6 +599,7 @@ class ChatGoogleGenerativeAI(_BaseGoogleGenerativeAI, BaseChatModel):
         for chunk in response:
             _chat_result = _response_to_result(chunk, stream=True)
             gen = cast(ChatGenerationChunk, _chat_result.generations[0])
+
             if run_manager:
                 run_manager.on_llm_new_token(gen.text)
             yield gen
@@ -612,7 +614,7 @@ class ChatGoogleGenerativeAI(_BaseGoogleGenerativeAI, BaseChatModel):
         params, chat, message = self._prepare_chat(
             messages,
             stop=stop,
-            functions=kwargs.get("functions"),
+            **kwargs,
         )
         async for chunk in await _achat_with_retry(
             content=message,
@@ -622,6 +624,7 @@ class ChatGoogleGenerativeAI(_BaseGoogleGenerativeAI, BaseChatModel):
         ):
             _chat_result = _response_to_result(chunk, stream=True)
             gen = cast(ChatGenerationChunk, _chat_result.generations[0])
+
             if run_manager:
                 await run_manager.on_llm_new_token(gen.text)
             yield gen
@@ -634,9 +637,14 @@ class ChatGoogleGenerativeAI(_BaseGoogleGenerativeAI, BaseChatModel):
     ) -> Tuple[Dict[str, Any], genai.ChatSession, genai.types.ContentDict]:
         client = self.client
         functions = kwargs.pop("functions", None)
-        if functions:
-            tools = convert_to_genai_function_declarations(functions)
-            client = genai.GenerativeModel(model_name=self.model, tools=tools)
+        safety_settings = kwargs.pop("safety_settings", self.safety_settings)
+        if functions or safety_settings:
+            tools = (
+                convert_to_genai_function_declarations(functions) if functions else None
+            )
+            client = genai.GenerativeModel(
+                model_name=self.model, tools=tools, safety_settings=safety_settings
+            )
 
         params = self._prepare_params(stop, **kwargs)
         history = _parse_chat_history(

{langchain_google_genai-0.0.8 → langchain_google_genai-0.0.10rc0}/langchain_google_genai/llms.py

@@ -15,6 +15,11 @@ from langchain_core.outputs import Generation, GenerationChunk, LLMResult
 from langchain_core.pydantic_v1 import BaseModel, Field, SecretStr, root_validator
 from langchain_core.utils import get_from_dict_or_env
 
+from langchain_google_genai._enums import (
+    HarmBlockThreshold,
+    HarmCategory,
+)
+
 
 class GoogleModelFamily(str, Enum):
     GEMINI = auto()
@@ -77,7 +82,10 @@ def _completion_with_retry(
         try:
             if is_gemini:
                 return llm.client.generate_content(
-                    contents=prompt, stream=stream, generation_config=generation_config
+                    contents=prompt,
+                    stream=stream,
+                    generation_config=generation_config,
+                    safety_settings=kwargs.pop("safety_settings", None),
                 )
             return llm.client.generate_text(prompt=prompt, **kwargs)
         except google.api_core.exceptions.FailedPrecondition as exc:
@@ -143,6 +151,22 @@ Supported examples:
         description="A string, one of: [`rest`, `grpc`, `grpc_asyncio`].",
     )
 
+    safety_settings: Optional[Dict[HarmCategory, HarmBlockThreshold]] = None
+    """The default safety settings to use for all generations. 
+    
+        For example: 
+
+            from google.generativeai.types.safety_types import HarmBlockThreshold, HarmCategory
+
+            safety_settings = {
+                HarmCategory.HARM_CATEGORY_UNSPECIFIED: HarmBlockThreshold.BLOCK_NONE,
+                HarmCategory.HARM_CATEGORY_DANGEROUS_CONTENT: HarmBlockThreshold.BLOCK_MEDIUM_AND_ABOVE,
+                HarmCategory.HARM_CATEGORY_HATE_SPEECH: HarmBlockThreshold.BLOCK_ONLY_HIGH,
+                HarmCategory.HARM_CATEGORY_HARASSMENT: HarmBlockThreshold.BLOCK_LOW_AND_ABOVE,
+                HarmCategory.HARM_CATEGORY_SEXUALLY_EXPLICIT: HarmBlockThreshold.BLOCK_NONE,
+            }
+            """  # noqa: E501
+
     @property
     def lc_secrets(self) -> Dict[str, str]:
         return {"google_api_key": "GOOGLE_API_KEY"}
@@ -184,6 +208,8 @@ class GoogleGenerativeAI(_BaseGoogleGenerativeAI, BaseLLM):
         )
         model_name = values["model"]
 
+        safety_settings = values["safety_settings"]
+
         if isinstance(google_api_key, SecretStr):
             google_api_key = google_api_key.get_secret_value()
 
@@ -193,8 +219,15 @@ class GoogleGenerativeAI(_BaseGoogleGenerativeAI, BaseLLM):
             client_options=values.get("client_options"),
         )
 
+        if safety_settings and (
+            not GoogleModelFamily(model_name) == GoogleModelFamily.GEMINI
+        ):
+            raise ValueError("Safety settings are only supported for Gemini models")
+
         if GoogleModelFamily(model_name) == GoogleModelFamily.GEMINI:
-            values["client"] = genai.GenerativeModel(model_name=model_name)
+            values["client"] = genai.GenerativeModel(
+                model_name=model_name, safety_settings=safety_settings
+            )
         else:
             values["client"] = genai
 
@@ -237,6 +270,7 @@ class GoogleGenerativeAI(_BaseGoogleGenerativeAI, BaseLLM):
                     is_gemini=True,
                     run_manager=run_manager,
                     generation_config=generation_config,
+                    safety_settings=kwargs.pop("safety_settings", None),
                 )
                 candidates = [
                     "".join([p.text for p in c.content.parts]) for c in res.candidates
@@ -278,6 +312,7 @@ class GoogleGenerativeAI(_BaseGoogleGenerativeAI, BaseLLM):
             is_gemini=True,
             run_manager=run_manager,
             generation_config=generation_config,
+            safety_settings=kwargs.pop("safety_settings", None),
             **kwargs,
         ):
             chunk = GenerationChunk(text=stream_resp.text)

{langchain_google_genai-0.0.8 → langchain_google_genai-0.0.10rc0}/pyproject.toml

@@ -1,14 +1,14 @@
 [tool.poetry]
 name = "langchain-google-genai"
-version = "0.0.8"
+version = "0.0.10rc0"
 description = "An integration package connecting Google's genai package and LangChain"
 authors = []
 readme = "README.md"
-repository = "https://github.com/langchain-ai/langchain"
+repository = "https://github.com/langchain-ai/langchain-google"
 license = "MIT"
 
 [tool.poetry.urls]
-"Source Code" = "https://github.com/langchain-ai/langchain/tree/master/libs/partners/google-genai"
+"Source Code" = "https://github.com/langchain-ai/langchain-google/tree/main/libs/genai"
 
 [tool.poetry.dependencies]
 python = ">=3.9,<4.0"
@@ -29,7 +29,6 @@ pytest-mock = "^3.10.0"
 syrupy = "^4.0.2"
 pytest-watcher = "^0.3.4"
 pytest-asyncio = "^0.21.1"
-langchain-core = { path = "../../core", develop = true }
 numpy = "^1.26.2"
 
 [tool.poetry.group.codespell]
@@ -53,7 +52,6 @@ ruff = "^0.1.5"
 
 [tool.poetry.group.typing.dependencies]
 mypy = "^0.991"
-langchain-core = { path = "../../core", develop = true }
 types-requests = "^2.28.11.5"
 types-google-cloud-ndb = "^2.2.0.1"
 types-pillow = "^10.1.0.2"
@@ -62,7 +60,6 @@ types-pillow = "^10.1.0.2"
 optional = true
 
 [tool.poetry.group.dev.dependencies]
-langchain-core = { path = "../../core", develop = true }
 pillow = "^10.1.0"
 types-requests = "^2.31.0.10"
 types-pillow = "^10.1.0.2"