arize-phoenix 2.4.1rc4__py3-none-any.whl → 2.4.1rc6__py3-none-any.whl

{arize_phoenix-2.4.1rc4.dist-info → arize_phoenix-2.4.1rc6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: arize-phoenix
-Version: 2.4.1rc4
+Version: 2.4.1rc6
 Summary: ML Observability in your notebook
 Project-URL: Documentation, https://docs.arize.com/phoenix/
 Project-URL: Issues, https://github.com/Arize-ai/phoenix/issues

{arize_phoenix-2.4.1rc4.dist-info → arize_phoenix-2.4.1rc6.dist-info}/RECORD

@@ -3,8 +3,8 @@ phoenix/config.py,sha256=wYmvT1I3wad8YIunbsiJ0nBu4-W8pUZwwbs5CxJKRs8,2442
 phoenix/datetime_utils.py,sha256=D955QLrkgrrSdUM6NyqbCeAu2SMsjhR5rHVQEsVUdng,2773
 phoenix/exceptions.py,sha256=igIWGAg3m8jm5YwQDeCY1p8ml_60A7zaGVXJ1yZhY9s,44
 phoenix/py.typed,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-phoenix/services.py,sha256=slL4Uu___QQSKEssgD738-WAld-kzVQnpW92uKLxV4E,4886
-phoenix/version.py,sha256=jQJy8hLBFCsN7f2COT6xTJBYFtZehVyfl5Pb66EeJzU,25
+phoenix/services.py,sha256=f6AeyKTuOpy9RCcTCjVH3gx5nYZhbTMFOuv1WSUOB5o,4992
+phoenix/version.py,sha256=PBfHg55LBkQ021mwCxcQp5JEkKfbXnP1GrPdM50Lifo,25
 phoenix/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 phoenix/core/embedding_dimension.py,sha256=zKGbcvwOXgLf-yrJBpQyKtd-LEOPRKHnUToyAU8Owis,87
 phoenix/core/evals.py,sha256=OrHeYlh804rpcZIXTA6kan2mzSZMfgpphNNQdPMpNoM,7597
@@ -55,11 +55,11 @@ phoenix/pointcloud/pointcloud.py,sha256=ms-h1FLC0xXb3sk256zpSuZQDE2hdOAJzRNBklP0
 phoenix/pointcloud/projectors.py,sha256=zO_RrtDYSv2rqVOfIP2_9Cv11Dc8EmcZR94xhFcBYPU,1057
 phoenix/pointcloud/umap_parameters.py,sha256=lJsEOrbSuSiqI7g4Yt6xj7kgYxEqoep4ZHWLr6VWBqw,1760
 phoenix/server/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-phoenix/server/app.py,sha256=ZjVzQ4PELR0m6vCRQ7exzhb9Q1LHyu6cl3ttkNsPrgE,8110
+phoenix/server/app.py,sha256=-Xn6BTdQsJ_VAAOWwiLQr_ZeyfOBSO_0cFyY7ewkqFM,7802
 phoenix/server/evaluation_handler.py,sha256=HzaoD8Cv9HbEdd0nYSTZoakKsE8Ic5lVjeuBh0vnhoA,1554
 phoenix/server/main.py,sha256=ZWV_UQOE2c5Gx4x_2UQiZIww3JMRWosza5BbzstTUsg,6814
 phoenix/server/span_handler.py,sha256=reYUDaN5bavSFjEiSfvYyAG_mpJs6S3iB-RNCkZrSUU,1295
-phoenix/server/thread_server.py,sha256=a9Vnzc69ZLqJbI_FUSOY3eeuYCiCq6aprPj2gS_RB-M,2097
+phoenix/server/thread_server.py,sha256=z6VwimjlHEsOavlybcQFVWubZvHDGYOH7p61nscC0lU,2164
 phoenix/server/trace_handler.py,sha256=pXanrp9L21Mh7MnyJbj202NJ-Rn4bCjG0oL4DtdKcls,2074
 phoenix/server/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 phoenix/server/api/context.py,sha256=02vRgyLFpDCmh97QwsjWD5cdNZkoCUtDPPs1YItbdbI,583
@@ -130,10 +130,10 @@ phoenix/server/static/index.js,sha256=dJKCIzqIRBf_IKfXUbnSZnegpgnfMV3wsnFGXWV9Ie
 phoenix/server/static/index.js.map,sha256=Pe5FBAB7cKnRik9CrPFsP4AHe3MR3LUI7OShR2pA5ys,15465655
 phoenix/server/static/modernizr.js,sha256=mvK-XtkNqjOral-QvzoqsyOMECXIMu5BQwSVN_wcU9c,2564
 phoenix/server/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-phoenix/server/templates/index.html,sha256=6Zt_ouVbwQ8fDIQgVqlumu-SBwbIFkbcGaDVHgrlrNY,1868
+phoenix/server/templates/index.html,sha256=7N-1rUz82nvblYndZLdZ_VdIOSKD5wGq4LyO5Cs-P5w,1916
 phoenix/session/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 phoenix/session/evaluation.py,sha256=s5OivScAMSj8qfU4IexpmbyKvcGBj_nt-GP_13_o-iY,4843
-phoenix/session/session.py,sha256=ZQaakc5qhiJOzdyEMKAbXBx3UCPTcufytYXDhbctmJo,18941
+phoenix/session/session.py,sha256=nZxE2CCip6vgUU9KyzaxQmSLF3v4ywYGLWmCUR1K5no,20104
 phoenix/trace/__init__.py,sha256=4d_MqzUIFmlY9WWcFeTONJ4xL5mPGoWZaPM2TJ0ZDBQ,266
 phoenix/trace/evaluation_conventions.py,sha256=t8jydM3U0-T5YpiQKRJ3tWdWGlHtzKyttYdw-ddvPOk,1048
 phoenix/trace/exporter.py,sha256=z3xrGJhIRh7XMy4Q1FkR3KmFZym-GX0XxLTZ6eSnN0Q,4347
@@ -167,8 +167,8 @@ phoenix/trace/v1/evaluation_pb2.pyi,sha256=cCbbx06gwQmaH14s3J1X25TtaARh-k1abbxQd
 phoenix/utilities/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 phoenix/utilities/error_handling.py,sha256=7b5rpGFj9EWZ8yrZK1IHvxB89suWk3lggDayUQcvZds,1946
 phoenix/utilities/logging.py,sha256=lDXd6EGaamBNcQxL4vP1au9-i_SXe0OraUDiJOcszSw,222
-arize_phoenix-2.4.1rc4.dist-info/METADATA,sha256=4ex6gs_0C1rsR_hqChGnoTXjsHj2092ltjx0TvqCV9A,26482
-arize_phoenix-2.4.1rc4.dist-info/WHEEL,sha256=9QBuHhg6FNW7lppboF2vKVbCGTVzsFykgRQjjlajrhA,87
-arize_phoenix-2.4.1rc4.dist-info/licenses/IP_NOTICE,sha256=JBqyyCYYxGDfzQ0TtsQgjts41IJoa-hiwDrBjCb9gHM,469
-arize_phoenix-2.4.1rc4.dist-info/licenses/LICENSE,sha256=HFkW9REuMOkvKRACuwLPT0hRydHb3zNg-fdFt94td18,3794
-arize_phoenix-2.4.1rc4.dist-info/RECORD,,
+arize_phoenix-2.4.1rc6.dist-info/METADATA,sha256=QIZlIFPN4oM5mMXyYkwIALOztVAI59q5eACLivAVnQw,26482
+arize_phoenix-2.4.1rc6.dist-info/WHEEL,sha256=9QBuHhg6FNW7lppboF2vKVbCGTVzsFykgRQjjlajrhA,87
+arize_phoenix-2.4.1rc6.dist-info/licenses/IP_NOTICE,sha256=JBqyyCYYxGDfzQ0TtsQgjts41IJoa-hiwDrBjCb9gHM,469
+arize_phoenix-2.4.1rc6.dist-info/licenses/LICENSE,sha256=HFkW9REuMOkvKRACuwLPT0hRydHb3zNg-fdFt94td18,3794
+arize_phoenix-2.4.1rc6.dist-info/RECORD,,

phoenix/server/app.py

@@ -4,7 +4,7 @@ from pathlib import Path
 from typing import Any, NamedTuple, Optional, Union
 
 from starlette.applications import Starlette
-from starlette.datastructures import QueryParams
+from starlette.datastructures import Headers, QueryParams
 from starlette.endpoints import HTTPEndpoint
 from starlette.exceptions import HTTPException
 from starlette.middleware import Middleware
@@ -35,8 +35,6 @@ logger = logging.getLogger(__name__)
 
 templates = Jinja2Templates(directory=SERVER_DIR / "templates")
 
-_databricks_basename_pattern = r"https://.*?\.com(/driver-proxy/o/\d+/\d+-\d+-\w+/\d+/)"
-
 
 class AppConfig(NamedTuple):
     has_corpus: bool
@@ -53,29 +51,22 @@ def _is_databricks(url: str) -> bool:
     return "databricks" in url
 
 
-def _get_databricks_basename(url: str) -> str:
-    match = re.search(_databricks_basename_pattern, url)
-    if match is None:
-        raise ValueError("Could not decipher the basename in Databricks URL")
-    return match.group(1)
-
-
 def _get_basename(request: Request) -> str:
     """
     Determine the basename for the API and static content.
     If the server is running in a hosted notebook, the base URL
     must be configured to point to the hosted notebook's proxy.
     """
-    url = str(request.url)
-    if _is_sagemaker(url):
+    if _is_sagemaker(str(request.url)):
         # Sagemaker sets up a proxy at /proxy/6006
         # NB: this is the only port that is open
         return "/proxy/6006"
-    if _is_databricks(url):
-        # For Databricks, the basename goes from /driver-proxy/ to the
-        # end of the URL where there is a port number
-        # For example: /driver-proxy/o/1018391329803962/0112-220452-osc8oiar/6007/
-        return _get_databricks_basename(url)
+    if _is_databricks(request.headers.get("referer", "")):
+        # NG: For Databricks, the request.url is the IP address,
+        # not the DNS address, so we must rely on the referer
+
+        # For Databricks, we set the root_path to the basename
+        return request.scope.get("root_path", "")
     # URL is relative to / for colab and local
     return ""
 
@@ -107,9 +98,9 @@ class Static(StaticFiles):
                     "n_neighbors": self._app_config.n_neighbors,
                     "n_samples": self._app_config.n_samples,
                     "basename": _get_basename(request),
-                    "path": request.headers.get(":path:", ""),
-                    "authority": request.headers.get(":authority:", ""),
                     "request": request,
+                    "referer": request.headers.get("referer", ""),
+                    "root_path": request.scope.get("root_path", ""),
                 },
             )
         except Exception as e:

