promptbuilder 0.4.33__py3-none-any.whl → 0.4.34__py3-none-any.whl

promptbuilder/llm_client/logfire_decorators.py

@@ -7,7 +7,7 @@ import logfire
 
 from promptbuilder.llm_client.utils import inherited_decorator
 from promptbuilder.llm_client.config import GLOBAL_CONFIG
-from promptbuilder.llm_client.types import Response, UsageMetadata
+from promptbuilder.llm_client.types import Response, UsageMetadata, content_to_str
 
 
 P = ParamSpec("P")
@@ -24,9 +24,9 @@ def extract_span_data(self, *args, **kwargs) -> dict[str, Any]:
         logfire_messages.append({"role": "system", "content": system_message})
     for content in messages:
         if content.role == "user":
-            logfire_messages.append({"role": "user", "content": content.as_str()})
+            logfire_messages.append({"role": "user", "content": content_to_str(content)})
         elif content.role == "model":
-            logfire_messages.append({"role": "assistant", "content": content.as_str()})
+            logfire_messages.append({"role": "assistant", "content": content_to_str(content)})
     span_data["request_data"] = {"messages": logfire_messages}
     span_data["messages"] = messages
     

promptbuilder/llm_client/types.py

@@ -96,11 +96,13 @@ class Content(BaseModel):
     role: Role | None = None
     
     def as_str(self) -> str:
-        if self.parts is None:
-            return ""
-        else:
-            return "\n".join([(part.text or "") for part in self.parts])
+        return content_to_str(self)
 
+def content_to_str(content: Content) -> str:
+    if content.parts is None:
+        return ""
+    else:
+        return "".join([part.text for part in content.parts if part.text])
 
 class FinishReason(Enum):
   """Output only. The reason why the model stopped generating tokens.

{promptbuilder-0.4.33.dist-info → promptbuilder-0.4.34.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: promptbuilder
-Version: 0.4.33
+Version: 0.4.34
 Summary: Library for building prompts for LLMs
 Home-page: https://github.com/kapulkin/promptbuilder
 Author: Kapulkin Stanislav

{promptbuilder-0.4.33.dist-info → promptbuilder-0.4.34.dist-info}/RECORD

@@ -15,14 +15,14 @@ promptbuilder/llm_client/config.py,sha256=exQEm35wp7lK5SfXNpN5H9VZEb2LVa4pyZ-cxG
 promptbuilder/llm_client/exceptions.py,sha256=t-X7r_a8B1jNu8eEavde1jXu5dz97yV3IG4YHOtgh0Y,4836
 promptbuilder/llm_client/google_client.py,sha256=ZjJjDUQZH6zAIRoi4xUx3IDEm8jRkVWGyehy5P_Ba_M,12170
 promptbuilder/llm_client/litellm_client.py,sha256=NxVJORvQy5fSoqzPOagBliAhg2fjnFNnV5ZF7qckbVI,25561
-promptbuilder/llm_client/logfire_decorators.py,sha256=un_QnIekypOEcqTZ5v1y9pwijGnF95xwnwKO5rFSHVY,9667
+promptbuilder/llm_client/logfire_decorators.py,sha256=pEPm3nTfqkg9kZr3s5ORs3fMex_z4Ce8CAt301m3OIk,9697
 promptbuilder/llm_client/main.py,sha256=2Q7J5FwivX2YwvptzoSEtCfvfcI9p5HC55D3mMb2se4,8243
 promptbuilder/llm_client/openai_client.py,sha256=QMXX7VPYWFo1VvX8bWF6jpi95ZIOk_MMBpz-14GrT-k,25274
-promptbuilder/llm_client/types.py,sha256=kgbg5FRzvZwu98y1OhAZJDneXBNPnsFZueQCr9HXIY4,8063
+promptbuilder/llm_client/types.py,sha256=fnkSMFjK9ViaRQsD6LILpLz8R2_E1TI9efjy8VNO0RQ,8139
 promptbuilder/llm_client/utils.py,sha256=79lvSppjrrItHB5MIozbp_5Oq7TsOK4Qzt9Ae3XMLFw,7624
 promptbuilder/llm_client/vertex_client.py,sha256=OgbmRIYQXeK2kAh27ijhXuTzeg8APP38IyJ9WJqvDkY,15405
-promptbuilder-0.4.33.dist-info/licenses/LICENSE,sha256=fqXmInzgsvEOIaKSBgcrwKyYCGYF0MKErJ0YivtODcc,1096
-promptbuilder-0.4.33.dist-info/METADATA,sha256=LzmyQ7EyHXCNSmW_M_cXFdKimdlQvizbK85I5qf-uPs,3799
-promptbuilder-0.4.33.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-promptbuilder-0.4.33.dist-info/top_level.txt,sha256=UBVcYn4UgrPy3O3fmmnPEU_kieuplBMgheetIMei4EI,14
-promptbuilder-0.4.33.dist-info/RECORD,,
+promptbuilder-0.4.34.dist-info/licenses/LICENSE,sha256=fqXmInzgsvEOIaKSBgcrwKyYCGYF0MKErJ0YivtODcc,1096
+promptbuilder-0.4.34.dist-info/METADATA,sha256=vGhJa-lzL9vGZm-4GTwWmYtqzpjPGEkVt7SL5Lvkskg,3799
+promptbuilder-0.4.34.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+promptbuilder-0.4.34.dist-info/top_level.txt,sha256=UBVcYn4UgrPy3O3fmmnPEU_kieuplBMgheetIMei4EI,14
+promptbuilder-0.4.34.dist-info/RECORD,,