pycityagent 2.0.0a20__py3-none-any.whl → 2.0.0a22__py3-none-any.whl

pycityagent/simulation/storage/pg.py

@@ -0,0 +1,139 @@
+import asyncio
+from collections import defaultdict
+from typing import Any
+
+import psycopg
+import psycopg.sql
+import ray
+from psycopg.rows import dict_row
+
+from ...utils.decorators import lock_decorator
+from ...utils.pg_query import PGSQL_DICT
+
+
+def create_pg_tables(exp_id: str, dsn: str):
+    for table_type, exec_strs in PGSQL_DICT.items():
+        table_name = f"socialcity_{exp_id.replace('-', '_')}_{table_type}"
+        # # debug str
+        # for _str in [f"DROP TABLE IF EXISTS {table_name}"] + [
+        #     _exec_str.format(table_name=table_name) for _exec_str in exec_strs
+        # ]:
+        #     print(_str)
+        with psycopg.connect(dsn) as conn:
+            with conn.cursor() as cur:
+                # delete table
+                cur.execute(f"DROP TABLE IF EXISTS {table_name}")  # type:ignore
+                conn.commit()
+                # create table
+                for _exec_str in exec_strs:
+                    cur.execute(_exec_str.format(table_name=table_name))
+                conn.commit()
+
+
+@ray.remote
+class PgWriter:
+    def __init__(self, exp_id: str, dsn: str):
+        self.exp_id = exp_id
+        self._dsn = dsn
+        # self._lock = asyncio.Lock()
+
+    # @lock_decorator
+    async def async_write_dialog(self, rows: list[tuple]):
+        _tuple_types = [str, int, float, int, str, str, str, None]
+        table_name = f"socialcity_{self.exp_id.replace('-', '_')}_agent_dialog"
+        # 将数据插入数据库
+        async with await psycopg.AsyncConnection.connect(self._dsn) as aconn:
+            copy_sql = psycopg.sql.SQL(
+                "COPY {} (id, day, t, type, speaker, content, created_at) FROM STDIN"
+            ).format(psycopg.sql.Identifier(table_name))
+            async with aconn.cursor() as cur:
+                async with cur.copy(copy_sql) as copy:
+                    for row in rows:
+                        _row = [
+                            _type(r) if _type is not None else r
+                            for (_type, r) in zip(_tuple_types, row)
+                        ]
+                        await copy.write_row(_row)
+
+    # @lock_decorator
+    async def async_write_status(self, rows: list[tuple]):
+        _tuple_types = [str, int, float, float, float, int, str, str, None]
+        table_name = f"socialcity_{self.exp_id.replace('-', '_')}_agent_status"
+        async with await psycopg.AsyncConnection.connect(self._dsn) as aconn:
+            copy_sql = psycopg.sql.SQL(
+                "COPY {} (id, day, t, lng, lat, parent_id, action, status, created_at) FROM STDIN"
+            ).format(psycopg.sql.Identifier(table_name))
+            async with aconn.cursor() as cur:
+                async with cur.copy(copy_sql) as copy:
+                    for row in rows:
+                        _row = [
+                            _type(r) if _type is not None else r
+                            for (_type, r) in zip(_tuple_types, row)
+                        ]
+                        await copy.write_row(_row)
+
+    # @lock_decorator
+    async def async_write_profile(self, rows: list[tuple]):
+        _tuple_types = [str, str, str]
+        table_name = f"socialcity_{self.exp_id.replace('-', '_')}_agent_profile"
+        async with await psycopg.AsyncConnection.connect(self._dsn) as aconn:
+            copy_sql = psycopg.sql.SQL("COPY {} (id, name, profile) FROM STDIN").format(
+                psycopg.sql.Identifier(table_name)
+            )
+            async with aconn.cursor() as cur:
+                async with cur.copy(copy_sql) as copy:
+                    for row in rows:
+                        _row = [
+                            _type(r) if _type is not None else r
+                            for (_type, r) in zip(_tuple_types, row)
+                        ]
+                        await copy.write_row(_row)
+
+    # @lock_decorator
+    async def async_write_survey(self, rows: list[tuple]):
+        _tuple_types = [str, int, float, str, str, None]
+        table_name = f"socialcity_{self.exp_id.replace('-', '_')}_agent_survey"
+        async with await psycopg.AsyncConnection.connect(self._dsn) as aconn:
+            copy_sql = psycopg.sql.SQL(
+                "COPY {} (id, day, t, survey_id, result, created_at) FROM STDIN"
+            ).format(psycopg.sql.Identifier(table_name))
+            async with aconn.cursor() as cur:
+                async with cur.copy(copy_sql) as copy:
+                    for row in rows:
+                        _row = [
+                            _type(r) if _type is not None else r
+                            for (_type, r) in zip(_tuple_types, row)
+                        ]
+                        await copy.write_row(_row)
+
+    # @lock_decorator
+    async def async_update_exp_info(self, exp_info: dict[str, Any]):
+        # timestamp不做类型转换
+        TO_UPDATE_EXP_INFO_KEYS_AND_TYPES = [
+            ("id", str),
+            ("name", str),
+            ("num_day", int),
+            ("status", int),
+            ("cur_day", int),
+            ("cur_t", float),
+            ("config", str),
+            ("error", str),
+            ("created_at", None),
+            ("updated_at", None),
+        ]
+        table_name = f"socialcity_{self.exp_id.replace('-', '_')}_experiment"
+        async with await psycopg.AsyncConnection.connect(self._dsn) as aconn:
+            async with aconn.cursor(row_factory=dict_row) as cur:
+                # UPDATE
+                columns = ", ".join(
+                    f"{key} = %s" for key, _ in TO_UPDATE_EXP_INFO_KEYS_AND_TYPES
+                )
+                update_sql = psycopg.sql.SQL(
+                    f"UPDATE {{}} SET {columns} WHERE id = %s"  # type:ignore
+                ).format(psycopg.sql.Identifier(table_name))
+                params = [
+                    _type(exp_info[key]) if _type is not None else exp_info[key]
+                    for key, _type in TO_UPDATE_EXP_INFO_KEYS_AND_TYPES
+                ] + [self.exp_id]
+                await cur.execute(update_sql, params)
+                await aconn.commit()