phoenix/server/templates/index.html

@@ -22,8 +22,9 @@
     <div id="root"></div>
     // Request Info:
     // URL: {{request.url}}
-    // Path: {{path}}
-    // authority: {{authority}}
+    // Base URL: {{request.base_url}}
+    // Headers: {{request.headers}}
+    // Referer: {{referer}}
     <script>(function() {
         Object.defineProperty(window, "Config", {
             // Place any server-side injected config here

phoenix/server/thread_server.py

@@ -2,7 +2,7 @@ import asyncio
 import logging
 from threading import Thread
 from time import sleep, time
-from typing import Generator
+from typing import Generator, Optional
 
 from starlette.applications import Starlette
 from uvicorn import Config, Server
@@ -27,6 +27,7 @@ class ThreadServer(Server):
         app: Starlette,
         host: str,
         port: int,
+        root_path: str,
     ) -> None:
         # Must use asyncio loop if nest_asyncio is applied
         # Otherwise the app crashes when the server is run in a thread
@@ -35,6 +36,7 @@ class ThreadServer(Server):
             app=app,
             host=host,
             port=port,
+            root_path=root_path,
             # TODO: save logs to file
             log_level=logging.ERROR,
             loop=loop,

phoenix/services.py

@@ -110,6 +110,7 @@ class AppService(Service):
         export_path: Path,
         host: str,
         port: int,
+        root_path: str,
         primary_dataset_name: str,
         umap_params: str,
         reference_dataset_name: Optional[str],
@@ -119,6 +120,7 @@ class AppService(Service):
         self.export_path = export_path
         self.host = host
         self.port = port
+        self.root_path = root_path  # TODO(mikeldking): Add support for root_path
         self.__primary_dataset_name = primary_dataset_name
         self.__umap_params = umap_params
         self.__reference_dataset_name = reference_dataset_name

phoenix/session/session.py

@@ -13,6 +13,7 @@ from typing import (
     Iterable,
     List,
     Mapping,
+    NamedTuple,
     Optional,
     Set,
     Union,
@@ -96,6 +97,7 @@ class Session(ABC):
         default_umap_parameters: Optional[Mapping[str, Any]] = None,
         host: Optional[str] = None,
         port: Optional[int] = None,
+        root_path: Optional[str] = None,
         notebook_env: Optional[NotebookEnvironment] = None,
     ):
         self.primary_dataset = primary_dataset
@@ -125,6 +127,7 @@ class Session(ABC):
 
         self.host = host or get_env_host()
         self.port = port or get_env_port()
+        self.root_path = root_path or ""
         self.temp_dir = TemporaryDirectory()
         self.export_path = Path(self.temp_dir.name) / "exports"
         self.export_path.mkdir(parents=True, exist_ok=True)
@@ -225,6 +228,7 @@ class ProcessSession(Session):
         default_umap_parameters: Optional[Mapping[str, Any]] = None,
         host: Optional[str] = None,
         port: Optional[int] = None,
+        root_path: Optional[str] = None,
         notebook_env: Optional[NotebookEnvironment] = None,
     ) -> None:
         super().__init__(
@@ -235,6 +239,7 @@ class ProcessSession(Session):
             default_umap_parameters=default_umap_parameters,
             host=host,
             port=port,
+            root_path=root_path,
             notebook_env=notebook_env,
         )
         primary_dataset.to_disc()
@@ -254,6 +259,7 @@ class ProcessSession(Session):
             self.export_path,
             self.host,
             self.port,
+            self.root_path,
             self.primary_dataset.name,
             umap_params_str,
             reference_dataset_name=(
@@ -286,6 +292,7 @@ class ThreadSession(Session):
         default_umap_parameters: Optional[Mapping[str, Any]] = None,
         host: Optional[str] = None,
         port: Optional[int] = None,
+        root_path: Optional[str] = None,
         notebook_env: Optional[NotebookEnvironment] = None,
     ):
         super().__init__(
@@ -296,6 +303,7 @@ class ThreadSession(Session):
             default_umap_parameters=default_umap_parameters,
             host=host,
             port=port,
+            root_path=root_path,
             notebook_env=notebook_env,
         )
         # Initialize an app service that keeps the server running
@@ -311,6 +319,7 @@ class ThreadSession(Session):
             app=self.app,
             host=self.host,
             port=self.port,
+            root_path=self.root_path,
         ).run_in_thread()
         # start the server
         self.server_thread = next(self.server)
@@ -401,6 +410,7 @@ def launch_app(
 
     host = host or get_env_host()
     port = port or get_env_port()
+    root_path = _get_root_path(nb_env, port)
 
     if run_in_thread:
         _session = ThreadSession(
@@ -411,6 +421,7 @@ def launch_app(
             default_umap_parameters,
             host=host,
             port=port,
+            root_path=root_path,
             notebook_env=nb_env,
         )
         # TODO: catch exceptions from thread
@@ -471,7 +482,8 @@ def _get_url(host: str, port: int, notebook_env: NotebookEnvironment) -> str:
         # NB: Sagemaker notebooks only work with port 6006 - which is used by tensorboard
         return f"{_get_sagemaker_notebook_base_url()}/proxy/{port}/"
     if notebook_env == NotebookEnvironment.DATABRICKS:
-        return f"{_get_databricks_notebook_base_url()}/{port}/"
+        context = _get_databricks_context()
+        return f"{_get_databricks_notebook_base_url(context)}/{port}/"
     return f"http://{host}:{port}/"
 
 
@@ -552,9 +564,26 @@ def _get_sagemaker_notebook_base_url() -> str:
     return f"https://{notebook_instance_name}.notebook.{region}.sagemaker.aws"
 
 
-def _get_databricks_notebook_base_url() -> str:
+def _get_root_path(environment: Optional[NotebookEnvironment], port: int) -> str:
     """
-    Returns base url of the databricks notebook by parsing the tags
+    Returns the base path for the app if the app is running behind a proxy
+    """
+    if environment == NotebookEnvironment.DATABRICKS:
+        context = _get_databricks_context()
+        return f"/driver-proxy/o/{context.org_id}/{context.cluster_id}/{port}/"
+    return ""
+
+
+class DatabricksContext(NamedTuple):
+    host: str
+    org_id: str
+    cluster_id: str
+
+
+def _get_databricks_context() -> DatabricksContext:
+    """
+    Returns the databricks context for constructing the base url
+    and the base_path for the app
     """
     import IPython
 
@@ -563,7 +592,16 @@ def _get_databricks_notebook_base_url() -> str:
     notebook_context = json.loads(
         dbutils.entry_point.getDbutils().notebook().getContext().toJson()
     )["tags"]
-    host = notebook_context["browserHostName"]
-    org_id = notebook_context["orgId"]
-    cluster_id = notebook_context["clusterId"]
-    return f"https://{host}/driver-proxy/o/{org_id}/{cluster_id}"
+
+    return DatabricksContext(
+        host=notebook_context["browserHostName"],
+        org_id=notebook_context["orgId"],
+        cluster_id=notebook_context["clusterId"],
+    )
+
+
+def _get_databricks_notebook_base_url(context: DatabricksContext) -> str:
+    """
+    Returns base url of the databricks notebook by parsing the tags
+    """
+    return f"https://{context.host}/driver-proxy/o/{context.org_id}/{context.cluster_id}/"

phoenix/version.py

@@ -1 +1 @@
-__version__ = "2.4.1rc4"
+__version__ = "2.4.1rc6"