arize-phoenix 8.0.1__tar.gz → 8.1.0__tar.gz

{arize_phoenix-8.0.1 → arize_phoenix-8.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: arize-phoenix
-Version: 8.0.1
+Version: 8.1.0
 Summary: AI Observability and Evaluation
 Project-URL: Documentation, https://docs.arize.com/phoenix/
 Project-URL: Issues, https://github.com/Arize-ai/phoenix/issues
@@ -30,7 +30,6 @@ Requires-Dist: grpc-interceptor
 Requires-Dist: grpcio
 Requires-Dist: httpx
 Requires-Dist: jinja2
-Requires-Dist: jsonschema<=4.23.0,>=4.0.0
 Requires-Dist: numpy!=2.0.0
 Requires-Dist: openinference-instrumentation>=0.1.12
 Requires-Dist: openinference-semantic-conventions>=0.1.12

{arize_phoenix-8.0.1 → arize_phoenix-8.1.0}/pyproject.toml

@@ -58,7 +58,6 @@ dependencies = [
   "pydantic>=2.1.0", # exclude 2.0.* since it does not support the `json_encoders` configuration setting
   "authlib",
   "websockets",
-  "jsonschema>=4.0.0,<=4.23.0", # the upper bound is to keep us off the bleeding edge in case there's a regression since this controls what gets written to the database
   "arize-phoenix-client",
 ]
 dynamic = ["version"]

{arize_phoenix-8.0.1 → arize_phoenix-8.1.0}/src/phoenix/config.py

@@ -8,7 +8,7 @@ from enum import Enum
 from importlib.metadata import version
 from pathlib import Path
 from typing import Optional, cast, overload
-from urllib.parse import urlparse
+from urllib.parse import quote_plus, urlparse
 
 from phoenix.utilities.logging import log_a_list
 
@@ -624,11 +624,37 @@ def get_env_project_name() -> str:
 
 
 def get_env_database_connection_str() -> str:
-    env_url = getenv(ENV_PHOENIX_SQL_DATABASE_URL)
-    if env_url is None:
-        working_dir = get_working_dir()
-        return f"sqlite:///{working_dir}/phoenix.db"
-    return env_url
+    if phoenix_url := os.getenv(ENV_PHOENIX_SQL_DATABASE_URL):
+        return phoenix_url
+
+    if postgres_url := get_env_postgres_connection_str():
+        return postgres_url
+
+    working_dir = get_working_dir()
+    return f"sqlite:///{working_dir}/phoenix.db"
+
+
+def get_env_postgres_connection_str() -> Optional[str]:
+    pg_user = os.getenv("PHOENIX_POSTGRES_USER")
+    pg_password = os.getenv("PHOENIX_POSTGRES_PASSWORD")
+    pg_host = os.getenv("PHOENIX_POSTGRES_HOST")
+    pg_port = os.getenv("PHOENIX_POSTGRES_PORT")
+    pg_db = os.getenv("PHOENIX_POSTGRES_DB")
+
+    if pg_host and ":" in pg_host:
+        pg_host, parsed_port = pg_host.split(":")
+        pg_port = pg_port or parsed_port  # use the explicitly set port if provided
+
+    if pg_host and pg_user and pg_password:
+        encoded_password = quote_plus(pg_password)
+        connection_str = f"postgresql://{pg_user}:{encoded_password}@{pg_host}"
+        if pg_port:
+            connection_str = f"{connection_str}:{pg_port}"
+        if pg_db:
+            connection_str = f"{connection_str}/{pg_db}"
+
+        return connection_str
+    return None
 
 
 def get_env_database_schema() -> Optional[str]:

arize_phoenix-8.1.0/src/phoenix/version.py

@@ -0,0 +1 @@
+__version__ = "8.1.0"

arize_phoenix-8.0.1/src/phoenix/server/api/helpers/jsonschema.py

@@ -1,135 +0,0 @@
-from typing import Annotated, Any, Literal, Union
-
-from jsonschema import Draft7Validator, ValidationError
-from pydantic import AfterValidator, BaseModel, Field
-from typing_extensions import TypeAlias
-
-# This meta-schema describes valid JSON schemas according to the JSON Schema Draft 7 specification.
-# It is copied from https://json-schema.org/draft-07/schema#
-JSON_SCHEMA_DRAFT_7_META_SCHEMA = {
-    "$schema": "http://json-schema.org/draft-07/schema#",
-    "$id": "http://json-schema.org/draft-07/schema#",
-    "title": "Core schema meta-schema",
-    "definitions": {
-        "schemaArray": {"type": "array", "minItems": 1, "items": {"$ref": "#"}},
-        "nonNegativeInteger": {"type": "integer", "minimum": 0},
-        "nonNegativeIntegerDefault0": {
-            "allOf": [{"$ref": "#/definitions/nonNegativeInteger"}, {"default": 0}]
-        },
-        "simpleTypes": {
-            "enum": ["array", "boolean", "integer", "null", "number", "object", "string"]
-        },
-        "stringArray": {
-            "type": "array",
-            "items": {"type": "string"},
-            "uniqueItems": True,
-            "default": [],
-        },
-    },
-    "type": ["object", "boolean"],
-    "properties": {
-        "$id": {"type": "string", "format": "uri-reference"},
-        "$schema": {"type": "string", "format": "uri"},
-        "$ref": {"type": "string", "format": "uri-reference"},
-        "$comment": {"type": "string"},
-        "title": {"type": "string"},
-        "description": {"type": "string"},
-        "default": True,
-        "readOnly": {"type": "boolean", "default": False},
-        "writeOnly": {"type": "boolean", "default": False},
-        "examples": {"type": "array", "items": True},
-        "multipleOf": {"type": "number", "exclusiveMinimum": 0},
-        "maximum": {"type": "number"},
-        "exclusiveMaximum": {"type": "number"},
-        "minimum": {"type": "number"},
-        "exclusiveMinimum": {"type": "number"},
-        "maxLength": {"$ref": "#/definitions/nonNegativeInteger"},
-        "minLength": {"$ref": "#/definitions/nonNegativeIntegerDefault0"},
-        "pattern": {"type": "string", "format": "regex"},
-        "additionalItems": {"$ref": "#"},
-        "items": {"anyOf": [{"$ref": "#"}, {"$ref": "#/definitions/schemaArray"}], "default": True},
-        "maxItems": {"$ref": "#/definitions/nonNegativeInteger"},
-        "minItems": {"$ref": "#/definitions/nonNegativeIntegerDefault0"},
-        "uniqueItems": {"type": "boolean", "default": False},
-        "contains": {"$ref": "#"},
-        "maxProperties": {"$ref": "#/definitions/nonNegativeInteger"},
-        "minProperties": {"$ref": "#/definitions/nonNegativeIntegerDefault0"},
-        "required": {"$ref": "#/definitions/stringArray"},
-        "additionalProperties": {"$ref": "#"},
-        "definitions": {"type": "object", "additionalProperties": {"$ref": "#"}, "default": {}},
-        "properties": {"type": "object", "additionalProperties": {"$ref": "#"}, "default": {}},
-        "patternProperties": {
-            "type": "object",
-            "additionalProperties": {"$ref": "#"},
-            "propertyNames": {"format": "regex"},
-            "default": {},
-        },
-        "dependencies": {
-            "type": "object",
-            "additionalProperties": {
-                "anyOf": [{"$ref": "#"}, {"$ref": "#/definitions/stringArray"}]
-            },
-        },
-        "propertyNames": {"$ref": "#"},
-        "const": True,
-        "enum": {"type": "array", "items": True, "minItems": 1, "uniqueItems": True},
-        "type": {
-            "anyOf": [
-                {"$ref": "#/definitions/simpleTypes"},
-                {
-                    "type": "array",
-                    "items": {"$ref": "#/definitions/simpleTypes"},
-                    "minItems": 1,
-                    "uniqueItems": True,
-                },
-            ]
-        },
-        "format": {"type": "string"},
-        "contentMediaType": {"type": "string"},
-        "contentEncoding": {"type": "string"},
-        "if": {"$ref": "#"},
-        "then": {"$ref": "#"},
-        "else": {"$ref": "#"},
-        "allOf": {"$ref": "#/definitions/schemaArray"},
-        "anyOf": {"$ref": "#/definitions/schemaArray"},
-        "oneOf": {"$ref": "#/definitions/schemaArray"},
-        "not": {"$ref": "#"},
-    },
-    "default": True,
-}
-Draft7Validator.check_schema(JSON_SCHEMA_DRAFT_7_META_SCHEMA)  # ensure the schema is valid
-JSON_SCHEMA_DRAFT_7_VALIDATOR = Draft7Validator(JSON_SCHEMA_DRAFT_7_META_SCHEMA)
-
-
-def validate_json_schema_draft_7_object(schema: dict[str, Any]) -> dict[str, Any]:
-    """
-    Validates that a dictionary is a valid JSON schema according to the JSON
-    Schema Draft 7 specification.
-    """
-    try:
-        JSON_SCHEMA_DRAFT_7_VALIDATOR.validate(schema)
-    except ValidationError as error:
-        raise ValueError(str(error))
-    if schema.get("type") != "object":
-        raise ValueError("The 'type' property must be 'object'")
-    return schema
-
-
-JSONSchemaDraft7ObjectSchemaContent: TypeAlias = Annotated[
-    dict[str, Any],
-    AfterValidator(validate_json_schema_draft_7_object),
-]
-
-
-class JSONSchemaDraft7ObjectSchema(BaseModel):
-    type: Literal["json-schema-draft-7-object-schema"]
-    json_: JSONSchemaDraft7ObjectSchemaContent = Field(
-        ...,
-        alias="json",  # avoid conflict with pydantic json method
-    )
-
-
-JSONSchemaObjectSchema: TypeAlias = Annotated[
-    Union[JSONSchemaDraft7ObjectSchema],
-    Field(discriminator="type"),
-]

arize_phoenix-8.0.1/src/phoenix/version.py

@@ -1 +0,0 @@
-__version__ = "8.0.1"