promptlayer 1.0.14__py3-none-any.whl → 1.0.16__py3-none-any.whl

promptlayer/__init__.py

@@ -1,4 +1,4 @@
 from .promptlayer import PromptLayer
 
-__version__ = "1.0.14"
+__version__ = "1.0.16"
 __all__ = ["PromptLayer", "__version__"]

promptlayer/promptlayer.py

@@ -61,7 +61,6 @@ class PromptLayer:
         self,
         api_key: str = None,
         enable_tracing: bool = False,
-        workspace_id: int = None,
     ):
         if api_key is None:
             api_key = os.environ.get("PROMPTLAYER_API_KEY")
@@ -72,15 +71,11 @@ class PromptLayer:
                 "Please set the PROMPTLAYER_API_KEY environment variable or pass the api_key parameter."
             )
 
-        if enable_tracing and not workspace_id:
-            raise ValueError("Please set a workspace_id to enable tracing.")
-
         self.api_key = api_key
         self.templates = TemplateManager(api_key)
         self.group = GroupManager(api_key)
-        self.tracer = self._initialize_tracer(api_key, enable_tracing, workspace_id)
+        self.tracer = self._initialize_tracer(api_key, enable_tracing)
         self.track = TrackManager(api_key)
-        self.workspace_id = workspace_id
 
     def __getattr__(
         self,
@@ -111,46 +106,30 @@ class PromptLayer:
             raise AttributeError(f"module {__name__} has no attribute {name}")
 
     def _create_track_request_callable(
-        self, request_params, tags, input_variables, group_id, span_id
+        self,
+        *,
+        request_params,
+        tags,
+        input_variables,
+        group_id,
+        pl_run_span_id: str | None = None,
     ):
         def _track_request(**body):
             track_request_kwargs = self._prepare_track_request_kwargs(
-                request_params, tags, input_variables, group_id, span_id, **body
+                request_params, tags, input_variables, group_id, pl_run_span_id, **body
             )
-            if self.tracer:
-                with self.tracer.start_as_current_span("track_request"):
-                    return track_request(**track_request_kwargs)
             return track_request(**track_request_kwargs)
 
         return _track_request
 
-    def _fetch_prompt_blueprint(self, *, prompt_name, template_params):
-        if self.tracer:
-            with self.tracer.start_as_current_span("fetch_prompt_template") as span:
-                span.set_attribute("prompt_name", prompt_name)
-                span.set_attribute(
-                    "function_input",
-                    str(
-                        {"prompt_name": prompt_name, "template_params": template_params}
-                    ),
-                )
-                result = self.templates.get(prompt_name, template_params)
-                span.set_attribute("function_output", str(result))
-                return result
-        return self.templates.get(prompt_name, template_params)
-
     @staticmethod
-    def _initialize_tracer(
-        api_key: str = None, enable_tracing: bool = False, workspace_id: int = None
-    ):
+    def _initialize_tracer(api_key: str = None, enable_tracing: bool = False):
         if enable_tracing:
             resource = Resource(
                 attributes={ResourceAttributes.SERVICE_NAME: "prompt-layer-library"}
             )
             tracer_provider = TracerProvider(resource=resource)
-            promptlayer_exporter = PromptLayerSpanExporter(
-                api_key=api_key, workspace_id=workspace_id
-            )
+            promptlayer_exporter = PromptLayerSpanExporter(api_key=api_key)
             span_processor = BatchSpanProcessor(promptlayer_exporter)
             tracer_provider.add_span_processor(span_processor)
             trace.set_tracer_provider(tracer_provider)
@@ -158,26 +137,6 @@ class PromptLayer:
         else:
             return None
 
-    def _make_llm_request(self, request_params):
-        span_id = None
-
-        if self.tracer:
-            with self.tracer.start_as_current_span("llm_request") as span:
-                span.set_attribute("provider", request_params["provider"])
-                span.set_attribute("function_name", request_params["function_name"])
-                span.set_attribute("function_input", str(request_params))
-                span_id = hex(span.context.span_id)[2:].zfill(16)
-                response = request_params["request_function"](
-                    request_params["prompt_blueprint"], **request_params["kwargs"]
-                )
-                span.set_attribute("function_output", str(response))
-        else:
-            response = request_params["request_function"](
-                request_params["prompt_blueprint"], **request_params["kwargs"]
-            )
-
-        return response, span_id
-
     @staticmethod
     def _prepare_get_prompt_template_params(
         *, prompt_version, prompt_release_label, input_variables, metadata
@@ -220,7 +179,14 @@ class PromptLayer:
         }
 
     def _prepare_track_request_kwargs(
-        self, request_params, tags, input_variables, group_id, span_id, **body
+        self,
+        request_params,
+        tags,
+        input_variables,
+        group_id,
+        pl_run_span_id: str | None = None,
+        metadata: Dict[str, str] | None = None,
+        **body,
     ):
         return {
             "function_name": request_params["function_name"],
@@ -235,13 +201,13 @@ class PromptLayer:
                 datetime.timezone.utc
             ).timestamp(),
             "api_key": self.api_key,
-            "metadata": request_params.get("metadata"),
+            "metadata": metadata,
             "prompt_id": request_params["prompt_blueprint"]["id"],
             "prompt_version": request_params["prompt_blueprint"]["version"],
             "prompt_input_variables": input_variables,
             "group_id": group_id,
             "return_prompt_blueprint": True,
-            "span_id": span_id,
+            "span_id": pl_run_span_id,
             **body,
         }
 
