beswarm 0.2.25__py3-none-any.whl → 0.2.26__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. beswarm/aient/setup.py +1 -1
  2. beswarm/aient/src/aient/core/request.py +0 -4
  3. beswarm/aient/src/aient/core/response.py +7 -1
  4. beswarm/aient/src/aient/plugins/websearch.py +2 -1
  5. beswarm/tools/search_web.py +1 -0
  6. {beswarm-0.2.25.dist-info → beswarm-0.2.26.dist-info}/METADATA +1 -1
  7. {beswarm-0.2.25.dist-info → beswarm-0.2.26.dist-info}/RECORD +9 -9
  8. {beswarm-0.2.25.dist-info → beswarm-0.2.26.dist-info}/WHEEL +0 -0
  9. {beswarm-0.2.25.dist-info → beswarm-0.2.26.dist-info}/top_level.txt +0 -0
beswarm/aient/setup.py CHANGED
@@ -4,7 +4,7 @@ from setuptools import setup, find_packages
4
4
 
5
5
  setup(
6
6
  name="aient",
7
- version="1.1.46",
7
+ version="1.1.47",
8
8
  description="Aient: The Awakening of Agent.",
9
9
  long_description=Path.open(Path("README.md"), encoding="utf-8").read(),
10
10
  long_description_content_type="text/markdown",
beswarm/aient/src/aient/core/request.py CHANGED
@@ -256,8 +256,6 @@ async def get_gemini_payload(request, engine, provider, api_key=None):
256
256
  elif val > 24576:
257
257
  val = 24576
258
258
  payload["generationConfig"]["thinkingConfig"]["thinkingBudget"] = val
259
- if val == 0:
260
- payload["generationConfig"].pop("thinkingConfig", None)
261
259
  except ValueError:
262
260
  # 如果转换为整数失败，忽略思考预算设置
263
261
  pass
@@ -554,8 +552,6 @@ async def get_vertex_gemini_payload(request, engine, provider, api_key=None):
554
552
  elif val > 24576:
555
553
  val = 24576
556
554
  payload["generationConfig"]["thinkingConfig"]["thinkingBudget"] = val
557
- if val == 0:
558
- payload["generationConfig"].pop("thinkingConfig", None)
559
555
  except ValueError:
560
556
  # 如果转换为整数失败，忽略思考预算设置
561
557
  pass
beswarm/aient/src/aient/core/response.py CHANGED
@@ -141,7 +141,13 @@ async def fetch_gemini_response_stream(client, url, headers, payload, model):
141
141
  sse_string = await generate_sse_response(timestamp, model, content=None, tools_id="chatcmpl-9inWv0yEtgn873CxMBzHeCeiHctTV", function_call_name=None, function_call_content=function_full_response)
142
142
  yield sse_string
143
143
 
144
- if cache_buffer == "[]":
144
+ cache_buffer_json = {}
145
+ try:
146
+ cache_buffer_json = json.loads(cache_buffer)
147
+ except json.JSONDecodeError:
148
+ cache_buffer_json = {}
149
+
150
+ if cache_buffer == "[]" or safe_get(cache_buffer_json, 0, "promptFeedback", "blockReason") == "PROHIBITED_CONTENT":
145
151
  sse_string = await generate_sse_response(timestamp, model, stop="PROHIBITED_CONTENT")
146
152
  yield sse_string
147
153
  else:
beswarm/aient/src/aient/plugins/websearch.py CHANGED
@@ -83,7 +83,7 @@ def jina_ai_Web_crawler(url: str, isSearch=False) -> str:
83
83
  from bs4 import BeautifulSoup
84
84
  requests.packages.urllib3.disable_warnings()
85
85
  url = "https://r.jina.ai/" + url
86
- response = requests.get(url, headers=headers, verify=False, timeout=5, stream=True)
86
+ response = requests.get(url, headers=headers, verify=False, timeout=20, stream=True)
87
87
  if response.status_code == 404:
88
88
  print("Page not found:", url)
89
89
  return "抱歉，网页不存在，目前无法访问该网页。@Trash@"
@@ -133,6 +133,7 @@ def get_url_content(url: str) -> str:
133
133
  # print(markdown_content)
134
134
  # print('-----------------------------')
135
135
  jina_content = jina_ai_Web_crawler(url)
136
+ # print(jina_content)
136
137
  # print('-----------------------------')
137
138
 
138
139
  # 定义评分函数
beswarm/tools/search_web.py CHANGED
@@ -368,5 +368,6 @@ if __name__ == '__main__':
368
368
  print(results)
369
369
 
370
370
  asyncio.run(main())
371
+ # print(get_url_content("https://www.ces.org.cn/res/ces/2308/69c936072d86b5161d7cca95c30ea832.pdf"))
371
372
 
372
373
  # python -m beswarm.tools.search_web
{beswarm-0.2.25.dist-info → beswarm-0.2.26.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: beswarm
3
- Version: 0.2.25
3
+ Version: 0.2.26
4
4
  Summary: MAS
5
5
  Requires-Python: >=3.11
6
6
  Description-Content-Type: text/markdown
{beswarm-0.2.25.dist-info → beswarm-0.2.26.dist-info}/RECORD RENAMED
@@ -2,13 +2,13 @@ beswarm/__init__.py,sha256=HZjUOJtZR5QhMuDbq-wukQQn1VrBusNWai_ysGo-VVI,20
2
2
  beswarm/prompt.py,sha256=5JMfOuXWHscsaeDzwBn223mj9N85eAQdOHXQZk7zeWE,32238
3
3
  beswarm/utils.py,sha256=xxbNifOPlfcVkKmF_qFzuEnZgF3MQg3mnOfz1EF0Qss,6697
4
4
  beswarm/aient/main.py,sha256=SiYAIgQlLJqYusnTVEJOx1WNkSJKMImhgn5aWjfroxg,3814
5
- beswarm/aient/setup.py,sha256=TTd2yaKXQpCf2v-b35OeJhLMXEJ-QRkhO48wTq7edKk,487
5
+ beswarm/aient/setup.py,sha256=mDFzdO4betWxiHRtK2bR9z4ahWthoYip79BFKMMGvFo,487
6
6
  beswarm/aient/src/aient/__init__.py,sha256=SRfF7oDVlOOAi6nGKiJIUK6B_arqYLO9iSMp-2IZZps,21
7
7
  beswarm/aient/src/aient/core/__init__.py,sha256=NxjebTlku35S4Dzr16rdSqSTWUvvwEeACe8KvHJnjPg,34
8
8
  beswarm/aient/src/aient/core/log_config.py,sha256=kz2_yJv1p-o3lUQOwA3qh-LSc3wMHv13iCQclw44W9c,274
9
9
  beswarm/aient/src/aient/core/models.py,sha256=d4MISNezTSe0ls0-fjuToI2SoT-sk5fWqAJuKVinIlo,7502
10
- beswarm/aient/src/aient/core/request.py,sha256=r8IvC62GZ6NuBXx82Fd0hiPjYrtqhW3hKz2jdqVY8L0,72473
11
- beswarm/aient/src/aient/core/response.py,sha256=_FVvvakplKAvBMljXy8jm9hMGJ8xgHGrsU8Aio9Xk1o,35408
10
+ beswarm/aient/src/aient/core/request.py,sha256=8HlSFaBhWMs5thhL4C5qj-hvuDZWUXCYWwVShFR99QU,72263
11
+ beswarm/aient/src/aient/core/response.py,sha256=xSOmc4aBFeoT-Cx42B6GrRvsxalx-dOiGdjN1WByyXs,35673
12
12
  beswarm/aient/src/aient/core/utils.py,sha256=NcXdb8zBN0GE01OGaUzg8U34RaraoFf2MaLDDGFvvC4,27492
13
13
  beswarm/aient/src/aient/core/test/test_base_api.py,sha256=pWnycRJbuPSXKKU9AQjWrMAX1wiLC_014Qc9hh5C2Pw,524
14
14
  beswarm/aient/src/aient/core/test/test_geminimask.py,sha256=HFX8jDbNg_FjjgPNxfYaR-0-roUrOO-ND-FVsuxSoiw,13254
@@ -35,7 +35,7 @@ beswarm/aient/src/aient/plugins/read_image.py,sha256=4FbIiMNVFUQpNyiH5ApGSRvOD9u
35
35
  beswarm/aient/src/aient/plugins/readonly.py,sha256=qK5-kBM3NDH1b-otFxFHpAjV5BXEY_e7cTWBcpP7G5k,710
36
36
  beswarm/aient/src/aient/plugins/registry.py,sha256=YknzhieU_8nQ3oKlUSSWDB4X7t2Jx0JnqT2Jd9Xsvfk,3574
37
37
  beswarm/aient/src/aient/plugins/run_python.py,sha256=MohvdtZUTDLrHBDtJ9L2_Qu1pWAGrkbzsGmmn5tMN20,4614
38
- beswarm/aient/src/aient/plugins/websearch.py,sha256=51tNjEe3pAElXY3SIxaXFYjRrHdGiY6nkmVPU1lTWoY,15258
38
+ beswarm/aient/src/aient/plugins/websearch.py,sha256=LPS5NmHrY-Rc0FCPlhHrUWE90XJmXF_AvShLHTV_Zqc,15285
39
39
  beswarm/aient/src/aient/plugins/write_file.py,sha256=hExFLuoNPtjYxJI3pVbofZRpokvUabpXdEkd3mZJPPc,3778
40
40
  beswarm/aient/src/aient/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
41
41
  beswarm/aient/src/aient/utils/prompt.py,sha256=UcSzKkFE4-h_1b6NofI6xgk3GoleqALRKY8VBaXLjmI,11311
@@ -133,10 +133,10 @@ beswarm/tools/repomap.py,sha256=YsTPq5MXfn_Ds5begcvHDnY_Xp2d4jH-xmWqNMHnNHY,4523
133
133
  beswarm/tools/request_input.py,sha256=gXNAJPOJektMqxJVyzNTFOeMQ7xUkO-wWMYH-r2Rdwk,942
134
134
  beswarm/tools/screenshot.py,sha256=u6t8FCgW5YHJ_Oc4coo8e0F3wTusWE_-H8dFh1rBq9Q,1011
135
135
  beswarm/tools/search_arxiv.py,sha256=caVIUOzMhFu-r_gVgJZrH2EO9xI5iV_qLAg0b3Ie9Xg,8095
136
- beswarm/tools/search_web.py,sha256=eEE_aRcocttAwWfkcQdElI_BZw73xiRIEfbHDWAoQqU,15996
136
+ beswarm/tools/search_web.py,sha256=XkKb2_Snm4-bIOrkMhsyxao0-VPsYmfM2CKQbJ5TGFI,16101
137
137
  beswarm/tools/taskmanager.py,sha256=oB_768qy6Lb58JNIcSLVgbPrgNB3duIq9DawbVHRbrg,6270
138
138
  beswarm/tools/worker.py,sha256=Vwn1XuTZ2dIStd5dQ6DhJ4f7LmwDc-Sx9PwLG0Xw-MQ,24062
139
- beswarm-0.2.25.dist-info/METADATA,sha256=Wwq8gqLH0xv1KMUkNsbfZEw6XRGKNORHzNTMXyPLjxs,3847
140
- beswarm-0.2.25.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
141
- beswarm-0.2.25.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
142
- beswarm-0.2.25.dist-info/RECORD,,
139
+ beswarm-0.2.26.dist-info/METADATA,sha256=638-bD8BpgtGfE2LsDrxqUu0X1orew1iwDtVhGzQmJM,3847
140
+ beswarm-0.2.26.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
141
+ beswarm-0.2.26.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
142
+ beswarm-0.2.26.dist-info/RECORD,,