pycityagent 2.0.0a63__cp311-cp311-macosx_11_0_arm64.whl → 2.0.0a64__cp311-cp311-macosx_11_0_arm64.whl

pycityagent/cityagent/message_intercept.py

@@ -42,14 +42,23 @@ async def check_message(
 
 
 class EdgeMessageBlock(MessageBlockBase):
+    def __init__(self, name: str = "", max_violation_time: int = 3) -> None:
+        super().__init__(name)
+        self.max_violation_time = max_violation_time
+
     async def forward(  # type:ignore
         self,
         from_uuid: str,
         to_uuid: str,
         msg: str,
+        violation_counts: dict[str, int],
         black_list: list[tuple[str, str]],
     ):
-        if (from_uuid, to_uuid) in set(black_list):
+        if (
+            (from_uuid, to_uuid) in set(black_list)
+            or (None, to_uuid) in set(black_list)
+            or (from_uuid, None) in set(black_list)
+        ):
             # 可选同时返回入队的信息(False,err) 如果只返回bool值则默认报错信息入队
             return False
         else:
@@ -59,7 +68,10 @@ class EdgeMessageBlock(MessageBlockBase):
                 llm_client=self.llm,
                 content=msg,
             )
-            if not is_valid:
+            if (
+                not is_valid
+                and violation_counts[from_uuid] >= self.max_violation_time - 1
+            ):
                 # 直接添加即可 在框架内部的异步锁保证不会冲突
                 black_list.append((from_uuid, to_uuid))
             return is_valid
@@ -78,7 +90,11 @@ class PointMessageBlock(MessageBlockBase):
         violation_counts: dict[str, int],
         black_list: list[tuple[str, str]],
     ):
-        if (from_uuid, to_uuid) in set(black_list):
+        if (
+            (from_uuid, to_uuid) in set(black_list)
+            or (None, to_uuid) in set(black_list)
+            or (from_uuid, None) in set(black_list)
+        ):
             # 可选同时返回入队的信息(False,err) 如果只返回bool值则默认报错信息入队
             return False
         else:
@@ -94,7 +110,7 @@ class PointMessageBlock(MessageBlockBase):
                 and violation_counts[from_uuid] >= self.max_violation_time - 1
             ):
                 # 直接添加即可 在框架内部的异步锁保证不会冲突
-                black_list.append((from_uuid, to_uuid))
+                black_list.append((from_uuid, None))  # type:ignore
             return is_valid
 
 

pycityagent/simulation/simulation.py

@@ -283,7 +283,14 @@ class AgentSimulation:
                 }
                 _interceptor_blocks = [PointMessageBlock(**_kwargs)]
             elif _mode == "edge":
-                _kwargs = {}
+                _kwargs = {
+                    k: v
+                    for k, v in _intercept_config.items()
+                    if k
+                    in {
+                        "max_violation_time",
+                    }
+                }
                 _interceptor_blocks = [EdgeMessageBlock(**_kwargs)]
             else:
                 raise ValueError(f"Unsupported interception mode `{_mode}!`")

