bisheng-langchain 0.3.0b0__py3-none-any.whl → 0.3.0rc0__py3-none-any.whl

bisheng_langchain/autogen_role/assistant.py

@@ -1,9 +1,8 @@
 """Chain that runs an arbitrary python function."""
 import logging
-import os
 from typing import Callable, Dict, Optional
 
-import openai
+import httpx
 from autogen import AssistantAgent
 from langchain.base_language import BaseLanguageModel
 
@@ -45,15 +44,6 @@ Reply "TERMINATE" in the end when everything is done.
     ):
         is_termination_msg = (is_termination_msg if is_termination_msg is not None else
                               (lambda x: x.get('content') == 'TERMINATE'))
-        if openai_proxy:
-            openai.proxy = {'https': openai_proxy, 'http': openai_proxy}
-        else:
-            openai.proxy = None
-        if openai_api_base:
-            openai.api_base = openai_api_base
-        else:
-            openai.api_base = os.environ.get('OPENAI_API_BASE', 'https://api.openai.com/v1')
-
         config_list = [
             {
                 'model': model_name,
@@ -63,17 +53,24 @@ Reply "TERMINATE" in the end when everything is done.
                 'api_version': api_version,
             },
         ]
-        llm_config = {
-            'seed': 42,  # change the seed for different trials
-            'temperature': temperature,
-            'config_list': config_list,
-            'request_timeout': 120,
-        }
+        if openai_proxy:
+            config_list[0]['http_client'] = httpx.Client(proxies=openai_proxy)
+            config_list[0]['http_async_client'] = httpx.AsyncClient(proxies=openai_proxy)
+
+        if llm:
+            llm_config = llm
+
+        else:
+            llm_config = {
+                'seed': 42,  # change the seed for different trials
+                'temperature': temperature,
+                'config_list': config_list,
+                'request_timeout': 120,
+            }
 
         super().__init__(
             name,
             llm_config=llm_config,
-            llm=llm,
             system_message=system_message,
             is_termination_msg=is_termination_msg,
             max_consecutive_auto_reply=None,

bisheng_langchain/autogen_role/custom.py

@@ -19,7 +19,6 @@ class AutoGenCustomRole(ConversableAgent):
                          human_input_mode='NEVER',
                          code_execution_config=False,
                          llm_config=False,
-                         llm=None,
                          **kwargs)
         self.func = func
         self.coroutine = coroutine

bisheng_langchain/autogen_role/groupchat_manager.py

@@ -1,9 +1,8 @@
 """Chain that runs an arbitrary python function."""
 import logging
-import os
 from typing import List, Optional
 
-import openai
+import httpx
 from autogen import Agent, GroupChat, GroupChatManager
 from langchain.base_language import BaseLanguageModel
 
@@ -20,6 +19,7 @@ class AutoGenGroupChatManager(GroupChatManager):
         self,
         agents: List[Agent],
         max_round: int = 50,
+        llm: Optional[BaseLanguageModel] = None,
         model_name: Optional[str] = 'gpt-4-0613',
         openai_api_key: Optional[str] = '',
         openai_api_base: Optional[str] = '',
@@ -28,7 +28,6 @@ class AutoGenGroupChatManager(GroupChatManager):
         api_type: Optional[str] = None,  # when llm_flag=True, need to set
         api_version: Optional[str] = None,  # when llm_flag=True, need to set
         name: Optional[str] = 'chat_manager',
-        llm: Optional[BaseLanguageModel] = None,
         system_message: Optional[str] = 'Group chat manager.',
         **kwargs,
     ):
@@ -37,15 +36,6 @@ class AutoGenGroupChatManager(GroupChatManager):
 
         groupchat = GroupChat(agents=agents, messages=[], max_round=max_round)
 
