aient 1.1.99__py3-none-any.whl → 1.2.1__py3-none-any.whl

aient/architext/architext/core.py

@@ -10,6 +10,30 @@ from dataclasses import dataclass
 from abc import ABC, abstractmethod
 from typing import List, Dict, Any, Optional, Union, Callable
 
+# A wrapper to manage multiple providers with the same name
+class ProviderGroup:
+    """A container for multiple providers that share the same name, allowing for bulk operations."""
+    def __init__(self, providers: List['ContextProvider']):
+        self._providers = providers
+    def __getitem__(self, key: int) -> 'ContextProvider':
+        """Allows accessing providers by index, e.g., group[-1]."""
+        return self._providers[key]
+    def __iter__(self):
+        """Allows iterating over the providers."""
+        return iter(self._providers)
+    def __len__(self) -> int:
+        """Returns the number of providers in the group."""
+        return len(self._providers)
+    @property
+    def visible(self) -> List[bool]:
+        """Gets the visibility of all providers in the group."""
+        return [p.visible for p in self._providers]
+    @visible.setter
+    def visible(self, value: bool):
+        """Sets the visibility for all providers in the group."""
+        for p in self._providers:
+            p.visible = value
+
 # Global, thread-safe registry for providers created within f-strings
 _fstring_provider_registry = {}
 _registry_lock = threading.Lock()
@@ -436,22 +460,40 @@ class Messages:
     def __init__(self, *initial_messages: Message):
         from typing import Tuple
         self._messages: List[Message] = []
-        self._providers_index: Dict[str, Tuple[ContextProvider, Message]] = {}
+        self._providers_index: Dict[str, List[Tuple[ContextProvider, Message]]] = {}
         if initial_messages:
             for msg in initial_messages:
                 self.append(msg)
 
     def _notify_provider_added(self, provider: ContextProvider, message: Message):
         if provider.name not in self._providers_index:
-            self._providers_index[provider.name] = (provider, message)
+            self._providers_index[provider.name] = []
+        self._providers_index[provider.name].append((provider, message))
 
     def _notify_provider_removed(self, provider: ContextProvider):
         if provider.name in self._providers_index:
-            del self._providers_index[provider.name]
+            # Create a new list excluding the provider to be removed.
+            # Comparing by object identity (`is`) is crucial here.
+            providers_list = self._providers_index[provider.name]
+            new_list = [(p, m) for p, m in providers_list if p is not provider]
+
+            if not new_list:
+                # If the list becomes empty, remove the key from the dictionary.
+                del self._providers_index[provider.name]
+            else:
+                # Otherwise, update the dictionary with the new list.
+                self._providers_index[provider.name] = new_list
+
+    def provider(self, name: str) -> Optional[Union[ContextProvider, ProviderGroup]]:
+        indexed_list = self._providers_index.get(name)
+        if not indexed_list:
+            return None
 
-    def provider(self, name: str) -> Optional[ContextProvider]:
-        indexed = self._providers_index.get(name)
-        return indexed[0] if indexed else None
+        providers = [p for p, m in indexed_list]
+        if len(providers) == 1:
+            return providers[0]
+        else:
+            return ProviderGroup(providers)
 
     def pop(self, key: Optional[Union[str, int]] = None) -> Union[Optional[ContextProvider], Optional[Message]]:
         # If no key is provided, pop the last message.
@@ -459,10 +501,13 @@ class Messages:
             key = len(self._messages) - 1
 
         if isinstance(key, str):
-            indexed = self._providers_index.get(key)
-            if not indexed:
+            indexed_list = self._providers_index.get(key)
+            if not indexed_list:
                 return None
-            _provider, parent_message = indexed
+            # Pop the first one found, which is consistent with how pop usually works
+            _provider, parent_message = indexed_list[0]
+            # The actual removal from _providers_index happens in _notify_provider_removed
+            # which is called by message.pop()
             return parent_message.pop(key)
         elif isinstance(key, int):
             try:
@@ -481,7 +526,10 @@ class Messages:
         return None
 
     async def refresh(self):
