fix: allow prompt, change to pipelineRunId (#68)

examples/examples/simple/openai/create-chat-completion-async-stream.py

@@ -25,8 +25,8 @@ async def main():
 
     pipeline_run_id = None
     async for value in result:
-        if value.get("pipeline_run_id"):
-            pipeline_run_id = value.get("pipeline_run_id")
+        if value.get("pipelineRunId"):
+            pipeline_run_id = value.get("pipelineRunId")
 
     gentrace.flush()
 

examples/examples/simple/openai/create-chat-completion-async.py

@@ -24,7 +24,7 @@ async def main():
 
     gentrace.flush()
 
-    print("Result: ", result.pipeline_run_id)
+    print("Result: ", result["pipelineRunId"])
 
 
 asyncio.run(main())

examples/examples/simple/openai/create-chat-completion-stream.py

@@ -23,8 +23,8 @@
 pipeline_run_id = None
 
 for value in result:
-    if value.get("pipeline_run_id"):
-        pipeline_run_id = value.get("pipeline_run_id")
+    if value.get("pipelineRunId"):
+        pipeline_run_id = value.get("pipelineRunId")
 
 print("Result: ", pipeline_run_id)
 

examples/examples/simple/openai/create-completion-async-stream.py

@@ -26,8 +26,8 @@ async def main():
 
     pipeline_run_id = None
     async for value in result:
-        if value.get("pipeline_run_id"):
-            pipeline_run_id = value.get("pipeline_run_id")
+        if value.get("pipelineRunId"):
+            pipeline_run_id = value.get("pipelineRunId")
 
     gentrace.flush()
 

examples/examples/simple/openai/create-completion-async.py

@@ -25,7 +25,7 @@ async def main():
 
     gentrace.flush()
 
-    print("Result: ", result.pipeline_run_id)
+    print("Result: ", result["pipelineRunId"])
 
 
 asyncio.run(main())

examples/examples/simple/openai/create-completion.py

@@ -14,12 +14,12 @@
 openai.api_key = os.getenv("OPENAI_KEY")
 
 result = openai.Completion.create(
-    pipeline_id="text-generation",
+    pipeline_id="text-generation-test",
     model="text-davinci-003",
     prompt_template="Hello world {{ name }}",
     prompt_inputs={"name": "test"},
 )
 
 gentrace.flush()
 
-print("Result: ", result.pipeline_run_id)
+print("Result: ", result["pipelineRunId"])

examples/examples/simple/openai/create-embedding-async.py

@@ -24,7 +24,7 @@ async def main():
 
     gentrace.flush()
 
-    print("Result: ", result.pipeline_run_id)
+    print("Result: ", result["pipelineRunId"])
 
 
 asyncio.run(main())

examples/examples/simple/openai/create-embedding.py

@@ -22,4 +22,4 @@
 
 gentrace.flush()
 
-print("Result: ", result.pipeline_run_id)
+print("Result: ", result["pipelineRunId"])

examples/examples/simple/pinecone/delete.py

@@ -21,4 +21,4 @@
 
 gentrace.flush()
 
-print("Result: ", result.pipeline_run_id)
+print("Result: ", result["pipelineRunId"])

examples/examples/simple/pinecone/fetch.py

@@ -21,4 +21,4 @@
 
 gentrace.flush()
 
-print("Result: ", result.pipeline_run_id)
+print("Result: ", result["pipelineRunId"])

examples/examples/simple/pinecone/query.py

@@ -18,10 +18,10 @@
 )
 
 result = pinecone.Index("openai-trec").query(
-    top_k=10, vector=DEFAULT_VECTOR, pipline_id="self-contained-pinecone-query"
+    top_k=10, vector=DEFAULT_VECTOR, pipeline_id="self-contained-pinecone-query"
 )
 
 
 gentrace.flush()
 
-print("Result: ", result.pipeline_run_id)
+print("Result: ", result["pipelineRunId"])

examples/examples/simple/pinecone/upsert.py

@@ -30,4 +30,4 @@
 
 gentrace.flush()
 
-print("Result: ", result.pipeline_run_id)
+print("Result: ", result["pipelineRunId"])

examples/pyproject.toml