{pycityagent-2.0.0a63.dist-info → pycityagent-2.0.0a64.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pycityagent
-Version: 2.0.0a63
+Version: 2.0.0a64
 Summary: LLM-based city environment agent building library
 Author-email: Yuwei Yan <pinkgranite86@gmail.com>, Junbo Yan <yanjb20thu@gmali.com>, Jun Zhang <zhangjun990222@gmali.com>
 License: MIT License

{pycityagent-2.0.0a63.dist-info → pycityagent-2.0.0a64.dist-info}/RECORD

@@ -22,7 +22,7 @@ pycityagent/memory/utils.py,sha256=oJWLdPeJy_jcdKcDTo9JAH9kDZhqjoQhhv_zT9qWC0w,8
 pycityagent/memory/const.py,sha256=6zpJPJXWoH9-yf4RARYYff586agCoud9BRn7sPERB1g,932
 pycityagent/memory/faiss_query.py,sha256=V3rIw6d1_xcpNqZBbAYz3qfjVNE7NfJ7xOS5SibPtVU,13180
 pycityagent/memory/state.py,sha256=TYItiyDtehMEQaSBN7PpNrnNxdDM5jGppr9R9Ufv3kA,5134
-pycityagent/simulation/simulation.py,sha256=yDQBzIpxAEvr3oEt2PChgAhTnPgy2t4n-nbgCiqiE6s,35578
+pycityagent/simulation/simulation.py,sha256=dt1AHJX1xXjVYJwNKc2bDBsP0NV-EBCEL0vjrQgHnlo,35796
 pycityagent/simulation/__init__.py,sha256=P5czbcg2d8S0nbbnsQXFIhwzO4CennAhZM8OmKvAeYw,194
 pycityagent/simulation/agentgroup.py,sha256=V-ChLJtJUWJZnmTGllXqGk4XW4iDz9h3V89RgW0e4gg,31376
 pycityagent/simulation/storage/pg.py,sha256=xRshSOGttW-p0re0fNBOjOpb-nQ5msIE2LsdT79_E_Y,8425
@@ -82,7 +82,7 @@ pycityagent/cityagent/firmagent.py,sha256=UVlNN0lpa4cC4PZVqYzQhbc5VJ2oGsA1731mhb
 pycityagent/cityagent/nbsagent.py,sha256=WIXW__6dZ5IrqBqDCjvGbrCshpXzuFRV3Ww6gkYw7p4,4387
 pycityagent/cityagent/initial.py,sha256=7hgCt_tGdnVTXGfEQOn1GTW5dAs1b-ru_FwXxRLI6tM,4549
 pycityagent/cityagent/societyagent.py,sha256=2J2LWiEHie-NXDQAOBBe_dmb9Zk8mJsLB2SY820W6Ng,20441
-pycityagent/cityagent/message_intercept.py,sha256=KqwW19zpPG8WMpiU91GAhJc9Gox3YgjFkTDokUFWAkw,3940
+pycityagent/cityagent/message_intercept.py,sha256=1YMOs6-6bbAaTt7RfMn-ALVIcp0frHN7oqGUkWRy5xE,4519
 pycityagent/cityagent/governmentagent.py,sha256=HJLuhvEmllu_1KnFEJsYCIasaBJT0BV9Cn_4Y2QGPqg,2791
 pycityagent/cityagent/blocks/dispatcher.py,sha256=mEa1r3tRS3KI1BMZR_w_sbUGzOj6aUJuiUrsHv1n2n0,2943
 pycityagent/cityagent/blocks/needs_block.py,sha256=s8LikgtKORfo_Sw9SQ5_3biNPTof15QuUs4cDynXCyM,15332
@@ -97,9 +97,9 @@ pycityagent/cityagent/blocks/mobility_block.py,sha256=xWbARMfJ3-6fddrW3VOUKJrXfM
 pycityagent/survey/models.py,sha256=YE50UUt5qJ0O_lIUsSY6XFCGUTkJVNu_L1gAhaCJ2fs,3546
 pycityagent/survey/__init__.py,sha256=rxwou8U9KeFSP7rMzXtmtp2fVFZxK4Trzi-psx9LPIs,153
 pycityagent/survey/manager.py,sha256=S5IkwTdelsdtZETChRcfCEczzwSrry_Fly9MY4s3rbk,1681
-pycityagent-2.0.0a63.dist-info/RECORD,,
-pycityagent-2.0.0a63.dist-info/LICENSE,sha256=n2HPXiupinpyHMnIkbCf3OTYd3KMqbmldu1e7av0CAU,1084
-pycityagent-2.0.0a63.dist-info/WHEEL,sha256=NW1RskY9zow1Y68W-gXg0oZyBRAugI1JHywIzAIai5o,109
-pycityagent-2.0.0a63.dist-info/entry_points.txt,sha256=BZcne49AAIFv-hawxGnPbblea7X3MtAtoPyDX8L4OC4,132
-pycityagent-2.0.0a63.dist-info/top_level.txt,sha256=yOmeu6cSXmiUtScu53a3s0p7BGtLMaV0aff83EHCTic,43
-pycityagent-2.0.0a63.dist-info/METADATA,sha256=bu9VH3Ht_PsoCbGdsQFGVSaPo0GcxtNE57QQ9HqMT1I,9110
+pycityagent-2.0.0a64.dist-info/RECORD,,
+pycityagent-2.0.0a64.dist-info/LICENSE,sha256=n2HPXiupinpyHMnIkbCf3OTYd3KMqbmldu1e7av0CAU,1084
+pycityagent-2.0.0a64.dist-info/WHEEL,sha256=NW1RskY9zow1Y68W-gXg0oZyBRAugI1JHywIzAIai5o,109
+pycityagent-2.0.0a64.dist-info/entry_points.txt,sha256=BZcne49AAIFv-hawxGnPbblea7X3MtAtoPyDX8L4OC4,132
+pycityagent-2.0.0a64.dist-info/top_level.txt,sha256=yOmeu6cSXmiUtScu53a3s0p7BGtLMaV0aff83EHCTic,43
+pycityagent-2.0.0a64.dist-info/METADATA,sha256=Y5jk3ZxwATSr1K6QdN8hLQV-XUhcMNtPRJiXNDdniC4,9110