-        tasks = [provider.refresh() for provider, _ in self._providers_index.values()]
+        tasks = []
+        for provider_list in self._providers_index.values():
+            for provider, _ in provider_list:
+                tasks.append(provider.refresh())
         await asyncio.gather(*tasks)
 
     def render(self) -> List[Dict[str, Any]]:

aient/architext/test/test.py

@@ -1053,6 +1053,54 @@ Current time: {Texts(lambda: datetime.now().strftime("%Y-%m-%d %H:%M:%S"))}
         self.assertEqual(len(rendered_visible_again), 1)
         self.assertEqual(rendered_visible_again[0]['content'], "Hello, World!")
 
+    async def test_z8_bulk_provider_visibility_control(self):
+        """测试通过名称批量控制和豁免provider的可见性"""
+        # 1. 创建多个同名 provider
+        messages = Messages(
+            UserMessage(
+                Texts("First explanation.", name="explanation"),
+                Texts("Second explanation.", name="explanation"),
+                Texts("Some other text."),
+                Texts("Third explanation.", name="explanation")
+            )
+        )
+
+        # 2. 初始渲染，所有 "explanation" 都应该可见
+        rendered_initial = await messages.render_latest()
+        self.assertIn("First explanation.", rendered_initial[0]['content'])
+        self.assertIn("Second explanation.", rendered_initial[0]['content'])
+        self.assertIn("Third explanation.", rendered_initial[0]['content'])
+
+        # 3. 获取所有名为 "explanation" 的 provider
+        explanation_providers = messages.provider("explanation")
+        self.assertIsInstance(explanation_providers, ProviderGroup)
+        self.assertEqual(len(explanation_providers), 3)
+
+        # 4. 将所有 "explanation" provider 设置为不可见
+        # 这是需要实现的新语法
+        explanation_providers.visible = False
+        for p in explanation_providers:
+             self.assertFalse(p.visible)
+
+        # 5. 渲染，所有 "explanation" 的内容都应该消失
+        rendered_hidden = await messages.render_latest()
+        self.assertNotIn("First explanation.", rendered_hidden[0]['content'])
+        self.assertNotIn("Second explanation.", rendered_hidden[0]['content'])
+        self.assertNotIn("Third explanation.", rendered_hidden[0]['content'])
+        self.assertIn("Some other text.", rendered_hidden[0]['content'])
+
+        # 6. 将最后一个 "explanation" provider 设置回可见
+        # 这是需要实现的另一个新语法
+        explanation_providers[-1].visible = True
+        self.assertTrue(explanation_providers[-1].visible)
+        self.assertFalse(explanation_providers[0].visible)
+
+        # 7. 最终渲染，只应看到最后一个 "explanation"
+        rendered_final = await messages.render_latest()
+        self.assertNotIn("First explanation.", rendered_final[0]['content'])
+        self.assertNotIn("Second explanation.", rendered_final[0]['content'])
+        self.assertIn("Third explanation.", rendered_final[0]['content'])
+        self.assertIn("Some other text.", rendered_final[0]['content'])
 
 # ==============================================================================
 # 6. 演示

aient/models/chatgpt.py

