qtype 0.0.14__py3-none-any.whl → 0.0.16__py3-none-any.whl

qtype/interpreter/api.py

@@ -6,6 +6,7 @@ from pathlib import Path
 import pandas as pd
 from fastapi import FastAPI, HTTPException, Query
 from fastapi.middleware.cors import CORSMiddleware
+from fastapi.responses import RedirectResponse
 from fastapi.staticfiles import StaticFiles
 
 from qtype.dsl.base_types import StepCardinality
@@ -70,6 +71,7 @@ class APIExecutor:
                     StaticFiles(directory=str(ui_dir), html=True),
                     name="ui",
                 )
+                app.get("/")(lambda: RedirectResponse(url="/ui"))
 
         flows = self.definition.flows if self.definition.flows else []
 

qtype/interpreter/steps/llm_inference.py

@@ -1,9 +1,16 @@
 import logging
 from typing import Any, Callable
 
+from llama_cloud import MessageRole as LlamaMessageRole
 from llama_index.core.base.llms.types import ChatResponse, CompletionResponse
 
-from qtype.dsl.domain_types import ChatMessage, Embedding
+from qtype.dsl.base_types import PrimitiveTypeEnum
+from qtype.dsl.domain_types import (
+    ChatContent,
+    ChatMessage,
+    Embedding,
+    MessageRole,
+)
 from qtype.interpreter.conversions import (
     from_chat_message,
     to_chat_message,
@@ -96,6 +103,20 @@ def execute(
             history: list[ChatMessage] = conversation_history
             inputs = [to_chat_message(msg) for msg in history] + inputs
 
+        if li.system_message and inputs[0].role != LlamaMessageRole.SYSTEM:
+            # There is a system prompt we should append
+            # Note system_prompt on the llm doesn't work for chat -- is only used for predict https://github.com/run-llama/llama_index/issues/13983
+            system_message = ChatMessage(
+                role=MessageRole.system,
+                blocks=[
+                    ChatContent(
+                        type=PrimitiveTypeEnum.text,
+                        content=li.system_message,
+                    )
+                ],
+            )
+            inputs = [to_chat_message(system_message)] + inputs
+
         # If the stream function is set, we'll stream the results
         chat_result: ChatResponse
         if stream_fn:

{qtype-0.0.14.dist-info → qtype-0.0.16.dist-info}/METADATA

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

{qtype-0.0.14.dist-info → qtype-0.0.16.dist-info}/RECORD

@@ -28,7 +28,7 @@ qtype/dsl/domain_types.py,sha256=T0fVhdTyTrdtH4oOYvaRb7fstcReiwTQFCFYbDzPeew,165
 qtype/dsl/model.py,sha256=POUDwNm74dTstcRb5Ens-DSpA8r9e1DtGbTm5KA8X74,31190
 qtype/dsl/validator.py,sha256=j-Jb6uHNF9JwOFs1P-iaMyakhjLR7taJn6HKQuY3WfA,18278
 qtype/interpreter/__init__.py,sha256=IaRF90JLFbsTLKz9LTOMI_Pz4xwVaEyXPNaXV7sLou8,43
-qtype/interpreter/api.py,sha256=FK-YY5ub1n5r69bq3uTtljGwYrERhUmIhgVwErtEnq0,7714
+qtype/interpreter/api.py,sha256=kvd1tOgJGeVE2fXaHzXwPS0YOEt_kFnoVLRF_4QPOl8,7827
 qtype/interpreter/conversions.py,sha256=SFkALpQc2qIApYe7ICuQp6eSuB0YLsE9-gJT_B0e2cU,6072
 qtype/interpreter/exceptions.py,sha256=Il8IF0UAtYWQXwvOVQCY-csfRzC1iOejHM1G-nF5EfY,288
 qtype/interpreter/flow.py,sha256=2u1wRahNFQaRRklnU4uW7_UKSD73-uZe_WiYlKitXQg,1233
@@ -55,7 +55,7 @@ qtype/interpreter/steps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG
 qtype/interpreter/steps/agent.py,sha256=Yg56YjTlrwc4oJ-f7ZBazF4ii2oJX8zMhETHF0-ArAU,4008
 qtype/interpreter/steps/condition.py,sha256=E86aRWQpjz18QuKwcGyoIPoOKAvTDZgnpg9qXw6xYas,1128
 qtype/interpreter/steps/decoder.py,sha256=toKiZHpM3_y6imV8xQXmAOvGGFhqJzXaWlM1HLIyOzw,2993
-qtype/interpreter/steps/llm_inference.py,sha256=k7OD40QT95AfjMjAk-5nxCjYCnDe4RdNgIV0Cqn5R8A,5419
+qtype/interpreter/steps/llm_inference.py,sha256=jnRqcTx7yIbJ5Sbi1hjeJUGBw9eOHwgUhe-f-XmngyI,6218
 qtype/interpreter/steps/prompt_template.py,sha256=tK1j6DTUMvlDMcJZDGQ2lLgwq_LkaICIq0U5u-QK_WU,1597
 qtype/interpreter/steps/search.py,sha256=wyVFwg5wVXytsm2JyNPwkuBAWpxEunP-dAiqhDZyii4,660
 qtype/interpreter/steps/tool.py,sha256=SNY1SOTpydwo-P-zf1w2EU9tFkXy9YrfjdI9AP2Kbe8,7276
@@ -98,9 +98,9 @@ qtype/semantic/generate.py,sha256=c7yzVmzNyOqWdlbofR1FY8QyeiLYddnIdSsd6VvyY0c,15
 qtype/semantic/model.py,sha256=HoG6rawJ7UuaDbME9QgQke8lOJYUNdawZBBZucNxPbc,16582
 qtype/semantic/resolver.py,sha256=rhePhY1m4h-qYZucIcBcu0DMocjlOs5OVSbhR5HZ2xo,3404
 qtype/semantic/visualize.py,sha256=ZFXBBxqRkX9vXNoCQAReYU7HB3Ecmsm5sQBMEox8ZNU,17444
-qtype-0.0.14.dist-info/licenses/LICENSE,sha256=1KA5EgYBSR0O6nCH2HEvk6Di53YKJ9r_VCR7G8G8qAY,11341
-qtype-0.0.14.dist-info/METADATA,sha256=wsYlqawnBhhuOj2acJgk-6elV7TNs-pWkpD5ECpW8nI,4737
-qtype-0.0.14.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-qtype-0.0.14.dist-info/entry_points.txt,sha256=5y4vj8RLvgl2tXSj-Hm7v5-Tn3kP4-UonjNoN-mfaQE,41
-qtype-0.0.14.dist-info/top_level.txt,sha256=ONroH5B0mZ51jr7NSWCK0weFwwCO7wBLmyVS1YqNU14,6
-qtype-0.0.14.dist-info/RECORD,,
+qtype-0.0.16.dist-info/licenses/LICENSE,sha256=1KA5EgYBSR0O6nCH2HEvk6Di53YKJ9r_VCR7G8G8qAY,11341
+qtype-0.0.16.dist-info/METADATA,sha256=5Jafu7CEKPiuG0z3CARPv5WI0Gb7r-9IqPPRbOizEIQ,4737
+qtype-0.0.16.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+qtype-0.0.16.dist-info/entry_points.txt,sha256=5y4vj8RLvgl2tXSj-Hm7v5-Tn3kP4-UonjNoN-mfaQE,41
+qtype-0.0.16.dist-info/top_level.txt,sha256=ONroH5B0mZ51jr7NSWCK0weFwwCO7wBLmyVS1YqNU14,6
+qtype-0.0.16.dist-info/RECORD,,