qtype 0.0.1__py3-none-any.whl → 0.0.3__py3-none-any.whl

qtype/interpreter/conversions.py

@@ -39,6 +39,7 @@ def to_llm(model: Model, system_prompt: str | None) -> BaseLLM:
         # BedrockConverse requires a model_id and system_prompt
         # Inference params can be passed as additional kwargs
         from llama_index.llms.bedrock_converse import BedrockConverse
+
         brv: BaseLLM = BedrockConverse(
             model=model.model_id if model.model_id else model.id,
             system_prompt=system_prompt,
@@ -47,14 +48,18 @@ def to_llm(model: Model, system_prompt: str | None) -> BaseLLM:
         return brv
     elif model.provider == "openai":
         from llama_index.llms.openai import OpenAI
+
         return OpenAI(
             model=model.model_id if model.model_id else model.id,
             system_prompt=system_prompt,
             **(model.inference_params if model.inference_params else {}),
-            api_key=model.auth.api_key if model.auth and model.auth.api_key else None,
+            api_key=model.auth.api_key
+            if model.auth and model.auth.api_key
+            else None,
         )
     elif model.provider == "anthropic":
         from llama_index.llms.anthropic import Anthropic
+
         arv: BaseLLM = Anthropic(
             model=model.model_id if model.model_id else model.id,
             system_prompt=system_prompt,
@@ -71,7 +76,7 @@ def to_llm(model: Model, system_prompt: str | None) -> BaseLLM:
 def to_embedding_model(model: Model) -> BaseEmbedding:
     """Convert a qtype Model to a LlamaIndex embedding model."""
 
-    if model.provider in {"bedrock","aws", "aws-bedrock"}:
+    if model.provider in {"bedrock", "aws", "aws-bedrock"}:
         from llama_index.embeddings.bedrock import BedrockEmbedding
 
         embedding: BaseEmbedding = BedrockEmbedding(

qtype/semantic/base_types.py

@@ -0,0 +1,47 @@
+from __future__ import annotations
+
+from typing import Any
+
+from pydantic import BaseModel, ConfigDict, Field
+
+
+def _make_hashable(value: Any) -> Any:
+    """Convert a value to a hashable equivalent."""
+    if isinstance(value, BaseModel):
+        # Handle Pydantic models by iterating over their fields
+        hashable_values = []
+        for field_name, field_value in value.model_dump().items():
+            hashable_values.append((field_name, _make_hashable(field_value)))
+        return tuple(sorted(hashable_values))
+    elif isinstance(value, dict):
+        return frozenset(
+            (k, _make_hashable(v)) for k, v in sorted(value.items())
+        )
+    elif isinstance(value, list):
+        return tuple(_make_hashable(item) for item in value)
+    elif isinstance(value, set):
+        return frozenset(_make_hashable(item) for item in value)
+    elif hasattr(value, "__dict__"):
+        # Handle nested objects
+        return tuple(
+            sorted(
+                (k, _make_hashable(v))
+                for k, v in value.__dict__.items()
+                if not k.startswith("_")
+            )
+        )
+    else:
+        # Value is already hashable (int, str, tuple, etc.)
+        return value
+
+
+class ImmutableModel(BaseModel):
+    """Base model that can't be mutated but can be cached."""
+
+    id: str = Field(..., description="Unique ID of this model.")
+
+    model_config = ConfigDict(frozen=True)
+
+    def __hash__(self) -> int:
+        """Hash based on all model fields."""
+        return hash(_make_hashable(self))

qtype/semantic/generate.py

@@ -108,7 +108,7 @@ def generate_semantic_model(args: argparse.Namespace) -> None:
         # Write imports
         f.write("from __future__ import annotations\n\n")
         f.write("from typing import Any, Type\n\n")
-        f.write("from pydantic import BaseModel, ConfigDict, Field\n\n")
+        f.write("from pydantic import BaseModel, Field\n\n")
         f.write("# Import enums and type aliases from DSL\n")
         f.write("from qtype.dsl.model import VariableType # noqa: F401\n")
         f.write(
@@ -117,6 +117,7 @@ def generate_semantic_model(args: argparse.Namespace) -> None:
         f.write(
             "from qtype.dsl.model import Variable as DSLVariable # noqa: F401\n"
         )
+        f.write("from qtype.semantic.base_types import ImmutableModel\n")
 
         # Write the new variable class
         f.write("class Variable(DSLVariable, BaseModel):\n")
@@ -129,13 +130,6 @@ def generate_semantic_model(args: argparse.Namespace) -> None:
         f.write("    def is_set(self) -> bool:\n")
         f.write("        return self.value is not None\n")
 
-        # Write the new ImmutableModel class
-        f.write("\n\nclass ImmutableModel(BaseModel):\n")
-        f.write(
-            '    """Base model that can\'t be mutated but can be cached."""\n'
-        )
-        f.write("    model_config = ConfigDict(frozen=True)\n\n")
-
         # Write classes
         f.write("\n\n".join(generated))
         f.write("\n\n")

qtype/semantic/model.py

@@ -13,7 +13,7 @@ from __future__ import annotations
 
 from typing import Any
 
-from pydantic import BaseModel, ConfigDict, Field
+from pydantic import BaseModel, Field
 
 # Import enums and type aliases from DSL
 from qtype.dsl.model import VariableType  # noqa: F401
@@ -24,6 +24,7 @@ from qtype.dsl.model import (
     StructuralTypeEnum,
 )
 from qtype.dsl.model import Variable as DSLVariable  # noqa: F401
+from qtype.semantic.base_types import ImmutableModel
 
 
 class Variable(DSLVariable, BaseModel):
@@ -35,17 +36,6 @@ class Variable(DSLVariable, BaseModel):
         return self.value is not None
 
 
-class ImmutableModel(BaseModel):
-    """Base model that can't be mutated but can be cached."""
-
-    id: str = Field(..., description="Unique ID of this model.")
-
-    model_config = ConfigDict(frozen=True)
-
-    def __hash__(self) -> int:
-        return hash(self.id)  # Hash based on a hashable field
-
-
 class Application(BaseModel):
     """Defines a QType application that can include models, variables, and other components."""
 

{qtype-0.0.1.dist-info → qtype-0.0.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qtype
-Version: 0.0.1
+Version: 0.0.3
 Summary: DSL for Generative AI Prototyping
 Author-email: Lou Kratz <lou.kratz+qtype@bazaarvoice.com>
 License-Expression: Apache-2.0
@@ -15,6 +15,18 @@ Requires-Dist: python-dotenv>=1.0.0
 Requires-Dist: openai>=1.93.0
 Requires-Dist: fsspec>=2025.5.1
 Requires-Dist: pydantic-yaml>=1.5.1
+Provides-Extra: interpreter
+Requires-Dist: arize-phoenix-otel>=0.12.1; extra == "interpreter"
+Requires-Dist: boto3>=1.34.0; extra == "interpreter"
+Requires-Dist: fastapi>=0.116.1; 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.7.4; extra == "interpreter"
+Requires-Dist: llama-index-llms-bedrock>=0.3.8; extra == "interpreter"
+Requires-Dist: llama-index>=0.12.45; extra == "interpreter"
+Requires-Dist: openinference-instrumentation-llama-index>=4.3.1; extra == "interpreter"
+Requires-Dist: psycopg2-binary>=2.9.10; extra == "interpreter"
+Requires-Dist: uvicorn[standard]>=0.35.0; extra == "interpreter"
 Dynamic: license-file
 
 # QType

{qtype-0.0.1.dist-info → qtype-0.0.3.dist-info}/RECORD

@@ -21,7 +21,7 @@ qtype/dsl/model.py,sha256=mAgqfG1us1mT53nYd0gAIwOSgudLSDlwQjUlG5MDfRg,21169
 qtype/dsl/validator.py,sha256=yuDFPHfErPTIpZXCIyBrwpZJAitMEW0jNL8867KixUA,17130
 qtype/interpreter/__init__.py,sha256=IaRF90JLFbsTLKz9LTOMI_Pz4xwVaEyXPNaXV7sLou8,43
 qtype/interpreter/api.py,sha256=DrBV0fF6f4HiGSgXzHE07FwOr5Qe7uBQ2yQ6UjDOUTU,3872
-qtype/interpreter/conversions.py,sha256=17EKzKRSTKsGWlXemXdvHVdefZTonMyB0Ui6dIEtN7M,5584
+qtype/interpreter/conversions.py,sha256=d_hyWWR0PlhvRf2EiNt1sEzhFH8gIl3vMrVnSOFUZGk,5612
 qtype/interpreter/exceptions.py,sha256=Il8IF0UAtYWQXwvOVQCY-csfRzC1iOejHM1G-nF5EfY,288
 qtype/interpreter/flow.py,sha256=2u1wRahNFQaRRklnU4uW7_UKSD73-uZe_WiYlKitXQg,1233
 qtype/interpreter/resource_cache.py,sha256=XylIIh7RFHs4JdOZWx24a3P-sH0qjgqU9_vri9ztAXU,1014
@@ -37,13 +37,14 @@ qtype/interpreter/steps/prompt_template.py,sha256=Hs4ZANMqDViZVEPhD2v6JcUJ0DdMka
 qtype/interpreter/steps/search.py,sha256=wyVFwg5wVXytsm2JyNPwkuBAWpxEunP-dAiqhDZyii4,660
 qtype/interpreter/steps/tool.py,sha256=zAL9us_KRrcaw_sktD1z2pm0Z2W9ruMd3rrjqk7TI_k,1996
 qtype/semantic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+qtype/semantic/base_types.py,sha256=wfUlT0gV3_Mk1xLLI64SSXCB9GFmn29yz5adTaHrsOI,1540
 qtype/semantic/errors.py,sha256=dmdxGkVHrTwfiEHj5RFu2q11dAtefsivpLdJd6QynK0,119
-qtype/semantic/generate.py,sha256=JTQALEP0DCbx13HpuR7zsP5Nnk_XYkEAFpLutmRZmIQ,13299
-qtype/semantic/model.py,sha256=XmPoEqFQFKXHKC0hj-p9aEiuzUM4Q0qCHHskly3X5CM,11308
+qtype/semantic/generate.py,sha256=U4r5Yo1b0wTBgw3dLnqjYD6wD6lc0TqdwUjhIV_yQRI,13085
+qtype/semantic/model.py,sha256=Hd3rsTdvkHtAeIrPqpJf0yjHa697TnrUbm3pbrIgSK0,11047
 qtype/semantic/resolver.py,sha256=D3CmRmr_ACL54ZCbc9HxXCuCZ37bNtSzlPLMpOeeOcw,3439
-qtype-0.0.1.dist-info/licenses/LICENSE,sha256=1KA5EgYBSR0O6nCH2HEvk6Di53YKJ9r_VCR7G8G8qAY,11341
-qtype-0.0.1.dist-info/METADATA,sha256=-qtCCCsTEA8veBIYr-z8yx4djIWdVlxSQzwUQsCp91w,4026
-qtype-0.0.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-qtype-0.0.1.dist-info/entry_points.txt,sha256=5y4vj8RLvgl2tXSj-Hm7v5-Tn3kP4-UonjNoN-mfaQE,41
-qtype-0.0.1.dist-info/top_level.txt,sha256=ONroH5B0mZ51jr7NSWCK0weFwwCO7wBLmyVS1YqNU14,6
-qtype-0.0.1.dist-info/RECORD,,
+qtype-0.0.3.dist-info/licenses/LICENSE,sha256=1KA5EgYBSR0O6nCH2HEvk6Di53YKJ9r_VCR7G8G8qAY,11341
+qtype-0.0.3.dist-info/METADATA,sha256=F4WqzZVkHDvHI8gl7bzB7P0bGbQcYGuUoB-Wb4SOkLE,4809
+qtype-0.0.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+qtype-0.0.3.dist-info/entry_points.txt,sha256=5y4vj8RLvgl2tXSj-Hm7v5-Tn3kP4-UonjNoN-mfaQE,41
+qtype-0.0.3.dist-info/top_level.txt,sha256=ONroH5B0mZ51jr7NSWCK0weFwwCO7wBLmyVS1YqNU14,6
+qtype-0.0.3.dist-info/RECORD,,