Merge pull request #21 from ai-forever/feature/ssl_support

refactor: Adds ssl context support for gigachat

libs/gigachat/langchain_gigachat/chat_models/base_gigachat.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import logging
+import ssl
 from functools import cached_property
 from typing import TYPE_CHECKING, Any, Dict, List, Literal, Optional
 
@@ -41,6 +42,11 @@ class _BaseGigaChat(Serializable):
     verify_ssl_certs: Optional[bool] = None
     """ Check certificates for all requests """
 
+    ssl_context: Optional[ssl.SSLContext] = None
+
+    class Config:
+        arbitrary_types_allowed = True
+
     ca_bundle_file: Optional[str] = None
     cert_file: Optional[str] = None
     key_file: Optional[str] = None
@@ -103,6 +109,7 @@ def _client(self) -> gigachat.GigaChat:
             user=self.user,
             password=self.password,
             timeout=self.timeout,
+            ssl_context=self.ssl_context,
             verify_ssl_certs=self.verify_ssl_certs,
             ca_bundle_file=self.ca_bundle_file,
             cert_file=self.cert_file,

libs/gigachat/langchain_gigachat/embeddings/gigachat.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import logging
+import ssl
 from functools import cached_property
 from typing import Any, Dict, List, Optional
 
@@ -55,6 +56,11 @@ class GigaChatEmbeddings(BaseModel, Embeddings):
     verify_ssl_certs: Optional[bool] = None
     """ Check certificates for all requests """
 
+    ssl_context: Optional[ssl.SSLContext] = None
+
+    class Config:
+        arbitrary_types_allowed = True
+
     ca_bundle_file: Optional[str] = None
     cert_file: Optional[str] = None
     key_file: Optional[str] = None
@@ -82,6 +88,7 @@ def _client(self) -> Any:
             user=self.user,
             password=self.password,
             timeout=self.timeout,
+            ssl_context=self.ssl_context,
             verify_ssl_certs=self.verify_ssl_certs,
             ca_bundle_file=self.ca_bundle_file,
             cert_file=self.cert_file,

libs/gigachat/langchain_gigachat/tools/giga_tool.py

@@ -84,7 +84,7 @@ def from_function(
         args_schema: Optional[type[BaseModel]] = None,
         infer_schema: bool = True,
         return_schema: Optional[Type[BaseModel]] = None,
-        few_shot_examples: Optional[List[Dict[str, Any]]] = None,
+        few_shot_examples: FewShotExamples = None,
         *,
         response_format: Literal["content", "content_and_artifact"] = "content",
         parse_docstring: bool = False,

libs/gigachat/langchain_gigachat/utils/function_calling.py

@@ -323,13 +323,13 @@ def format_tool_to_gigachat_function(tool: BaseTool) -> GigaFunctionDescription:
         else:
             return_schema = None
 
-        return {
-            "name": tool.name,
-            "description": tool.description,
-            "parameters": {"properties": {}, "type": "object"},
-            "few_shot_examples": few_shot_examples,
-            "return_parameters": return_schema,
-        }
+        return GigaFunctionDescription(
+            name=tool.name,
+            description=tool.description,
+            parameters={"properties": {}, "type": "object"},
+            few_shot_examples=few_shot_examples,
+            return_parameters=return_schema,
+        )
 
 
 def convert_pydantic_to_gigachat_function(

libs/gigachat/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "langchain-gigachat"
-version = "0.3.2"
+version = "0.3.3"
 description = "An integration package connecting GigaChat and LangChain"
 authors = []
 readme = "README.md"
@@ -13,7 +13,7 @@ license = "MIT"
 [tool.poetry.dependencies]
 python = ">=3.9,<4.0"
 langchain-core = "^0.3"
-gigachat = "^0.1.36"
+gigachat = "^0.1.37"
 types-requests = "^2.32"
 
 [tool.poetry.group.dev]