pycityagent/utils/parsers/json_parser.py

@@ -1,6 +1,6 @@
 import json
 import logging
-from typing import Any, Dict
+from typing import Any
 
 from .parser_base import ParserBase
 
@@ -67,14 +67,14 @@ class JsonDictParser(JsonObjectParser):
         """Initialize the JsonDictParser with default tags."""
         super().__init__()
 
-    def parse(self, response: str) -> Dict:
+    def parse(self, response: str) -> dict:
         """Parse the response string to extract and return a JSON object as a dictionary.
 
         Parameters:
             response (str): The response string containing the JSON object.
 
         Returns:
-            Dict: The parsed JSON object as a dictionary.
+            dict: The parsed JSON object as a dictionary.
         """
         parsed_json = super().parse(response)
         if not isinstance(parsed_json, dict):

pycityagent/utils/pg_query.py

@@ -0,0 +1,80 @@
+from typing import Any
+
+PGSQL_DICT: dict[str, list[Any]] = {
+    # Experiment
+    "experiment": [
+        """
+    CREATE TABLE IF NOT EXISTS {table_name} (
+        id UUID PRIMARY KEY,
+        name TEXT,
+        num_day INT4,
+        status INT4, 
+        cur_day INT4,
+        cur_t FLOAT,
+        config TEXT,
+        error TEXT,
+        created_at TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        updated_at TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP
+    )
+""",
+    ],
+    # Agent Profile
+    "agent_profile": [
+        """
+    CREATE TABLE IF NOT EXISTS {table_name} (
+        id UUID PRIMARY KEY,
+        name TEXT,
+        profile JSONB
+    )
+""",
+    ],
+    # Agent Dialog
+    "agent_dialog": [
+        """
+    CREATE TABLE IF NOT EXISTS {table_name} (
+        id UUID,
+        day INT4,
+        t FLOAT,
+        type INT4,
+        speaker TEXT,
+        content TEXT,
+        created_at TIMESTAMPTZ
+    )
+""",
+        "CREATE INDEX {table_name}_id_idx ON {table_name} (id)",
+        "CREATE INDEX {table_name}_day_t_idx ON {table_name} (day,t)",
+    ],
+    # Agent Status
+    "agent_status": [
+        """
+    CREATE TABLE IF NOT EXISTS {table_name} (
+        id UUID,
+        day INT4,
+        t FLOAT,
+        lng DOUBLE PRECISION,
+        lat DOUBLE PRECISION,
+        parent_id INT4,
+        action TEXT,
+        status JSONB,
+        created_at TIMESTAMPTZ
+    )
+""",
+        "CREATE INDEX {table_name}_id_idx ON {table_name} (id)",
+        "CREATE INDEX {table_name}_day_t_idx ON {table_name} (day,t)",
+    ],
+    # Agent Survey
+    "agent_survey": [
+        """
+    CREATE TABLE IF NOT EXISTS {table_name} (
+        id UUID,
+        day INT4,
+        t FLOAT,
+        survey_id UUID,
+        result JSONB,
+        created_at TIMESTAMPTZ
+    )
+""",
+        "CREATE INDEX {table_name}_id_idx ON {table_name} (id)",
+        "CREATE INDEX {table_name}_day_t_idx ON {table_name} (day,t)",
+    ],
+}

