pycityagent 2.0.0a29__py3-none-any.whl → 2.0.0a31__py3-none-any.whl

pycityagent/simulation/agentgroup.py

@@ -409,6 +409,50 @@ class AgentGroup:
                 else:
                     for agent in self.agents:
                         _date_time = datetime.now(timezone.utc)
+                        try:
+                            nominal_gdp = await agent.memory.get("nominal_gdp")
+                        except:
+                            nominal_gdp = []
+                        try:
+                            real_gdp = await agent.memory.get("real_gdp")
+                        except:
+                            real_gdp = []
+                        try:
+                            unemployment = await agent.memory.get("unemployment")
+                        except:
+                            unemployment = []
+                        try:
+                            wages = await agent.memory.get("wages")
+                        except:
+                            wages = []
+                        try:
+                            prices = await agent.memory.get("prices")
+                        except:
+                            prices = []
+                        try:
+                            inventory = await agent.memory.get("inventory")
+                        except:
+                            inventory = 0
+                        try:
+                            price = await agent.memory.get("price")
+                        except:
+                            price = 0.0
+                        try:
+                            interest_rate = await agent.memory.get("interest_rate")
+                        except:
+                            interest_rate = 0.0
+                        try:
+                            bracket_cutoffs = await agent.memory.get("bracket_cutoffs")
+                        except:
+                            bracket_cutoffs = []
+                        try:
+                            bracket_rates = await agent.memory.get("bracket_rates")
+                        except:
+                            bracket_rates = []
+                        try:
+                            employees = await agent.memory.get("employees")
+                        except:
+                            employees = []
                         _status_dict = {
                             "id": agent._uuid,
                             "day": await self.simulator.get_simulator_day(),
@@ -418,20 +462,17 @@ class AgentGroup:
                             "parent_id": -1,
                             "action": "",
                             "type": await agent.memory.get("type"),
-                            "nominal_gdp": await agent.memory.get("nominal_gdp"),
-                            "real_gdp": await agent.memory.get("real_gdp"),
-                            "unemployment": await agent.memory.get("unemployment"),
-                            "wages": await agent.memory.get("wages"),
-                            "prices": await agent.memory.get("prices"),
-                            "inventory": await agent.memory.get("inventory"),
-                            "price": await agent.memory.get("price"),
-                            "interest_rate": await agent.memory.get("interest_rate"),
-                            "bracket_cutoffs": await agent.memory.get(
-                                "bracket_cutoffs"
-                            ),
-                            "bracket_rates": await agent.memory.get("bracket_rates"),
-                            "employees": await agent.memory.get("employees"),
-                            "customers": await agent.memory.get("customers"),
+                            "nominal_gdp": nominal_gdp,
+                            "real_gdp": real_gdp,
+                            "unemployment": unemployment,
+                            "wages": wages,
+                            "prices": prices,
+                            "inventory": inventory,
+                            "price": price,
+                            "interest_rate": interest_rate,
+                            "bracket_cutoffs": bracket_cutoffs,
+                            "bracket_rates": bracket_rates,
+                            "employees": employees,
                             "created_at": _date_time,
                         }
                         _statuses_time_list.append((_status_dict, _date_time))

pycityagent/simulation/storage/pg.py

@@ -13,7 +13,10 @@ 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}"
+        if not table_type == "experiment":
+            table_name = f"socialcity_{exp_id.replace('-', '_')}_{table_type}"
+        else:
+            table_name = f"socialcity_{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
@@ -21,9 +24,10 @@ def create_pg_tables(exp_id: str, dsn: str):
         #     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()
+                if not table_type == "experiment":
+                    # 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))
@@ -106,10 +110,11 @@ class PgWriter:
                         ]
                         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),
+            ("id", None),
             ("name", str),
             ("num_day", int),
             ("status", int),
@@ -120,37 +125,31 @@ class PgWriter:
             ("created_at", None),
             ("updated_at", None),
         ]
-        table_name = f"socialcity_{self.exp_id.replace('-', '_')}_experiment"
+        table_name = f"socialcity_experiment"
         async with await psycopg.AsyncConnection.connect(self._dsn) as aconn:
