bisheng-langchain 0.3.3.dev2__py3-none-any.whl → 0.3.4.dev1__py3-none-any.whl

bisheng_langchain/gpts/load_tools.py

@@ -27,6 +27,7 @@ from langchain_core.language_models import BaseLanguageModel
 from langchain_core.tools import BaseTool, Tool
 from mypy_extensions import Arg, KwArg
 from bisheng_langchain.rag import BishengRAGTool
+from bisheng_langchain.utils.azure_dalle_image_generator import AzureDallEWrapper
 
 
 def _get_current_time() -> BaseTool:
@@ -59,17 +60,22 @@ def _get_bing_search(**kwargs: Any) -> BaseTool:
 
 
 def _get_dalle_image_generator(**kwargs: Any) -> Tool:
-    openai_api_key = kwargs.get('openai_api_key')
-    openai_api_base = kwargs.get('openai_api_base')
-    http_async_client = httpx.AsyncClient(proxies=kwargs.get('openai_proxy'))
-    httpc_client = httpx.Client(proxies=kwargs.get('openai_proxy'))
+    if kwargs.get('openai_proxy'):
+        kwargs['http_async_client'] = httpx.AsyncClient(proxies=kwargs.get('openai_proxy'))
+        kwargs['http_client'] = httpx.Client(proxies=kwargs.get('openai_proxy'))
+
+    # 说明是azure的openai配置
+    if kwargs.get("azure_endpoint"):
+        kwargs['api_key'] = kwargs.pop('openai_api_key')
+        kwargs['api_version'] = kwargs.pop('openai_api_version')
+        return DallEImageGenerator(
+            api_wrapper=AzureDallEWrapper(**kwargs)
+        )
+
     return DallEImageGenerator(
         api_wrapper=DallEAPIWrapper(
             model='dall-e-3',
-            api_key=openai_api_key,
-            base_url=openai_api_base,
-            http_client=httpc_client,
-            http_async_client=http_async_client,
+            **kwargs
         )
     )
 
@@ -83,11 +89,16 @@ def _get_native_code_interpreter(**kwargs: Any) -> Tool:
 
 
 # 第二个list内填必填参数，第三个list内填可选参数