@@ -7,11 +7,11 @@ repository = "https://github.com/gentrace/gentrace-python"
 version = "0.0.1"
 
 [tool.poetry.dependencies]
-gentrace-py = {path = "../package/dist/gentrace_py-0.5.1.tar.gz", develop = true}
 openai = "^0.27.4"
 pinecone-client = "^2.2.1"
 python = "^3.11"
 python-dotenv = "^1.0.0"
+gentrace-py = {path = "../package/dist/gentrace_py-0.5.5.tar.gz", develop = true}
 
 [tool.poetry.group.lint.dependencies]
 black = "^23.3.0"

package/gentrace/providers/getters.py

@@ -2,22 +2,22 @@
 import re
 
 import openai
+from urllib3.util import parse_url
 
 from gentrace.configuration import Configuration as GentraceConfiguration
 
 openai.api_key = os.getenv("OPENAI_KEY")
 
 
-VALID_GENTRACE_HOST = r"^https?://[\w.-]+:\d{1,5}/api/v1/?$"
-
-
 def test_validity():
     from gentrace import api_key, host
 
     if not api_key:
         raise ValueError("Gentrace API key not set")
 
-    if host and not re.match(VALID_GENTRACE_HOST, host):
+    path = parse_url(host).path
+
+    if host and path != "/api/v1" and path != "/api/v1/":
         raise ValueError("Gentrace host is invalid")
 
 
@@ -28,9 +28,6 @@ def configure_openai():
 
     test_validity()
 
-    if host and not re.match(VALID_GENTRACE_HOST, host):
-        raise ValueError("Gentrace host is invalid")
-
     gentrace_config = GentraceConfiguration(host=host)
     gentrace_config.access_token = api_key
 

package/gentrace/providers/llms/openai.py

