qtype 0.1.9__py3-none-any.whl → 0.1.10__py3-none-any.whl

qtype/application/converters/tools_from_module.py

@@ -144,6 +144,11 @@ def _create_tool_from_function(
         for p in func_info["parameters"]
     }
 
+    # # quick hack
+    # for k, v in inputs.items():
+    #     if inspect.isclass(v.type) and issubclass(v.type, BaseModel):
+    #         v.type = str(v.type.__name__)
+
     # Create output parameter based on return type
     tool_id = func_info["module"] + "." + func_name
 
@@ -152,6 +157,7 @@ def _create_tool_from_function(
     )
 
     outputs = {"result": ToolParameter(type=output_type, optional=False)}
+    # outputs['result'].type =
 
     return PythonFunctionTool(
         id=tool_id,
@@ -264,6 +270,15 @@ def _map_python_type_to_variable_type(
     elif python_type in get_args(VariableType):
         # If it's a domain type, return its name
         return python_type  # type: ignore[no-any-return]
+    elif any(
+        [
+            (python_type is get_args(t)[0])
+            for t in get_args(VariableType)
+            if get_origin(t) is type
+        ]
+    ):
+        # It's the domain type, but the actual class (the user imported it)
+        return python_type.__name__
     elif inspect.isclass(python_type) and issubclass(python_type, BaseModel):
         # If it's a Pydantic model, create or retrieve its CustomType definition
         return _pydantic_to_custom_types(python_type, custom_types)

qtype/commands/convert.py

@@ -23,6 +23,9 @@ def _convert_to_yaml(doc: Application | ToolList) -> str:
     else:
         wrapped = doc
 
+    import pprint
+
+    pprint.pprint(wrapped)
     # NOTE: We use exclude_none but NOT exclude_unset because discriminator
     # fields like 'type' have default values and must be included in output
     return to_yaml_str(wrapped, exclude_none=True)

qtype/dsl/model.py

@@ -12,6 +12,7 @@ from pydantic import (
     Field,
     RootModel,
     ValidationInfo,
+    model_serializer,
     model_validator,
 )
 
@@ -27,11 +28,15 @@ from qtype.base.types import (
 )
 from qtype.base.ui_shapes import UI_INPUT_TO_TYPE, UIType
 from qtype.dsl.domain_types import (
+    AggregateStats,
     ChatContent,
     ChatMessage,
     Embedding,
+    MessageRole,
     RAGChunk,
     RAGDocument,
+    RAGSearchResult,
+    SearchResult,
 )
 
 DOMAIN_CLASSES = {
@@ -269,6 +274,21 @@ class ToolParameter(BaseModel):
         """Resolve string-based type references using the shared validator."""
         return _resolve_type_field_validator(data, info)
 
+    @staticmethod
+    def _serialize_type(value):
+        if isinstance(value, type):
+            return value.__name__
+        elif hasattr(value, "__name__"):
+            return value.__name__
+        return value
+
+    @model_serializer
+    def _model_serializer(self):
+        # Use the default serialization, but ensure 'type' is a string
+        data = self.model_dump()
+        data["type"] = self._serialize_type(data.get("type"))
+        return data
+
 
 class ListType(BaseModel):
     """Represents a list type with a specific element type."""
@@ -288,12 +308,16 @@ class ListType(BaseModel):
 
 VariableType = (
     PrimitiveTypeEnum
-    | Type[Embedding]
-    | Type[ChatMessage]
-    | Type[ChatContent]
+    | Type[AggregateStats]
     | Type[BaseModel]
-    | Type[RAGDocument]
+    | Type[ChatContent]
+    | Type[ChatMessage]
+    | Type[Embedding]
+    | Type[MessageRole]
     | Type[RAGChunk]
+    | Type[RAGDocument]
+    | Type[RAGSearchResult]
+    | Type[SearchResult]
     | ListType
 )
 

{qtype-0.1.9.dist-info → qtype-0.1.10.dist-info}/METADATA

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

{qtype-0.1.9.dist-info → qtype-0.1.10.dist-info}/RECORD

@@ -7,7 +7,7 @@ qtype/application/commons/__init__.py,sha256=QyWAB2cvimM4DxNo2oBFCGkfBikH-ZeMBMG
 qtype/application/commons/tools.py,sha256=U_jJdVN2NO5v9b3qb6dPIiVykfal6tp6NvcLGWR6HC8,5035
 qtype/application/converters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 qtype/application/converters/tools_from_api.py,sha256=h1g4nOLEpLPqbXAtqSLPA1WuRELMOMsI392kA61nsxc,16831
-qtype/application/converters/tools_from_module.py,sha256=PDfQVMytpCjcMxoCUb_Viqxn3IzD7Lb9tHqsbb9tcT0,9047
+qtype/application/converters/tools_from_module.py,sha256=7pR0oA4xeWQchclWYu3sa5760NJoms9y-aQd1GLDj7M,9526
 qtype/application/converters/types.py,sha256=OsJQ2fmgQm5NaxgS9cvHER9anfv3qttbt7co3f-MxPE,440
 qtype/base/__init__.py,sha256=4jwcB8cDHzDNF3NBv8WqHNk3sDZDNvUFNjx2CKZ-pyY,283
 qtype/base/exceptions.py,sha256=NR6-p6FnIabFPid9xIUTTeNhCYoIw8sbxEzaWQ11a4o,1155
@@ -15,7 +15,7 @@ qtype/base/logging.py,sha256=eqStjILlmhNryYRqUiyTdDHoUoiLKSY8J0GevvzvTKQ,1075
 qtype/base/types.py,sha256=Z-x9ytcmPPCmtkzu_JAn9wBdBiaUKqPpmVzgUIB_SaM,6676
 qtype/base/ui_shapes.py,sha256=FkziyJ8VKqimpDepTK6tlZ47HQzNwJUeKARAM2qOYKo,921
 qtype/commands/__init__.py,sha256=Qo4M07zm5I63r8STxDjvt5fhP1jygdXTsExNGELkefc,257
-qtype/commands/convert.py,sha256=wh2-MSBlnMU5peAzVeQcGqqFzQbeCuL5WC5-EDZ-TFM,4636
+qtype/commands/convert.py,sha256=tIzi31q8f3quIzLGsNVx8P467JCRK4MpRpx2hjk9j64,4682
 qtype/commands/generate.py,sha256=OQEkuh3dTVu6ZUNAuH_HkU-9YktYySL0qjTdrz28FY8,7285
 qtype/commands/run.py,sha256=rDIiDioWU-dNuw39F12Bb6buknsNGzzVhd41i9Yms8Y,6633
 qtype/commands/serve.py,sha256=lb5akSZ8fYLlCl8u8HDFFk6kyCHHwSRnP5wNzZry8sg,3216
@@ -26,7 +26,7 @@ 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=V0Tap3blGOk56F8ARM_qcfMWIyeKwuWAXmyD6xgtw-Y,41589
+qtype/dsl/model.py,sha256=GS3_I4AAq3bIQJn9Nr2M834xa4SqmVddCqGAJ_ZeBOk,42250
 qtype/dsl/parser.py,sha256=Ww32bLQ2vGOObsA-vWjaMh4TOKRwEA7FAt9U6wjKZkw,5490
 qtype/dsl/types.py,sha256=k6cgThA287bZ_pvTKQvxWhatcYCPNne8zpqOYOvLvOg,1687
 qtype/interpreter/__init__.py,sha256=IaRF90JLFbsTLKz9LTOMI_Pz4xwVaEyXPNaXV7sLou8,43
@@ -134,9 +134,9 @@ qtype/semantic/loader.py,sha256=QRhTc_AJfsWSMn8ThaW60GmIGjFMN-3bBUy4pktFjz4,3041
 qtype/semantic/model.py,sha256=eUPmdYgtRxx2U3zcC4thjh52-vHuNQAKS10hCRGjr14,28724
 qtype/semantic/resolver.py,sha256=bWPCSB8KJpVqN_n41U_r-qzUiT8vAMBOD3pOGmxL6TY,4618
 qtype/semantic/visualize.py,sha256=thjrZcfQuZJWrZ9EMAPhAa2kNikR5rLIJrfcD3hJ8XY,17426
-qtype-0.1.9.dist-info/licenses/LICENSE,sha256=1KA5EgYBSR0O6nCH2HEvk6Di53YKJ9r_VCR7G8G8qAY,11341
-qtype-0.1.9.dist-info/METADATA,sha256=yYIfRINDr6me9GXhWJDXVX3BeHD_ozt3rr7PtcXIVmA,5657
-qtype-0.1.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-qtype-0.1.9.dist-info/entry_points.txt,sha256=5y4vj8RLvgl2tXSj-Hm7v5-Tn3kP4-UonjNoN-mfaQE,41
-qtype-0.1.9.dist-info/top_level.txt,sha256=ONroH5B0mZ51jr7NSWCK0weFwwCO7wBLmyVS1YqNU14,6
-qtype-0.1.9.dist-info/RECORD,,
+qtype-0.1.10.dist-info/licenses/LICENSE,sha256=1KA5EgYBSR0O6nCH2HEvk6Di53YKJ9r_VCR7G8G8qAY,11341
+qtype-0.1.10.dist-info/METADATA,sha256=EwAyMpRp7sop4mRZOATAM9ccOv2RqzFEKBPWC3py4EE,5658
+qtype-0.1.10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+qtype-0.1.10.dist-info/entry_points.txt,sha256=5y4vj8RLvgl2tXSj-Hm7v5-Tn3kP4-UonjNoN-mfaQE,41
+qtype-0.1.10.dist-info/top_level.txt,sha256=ONroH5B0mZ51jr7NSWCK0weFwwCO7wBLmyVS1YqNU14,6
+qtype-0.1.10.dist-info/RECORD,,