pycityagent/workflow/block.py

@@ -1,7 +1,8 @@
 import asyncio
 import functools
 import inspect
-from typing import Any, Callable, Coroutine, Optional, Union
+from collections.abc import Awaitable, Callable, Coroutine
+from typing import Any, Optional, Union
 
 from ..environment.simulator import Simulator
 from ..llm import LLM

pycityagent/workflow/tool.py

@@ -1,6 +1,8 @@
 import time
+from collections import defaultdict
+from collections.abc import Callable, Sequence
 from typing import Any, Optional, Union
-from collections.abc import Callable
+
 from mlflow.entities import Metric
 
 from ..agent import Agent
@@ -190,33 +192,38 @@ class ResetAgentPosition(Tool):
 class ExportMlflowMetrics(Tool):
     def __init__(self, log_batch_size: int = 100) -> None:
         self._log_batch_size = log_batch_size
-        # TODO:support other log types
-        self.metric_log_cache: list[Metric] = []
+        # TODO: support other log types
+        self.metric_log_cache: dict[str, list[Metric]] = defaultdict(list)
 
     async def __call__(
         self,
-        metric: Union[Metric, dict],
+        metric: Union[Sequence[Union[Metric, dict]], Union[Metric, dict]],
         clear_cache: bool = False,
     ):
         agent = self.agent
         batch_size = self._log_batch_size
-        if len(self.metric_log_cache) > batch_size:
-            client = agent.mlflow_client
-            await client.log_batch(
-                metrics=self.metric_log_cache[:batch_size],
-            )
-            self.metric_log_cache = self.metric_log_cache[batch_size:]
-        else:
-            if isinstance(metric, Metric):
-                self.metric_log_cache.append(metric)
+        if not isinstance(metric, Sequence):
+            metric = [metric]
+        for _metric in metric:
+            if isinstance(_metric, Metric):
+                item = _metric
+                metric_key = item.key
             else:
