Skip to content

refactor: replace install-common.sh with declarative artifact system #473

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mergify merged 21 commits into from
Jul 7, 2026
Merged

refactor: replace install-common.sh with declarative artifact system #473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
39599b6
refactor: replace install-common.sh with declarative artifact system
eoinfennessy Jun 30, 2026
29cadd3
fix: place HF cache under APP_ROOT and export HF_HOME
eoinfennessy Jun 30, 2026
f5b3ca3
fix: add path traversal validation and pin script dependencies
eoinfennessy Jun 30, 2026
f6ed9d2
fix: derive tiktoken cache key from URL instead of hardcoding
eoinfennessy Jun 30, 2026
fc46665
fix: swap opencv-python for headless variant via post-install step
eoinfennessy Jul 1, 2026
e57ab0f
fix: pin opencv-python-headless to the resolved opencv-python version
eoinfennessy Jul 1, 2026
5e922b5
refactor: use artifact filenames as destination paths to simplify cop…
eoinfennessy Jul 1, 2026
091f69b
fix: remove unnecessary chown/chmod on read-only docling models dir
eoinfennessy Jul 1, 2026
e7825d4
fix: remove vestigial .ogx mkdir from copy-artifacts.sh
eoinfennessy Jul 1, 2026
21f0b48
Merge branch 'main' into unify-install-scripts
mergify[bot] Jul 2, 2026
2927762
Merge branch 'main' into unify-install-scripts
mergify[bot] Jul 2, 2026
ecc5cc4
Merge branch 'main' into unify-install-scripts
mergify[bot] Jul 2, 2026
6133b80
Merge branch 'main' into unify-install-scripts
mergify[bot] Jul 2, 2026
5338b47
Merge branch 'main' into unify-install-scripts
mergify[bot] Jul 3, 2026
2384d33
Merge branch 'main' into unify-install-scripts
mergify[bot] Jul 6, 2026
7ddebde
Merge branch 'main' into unify-install-scripts
mergify[bot] Jul 6, 2026
8a09237
Merge branch 'main' into unify-install-scripts
mergify[bot] Jul 6, 2026
df90b8c
Merge branch 'main' into unify-install-scripts
mergify[bot] Jul 6, 2026
b19cf51
increase download timeout to 3 minutes
eoinfennessy Jul 7, 2026
406c25a
ensure OPENCV_VERSION variable is set after extraction
eoinfennessy Jul 7, 2026
eecbac6
cache artifact downloads across container builds
eoinfennessy Jul 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions Containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,24 @@ ENV UV_INDEX_STRATEGY=unsafe-best-match

COPY distribution/constraints.txt ${APP_ROOT}/constraints.txt
COPY distribution/requirements.txt ${APP_ROOT}/requirements.txt
RUN uv pip install --constraint ${APP_ROOT}/constraints.txt -r ${APP_ROOT}/requirements.txt

COPY --chmod=755 distribution/install-common.sh ${APP_ROOT}/install-common.sh
# Package docling transitively pulls in opencv-python via rapidocr.
# opencv-python requires libGL.so.1 (absent in UBI). Swap it for the headless
# variant after install, pinned to the exact version the resolver chose.
RUN uv pip install --constraint ${APP_ROOT}/constraints.txt -r ${APP_ROOT}/requirements.txt \
&& OPENCV_VERSION=$(uv pip show opencv-python 2>/dev/null | awk '/^Version:/{print $2}') \
&& [ -n "${OPENCV_VERSION}" ] || { echo "ERROR: opencv-python not found after install"; exit 1; } \
&& uv pip uninstall opencv-python \
&& uv pip install --constraint ${APP_ROOT}/constraints.txt "opencv-python-headless==${OPENCV_VERSION}"
Comment thread
eoinfennessy marked this conversation as resolved.

COPY distribution/fetch_artifacts.py ${APP_ROOT}/fetch_artifacts.py
COPY --chmod=755 distribution/copy-artifacts.sh ${APP_ROOT}/copy-artifacts.sh
COPY distribution/artifacts.lock.yaml ${APP_ROOT}/artifacts.lock.yaml
RUN --mount=type=cache,target=/var/cache/artifacts,uid=1001,gid=0 \
uv run ${APP_ROOT}/fetch_artifacts.py ${APP_ROOT}/artifacts.lock.yaml /var/cache/artifacts \
&& ${APP_ROOT}/copy-artifacts.sh /var/cache/artifacts
ENV DOCLING_ARTIFACTS_PATH="${APP_ROOT}/.cache/docling/models"
RUN ${APP_ROOT}/install-common.sh
ENV HF_HOME="${APP_ROOT}/.cache/huggingface"
ENV TIKTOKEN_CACHE_DIR="${APP_ROOT}/.cache/tiktoken"

