prompty 0.1.34__py3-none-any.whl → 0.1.36__py3-none-any.whl

prompty/azure/processor.py

@@ -9,6 +9,8 @@ from openai.types.create_embedding_response import CreateEmbeddingResponse
 
 @InvokerFactory.register_processor("azure")
 @InvokerFactory.register_processor("azure_openai")
+@InvokerFactory.register_processor("azure_beta")
+@InvokerFactory.register_processor("azure_openai_beta")
 class AzureOpenAIProcessor(Invoker):
     """Azure OpenAI Processor"""
 

prompty/azure_beta/__init__.py

@@ -0,0 +1,11 @@
+# __init__.py
+from prompty.invoker import InvokerException
+
+try:
+    from .executor import AzureOpenAIBetaExecutor
+    # Reuse the common Azure OpenAI Processor
+    from ..azure.processor import AzureOpenAIProcessor
+except ImportError:
+    raise InvokerException(
+        "Error registering AzureOpenAIBetaExecutor and AzureOpenAIProcessor", "azure_beta"
+    )

prompty/azure_beta/executor.py

@@ -0,0 +1,281 @@
+import azure.identity
+import importlib.metadata
+from typing import AsyncIterator, Iterator
+from openai import AzureOpenAI, AsyncAzureOpenAI
+
+from prompty.tracer import Tracer
+from ..core import AsyncPromptyStream, Prompty, PromptyStream
+from ..invoker import Invoker, InvokerFactory
+import re
+from datetime import datetime
+
+def extract_date(data: str) -> datetime:
+    """Extract date from a string
+
+    Parameters
+    ----------
+    data : str
+        The string containing the date
+
+    Returns
+    -------
+    datetime
+        The extracted date as a datetime object
+    """
+
+    # Regular expression to find dates in the format YYYY-MM-DD
+    date_pattern = re.compile(r'\b\d{4}-\d{2}-\d{2}\b')
+    match = date_pattern.search(data)
+    if match:
+        date_str = match.group(0)
+        # Validate the date format
+        try:
+            return datetime.strptime(date_str, '%Y-%m-%d')
+        except ValueError:
+            pass
+    return None
+
+def is_structured_output_available(api_version: str) -> bool:
+    """Check if the structured output API is available for the given API version
+
+    Parameters
+    ----------
+    api_version : datetime
+        The API version
+
+    Returns
+    -------
+    bool
+        True if the structured output API is available, False otherwise
+    """
+
+    # Define the threshold date
+    threshold_api_version_date = datetime(2024, 8, 1)
+
+    api_version_date = extract_date(api_version)
+
+    # Check if the API version are on or after the threshold date
+    if api_version_date >= threshold_api_version_date:
+        return True
+    return False
+
+VERSION = importlib.metadata.version("prompty")
+
+
+@InvokerFactory.register_executor("azure_beta")
+@InvokerFactory.register_executor("azure_openai_beta")
+class AzureOpenAIBetaExecutor(Invoker):
+    """Azure OpenAI Beta 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.api_version = self.prompty.model.configuration["api_version"]
+        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":
+                # We can only verify the API version as the model and its version are not part of prompty configuration
+                # Should be gpt-4o and 2024-08-06 or later    
+                choose_beta = is_structured_output_available(self.api_version)
+                if choose_beta:
+                    trace("signature", "AzureOpenAI.beta.chat.completions.parse")
+                else:
+                    trace("signature", "AzureOpenAI.chat.completions.create")
+                
+                args = {
+                    "model": self.deployment,
+                    "messages": data if isinstance(data, list) else [data],
+                    **self.parameters,
+                }
+                trace("inputs", args)
+                if choose_beta:
+                    response = client.beta.chat.completions.parse(**args)
+                else:
+                    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("AzureOpenAIBetaExecutor", response)
+            else:
+                return PromptyStream("AzureOpenAIBetaExecutor", response)
+        else:
+            return response
+
+    async def invoke_async(self, data: str) -> str:
+        """Invoke the Prompty Chat Parser (Async)
+
+        Parameters
+        ----------
+        data : str
+            The data to parse
+
+        Returns
+        -------
+        str
+            The parsed data
+        """
+        with Tracer.start("AzureOpenAIAsync") as trace:
+            trace("type", "LLM")
+            trace("signature", "AzureOpenAIAsync.ctor")
+            trace("description", "Async Azure OpenAI Constructor")
+            trace("inputs", self.kwargs)
+            client = AsyncAzureOpenAI(
+                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", "AzureOpenAIAsync.chat.completions.create")
+                args = {
+                    "model": self.deployment,
+                    "messages": data if isinstance(data, list) else [data],
+                    **self.parameters,
+                }
+                trace("inputs", args)
+                response = await client.chat.completions.create(**args)
+                trace("result", response)
+
+            elif self.api == "completion":
+                trace("signature", "AzureOpenAIAsync.completions.create")
+                args = {
+                    "prompt": data,
+                    "model": self.deployment,
+                    **self.parameters,
+                }
+                trace("inputs", args)
+                response = await client.completions.create(**args)
+                trace("result", response)
+
+            elif self.api == "embedding":
+                trace("signature", "AzureOpenAIAsync.embeddings.create")
+                args = {
+                    "input": data if isinstance(data, list) else [data],
+                    "model": self.deployment,
+                    **self.parameters,
+                }
+                trace("inputs", args)
+                response = await client.embeddings.create(**args)
+                trace("result", response)
+
+            elif self.api == "image":
+                trace("signature", "AzureOpenAIAsync.images.generate")
+                args = {
+                    "prompt": data,
+                    "model": self.deployment,
+                    **self.parameters,
+                }
+                trace("inputs", args)
+                response = await client.images.generate.create(**args)
+                trace("result", response)
+
+        # stream response
+        if isinstance(response, AsyncIterator):
+            if self.api == "chat":
+                # TODO: handle the case where there might be no usage in the stream
+                return AsyncPromptyStream("AzureOpenAIBetaExecutorAsync", response)
+            else:
+                return AsyncPromptyStream("AzureOpenAIBetaExecutorAsync", response)
+        else:
+            return response

{prompty-0.1.34.dist-info → prompty-0.1.36.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: prompty
-Version: 0.1.34
+Version: 0.1.36
 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
@@ -13,9 +13,9 @@ Requires-Dist: click>=8.1.7
 Requires-Dist: aiofiles>=24.1.0
 Provides-Extra: azure
 Requires-Dist: azure-identity>=1.17.1; extra == "azure"
-Requires-Dist: openai>=1.35.10; extra == "azure"
+Requires-Dist: openai>=1.43.0; extra == "azure"
 Provides-Extra: openai
-Requires-Dist: openai>=1.35.10; extra == "openai"
+Requires-Dist: openai>=1.43.0; extra == "openai"
 Provides-Extra: serverless
 Requires-Dist: azure-identity>=1.17.1; extra == "serverless"
 Requires-Dist: azure-ai-inference>=1.0.0b3; extra == "serverless"

{prompty-0.1.34.dist-info → prompty-0.1.36.dist-info}/RECORD

@@ -1,11 +1,13 @@
-prompty-0.1.34.dist-info/METADATA,sha256=tZPxYcZ2mi_pOO-Z-6wrQ6zTeadaPLpFdkLZXbfWDF0,9166
-prompty-0.1.34.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
-prompty-0.1.34.dist-info/entry_points.txt,sha256=a3i7Kvf--3DOkkv9VQpstwaNKgsnXwDGaPL18lPpKeI,60
-prompty-0.1.34.dist-info/licenses/LICENSE,sha256=KWSC4z9cfML_t0xThoQYjzTdcZQj86Y_mhXdatzU-KM,1052
+prompty-0.1.36.dist-info/METADATA,sha256=hkRNP31HOI6NKNO8EW3juLAZOOc1EPhrV-XTE6CtjYA,9164
+prompty-0.1.36.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
+prompty-0.1.36.dist-info/entry_points.txt,sha256=a3i7Kvf--3DOkkv9VQpstwaNKgsnXwDGaPL18lPpKeI,60
+prompty-0.1.36.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/processor.py,sha256=eWcHTLwxxBw7ZfK-rSf2cdljJgouxGXuRh_7EtV-MGk,4974
+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/invoker.py,sha256=O77E5iQ1552wQXxL8FhZGERbCi_0O3mDTd5Ozqw-O-E,8593
@@ -19,4 +21,4 @@ prompty/serverless/executor.py,sha256=PUDJsYcJLQx9JSTh-R3HdJd0ehEC6w2Ch5OEqz52uV
 prompty/serverless/processor.py,sha256=ZSL9y8JC-G4qbtWOSbQAqEcFMWEaLskyOr5VjLthelU,3660
 prompty/tracer.py,sha256=WUR7PsvhBLQf7WcnKQPOeLeii9l4xPKB2owjvJ50d0E,10907
 prompty/utils.py,sha256=jm7HEzOGk3zz8d5aquXK3zWIQWuDpBpJTzlz5sswtdg,2836
-prompty-0.1.34.dist-info/RECORD,,
+prompty-0.1.36.dist-info/RECORD,,