-                _metric = Metric(
-                    key=metric["key"],
-                    value=metric["value"],
-                    timestamp=metric.get("timestamp", int(1000 * time.time())),
-                    step=metric["step"],
+                item = Metric(
+                    key=_metric["key"],
+                    value=_metric["value"],
+                    timestamp=_metric.get("timestamp", int(1000 * time.time())),
+                    step=_metric["step"],
                 )
-                self.metric_log_cache.append(_metric)
+                metric_key = _metric["key"]
+            self.metric_log_cache[metric_key].append(item)
+        for metric_key, _cache in self.metric_log_cache.items():
+            if len(_cache) > batch_size:
+                client = agent.mlflow_client
+                await client.log_batch(
+                    metrics=_cache[:batch_size],
+                )
+                _cache = _cache[batch_size:]
         if clear_cache:
             await self._clear_cache()
 
@@ -225,8 +232,9 @@ class ExportMlflowMetrics(Tool):
     ):
         agent = self.agent
         client = agent.mlflow_client
-        if len(self.metric_log_cache) > 0:
-            await client.log_batch(
-                metrics=self.metric_log_cache,
-            )
-            self.metric_log_cache = []
+        for metric_key, _cache in self.metric_log_cache.items():
+            if len(_cache) > 0:
+                await client.log_batch(
+                    metrics=_cache,
+                )
+                _cache = []