LABEL com.ogx.config.config.yaml="# This file is automatically generated from build.yaml
# by build/build.py - do not edit manually.
#
# Stripped provider types (dependency only - available via custom config.yaml):
#   - inline::docling
#   - inline::faiss
#   - inline::markitdown
#   - inline::milvus
#   - inline::pypdf
#   - inline::sentence-transformers
#   - remote::docling-serve
version: 2
image_name: rh
apis:
  - responses
  - messages
  - batches
  - inference
  - tool_runtime
  - vector_io
  - files
  - file_processors
providers:
  inference:
    - provider_id: ${env.VLLM_URL:+vllm-inference}
      provider_type: remote::vllm
      config:
        base_url: ${env.VLLM_URL:=}
        max_tokens: ${env.VLLM_MAX_TOKENS:=4096}
        api_token: ${env.VLLM_API_TOKEN:=fake}
        tls_verify: ${env.VLLM_TLS_VERIFY:=true}
        refresh_models: ${env.VLLM_REFRESH_MODELS:=false}
    - provider_id: ${env.VLLM_EMBEDDING_URL:+vllm-embedding}
      provider_type: remote::vllm
      config:
        base_url: ${env.VLLM_EMBEDDING_URL:=}
        max_tokens: ${env.VLLM_EMBEDDING_MAX_TOKENS:=4096}
        api_token: ${env.VLLM_EMBEDDING_API_TOKEN:=fake}
        tls_verify: ${env.VLLM_EMBEDDING_TLS_VERIFY:=true}
        refresh_models: ${env.VLLM_EMBEDDING_REFRESH_MODELS:=false}
    - provider_id: ${env.ENABLE_BEDROCK:+bedrock}
      provider_type: remote::bedrock
      config:
        aws_bedrock_bearer_token: ${env.AWS_BEDROCK_BEARER_TOKEN:=}
        region_name: ${env.AWS_DEFAULT_REGION:=us-east-2}
        aws_role_arn: ${env.AWS_ROLE_ARN:=}
        aws_web_identity_token_file: ${env.AWS_WEB_IDENTITY_TOKEN_FILE:=}
    - provider_id: ${env.WATSONX_API_KEY:+watsonx}
      provider_type: remote::watsonx
      config:
        base_url: ${env.WATSONX_BASE_URL:=https://us-south.ml.cloud.ibm.com}
        api_key: ${env.WATSONX_API_KEY:=}
        project_id: ${env.WATSONX_PROJECT_ID:=}
    - provider_id: ${env.AZURE_API_KEY:+azure}
      provider_type: remote::azure
      config:
        api_key: ${env.AZURE_API_KEY:=}
        api_base: ${env.AZURE_API_BASE:=}
        api_version: ${env.AZURE_API_VERSION:=}
        api_type: ${env.AZURE_API_TYPE:=}
    - provider_id: ${env.VERTEX_AI_PROJECT:+vertexai}
      provider_type: remote::vertexai
      config:
        project: ${env.VERTEX_AI_PROJECT:=}
        location: ${env.VERTEX_AI_LOCATION:=global}
    - provider_id: ${env.OPENAI_API_KEY:+openai}
      provider_type: remote::openai
      config:
        api_key: ${env.OPENAI_API_KEY:=}
        base_url: ${env.OPENAI_BASE_URL:=https://api.openai.com/v1}
    - provider_id: ${env.ENABLE_GEMINI:+gemini}
      provider_type: remote::gemini
      config:
        api_key: ${env.GEMINI_API_KEY:=}
        access_token: ${env.GEMINI_ACCESS_TOKEN:=}
        project: ${env.GEMINI_AI_PROJECT:=}
    - provider_id: ${env.ANTHROPIC_API_KEY:+anthropic}
      provider_type: remote::anthropic
      config:
        api_key: ${env.ANTHROPIC_API_KEY:=}
  vector_io:
    - provider_id: ${env.MILVUS_ENDPOINT:+milvus-remote}
      provider_type: remote::milvus
      config:
        uri: ${env.MILVUS_ENDPOINT:=}
        token: ${env.MILVUS_TOKEN:=}
        secure: ${env.MILVUS_SECURE:=}
        consistency_level: ${env.MILVUS_CONSISTENCY_LEVEL:=}
        ca_pem_path: ${env.MILVUS_CA_PEM_PATH:=}
        client_pem_path: ${env.MILVUS_CLIENT_PEM_PATH:=}
        client_key_path: ${env.MILVUS_CLIENT_KEY_PATH:=}
        persistence:
          backend: kv_default
          namespace: vector_io::milvus_remote
    - provider_id: ${env.ENABLE_PGVECTOR:+pgvector}
      provider_type: remote::pgvector
      config:
        host: ${env.PGVECTOR_HOST:=localhost}
        port: ${env.PGVECTOR_PORT:=5432}
        db: ${env.PGVECTOR_DB:=}
        user: ${env.PGVECTOR_USER:=}
        password: ${env.PGVECTOR_PASSWORD:=}
        persistence:
          backend: kv_default
          namespace: vector_io::pgvector
    - provider_id: ${env.ENABLE_QDRANT:+qdrant-remote}
      provider_type: remote::qdrant
      config:
        location: ${env.QDRANT_LOCATION:=}
        url: ${env.QDRANT_URL:=}
        port: ${env.QDRANT_PORT:=6333}
        grpc_port: ${env.QDRANT_GRPC_PORT:=6334}
        prefer_grpc: ${env.QDRANT_PREFER_GRPC:=false}
        https: ${env.QDRANT_HTTPS:=}
        api_key: ${env.QDRANT_API_KEY:=}
        prefix: ${env.QDRANT_PREFIX:=}
        timeout: ${env.QDRANT_TIMEOUT:=}
        host: ${env.QDRANT_HOST:=}
        persistence:
          backend: kv_default
          namespace: vector_io::qdrant_remote
  responses:
    - provider_id: meta-reference
      provider_type: inline::builtin
      config:
        persistence:
          agent_state:
            backend: kv_default
            namespace: agents::meta_reference
          responses:
            backend: sql_default
            table_name: agents_responses
            max_write_queue_size: 10000
            num_writers: 4
  messages:
  # Implements the Anthropic Messages API (/v1/messages). Native passthrough for
  # providers that support it (e.g. vLLM); translates Anthropic <-> OpenAI Chat
  # Completions for all other providers. Depends on the inference API.
    - provider_id: builtin
      provider_type: inline::builtin
      config:
        kvstore:
          backend: kv_default
          namespace: message_batches
  tool_runtime:
  # NOTE: inline::file-search requires a 'files' provider at runtime
  # (currently inline::localfs). Do not add inline::localfs to
  # STRIPPED_PROVIDER_TYPES in build.py without also removing
  # inline::file-search here.
    - provider_id: brave-search
      provider_type: remote::brave-search
      config:
        api_key: ${env.BRAVE_SEARCH_API_KEY:=}
        max_results: 3
    - provider_id: tavily-search
      provider_type: remote::tavily-search
      config:
        api_key: ${env.TAVILY_SEARCH_API_KEY:=}
        max_results: 3
    - provider_id: file-search
      provider_type: inline::file-search
      config: {}
    - provider_id: model-context-protocol
      provider_type: remote::model-context-protocol
      config: {}
  files:
  # Required at runtime by inline::file-search (see tool_runtime above).
    - provider_id: meta-reference-files
      provider_type: inline::localfs
      config:
        storage_dir: /opt/app-root/src/.ogx/distributions/rh/files
        metadata_store:
          backend: sql_default
          table_name: files_metadata
    - provider_id: ${env.ENABLE_S3:+s3}
      provider_type: remote::s3
      config:
        bucket_name: ${env.S3_BUCKET_NAME:=}
        region: ${env.AWS_DEFAULT_REGION:=us-east-1}
        aws_access_key_id: ${env.AWS_ACCESS_KEY_ID:=}
        aws_secret_access_key: ${env.AWS_SECRET_ACCESS_KEY:=}
        endpoint_url: ${env.S3_ENDPOINT_URL:=}
        auto_create_bucket: ${env.S3_AUTO_CREATE_BUCKET:=false}
        metadata_store:
          backend: sql_default
          table_name: files_metadata
  file_processors:
    - provider_id: auto
      provider_type: inline::auto
      config: {}
  batches:
    - provider_id: reference
      provider_type: inline::reference
      config:
        sqlstore:
          table_name: batches
          backend: sql_default
storage:
  backends:
    kv_default:
      type: kv_postgres
      host: ${env.POSTGRES_HOST:=localhost}
      port: ${env.POSTGRES_PORT:=5432}
      db: ${env.POSTGRES_DB:=ogx}
      user: ${env.POSTGRES_USER:=ogx}
      password: ${env.POSTGRES_PASSWORD:=ogx}
      table_name: ${env.POSTGRES_TABLE_NAME:=ogx_kvstore}
    sql_default:
      type: sql_postgres
      host: ${env.POSTGRES_HOST:=localhost}
      port: ${env.POSTGRES_PORT:=5432}
      db: ${env.POSTGRES_DB:=ogx}
      user: ${env.POSTGRES_USER:=ogx}
      password: ${env.POSTGRES_PASSWORD:=ogx}
  stores:
    metadata:
      backend: kv_default
      namespace: registry
    inference:
      table_name: inference_store
      backend: sql_default
      max_write_queue_size: 10000
      num_writers: 4
    conversations:
      table_name: openai_conversations
      backend: sql_default
    prompts:
      namespace: prompts
      backend: kv_default
    connectors:
      table_name: connectors
      backend: sql_default
    vector_stores:
      backend: sql_default
      table_name: vector_store_metadata
registered_resources:
  models:
    - metadata:
        embedding_dimension: ${env.EMBEDDING_DIMENSION:=768}
      model_id: ${env.EMBEDDING_MODEL:=}
      provider_id: ${env.EMBEDDING_PROVIDER:=vllm-embedding}
      provider_model_id: ${env.EMBEDDING_PROVIDER_MODEL_ID:=ibm-granite/granite-embedding-125m-english}
      model_type: embedding
  vector_dbs: []
  tool_groups:
    - toolgroup_id: builtin::websearch
      provider_id: tavily-search
    - toolgroup_id: builtin::rag
      provider_id: file-search
vector_stores:
  annotation_prompt_params:
    enable_annotations: true
    annotation_instruction_template: "Cite sources immediately at the end of sentences using <|file-id|> format."
telemetry:
  enabled: true
server:
  port: 8321
  registry_refresh_interval_seconds: ${env.REGISTRY_REFRESH_INTERVAL_SECONDS:=300}
  auth:
    provider_config:
      type: ${env.AUTH_ISSUER:+oauth2_token}
      audience: ${env.AUTH_AUDIENCE:=ogx}
      issuer: ${env.AUTH_ISSUER:=}
      jwks:
        uri: ${env.AUTH_JWKS_URI:=}
        key_recheck_period: ${env.AUTH_JWKS_RECHECK_PERIOD:=3600}
      verify_tls: ${env.AUTH_VERIFY_TLS:=true}
    access_policy:
      - permit:
          actions: [read]
        when: resource is unowned
        description: "All users can read system resources"
      - permit:
          actions: [create]
        description: "Authenticated users can create resources"
      - permit:
          actions: [read, update, delete]
        when: user is owner
        description: "Owners can manage their own resources"
" \
Expand Down
19 changes: 16 additions & 3 deletions Containerfile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,24 @@ ENV UV_INDEX_STRATEGY=unsafe-best-match

COPY distribution/constraints.txt ${APP_ROOT}/constraints.txt
COPY distribution/requirements.txt ${APP_ROOT}/requirements.txt
RUN uv pip install --constraint ${APP_ROOT}/constraints.txt -r ${APP_ROOT}/requirements.txt

COPY --chmod=755 distribution/install-common.sh ${APP_ROOT}/install-common.sh
# Package docling transitively pulls in opencv-python via rapidocr.
# opencv-python requires libGL.so.1 (absent in UBI). Swap it for the headless
# variant after install, pinned to the exact version the resolver chose.
RUN uv pip install --constraint ${APP_ROOT}/constraints.txt -r ${APP_ROOT}/requirements.txt \
&& OPENCV_VERSION=$(uv pip show opencv-python 2>/dev/null | awk '/^Version:/{print $2}') \
&& [ -n "${OPENCV_VERSION}" ] || { echo "ERROR: opencv-python not found after install"; exit 1; } \
&& uv pip uninstall opencv-python \
&& uv pip install --constraint ${APP_ROOT}/constraints.txt "opencv-python-headless==${OPENCV_VERSION}"

COPY distribution/fetch_artifacts.py ${APP_ROOT}/fetch_artifacts.py
COPY --chmod=755 distribution/copy-artifacts.sh ${APP_ROOT}/copy-artifacts.sh
COPY distribution/artifacts.lock.yaml ${APP_ROOT}/artifacts.lock.yaml
RUN --mount=type=cache,target=/var/cache/artifacts,uid=1001,gid=0 \
uv run ${APP_ROOT}/fetch_artifacts.py ${APP_ROOT}/artifacts.lock.yaml /var/cache/artifacts \
&& ${APP_ROOT}/copy-artifacts.sh /var/cache/artifacts
ENV DOCLING_ARTIFACTS_PATH="${APP_ROOT}/.cache/docling/models"
RUN ${APP_ROOT}/install-common.sh
ENV HF_HOME="${APP_ROOT}/.cache/huggingface"
ENV TIKTOKEN_CACHE_DIR="${APP_ROOT}/.cache/tiktoken"

{config_labels}
Expand Down
Loading
Loading