arize-phoenix 7.12.3__py3-none-any.whl → 8.0.1__py3-none-any.whl

phoenix/session/client.py

@@ -2,7 +2,6 @@ import csv
 import gzip
 import logging
 import re
-import weakref
 from collections import Counter
 from collections.abc import Iterable, Mapping, Sequence
 from datetime import datetime
@@ -84,11 +83,16 @@ class Client(TraceDataExtractor):
         if host == "0.0.0.0":
             host = "127.0.0.1"
         base_url = endpoint or get_env_collector_endpoint() or f"http://{host}:{get_env_port()}"
-        self._base_url = base_url if base_url.endswith("/") else base_url + "/"
-        self._client = VersionedClient(headers=headers)
-        weakref.finalize(self, self._client.close)
+        self._client = VersionedClient(headers=headers, base_url=httpx.URL(base_url))
         if warn_if_server_not_running:
             self._warn_if_phoenix_is_not_running()
+        try:
+            # place import here temporarily before phoenix-client is fully published on pypi
+            from phoenix.client.resources.prompts import Prompts
+
+            self.prompts = Prompts(self._client)
+        except ImportError:
+            pass
 
     @property
     def web_url(self) -> str:
@@ -105,7 +109,7 @@ class Client(TraceDataExtractor):
 
         if session := active_session():
             return session.url