@@ -256,6 +222,7 @@ class PromptLayer:
         metadata: Union[Dict[str, str], None] = None,
         group_id: Union[int, None] = None,
         stream: bool = False,
+        pl_run_span_id: str | None = None,
     ) -> Dict[str, Any]:
         get_prompt_template_params = self._prepare_get_prompt_template_params(
             prompt_version=prompt_version,
@@ -263,9 +230,7 @@ class PromptLayer:
             input_variables=input_variables,
             metadata=metadata,
         )
-        prompt_blueprint = self._fetch_prompt_blueprint(
-            prompt_name=prompt_name, template_params=get_prompt_template_params
-        )
+        prompt_blueprint = self.templates.get(prompt_name, get_prompt_template_params)
         prompt_blueprint_model = self._validate_and_extract_model_from_prompt_blueprint(
             prompt_blueprint=prompt_blueprint, prompt_name=prompt_name
         )
@@ -276,13 +241,19 @@ class PromptLayer:
             stream=stream,
         )
 
-        response, span_id = self._make_llm_request(llm_request_params)
+        response = llm_request_params["request_function"](
+            llm_request_params["prompt_blueprint"], **llm_request_params["kwargs"]
+        )
 
         if stream:
             return stream_response(
                 response,
                 self._create_track_request_callable(
-                    llm_request_params, tags, input_variables, group_id, span_id
+                    request_params=llm_request_params,
+                    tags=tags,
+                    input_variables=input_variables,
+                    group_id=group_id,
+                    pl_run_span_id=pl_run_span_id,
                 ),
                 llm_request_params["stream_function"],
             )
@@ -292,7 +263,8 @@ class PromptLayer:
             tags,
             input_variables,
             group_id,
-            span_id,
+            pl_run_span_id,
+            metadata=metadata,
             request_response=response.model_dump(),
         )
 
@@ -303,17 +275,24 @@ class PromptLayer:
         }
 
     def _track_request_log(
-        self, request_params, tags, input_variables, group_id, span_id, **body
+        self,
+        request_params,
+        tags,
+        input_variables,
+        group_id,
+        pl_run_span_id: str | None = None,
+        metadata: Dict[str, str] | None = None,
+        **body,
     ):
         track_request_kwargs = self._prepare_track_request_kwargs(
-            request_params, tags, input_variables, group_id, span_id, **body
+            request_params,
+            tags,
+            input_variables,
+            group_id,
+            pl_run_span_id,
+            metadata=metadata,
+            **body,
         )
-        if self.tracer:
-            with self.tracer.start_as_current_span("track_request") as span:
-                span.set_attribute("function_input", str(track_request_kwargs))
-                result = track_request(**track_request_kwargs)
-                span.set_attribute("function_output", str(result))
-                return result
         return track_request(**track_request_kwargs)
 
     @staticmethod
@@ -364,12 +343,14 @@ class PromptLayer:
         }
 
         if self.tracer:
-            with self.tracer.start_as_current_span("PromptLayer.run") as main_span:
-                main_span.set_attribute("prompt_name", prompt_name)
-                main_span.set_attribute("stream", stream)
-                main_span.set_attribute("function_input", str(_run_internal_kwargs))
-                result = self._run_internal(**_run_internal_kwargs)
-                main_span.set_attribute("function_output", str(result))
+            with self.tracer.start_as_current_span("PromptLayer Run") as span:
+                span.set_attribute("prompt_name", prompt_name)
+                span.set_attribute("function_input", str(_run_internal_kwargs))
+                pl_run_span_id = hex(span.context.span_id)[2:].zfill(16)
+                result = self._run_internal(
+                    **_run_internal_kwargs, pl_run_span_id=pl_run_span_id
+                )
+                span.set_attribute("function_output", str(result))
                 return result
         else:
             return self._run_internal(**_run_internal_kwargs)

