pycityagent 1.1.1__tar.gz → 1.1.3__tar.gz

{pycityagent-1.1.1 → pycityagent-1.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pycityagent
-Version: 1.1.1
+Version: 1.1.3
 Summary: LLM-based城市模拟器agent构建库
 Author-email: Yuwei Yan <pinkgranite86@gmail.com>
 License: MIT License
@@ -74,9 +74,10 @@ Requires-Dist: transitions>=0.9.0
 ```yaml
 llm_request:
   text_request:
-    request_type: qwen
+    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)
   img_understand_request:
     request_type: qwen
     api_key: xxx
@@ -111,7 +112,8 @@ apphub_request:
 - As you can see, the whole CityAgent is based on the LLM, by now, there are three different parts of config items: **text_request**, **img_understand_request** and **img_generate_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**s
+- 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**)
 
 #### 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.1 → pycityagent-1.1.3}/README.md

@@ -27,9 +27,10 @@
 ```yaml
 llm_request:
   text_request:
-    request_type: qwen
+    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)
   img_understand_request:
     request_type: qwen
     api_key: xxx
@@ -64,7 +65,8 @@ apphub_request:
 - As you can see, the whole CityAgent is based on the LLM, by now, there are three different parts of config items: **text_request**, **img_understand_request** and **img_generate_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**s
+- 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**)
 
 #### 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.1 → pycityagent-1.1.3}/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-1.1.1 → pycityagent-1.1.3}/pycityagent/urbanllm/urbanllm.py

@@ -41,10 +41,12 @@ class UrbanLLM:
         Returns:
         - (str): the response content
         """
+        client = None if self.config.text['http_client'] == None else self.config.text['http_client']
         if self.config.text['request_type'] == 'openai':
             client = OpenAI(
                 api_key=self.config.text['api_key'], 
-                base_url=self.config.text['api_base']
+                base_url=self.config.text['api_base'],
+                http_client=client
             )
             response = client.chat.completions.create(
                 model=self.config.text['model'],
@@ -53,7 +55,6 @@ class UrbanLLM:
             )
             return response.choices[0].message.content
         elif self.config.text['request_type'] == 'qwen':
-
             response = dashscope.Generation.call(
                 model=self.config.text['model'],
                 api_key=self.config.text['api_key'],

{pycityagent-1.1.1 → pycityagent-1.1.3}/pycityagent.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pycityagent
-Version: 1.1.1
+Version: 1.1.3
 Summary: LLM-based城市模拟器agent构建库
 Author-email: Yuwei Yan <pinkgranite86@gmail.com>
 License: MIT License
@@ -74,9 +74,10 @@ Requires-Dist: transitions>=0.9.0
 ```yaml
 llm_request:
   text_request:
-    request_type: qwen
+    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)
   img_understand_request:
     request_type: qwen
     api_key: xxx
@@ -111,7 +112,8 @@ apphub_request:
 - As you can see, the whole CityAgent is based on the LLM, by now, there are three different parts of config items: **text_request**, **img_understand_request** and **img_generate_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**s
+- 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**)
 
 #### CITYSIM_REQUEST
 - Most of the configuration options in this part are determined, such as **simulator.server**, **map_request.mongo_coll**, **route_request.server**