pycityagent 1.1.3__py3-none-any.whl → 1.1.5__py3-none-any.whl

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']
 
@@ -30,28 +32,39 @@ class UrbanLLM:
     def __init__(self, config: LLMConfig) -> None:
         self.config = config
 
-    def text_request(self, dialog:list[dict]) -> str:
+    def text_request(self, dialog:list[dict], temperature:float=1, max_tokens:int=None, top_p:float=None, frequency_penalty:float=None, presence_penalty:float=None) -> str:
         """
         文本相关请求
         Text request
 
         Args:
         - dialog (list[dict]): 标准的LLM文本dialog. The standard text LLM dialog
+        - temperature (float): default 1, used in openai
+        - max_tokens (int): default None, used in openai
+        - top_p (float): default None, used in openai
+        - frequency_penalty (float): default None, used in openai
+        - presence_penalty (float): default None, used in openai
 
         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'],
                 messages=dialog,
-                temperature=1.0,
+                temperature=temperature,
+                max_tokens=max_tokens,
+                top_p=top_p,
+                frequency_penalty=frequency_penalty,
+                presence_penalty=presence_penalty
             )
             return response.choices[0].message.content
         elif self.config.text['request_type'] == 'qwen':
@@ -75,7 +88,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.3.dist-info → pycityagent-1.1.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pycityagent
-Version: 1.1.3
+Version: 1.1.5
 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.3.dist-info → pycityagent-1.1.5.dist-info}/RECORD

@@ -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.3.dist-info/LICENSE,sha256=Yo9QmwLDFU3VoOc0W8aYSCa5Yj5sJyqM3FEcbC2jMQQ,1063
-pycityagent-1.1.3.dist-info/METADATA,sha256=w22vYIDhb2ND3fulYuuwBpxDvwalqrlQP8-ceFwQrVg,7657
-pycityagent-1.1.3.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-pycityagent-1.1.3.dist-info/top_level.txt,sha256=mf70CsOn3eVJBwHQ_TjCesoc-elD0Bj2WLsi5APRjlU,12
-pycityagent-1.1.3.dist-info/RECORD,,
+pycityagent/urbanllm/urbanllm.py,sha256=z6mJyvFbu4cotxLuen0ODZUIpba9SOUwNg3HEbrGylI,5176
+pycityagent-1.1.5.dist-info/LICENSE,sha256=Yo9QmwLDFU3VoOc0W8aYSCa5Yj5sJyqM3FEcbC2jMQQ,1063
+pycityagent-1.1.5.dist-info/METADATA,sha256=zBD0UWeliRWImn4hPEDfTNNlyymcJOfsWQ7bscUJlgs,7768
+pycityagent-1.1.5.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+pycityagent-1.1.5.dist-info/top_level.txt,sha256=mf70CsOn3eVJBwHQ_TjCesoc-elD0Bj2WLsi5APRjlU,12
+pycityagent-1.1.5.dist-info/RECORD,,