bisheng-langchain 1.0.1__py3-none-any.whl → 1.1.0__py3-none-any.whl

bisheng_langchain/chat_models/host_llm.py

@@ -112,6 +112,7 @@ class BaseHostChatLLM(BaseChatModel):
     model_kwargs: Optional[Dict[str, Any]] = Field(default_factory=dict)
     """Holds any model parameters valid for `create` call not explicitly specified."""
     host_base_url: Optional[str] = None
+    is_ssl: Optional[bool] = False
 
     headers: Optional[Dict[str, str]] = Field(default_factory=dict)
 
@@ -170,7 +171,13 @@ class BaseHostChatLLM(BaseChatModel):
                 headers = values['headers']
             else:
                 headers = {'Content-Type': 'application/json'}
-            values['client'] = Requests(headers=headers, request_timeout=values['request_timeout'])
+            if cls.is_ssl and "https" in values['host_base_url']:
+                import aiohttp
+                values['client'] = Requests(headers=headers,
+                                            aiosession=aiohttp.ClientSession(connector=aiohttp.TCPConnector(ssl=False)),
+                                            request_timeout=values['request_timeout'])
+            else:
+                values['client'] = Requests(headers=headers, request_timeout=values['request_timeout'])
         except AttributeError:
             raise ValueError('Try upgrading it with `pip install --upgrade requests`.')
         return values

bisheng_langchain/gpts/tools/api_tools/jina.py

@@ -20,10 +20,12 @@ class JinaTool(BaseModel):
         """get url from jina api"""
         url = "https://r.jina.ai/" + target_url
 
-        headers = {
-            "Content-Type": "application/json",
-            "Authorization": "Bearer " + self.jina_api_key,
-        }
+        headers = None
+        if self.jina_api_key and len(self.jina_api_key)>0 :
+            headers = {
+                "Content-Type": "application/json",
+                "Authorization": "Bearer " + self.jina_api_key,
+            }
 
         response = requests.get(url, headers=headers)
 

bisheng_langchain/gpts/tools/api_tools/openapi.py

@@ -13,7 +13,7 @@ class OpenApiTools(APIToolBase):
     api_location: Optional[str]
     parameter_name: Optional[str]
 
-    def get_real_path(self, path_params: dict|None):
+    def get_real_path(self, path_params: dict | None):
         path = self.params['path']
         if path_params:
             path = path.format(**path_params)
@@ -47,8 +47,10 @@ class OpenApiTools(APIToolBase):
         #     elif self.params['parameter_name']:
         #         params.update({self.params['parameter_name']:self.api_key})
         api_location = self.params.get('api_location')
-        if (api_location == "query") or (hasattr(self, 'api_location') and self.api_location == "query"):
-            parameter_name = getattr(self, 'parameter_name', None) or self.params.get('parameter_name')
+        if (api_location == 'query') or (hasattr(self, 'api_location')
+                                         and self.api_location == 'query'):
+            parameter_name = getattr(self, 'parameter_name',
+                                     None) or self.params.get('parameter_name')
             if parameter_name:
                 params.update({parameter_name: self.api_key})
         return params, json_data, path_params

bisheng_langchain/gpts/tools/sql_agent/tool.py

@@ -252,7 +252,12 @@ class SqlAgentTool(BaseTool):
             run_manager: Optional[CallbackManagerForToolRun] = None,
     ) -> str:
         """Use the tool."""
-        return self.api_wrapper.run(query)
+        try:
+            res = self.api_wrapper.run(query)
+        finally:
+            if self.api_wrapper and self.api_wrapper.db:
+                self.api_wrapper.db._engine.dispose()
+        return res
 
 
 if __name__ == '__main__':

bisheng_langchain/utils/requests.py

@@ -87,12 +87,13 @@ class Requests(BaseModel):
                                            **kwargs) as response:
                     yield response
         else:
-            async with self.aiosession.request(method,
-                                               url,
-                                               headers=self.headers,
-                                               auth=self.auth,
-                                               **kwargs) as response:
-                yield response
+            async with self.aiosession:
+                async with self.aiosession.request(method,
+                                                   url,
+                                                   headers=self.headers,
+                                                   auth=self.auth,
+                                                   **kwargs) as response:
+                    yield response
 
     @asynccontextmanager
     async def aget(self, url: str, **kwargs: Any) -> AsyncGenerator[aiohttp.ClientResponse, None]:

{bisheng_langchain-1.0.1.dist-info → bisheng_langchain-1.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bisheng-langchain
-Version: 1.0.1
+Version: 1.1.0
 Summary: bisheng langchain modules
 Home-page: https://github.com/dataelement/bisheng
 Author: DataElem

{bisheng_langchain-1.0.1.dist-info → bisheng_langchain-1.1.0.dist-info}/RECORD

@@ -33,7 +33,7 @@ bisheng_langchain/chains/router/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm
 bisheng_langchain/chains/router/multi_rule.py,sha256=BiFryj3-7rOxfttD-MyOkKWLCSGB9LVYd2rjOsIfQC8,375
 bisheng_langchain/chains/router/rule_router.py,sha256=R2YRUnwn7s_7DbsSn27uPn4cIV0D-5iXEORXir0tNGM,1835
 bisheng_langchain/chat_models/__init__.py,sha256=4-HTLE_SXO4hmNJu6yQxiQKBt2IFca_ezllVBLmvbEE,635
-bisheng_langchain/chat_models/host_llm.py,sha256=35_jTdUm85mk-t2MARZYGC8dIPVtf5XXlGfFE6hQ1Gc,23153
+bisheng_langchain/chat_models/host_llm.py,sha256=dSLj3pW1Hg4cYaC554PjL1CFjJ5gVVwsqTecdEjYJFk,23576
 bisheng_langchain/chat_models/minimax.py,sha256=JLs_f6vWD9beZYUtjD4FG28G8tZHrGUAWOwdLIuJomw,13901
 bisheng_langchain/chat_models/proxy_llm.py,sha256=3ZCWU4n4eEMQcWiZt1BgD6DuVlbW8IyZSWGPsRunQco,17084
 bisheng_langchain/chat_models/qwen.py,sha256=W73KxDRQBUZEzttEM4K7ZzPqbN-82O6YQmpX-HB_wZU,19971
@@ -92,9 +92,9 @@ bisheng_langchain/gpts/tools/api_tools/__init__.py,sha256=PovWXou3paSpV9xABCt4HB
 bisheng_langchain/gpts/tools/api_tools/base.py,sha256=zPUCM_mOM9ygsc8pwejZvngEfEvGtiWTKbavfza7Eqg,3593
 bisheng_langchain/gpts/tools/api_tools/firecrawl.py,sha256=9zvgE1N1Z9jb8zIpyiDFKP_31bStP4u13fhTPFIVvf8,2682
 bisheng_langchain/gpts/tools/api_tools/flow.py,sha256=ot2YAYgQGWgUpb2nCECAmpqHY6m0SgzwkupF9kDT3lU,2461
-bisheng_langchain/gpts/tools/api_tools/jina.py,sha256=lk8t_PlrcVS_oI5DHgNYpwLtC2tquTb4XmJvJNRsF-k,1321
+bisheng_langchain/gpts/tools/api_tools/jina.py,sha256=OLK8KetHf4G8xozMEC7twaOQeaniON4IvyhdfWxro1k,1420
 bisheng_langchain/gpts/tools/api_tools/macro_data.py,sha256=FyG-qtl2ECS1CDKt6olN0eDTDM91d-UvDkMDBiVLgYQ,27429
-bisheng_langchain/gpts/tools/api_tools/openapi.py,sha256=6SiL-p80-SN8Q1LWnEqjR7Baq3RfqDwpdjZmOiQQItc,6648
+bisheng_langchain/gpts/tools/api_tools/openapi.py,sha256=-9W1A6EyViplkgr12aC01XRuAxO5Gt6v5ERss25JPsc,6728
 bisheng_langchain/gpts/tools/api_tools/silicon_flow.py,sha256=VRMqiqO2yWGpYwF2OktSFf9mBNCAioV0Nu2FPBA9x7U,2035
 bisheng_langchain/gpts/tools/api_tools/sina.py,sha256=4KpK7_HUUtjpdJ-K4LjPlb-occyAZcRtmmCWqJ2BotE,9708
 bisheng_langchain/gpts/tools/api_tools/tianyancha.py,sha256=abDAz-yAH1-2rKiSmZ6TgnrNUnpgAZpDY8oDiWfWapc,6684
@@ -115,7 +115,7 @@ bisheng_langchain/gpts/tools/message/email.py,sha256=Oirj4gw-ZkS0EeuPrYG3dSqAHSP
 bisheng_langchain/gpts/tools/message/feishu.py,sha256=yVoaugM7T67vNT5r9y8eHjUzmox5NxKnawxrq48bRtc,4519
 bisheng_langchain/gpts/tools/message/wechat.py,sha256=iUHXWiVwlE0GhkSEhzCBOiZq-orkReiBvvCV5PCFImo,1666
 bisheng_langchain/gpts/tools/sql_agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bisheng_langchain/gpts/tools/sql_agent/tool.py,sha256=WIN0rfdrNR7uGDIc_VGdPjzXrVnUs24OAicOl0_-5bM,11861
+bisheng_langchain/gpts/tools/sql_agent/tool.py,sha256=WhV5bex-X7jyh5PSRloOoYMqsAqtUcIY5BP__FGKrus,12024
 bisheng_langchain/input_output/__init__.py,sha256=sW_GB7MlrHYsqY1Meb_LeimQqNsMz1gH-00Tqb2BUyM,153
 bisheng_langchain/input_output/input.py,sha256=I5YDmgbvvj1o2lO9wi8LE37wM0wP5jkhUREU32YrZMQ,1094
 bisheng_langchain/input_output/output.py,sha256=6U-az6-Cwz665C2YmcH3SYctWVjPFjmW8s70CA_qphk,11585
@@ -161,12 +161,12 @@ bisheng_langchain/sql/__init__.py,sha256=2arRtNQ-kUvIsy_8v_PrLxf5r9W-S7mbqptG_l4
 bisheng_langchain/sql/base.py,sha256=RQq7BdWroTp2aKzKr_5AMMUaSTxefMJ1DF3r1Rsi0EQ,6162
 bisheng_langchain/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bisheng_langchain/utils/azure_dalle_image_generator.py,sha256=96-_nO4hDSwyPE4rSYop5SgJ-U9CE2un4bTdW0E5RGU,6582
-bisheng_langchain/utils/requests.py,sha256=vWGKyNTxApVeaVdKxqACfIT1Q8wMy-jC3kUv2Ce9Mzc,8688
+bisheng_langchain/utils/requests.py,sha256=QELOIod4DPEGzq922_xIIuKuoHgP38Dcojeb2Y_Q0Ag,8752
 bisheng_langchain/vectorstores/__init__.py,sha256=zCZgDe7LyQ0iDkfcm5UJ5NxwKQSRHnqrsjx700Fy11M,213
 bisheng_langchain/vectorstores/elastic_keywords_search.py,sha256=BxvT9FUTju4AZPtQFTbYLmIIKKw8bqcact5Cav_5H2I,15357
 bisheng_langchain/vectorstores/milvus.py,sha256=jWq_lce-ihOz07D1kwj5ctPzElYexNCjJ-xSv-pK1CI,37172
 bisheng_langchain/vectorstores/retriever.py,sha256=hj4nAAl352EV_ANnU2OHJn7omCH3nBK82ydo14KqMH4,4353
-bisheng_langchain-1.0.1.dist-info/METADATA,sha256=XZh_eZUK_KouDPaYs8AZDz4oK6K-Lts05iOiZxlxDW0,2439
-bisheng_langchain-1.0.1.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-bisheng_langchain-1.0.1.dist-info/top_level.txt,sha256=Z6pPNyCo4ihyr9iqGQbH8sJiC4dAUwA_mAyGRQB5_Fs,18
-bisheng_langchain-1.0.1.dist-info/RECORD,,
+bisheng_langchain-1.1.0.dist-info/METADATA,sha256=Dza-LpX2KRdncsAGo8Wj0Dpb_Sp_45wtqh3O8_rPZ5U,2439
+bisheng_langchain-1.1.0.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+bisheng_langchain-1.1.0.dist-info/top_level.txt,sha256=Z6pPNyCo4ihyr9iqGQbH8sJiC4dAUwA_mAyGRQB5_Fs,18
+bisheng_langchain-1.1.0.dist-info/RECORD,,