-_EXTRA_PARAM_TOOLS: Dict[str, Tuple[Callable[[KwArg(Any)], BaseTool], List[Optional[str]], List[Optional[str]]]] = {  # type: ignore
-    'dalle_image_generator': (_get_dalle_image_generator, ['openai_api_key', 'openai_proxy'], []),
+_EXTRA_PARAM_TOOLS: Dict[str, Tuple[Callable[[KwArg(Any)], BaseTool], List[Optional[str]], List[Optional[str]]]] = {
+    # type: ignore
+    'dalle_image_generator': (_get_dalle_image_generator,
+                              ['openai_api_key'],
+                              ['openai_api_base', 'openai_proxy', 'azure_deployment', 'azure_endpoint', 'openai_api_version']),
     'bing_search': (_get_bing_search, ['bing_subscription_key', 'bing_search_url'], []),
     'bisheng_code_interpreter': (_get_native_code_interpreter, ["minio"], ['files']),
-    'bisheng_rag': (BishengRAGTool.get_rag_tool, ['name', 'description'], ['vector_store', 'keyword_store', 'llm', 'collection_name', 'max_content', 'sort_by_source_and_index']),
+    'bisheng_rag': (BishengRAGTool.get_rag_tool, ['name', 'description'],
+                    ['vector_store', 'keyword_store', 'llm', 'collection_name', 'max_content',
+                     'sort_by_source_and_index']),
 }
 
 _API_TOOLS: Dict[str, Tuple[Callable[[KwArg(Any)], BaseTool], List[str]]] = {**ALL_API_TOOLS}  # type: ignore
@@ -114,10 +125,10 @@ def _handle_callbacks(callback_manager: Optional[BaseCallbackManager], callbacks
 
 
 def load_tools(
-    tool_params: Dict[str, Dict[str, Any]],
-    llm: Optional[BaseLanguageModel] = None,
-    callbacks: Callbacks = None,
-    **kwargs: Any,
+        tool_params: Dict[str, Dict[str, Any]],
+        llm: Optional[BaseLanguageModel] = None,
+        callbacks: Callbacks = None,
+        **kwargs: Any,
 ) -> List[BaseTool]:
     tools = []
     callbacks = _handle_callbacks(callback_manager=kwargs.get('callback_manager'), callbacks=callbacks)
@@ -171,7 +182,6 @@ def get_all_tool_names() -> List[str]:
 
 
 def get_tool_table():
-
     load_dotenv('.sql_env', override=True)
     db = pymysql.connect(
         host=os.getenv('MYSQL_HOST'),
@@ -184,7 +194,7 @@ def get_tool_table():
     cursor.execute("SELECT name, t.desc, tool_key, extra FROM t_gpts_tools as t;")
     results = cursor.fetchall()
     db.close()
-    
+
     df = pd.DataFrame(
         columns=[
             '前端工具名',

bisheng_langchain/gpts/tools/dalle_image_generator/tool.py

@@ -10,6 +10,8 @@ from langchain_core.pydantic_v1 import BaseModel, Extra, Field, root_validator
 from langchain_core.tools import BaseTool
 from langchain_core.utils import get_from_dict_or_env, get_pydantic_field_names
 
+from bisheng_langchain.utils.azure_dalle_image_generator import AzureDallEWrapper
+
 logger = logging.getLogger(__name__)
 
 
@@ -170,7 +172,7 @@ class DallEImageGenerator(BaseTool):
         "A wrapper around OpenAI DALL-E API. Useful for when you need to generate images from a text description. Input should be an image description."
     )
     args_schema: Type[BaseModel] = DallEInput
-    api_wrapper: DallEAPIWrapper
+    api_wrapper: DallEAPIWrapper | AzureDallEWrapper
 
     def _run(
         self,

bisheng_langchain/utils/azure_dalle_image_generator.py

@@ -127,12 +127,9 @@ class AzureDallEWrapper(DallEAPIWrapper):
             values['default_query'],
         }
         if not values.get('client'):
-            sync_specific = {'http_client': values['http_client']}
-            values['client'] = openai.AzureOpenAI(**client_params, **sync_specific).images
+            values['client'] = openai.AzureOpenAI(**client_params).images
         if not values.get('async_client'):
-            async_specific = {'http_client': values['http_async_client']}
-            values['async_client'] = openai.AsyncAzureOpenAI(**client_params,
-                                                             **async_specific).images
+            values['async_client'] = openai.AsyncAzureOpenAI(**client_params).images
         return values
 
     @property

{bisheng_langchain-0.3.3.dev2.dist-info → bisheng_langchain-0.3.4.dev1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bisheng-langchain
-Version: 0.3.3.dev2
+Version: 0.3.4.dev1
 Summary: bisheng langchain modules
 Home-page: https://github.com/dataelement/bisheng
 Author: DataElem
@@ -16,23 +16,23 @@ Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
-Requires-Dist: langchain ==0.1.12
+Requires-Dist: langchain==0.1.12
 Requires-Dist: zhipuai
 Requires-Dist: websocket-client
 Requires-Dist: elasticsearch
-Requires-Dist: opencv-python ==4.5.5.64
-Requires-Dist: Pillow ==9.5.0
+Requires-Dist: opencv-python==4.5.5.64
+Requires-Dist: Pillow==9.5.0
 Requires-Dist: bisheng-pyautogen
-Requires-Dist: jieba ==0.42.1
-Requires-Dist: pydantic ==1.10.13
-Requires-Dist: pymupdf ==1.23.8
-Requires-Dist: shapely ==2.0.2
-Requires-Dist: filetype ==1.2.0
-Requires-Dist: langgraph ==0.0.50
-Requires-Dist: openai ==1.14.3
-Requires-Dist: langchain-openai ==0.1.0
-Requires-Dist: llama-index ==0.9.48
-Requires-Dist: bisheng-ragas ==1.0.0
+Requires-Dist: jieba==0.42.1
+Requires-Dist: pydantic==1.10.13
+Requires-Dist: pymupdf==1.23.8
+Requires-Dist: shapely==2.0.2
+Requires-Dist: filetype==1.2.0
+Requires-Dist: langgraph==0.0.50
+Requires-Dist: openai==1.14.3
+Requires-Dist: langchain-openai==0.1.0
+Requires-Dist: llama-index==0.9.48
+Requires-Dist: bisheng-ragas==1.0.0
 
 ## What is bisheng-langchain?
 

{bisheng_langchain-0.3.3.dev2.dist-info → bisheng_langchain-0.3.4.dev1.dist-info}/RECORD

@@ -73,7 +73,7 @@ bisheng_langchain/gpts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 bisheng_langchain/gpts/assistant.py,sha256=jPGVjPhqx-z4nvEHVsprWLqAVbO99Uus_GADAPASXQE,5438
 bisheng_langchain/gpts/auto_optimization.py,sha256=WNsC19rgvuDYQlSIaYThq5RqCbuobDbzCwAJW4Ksw0c,3626
 bisheng_langchain/gpts/auto_tool_selected.py,sha256=21WETf9o0YS-QEBwv3mmZRObKWszefQkXEqAA6KzoaM,1582
-bisheng_langchain/gpts/load_tools.py,sha256=LiiK1OqFu7Ki-F_Rhfi1rgp0wBQCSrTDdqsgwciTOIU,8099
+bisheng_langchain/gpts/load_tools.py,sha256=U0DTN53bCXWZ26dlx9ZEPXO42Uvt72Q8mqKWcaBVQYo,8488
 bisheng_langchain/gpts/message_types.py,sha256=7EJOx62j9E1U67jxWgxE_I7a8IjAvvKANknXkD2gFm0,213
 bisheng_langchain/gpts/utils.py,sha256=t3YDxaJ0OYd6EKsek7PJFRYnsezwzEFK5oVU-PRbu5g,6671
 bisheng_langchain/gpts/agent_types/__init__.py,sha256=88tFt1GfrfIqa4hCg0cMJk7rTeUmCSSdiVhR41CW4rM,381
@@ -102,7 +102,7 @@ bisheng_langchain/gpts/tools/calculator/tool.py,sha256=iwGPE7jvxZg_jUL2Aq9HHwnRJ
 bisheng_langchain/gpts/tools/code_interpreter/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bisheng_langchain/gpts/tools/code_interpreter/tool.py,sha256=1VLkgngRR0k8YjA4eYkfPd1E7fD29tMKpqtCtn7WwYE,11443
 bisheng_langchain/gpts/tools/dalle_image_generator/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bisheng_langchain/gpts/tools/dalle_image_generator/tool.py,sha256=mhxdNNhBESjbOy30Rnp6hQhnrV4evQpv-B1fFXcU-68,7528
+bisheng_langchain/gpts/tools/dalle_image_generator/tool.py,sha256=h_mSGn2fvw4wGufrqKYC3lI1LLo9Uu_rynDM88IonMA,7631
 bisheng_langchain/gpts/tools/get_current_time/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bisheng_langchain/gpts/tools/get_current_time/tool.py,sha256=3uvk7Yu07qhZy1sBrFMhGEwyxEGMB8vubizs9x-6DG8,801
 bisheng_langchain/input_output/__init__.py,sha256=sW_GB7MlrHYsqY1Meb_LeimQqNsMz1gH-00Tqb2BUyM,153
@@ -147,13 +147,13 @@ bisheng_langchain/retrievers/mix_es_vector.py,sha256=dSrrsuMPSgGiu181EOzACyIKiDX
 bisheng_langchain/sql/__init__.py,sha256=2arRtNQ-kUvIsy_8v_PrLxf5r9W-S7mbqptG_l4_1RE,88
 bisheng_langchain/sql/base.py,sha256=WNHCy16UoxvDbroHnJq8CsZ9ot4NGflCm8Bgiv45kks,6152
 bisheng_langchain/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bisheng_langchain/utils/azure_dalle_image_generator.py,sha256=wbOIrVX8lN8zZni0GjUpwKBESy0TmlqrGLZCY5PbUsM,6819
+bisheng_langchain/utils/azure_dalle_image_generator.py,sha256=96-_nO4hDSwyPE4rSYop5SgJ-U9CE2un4bTdW0E5RGU,6582
 bisheng_langchain/utils/requests.py,sha256=vWGKyNTxApVeaVdKxqACfIT1Q8wMy-jC3kUv2Ce9Mzc,8688
 bisheng_langchain/vectorstores/__init__.py,sha256=zCZgDe7LyQ0iDkfcm5UJ5NxwKQSRHnqrsjx700Fy11M,213
 bisheng_langchain/vectorstores/elastic_keywords_search.py,sha256=Pm1rS50GJ0HWbjBsFDgs28SVuVbjGSRPOor6yJlnE7w,13347
 bisheng_langchain/vectorstores/milvus.py,sha256=8HHbIxoSbLYDFlFJSfmjLOfqGpOSZd24iVYWSYz3TX0,36637
 bisheng_langchain/vectorstores/retriever.py,sha256=hj4nAAl352EV_ANnU2OHJn7omCH3nBK82ydo14KqMH4,4353
-bisheng_langchain-0.3.3.dev2.dist-info/METADATA,sha256=9JMcguR6d_cAwkNX3ynYJi55rnk6PjZSqfUIXH9gnG4,2489
-bisheng_langchain-0.3.3.dev2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-bisheng_langchain-0.3.3.dev2.dist-info/top_level.txt,sha256=Z6pPNyCo4ihyr9iqGQbH8sJiC4dAUwA_mAyGRQB5_Fs,18
-bisheng_langchain-0.3.3.dev2.dist-info/RECORD,,
+bisheng_langchain-0.3.4.dev1.dist-info/METADATA,sha256=wMwMyK4VrN7WiO_IYurW5jWRN_-oWfEgDzgIFgLoFbE,2476
+bisheng_langchain-0.3.4.dev1.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+bisheng_langchain-0.3.4.dev1.dist-info/top_level.txt,sha256=Z6pPNyCo4ihyr9iqGQbH8sJiC4dAUwA_mAyGRQB5_Fs,18
+bisheng_langchain-0.3.4.dev1.dist-info/RECORD,,

{bisheng_langchain-0.3.3.dev2.dist-info → bisheng_langchain-0.3.4.dev1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.43.0)
+Generator: bdist_wheel (0.44.0)
 Root-Is-Purelib: true
 Tag: py3-none-any