prompty 0.1.18__tar.gz → 0.1.20__tar.gz

{prompty-0.1.18 → prompty-0.1.20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: prompty
-Version: 0.1.18
+Version: 0.1.20
 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>
 Requires-Dist: pyyaml>=6.0.1
@@ -177,7 +177,7 @@ def get_response(customerId, prompt):
 
 ```
 
-In this case, whenever this code is executed, a `.ptrace` file will be created in the `path/to/output` directory. This file will contain the trace of the execution of the `get_response` function, the execution of the `get_customer` function, and the prompty internals that generated the response.
+In this case, whenever this code is executed, a `.tracy` file will be created in the `path/to/output` directory. This file will contain the trace of the execution of the `get_response` function, the execution of the `get_customer` function, and the prompty internals that generated the response.
 
 ## OpenTelemetry Tracing
 You can add OpenTelemetry tracing to your application using the same hook mechanism. In your application, you might create something like `trace_span` to trace the execution of your prompts:
@@ -206,10 +206,10 @@ This will produce spans during the execution of the prompt that can be sent to a
 The Prompty runtime also comes with a CLI tool that allows you to run prompts from the command line. The CLI tool is installed with the Python package.
 
 ```bash
-prompty -s path/to/prompty/file
+prompty -s path/to/prompty/file -e .env
 ```
 
-This will execute the prompt and print the response to the console. It also has default tracing enabled.
+This will execute the prompt and print the response to the console. If there are any environment variables the CLI should take into account, you can pass those in via the `-e` flag. It also has default tracing enabled.
 
 ## Contributing
 We welcome contributions to the Prompty project! This community led project is open to all contributors. The project cvan be found on [GitHub](https://github.com/Microsoft/prompty).

{prompty-0.1.18 → prompty-0.1.20}/README.md

@@ -158,7 +158,7 @@ def get_response(customerId, prompt):
 
 ```
 
-In this case, whenever this code is executed, a `.ptrace` file will be created in the `path/to/output` directory. This file will contain the trace of the execution of the `get_response` function, the execution of the `get_customer` function, and the prompty internals that generated the response.
+In this case, whenever this code is executed, a `.tracy` file will be created in the `path/to/output` directory. This file will contain the trace of the execution of the `get_response` function, the execution of the `get_customer` function, and the prompty internals that generated the response.
 
 ## OpenTelemetry Tracing
 You can add OpenTelemetry tracing to your application using the same hook mechanism. In your application, you might create something like `trace_span` to trace the execution of your prompts:
@@ -187,10 +187,10 @@ This will produce spans during the execution of the prompt that can be sent to a
 The Prompty runtime also comes with a CLI tool that allows you to run prompts from the command line. The CLI tool is installed with the Python package.
 
 ```bash
-prompty -s path/to/prompty/file
+prompty -s path/to/prompty/file -e .env
 ```
 
-This will execute the prompt and print the response to the console. It also has default tracing enabled.
+This will execute the prompt and print the response to the console. If there are any environment variables the CLI should take into account, you can pass those in via the `-e` flag. It also has default tracing enabled.
 
 ## Contributing
 We welcome contributions to the Prompty project! This community led project is open to all contributors. The project cvan be found on [GitHub](https://github.com/Microsoft/prompty).

prompty-0.1.20/prompty/azure/executor.py

@@ -0,0 +1,132 @@
+import azure.identity
+import importlib.metadata
+from typing import Iterator
+from openai import AzureOpenAI
+
+from prompty.tracer import Tracer
+from ..core import Invoker, InvokerFactory, Prompty, PromptyStream
+
+VERSION = importlib.metadata.version("prompty")
+
+
+@InvokerFactory.register_executor("azure")
+@InvokerFactory.register_executor("azure_openai")
+class AzureOpenAIExecutor(Invoker):
+    """Azure OpenAI Executor"""
+
+    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"
+        }
+
+        # no key, use default credentials
+        if "api_key" not in self.kwargs:
+            # managed identity if client id
+            if "client_id" in self.kwargs:
+                default_credential = azure.identity.ManagedIdentityCredential(
+                    client_id=self.kwargs.pop("client_id"),
+                )
+            # default credential
+            else:
+                default_credential = azure.identity.DefaultAzureCredential(
+                    exclude_shared_token_cache_credential=True
+                )
+
+            self.kwargs["azure_ad_token_provider"] = (
+                azure.identity.get_bearer_token_provider(
+                    default_credential, "https://cognitiveservices.azure.com/.default"
+                )
+            )
+
+        self.api = self.prompty.model.api
+        self.deployment = self.prompty.model.configuration["azure_deployment"]
+        self.parameters = self.prompty.model.parameters
+
+    def invoke(self, data: any) -> any:
+        """Invoke the Azure OpenAI API
+
+        Parameters
+        ----------
+        data : any
+            The data to send to the Azure OpenAI API
+
+        Returns
+        -------
+        any
+            The response from the Azure OpenAI API
+        """
+
+        with Tracer.start("AzureOpenAI") as trace:
+            trace("type", "LLM")
+            trace("signature", "AzureOpenAI.ctor")
+            trace("description", "Azure OpenAI Constructor")
+            trace("inputs", self.kwargs)
+            client = AzureOpenAI(
+                default_headers={
+                    "User-Agent": f"prompty/{VERSION}",
+                    "x-ms-useragent": f"prompty/{VERSION}",
+                },
+                **self.kwargs,
+            )
+            trace("result", client)
+
+        with Tracer.start("create") as trace:
+            trace("type", "LLM")
+            trace("description", "Azure OpenAI Client")
+
+            if self.api == "chat":
+                trace("signature", "AzureOpenAI.chat.completions.create")
+                args = {
+                    "model": self.deployment,
+                    "messages": data if isinstance(data, list) else [data],
+                    **self.parameters,
+                }
+                trace("inputs", args)
+                response = client.chat.completions.create(**args)
+                trace("result", response)
+
+            elif self.api == "completion":
+                trace("signature", "AzureOpenAI.completions.create")
+                args = {
+                    "prompt": data,
+                    "model": self.deployment,
+                    **self.parameters,
+                }
+                trace("inputs", args)
+                response = client.completions.create(**args)
+                trace("result", response)
+
+            elif self.api == "embedding":
+                trace("signature", "AzureOpenAI.embeddings.create")
+                args = {
+                    "input": data if isinstance(data, list) else [data],
+                    "model": self.deployment,
+                    **self.parameters,
+                }
+                trace("inputs", args)
+                response = client.embeddings.create(**args)
+                trace("result", response)
+
+            elif self.api == "image":
+                trace("signature", "AzureOpenAI.images.generate")
+                args = {
+                    "prompt": data,
+                    "model": self.deployment,
+                    **self.parameters,
+                }
+                trace("inputs", args)
+                response = client.images.generate.create(**args)
+                trace("result", response)
+
+        # stream response
+        if isinstance(response, Iterator):
+            if self.api == "chat":
+                # TODO: handle the case where there might be no usage in the stream
+                return PromptyStream("AzureOpenAIExecutor", response)
+            else:
+                return PromptyStream("AzureOpenAIExecutor", response)
+        else:
+            return response

{prompty-0.1.18 → prompty-0.1.20}/prompty/azure/processor.py

@@ -1,5 +1,6 @@
 from typing import Iterator
 from openai.types.completion import Completion
+from openai.types.images_response import ImagesResponse
 from openai.types.chat.chat_completion import ChatCompletion
 from ..core import Invoker, InvokerFactory, Prompty, PromptyStream, ToolCall
 from openai.types.create_embedding_response import CreateEmbeddingResponse
@@ -50,6 +51,17 @@ class AzureOpenAIProcessor(Invoker):
                 return data.data[0].embedding
             else:
                 return [item.embedding for item in data.data]
+        elif isinstance(data, ImagesResponse):
+            self.prompty.model.parameters
+            item: ImagesResponse = data
+
+            if len(data.data) == 0:
+                raise ValueError("Invalid data")
+            elif len(data.data) == 1:
+                return data.data[0].url if item.data[0].url else item.data[0].b64_json
+            else:
+                return [item.url if item.url else item.b64_json for item in data.data]
+
         elif isinstance(data, Iterator):
 
             def generator():

{prompty-0.1.18 → prompty-0.1.20}/prompty/core.py

@@ -561,7 +561,9 @@ class AsyncPromptyStream(AsyncIterator):
             # StopIteration is raised
             # contents are exhausted
             if len(self.items) > 0:
-                with Tracer.start(f"{self.name}.AsyncPromptyStream") as trace:
+                with Tracer.start("AsyncPromptyStream") as trace:
+                    trace("signature", f"{self.name}.AsyncPromptyStream")
+                    trace("inputs", "None")
                     trace("result", [to_dict(s) for s in self.items])
 
             raise StopIteration

prompty-0.1.20/prompty/openai/executor.py

@@ -0,0 +1,98 @@
+import importlib.metadata
+from openai import OpenAI
+from typing import Iterator
+
+from prompty.tracer import Tracer
+from ..core import Invoker, InvokerFactory, Prompty, PromptyStream
+
+VERSION = importlib.metadata.version("prompty")
+
+
+@InvokerFactory.register_executor("openai")
+class OpenAIExecutor(Invoker):
+    """OpenAI Executor"""
+
+    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.api = self.prompty.model.api
+        self.deployment = self.prompty.model.configuration["azure_deployment"]
+        self.parameters = self.prompty.model.parameters
+
+    def invoke(self, data: any) -> any:
+        """Invoke the OpenAI API
+
+        Parameters
+        ----------
+        data : any
+            The data to send to the OpenAI API
+
+        Returns
+        -------
+        any
+            The response from the OpenAI API
+        """
+        with Tracer.start("OpenAI") as trace:
+            trace("type", "LLM")
+            trace("signature", "OpenAI.ctor")
+            trace("description", "OpenAI Constructor")
+            trace("inputs", self.kwargs)
+            client = OpenAI(
+                default_headers={
+                    "User-Agent": f"prompty/{VERSION}",
+                    "x-ms-useragent": f"prompty/{VERSION}",
+                },
+                **self.kwargs,
+            )
+            trace("result", client)
+
+        with Tracer.start("create") as trace:
+            trace("type", "LLM")
+            trace("description", "OpenAI Prompty Execution Invoker")
+
+            if self.api == "chat":
+                trace("signature", "OpenAI.chat.completions.create")
+                args = {
+                    "model": self.deployment,
+                    "messages": data if isinstance(data, list) else [data],
+                    **self.parameters,
+                }
+                trace("inputs", args)
+                response = client.chat.completions.create(**args)
+
+            elif self.api == "completion":
+                trace("signature", "OpenAI.completions.create")
+                args = {
+                    "prompt": data.item,
+                    "model": self.deployment,
+                    **self.parameters,
+                }
+                trace("inputs", args)
+                response = client.completions.create(**args)
+
+            elif self.api == "embedding":
+                trace("signature", "OpenAI.embeddings.create")
+                args = {
+                    "input": data if isinstance(data, list) else [data],
+                    "model": self.deployment,
+                    **self.parameters,
+                }
+                trace("inputs", args)
+                response = client.embeddings.create(**args)
+
+            elif self.api == "image":
+                raise NotImplementedError("OpenAI Image API is not implemented yet")
+
+            # stream response
+            if isinstance(response, Iterator):
+                stream = PromptyStream("AzureOpenAIExecutor", response)
+                trace("result", stream)
+                return stream
+            else:
+                trace("result", response)
+                return response

prompty-0.1.20/prompty/serverless/executor.py

@@ -0,0 +1,131 @@
+import importlib.metadata
+from typing import Iterator
+from azure.core.credentials import AzureKeyCredential
+from azure.ai.inference import (
+    ChatCompletionsClient,
+    EmbeddingsClient,
+)
+from azure.ai.inference.models import (
+    StreamingChatCompletions,
+    AsyncStreamingChatCompletions,
+)
+
+from prompty.tracer import Tracer
+from ..core import Invoker, InvokerFactory, Prompty, PromptyStream, AsyncPromptyStream
+
+VERSION = importlib.metadata.version("prompty")
+
+
+@InvokerFactory.register_executor("serverless")
+class ServerlessExecutor(Invoker):
+    """Azure OpenAI Executor"""
+
+    def __init__(self, prompty: Prompty) -> None:
+        super().__init__(prompty)
+
+        # serverless configuration
+        self.endpoint = self.prompty.model.configuration["endpoint"]
+        self.model = self.prompty.model.configuration["model"]
+        self.key = self.prompty.model.configuration["key"]
+
+        # api type
+        self.api = self.prompty.model.api
+
+    def _response(self, response: any) -> any:
+        # stream response
+        if isinstance(response, Iterator):
+            if isinstance(response, StreamingChatCompletions):
+                stream = PromptyStream("ServerlessExecutor", response)
+                return stream
+            elif isinstance(response, AsyncStreamingChatCompletions):
+                stream = AsyncPromptyStream("ServerlessExecutor", response)
+                return stream
+            else:
+                stream = PromptyStream("ServerlessExecutor", response)
+
+            return stream
+        else:
+            return response
+
+    def invoke(self, data: any) -> any:
+        """Invoke the Serverless SDK
+
+        Parameters
+        ----------
+        data : any
+            The data to send to the Serverless SDK
+
+        Returns
+        -------
+        any
+            The response from the Serverless SDK
+        """
+
+        cargs = {
+            "endpoint": self.endpoint,
+            "credential": AzureKeyCredential(self.key),
+        }
+
+        if self.api == "chat":
+            with Tracer.start("ChatCompletionsClient") as trace:
+                trace("type", "LLM")
+                trace("signature", "azure.ai.inference.ChatCompletionsClient.ctor")
+                trace("description", "Azure Unified Inference SDK Chat Completions Client")
+                trace("inputs", cargs)
+                client = ChatCompletionsClient(
+                    user_agent=f"prompty/{VERSION}",
+                    **cargs,
+                )
+                trace("result", client)
+
+            with Tracer.start("complete") as trace:
+                trace("type", "LLM")
+                trace("signature", "azure.ai.inference.ChatCompletionsClient.complete")
+                trace("description", "Azure Unified Inference SDK Chat Completions Client")
+                eargs = {
+                    "model": self.model,
+                    "messages": data if isinstance(data, list) else [data],
+                    **self.prompty.model.parameters,
+                }
+                trace("inputs", eargs)
+                r = client.complete(**eargs)
+                trace("result", r)
+
+            response = self._response(r)
+
+        elif self.api == "completion":
+            raise NotImplementedError(
+                "Serverless Completions API is not implemented yet"
+            )
+
+        elif self.api == "embedding":
+            with Tracer.start("EmbeddingsClient") as trace:
+                trace("type", "LLM")
+                trace("signature", "azure.ai.inference.EmbeddingsClient.ctor")
+                trace("description", "Azure Unified Inference SDK Embeddings Client")
+                trace("inputs", cargs)
+                client = EmbeddingsClient(
+                    user_agent=f"prompty/{VERSION}",
+                    **cargs,
+                )
+                trace("result", client)
+
+            with Tracer.start("complete") as trace:
+                trace("type", "LLM")
+                trace("signature", "azure.ai.inference.ChatCompletionsClient.complete")
+                trace("description", "Azure Unified Inference SDK Chat Completions Client")
+                eargs = {
+                    "model": self.model,
+                    "input": data if isinstance(data, list) else [data],
+                    **self.prompty.model.parameters,
+                }
+                trace("inputs", eargs)
+                r = client.complete(**eargs)
+                trace("result", r)
+
+            response = self._response(r)
+
+        elif self.api == "image":
+            raise NotImplementedError("Azure OpenAI Image API is not implemented yet")
+
+        return response

{prompty-0.1.18 → prompty-0.1.20}/prompty/tracer.py

@@ -1,6 +1,7 @@
 import os
 import json
 import inspect
+import traceback
 import importlib
 import contextlib
 from pathlib import Path
@@ -11,6 +12,18 @@ from functools import wraps, partial
 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"]]
+    ):
+        return len(str(value)) * "*"
+    elif isinstance(value, dict):
+        return {k: sanitize(k, v) for k, v in value.items()}
+    else:
+        return value
+
+
 class Tracer:
     _tracers: Dict[str, Callable[[str], Iterator[Callable[[str, Any], None]]]] = {}
 
@@ -31,7 +44,11 @@ class Tracer:
             traces = [
                 stack.enter_context(tracer(name)) for tracer in cls._tracers.values()
             ]
-            yield lambda key, value: [trace(key, value) for trace in traces]
+            yield lambda key, value: [
+                # normalize and sanitize any trace values
+                trace(key, sanitize(key, to_dict(value)))
+                for trace in traces
+            ]
 
 
 def to_dict(obj: Any) -> Dict[str, Any]:
@@ -94,7 +111,9 @@ def _results(result: Any) -> dict:
     return to_dict(result) if result is not None else "None"
 
 
-def _trace_sync(func: Callable = None, *, description: str = None) -> Callable:
+def _trace_sync(
+    func: Callable = None, *, description: str = None, type: str = None
+) -> Callable:
     description = description or ""
 
     @wraps(func)
@@ -105,6 +124,9 @@ def _trace_sync(func: Callable = None, *, description: str = None) -> Callable:
             if description and description != "":
                 trace("description", description)
 
+            if type and type != "":
+                trace("type", type)
+
             inputs = _inputs(func, args, kwargs)
             trace("inputs", inputs)
 
@@ -118,7 +140,7 @@ def _trace_sync(func: Callable = None, *, description: str = None) -> Callable:
                         "exception": {
                             "type": type(e).__name__,
                             "message": str(e),
-                            "args": e.args,
+                            "args": to_dict(e.args),
                         }
                     },
                 )
@@ -129,7 +151,9 @@ def _trace_sync(func: Callable = None, *, description: str = None) -> Callable:
     return wrapper
 
 
-def _trace_async(func: Callable = None, *, description: str = None) -> Callable:
+def _trace_async(
+    func: Callable = None, *, description: str = None, type: str = None
+) -> Callable:
     description = description or ""
 
     @wraps(func)
@@ -140,6 +164,9 @@ def _trace_async(func: Callable = None, *, description: str = None) -> Callable:
             if description and description != "":
                 trace("description", description)
 
+            if type and type != "":
+                trace("type", type)
+
             inputs = _inputs(func, args, kwargs)
             trace("inputs", inputs)
             try:
@@ -150,9 +177,10 @@ def _trace_async(func: Callable = None, *, description: str = None) -> Callable:
                     "result",
                     {
                         "exception": {
-                            "type": type(e).__name__,
+                            "type": type(e),
+                            "traceback": traceback.format_tb(),
                             "message": str(e),
-                            "args": e.args,
+                            "args": to_dict(e.args),
                         }
                     },
                 )
@@ -163,13 +191,15 @@ def _trace_async(func: Callable = None, *, description: str = None) -> Callable:
     return wrapper
 
 
-def trace(func: Callable = None, *, description: str = None) -> Callable:
+def trace(
+    func: Callable = None, *, description: str = None, type: str = None
+) -> Callable:
     if func is None:
-        return partial(trace, description=description)
+        return partial(trace, description=description, type=type)
 
     wrapped_method = _trace_async if inspect.iscoroutinefunction(func) else _trace_sync
 
-    return wrapped_method(func, description=description)
+    return wrapped_method(func, description=description, type=type)
 
 
 class PromptyTracer:
@@ -280,6 +310,8 @@ class PromptyTracer:
 def console_tracer(name: str) -> Iterator[Callable[[str, Any], None]]:
     try:
         print(f"Starting {name}")
-        yield lambda key, value: print(f"{key}:\n{json.dumps(value, indent=4)}")
+        yield lambda key, value: print(
+            f"{key}:\n{json.dumps(to_dict(value), indent=4)}"
+        )
     finally:
         print(f"Ending {name}")

{prompty-0.1.18 → prompty-0.1.20}/pyproject.toml

@@ -13,7 +13,7 @@ dependencies = [
     "python-dotenv>=1.0.1",
     "click>=8.1.7",
 ]
-version = "0.1.18"
+version = "0.1.20"
 
 [project.optional-dependencies]
 azure = [

{prompty-0.1.18 → prompty-0.1.20}/tests/test_execute.py

@@ -3,7 +3,6 @@ import pytest
 import prompty
 from prompty.core import InvokerFactory
 
-
 from tests.fake_azure_executor import FakeAzureExecutor
 from tests.fake_serverless_executor import FakeServerlessExecutor
 from prompty.azure import AzureOpenAIProcessor
@@ -24,6 +23,7 @@ def fake_azure_executor():
     InvokerFactory.add_processor("serverless", ServerlessProcessor)
 
 
+
 @pytest.mark.parametrize(
     "prompt",
     [
@@ -151,6 +151,7 @@ def test_streaming():
 
 
 def test_serverless():
+    
     result = prompty.execute(
         "prompts/serverless.prompty",
         configuration={"key": os.environ.get("SERVERLESS_KEY", "key")},

{prompty-0.1.18 → prompty-0.1.20}/tests/test_tracing.py

@@ -151,5 +151,8 @@ def test_streaming():
     result = prompty.execute(
         "prompts/streaming.prompty",
     )
+    r = []
     for item in result:
-        print(item)
+        r.append(item)
+        
+    return ' '.join(r)

prompty-0.1.18/prompty/azure/executor.py

@@ -1,95 +0,0 @@
-import azure.identity
-import importlib.metadata
-from typing import Iterator
-from openai import AzureOpenAI
-from ..core import Invoker, InvokerFactory, Prompty, PromptyStream
-
-VERSION = importlib.metadata.version("prompty")
-
-
-@InvokerFactory.register_executor("azure")
-@InvokerFactory.register_executor("azure_openai")
-class AzureOpenAIExecutor(Invoker):
-    """Azure OpenAI Executor"""
-
-    def __init__(self, prompty: Prompty) -> None:
-        super().__init__(prompty)
-        kwargs = {
-            key: value
-            for key, value in self.prompty.model.configuration.items()
-            if key != "type"
-        }
-
-        # no key, use default credentials
-        if "api_key" not in kwargs:
-            # managed identity if client id
-            if "client_id" in kwargs:
-                default_credential = azure.identity.ManagedIdentityCredential(
-                    client_id=kwargs.pop("client_id"),
-                )
-            # default credential
-            else:
-                default_credential = azure.identity.DefaultAzureCredential(
-                    exclude_shared_token_cache_credential=True
-                )
-
-            kwargs["azure_ad_token_provider"] = (
-                azure.identity.get_bearer_token_provider(
-                    default_credential, "https://cognitiveservices.azure.com/.default"
-                )
-            )
-
-        self.client = AzureOpenAI(
-            default_headers={
-                "User-Agent": f"prompty/{VERSION}",
-                "x-ms-useragent": f"prompty/{VERSION}",
-            },
-            **kwargs,
-        )
-
-        self.api = self.prompty.model.api
-        self.deployment = self.prompty.model.configuration["azure_deployment"]
-        self.parameters = self.prompty.model.parameters
-
-    def invoke(self, data: any) -> any:
-        """Invoke the Azure OpenAI API
-
-        Parameters
-        ----------
-        data : any
-            The data to send to the Azure OpenAI API
-
-        Returns
-        -------
-        any
-            The response from the Azure OpenAI API
-        """
-        if self.api == "chat":
-            response = self.client.chat.completions.create(
-                model=self.deployment,
-                messages=data if isinstance(data, list) else [data],
-                **self.parameters,
-            )
-
-        elif self.api == "completion":
-            response = self.client.completions.create(
-                prompt=data.item,
-                model=self.deployment,
-                **self.parameters,
-            )
-
-        elif self.api == "embedding":
-            response = self.client.embeddings.create(
-                input=data if isinstance(data, list) else [data],
-                model=self.deployment,
-                **self.parameters,
-            )
-
-        elif self.api == "image":
-            raise NotImplementedError("Azure OpenAI Image API is not implemented yet")
-
-        # stream response
-        if isinstance(response, Iterator):
-            return PromptyStream("AzureOpenAIExecutor", response)
-        else:
-            return response

prompty-0.1.18/prompty/openai/executor.py

@@ -1,74 +0,0 @@
-import importlib.metadata
-from openai import OpenAI
-from typing import Iterator
-from ..core import Invoker, InvokerFactory, Prompty, PromptyStream
-
-VERSION = importlib.metadata.version("prompty")
-
-
-@InvokerFactory.register_executor("openai")
-class OpenAIExecutor(Invoker):
-    """OpenAI Executor"""
-
-    def __init__(self, prompty: Prompty) -> None:
-        super().__init__(prompty)
-        kwargs = {
-            key: value
-            for key, value in self.prompty.model.configuration.items()
-            if key != "type"
-        }
-
-        self.client = OpenAI(
-            default_headers={
-                "User-Agent": f"prompty/{VERSION}",
-                "x-ms-useragent": f"prompty/{VERSION}",
-            },
-            **kwargs,
-        )
-
-        self.api = self.prompty.model.api
-        self.deployment = self.prompty.model.configuration["azure_deployment"]
-        self.parameters = self.prompty.model.parameters
-
-    def invoke(self, data: any) -> any:
-        """Invoke the OpenAI API
-
-        Parameters
-        ----------
-        data : any
-            The data to send to the OpenAI API
-
-        Returns
-        -------
-        any
-            The response from the OpenAI API
-        """
-        if self.api == "chat":
-            response = self.client.chat.completions.create(
-                model=self.deployment,
-                messages=data if isinstance(data, list) else [data],
-                **self.parameters,
-            )
-
-        elif self.api == "completion":
-            response = self.client.completions.create(
-                prompt=data.item,
-                model=self.deployment,
-                **self.parameters,
-            )
-
-        elif self.api == "embedding":
-            response = self.client.embeddings.create(
-                input=data if isinstance(data, list) else [data],
-                model=self.deployment,
-                **self.parameters,
-            )
-
-        elif self.api == "image":
-            raise NotImplementedError("OpenAI Image API is not implemented yet")
-
-        # stream response
-        if isinstance(response, Iterator):
-            return PromptyStream("OpenAIExecutor", response)
-        else:
-            return response

prompty-0.1.18/prompty/serverless/executor.py

@@ -1,84 +0,0 @@
-import importlib.metadata
-from typing import Iterator
-from azure.core.credentials import AzureKeyCredential
-from azure.ai.inference import (
-    ChatCompletionsClient,
-    EmbeddingsClient,
-)
-from azure.ai.inference.models import (
-    StreamingChatCompletions,
-    AsyncStreamingChatCompletions,
-)
-from ..core import Invoker, InvokerFactory, Prompty, PromptyStream, AsyncPromptyStream
-
-VERSION = importlib.metadata.version("prompty")
-
-
-@InvokerFactory.register_executor("serverless")
-class ServerlessExecutor(Invoker):
-    """Azure OpenAI Executor"""
-
-    def __init__(self, prompty: Prompty) -> None:
-        super().__init__(prompty)
-
-        # serverless configuration
-        self.endpoint = self.prompty.model.configuration["endpoint"]
-        self.model = self.prompty.model.configuration["model"]
-        self.key = self.prompty.model.configuration["key"]
-
-        # api type
-        self.api = self.prompty.model.api
-
-    def invoke(self, data: any) -> any:
-        """Invoke the Serverless SDK
-
-        Parameters
-        ----------
-        data : any
-            The data to send to the Serverless SDK
-
-        Returns
-        -------
-        any
-            The response from the Serverless SDK
-        """
-        if self.api == "chat":
-            response = ChatCompletionsClient(
-                endpoint=self.endpoint,
-                credential=AzureKeyCredential(self.key),
-                user_agent=f"prompty/{VERSION}"
-            ).complete(
-                model=self.model,
-                messages=data if isinstance(data, list) else [data],
-                **self.prompty.model.parameters,
-            )
-
-        elif self.api == "completion":
-            raise NotImplementedError(
-                "Serverless Completions API is not implemented yet"
-            )
-
-        elif self.api == "embedding":
-            response = EmbeddingsClient(
-                endpoint=self.endpoint,
-                credential=AzureKeyCredential(self.key),
-                user_agent=f"prompty/{VERSION}",
-            ).complete(
-                model=self.model,
-                input=data if isinstance(data, list) else [data],
-                **self.prompty.model.parameters,
-            )
-
-        elif self.api == "image":
-            raise NotImplementedError("Azure OpenAI Image API is not implemented yet")
-
-        # stream response
-        if isinstance(response, Iterator):
-            if isinstance(response, StreamingChatCompletions):
-                return PromptyStream("ServerlessExecutor", response)
-            elif isinstance(response, AsyncStreamingChatCompletions):
-                return AsyncPromptyStream("ServerlessExecutor", response)
-            return PromptyStream("ServerlessExecutor", response)
-        else:
-
-            return response