promptlayer/span_exporter.py

@@ -8,10 +8,9 @@ from promptlayer.utils import URL_API_PROMPTLAYER
 
 
 class PromptLayerSpanExporter(SpanExporter):
-    def __init__(self, api_key: str = None, workspace_id: int = None):
+    def __init__(self, api_key: str = None):
         self.api_key = api_key
         self.url = f"{URL_API_PROMPTLAYER}/spans-bulk"
-        self.workspace_id = workspace_id
 
     def export(self, spans: Sequence[ReadableSpan]) -> SpanExportResult:
         request_data = []
@@ -65,7 +64,6 @@ class PromptLayerSpanExporter(SpanExporter):
                 },
                 json={
                     "spans": request_data,
-                    "workspace_id": self.workspace_id,
                 },
             )
             response.raise_for_status()

{promptlayer-1.0.14.dist-info → promptlayer-1.0.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: promptlayer
-Version: 1.0.14
+Version: 1.0.16
 Summary: PromptLayer is a platform for prompt engineering and tracks your LLM requests.
 License: Apache-2.0
 Author: Magniv

{promptlayer-1.0.14.dist-info → promptlayer-1.0.16.dist-info}/RECORD

@@ -1,16 +1,16 @@
-promptlayer/__init__.py,sha256=yJZGbYllyfg2D9wdhrKuX-5tsugDI5xUCACIqJfZRk0,102
+promptlayer/__init__.py,sha256=NPhgcyisSfks_AFSRjhlScwwHQRlZSKiPBJS-Lm_grg,102
 promptlayer/groups/__init__.py,sha256=-xs-2cn0nc0D_5YxZr3nC86iTdRVZmBhEpOKDJXE-sQ,224
 promptlayer/groups/groups.py,sha256=yeO6T0TM3qB0ondZRiHhcH8G06YygrpFoM8b9RmoIao,165
-promptlayer/promptlayer.py,sha256=V7VtlfXftT7U1HguC_8B_NggBQtX8CcKJ4nWwrBbnxU,15529
+promptlayer/promptlayer.py,sha256=xqnwYO5p2JPA_mQbP-5l9yQlQ1bKrfms803CrJBSiFA,13824
 promptlayer/promptlayer_base.py,sha256=sev-EZehRXJSZSmJtMkqmAUK1345pqbDY_lNjPP5MYA,7158
-promptlayer/span_exporter.py,sha256=b8sn9bJIUbYDmme5Md3g2K3X62RGDPMDYdkk_8ZETbk,2780
+promptlayer/span_exporter.py,sha256=zIJNsb3Fe6yb5wKLDmkoPF2wqFjk1p39E0jWHD2plzI,2658
 promptlayer/templates.py,sha256=aY_-BCrL0AgIdYEUE28pi0AP_avTVAgwv5hgzrh75vo,717
 promptlayer/track/__init__.py,sha256=VheO_Au0lffGlPKYYPQwkv8ci16wSXABCVSNRoFWu_w,945
 promptlayer/track/track.py,sha256=XNEZT9yNiRBPp9vaDZo_f0dP_ldOu8q1qafpVfS5Ze8,1610
 promptlayer/types/__init__.py,sha256=ulWSyCrk5hZ_PI-nKGpd6GPcRaK8lqP4wFl0LPNUYWk,61
 promptlayer/types/prompt_template.py,sha256=QbxYSeIubrwp8KmDKdt9syAwzONFPh_So9yr4H73ANQ,4429
 promptlayer/utils.py,sha256=-p0qapUvkZYJd_Dfat3c8LANXWU1JN0bJB91IyjB8iA,29656
-promptlayer-1.0.14.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-promptlayer-1.0.14.dist-info/METADATA,sha256=SDlXrNOXoAwkDoYuxHjSKpFrxR7pMEh1ddP2p4XvyTI,4609
-promptlayer-1.0.14.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-promptlayer-1.0.14.dist-info/RECORD,,
+promptlayer-1.0.16.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+promptlayer-1.0.16.dist-info/METADATA,sha256=HpWQPpYbuABRRj4feBBLYpZvviPcIe25q5S0fBKlzR8,4609
+promptlayer-1.0.16.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+promptlayer-1.0.16.dist-info/RECORD,,