qtype 0.1.12__py3-none-any.whl → 0.1.14__py3-none-any.whl

qtype/semantic/generate.py

@@ -144,8 +144,7 @@ def generate_semantic_model(args: argparse.Namespace) -> None:
                 CustomType,
                 DecoderFormat,
                 ListType,
-                PrimitiveTypeEnum,
-                ToolParameter
+                PrimitiveTypeEnum
             )
             from qtype.dsl.model import Variable as DSLVariable  # noqa: F401
             from qtype.dsl.model import VariableType  # noqa: F401
@@ -158,10 +157,8 @@ def generate_semantic_model(args: argparse.Namespace) -> None:
         f.write(
             dedent('''
             class Variable(DSLVariable, BaseModel):
-                """Semantic version of DSL Variable with ID references resolved."""
-                value: Any | None = Field(None, description="The value of the variable")
-                def is_set(self) -> bool:
-                    return self.value is not None
+                """Semantic version of DSL Variable."""
+                pass
 
         ''').lstrip()
         )

qtype/semantic/model.py

@@ -32,19 +32,15 @@ from qtype.dsl.model import (  # noqa: F401
     DecoderFormat,
     ListType,
     PrimitiveTypeEnum,
-    ToolParameter,
 )
 from qtype.dsl.model import Variable as DSLVariable  # noqa: F401
 from qtype.semantic.base_types import ImmutableModel
 
 
 class Variable(DSLVariable, BaseModel):
-    """Semantic version of DSL Variable with ID references resolved."""
+    """Semantic version of DSL Variable."""
 
-    value: Any | None = Field(None, description="The value of the variable")
-
-    def is_set(self) -> bool:
-        return self.value is not None
+    pass
 
 
 class AuthorizationProvider(ImmutableModel):
@@ -66,12 +62,12 @@ class Tool(ImmutableModel):
     description: str = Field(
         ..., description="Description of what the tool does."
     )
