prompty 0.1.37__py3-none-any.whl → 0.1.39__py3-none-any.whl

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/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/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.dist-info → prompty-0.1.39.dist-info}/METADATA

@@ -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.dist-info → prompty-0.1.39.dist-info}/RECORD

@@ -1,15 +1,15 @@
-prompty-0.1.37.dist-info/METADATA,sha256=q2jDy8mc-b5UPlsKAkel1SzCP8XPwspLr0mfcZA5OlQ,9164
-prompty-0.1.37.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
-prompty-0.1.37.dist-info/entry_points.txt,sha256=a3i7Kvf--3DOkkv9VQpstwaNKgsnXwDGaPL18lPpKeI,60
-prompty-0.1.37.dist-info/licenses/LICENSE,sha256=KWSC4z9cfML_t0xThoQYjzTdcZQj86Y_mhXdatzU-KM,1052
+prompty-0.1.39.dist-info/METADATA,sha256=MIUpA37K8Wo4wUD7xtK6oIeLFJj5uuZT-5rM18LbI5w,9164
+prompty-0.1.39.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
+prompty-0.1.39.dist-info/entry_points.txt,sha256=a3i7Kvf--3DOkkv9VQpstwaNKgsnXwDGaPL18lPpKeI,60
+prompty-0.1.39.dist-info/licenses/LICENSE,sha256=KWSC4z9cfML_t0xThoQYjzTdcZQj86Y_mhXdatzU-KM,1052
 prompty/__init__.py,sha256=HCAvInBgNcIDO54rR4-RDIF4KUmGVQ2TRam_dS7xHEk,16561
 prompty/azure/__init__.py,sha256=WI8qeNWfxqggj21bznL-mxGUS-v67bUrunX0Lf2hsI8,295
-prompty/azure/executor.py,sha256=RJXMB0W7KcVvQ7l3xJaau7YM8PqOCQwuN4IwIe0sTLg,7930
+prompty/azure/executor.py,sha256=LZG0U5AZB4H6CDfZxlsvcUnmq0LnTxMEFgLd9nzHAgc,9126
 prompty/azure/processor.py,sha256=-CWc_1h4xdb0nyHwUkaI40NtzTxxenCXkgjJTh76AOk,5079
 prompty/azure_beta/__init__.py,sha256=QF4qcILpsryBLl1nvc1AhRzkKI2uqc6OAU_fA3LISNE,361
 prompty/azure_beta/executor.py,sha256=PIPfeOTLk9YEM80adktL2zxpa51gO4itlQzUDoq0QVg,9896
 prompty/cli.py,sha256=k8Rxm41fMFNvmnsX737UiN6v-7756tpoJPN4rPXMNcU,3726
-prompty/core.py,sha256=EvkXV_mH7Mj1skT21XMZ4VX-Jlwx6AF-WEJ9yPc50AE,13061
+prompty/core.py,sha256=haX415_MciCn6K0zU4nZ394ZaJemZe9-iOsdRbe9G6A,12985
 prompty/invoker.py,sha256=O77E5iQ1552wQXxL8FhZGERbCi_0O3mDTd5Ozqw-O-E,8593
 prompty/openai/__init__.py,sha256=hbBhgCwB_uSq-1NWL02yiOiNkyi39-G-AyVlTSgKTkU,276
 prompty/openai/executor.py,sha256=qkFSMA-pWlA1c602Dx5aR1cFEOnYsUUp_E7P3zFhSPs,3644
@@ -19,6 +19,6 @@ prompty/renderers.py,sha256=80HNtCp3osgaLfhKxkG4j1kiRhJ727ITzT_yL5JLjEQ,1104
 prompty/serverless/__init__.py,sha256=xoXOTRXO8C631swNKaa-ek5_R3X-87bJpTm0z_Rsg6A,282
 prompty/serverless/executor.py,sha256=PUDJsYcJLQx9JSTh-R3HdJd0ehEC6w2Ch5OEqz52uVI,8395
 prompty/serverless/processor.py,sha256=ZSL9y8JC-G4qbtWOSbQAqEcFMWEaLskyOr5VjLthelU,3660
-prompty/tracer.py,sha256=7z9IsJgOyE3tJkRIAhbo3QRSKrjFjH0-ZoN5fKIT_9w,11181
+prompty/tracer.py,sha256=VcrXkM71VO45xWY2b7H2AdCp5bSsCtcAv1m00ycf7XM,11678
 prompty/utils.py,sha256=jm7HEzOGk3zz8d5aquXK3zWIQWuDpBpJTzlz5sswtdg,2836
-prompty-0.1.37.dist-info/RECORD,,
+prompty-0.1.39.dist-info/RECORD,,