prompty 0.1.38__tar.gz → 0.1.40__tar.gz

{prompty-0.1.38 → prompty-0.1.40}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: prompty
-Version: 0.1.38
+Version: 0.1.40
 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.38 → prompty-0.1.40}/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.38 → prompty-0.1.40}/prompty/cli.py

@@ -2,6 +2,7 @@ import os
 import json
 import click
 import importlib
+from typing import Any, Dict, Optional
 
 from pathlib import Path
 from pydantic import BaseModel
@@ -32,6 +33,8 @@ def dynamic_import(module: str):
         t = "prompty.azure"
     elif module == "serverless":
         t = "prompty.serverless"
+    elif module == "openai":
+        t = "prompty.openai"
     else:
         t = module
 
@@ -78,14 +81,16 @@ def chat_mode(prompt_path: str):
 
 
 @trace
-def execute(prompt_path: str, raw=False):
+def execute(prompt_path: str, inputs: Optional[Dict[str, Any]] = None, raw=False):
     p = prompty.load(prompt_path)
 
+    inputs = inputs or {}
+
     try:
         # load executor / processor types
         dynamic_import(p.model.configuration["type"])
 
-        result = prompty.execute(p, raw=raw)
+        result = prompty.execute(p, inputs=inputs, raw=raw)
         if issubclass(type(result), BaseModel):
             print("\n", json.dumps(result.model_dump(), indent=4), "\n")
         elif isinstance(result, list):
@@ -98,13 +103,42 @@ def execute(prompt_path: str, raw=False):
         print(f"{type(e).__qualname__}: {e}", "\n")
 
 
-@click.command()
+def _attributes_to_dict(
+    ctx: click.Context, attribute: click.Option, attributes: tuple[str, ...]
+) -> dict[str, str]:
+    """Click callback that converts attributes specified in the form `key=value` to a
+    dictionary"""
+    result = {}
+    for arg in attributes:
+        k, v = arg.split("=")
+        if k in result:
+            raise click.BadParameter(f"Attribute {k!r} is specified twice")
+        if v == "@-":
+            v = click.get_text_stream("stdin").read()
+        if v.startswith("@"):
+            v = Path(v[1:]).read_text()
+        result[k] = v
+
+    return result
+
+
+@click.command(epilog="""
+\b
+INPUTS: key=value pairs
+    The values can come from:
+    - plain strings - e.g.: question="Does it have windows?"
+    - files - e.g.: question=@question.txt
+    - stdin - e.g.: question=@-
+
+For more information, visit https://prompty.ai/
+""")
 @click.option("--source", "-s", required=True)
 @click.option("--env", "-e", required=False)
 @click.option("--verbose", "-v", is_flag=True)
 @click.option("--chat", "-c", is_flag=True)
+@click.argument("inputs", nargs=-1, callback=_attributes_to_dict)
 @click.version_option()
-def run(source, env, verbose, chat):
+def run(source, env, verbose, chat, inputs):
     # load external env file
     if env:
         print(f"Loading environment variables from {env}")
@@ -124,7 +158,7 @@ def run(source, env, verbose, chat):
     if chat:
         chat_mode(str(prompt_path))
     else:
-        execute(str(prompt_path), raw=verbose)
+        execute(str(prompt_path), inputs=inputs, raw=verbose)
 
 
 if __name__ == "__main__":

{prompty-0.1.38 → prompty-0.1.40}/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.38 → prompty-0.1.40}/prompty/openai/__init__.py

@@ -4,7 +4,7 @@ from prompty.invoker import InvokerException
 try:
     from .executor import OpenAIExecutor
     from .processor import OpenAIProcessor
-except ImportError:
+except ImportError as e:
     raise InvokerException(
-        "Error registering OpenAIExecutor and OpenAIProcessor", "openai"
+        f"Error registering OpenAIExecutor and OpenAIProcessor: {e}", "openai"
     )

{prompty-0.1.38 → prompty-0.1.40}/prompty/openai/executor.py

@@ -18,12 +18,12 @@ class OpenAIExecutor(Invoker):
         self.kwargs = {
             key: value
             for key, value in self.prompty.model.configuration.items()
-            if key != "type"
+            if key != "type" and key != "name"
         }
 
         self.api = self.prompty.model.api
-        self.deployment = self.prompty.model.configuration["azure_deployment"]
         self.parameters = self.prompty.model.parameters
+        self.model = self.prompty.model.configuration["name"]
 
     def invoke(self, data: any) -> any:
         """Invoke the OpenAI API
@@ -59,7 +59,7 @@ class OpenAIExecutor(Invoker):
             if self.api == "chat":
                 trace("signature", "OpenAI.chat.completions.create")
                 args = {
-                    "model": self.deployment,
+                    "model": self.model,
                     "messages": data if isinstance(data, list) else [data],
                     **self.parameters,
                 }

{prompty-0.1.38 → prompty-0.1.40}/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:

{prompty-0.1.38 → prompty-0.1.40}/pyproject.toml

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