-        return self._base_url
+        return str(self._client.base_url)
 
     def query_spans(
         self,
@@ -148,7 +152,7 @@ class Client(TraceDataExtractor):
         try:
             response = self._client.post(
                 headers={"accept": "application/json"},
-                url=urljoin(self._base_url, "v1/spans"),
+                url="v1/spans",
                 params={
                     "project_name": project_name,
                     "project-name": project_name,  # for backward-compatibility
@@ -236,7 +240,7 @@ class Client(TraceDataExtractor):
         """
         project_name = project_name or get_env_project_name()
         response = self._client.get(
-            url=urljoin(self._base_url, "v1/evaluations"),
+            url="v1/evaluations",
             params={
                 "project_name": project_name,
                 "project-name": project_name,  # for backward-compatibility
@@ -261,10 +265,10 @@ class Client(TraceDataExtractor):
 
     def _warn_if_phoenix_is_not_running(self) -> None:
         try:
-            self._client.get(urljoin(self._base_url, "arize_phoenix_version")).raise_for_status()
+            self._client.get("arize_phoenix_version").raise_for_status()
         except Exception:
             logger.warning(
-                f"Arize Phoenix is not running on {self._base_url}. Launch Phoenix "
+                f"Arize Phoenix is not running on {self.web_url}. Launch Phoenix "
                 f"with `import phoenix as px; px.launch_app()`"
             )
 
@@ -295,7 +299,7 @@ class Client(TraceDataExtractor):
             with pa.ipc.new_stream(sink, table.schema) as writer:
                 writer.write_table(table)
             self._client.post(
-                url=urljoin(self._base_url, "v1/evaluations"),
+                url="v1/evaluations",
                 content=cast(bytes, sink.getvalue().to_pybytes()),
                 headers=headers,
                 timeout=timeout,
@@ -339,7 +343,7 @@ class Client(TraceDataExtractor):
             serialized = otlp_span.SerializeToString()
             content = gzip.compress(serialized)
             response = self._client.post(
-                url=urljoin(self._base_url, "v1/traces"),
+                url="v1/traces",
                 content=content,
                 headers={
                     "content-type": "application/x-protobuf",
@@ -360,7 +364,7 @@ class Client(TraceDataExtractor):
              Dataset: The dataset object.
         """
         response = self._client.get(
-            urljoin(self._base_url, "v1/datasets"),
+            "v1/datasets",
             params={"name": name},
         )
         response.raise_for_status()
@@ -402,7 +406,7 @@ class Client(TraceDataExtractor):
             raise ValueError("Dataset id or name must be provided.")
 
         response = self._client.get(
-            urljoin(self._base_url, f"v1/datasets/{quote(id)}/examples"),
+            f"v1/datasets/{quote(id)}/examples",
             params={"version_id": version_id} if version_id else None,
         )
         response.raise_for_status()
@@ -442,7 +446,7 @@ class Client(TraceDataExtractor):
         Returns:
             pandas DataFrame
         """
-        url = urljoin(self._base_url, f"v1/datasets/{dataset_id}/versions")
+        url = f"v1/datasets/{dataset_id}/versions"
         response = self._client.get(url=url, params={"limit": limit})
         response.raise_for_status()
         if not (records := response.json()["data"]):
@@ -612,7 +616,7 @@ class Client(TraceDataExtractor):
             experiment_id (str): ID of the experiment. This can be found in the UI.
         """
         response = self._client.get(
-            url=urljoin(self._base_url, f"v1/experiments/{experiment_id}"),
+            url=f"v1/experiments/{experiment_id}",
         )
         experiment = response.json()["data"]
         return Experiment.from_dict(experiment)
@@ -676,7 +680,7 @@ class Client(TraceDataExtractor):
             assert_never(table)
         print("📤 Uploading dataset...")
         response = self._client.post(
-            url=urljoin(self._base_url, "v1/datasets/upload"),
+            url="v1/datasets/upload",
             files={"file": file},
             data={
                 "action": action,
@@ -733,7 +737,7 @@ class Client(TraceDataExtractor):
                 )
         print("📤 Uploading dataset...")
         response = self._client.post(
-            url=urljoin(self._base_url, "v1/datasets/upload"),
+            url="v1/datasets/upload",
             headers={"Content-Encoding": "gzip"},
             json={
                 "action": action,
@@ -756,14 +760,14 @@ class Client(TraceDataExtractor):
             raise
         data = response.json()["data"]
         dataset_id = data["dataset_id"]
-        response = self._client.get(
-            url=urljoin(self._base_url, f"v1/datasets/{dataset_id}/examples")
-        )
+        path = f"v1/datasets/{dataset_id}/examples"
+        response = self._client.get(path)
         response.raise_for_status()
         data = response.json()["data"]
         version_id = data["version_id"]
         examples = data["examples"]
-        print(f"💾 Examples uploaded: {self.web_url}datasets/{dataset_id}/examples")
+        examples_url = urljoin(self.web_url, f"datasets/{dataset_id}/examples")
+        print(f"💾 Examples uploaded: {examples_url}")
         print(f"🗄️ Dataset version ID: {version_id}")
 
         return Dataset(

phoenix/utilities/client.py

@@ -27,6 +27,12 @@ class VersionedClient(httpx.Client):
         self._client_phoenix_version = phoenix_version
         self._warned_on_minor_version_mismatch = False
 
+    def __del__(self) -> None:
+        try:
+            self.close()
+        except BaseException:
+            pass
+
     def _check_version(self, response: httpx.Response) -> None:
         server_version = response.headers.get(PHOENIX_SERVER_VERSION_HEADER)
 

phoenix/version.py

@@ -1 +1 @@
-__version__ = "7.12.3"
+__version__ = "8.0.1"

phoenix/server/api/input_types/TemplateOptions.py

@@ -1,10 +0,0 @@
-import strawberry
-from strawberry.scalars import JSON
-
-from phoenix.server.api.types.TemplateLanguage import TemplateLanguage
-
-
-@strawberry.input
-class TemplateOptions:
-    variables: JSON
-    language: TemplateLanguage

phoenix/server/api/routers/v1/pydantic_compat.py

@@ -1,78 +0,0 @@
-from datetime import datetime
-from enum import Enum
-from importlib.metadata import PackageNotFoundError, version
-
-from pydantic import BaseModel
-from typing_extensions import assert_never
-
-
-def datetime_encoder(dt: datetime) -> str:
-    """
-    Encodes a `datetime` object to an ISO-formatted timestamp string.
-
-    By default, Pydantic v2 serializes `datetime` objects in a format that
-    cannot be parsed by `datetime.fromisoformat`. Adding this encoder to the
-    `json_encoders` config for a Pydantic model ensures that the serialized
-    `datetime` objects are parseable.
-    """
-    return dt.isoformat()
-
-
-class PydanticMajorVersion(Enum):
-    """
-    The major version of `pydantic`.
-    """
-
-    V1 = "v1"
-    V2 = "v2"
-
-
-def get_pydantic_major_version() -> PydanticMajorVersion:
-    """
-    Returns the major version of `pydantic` or raises an error if `pydantic` is
-    not installed.
-    """
-    try:
-        pydantic_version = version("pydantic")
-    except PackageNotFoundError:
-        raise RuntimeError("Please install pydantic with `pip install pydantic`.")
-    if pydantic_version.startswith("1"):
-        return PydanticMajorVersion.V1
-    elif pydantic_version.startswith("2"):
-        return PydanticMajorVersion.V2
-    raise ValueError(f"Unsupported Pydantic version: {pydantic_version}")
-
-
-if (pydantic_major_version := get_pydantic_major_version()) is PydanticMajorVersion.V1:
-
-    class V1RoutesBaseModel(BaseModel):
-        class Config:
-            json_encoders = {datetime: datetime_encoder}
-
-elif pydantic_major_version is PydanticMajorVersion.V2:
-    from pydantic import ConfigDict
-
-    # `json_encoders` is a configuration setting from Pydantic v1 that was
-    # removed in Pydantic v2.0.* but restored in Pydantic v2.1.0 with a
-    # deprecation warning. At this time, it remains the simplest way to
-    # configure custom JSON serialization for specific data types in a manner
-    # that is consistent between Pydantic v1 and v2.
-    #
-    # For details, see:
-    # - https://github.com/pydantic/pydantic/pull/6811
-    # - https://github.com/pydantic/pydantic/releases/tag/v2.1.0
-    #
-    # The assertion below is added in case a future release of Pydantic v2 fully
-    # removes the `json_encoders` parameter.
-    assert "json_encoders" in ConfigDict.__annotations__, (
-        "If you encounter this error with `pydantic==2.0.*`, "
-        "please upgrade `pydantic` with `pip install -U pydantic>=2.1.0`. "
-        "If you encounter this error with `pydantic>=2.1.0`, "
-        "please upgrade `arize-phoenix` with `pip install -U arize-phoenix`, "
-        "or downgrade `pydantic` to a version that supports the `json_encoders` config setting."
-    )
-
-    class V1RoutesBaseModel(BaseModel):  # type: ignore[no-redef]
-        model_config = ConfigDict({"json_encoders": {datetime: datetime_encoder}})
-else:
-    assert_never(pydantic_major_version)

phoenix/server/api/types/TemplateLanguage.py

@@ -1,10 +0,0 @@
-from enum import Enum
-
-import strawberry
-
-
-@strawberry.enum
-class TemplateLanguage(Enum):
-    NONE = "NONE"
-    MUSTACHE = "MUSTACHE"
-    F_STRING = "F_STRING"