pycityagent 1.1.2__py3-none-any.whl → 1.1.4__py3-none-any.whl

pycityagent/simulator.py

@@ -45,7 +45,7 @@ class Simulator:
             mongo_coll = config['map_request']['mongo_coll'],
             cache_dir = config['map_request']['cache_dir'],
         )
-        self.routing = RoutingClient(self.config['route_request']['server'], True)
+        self.routing = RoutingClient(self.config['route_request']['server'])
         self.time = 0
 
     # * Agent相关

pycityagent/urbanllm/urbanllm.py

@@ -19,6 +19,8 @@ class LLMConfig:
     ) -> None:
         self.config = config
         self.text = config['text_request']
+        if 'api_base' in self.text.keys() and self.text['api_base'] == 'None':
+            self.text['api_base'] = None
         self.image_u = config['img_understand_request']
         self.image_g = config['img_generate_request']
 
@@ -41,12 +43,14 @@ class UrbanLLM:
         Returns:
         - (str): the response content
         """
-        client = None if self.config.text['http_client'] == None else self.config.text['http_client']
+        if 'api_base' in self.config.text.keys():
+            api_base = self.config.text['api_base']
+        else:
+            api_base = None
         if self.config.text['request_type'] == 'openai':
             client = OpenAI(
                 api_key=self.config.text['api_key'], 
-                base_url=self.config.text['api_base'],
-                http_client=client
+                base_url=api_base,
             )
             response = client.chat.completions.create(
                 model=self.config.text['model'],
@@ -75,7 +79,7 @@ class UrbanLLM:
         Image understanding
 
         Args:
-        - img_path: 图像的绝对路径. The absolute path of selected Image
+        - img_path: 目标图像的路径. The path of selected Image
         - prompt: 理解提示词 - 例如理解方向. The understanding prompts
 
         Returns:

{pycityagent-1.1.2.dist-info → pycityagent-1.1.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pycityagent
-Version: 1.1.2
+Version: 1.1.4
 Summary: LLM-based城市模拟器agent构建库
 Author-email: Yuwei Yan <pinkgranite86@gmail.com>
 License: MIT License
@@ -77,7 +77,7 @@ llm_request:
     request_type: openai / qwen
     api_key: xxx
     model: xxx
-    http_client: xxx (if you use opanai and want to use your own backend LLM model)
+    (api_base): xxx (this is an optional config, if you use opanai and want to use your own backend LLM model, default to "https://api.openai.com/v1")
   img_understand_request:
     request_type: qwen
     api_key: xxx
@@ -113,7 +113,8 @@ apphub_request:
 - By now, we support [**qwen**](https://tongyi.aliyun.com/) and [**openai**](https://openai.com/)
     - `Notice: Our environments are basically conducted with qwen. If you prefer to use openai, then you may encounter hardships. AND fell free to issue us.`
 - Get your **api_key** and chooce your **model**
-- If you want to use your backend models, set the **http_client** (only available when using **openai**)
+- If you want to use your backend models, set the **api_base** (only available when using **openai**)
+  - default value: "https://api.openai.com/v1"
 
 #### CITYSIM_REQUEST
 - Most of the configuration options in this part are determined, such as **simulator.server**, **map_request.mongo_coll**, **route_request.server**

{pycityagent-1.1.2.dist-info → pycityagent-1.1.4.dist-info}/RECORD

@@ -2,7 +2,7 @@ pycityagent/__init__.py,sha256=UWAMvcctp49-8QaRHr2wuR4mLPNvUQ9ocQaXPVLHonI,186
 pycityagent/agent.py,sha256=FxbQiP1IDhuBQuUI8IQeY8eFbr18NQxCiBefWICGnQc,8165
 pycityagent/agent_citizen.py,sha256=AnU9LTP1vGccO7MIxcCYwT40S5Wd9XexO77xjb_oNDc,4972
 pycityagent/agent_func.py,sha256=_9-68KECa0yi867XsXECT8goAw6VogPtb6ba4lNmHJY,4212
-pycityagent/simulator.py,sha256=pX8jTxXl7w6WA4nliJFht74tY-dhOl8dvRvX0U5G00Y,5200
+pycityagent/simulator.py,sha256=f8IATajGMuUHaHQV_152tFQQAMv2aVWbusrVpjx3LZI,5194
 pycityagent/ac/__init__.py,sha256=ya2NEJ_GagbNc52uFkmPjTGm9FoFy5pRrhXlm0SCt3s,330
 pycityagent/ac/ac.py,sha256=hln8_Dv05tBLcSXd2yso09Z5hsZkvqYBxk6o-sZKia8,2229
 pycityagent/ac/action.py,sha256=MoJ-czSY8AIPDxUzD8-rLrbZIcomovmHvEkMLCTNOTw,1954
@@ -50,9 +50,9 @@ pycityagent/image/image.py,sha256=KyOBoX8I1KSi82lBCBku-NXgXX4gIFHi2cGEe7yQ-lI,53
 pycityagent/st/__init__.py,sha256=YzsQXrgqRvmoQ4dWqAztAriKd8wvnQVe0FOpX_oZmiY,109
 pycityagent/st/st.py,sha256=z6yDo7ADOjostLg0mLmQ0oa_VysaCXFm4MnzC2H9nsI,5154
 pycityagent/urbanllm/__init__.py,sha256=D24mYFXdIEL2vbvB7Cp_BGgJvg-tvEnCgtEAAGaqGDY,56
-pycityagent/urbanllm/urbanllm.py,sha256=okwHKRg-tuFBizkeH6dbF2KPH5Y-hC6Aufn2fX10-t0,4481
-pycityagent-1.1.2.dist-info/LICENSE,sha256=Yo9QmwLDFU3VoOc0W8aYSCa5Yj5sJyqM3FEcbC2jMQQ,1063
-pycityagent-1.1.2.dist-info/METADATA,sha256=ab6Q31q_aOubjg-tlL7VlH0mucU63w6aqER08dJ0vNU,7657
-pycityagent-1.1.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-pycityagent-1.1.2.dist-info/top_level.txt,sha256=mf70CsOn3eVJBwHQ_TjCesoc-elD0Bj2WLsi5APRjlU,12
-pycityagent-1.1.2.dist-info/RECORD,,
+pycityagent/urbanllm/urbanllm.py,sha256=7Dc71zGHvvPj1pV76ZzIMPheTVzmsoaL-fw0uc3RJb0,4579
+pycityagent-1.1.4.dist-info/LICENSE,sha256=Yo9QmwLDFU3VoOc0W8aYSCa5Yj5sJyqM3FEcbC2jMQQ,1063
+pycityagent-1.1.4.dist-info/METADATA,sha256=18S7XJjHvyBnTUtlK0KmAEZld1dgidg1jpAbe339Atg,7768
+pycityagent-1.1.4.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+pycityagent-1.1.4.dist-info/top_level.txt,sha256=mf70CsOn3eVJBwHQ_TjCesoc-elD0Bj2WLsi5APRjlU,12
+pycityagent-1.1.4.dist-info/RECORD,,