-        if openai_proxy:
-            openai.proxy = {'https': openai_proxy, 'http': openai_proxy}
-        else:
-            openai.proxy = None
-        if openai_api_base:
-            openai.api_base = openai_api_base
-        else:
-            openai.api_base = os.environ.get('OPENAI_API_BASE', 'https://api.openai.com/v1')
-
         config_list = [
             {
                 'model': model_name,
@@ -55,17 +45,23 @@ class AutoGenGroupChatManager(GroupChatManager):
                 'api_version': api_version,
             },
         ]
-        llm_config = {
-            'seed': 42,  # change the seed for different trials
-            'temperature': temperature,
-            'config_list': config_list,
-            'request_timeout': 120,
-        }
+        if openai_proxy:
+            config_list[0]['http_client'] = httpx.Client(proxies=openai_proxy)
+            config_list[0]['http_async_client'] = httpx.AsyncClient(proxies=openai_proxy)
+
+        if llm:
+            llm_config = llm
+        else:
+            llm_config = {
+                'seed': 42,  # change the seed for different trials
+                'temperature': temperature,
+                'config_list': config_list,
+                'request_timeout': 120,
+            }
 
         super().__init__(
             groupchat=groupchat,
             llm_config=llm_config,
-            llm=llm,
             name=name,
             system_message=system_message,
         )

bisheng_langchain/autogen_role/user.py

@@ -1,9 +1,8 @@
 """Chain that runs an arbitrary python function."""
 import logging
-import os
 from typing import Callable, Dict, Optional
 
-import openai
+import httpx
 from autogen import UserProxyAgent
 from langchain.base_language import BaseLanguageModel
 
@@ -47,14 +46,6 @@ class AutoGenUserProxyAgent(UserProxyAgent):
             code_execution_config = False
 
         if llm_flag:
-            if openai_proxy:
-                openai.proxy = {'https': openai_proxy, 'http': openai_proxy}
-            else:
-                openai.proxy = None
-            if openai_api_base:
-                openai.api_base = openai_api_base
-            else:
-                openai.api_base = os.environ.get('OPENAI_API_BASE', 'https://api.openai.com/v1')
             config_list = [
                 {
                     'model': model_name,
@@ -64,12 +55,19 @@ class AutoGenUserProxyAgent(UserProxyAgent):
                     'api_version': api_version,
                 },
             ]
-            llm_config = {
-                'seed': 42,  # change the seed for different trials
-                'temperature': temperature,
-                'config_list': config_list,
-                'request_timeout': 120,
-            }
+            if openai_proxy:
+                config_list[0]['http_client'] = httpx.Client(proxies=openai_proxy)
+                config_list[0]['http_async_client'] = httpx.AsyncClient(proxies=openai_proxy)
+
+            if llm:
+                llm_config = llm
+            else:
+                llm_config = {
+                    'seed': 42,  # change the seed for different trials
+                    'temperature': temperature,
+                    'config_list': config_list,
+                    'request_timeout': 120,
+                }
         else:
             llm_config = False
 
@@ -80,7 +78,6 @@ class AutoGenUserProxyAgent(UserProxyAgent):
                          function_map=function_map,
                          code_execution_config=code_execution_config,
                          llm_config=llm_config,
-                         llm=llm,
                          system_message=system_message)
 
 
@@ -109,7 +106,6 @@ class AutoGenUser(UserProxyAgent):
                          human_input_mode=human_input_mode,
                          code_execution_config=code_execution_config,
                          llm_config=llm_config,
-                         llm=None,
                          system_message=system_message)
 
 
@@ -140,5 +136,4 @@ class AutoGenCoder(UserProxyAgent):
                          function_map=function_map,
                          code_execution_config=code_execution_config,
                          llm_config=llm_config,
-                         llm=None,
                          system_message=system_message)

bisheng_langchain/gpts/tools/api_tools/base.py

@@ -49,10 +49,12 @@ class APIToolBase(BaseModel):
                                                      request_timeout=timeout)
         return values
 
-    def run(self, query: str) -> str:
+    def run(self, query: str, **kwargs) -> str:
         """Run query through api and parse result."""
         if query:
             self.params[self.input_key] = query
