phlo-api 0.3.0__tar.gz → 0.4.0__tar.gz

{phlo_api-0.3.0 → phlo_api-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: phlo-api
-Version: 0.3.0
+Version: 0.4.0
 Summary: Phlo API - Backend service exposing Phlo internals to Observatory
 Author-email: Phlo Team <team@phlo.dev>
 License: MIT

{phlo_api-0.3.0 → phlo_api-0.4.0}/pyproject.toml

@@ -19,7 +19,7 @@ dependencies = [
 description = "Phlo API - Backend service exposing Phlo internals to Observatory"
 name = "phlo-api"
 requires-python = ">=3.11"
-version = "0.3.0"
+version = "0.4.0"
 
 [[project.authors]]
 email = "team@phlo.dev"

phlo_api-0.4.0/src/phlo_api/Dockerfile

@@ -0,0 +1,21 @@
+FROM python:3.11-slim
+
+WORKDIR /app
+
+# Install the same PyPI package versions that generated this stack. Source
+# checkouts still copy the local phlo_api package below, but PyPI installs only
+# have this package directory as Docker build context.
+ARG PHLO_VERSION=
+ARG PHLO_API_VERSION=
+RUN set -eux; \
+    if [ -n "$PHLO_VERSION" ]; then pip install --no-cache-dir "phlo==$PHLO_VERSION"; else pip install --no-cache-dir phlo; fi; \
+    if [ -n "$PHLO_API_VERSION" ]; then pip install --no-cache-dir "phlo-api==$PHLO_API_VERSION"; else pip install --no-cache-dir phlo-api; fi
+
+# Copy the API package so `phlo_api.main` is importable.
+COPY . /app/phlo_api
+
+ENV PYTHONPATH=/app
+
+EXPOSE 4000
+
+CMD ["python", "-m", "uvicorn", "phlo_api.main:app", "--host", "0.0.0.0", "--port", "4000"]

{phlo_api-0.3.0 → phlo_api-0.4.0}/src/phlo_api/main.py

@@ -50,6 +50,7 @@ require_regulated_validation(runtime=app)
 _cors_origins_raw = os.environ.get(
     "PHLO_API_CORS_ORIGINS",
     "http://localhost:3000,http://127.0.0.1:3000,"
+    "http://localhost:3001,http://127.0.0.1:3001,"
     "http://localhost:3005,http://127.0.0.1:3005,"
     "http://localhost:4000,http://127.0.0.1:4000",
 )

{phlo_api-0.3.0 → phlo_api-0.4.0}/src/phlo_api/observatory_api/dagster.py

@@ -31,7 +31,6 @@ Example:
 
 from __future__ import annotations
 
-import os
 import time
 from datetime import datetime
 from typing import Any
@@ -40,6 +39,8 @@ import httpx
 from fastapi import APIRouter, Query
 from pydantic import BaseModel
 
+from phlo.config.env import project_env_value
+from phlo.config.network import resolve_url
 from phlo.logging import get_bound_correlation_context, get_logger
 from phlo.security.service_identity import build_service_headers
 from phlo_api.observatory_api.quality import fetch_quality_snapshot
@@ -64,12 +65,12 @@ def resolve_dagster_url(override: str | None = None) -> str:
         None: No exceptions raised directly.
 
     """
-    env_url = os.environ.get("DAGSTER_GRAPHQL_URL")
+    env_url = project_env_value("DAGSTER_GRAPHQL_URL")
     if override and override.strip():
         if env_url and override.strip() == "http://localhost:3000/graphql":
-            return env_url
-        return override
-    return env_url or DEFAULT_DAGSTER_URL
+            return resolve_url(env_url, port_env_var="DAGSTER_PORT")
+        return resolve_url(override, port_env_var="DAGSTER_PORT")
+    return resolve_url(env_url or DEFAULT_DAGSTER_URL, port_env_var="DAGSTER_PORT")
 
 
 # --- GraphQL Queries ---

{phlo_api-0.3.0 → phlo_api-0.4.0}/src/phlo_api/observatory_api/loki.py

@@ -29,7 +29,6 @@ Example:
 from __future__ import annotations
 
 import json
-import os
 from datetime import datetime, timedelta
 from typing import Any, Literal
 
@@ -37,6 +36,8 @@ import httpx
 from fastapi import APIRouter, Query
 from pydantic import BaseModel
 
+from phlo.config.env import project_env_value
+from phlo.config.network import resolve_url
 from phlo.logging import get_logger
 
 logger = get_logger(__name__)
@@ -59,8 +60,11 @@ def resolve_loki_url(override: str | None = None) -> str:
 
     """
     if override and override.strip():
-        return override
-    return os.environ.get("LOKI_URL", DEFAULT_LOKI_URL)
+        return resolve_url(override, port_env_var="LOKI_PORT")
+    return resolve_url(
+        project_env_value("LOKI_URL", DEFAULT_LOKI_URL) or DEFAULT_LOKI_URL,
+        port_env_var="LOKI_PORT",
+    )
 
 
 # --- Pydantic Models ---

{phlo_api-0.3.0 → phlo_api-0.4.0}/src/phlo_api/observatory_api/nessie.py

@@ -33,7 +33,6 @@ Example:
 
 from __future__ import annotations
 
-import os
 from typing import Any, Literal
 from urllib.parse import quote
 
@@ -41,6 +40,8 @@ import httpx
 from fastapi import APIRouter, Query
 from pydantic import BaseModel
 
+from phlo.config.env import project_env_value
+from phlo.config.network import resolve_url
 from phlo.logging import get_logger
 
 logger = get_logger(__name__)
@@ -60,12 +61,12 @@ def resolve_nessie_url(override: str | None = None) -> str:
         Nessie URL from override, environment, or default.
 
     """
-    env_url = os.environ.get("NESSIE_URL")
+    env_url = project_env_value("NESSIE_URL")
     if override and override.strip():
         if env_url and override.strip() == "http://localhost:19120/api/v2":
-            return env_url
-        return override
-    return env_url or DEFAULT_NESSIE_URL
+            return resolve_url(env_url, port_env_var="NESSIE_PORT")
+        return resolve_url(override, port_env_var="NESSIE_PORT")
+    return resolve_url(env_url or DEFAULT_NESSIE_URL, port_env_var="NESSIE_PORT")
 
 
 # --- Pydantic Models ---

{phlo_api-0.3.0 → phlo_api-0.4.0}/src/phlo_api/observatory_api/quality.py

@@ -28,7 +28,6 @@ Example:
 from __future__ import annotations
 
 import json
-import os
 from datetime import datetime, timezone
 from typing import Any, Literal
 
@@ -36,6 +35,8 @@ import httpx
 from fastapi import APIRouter, Query
 from pydantic import BaseModel
 
+from phlo.config.env import project_env_value
+from phlo.config.network import resolve_url
 from phlo.logging import get_logger
 
 logger = get_logger(__name__)
@@ -56,8 +57,11 @@ def resolve_dagster_url(override: str | None = None) -> str:
 
     """
     if override and override.strip():
-        return override
-    return os.environ.get("DAGSTER_GRAPHQL_URL", DEFAULT_DAGSTER_URL)
+        return resolve_url(override, port_env_var="DAGSTER_PORT")
+    return resolve_url(
+        project_env_value("DAGSTER_GRAPHQL_URL", DEFAULT_DAGSTER_URL) or DEFAULT_DAGSTER_URL,
+        port_env_var="DAGSTER_PORT",
+    )
 
 
 # --- GraphQL Queries ---

{phlo_api-0.3.0 → phlo_api-0.4.0}/src/phlo_api/observatory_api/trino.py

@@ -45,6 +45,8 @@ from pydantic import BaseModel, Field
 
 from phlo.capabilities import resolve_capability
 from phlo.capabilities.discovery import discover_capabilities
+from phlo.config.env import project_env_value
+from phlo.config.network import resolve_url
 from phlo.logging import get_bound_correlation_context, get_logger
 from phlo_api.api.authorization import check_dataset_query, check_dataset_read
 from phlo_api.observatory_api.trino_sql import (
@@ -107,7 +109,7 @@ def _resolve_query_engine() -> Any | None:
     discover_capabilities()
     return resolve_capability(
         "query_engine",
-        os.environ.get(_DEFAULT_QUERY_ENGINE_ENV) or _DEFAULT_TRINO_CAPABILITY_NAME,
+        project_env_value(_DEFAULT_QUERY_ENGINE_ENV) or _DEFAULT_TRINO_CAPABILITY_NAME,
     )
 
 
@@ -124,18 +126,18 @@ def resolve_trino_url(override: str | None = None) -> str:
         RuntimeError: If no query-engine URL is configured.
 
     """
-    env_url = os.environ.get(_QUERY_ENGINE_URL_ENV) or os.environ.get("TRINO_URL")
+    env_url = project_env_value(_QUERY_ENGINE_URL_ENV) or project_env_value("TRINO_URL")
     if override and override.strip():
-        return override
+        return resolve_url(override, port_env_var="TRINO_PORT")
     if env_url:
-        return env_url
+        return resolve_url(env_url, port_env_var="TRINO_PORT")
 
     resolution = _resolve_query_engine()
     if resolution is not None:
         for key in ("url", "http_url", "endpoint"):
             value = resolution.metadata.get(key)
             if isinstance(value, str) and value:
-                return value
+                return resolve_url(value, port_env_var="TRINO_PORT")
 
         host = resolution.metadata.get("host")
         port = resolution.metadata.get("port")
@@ -143,7 +145,7 @@ def resolve_trino_url(override: str | None = None) -> str:
             resolution.metadata.get("scheme") or resolution.metadata.get("http_scheme") or "http"
         )
         if isinstance(host, str) and host and port is not None:
-            return f"{scheme}://{host}:{port}"
+            return resolve_url(f"{scheme}://{host}:{port}", port_env_var="TRINO_PORT")
 
     raise RuntimeError(
         "No query-engine URL is configured. Set PHLO_QUERY_ENGINE_URL or TRINO_URL, "
@@ -164,7 +166,7 @@ def resolve_default_catalog() -> str:
         RuntimeError: If no default catalog is configured.
 
     """
-    env_catalog = os.environ.get("PHLO_QUERY_CATALOG") or os.environ.get("TRINO_CATALOG")
+    env_catalog = project_env_value("PHLO_QUERY_CATALOG") or project_env_value("TRINO_CATALOG")
     if env_catalog:
         return env_catalog
 
@@ -193,7 +195,7 @@ def resolve_default_ref() -> str:
         RuntimeError: If no default ref is configured.
 
     """
-    env_ref = os.environ.get("PHLO_DEFAULT_REF") or os.environ.get("NESSIE_DEFAULT_REF")
+    env_ref = project_env_value("PHLO_DEFAULT_REF") or project_env_value("NESSIE_DEFAULT_REF")
     if env_ref:
         return env_ref
 
@@ -229,7 +231,7 @@ def resolve_table_discovery_schemas(
     if preferred_schema and preferred_schema.strip():
         return [preferred_schema.strip()]
 
-    env_schemas = os.environ.get(_DISCOVERY_SCHEMAS_ENV)
+    env_schemas = project_env_value(_DISCOVERY_SCHEMAS_ENV)
     if env_schemas:
         schemas = [schema.strip() for schema in env_schemas.split(",") if schema.strip()]
         if schemas: