prompty 0.1.13__py2.py3-none-any.whl → 0.1.15__py2.py3-none-any.whl

prompty/__init__.py

@@ -6,6 +6,7 @@ from typing import Dict, List, Union
 from prompty.tracer import trace
 from prompty.core import (
     Frontmatter,
+    InvokerException,
     InvokerFactory,
     ModelSettings,
     Prompty,
@@ -321,18 +322,28 @@ def run(
     if parameters != {}:
         prompt.model.parameters = param_hoisting(parameters, prompt.model.parameters)
 
+    invoker_type = prompt.model.configuration["type"]
+
+    # invoker registration check
+    if not InvokerFactory.has_invoker("executor", invoker_type):
+        raise InvokerException(
+            f"{invoker_type} Invoker has not been registered properly.", invoker_type
+        )
+
     # execute
-    executor = InvokerFactory.create_executor(
-        prompt.model.configuration["type"], prompt
-    )
+    executor = InvokerFactory.create_executor(invoker_type, prompt)
     result = executor(content)
 
     # skip?
     if not raw:
+        # invoker registration check
+        if not InvokerFactory.has_invoker("processor", invoker_type):
+            raise InvokerException(
+                f"{invoker_type} Invoker has not been registered properly.", invoker_type
+            )
+        
         # process
-        processor = InvokerFactory.create_processor(
-            prompt.model.configuration["type"], prompt
-        )
+        processor = InvokerFactory.create_processor(invoker_type, prompt)
         result = processor(result)
 
     return result
@@ -344,7 +355,7 @@ def execute(
     parameters: Dict[str, any] = {},
     inputs: Dict[str, any] = {},
     raw: bool = False,
-    connection: str = "default",
+    config_name: str = "default",
 ):
     """Execute a prompty.
 
@@ -380,7 +391,7 @@ def execute(
             # get caller's path (take into account trace frame)
             caller = Path(traceback.extract_stack()[-3].filename)
             path = Path(caller.parent / path).resolve().absolute()
-        prompt = load(path, connection)
+        prompt = load(path, config_name)
 
     # prepare content
     content = prepare(prompt, inputs)

prompty/azure/__init__.py

@@ -1,3 +1,10 @@
 # __init__.py
-from .executor import AzureOpenAIExecutor
-from .processor import AzureOpenAIProcessor
+from prompty.core import InvokerException
+
+try:
+    from .executor import AzureOpenAIExecutor
+    from .processor import AzureOpenAIProcessor
+except ImportError:
+    raise InvokerException(
+        "Error registering AzureOpenAIExecutor and AzureOpenAIProcessor", "azure"
+    )

prompty/azure_openai/__init__.py

@@ -0,0 +1,10 @@
+# __init__.py
+from prompty.core import InvokerException
+
+try:
+    from ..azure.executor import AzureOpenAIExecutor
+    from ..azure.processor import AzureOpenAIProcessor
+except ImportError:
+    raise InvokerException(
+        "Error registering AzureOpenAIExecutor and AzureOpenAIProcessor", "azure"
+    )

prompty/core.py

@@ -343,6 +343,21 @@ class InvokerFactory:
     _executors: Dict[str, Invoker] = {}
     _processors: Dict[str, Invoker] = {}
 
+    @classmethod
+    def has_invoker(
+        cls, type: Literal["renderer", "parser", "executor", "processor"], name: str
+    ) -> bool:
+        if type == "renderer":
+            return name in cls._renderers
+        elif type == "parser":
+            return name in cls._parsers
+        elif type == "executor":
+            return name in cls._executors
+        elif type == "processor":
+            return name in cls._processors
+        else:
+            raise ValueError(f"Type {type} not found")
+
     @classmethod
     def add_renderer(cls, name: str, invoker: Invoker) -> None:
         cls._renderers[name] = invoker
@@ -416,6 +431,17 @@ class InvokerFactory:
         return cls._processors[name](prompty)
 
 
+class InvokerException(Exception):
+    """Exception class for Invoker"""
+
+    def __init__(self, message: str, type: str) -> None:
+        super().__init__(message)
+        self.type = type
+
+    def __str__(self) -> str:
+        return f"{super().__str__()}. Make sure to pip install any necessary package extras (i.e. could be something like `pip install prompty[{self.type}]`) for {self.type} as well as import the appropriate invokers (i.e. could be something like `import prompty.{self.type}`)."
+
+
 @InvokerFactory.register_renderer("NOOP")
 @InvokerFactory.register_parser("NOOP")
 @InvokerFactory.register_executor("NOOP")

prompty/openai/__init__.py

@@ -1,3 +1,10 @@
 # __init__.py
-from .executor import AzureOpenAIExecutor
-from .processor import AzureOpenAIProcessor
+from prompty.core import InvokerException
+
+try:
+    from .executor import OpenAIExecutor
+    from .processor import OpenAIProcessor
+except ImportError:
+    raise InvokerException(
+        "Error registering OpenAIExecutor and OpenAIProcessor", "openai"
+    )

prompty/openai/executor.py

@@ -7,7 +7,7 @@ VERSION = importlib.metadata.version("prompty")
 
 
 @InvokerFactory.register_executor("openai")
-class AzureOpenAIExecutor(Invoker):
+class OpenAIExecutor(Invoker):
     """OpenAI Executor"""
 
     def __init__(self, prompty: Prompty) -> None:

prompty/openai/processor.py

@@ -6,7 +6,7 @@ from openai.types.create_embedding_response import CreateEmbeddingResponse
 
 
 @InvokerFactory.register_processor("openai")
-class AzureOpenAIProcessor(Invoker):
+class OpenAIProcessor(Invoker):
     """OpenAI Processor"""
 
     def __init__(self, prompty: Prompty) -> None:

prompty/serverless/__init__.py

@@ -1,3 +1,8 @@
 # __init__.py
-from .executor import ServerlessExecutor
-from .processor import ServerlessProcessor
+from prompty.core import InvokerException
+
+try:
+    from .executor import ServerlessExecutor
+    from .processor import ServerlessProcessor
+except ImportError:
+    raise InvokerException("Error registering ServerlessExecutor and ServerlessProcessor", "serverless")

prompty/serverless/executor.py

@@ -46,6 +46,7 @@ class ServerlessExecutor(Invoker):
             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],
@@ -61,6 +62,7 @@ class ServerlessExecutor(Invoker):
             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],

prompty/tracer.py

@@ -232,7 +232,7 @@ class PromptyTracer:
             if len(self.stack) == 0:
                 trace_file = (
                     self.output
-                    / f"{frame['name']}.{datetime.now().strftime('%Y%m%d.%H%M%S')}.ptrace"
+                    / f"{frame['name']}.{datetime.now().strftime('%Y%m%d.%H%M%S')}.tracy"
                 )
 
                 v = importlib.metadata.version("prompty")

{prompty-0.1.13.dist-info → prompty-0.1.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: prompty
-Version: 0.1.13
+Version: 0.1.15
 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
@@ -39,7 +39,6 @@ model:
   api: chat
   configuration:
     api_version: 2023-12-01-preview
-    azure_deployment: gpt-35-turbo
     azure_endpoint: ${env:AZURE_OPENAI_ENDPOINT}
     azure_deployment: ${env:AZURE_OPENAI_DEPLOYMENT:gpt-35-turbo}
 sample:

prompty-0.1.15.dist-info/RECORD

@@ -0,0 +1,20 @@
+prompty-0.1.15.dist-info/METADATA,sha256=LjD9DJ73cHctVn2EVIvKSsjbOleo_412rjBBafYYYPg,8916
+prompty-0.1.15.dist-info/WHEEL,sha256=CuZGaXTwoRLAOVv0AcE3bCTxO5ejVuBEJkUBe9C-kvk,94
+prompty-0.1.15.dist-info/licenses/LICENSE,sha256=KWSC4z9cfML_t0xThoQYjzTdcZQj86Y_mhXdatzU-KM,1052
+prompty/__init__.py,sha256=XTUgJ3xT7HYJieuWW5PBItey0BWneg3G7iBBjIeNJZU,11628
+prompty/azure/__init__.py,sha256=ptGajCh68s_tugPv45Y4GJCyBToNFCExUzUh9yIBIfo,292
+prompty/azure/executor.py,sha256=x2ng2EbYUxbingjy8w27TFGWezs4QC0LHh_S0F0-E1U,3082
+prompty/azure/processor.py,sha256=e9CcKG665zvCLPeJfS91FM6c_W_6YY0mVENxinCo19A,2253
+prompty/azure_openai/__init__.py,sha256=tjCu2NEF-YV3AZPPZfYjdkCzPtPbc2NfYazPb1Gu4GI,306
+prompty/cli.py,sha256=oIJ5aPCjwBl4xA5SWkbQ_Xj0KhzuSJhRnqV95DhfORc,3382
+prompty/core.py,sha256=O_Kvj7XjaNG50_mWzpxf5xVOEOWGYBkwBXqPA__5kz0,17126
+prompty/openai/__init__.py,sha256=16LxFrG_qGMg_Nx_BTMkCZupPEADsi8Gj234uFiXoZo,273
+prompty/openai/executor.py,sha256=5LXME0ACvbX3PSpSfh9ohDGWB50ZYBXLZG238wQiVGc,2212
+prompty/openai/processor.py,sha256=Cw-_O_r9B5QqiCsfIglI5lcJgKCStkse2iIDbPWxfhg,2169
+prompty/parsers.py,sha256=4mmIn4SVNs8B0R1BufanqUJk8v4r0OEEo8yx6UOxQpA,4670
+prompty/renderers.py,sha256=RSHFQFx7AtKLUfsMLCXR0a56Mb7DL1NJNgjUqgg3IqU,776
+prompty/serverless/__init__.py,sha256=NPqoFATEMQ96G8OQkVcGxUWU4llIQCwxfJePPo8YFY8,279
+prompty/serverless/executor.py,sha256=fYCMV01iLBLpH2SQ9nxmrvY9ijAGpZezwkobZwUjSVQ,2781
+prompty/serverless/processor.py,sha256=pft1XGbPzo0MzQMbAt1VxsLsvRrjQO3B8MXEE2PfSA0,1982
+prompty/tracer.py,sha256=dwASxJsVnoUNIKLuBHtZAhD0JctbTCImBP5mjVGCnPo,8809
+prompty-0.1.15.dist-info/RECORD,,

prompty-0.1.13.dist-info/RECORD

@@ -1,19 +0,0 @@
-prompty-0.1.13.dist-info/METADATA,sha256=QTF628f7AXmm8K6MvnafJJGJk6ye-FuYaf6m8-d8WWk,8951
-prompty-0.1.13.dist-info/WHEEL,sha256=CuZGaXTwoRLAOVv0AcE3bCTxO5ejVuBEJkUBe9C-kvk,94
-prompty-0.1.13.dist-info/licenses/LICENSE,sha256=KWSC4z9cfML_t0xThoQYjzTdcZQj86Y_mhXdatzU-KM,1052
-prompty/__init__.py,sha256=5t_hxoRVxsbc7gfMyH9EVO2j259dM6uac3GmspQ-MjE,11146
-prompty/azure/__init__.py,sha256=6duJ79CDPG3w-cLk3vt8YfELDMOtSsnI2ClNLMFP_Og,100
-prompty/azure/executor.py,sha256=x2ng2EbYUxbingjy8w27TFGWezs4QC0LHh_S0F0-E1U,3082
-prompty/azure/processor.py,sha256=e9CcKG665zvCLPeJfS91FM6c_W_6YY0mVENxinCo19A,2253
-prompty/cli.py,sha256=oIJ5aPCjwBl4xA5SWkbQ_Xj0KhzuSJhRnqV95DhfORc,3382
-prompty/core.py,sha256=Zy6BFYUAMTeaAFeHdcRkm4lrxlyBEKHwc96XQJH3M2U,16120
-prompty/openai/__init__.py,sha256=6duJ79CDPG3w-cLk3vt8YfELDMOtSsnI2ClNLMFP_Og,100
-prompty/openai/executor.py,sha256=hlze8dXG_jPurPBN7vPC-HJC1dYXSSZeElhE_X_BJhk,2217
-prompty/openai/processor.py,sha256=PacKjMmGO-fd5KhOs98JyjsIf0Kl_J2SX5VroA8lVbI,2174
-prompty/parsers.py,sha256=4mmIn4SVNs8B0R1BufanqUJk8v4r0OEEo8yx6UOxQpA,4670
-prompty/renderers.py,sha256=RSHFQFx7AtKLUfsMLCXR0a56Mb7DL1NJNgjUqgg3IqU,776
-prompty/serverless/__init__.py,sha256=KgsiNr-IhPiIuZoChvDf6xbbvFF467MCUKspJHo56yc,98
-prompty/serverless/executor.py,sha256=2XVzFX9SMX33sQTW-AZObiZ5NtVl3xVahb79ejMrlz8,2684
-prompty/serverless/processor.py,sha256=pft1XGbPzo0MzQMbAt1VxsLsvRrjQO3B8MXEE2PfSA0,1982
-prompty/tracer.py,sha256=r-HC__xLtFPb2pr-xGUuhdlAaMA_PmsBB_NG79jKRO4,8810
-prompty-0.1.13.dist-info/RECORD,,