prompty 0.1.40__py3-none-any.whl → 0.1.45__py3-none-any.whl

prompty/serverless/executor.py

@@ -1,24 +1,27 @@
-import azure.identity
 import importlib.metadata
-from typing import Iterator
-from azure.core.credentials import AzureKeyCredential
+import typing
+from collections.abc import Iterator
+
+import azure.identity
 from azure.ai.inference import (
     ChatCompletionsClient,
     EmbeddingsClient,
 )
-
 from azure.ai.inference.aio import (
     ChatCompletionsClient as AsyncChatCompletionsClient,
+)
+from azure.ai.inference.aio import (
     EmbeddingsClient as AsyncEmbeddingsClient,
 )
 from azure.ai.inference.models import (
-    StreamingChatCompletions,
     AsyncStreamingChatCompletions,
+    StreamingChatCompletions,
 )
+from azure.core.credentials import AzureKeyCredential
 
-from ..tracer import Tracer
+from ..core import AsyncPromptyStream, Prompty, PromptyStream
 from ..invoker import Invoker, InvokerFactory
-from ..core import Prompty, PromptyStream, AsyncPromptyStream
+from ..tracer import Tracer
 
 VERSION = importlib.metadata.version("prompty")
 
@@ -29,13 +32,20 @@ class ServerlessExecutor(Invoker):
 
     def __init__(self, prompty: Prompty) -> None:
         super().__init__(prompty)
+        self.kwargs = {
+            key: value
+            for key, value in self.prompty.model.configuration.items()
+            if key != "type"
+        }
 
         self.endpoint = self.prompty.model.configuration["endpoint"]
         self.model = self.prompty.model.configuration["model"]
 
         # no key, use default credentials
         if "key" not in self.kwargs:
-            self.credential = azure.identity.DefaultAzureCredential(
+            self.credential: typing.Union[
+                azure.identity.DefaultAzureCredential, AzureKeyCredential
+            ] = azure.identity.DefaultAzureCredential(
                 exclude_shared_token_cache_credential=True
             )
         else:
@@ -46,11 +56,13 @@ class ServerlessExecutor(Invoker):
         # api type
         self.api = self.prompty.model.api
 
-    def _response(self, response: any) -> any:
+    def _response(self, response: typing.Any) -> typing.Any:
         # stream response
         if isinstance(response, Iterator):
             if isinstance(response, StreamingChatCompletions):
-                stream = PromptyStream("ServerlessExecutor", response)
+                stream: typing.Union[PromptyStream, AsyncPromptyStream] = PromptyStream(
+                    "ServerlessExecutor", response
+                )
                 return stream
             elif isinstance(response, AsyncStreamingChatCompletions):
                 stream = AsyncPromptyStream("ServerlessExecutor", response)
@@ -62,7 +74,7 @@ class ServerlessExecutor(Invoker):
         else:
             return response
 
-    def invoke(self, data: any) -> any:
+    def invoke(self, data: typing.Any) -> typing.Any:
         """Invoke the Serverless SDK
 
         Parameters
@@ -89,7 +101,7 @@ class ServerlessExecutor(Invoker):
                     "description", "Azure Unified Inference SDK Chat Completions Client"
                 )
                 trace("inputs", cargs)
-                client = ChatCompletionsClient(
+                client: typing.Any = ChatCompletionsClient(
                     user_agent=f"prompty/{VERSION}",
                     **cargs,
                 )
@@ -174,10 +186,11 @@ class ServerlessExecutor(Invoker):
                 trace("type", "LLM")
                 trace("signature", "azure.ai.inference.aio.ChatCompletionsClient.ctor")
                 trace(
-                    "description", "Azure Unified Inference SDK Async Chat Completions Client"
+                    "description",
+                    "Azure Unified Inference SDK Async Chat Completions Client",
                 )
                 trace("inputs", cargs)
-                client = AsyncChatCompletionsClient(
+                client: typing.Any = AsyncChatCompletionsClient(
                     user_agent=f"prompty/{VERSION}",
                     **cargs,
                 )
@@ -187,7 +200,8 @@ class ServerlessExecutor(Invoker):
                 trace("type", "LLM")
                 trace("signature", "azure.ai.inference.ChatCompletionsClient.complete")
                 trace(
-                    "description", "Azure Unified Inference SDK Async Chat Completions Client"
+                    "description",
+                    "Azure Unified Inference SDK Async Chat Completions Client",
                 )
                 eargs = {
                     "model": self.model,
@@ -209,7 +223,9 @@ class ServerlessExecutor(Invoker):
             with Tracer.start("EmbeddingsClient") as trace:
                 trace("type", "LLM")
                 trace("signature", "azure.ai.inference.aio.EmbeddingsClient.ctor")
-                trace("description", "Azure Unified Inference SDK Async Embeddings Client")
+                trace(
+                    "description", "Azure Unified Inference SDK Async Embeddings Client"
+                )
                 trace("inputs", cargs)
                 client = AsyncEmbeddingsClient(
                     user_agent=f"prompty/{VERSION}",

prompty/serverless/processor.py

@@ -1,9 +1,11 @@
-from typing import AsyncIterator, Iterator
-from ..invoker import Invoker, InvokerFactory
-from ..core import AsyncPromptyStream, Prompty, PromptyStream, ToolCall
+import typing
+from collections.abc import AsyncIterator, Iterator
 
 from azure.ai.inference.models import ChatCompletions, EmbeddingsResult
 
+from ..core import AsyncPromptyStream, Prompty, PromptyStream, ToolCall
+from ..invoker import Invoker, InvokerFactory
+
 
 @InvokerFactory.register_processor("serverless")
 class ServerlessProcessor(Invoker):
@@ -12,7 +14,9 @@ class ServerlessProcessor(Invoker):
     def __init__(self, prompty: Prompty) -> None:
         super().__init__(prompty)
 
-    def invoke(self, data: any) -> any:
+    def invoke(
+        self, data: typing.Any
+    ) -> typing.Any:
         """Invoke the OpenAI API
 
         Parameters
@@ -53,7 +57,7 @@ class ServerlessProcessor(Invoker):
                 for chunk in data:
                     if (
                         len(chunk.choices) == 1
-                        and chunk.choices[0].delta.content != None
+                        and chunk.choices[0].delta.content is not None
                     ):
                         content = chunk.choices[0].delta.content
                         yield content
@@ -62,7 +66,7 @@ class ServerlessProcessor(Invoker):
         else:
             return data
 
-    async def invoke_async(self, data: str) -> str:
+    async def invoke_async(self, data: str) -> typing.Union[str, AsyncPromptyStream]:
         """Invoke the Prompty Chat Parser (Async)
 
         Parameters
@@ -103,7 +107,7 @@ class ServerlessProcessor(Invoker):
                 async for chunk in data:
                     if (
                         len(chunk.choices) == 1
-                        and chunk.choices[0].delta.content != None
+                        and chunk.choices[0].delta.content is not None
                     ):
                         content = chunk.choices[0].delta.content
                         yield content

prompty/tracer.py

@@ -1,16 +1,17 @@
-import os
-import json
+import contextlib
+import importlib
 import inspect
-import numbers
+import json
+import os
 import traceback
-import importlib
-import contextlib
-from pathlib import Path
-from numbers import Number
+from collections.abc import Iterator
 from datetime import datetime
+from functools import partial, wraps
+from numbers import Number
+from pathlib import Path
+from typing import Any, Callable, Union
+
 from pydantic import BaseModel
-from functools import wraps, partial
-from typing import Any, Callable, Dict, Iterator, List
 
 
 # clean up key value pairs for sensitive values
@@ -26,7 +27,12 @@ def sanitize(key: str, value: Any) -> Any:
 
 
 class Tracer:
-    _tracers: Dict[str, Callable[[str], Iterator[Callable[[str, Any], None]]]] = {}
+    _tracers: dict[
+        str,
+        Callable[
+            [str], contextlib._GeneratorContextManager[Callable[[str, Any], None]]
+        ],
+    ] = {}
 
     SIGNATURE = "signature"
     INPUTS = "inputs"
@@ -34,7 +40,11 @@ class Tracer:
 
     @classmethod
     def add(
-        cls, name: str, tracer: Callable[[str], Iterator[Callable[[str, Any], None]]]
+        cls,
+        name: str,
+        tracer: Callable[
+            [str], contextlib._GeneratorContextManager[Callable[[str, Any], None]]
+        ],
     ) -> None:
         cls._tracers[name] = tracer
 
@@ -44,9 +54,11 @@ class Tracer:
 
     @classmethod
     @contextlib.contextmanager
-    def start(cls, name: str, attributes: Dict[str, Any] = None) -> Iterator[Callable[[str, Any], None]]:
+    def start(
+        cls, name: str, attributes: Union[dict[str, Any], None] = None
+    ) -> Iterator[Callable[[str, Any], list[None]]]:
         with contextlib.ExitStack() as stack:
-            traces = [
+            traces: list[Callable[[str, Any], None]] = [
                 stack.enter_context(tracer(name)) for tracer in cls._tracers.values()
             ]
 
@@ -62,7 +74,7 @@ class Tracer:
             ]
 
 
-def to_dict(obj: Any) -> Dict[str, Any]:
+def to_dict(obj: Any) -> Any:
     # simple json types
     if isinstance(obj, str) or isinstance(obj, Number) or isinstance(obj, bool):
         return obj
@@ -123,18 +135,16 @@ def _inputs(func: Callable, args, kwargs) -> dict:
     return inputs
 
 
-def _results(result: Any) -> dict:
+def _results(result: Any) -> Any:
     return to_dict(result) if result is not None else "None"
 
 
-def _trace_sync(
-    func: Callable = None, **okwargs: Any
-) -> Callable:
+def _trace_sync(func: Callable, **okwargs: Any) -> Callable:
 
     @wraps(func)
     def wrapper(*args, **kwargs):
         name, signature = _name(func, args)
-        altname: str = None
+        altname: Union[str, None] = None
         # special case
         if "name" in okwargs:
             altname = name
@@ -142,7 +152,7 @@ def _trace_sync(
             del okwargs["name"]
 
         with Tracer.start(name) as trace:
-            if altname != None:
+            if altname is not None:
                 trace("function", altname)
 
             trace("signature", signature)
@@ -181,14 +191,12 @@ def _trace_sync(
     return wrapper
 
 
-def _trace_async(
-    func: Callable = None, **okwargs: Any
-) -> Callable:
+def _trace_async(func: Callable, **okwargs: Any) -> Callable:
 
     @wraps(func)
     async def wrapper(*args, **kwargs):
         name, signature = _name(func, args)
-        altname: str = None
+        altname: Union[str, None] = None
         # special case
         if "name" in okwargs:
             altname = name
@@ -196,9 +204,9 @@ def _trace_async(
             del okwargs["name"]
 
         with Tracer.start(name) as trace:
-            if altname != None:
+            if altname is not None:
                 trace("function", altname)
-                
+
             trace("signature", signature)
 
             # support arbitrary keyword
@@ -234,7 +242,7 @@ def _trace_async(
     return wrapper
 
 
-def trace(func: Callable = None, **kwargs: Any) -> Callable:
+def trace(func: Union[Callable, None] = None, **kwargs: Any) -> Callable:
     if func is None:
         return partial(trace, **kwargs)
     wrapped_method = _trace_async if inspect.iscoroutinefunction(func) else _trace_sync
@@ -242,7 +250,7 @@ def trace(func: Callable = None, **kwargs: Any) -> Callable:
 
 
 class PromptyTracer:
-    def __init__(self, output_dir: str = None) -> None:
+    def __init__(self, output_dir: Union[str, None] = None) -> None:
         if output_dir:
             self.output = Path(output_dir).resolve().absolute()
         else:
@@ -251,7 +259,7 @@ class PromptyTracer:
         if not self.output.exists():
             self.output.mkdir(parents=True, exist_ok=True)
 
-        self.stack: List[Dict[str, Any]] = []
+        self.stack: list[dict[str, Any]] = []
 
     @contextlib.contextmanager
     def tracer(self, name: str) -> Iterator[Callable[[str, Any], None]]:
@@ -324,7 +332,7 @@ class PromptyTracer:
                     self.stack[-1]["__frames"] = []
                 self.stack[-1]["__frames"].append(frame)
 
-    def hoist_item(self, src: Dict[str, Any], cur: Dict[str, Any]) -> None:
+    def hoist_item(self, src: dict[str, Any], cur: dict[str, Any]) -> dict[str, Any]:
         for key, value in src.items():
             if value is None or isinstance(value, list) or isinstance(value, dict):
                 continue
@@ -333,12 +341,13 @@ class PromptyTracer:
                     cur[key] = value
                 else:
                     cur[key] += value
-            except:
+            except Exception:
+                # TODO: Be more specific about exceptions here
                 continue
 
         return cur
 
-    def write_trace(self, frame: Dict[str, Any]) -> None:
+    def write_trace(self, frame: dict[str, Any]) -> None:
         trace_file = (
             self.output
             / f"{frame['name']}.{datetime.now().strftime('%Y%m%d.%H%M%S')}.tracy"

prompty/utils.py

@@ -1,34 +1,39 @@
-import re
-import yaml
 import json
-import asyncio
-import aiofiles
-from typing import Dict
+import re
+import typing
 from pathlib import Path
 
+import aiofiles
+import yaml
+
 _yaml_regex = re.compile(
     r"^\s*" + r"(?:---|\+\+\+)" + r"(.*?)" + r"(?:---|\+\+\+)" + r"\s*(.+)$",
     re.S | re.M,
 )
 
-def load_text(file_path, encoding='utf-8'):
-    with open(file_path, 'r', encoding=encoding) as file:
+
+def load_text(file_path, encoding="utf-8"):
+    with open(file_path, encoding=encoding) as file:
         return file.read()
 
-async def load_text_async(file_path, encoding='utf-8'):
-    async with aiofiles.open(file_path, mode='r', encoding=encoding) as f:
+
+async def load_text_async(file_path, encoding="utf-8"):
+    async with aiofiles.open(file_path, encoding=encoding) as f:
         content = await f.read()
         return content
 
-def load_json(file_path, encoding='utf-8'):
+
+def load_json(file_path, encoding="utf-8"):
     return json.loads(load_text(file_path, encoding=encoding))
 
-async def load_json_async(file_path, encoding='utf-8'):
+
+async def load_json_async(file_path, encoding="utf-8"):
     # async file open
     content = await load_text_async(file_path, encoding=encoding)
     return json.loads(content)
 
-def _find_global_config(prompty_path: Path = Path.cwd()) -> Path:
+
+def _find_global_config(prompty_path: Path = Path.cwd()) -> typing.Union[Path, None]:
     prompty_config = list(Path.cwd().glob("**/prompty.json"))
 
     if len(prompty_config) > 0:
@@ -46,7 +51,7 @@ def _find_global_config(prompty_path: Path = Path.cwd()) -> Path:
 
 def load_global_config(
     prompty_path: Path = Path.cwd(), configuration: str = "default"
-) -> Dict[str, any]:
+) -> dict[str, typing.Any]:
     # prompty.config laying around?
     config = _find_global_config(prompty_path)
 
@@ -63,7 +68,7 @@ def load_global_config(
 
 async def load_global_config_async(
     prompty_path: Path = Path.cwd(), configuration: str = "default"
-) -> Dict[str, any]:
+) -> dict[str, typing.Any]:
     # prompty.config laying around?
     config = _find_global_config(prompty_path)
 
@@ -78,7 +83,7 @@ async def load_global_config_async(
     return {}
 
 
-def load_prompty(file_path, encoding='utf-8'):
+def load_prompty(file_path, encoding="utf-8"):
     contents = load_text(file_path, encoding=encoding)
     return parse(contents)
 

{prompty-0.1.40.dist-info → prompty-0.1.45.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: prompty
-Version: 0.1.40
+Version: 0.1.45
 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.45.dist-info/RECORD

@@ -0,0 +1,25 @@
+prompty-0.1.45.dist-info/METADATA,sha256=lGL_FxvFnqD5qScwk4XHKi3hSgRt8oovCeTdX2vk-q8,9164
+prompty-0.1.45.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
+prompty-0.1.45.dist-info/entry_points.txt,sha256=a3i7Kvf--3DOkkv9VQpstwaNKgsnXwDGaPL18lPpKeI,60
+prompty-0.1.45.dist-info/licenses/LICENSE,sha256=KWSC4z9cfML_t0xThoQYjzTdcZQj86Y_mhXdatzU-KM,1052
+prompty/__init__.py,sha256=geIhhprDhbqqkj5jQhy3Nv_b83T38VhleEUfB7Xkd4U,16861
+prompty/azure/__init__.py,sha256=zBxzOMQCwtiz2CsI8gNWzr7T2ZJHF3TZNIUtvfuaEQI,309
+prompty/azure/executor.py,sha256=UaojJ4aUObdGvR-aBRRSntrFJZynvZ0Q1z8j2XHyc3I,9269
+prompty/azure/processor.py,sha256=gNmUkPBoSLPE0t7IVJUxGdwZ2otiycDE4Fu6L1vurZI,5330
+prompty/azure_beta/__init__.py,sha256=-LPrqoAv2UGI29SUjiZCkPlAGARvixlYe2IW1edswWo,375
+prompty/azure_beta/executor.py,sha256=bARyO2k42ZQfd5NrNKyMUd7JZ2Rcm8urUP0sJ1P1Qxk,10157
+prompty/cli.py,sha256=7aDL8Lup5EONizwn1zQUhGq9vk6z62EA0lpdf80Ybdk,4836
+prompty/core.py,sha256=kAREbThLiVUikvikZX27riW0jJKIldkLusidzmdOftg,13070
+prompty/invoker.py,sha256=ARmyVkinm_Nk91k8mRlsDffox7MtGSVLpwNycavMSSI,9028
+prompty/openai/__init__.py,sha256=aRdXZ5pL4tURFqRwVX7gNdVy3PPWE6BvUbK1o73AqQc,303
+prompty/openai/executor.py,sha256=v5K8kDpGUsbtTpCb1hOVxPt7twX2p-a5yL2iC3Xm8TQ,3752
+prompty/openai/processor.py,sha256=X6yfSlHoTgXxCfGvUwADACjNtzLMNumcn0SX3U4T9as,2542
+prompty/parsers.py,sha256=ptET4j8Rf55Ob0uOx6A41nlQ6cwo1CHRytSjeMIp6JE,5083
+prompty/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+prompty/renderers.py,sha256=UMgJOjcAWd8LXX1ynXEdT4i9bqEAaJkeFp6KOD74lqU,1453
+prompty/serverless/__init__.py,sha256=ILtbqhy6E-wWodbnq-_aftruTGk1Z0EI9zURFH4FECM,297
+prompty/serverless/executor.py,sha256=QZXeFTXv_aT22rbBBgBFLtdAJqGp4W8GS3H3Rtoy8bE,8936
+prompty/serverless/processor.py,sha256=d42MalWRf8RUpHRiueqAPAj_nGmJSMUE2yL-Tgxrss4,3754
+prompty/tracer.py,sha256=jM2nQ7Cb-tSb7wog9w9QzhmB1IGwYb0B0-TBClZOn_A,11980
+prompty/utils.py,sha256=P9nW0QfY1F5PM4pLxsFVlnul1BaRBatmvC2tpqydPKQ,2836
+prompty-0.1.45.dist-info/RECORD,,

prompty-0.1.40.dist-info/RECORD

@@ -1,24 +0,0 @@
-prompty-0.1.40.dist-info/METADATA,sha256=W1QjkCeD1gnusTefPLneqE0zXfQImfR4bV9QbDFE4-c,9164
-prompty-0.1.40.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
-prompty-0.1.40.dist-info/entry_points.txt,sha256=a3i7Kvf--3DOkkv9VQpstwaNKgsnXwDGaPL18lPpKeI,60
-prompty-0.1.40.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=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=lo9mxw9V1gkeVcZZ2wkdAo_csmKTPpGfrr7XYmxDUr8,4840
-prompty/core.py,sha256=haX415_MciCn6K0zU4nZ394ZaJemZe9-iOsdRbe9G6A,12985
-prompty/invoker.py,sha256=O77E5iQ1552wQXxL8FhZGERbCi_0O3mDTd5Ozqw-O-E,8593
-prompty/openai/__init__.py,sha256=XX9j2zX_qt4saFJdZYWUNnrNnetHSnHC8dJ9YyFedL0,287
-prompty/openai/executor.py,sha256=8i5z_OxcESSYcjkDYIZwftr6YMvOHsOypzbNSCiLQ-Q,3640
-prompty/openai/processor.py,sha256=l9-91_CCgRtYvkwMO-jV6rkgeCA4gV_MFamQcvoNGQ0,2499
-prompty/parsers.py,sha256=zHqcRpFPUDG6BOI7ipaJf6yGc6ZbKnsLmO7jKEYNct4,5013
-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=VcrXkM71VO45xWY2b7H2AdCp5bSsCtcAv1m00ycf7XM,11678
-prompty/utils.py,sha256=jm7HEzOGk3zz8d5aquXK3zWIQWuDpBpJTzlz5sswtdg,2836
-prompty-0.1.40.dist-info/RECORD,,