{pycityagent-2.0.0a20.dist-info → pycityagent-2.0.0a22.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pycityagent
-Version: 2.0.0a20
+Version: 2.0.0a22
 Summary: LLM-based城市环境agent构建库
 License: MIT
 Author: Yuwei Yan

{pycityagent-2.0.0a20.dist-info → pycityagent-2.0.0a22.dist-info}/RECORD

@@ -1,5 +1,5 @@
 pycityagent/__init__.py,sha256=EDxt3Su3lH1IMh9suNw7GeGL7UrXeWiZTw5KWNznDzc,637
-pycityagent/agent.py,sha256=HRFAG_iM1q3nvXtV0T-Dz01foOtty4IWka7h4WD97CU,24268
+pycityagent/agent.py,sha256=TGW4vyaYBnNxYkr22FhGPwex3dLIeq3F-2rnELidNPA,28670
 pycityagent/economy/__init__.py,sha256=aonY4WHnx-6EGJ4WKrx4S-2jAkYNLtqUA04jp6q8B7w,75
 pycityagent/economy/econ_client.py,sha256=GuHK9ZBnhqW3Z7F8ViDJn_iN73yOBbbwFyJv1wLEBDk,12211
 pycityagent/environment/__init__.py,sha256=awHxlOud-btWbk0FCS4RmGJ13W84oVCkbGfcrhKqihA,240
@@ -11,16 +11,16 @@ pycityagent/environment/sence/static.py,sha256=9s7jz8HitstTrk-GqpnVB26oPrjuTyNeL
 pycityagent/environment/sidecar/__init__.py,sha256=RFbOf40aYBP4WwRpFkua5tlRE_OtMcMNyp1Lew_aaAU,235
 pycityagent/environment/sidecar/sidecarv2.py,sha256=beKlYZgt38EQbV1x6NWQo7xVXyB-5QHfbwJexyXu7Tg,3252
 pycityagent/environment/sim/__init__.py,sha256=JVG6sSD2Hbohl1TtKjuQi7_M7tKMrFh9vl3QV3VA5O0,724
-pycityagent/environment/sim/aoi_service.py,sha256=yM50xhYPLLExwjl5MDlnAuohqJpK0KbIvr_cWLZJEAk,1203
+pycityagent/environment/sim/aoi_service.py,sha256=2UjvUTF4CW4E_L30IRcdwv6t_q1ZdXN3TTLOKSOaaXE,1230
 pycityagent/environment/sim/client.py,sha256=MHR7Hhu-Cr7B61d3K_QDpSJh4HrUU9JQf6Cu7_8pdsE,3493
-pycityagent/environment/sim/clock_service.py,sha256=YG_A_IA7iJp9rOQE3bCPgppzuzzUwWMCzlxSUdOy088,1326
-pycityagent/environment/sim/economy_services.py,sha256=ZggCyAK4Tv5SS881lUBe0WyymKq-0PtdWpe8p_pTDiI,7085
-pycityagent/environment/sim/lane_service.py,sha256=6ljWiX_GbZd-a-fEcktDZncxBkraLA2LDE_pVV99uLs,3896
-pycityagent/environment/sim/light_service.py,sha256=ezYGcV_PkZ6I-yv48LNEjsytwwwQx-1Qp2QCWXWIhdQ,4215
-pycityagent/environment/sim/person_service.py,sha256=nIvOsoBoqOTDYtsiThg07-4ZBgkTUDEbb3dHyOjzyb8,10652
-pycityagent/environment/sim/road_service.py,sha256=phKTwTyhc_6Ht2mddEXpdENfl-lRXIVY0CHAlw1yHjI,1264
+pycityagent/environment/sim/clock_service.py,sha256=fgYXacf_-ixhVAn5uKUvqvemBS6A0oQK8JOZukkhXyY,1353
+pycityagent/environment/sim/economy_services.py,sha256=xoc-1_H8JmQwJ24oWRS1fD-hGYtz2I-x6BOkQ4yENzU,7106
+pycityagent/environment/sim/lane_service.py,sha256=N2dUe-3XuqqKLsNXt1k4NN8uV-J_ruo08yhaUd_hwOI,3916
+pycityagent/environment/sim/light_service.py,sha256=KVwt7ii_iLGA7gANZe3n6-4RiiPQt1w9H6ZOoizMI04,4242
+pycityagent/environment/sim/person_service.py,sha256=5r1F2Itn7dKJ2U4hSLovrk5p4qy-2n77MTAv_OlTIwA,10673
+pycityagent/environment/sim/road_service.py,sha256=bKyn3_me0sGmaJVyF6eNeFbdU-9C1yWsa9L7pieDJzg,1285
 pycityagent/environment/sim/sim_env.py,sha256=HI1LcS_FotDKQ6vBnx0e49prXSABOfA20aU9KM-ZkCY,4625
-pycityagent/environment/sim/social_service.py,sha256=6Iqvq6dz8H2jhLLdtaITc6Js9QnQw-Ylsd5AZgUj3-E,1993
+pycityagent/environment/sim/social_service.py,sha256=9EFJAwVdUuUQkNkFRn9qZRDfD1brh2fqkvasnXUEBhQ,2014
 pycityagent/environment/simulator.py,sha256=XjcxbyBIbB3Ht9z087z_oWIPAN6pP5Eq1lyf4W5atb8,12502
 pycityagent/environment/utils/__init__.py,sha256=1m4Q1EfGvNpUsa1bgQzzCyWhfkpElnskNImjjFD3Znc,237
 pycityagent/environment/utils/base64.py,sha256=hoREzQo3FXMN79pqQLO2jgsDEvudciomyKii7MWljAM,374
@@ -29,7 +29,7 @@ pycityagent/environment/utils/geojson.py,sha256=LVHAdEhnZM8d0BoUnuPiIL_gaeXBIIgl
 pycityagent/environment/utils/grpc.py,sha256=6EJwKXXktIWb1NcUiJzIRmfrY0S03QAXXGcCDHqAT00,1998
 pycityagent/environment/utils/map_utils.py,sha256=lYOEoCFFK6-e9N5txLMMq4HUlxMqc8Uw1YrGW5oJmgg,5749
 pycityagent/environment/utils/port.py,sha256=3OM6kSUt3PxvDUOlgyiendBtETaWU8Mzk_8H0TzTmYg,295
-pycityagent/environment/utils/protobuf.py,sha256=0jBvK_s96y_n7tuMbG22TOtQmg71SGV4ONDy2IGsU9o,1148
+pycityagent/environment/utils/protobuf.py,sha256=0BsM_G7x2B_6DMIBHe9bjVuQDOXUytNRQ03g9e05F3c,1170
 pycityagent/llm/__init__.py,sha256=7klKEmCcDWJIu-F4DoAukSuKfDbLhdczrSIhpwow-sY,145
 pycityagent/llm/embedding.py,sha256=2psX_EK67oPlYe77g43EYUYams4M9AiJqxpHTFHG0n8,4253
 pycityagent/llm/llm.py,sha256=vJaaGqVuyV-GlBxrnvGKZnMDlxeTT_sGUTdxz5tYwEE,15141
@@ -38,19 +38,20 @@ pycityagent/llm/utils.py,sha256=hoNPhvomb1u6lhFX0GctFipw74hVKb7bvUBDqwBzBYw,160
 pycityagent/memory/__init__.py,sha256=Hs2NhYpIG-lvpwPWwj4DydB1sxtjz7cuA4iDAzCXnjI,243
 pycityagent/memory/const.py,sha256=6zpJPJXWoH9-yf4RARYYff586agCoud9BRn7sPERB1g,932
 pycityagent/memory/memory.py,sha256=vJxHOI74aJDGZPFu2LbBr02ASfOYpig66fto6Gjr-6Q,18191
-pycityagent/memory/memory_base.py,sha256=euKZRCs4dbcKxjlZzpLCTnH066DAtRjj5g1JFKD40qQ,5633
-pycityagent/memory/profile.py,sha256=s4LnxSPGSjIGZXHXkkd8mMa6uYYZrytgyQdWjcaqGf4,5182
-pycityagent/memory/self_define.py,sha256=poPiexNhOLq_iTgK8s4mK_xoL_DAAcB8kMvInj7iE5E,5179
-pycityagent/memory/state.py,sha256=5W0c1yJ-aaPpE74B2LEcw3Ygpm77tyooHv8NylyrozE,5113
-pycityagent/memory/utils.py,sha256=wLNlNlZ-AY9VB8kbUIy0UQSYh26FOQABbhmKQkit5o8,850
+pycityagent/memory/memory_base.py,sha256=QG_j3BxZvkadFEeE3uBR_kjl_xcXD1aHUVs8GEF3d6w,5654
+pycityagent/memory/profile.py,sha256=q8ZS9IBmHCg_X1GONUvXK85P6tCepTKQgXKuvuXYNXw,5203
+pycityagent/memory/self_define.py,sha256=vpZ6CIxR2grNXEIOScdpsSc59FBg0mOKelwQuTElbtQ,5200
+pycityagent/memory/state.py,sha256=TYItiyDtehMEQaSBN7PpNrnNxdDM5jGppr9R9Ufv3kA,5134
+pycityagent/memory/utils.py,sha256=oJWLdPeJy_jcdKcDTo9JAH9kDZhqjoQhhv_zT9qWC0w,877
 pycityagent/message/__init__.py,sha256=TCjazxqb5DVwbTu1fF0sNvaH_EPXVuj2XQ0p6W-QCLU,55
 pycityagent/message/messager.py,sha256=W_OVlNGcreHSBf6v-DrEnfNCXExB78ySr0w26MSncfU,2541
 pycityagent/metrics/__init__.py,sha256=X08PaBbGVAd7_PRGLREXWxaqm7nS82WBQpD1zvQzcqc,128
 pycityagent/metrics/mlflow_client.py,sha256=g_tHxWkWTDijtbGL74-HmiYzWVKb1y8-w12QrY9jL30,4449
 pycityagent/metrics/utils/const.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pycityagent/simulation/__init__.py,sha256=jYaqaNpzM5M_e_ykISS_M-mIyYdzJXJWhgpfBpA6l5k,111
-pycityagent/simulation/agentgroup.py,sha256=6p8-OP2x_syaQ1pWLgll0LHs823OHnappuY-8XzL_LU,13383
-pycityagent/simulation/simulation.py,sha256=pxFdaNMLdJMcpW8gnOcxjfbz4gkpcvWsTR0rNP8rE9k,21675
+pycityagent/simulation/__init__.py,sha256=P5czbcg2d8S0nbbnsQXFIhwzO4CennAhZM8OmKvAeYw,194
+pycityagent/simulation/agentgroup.py,sha256=5p68wNoEaog4nDym3xsCTporBWmxNiQ1crN3mbOHFsE,19788
+pycityagent/simulation/simulation.py,sha256=7Go_RkpkC_DuBWW21JPqlV2yXY754RqSkqzM0vTdteU,23008
+pycityagent/simulation/storage/pg.py,sha256=Ws04mUgRcbbvWi_eQm3PXYa6w7AQUbDPWhSU7HFtsD8,6026
 pycityagent/survey/__init__.py,sha256=rxwou8U9KeFSP7rMzXtmtp2fVFZxK4Trzi-psx9LPIs,153
 pycityagent/survey/manager.py,sha256=S5IkwTdelsdtZETChRcfCEczzwSrry_Fly9MY4s3rbk,1681
 pycityagent/survey/models.py,sha256=YE50UUt5qJ0O_lIUsSY6XFCGUTkJVNu_L1gAhaCJ2fs,3546
@@ -59,14 +60,15 @@ pycityagent/utils/avro_schema.py,sha256=DHM3bOo8m0dJf8oSwyOWzVeXrH6OERmzA_a5vS4S
 pycityagent/utils/decorators.py,sha256=Gk3r41hfk6awui40tbwpq3C7wC7jHaRmLRlcJFlLQCE,3160
 pycityagent/utils/parsers/__init__.py,sha256=AN2xgiPxszWK4rpX7zrqRsqNwfGF3WnCA5-PFTvbaKk,281
 pycityagent/utils/parsers/code_block_parser.py,sha256=Cs2Z_hm9VfNCpPPll1TwteaJF-HAQPs-3RApsOekFm4,1173
-pycityagent/utils/parsers/json_parser.py,sha256=FZ3XN1g8z4Dr2TFraUOoah1oQcze4fPd2m01hHoX0Mo,2917
+pycityagent/utils/parsers/json_parser.py,sha256=tjwyPluYfkWgsvLi0hzfJwFhO3L6yQfZMKza20HaGrY,2911
 pycityagent/utils/parsers/parser_base.py,sha256=KBKO4zLZPNdGjPAGqIus8LseZ8W3Tlt2y0QxqeCd25Q,1713
+pycityagent/utils/pg_query.py,sha256=h5158xcrxjUTR0nKwAaG1neFfTHPbN5guLmaXpC8yvs,1918
 pycityagent/utils/survey_util.py,sha256=Be9nptmu2JtesFNemPgORh_2GsN7rcDYGQS9Zfvc5OI,2169
 pycityagent/workflow/__init__.py,sha256=QNkUV-9mACMrR8c0cSKna2gC1mMZdxXbxWzjE-Uods0,621
-pycityagent/workflow/block.py,sha256=WkE2On97DCZS_9n8aIgT8wxv9Oaff4Fdf2tLqbKfMtE,6010
+pycityagent/workflow/block.py,sha256=l-z9iJo9_USZQRyj4TLMfihK0-tnNDG0a6jVk9WhG0o,6048
 pycityagent/workflow/prompt.py,sha256=6jI0Rq54JLv3-IXqZLYug62vse10wTI83xvf4ZX42nk,2929
-pycityagent/workflow/tool.py,sha256=SGY18lT71hBLKagopirFbxRjPY_387Dobo9SUwjHIn0,8215
+pycityagent/workflow/tool.py,sha256=xADxhNgVsjNiMxlhdwn3xGUstFOkLEG8P67ez8VmwSI,8555
 pycityagent/workflow/trigger.py,sha256=Df-MOBEDWBbM-v0dFLQLXteLsipymT4n8vqexmK2GiQ,5643
-pycityagent-2.0.0a20.dist-info/METADATA,sha256=aygfImVFM4jG0nXVuunu5LZDNi4JyikBULFce0WGWeM,7848
-pycityagent-2.0.0a20.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-pycityagent-2.0.0a20.dist-info/RECORD,,
+pycityagent-2.0.0a22.dist-info/METADATA,sha256=s_gC55n1d1ZUyt1kRcYhl7h9Ymp8BQQKXZHrg93V8sg,7848
+pycityagent-2.0.0a22.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+pycityagent-2.0.0a22.dist-info/RECORD,,