-    inputs: dict[str, ToolParameter] = Field(
-        default_factory=dict,
+    inputs: list[Variable] = Field(
+        default_factory=list,
         description="Input parameters required by this tool.",
     )
-    outputs: dict[str, ToolParameter] = Field(
-        default_factory=dict,
+    outputs: list[Variable] = Field(
+        default_factory=list,
         description="Output parameters produced by this tool.",
     )
 
@@ -421,9 +417,9 @@ class APITool(Tool):
         default_factory=dict,
         description="Optional HTTP headers to include in the request.",
     )
-    parameters: dict[str, ToolParameter] = Field(
-        default_factory=dict,
-        description="Output parameters produced by this tool.",
+    parameters: list[Variable] = Field(
+        default_factory=list,
+        description="Path and query parameters for the API call.",
     )
 
 
@@ -447,15 +443,12 @@ class AWSSecretManager(SecretManager):
 
 class Aggregate(Step):
     """
-    A terminal step that consumes an entire input stream and produces a single
-    summary message with success/error counts.
+    A step that, after all messages have been processed,
+    returns a single message containing the counts of successful and failed
+    messages. Other messages are passed through unchanged.
     """
 
     type: Literal["Aggregate"] = Field("Aggregate")
-    outputs: list[Variable] = Field(
-        default_factory=list,
-        description="References to the variables for the output. There should be one and only one output with type AggregateStats",
-    )
 
 
 class Collect(Step, BatchableStepMixin):
@@ -472,8 +465,9 @@ class Construct(Step):
     """A step that converts variables into an instance of a Custom or Domain Type"""
 
     type: Literal["Construct"] = Field("Construct")
-    field_mapping: dict[str, str] = Field(
-        ..., description="Mapping of type inputs to variable names, if needed."
+    field_bindings: dict[str, Variable] = Field(
+        ...,
+        description="Mapping from type field names to flow variable names.",
     )
 
 
@@ -558,6 +552,9 @@ class FieldExtractor(Step):
     The extracted data is used to construct the output variable by passing it
     as keyword arguments to the output type's constructor.
 
+    If there is no match and the output variable is optional, it is set to None.
+    If there is no match and the output variable is required, an error is raised.
+
     Example JSONPath expressions:
     - `$.field_name` - Extract a single field
     - `$.items[*]` - Extract all items from a list
@@ -569,10 +566,6 @@ class FieldExtractor(Step):
         ...,
         description="JSONPath expression to extract data from the input. Uses jsonpath-ng syntax.",
     )
-    fail_on_missing: bool = Field(
-        True,
-        description="Whether to raise an error if the JSONPath matches no data. If False, returns None.",
-    )
 
 
 class InvokeEmbedding(Step, ConcurrentStepMixin):
@@ -590,13 +583,13 @@ class InvokeFlow(Step):
 
     type: Literal["InvokeFlow"] = Field("InvokeFlow")
     flow: Flow = Field(..., description="Flow to invoke.")
-    input_bindings: dict[Variable, str] = Field(
+    input_bindings: dict[str, Variable] = Field(
         ...,
-        description="Mapping from variable references to flow input variable IDs.",
+        description="Mapping from flow input variable IDs to step variable names.",
     )
-    output_bindings: dict[Variable, str] = Field(
+    output_bindings: dict[str, Variable] = Field(
         ...,
-        description="Mapping from variable references to flow output variable IDs.",
+        description="Mapping from flow output variable IDs to step variable names.",
     )
 
 
@@ -605,13 +598,13 @@ class InvokeTool(Step, ConcurrentStepMixin):
 
     type: Literal["InvokeTool"] = Field("InvokeTool")
     tool: Tool = Field(..., description="Tool to invoke.")
-    input_bindings: dict[str, str] = Field(
+    input_bindings: dict[str, Variable] = Field(
         ...,
-        description="Mapping from variable references to tool input parameter names.",
+        description="Mapping from tool parameter names to flow variable names.",
     )
-    output_bindings: dict[str, str] = Field(
+    output_bindings: dict[str, Variable] = Field(
         ...,
-        description="Mapping from variable references to tool output parameter names.",
+        description="Mapping from tool output names to flow variable names.",
     )
 
 

qtype/semantic/resolver.py

@@ -71,6 +71,13 @@ def to_semantic_ir(
         # If the object is already in the symbol table, return it.
         return symbol_table[obj_id]
 
+    if isinstance(dslobj, dict):
+        # If the object is a dict, recursively resolve each value
+        return {
+            key: to_semantic_ir(value, symbol_table)
+            for key, value in dslobj.items()
+        }
+
     if isinstance(dslobj, list):
         # If the object is a list, we will resolve each item in the list.
         return [to_semantic_ir(item, symbol_table) for item in dslobj]  # type: ignore

qtype/semantic/visualize.py

@@ -11,7 +11,6 @@ from typing import Any
 
 from pydantic import BaseModel
 
-from qtype.dsl.model import Index
 from qtype.semantic.model import (
     Agent,
     APITool,
@@ -21,6 +20,9 @@ from qtype.semantic.model import (
     DocumentIndex,
     DocumentSearch,
     Flow,
+    Index,
+    IndexUpsert,
+    InvokeFlow,
     InvokeTool,
     LLMInference,
     Memory,
@@ -168,10 +170,14 @@ def _generate_step_node(
     lines = []
     external_connections = []
 
-    if isinstance(step, Flow):
-        # Nested flow
+    if isinstance(step, InvokeFlow):
         lines.append(
-            f'        {node_id}@{{shape: subproc, label: "📋 {step.id}"}}'
+            f'        {node_id}@{{shape: sub-r, label: "🔄 {step.id}"}}'
+        )
+        # Connect to the invoked flow
+        invoked_flow_id = f"FLOW_{_sanitize_id(step.flow.id)}"
+        external_connections.append(
+            f"    {node_id} -.->|invokes| {invoked_flow_id}"
         )
     elif isinstance(step, Agent):
         # Agent with tools
@@ -233,6 +239,12 @@ def _generate_step_node(
         )
         index_id = f"INDEX_{_sanitize_id(step.index.id)}"
         external_connections.append(f"    {node_id} -.-> {index_id}")
+    elif isinstance(step, IndexUpsert):
+        lines.append(
+            f'        {node_id}@{{shape: rect, label: "💾 {step.id}"}}'
+        )
+        index_id = f"INDEX_{_sanitize_id(step.index.id)}"
+        external_connections.append(f"    {node_id} -.->|writes| {index_id}")
     else:
         # Generic step
         lines.append(
@@ -377,7 +389,7 @@ def _generate_shared_resources(app: Application) -> list[str]:
             index_id = f"INDEX_{_sanitize_id(index.id)}"
             if isinstance(index, VectorIndex):
                 lines.append(
-                    f'        {index_id}@{{shape: cyl, label: "🗂️ {index.id}"}}'
+                    f'        {index_id}@{{shape: cyl, label: "�️ {index.id}"}}'
                 )
                 # Connect to embedding model
                 emb_model_id = f"EMB_{_sanitize_id(index.embedding_model.id)}"
@@ -391,7 +403,7 @@ def _generate_shared_resources(app: Application) -> list[str]:
                 )
             else:
                 lines.append(
-                    f'        {index_id}@{{shape: cyl, label: "🗂️ {index.id}"}}'
+                    f'        {index_id}@{{shape: cyl, label: "�️ {index.id}"}}'
                 )
 
             if index.auth:

{qtype-0.1.12.dist-info → qtype-0.1.14.dist-info}/METADATA

@@ -1,60 +1,61 @@
 Metadata-Version: 2.4
 Name: qtype
-Version: 0.1.12
+Version: 0.1.14
 Summary: DSL for Generative AI Prototyping
+Project-URL: Homepage, https://github.com/bazaarvoice/qtype
 Author-email: Lou Kratz <lou.kratz+qtype@bazaarvoice.com>
 License-Expression: Apache-2.0
-Project-URL: Homepage, https://github.com/bazaarvoice/qtype
-Requires-Python: >=3.10
-Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: jsonschema>=4.24.0
-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
+Requires-Python: >=3.10
+Requires-Dist: cachetools>=6.2.1
 Requires-Dist: fsspec>=2025.5.1
+Requires-Dist: google-cloud-aiplatform>=1.120.0
+Requires-Dist: jsonschema>=4.24.0
 Requires-Dist: mkdocs-awesome-pages-plugin>=2.10.1
-Requires-Dist: pip-system-certs>=5.2
+Requires-Dist: openai>=1.93.0
 Requires-Dist: openapi3-parser>=1.1.21
+Requires-Dist: pip-system-certs>=5.2
 Requires-Dist: pydantic-yaml>=1.6.0
-Requires-Dist: google-cloud-aiplatform>=1.120.0
+Requires-Dist: pydantic>=2.12.4
+Requires-Dist: python-dotenv>=1.0.0
+Requires-Dist: pyyaml>=6.0.2
 Provides-Extra: interpreter
-Requires-Dist: aiostream>=0.7.1; extra == "interpreter"
-Requires-Dist: arize-phoenix-otel>=0.12.1; extra == "interpreter"
-Requires-Dist: boto3>=1.34.0; extra == "interpreter"
-Requires-Dist: datasets>=4.4.1; extra == "interpreter"
-Requires-Dist: diskcache>=5.6.3; extra == "interpreter"
-Requires-Dist: docling>=2.55.1; extra == "interpreter"
-Requires-Dist: docx2txt>=0.9; extra == "interpreter"
-Requires-Dist: fastapi>=0.116.1; extra == "interpreter"
-Requires-Dist: jsonpath-ng>=1.7.0; extra == "interpreter"
-Requires-Dist: langfuse>=3.9.0; extra == "interpreter"
-Requires-Dist: llama-index-embeddings-bedrock>=0.5.2; extra == "interpreter"
-Requires-Dist: llama-index-embeddings-openai>=0.3.1; extra == "interpreter"
-Requires-Dist: llama-index-llms-bedrock-converse>=0.10.5; extra == "interpreter"
-Requires-Dist: llama-index-llms-bedrock>=0.3.8; extra == "interpreter"
-Requires-Dist: llama-index-llms-vertex>=0.6.1; extra == "interpreter"
-Requires-Dist: llama-index-postprocessor-bedrock-rerank>=0.5.1; extra == "interpreter"
-Requires-Dist: llama-index-readers-huggingface-fs>=0.4.1; extra == "interpreter"
-Requires-Dist: llama-index-vector-stores-qdrant>=0.8.6; extra == "interpreter"
-Requires-Dist: llama-index>=0.12.45; extra == "interpreter"
-Requires-Dist: openinference-instrumentation-llama-index>=4.3.4; extra == "interpreter"
-Requires-Dist: opensearch-py>=2.7.0; extra == "interpreter"
-Requires-Dist: opentelemetry-exporter-otlp>=1.35.0; extra == "interpreter"
-Requires-Dist: opentelemetry-sdk>=1.35.0; extra == "interpreter"
-Requires-Dist: pandas>=2.2.3; extra == "interpreter"
-Requires-Dist: psycopg2-binary>=2.9.10; extra == "interpreter"
-Requires-Dist: pyarrow>=21.0.0; extra == "interpreter"
-Requires-Dist: pyathena[sqlalchemy]>=3.18.0; extra == "interpreter"
-Requires-Dist: python-magic>=0.4.27; extra == "interpreter"
-Requires-Dist: s3fs>=2025.7.0; extra == "interpreter"
-Requires-Dist: sqlalchemy>=2.0.42; extra == "interpreter"
-Requires-Dist: uvicorn[standard]>=0.35.0; extra == "interpreter"
+Requires-Dist: aiostream>=0.7.1; extra == 'interpreter'
+Requires-Dist: arize-phoenix-otel>=0.12.1; extra == 'interpreter'
+Requires-Dist: boto3>=1.34.0; extra == 'interpreter'
+Requires-Dist: datasets>=4.4.1; extra == 'interpreter'
+Requires-Dist: diskcache>=5.6.3; extra == 'interpreter'
+Requires-Dist: docling>=2.55.1; extra == 'interpreter'
+Requires-Dist: docx2txt>=0.9; extra == 'interpreter'
+Requires-Dist: fastapi>=0.116.1; extra == 'interpreter'
+Requires-Dist: jsonpath-ng>=1.7.0; extra == 'interpreter'
+Requires-Dist: langfuse>=3.9.0; extra == 'interpreter'
+Requires-Dist: llama-index-embeddings-bedrock>=0.5.2; extra == 'interpreter'
+Requires-Dist: llama-index-embeddings-openai>=0.3.1; extra == 'interpreter'
+Requires-Dist: llama-index-llms-bedrock-converse>=0.10.5; extra == 'interpreter'
+Requires-Dist: llama-index-llms-bedrock>=0.3.8; extra == 'interpreter'
+Requires-Dist: llama-index-llms-vertex>=0.6.1; extra == 'interpreter'
+Requires-Dist: llama-index-postprocessor-bedrock-rerank>=0.5.1; extra == 'interpreter'
+Requires-Dist: llama-index-readers-huggingface-fs>=0.4.1; extra == 'interpreter'
+Requires-Dist: llama-index-vector-stores-qdrant>=0.8.6; extra == 'interpreter'
+Requires-Dist: llama-index>=0.12.45; extra == 'interpreter'
+Requires-Dist: openinference-instrumentation-llama-index>=4.3.4; extra == 'interpreter'
+Requires-Dist: opensearch-py>=2.7.0; extra == 'interpreter'
+Requires-Dist: opentelemetry-exporter-otlp>=1.35.0; extra == 'interpreter'
+Requires-Dist: opentelemetry-sdk>=1.35.0; extra == 'interpreter'
+Requires-Dist: pandas>=2.2.3; extra == 'interpreter'
+Requires-Dist: psycopg2-binary>=2.9.10; extra == 'interpreter'
+Requires-Dist: pyarrow>=21.0.0; extra == 'interpreter'
+Requires-Dist: pyathena[sqlalchemy]>=3.18.0; extra == 'interpreter'
+Requires-Dist: python-magic>=0.4.27; extra == 'interpreter'
+Requires-Dist: s3fs>=2025.7.0; extra == 'interpreter'
+Requires-Dist: sqlalchemy>=2.0.42; extra == 'interpreter'
+Requires-Dist: uvicorn[standard]>=0.35.0; extra == 'interpreter'
 Provides-Extra: mcp
-Requires-Dist: httpx>=0.28.1; extra == "mcp"
-Requires-Dist: mcp[cli]>=1.25.0; extra == "mcp"
-Dynamic: license-file
+Requires-Dist: httpx>=0.28.1; extra == 'mcp'
+Requires-Dist: mcp[cli]>=1.25.0; extra == 'mcp'
+Requires-Dist: tantivy>=0.25.1; extra == 'mcp'
+Description-Content-Type: text/markdown
 
 # QType
 
@@ -178,4 +179,4 @@ Stay tuned for upcoming features like:
 Happy hacking with QType! 🛠️
 
 
-[![Generate JSON Schema](https://github.com/bazaarvoice/qtype/actions/workflows/github_workflows_generate-schema.yml/badge.svg)](https://github.com/bazaarvoice/qtype/actions/workflows/github_workflows_generate-schema.yml) [![Publish to PyPI](https://github.com/bazaarvoice/qtype/actions/workflows/publish-pypi.yml/badge.svg)](https://github.com/bazaarvoice/qtype/actions/workflows/publish-pypi.yml)
+[![Generate JSON Schema](https://github.com/bazaarvoice/qtype/actions/workflows/github_workflows_generate-schema.yml/badge.svg)](https://github.com/bazaarvoice/qtype/actions/workflows/github_workflows_generate-schema.yml) [![Publish to PyPI](https://github.com/bazaarvoice/qtype/actions/workflows/publish-pypi.yml/badge.svg)](https://github.com/bazaarvoice/qtype/actions/workflows/publish-pypi.yml)