+        if kwargs:
+            self.params.update(kwargs)
         if self.params:
             param = '&'.join([f'{k}={v}' for k, v in self.params.items()])
             url = self.url + '?' + param if '?' not in self.url else self.url + '&' + param
@@ -64,10 +66,12 @@ class APIToolBase(BaseModel):
             logger.info('api_call_fail res={}', resp.text)
         return resp.text
 
-    async def arun(self, query: str) -> str:
+    async def arun(self, query: str, **kwargs) -> str:
         """Run query through api and parse result."""
         if query:
             self.params[self.input_key] = query
+        if kwargs:
+            self.params.update(kwargs)
         if self.params:
             param = '&'.join([f'{k}={v}' for k, v in self.params.items()])
             url = self.url + '?' + param if '?' not in self.url else self.url + '&' + param

bisheng_langchain/gpts/tools/api_tools/sina.py

@@ -8,6 +8,7 @@ from datetime import datetime
 from typing import List, Type
 
 from langchain_core.pydantic_v1 import BaseModel, Field
+from loguru import logger
 
 from .base import APIToolBase
 
@@ -139,9 +140,11 @@ class StockInfo(APIToolBase):
             ts = int(datetime.timestamp(date_obj) * 1000)
             stock = f'{stock_number}_240_{ts}'
             count = datetime.today() - date_obj
-            self.url = self.url.format(stockName=stock_number, stock=stock, count=count.days)
-
-            k_data = super().run('')
+            url = self.url.format(stockName=stock_number, stock=stock, count=count.days)
+            resp = self.client.get(url)
+            if resp.status_code != 200:
+                logger.info('api_call_fail res={}', resp.text)
+            k_data = resp.text
             data_array = json.loads(kLinePattern.search(k_data).group(1))
             for item in data_array:
                 if item.get('day') == date:
@@ -168,9 +171,8 @@ class StockInfo(APIToolBase):
             ts = int(datetime.timestamp(date_obj) * 1000)
             stock = f'{stock_number}_240_{ts}'
             count = datetime.today() - date_obj
-            self.url = self.url.format(stockName=stock_number, stock=stock, count=count.days)
-            k_data = await super().arun('')
-
+            url = self.url.format(stockName=stock_number, stock=stock, count=count.days)
+            k_data = await self.async_client.aget(url)
             data_array = json.loads(kLinePattern.search(k_data).group(1))
             for item in data_array:
                 if item.get('day') == date:

bisheng_langchain/gpts/tools/api_tools/tianyancha.py

@@ -114,29 +114,7 @@ class CompanyInfo(APIToolBase):
 
     @classmethod
     def all_companys_by_company(cls, api_key: str, pageSize: int = 20, pageNum: int = 1):
-        """可以通过公司名称获取企业人员的所有相关公司，包括其担任法人、股东、董监高的公司信息"""
-        url = 'http://open.api.tianyancha.com/services/v4/open/allCompanys'
-        input_key = 'name'
-        params = {}
-        params['pageSize'] = pageSize
-        params['pageNum'] = pageNum
-
-        class InputArgs(BaseModel):
-            """args_schema"""
-            query: str = Field(description='company name to query')
-
-        return cls(url=url,
-                   api_key=api_key,
-                   params=params,
-                   input_key=input_key,
-                   args_schema=InputArgs)
-
-    @classmethod
-    def all_companys_by_humanname(cls,
-                                  api_key: str,
-                                  pageSize: int = 20,
-                                  pageNum: int = 1) -> CompanyInfo:
-        """可以通过人名获取企业人员的所有相关公司，包括其担任法人、股东、董监高的公司信息"""
+        """可以通过公司名称和人名获取企业人员的所有相关公司，包括其担任法人、股东、董监高的公司信息"""
         url = 'http://open.api.tianyancha.com/services/v4/open/allCompanys'
         input_key = 'humanName'
         params = {}
@@ -145,7 +123,8 @@ class CompanyInfo(APIToolBase):
 
         class InputArgs(BaseModel):
             """args_schema"""
