update deps and bump version

examples/roleplay.py

@@ -10,7 +10,7 @@
 from rich import print
 from stone_brick.llm.error import GeneratedNotValid
 from stone_brick.llm.utils import oai_gen_with_retry_then_validate
-from stone_brick.parser.xml import tags_from_text
+from stone_brick.parser import flat_xml_tags_from_text
 
 from prompt_bottle import PromptBottle
 
@@ -190,7 +190,7 @@ async def try_generate(
     )
 
     def validator(text: str):
-        tags = tags_from_text(text, [tag.value for tag in LogType])
+        tags = flat_xml_tags_from_text(text, [tag.value for tag in LogType])
         for item in tags:
             if isinstance(item, tuple):
                 return LogType(item[0]), item[1]

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "prompt_bottle"
-version = "0.1.4"
+version = "0.1.5"
 description = "LLM-targeted template engine, built upon Jinja"
 authors = [
     {name = "Yanli",email = "[email protected]"},
@@ -9,7 +9,7 @@ dependencies = [
     "openai>=1.51.2",
     "jinja2>=3.1.4",
     "PyYAML>=6.0.2",
-    "stone-brick-toolkit~=0.5.0"
+    "stone-brick-toolkit>=0.6.1,<1.0.0"
 ]
 requires-python = ">=3.9"
 readme = "README.md"
@@ -31,6 +31,11 @@ build-backend = "pdm.backend"
 [tool.pdm]
 distribution = true
 
+[tool.pdm.dev-dependencies]
+dev = [
+    "rich>=13.9.4",
+    "ruff>=0.8.1",
+]
 [tool.pyright]
 venvPath = ".venv"
 

src/prompt_bottle/__init__.py

@@ -10,12 +10,12 @@
 )
 
 __all__ = [
-    "PromptBottle",
-    "simple_bottle",
     "PBTag",
-    "pb_tag",
+    "PromptBottle",
+    "pb_audio",
     "pb_img_url",
     "pb_mp3_audio",
+    "pb_tag",
     "pb_wav_audio",
-    "pb_audio",
+    "simple_bottle",
 ]

src/prompt_bottle/bottle.py

@@ -21,7 +21,7 @@
 from openai.types.chat.chat_completion_assistant_message_param import (
     ContentArrayOfContentPart,
 )
-from stone_brick.parser.xml import tags_from_text
+from stone_brick.parser.xml import flat_xml_tags_from_text
 
 from prompt_bottle.tags.convert_to import PB_TAG_TO_OPENAI, to_text_part
 from prompt_bottle.tags.tags import PBTag
@@ -111,7 +111,7 @@ def render_text(
         text = Template(text).render(**kwargs)
     parts: List[ChatCompletionContentPartParam] = []
 
-    tags = tags_from_text(text, [tag.value for tag in PBTag])
+    tags = flat_xml_tags_from_text(text, [tag.value for tag in PBTag])
     for tag in tags:
         if isinstance(tag, tuple):
             name, content = tag