qtype 0.1.4__py3-none-any.whl → 0.1.6__py3-none-any.whl

qtype/interpreter/executors/document_embedder_executor.py

@@ -1,3 +1,5 @@
+import asyncio
+import logging
 from typing import AsyncIterator
 
 from botocore.exceptions import ClientError
@@ -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
@@ -56,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-0.1.4.dist-info → qtype-0.1.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qtype
-Version: 0.1.4
+Version: 0.1.6
 Summary: DSL for Generative AI Prototyping
 Author-email: Lou Kratz <lou.kratz+qtype@bazaarvoice.com>
 License-Expression: Apache-2.0

{qtype-0.1.4.dist-info → qtype-0.1.6.dist-info}/RECORD

@@ -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=cvteGIQOpVC94ZZX6vB7G9Pb8GXdKgNgkHubRbcgYQQ,3553
+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=PAD982r-1zBtbDOOacwFd3K5y5-jiYTiPoCNr3VIOuw,3357
+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.4.dist-info/licenses/LICENSE,sha256=1KA5EgYBSR0O6nCH2HEvk6Di53YKJ9r_VCR7G8G8qAY,11341
-qtype-0.1.4.dist-info/METADATA,sha256=xTA-mrWr4HvK6BOBTq6CBnuERaj_a84AdJIrywWtokU,5657
-qtype-0.1.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-qtype-0.1.4.dist-info/entry_points.txt,sha256=5y4vj8RLvgl2tXSj-Hm7v5-Tn3kP4-UonjNoN-mfaQE,41
-qtype-0.1.4.dist-info/top_level.txt,sha256=ONroH5B0mZ51jr7NSWCK0weFwwCO7wBLmyVS1YqNU14,6
-qtype-0.1.4.dist-info/RECORD,,
+qtype-0.1.6.dist-info/licenses/LICENSE,sha256=1KA5EgYBSR0O6nCH2HEvk6Di53YKJ9r_VCR7G8G8qAY,11341
+qtype-0.1.6.dist-info/METADATA,sha256=kzhXY2Ol_Ih1R-HZMSTrf_lLpQhjUY0t-JAj-IdYBrU,5657
+qtype-0.1.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+qtype-0.1.6.dist-info/entry_points.txt,sha256=5y4vj8RLvgl2tXSj-Hm7v5-Tn3kP4-UonjNoN-mfaQE,41
+qtype-0.1.6.dist-info/top_level.txt,sha256=ONroH5B0mZ51jr7NSWCK0weFwwCO7wBLmyVS1YqNU14,6
+qtype-0.1.6.dist-info/RECORD,,