@@ -97,13 +97,8 @@ class chatgpt(BaseLLM):
         Initialize Chatbot with API key (from https://platform.openai.com/account/api-keys)
         """
         super().__init__(api_key, engine, api_url, system_prompt, proxy, timeout, max_tokens, temperature, top_p, presence_penalty, frequency_penalty, reply_count, truncate_limit, use_plugins=use_plugins, print_log=print_log)
-        self.conversation: dict[str, list[dict]] = {
-            "default": [
-                {
-                    "role": "system",
-                    "content": self.system_prompt,
-                },
-            ],
+        self.conversation: dict[str, Messages] = {
+            "default": Messages(SystemMessage(self.system_prompt)),
         }
         if cache_messages:
             self.conversation["default"] = cache_messages

{aient-1.1.99.dist-info → aient-1.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aient
-Version: 1.1.99
+Version: 1.2.1
 Summary: Aient: The Awakening of Agent.
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown

{aient-1.1.99.dist-info → aient-1.2.1.dist-info}/RECORD

@@ -1,8 +1,8 @@
 aient/__init__.py,sha256=SRfF7oDVlOOAi6nGKiJIUK6B_arqYLO9iSMp-2IZZps,21
 aient/architext/architext/__init__.py,sha256=79Ih1151rfcqZdr7F8HSZSTs_iT2SKd1xCkehMsXeXs,19
-aient/architext/architext/core.py,sha256=RGUKPrTm0mXrC7FweIkPXRAXCDE1xxU08pZo1n-2tsA,21555
+aient/architext/architext/core.py,sha256=zdgUvCBr_BMZ1s51ZN_28CjN8RDXY6DzpnodJaIG80Y,23735
 aient/architext/test/openai_client.py,sha256=Dqtbmubv6vwF8uBqcayG0kbsiO65of7sgU2-DRBi-UM,4590
-aient/architext/test/test.py,sha256=CSjXZbY-cgJP1xXY-vA56iM5XXMfwsW2sZQLwAwWS7k,50477
+aient/architext/test/test.py,sha256=EsgtMdIUSz4eCB7T0zs3wqYg_E1gP7h11WZyVevlqjw,52951
 aient/architext/test/test_save_load.py,sha256=o8DqH6gDYZkFkQy-a7blqLtJTRj5e4a-Lil48pJ0V3g,3260
 aient/core/__init__.py,sha256=NxjebTlku35S4Dzr16rdSqSTWUvvwEeACe8KvHJnjPg,34
 aient/core/log_config.py,sha256=kz2_yJv1p-o3lUQOwA3qh-LSc3wMHv13iCQclw44W9c,274
@@ -17,7 +17,7 @@ aient/core/test/test_payload.py,sha256=8jBiJY1uidm1jzL-EiK0s6UGmW9XkdsuuKFGrwFhF
 aient/models/__init__.py,sha256=ZTiZgbfBPTjIPSKURE7t6hlFBVLRS9lluGbmqc1WjxQ,43
 aient/models/audio.py,sha256=kRd-8-WXzv4vwvsTGwnstK-WR8--vr9CdfCZzu8y9LA,1934
 aient/models/base.py,sha256=-nnihYnx-vHZMqeVO9ljjt3k4FcD3n-iMk4tT-10nRQ,7232
-aient/models/chatgpt.py,sha256=EqvIcB6R_JGmvD5kEfR1ZRQYLfyGpmy4PvfRx8hMIKE,42019
+aient/models/chatgpt.py,sha256=_fYGUnSciKSWYhPuS0lECtU6-C42GGGhFiqbVxejaJg,41919
 aient/plugins/__init__.py,sha256=p3KO6Aa3Lupos4i2SjzLQw1hzQTigOAfEHngsldrsyk,986
 aient/plugins/arXiv.py,sha256=yHjb6PS3GUWazpOYRMKMzghKJlxnZ5TX8z9F6UtUVow,1461
 aient/plugins/config.py,sha256=TGgZ5SnNKZ8MmdznrZ-TEq7s2ulhAAwTSKH89bci3dA,7079
@@ -35,8 +35,8 @@ aient/plugins/write_file.py,sha256=Jt8fOEwqhYiSWpCbwfAr1xoi_BmFnx3076GMhuL06uI,3
 aient/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 aient/utils/prompt.py,sha256=UcSzKkFE4-h_1b6NofI6xgk3GoleqALRKY8VBaXLjmI,11311
 aient/utils/scripts.py,sha256=VqtK4RFEx7KxkmcqG3lFDS1DxoNlFFGErEjopVcc8IE,40974
-aient-1.1.99.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
-aient-1.1.99.dist-info/METADATA,sha256=lUsprSWgvrH42NHm6pTNppqBmiSn7FG1BH2IDEZa4cE,4842
-aient-1.1.99.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-aient-1.1.99.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
-aient-1.1.99.dist-info/RECORD,,
+aient-1.2.1.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
+aient-1.2.1.dist-info/METADATA,sha256=XlgqCsm1fEQcbglTceD25kCVKaFmO5rvcON71zdg5cs,4841
+aient-1.2.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+aient-1.2.1.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
+aient-1.2.1.dist-info/RECORD,,