-            async with aconn.cursor(row_factory=dict_row) as cur:
-                await cur.execute(
-                    "SELECT * FROM {table_name}".format(table_name=table_name) # type:ignore
-                )  
-                record_exists = await cur.fetchall()
-
+            async with aconn.cursor(row_factory=dict_row) as cur:                
+                await cur.execute("SELECT * FROM {table_name} WHERE id=%s".format(table_name = table_name),(self.exp_id,))# type:ignore
+                record_exists = await cur.fetchall()    
+                print("record_exists",record_exists)            
                 if record_exists:
                     # 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}"  # type:ignore
+                        f"UPDATE {{}} SET {columns} WHERE id='{self.exp_id}'" # 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]
+                    ]# + [self.exp_id]
                     await cur.execute(update_sql, params)
                 else:
                     # INSERT
-                    keys = ", ".join(
-                        key for key, _ in TO_UPDATE_EXP_INFO_KEYS_AND_TYPES
-                    )
-                    placeholders = ", ".join(
-                        ["%s"] * len(TO_UPDATE_EXP_INFO_KEYS_AND_TYPES)
-                    )
+                    keys = ", ".join(key for key, _ in TO_UPDATE_EXP_INFO_KEYS_AND_TYPES)
+                    placeholders = ", ".join(["%s"] * len(TO_UPDATE_EXP_INFO_KEYS_AND_TYPES))
                     insert_sql = psycopg.sql.SQL(
-                        f"INSERT INTO {{}} ({keys}) VALUES ({placeholders})"  # type:ignore
+                        f"INSERT INTO {{}} ({keys}) VALUES ({placeholders})" # type:ignore
                     ).format(psycopg.sql.Identifier(table_name))
                     params = [
                         _type(exp_info[key]) if _type is not None else exp_info[key]

{pycityagent-2.0.0a29.dist-info → pycityagent-2.0.0a31.dist-info}/METADATA

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

{pycityagent-2.0.0a29.dist-info → pycityagent-2.0.0a31.dist-info}/RECORD

@@ -50,9 +50,9 @@ pycityagent/metrics/__init__.py,sha256=X08PaBbGVAd7_PRGLREXWxaqm7nS82WBQpD1zvQzc
 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=P5czbcg2d8S0nbbnsQXFIhwzO4CennAhZM8OmKvAeYw,194
-pycityagent/simulation/agentgroup.py,sha256=0uMoRBektdK9WEXmqYT2gASg42CtS6JjaQ7slP8IWkY,22011
+pycityagent/simulation/agentgroup.py,sha256=dyUnl76ZlO9ZDwCVtg6hB98dkXSurUsD0ADJyGIlP_I,23587
 pycityagent/simulation/simulation.py,sha256=9kkdgXSEOAN8wiewVFyORksti4IdVNU0opObV6ZYa9k,23344
-pycityagent/simulation/storage/pg.py,sha256=xJBR0ROCZpGs6d8ZDtV4iW0awatDvTDPnn6iMozDJfA,7083
+pycityagent/simulation/storage/pg.py,sha256=qGrYzJIAzjv8-d3-cle0rY0AN6XB6MgnHkFLBoLmKWU,7251
 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
@@ -70,6 +70,6 @@ pycityagent/workflow/block.py,sha256=l-z9iJo9_USZQRyj4TLMfihK0-tnNDG0a6jVk9WhG0o
 pycityagent/workflow/prompt.py,sha256=6jI0Rq54JLv3-IXqZLYug62vse10wTI83xvf4ZX42nk,2929
 pycityagent/workflow/tool.py,sha256=xADxhNgVsjNiMxlhdwn3xGUstFOkLEG8P67ez8VmwSI,8555
 pycityagent/workflow/trigger.py,sha256=Df-MOBEDWBbM-v0dFLQLXteLsipymT4n8vqexmK2GiQ,5643
-pycityagent-2.0.0a29.dist-info/METADATA,sha256=8zdE1yf3zCJPa0d_M5CYPXULA1fG8dkeveA5EmexLJ0,8033
-pycityagent-2.0.0a29.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-pycityagent-2.0.0a29.dist-info/RECORD,,
+pycityagent-2.0.0a31.dist-info/METADATA,sha256=T-AOPv84-eFtT35uA3WvqIpCkQGoCuxR-Tl_zfSqefI,8033
+pycityagent-2.0.0a31.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+pycityagent-2.0.0a31.dist-info/RECORD,,