qtype 0.1.3__py3-none-any.whl → 0.1.7__py3-none-any.whl

qtype/dsl/model.py

@@ -765,8 +765,9 @@ class AWSAuthProvider(AuthorizationProvider):
         has_keys = self.access_key_id and self.secret_access_key
         has_profile = self.profile_name
         has_role = self.role_arn
+        has_region = self.region
 
-        if not (has_keys or has_profile or has_role):
+        if not (has_keys or has_profile or has_role or has_region):
             raise ValueError(
                 "AWSAuthProvider must specify at least one authentication method: "
                 "access keys, profile name, or role ARN."

qtype/dsl/parser.py

@@ -153,12 +153,12 @@ def _format_validation_errors(
         error_msg = "Validation failed (see details above)"
     else:
         error_msg = "Validation failed:\n"
-        for error in relevant_errors[:5]:  # Show max 5 errors
+        for error in relevant_errors[:30]:  # Show max 5 errors
             loc_path = _simplify_field_path(error["loc"])
             error_msg += f"  {loc_path}: {error['msg']}\n"
 
-        if len(relevant_errors) > 5:
-            error_msg += f"  ... and {len(relevant_errors) - 5} more errors\n"
+        if len(relevant_errors) > 30:
+            error_msg += f"  ... and {len(relevant_errors) - 30} more errors\n"
 
     if source_name:
         error_msg = f"In {source_name}:\n{error_msg}"

qtype/interpreter/conversions.py

@@ -34,6 +34,7 @@ from qtype.interpreter.base.secrets import SecretManagerBase
 from qtype.interpreter.types import InterpreterError
 from qtype.semantic.model import (
     APIKeyAuthProvider,
+    AWSAuthProvider,
     DocumentIndex,
     DocumentSplitter,
     Model,
@@ -302,7 +303,9 @@ def to_vector_store(
 
 
 @cached_resource
-def to_embedding_model(model: Model) -> BaseEmbedding:
+def to_embedding_model(
+    model: Model, secret_manager: SecretManagerBase
+) -> BaseEmbedding:
     """Convert a qtype Model to a LlamaIndex embedding model."""
 
     if model.provider == "aws-bedrock":
@@ -310,7 +313,14 @@ def to_embedding_model(model: Model) -> BaseEmbedding:
             BedrockEmbedding,
         )
 
+        session = None
+        if model.auth is not None:
+            assert isinstance(model.auth, AWSAuthProvider)
+            with aws(model.auth, secret_manager) as session:
+                session = session._session
+
         bedrock_embedding: BaseEmbedding = BedrockEmbedding(
+            botocore_session=session,
             model_name=model.model_id if model.model_id else model.id,
             max_retries=100,
         )
@@ -320,8 +330,20 @@ def to_embedding_model(model: Model) -> BaseEmbedding:
             OpenAIEmbedding,
         )
 
+        api_key = None
+        if model.auth:
+            with auth(model.auth, secret_manager) as provider:
+                if not isinstance(provider, APIKeyAuthProvider):
+                    raise InterpreterError(
+                        f"OpenAI provider requires APIKeyAuthProvider, "
+                        f"got {type(provider).__name__}"
+                    )
+                # api_key is guaranteed to be str after auth() resolves it
+                api_key = provider.api_key  # type: ignore[assignment]
+
         openai_embedding: BaseEmbedding = OpenAIEmbedding(
-            model_name=model.model_id if model.model_id else model.id
+            api_key=api_key,
+            model_name=model.model_id if model.model_id else model.id,
         )
         return openai_embedding
     else:
@@ -566,7 +588,7 @@ def to_llama_vector_store_and_retriever(
     vector_store = to_vector_store(index, secret_manager)
 
     # Get the embedding model
-    embedding_model = to_embedding_model(index.embedding_model)
+    embedding_model = to_embedding_model(index.embedding_model, secret_manager)
 
     # Create a VectorStoreIndex with the vector store and embedding model
     vector_index = VectorStoreIndex.from_vector_store(

qtype/interpreter/executors/document_embedder_executor.py

@@ -1,3 +1,5 @@
+import asyncio
+import logging
 from typing import AsyncIterator
 
 from botocore.exceptions import ClientError
@@ -41,7 +43,7 @@ class DocumentEmbedderExecutor(StepExecutor):
         self.step: DocumentEmbedder = step
         # Initialize the embedding model once for the executor
         self.embedding_model: BaseEmbedding = to_embedding_model(
-            self.step.model
+            self.step.model, context.secret_manager
         )
 
     # TODO: properly abstract this into a mixin
@@ -58,7 +60,17 @@ class DocumentEmbedderExecutor(StepExecutor):
         Returns:
             The embedding vector as a list of floats.
         """
-        return await self.embedding_model.aget_text_embedding(text=text)
+
+        # TODO: switch back to async once aws auth supports it.
+        # https://github.com/bazaarvoice/qtype/issues/108
+        def _call():
+            return self.embedding_model.get_text_embedding(text=text)
+
+        loop = asyncio.get_running_loop()
+        response = await loop.run_in_executor(self.context.thread_pool, _call)
+
+        return response
+        # return await self.embedding_model.aget_text_embedding(text=text)
 
     async def process_message(
         self,
@@ -103,5 +115,9 @@ class DocumentEmbedderExecutor(StepExecutor):
         except Exception as e:
             # Emit error event to stream so frontend can display it
             await self.stream_emitter.error(str(e))
+            logging.error(
+                f"Error processing DocumentEmbedder step {self.step.id}",
+                exc_info=e,
+            )
             message.set_error(self.step.id, e)
             yield message

qtype/interpreter/executors/invoke_embedding_executor.py

@@ -1,3 +1,4 @@
+import asyncio
 from typing import AsyncIterator
 
 from openinference.semconv.trace import OpenInferenceSpanKindValues
@@ -30,7 +31,9 @@ class InvokeEmbeddingExecutor(StepExecutor):
             )
         self.step: InvokeEmbedding = step
         # Initialize the embedding model once for the executor
-        self.embedding_model = to_embedding_model(self.step.model)
+        self.embedding_model = to_embedding_model(
+            self.step.model, context.secret_manager
+        )
 
     async def process_message(
         self,
@@ -54,32 +57,41 @@ class InvokeEmbeddingExecutor(StepExecutor):
             if input_value is None:
                 raise ValueError(f"Input variable '{input_id}' is missing")
 
-            # Generate embedding based on input type
-            if input_type == PrimitiveTypeEnum.text:
-                if not isinstance(input_value, str):
-                    input_value = str(input_value)
-                vector = await self.embedding_model.aget_text_embedding(
-                    text=input_value
-                )
-                content = input_value
-            elif input_type == PrimitiveTypeEnum.image:
-                # For image embeddings
-                vector = await self.embedding_model.aget_image_embedding(
-                    image_path=input_value
-                )
-                content = input_value
-            else:
-                raise ValueError(
-                    (
-                        f"Unsupported input type for embedding: "
-                        f"{input_type}. Must be 'text' or 'image'."
+            def _call(input_value=input_value):
+                # Generate embedding based on input type
+                if input_type == PrimitiveTypeEnum.text:
+                    if not isinstance(input_value, str):
+                        input_value = str(input_value)
+                    vector = self.embedding_model.get_text_embedding(
+                        text=input_value
+                    )
+                    content = input_value
+                elif input_type == PrimitiveTypeEnum.image:
+                    # For image embeddings
+                    vector = self.embedding_model.get_image_embedding(
+                        image_path=input_value
                     )
+                    content = input_value
+                else:
+                    raise ValueError(
+                        (
+                            f"Unsupported input type for embedding: "
+                            f"{input_type}. Must be 'text' or 'image'."
+                        )
+                    )
+
+                # Create the Embedding object
+                embedding = Embedding(
+                    vector=vector,
+                    content=content,
                 )
+                return embedding
 
-            # Create the Embedding object
-            embedding = Embedding(
-                vector=vector,
-                content=content,
+            # TODO: switch back to async once aws auth supports it.
+            # https://github.com/bazaarvoice/qtype/issues/108
+            loop = asyncio.get_running_loop()
+            embedding = await loop.run_in_executor(
+                self.context.thread_pool, _call
             )
 
             # Yield the result

qtype/interpreter/flow.py

@@ -12,13 +12,12 @@ from opentelemetry import context as otel_context
 from opentelemetry import trace
 from opentelemetry.trace import Status, StatusCode
 from rich.console import Console
-from transformers import ProgressCallback
 
 from qtype.interpreter.base import factory
 from qtype.interpreter.base.executor_context import ExecutorContext
 from qtype.interpreter.logging_progress import LoggingProgressCallback
 from qtype.interpreter.rich_progress import RichProgressCallback
-from qtype.interpreter.types import FlowMessage
+from qtype.interpreter.types import FlowMessage, ProgressCallback
 from qtype.semantic.model import Flow
 
 logger = logging.getLogger(__name__)

{qtype-0.1.3.dist-info → qtype-0.1.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qtype
-Version: 0.1.3
+Version: 0.1.7
 Summary: DSL for Generative AI Prototyping
 Author-email: Lou Kratz <lou.kratz+qtype@bazaarvoice.com>
 License-Expression: Apache-2.0
@@ -9,7 +9,7 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: jsonschema>=4.24.0
-Requires-Dist: pydantic>=2.11.5
+Requires-Dist: pydantic>=2.12.4
 Requires-Dist: pyyaml>=6.0.2
 Requires-Dist: python-dotenv>=1.0.0
 Requires-Dist: openai>=1.93.0

{qtype-0.1.3.dist-info → qtype-0.1.7.dist-info}/RECORD

@@ -25,15 +25,15 @@ qtype/dsl/custom_types.py,sha256=N3qswimv0foH40YDubHaTZ3HYF9RUbZ2x5eQ4i798Ko,290
 qtype/dsl/domain_types.py,sha256=-pX74DKwrRanoXBxYqAdN_f44ike6ssRV3tZ20R2PhQ,4319
 qtype/dsl/linker.py,sha256=c7PPTULy7_z_9u_qeseIaomR_B8kBa9YzOhQpjeGaSM,12975
 qtype/dsl/loader.py,sha256=mht0BqfmyTNHIEDaF3iTEmYQLJBP5GIZULwexxw9Dpg,9771
-qtype/dsl/model.py,sha256=0yKl3fKAWQ_BDH-z62oI47IiJQhaH6HFzYRD1tUZhME,40860
-qtype/dsl/parser.py,sha256=jpz32zyvOIo-R6Xr1lshzQiGfeo-2-fZczkdfURBufo,5487
+qtype/dsl/model.py,sha256=g3cZ4-vh_WxrjJ1ev6kFfQcX2-NOZHb70ZT-7m-nHHY,40907
+qtype/dsl/parser.py,sha256=Ww32bLQ2vGOObsA-vWjaMh4TOKRwEA7FAt9U6wjKZkw,5490
 qtype/dsl/types.py,sha256=k6cgThA287bZ_pvTKQvxWhatcYCPNne8zpqOYOvLvOg,1687
 qtype/interpreter/__init__.py,sha256=IaRF90JLFbsTLKz9LTOMI_Pz4xwVaEyXPNaXV7sLou8,43
 qtype/interpreter/api.py,sha256=V7hjsmDhe1IwbcwdM5bnPGBiwH3TtlMLjUJdGJumCdA,4193
-qtype/interpreter/conversions.py,sha256=SHtVVN8k36_iODKvHt1MV6V08GRaEBwE4yCN6VQvlHA,20986
+qtype/interpreter/conversions.py,sha256=VKRJm5ofM3tWzXKg_zLTvKzi7GNBDv6MiE4HnQ52eFY,21871
 qtype/interpreter/converters.py,sha256=gWyfizl7d-DT6jJ2aOrneUcZcwB-LdMDEvl-VT0-mLQ,2348
 qtype/interpreter/endpoints.py,sha256=un4iCYCk86lYKpTDFdzlByvebdctNwRF3n4oD4ZwpTw,11946
-qtype/interpreter/flow.py,sha256=_RuOxGG34Ccvb3pS_f2e2xmpmmMcq7CakWBdS8ezZqY,6590
+qtype/interpreter/flow.py,sha256=rncholeAv7gn3Pr99N9mIA5oFY4OMHVQX6IJljtVO34,6566
 qtype/interpreter/logging_progress.py,sha256=RmyNXdbpPZ7ye8cbSab0Tw10x3T38U3S8rj2bOTfbso,1848
 qtype/interpreter/metadata_api.py,sha256=LfJjt9atsgiAra6aVBXLoJrPa06_CBUagYysT556nt8,3267
 qtype/interpreter/resource_cache.py,sha256=K0kzpm223COWk7FN9qyOvNOEoOcABR4yLeADL9ekE_o,1188
@@ -59,7 +59,7 @@ qtype/interpreter/executors/aggregate_executor.py,sha256=Z3NJekpeo7aqqvOcXQqb6d6
 qtype/interpreter/executors/bedrock_reranker_executor.py,sha256=p25BMmM1paAlK2vfpwJ9T5st_2B-bmZoDnVFp9ynZIY,7154
 qtype/interpreter/executors/decoder_executor.py,sha256=KqLhnhiclMIcUNf3bu7H4vDAOXCQeVO0rc2hIXm1qZ4,5610
 qtype/interpreter/executors/doc_to_text_executor.py,sha256=ZkTtKUL0BfNIiuj-OcYybn1f0By6ujRmd1U4VEAtJt4,3804
-qtype/interpreter/executors/document_embedder_executor.py,sha256=wvARlFPb2dmMdxjW8L1422a-XmcUVxEJXWf24bDR9BE,3529
+qtype/interpreter/executors/document_embedder_executor.py,sha256=dBx1yfjzGPAOAfCx0zr1uOkfs7JUWgHoKYanqnCFAQk,4089
 qtype/interpreter/executors/document_search_executor.py,sha256=ZmKAt__jC5cxZY0gSm9AgpC6n7MFavTHE01tQED3zFk,4051
 qtype/interpreter/executors/document_source_executor.py,sha256=ZpBrBaE16YeRk750TxvE08NnCIUzArjESZImESomaIo,4247
 qtype/interpreter/executors/document_splitter_executor.py,sha256=00x32yo1wGUvW88_lUahfGU94prUPGaOTk5GBUJbBJA,3882
@@ -68,7 +68,7 @@ qtype/interpreter/executors/field_extractor_executor.py,sha256=geDmT6GyvbDDJvPX1
 qtype/interpreter/executors/file_source_executor.py,sha256=OUT_zJrYN3iFMUgLECde93C4rv8PthcQsuJ--CJvEsI,3605
 qtype/interpreter/executors/file_writer_executor.py,sha256=x4BpgdXM7Xhz1tJJ5MmBIjFO4y80VC1V1ow3tox_Xrw,4099
 qtype/interpreter/executors/index_upsert_executor.py,sha256=5MxG3GX2bbjX6jhCpCdEZ0YFJOshn649cfaOT50PLCA,8518
-qtype/interpreter/executors/invoke_embedding_executor.py,sha256=OPvd--x8iimjODLJkRpRfQDahL8LnYaPy3A8WVB5h00,3311
+qtype/interpreter/executors/invoke_embedding_executor.py,sha256=5iXh2elP51gdnuUvRDH_RuWugsm3KCJb8S15Oy4p8zg,3834
 qtype/interpreter/executors/invoke_flow_executor.py,sha256=U30cYM3F_zy1_2CD1Dde59xyZD0rDa5W46lST1hxF6s,1682
 qtype/interpreter/executors/invoke_tool_executor.py,sha256=hhbE8YTr0x5-kz_xsvdWGGzkLkVdvDoAVAF-3ZUK5as,12786
 qtype/interpreter/executors/llm_inference_executor.py,sha256=A6b_Ns_734TCn_DMhdNSqWc5qX970FryhpsX_jtEu_4,9593
@@ -129,9 +129,9 @@ qtype/semantic/loader.py,sha256=QRhTc_AJfsWSMn8ThaW60GmIGjFMN-3bBUy4pktFjz4,3041
 qtype/semantic/model.py,sha256=7yZ-Ufuo-gNJbhFXALuKZxILdhNB5zbL3a3oQQARI8g,28602
 qtype/semantic/resolver.py,sha256=bWPCSB8KJpVqN_n41U_r-qzUiT8vAMBOD3pOGmxL6TY,4618
 qtype/semantic/visualize.py,sha256=thjrZcfQuZJWrZ9EMAPhAa2kNikR5rLIJrfcD3hJ8XY,17426
-qtype-0.1.3.dist-info/licenses/LICENSE,sha256=1KA5EgYBSR0O6nCH2HEvk6Di53YKJ9r_VCR7G8G8qAY,11341
-qtype-0.1.3.dist-info/METADATA,sha256=Q5VxMaYqCF9FVArNhhzlhwIsggD-obWOwY_uRBtRFQU,5657
-qtype-0.1.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-qtype-0.1.3.dist-info/entry_points.txt,sha256=5y4vj8RLvgl2tXSj-Hm7v5-Tn3kP4-UonjNoN-mfaQE,41
-qtype-0.1.3.dist-info/top_level.txt,sha256=ONroH5B0mZ51jr7NSWCK0weFwwCO7wBLmyVS1YqNU14,6
-qtype-0.1.3.dist-info/RECORD,,
+qtype-0.1.7.dist-info/licenses/LICENSE,sha256=1KA5EgYBSR0O6nCH2HEvk6Di53YKJ9r_VCR7G8G8qAY,11341
+qtype-0.1.7.dist-info/METADATA,sha256=N-2oIlfAJKDpgwT1XjZOKsH70kSUy6mSUSDR6j7ME0c,5657
+qtype-0.1.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+qtype-0.1.7.dist-info/entry_points.txt,sha256=5y4vj8RLvgl2tXSj-Hm7v5-Tn3kP4-UonjNoN-mfaQE,41
+qtype-0.1.7.dist-info/top_level.txt,sha256=ONroH5B0mZ51jr7NSWCK0weFwwCO7wBLmyVS1YqNU14,6
+qtype-0.1.7.dist-info/RECORD,,