-            query: str = Field(description='human name to query')
+            query: str = Field(description='human who you want to search')
+            name: str = Field(description='company name which human worked')
 
         return cls(url=url,
                    api_key=api_key,

bisheng_langchain/vectorstores/elastic_keywords_search.py

@@ -132,7 +132,7 @@ class ElasticKeywordsSearch(VectorStore, ABC):
                 self.client.indices.delete(index=index_name)
             except elasticsearch.exceptions.NotFoundError:
                 pass
-        
+
     def add_texts(
         self,
         texts: Iterable[str],
@@ -195,6 +195,9 @@ class ElasticKeywordsSearch(VectorStore, ABC):
                           query_strategy: str = 'match_phrase',
                           must_or_should: str = 'should',
                           **kwargs: Any) -> List[Document]:
+        if k == 0:
+            # pm need to control
+            return []
         docs_and_scores = self.similarity_search_with_score(query,
                                                             k=k,
                                                             query_strategy=query_strategy,
@@ -218,6 +221,9 @@ class ElasticKeywordsSearch(VectorStore, ABC):
                                      query_strategy: str = 'match_phrase',
                                      must_or_should: str = 'should',
                                      **kwargs: Any) -> List[Tuple[Document, float]]:
+        if k == 0:
+            # pm need to control
+            return []
         assert must_or_should in ['must', 'should'], 'only support must and should.'
         # llm or jiaba extract keywords
         if self.llm_chain:
@@ -288,10 +294,17 @@ class ElasticKeywordsSearch(VectorStore, ABC):
         index_name = index_name or uuid.uuid4().hex
         if llm:
             llm_chain = LLMChain(llm=llm, prompt=prompt)
-            vectorsearch = cls(elasticsearch_url, index_name, llm_chain=llm_chain, drop_old=drop_old, **kwargs)
+            vectorsearch = cls(elasticsearch_url,
+                               index_name,
+                               llm_chain=llm_chain,
+                               drop_old=drop_old,
+                               **kwargs)
         else:
             vectorsearch = cls(elasticsearch_url, index_name, drop_old=drop_old, **kwargs)
-        vectorsearch.add_texts(texts, metadatas=metadatas, ids=ids, refresh_indices=refresh_indices)
+        vectorsearch.add_texts(texts,
+                               metadatas=metadatas,
+                               ids=ids,
+                               refresh_indices=refresh_indices)
 
         return vectorsearch
 

bisheng_langchain/vectorstores/milvus.py

@@ -552,6 +552,9 @@ class Milvus(MilvusLangchain):
         Returns:
             List[Document]: Document results for search.
         """
+        if k == 0:
+            # pm need to control
+            return []
         if self.col is None:
             logger.debug('No existing collection to search.')
             return []
@@ -587,6 +590,9 @@ class Milvus(MilvusLangchain):
         Returns:
             List[Document]: Document results for search.
         """
+        if k == 0:
+            # pm need to control
+            return []
         if self.col is None:
             logger.debug('No existing collection to search.')
             return []
@@ -626,6 +632,9 @@ class Milvus(MilvusLangchain):
         Returns:
             List[float], List[Tuple[Document, any, any]]:
         """
+        if k == 0:
+            # pm need to control
+            return []
         if self.col is None:
             logger.debug('No existing collection to search.')
             return []
@@ -669,6 +678,9 @@ class Milvus(MilvusLangchain):
         Returns:
             List[Tuple[Document, float]]: Result doc and score.
         """
+        if k == 0:
+            # pm need to control
+            return []
         if self.col is None:
             logger.debug('No existing collection to search.')
             return []
@@ -741,6 +753,9 @@ class Milvus(MilvusLangchain):
         Returns:
             List[Document]: Document results for search.
         """
+        if k == 0:
+            # pm need to control
+            return []
         if self.col is None:
             logger.debug('No existing collection to search.')
             return []
@@ -790,6 +805,9 @@ class Milvus(MilvusLangchain):
         Returns:
             List[Document]: Document results for search.
         """
+        if k == 0:
+            # pm need to control
+            return []
         if self.col is None:
             logger.debug('No existing collection to search.')
             return []
@@ -908,7 +926,7 @@ class Milvus(MilvusLangchain):
 
     def _select_relevance_score_fn(self) -> Callable[[float], float]:
         return self._relevance_score_fn
-    
+
     def query(self, expr: str, timeout: Optional[int] = None, **kwargs: Any) -> List[Document]:
         output_fields = self.fields[:]
         output_fields.remove(self._vector_field)

{bisheng_langchain-0.3.0b0.dist-info → bisheng_langchain-0.3.0rc0.dist-info}/METADATA

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

{bisheng_langchain-0.3.0b0.dist-info → bisheng_langchain-0.3.0rc0.dist-info}/RECORD

@@ -8,10 +8,10 @@ bisheng_langchain/agents/chatglm_functions_agent/prompt.py,sha256=OiBTRUOhvhSyO2
 bisheng_langchain/agents/llm_functions_agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bisheng_langchain/agents/llm_functions_agent/base.py,sha256=DbykNAk3vU2sfTPTSM2KotHygXgzAJSUmo4tA0h9ezc,12296
 bisheng_langchain/autogen_role/__init__.py,sha256=MnTGbAOK770JM9l95Qcxu93s2gNAmhlil7K9HdFG81o,430
-bisheng_langchain/autogen_role/assistant.py,sha256=VGCoxJaRxRG6ZIJa2TsxcLZbMbF4KC8PRB76DOuznNU,4736
-bisheng_langchain/autogen_role/custom.py,sha256=8xxtAzNF_N1fysyChynVD19t659Qvtcyj_LNiOrE7ew,2499
-bisheng_langchain/autogen_role/groupchat_manager.py,sha256=O9XIove5yzyF_g3K5DnF-Fasdx0sUrRWMogYgEDYJAI,2314
-bisheng_langchain/autogen_role/user.py,sha256=lISbJN5yFsUXHnDCUwr5t6R8O8K3dOMspH4l4_kITnE,5885
+bisheng_langchain/autogen_role/assistant.py,sha256=rqUaD6fbW6d1jtzfrUQv5pJMKJgVGLagllz8LvzPCxY,4657
+bisheng_langchain/autogen_role/custom.py,sha256=vAyEGxnmV9anyLL12v4ZB_A2VOPwdl-kjGP037I8jPw,2464
+bisheng_langchain/autogen_role/groupchat_manager.py,sha256=AybsH3duoAFpo3bojOYVeSOE4iYkkbgmYIga6m2Jj_Y,2234
+bisheng_langchain/autogen_role/user.py,sha256=fbaORhC7oQjxGhc2RYIWpELdIogFBsgqgQUhZsK6Osk,5715
 bisheng_langchain/chains/__init__.py,sha256=oxN2tUMt_kNxKd_FzCQ7x8xIwojtdCNNKo-DI7q0unM,759
 bisheng_langchain/chains/loader_output.py,sha256=02ZercAFaudStTZ4t7mcVkGRj5pD78HZ6NO8HbmbDH8,1903
 bisheng_langchain/chains/transform.py,sha256=G2fMqoMB62e03ES--aoVjEo06FzYWb87jCt3EOsiwwg,2805
@@ -81,11 +81,11 @@ bisheng_langchain/gpts/prompts/opening_dialog_prompt.py,sha256=U6SDslWuXAB1ZamLZ
 bisheng_langchain/gpts/prompts/select_tools_prompt.py,sha256=AyvVnrLEsQy7RHuGTPkcrMUxgA98Q0TzF-xweoc7GyY,1400
 bisheng_langchain/gpts/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bisheng_langchain/gpts/tools/api_tools/__init__.py,sha256=mrmTV5bT5R1mEx9hbMAWKzNAAC4EL6biNn53dx5lYsc,1593
-bisheng_langchain/gpts/tools/api_tools/base.py,sha256=TF5MW0e62YvcfABp_-U32ESMKvN9CXPFKqiCeaZ3xFk,3458
+bisheng_langchain/gpts/tools/api_tools/base.py,sha256=t0gFRiXD-2InCHNDU_T1H0eSMXsWP_2sHBeLJ0bZOkc,3594
 bisheng_langchain/gpts/tools/api_tools/flow.py,sha256=u1_ASWlCcZarKR-293kACB_qQ1RzJuzPC3YZSl2JR-E,1814
 bisheng_langchain/gpts/tools/api_tools/macro_data.py,sha256=rlFNhjJ3HEHfWeW9Wqb27eeF1Q1Qmd2SA8VfgUK4ACs,19270
-bisheng_langchain/gpts/tools/api_tools/sina.py,sha256=A8YDLko3lptBxkGN2_e42GWfcrEgwJAZyp2wouC1Qvg,9340
-bisheng_langchain/gpts/tools/api_tools/tianyancha.py,sha256=sQbjPt8K0dLupFprWwc_z938DBB8nB7ydyIV5frWSJ0,7461
+bisheng_langchain/gpts/tools/api_tools/sina.py,sha256=tY4MXHNBEUiBN1wld2un_w7nHW_njXV7haLo3sgpDf0,9502
+bisheng_langchain/gpts/tools/api_tools/tianyancha.py,sha256=abDAz-yAH1-2rKiSmZ6TgnrNUnpgAZpDY8oDiWfWapc,6684
 bisheng_langchain/gpts/tools/bing_search/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bisheng_langchain/gpts/tools/bing_search/tool.py,sha256=v_VlqcMplITA5go5qWA4qZ5p43E1-1s0bzmyY7H0hqY,1710
 bisheng_langchain/gpts/tools/calculator/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -105,10 +105,10 @@ bisheng_langchain/retrievers/mix_es_vector.py,sha256=dSrrsuMPSgGiu181EOzACyIKiDX
 bisheng_langchain/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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=ACUzgeTwzVOVrm0EqBXF_VhzwrWZJbKYQgqNSW5VhbQ,12929
-bisheng_langchain/vectorstores/milvus.py,sha256=hk1XqmWoz04lltubzRcZHEcXXFMkxMeK84hH0GZoo1c,35857
+bisheng_langchain/vectorstores/elastic_keywords_search.py,sha256=JV_GM40cYx0PtPPvH2JYxtsMV0psSW2CDKagpR4M_0o,13286
+bisheng_langchain/vectorstores/milvus.py,sha256=lrnezKnYXhyH5M1g3a-Mcwpj9mwzAj44TKmzyUXlQYY,36297
 bisheng_langchain/vectorstores/retriever.py,sha256=hj4nAAl352EV_ANnU2OHJn7omCH3nBK82ydo14KqMH4,4353
-bisheng_langchain-0.3.0b0.dist-info/METADATA,sha256=ib2MCOn7ntlsILSxun7xakoaW3K53UmhWt750yiSZGg,2413
-bisheng_langchain-0.3.0b0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-bisheng_langchain-0.3.0b0.dist-info/top_level.txt,sha256=Z6pPNyCo4ihyr9iqGQbH8sJiC4dAUwA_mAyGRQB5_Fs,18
-bisheng_langchain-0.3.0b0.dist-info/RECORD,,
+bisheng_langchain-0.3.0rc0.dist-info/METADATA,sha256=-wUMNJfiSIK6i3D9pP74PdmDKuLtDcrW3BcNpNzqv1A,2414
+bisheng_langchain-0.3.0rc0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+bisheng_langchain-0.3.0rc0.dist-info/top_level.txt,sha256=Z6pPNyCo4ihyr9iqGQbH8sJiC4dAUwA_mAyGRQB5_Fs,18
+bisheng_langchain-0.3.0rc0.dist-info/RECORD,,