prompty 0.1.37__tar.gz → 0.1.39__tar.gz

{prompty-0.1.37 → prompty-0.1.39}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: prompty
-Version: 0.1.37
+Version: 0.1.39
 Summary: Prompty is a new asset class and format for LLM prompts that aims to provide observability, understandability, and portability for developers. It includes spec, tooling, and a runtime. This Prompty runtime supports Python
 Author-Email: Seth Juarez <seth.juarez@microsoft.com>
 License: MIT

{prompty-0.1.37 → prompty-0.1.39}/prompty/azure/executor.py

@@ -1,10 +1,12 @@
+import json
 import azure.identity
 import importlib.metadata
 from typing import AsyncIterator, Iterator
-from openai import AzureOpenAI, AsyncAzureOpenAI
+from openai import APIResponse, AzureOpenAI, AsyncAzureOpenAI
 
-from prompty.tracer import Tracer
+from prompty.tracer import Tracer, sanitize
 from ..core import AsyncPromptyStream, Prompty, PromptyStream
+from openai.types.chat.chat_completion import ChatCompletion
 from ..invoker import Invoker, InvokerFactory
 
 VERSION = importlib.metadata.version("prompty")
@@ -86,7 +88,21 @@ class AzureOpenAIExecutor(Invoker):
                     **self.parameters,
                 }
                 trace("inputs", args)
-                response = client.chat.completions.create(**args)
+
+                if "stream" in args and args["stream"] == True:
+                    response = client.chat.completions.create(**args)
+                else:
+                    raw: APIResponse = client.chat.completions.with_raw_response.create(
+                        **args
+                    )
+                    response = ChatCompletion.model_validate_json(raw.text)
+
+                    for k, v in raw.headers.raw:
+                        trace(k.decode("utf-8"), v.decode("utf-8"))
+
+                    trace("request_id", raw.request_id)
+                    trace("retries_taken", raw.retries_taken)
+
                 trace("result", response)
 
             elif self.api == "completion":
@@ -171,7 +187,20 @@ class AzureOpenAIExecutor(Invoker):
                     **self.parameters,
                 }
                 trace("inputs", args)
-                response = await client.chat.completions.create(**args)
+
+                if "stream" in args and args["stream"] == True:
+                    response = await client.chat.completions.create(**args)
+                else:
+                    raw: APIResponse = await client.chat.completions.with_raw_response.create(
+                        **args
+                    )
+                    response = ChatCompletion.model_validate_json(raw.text)
+                    for k, v in raw.headers.raw:
+                        trace(k.decode("utf-8"), v.decode("utf-8"))
+
+                    trace("request_id", raw.request_id)
+                    trace("retries_taken", raw.retries_taken)
+
                 trace("result", response)
 
             elif self.api == "completion":
@@ -182,6 +211,7 @@ class AzureOpenAIExecutor(Invoker):
                     **self.parameters,
                 }
                 trace("inputs", args)
+
                 response = await client.completions.create(**args)
                 trace("result", response)
 

{prompty-0.1.37 → prompty-0.1.39}/prompty/core.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import os
 from pathlib import Path
 
-from .tracer import Tracer, to_dict
+from .tracer import Tracer, to_dict, sanitize
 from pydantic import BaseModel, Field, FilePath
 from typing import AsyncIterator, Iterator, List, Literal, Dict, Callable, Set, Tuple
 
@@ -88,10 +88,7 @@ class ModelSettings(BaseModel):
             serialize_as_any=serialize_as_any,
         )
 
-        d["configuration"] = {
-            k: "*" * len(v) if "key" in k.lower() or "secret" in k.lower() else v
-            for k, v in d["configuration"].items()
-        }
+        d["configuration"] = {k: sanitize(k, v) for k, v in d["configuration"].items()}
         return d
 
 

{prompty-0.1.37 → prompty-0.1.39}/prompty/tracer.py

@@ -16,9 +16,9 @@ from typing import Any, Callable, Dict, Iterator, List
 # clean up key value pairs for sensitive values
 def sanitize(key: str, value: Any) -> Any:
     if isinstance(value, str) and any(
-        [s in key.lower() for s in ["key", "token", "secret", "password", "credential"]]
+        [s in key.lower() for s in ["key", "secret", "password", "credential"]]
     ):
-        return len(str(value)) * "*"
+        return 10 * "*"
     elif isinstance(value, dict):
         return {k: sanitize(k, v) for k, v in value.items()}
     else:
@@ -134,7 +134,17 @@ def _trace_sync(
     @wraps(func)
     def wrapper(*args, **kwargs):
         name, signature = _name(func, args)
+        altname: str = None
+        # special case
+        if "name" in okwargs:
+            altname = name
+            name = okwargs["name"]
+            del okwargs["name"]
+
         with Tracer.start(name) as trace:
+            if altname != None:
+                trace("function", altname)
+
             trace("signature", signature)
 
             # support arbitrary keyword
@@ -178,10 +188,20 @@ def _trace_async(
     @wraps(func)
     async def wrapper(*args, **kwargs):
         name, signature = _name(func, args)
+        altname: str = None
+        # special case
+        if "name" in okwargs:
+            altname = name
+            name = okwargs["name"]
+            del okwargs["name"]
+
         with Tracer.start(name) as trace:
+            if altname != None:
+                trace("function", altname)
+                
             trace("signature", signature)
 
-            # support arbitrary keyword 
+            # support arbitrary keyword
             # arguments for trace decorator
             for k, v in okwargs.items():
                 trace(k, to_dict(v))

{prompty-0.1.37 → prompty-0.1.39}/pyproject.toml

@@ -15,7 +15,7 @@ dependencies = [
     "click>=8.1.7",
     "aiofiles>=24.1.0",
 ]
-version = "0.1.37"
+version = "0.1.39"
 
 [project.license]
 text = "MIT"

{prompty-0.1.37 → prompty-0.1.39}/tests/test_tracing.py

@@ -308,3 +308,18 @@ def test_tracing_attributes():
             with Tracer.start("Test3", {"signature": "9", "ten": 10}) as trace:
                 trace("inputs", 11)
                 trace(Tracer.RESULT, 12)
+
+
+@trace(name="OTHER")
+def test_named_tracer():
+    with Tracer.start("Test1", {Tracer.SIGNATURE: "test1", "two": 2}) as trace:
+        trace(Tracer.INPUTS, 3)
+        trace(Tracer.RESULT, 4)
+
+
+@pytest.mark.asyncio
+@trace(name="OTHER")
+async def test_named_tracer_async():
+    with Tracer.start("Test1", {Tracer.SIGNATURE: "test1", "two": 2}) as trace:
+        trace(Tracer.INPUTS, 3)
+        trace(Tracer.RESULT, 4)