@@ -91,7 +91,7 @@ def create_completion_step_run(
             submit_result = pipeline_run.submit()
 
             if not stream:
-                completion.pipeline_run_id = (
+                completion["pipelineRunId"] = (
                     submit_result["pipelineRunId"]
                     if "pipelineRunId" in submit_result
                     else None
@@ -136,6 +136,7 @@ def intercept_completion(original_fn, gentrace_config: Configuration):
     def wrapper(cls, *args, **kwargs):
         prompt_template = kwargs.get("prompt_template")
         prompt_inputs = kwargs.get("prompt_inputs")
+        prompt = kwargs.get("prompt")
         pipeline_id = kwargs.pop("pipeline_id", None)
         stream = kwargs.get("stream")
         base_completion_options = {
@@ -144,18 +145,11 @@ def wrapper(cls, *args, **kwargs):
             if k not in ["prompt_template", "prompt_inputs"]
         }
 
-        if "prompt" in base_completion_options:
-            raise ValueError(
-                "The prompt attribute cannot be provided when using the Gentrace SDK. Use prompt_template and prompt_inputs instead."
-            )
-
-        if not prompt_template:
-            raise ValueError(
-                "The prompt_template attribute must be provided when using the Gentrace SDK."
-            )
-
         if stream:
-            rendered_prompt = pystache.render(prompt_template, prompt_inputs)
+            rendered_prompt = prompt
+
+            if prompt_template and prompt_inputs:
+                rendered_prompt = pystache.render(prompt_template, prompt_inputs)
 
             new_completion_options = {
                 **base_completion_options,
@@ -173,7 +167,7 @@ def profiled_completion():
                 modified_response = []
                 for value in completion:
                     if value and is_self_contained:
-                        value["pipeline_run_id"] = pipeline_run_id
+                        value["pipelineRunId"] = pipeline_run_id
                     modified_response.append(value)
                     yield value
 
@@ -197,9 +191,15 @@ def profiled_completion():
 
             return profiled_completion()
 
-        rendered_prompt = pystache.render(prompt_template, prompt_inputs)
+        rendered_prompt = prompt
+
+        if prompt_template and prompt_inputs:
+            rendered_prompt = pystache.render(prompt_template, prompt_inputs)
 
-        new_completion_options = {**base_completion_options, "prompt": rendered_prompt}
+        new_completion_options = {
+            **base_completion_options,
+            "prompt": rendered_prompt,
+        }
 
         start_time = time.time()
         completion = original_fn(**new_completion_options)
@@ -230,6 +230,7 @@ def intercept_completion_async(original_fn, gentrace_config: Configuration):
     async def wrapper(cls, *args, **kwargs):
         prompt_template = kwargs.get("prompt_template")
         prompt_inputs = kwargs.get("prompt_inputs")
+        prompt = kwargs.get("prompt")
         pipeline_id = kwargs.pop("pipeline_id", None)
         stream = kwargs.get("stream")
         base_completion_options = {
@@ -238,18 +239,11 @@ async def wrapper(cls, *args, **kwargs):
             if k not in ["prompt_template", "prompt_inputs"]
         }
 
-        if "prompt" in base_completion_options:
-            raise ValueError(
-                "The prompt attribute cannot be provided when using the Gentrace SDK. Use prompt_template and prompt_inputs instead."
-            )
-
-        if not prompt_template:
-            raise ValueError(
-                "The prompt_template attribute must be provided when using the Gentrace SDK."
-            )
-
         if stream:
-            rendered_prompt = pystache.render(prompt_template, prompt_inputs)
+            rendered_prompt = prompt
+
+            if prompt_template and prompt_inputs:
+                rendered_prompt = pystache.render(prompt_template, prompt_inputs)
 
             new_completion_options = {
                 **base_completion_options,
@@ -267,7 +261,7 @@ async def profiled_completion():
                 modified_response = []
                 async for value in completion:
                     if value and is_self_contained:
-                        value["pipeline_run_id"] = pipeline_run_id
+                        value["pipelineRunId"] = pipeline_run_id
                     modified_response.append(value)
                     yield value
 
@@ -291,9 +285,15 @@ async def profiled_completion():
 
             return profiled_completion()
 
-        rendered_prompt = pystache.render(prompt_template, prompt_inputs)
+        rendered_prompt = prompt
+
+        if prompt_template and prompt_inputs:
+            rendered_prompt = pystache.render(prompt_template, prompt_inputs)
 
-        new_completion_options = {**base_completion_options, "prompt": rendered_prompt}
+        new_completion_options = {
+            **base_completion_options,
+            "prompt": rendered_prompt,
+        }
 
         start_time = time.time()
         completion = await original_fn(**new_completion_options)
@@ -341,7 +341,7 @@ def profiled_completion():
                 modified_response = []
                 for value in completion:
                     if value and is_self_contained:
-                        value["pipeline_run_id"] = pipeline_run_id
+                        value["pipelineRunId"] = pipeline_run_id
                     modified_response.append(value)
                     yield value
 
@@ -416,7 +416,7 @@ def profiled_completion():
 
             if is_self_contained:
                 submit_result = pipeline_run.submit()
-                completion.pipeline_run_id = (
+                completion["pipelineRunId"] = (
                     submit_result["pipelineRunId"]
                     if "pipelineRunId" in submit_result
                     else None
@@ -450,7 +450,7 @@ async def profiled_completion():
                 modified_response = []
                 async for value in completion:
                     if value and is_self_contained:
-                        value["pipeline_run_id"] = pipeline_run_id
+                        value["pipelineRunId"] = pipeline_run_id
                     modified_response.append(value)
                     yield value
 
@@ -526,7 +526,7 @@ async def profiled_completion():
 
             if is_self_contained:
                 submit_result = pipeline_run.submit()
-                completion.pipeline_run_id = (
+                completion["pipelineRunId"] = (
                     submit_result["pipelineRunId"]
                     if "pipelineRunId" in submit_result
                     else None
@@ -578,7 +578,7 @@ def wrapper(cls, *args, **kwargs):
 
             if is_self_contained:
                 submit_result = pipeline_run.submit()
-                completion.pipeline_run_id = (
+                completion["pipelineRunId"] = (
                     submit_result["pipelineRunId"]
                     if "pipelineRunId" in submit_result
                     else None
@@ -630,7 +630,7 @@ async def wrapper(cls, *args, **kwargs):
 
             if is_self_contained:
                 submit_result = pipeline_run.submit()
-                completion.pipeline_run_id = (
+                completion["pipelineRunId"] = (
                     submit_result["pipelineRunId"]
                     if "pipelineRunId" in submit_result
                     else None