resolve conflict and reformat

Signed-off-by: Jordan Dubrick <jdubrick@redhat.com>

Author: Jdubrick

lightspeed-stack.yaml

@@ -12,10 +12,10 @@ llama_stack:
   # url: http://localhost:8321 # If running in cluster, use this
 user_data_collection:
   feedback_enabled: false
-  feedback_storage: "/tmp/data/feedback"
+  feedback_storage: '/tmp/data/feedback'
 authentication:
-  module: "noop"
+  module: 'noop'
 conversation_cache:
-  type: "sqlite"
+  type: 'sqlite'
   sqlite:
-    db_path: "/tmp/cache.db"
+    db_path: '/tmp/cache.db'

run.yaml

@@ -1,21 +1,21 @@
 version: '2'
-image_name: minimal-viable-llama-stack-configuration
+image_name: redhat-ai-dev-llama-stack
 
 apis:
-- agents
-- datasetio
-- eval
-- inference
-- post_training
-- safety
-- scoring
-- telemetry
-- tool_runtime
-- vector_io
+  - agents
+  - datasetio
+  - eval
+  - inference
+  - post_training
+  - safety
+  - scoring
+  - telemetry
+  - tool_runtime
+  - vector_io
 benchmarks: []
 container_image:
 datasets: []
-external_providers_dir: "/app-root/config/providers.d"
+external_providers_dir: '/app-root/config/providers.d'
 inference_store:
   db_path: .llama/distributions/ollama/inference_store.db
   type: sqlite
@@ -25,47 +25,47 @@ metadata_store:
   namespace:
   type: sqlite
 models:
-- model_id: sentence-transformers/all-mpnet-base-v2
-  metadata:
-    embedding_dimension: 768
-  model_type: embedding
-  provider_id: sentence-transformers
-  provider_model_id: "/app-root/embeddings_model"
+  - model_id: sentence-transformers/all-mpnet-base-v2
+    metadata:
+      embedding_dimension: 768
+    model_type: embedding
+    provider_id: sentence-transformers
+    provider_model_id: '/app-root/embeddings_model'
 providers:
   agents:
-  - config:
-      persistence_store:
-        db_path: .llama/distributions/ollama/agents_store.db
-        namespace:
-        type: sqlite
-      responses_store:
-        db_path: .llama/distributions/ollama/responses_store.db
-        type: sqlite
-    provider_id: meta-reference
-    provider_type: inline::meta-reference
+    - config:
+        persistence_store:
+          db_path: .llama/distributions/ollama/agents_store.db
+          namespace:
+          type: sqlite
+        responses_store:
+          db_path: .llama/distributions/ollama/responses_store.db
+          type: sqlite
+      provider_id: meta-reference
+      provider_type: inline::meta-reference
   datasetio:
-  - config:
-      kvstore:
-        db_path: .llama/distributions/ollama/huggingface_datasetio.db
-        namespace:
-        type: sqlite
-    provider_id: huggingface
-    provider_type: remote::huggingface
-  - config:
-      kvstore:
-        db_path: .llama/distributions/ollama/localfs_datasetio.db
-        namespace:
-        type: sqlite
-    provider_id: localfs
-    provider_type: inline::localfs
+    - config:
+        kvstore:
+          db_path: .llama/distributions/ollama/huggingface_datasetio.db
+          namespace:
+          type: sqlite
+      provider_id: huggingface
+      provider_type: remote::huggingface
+    - config:
+        kvstore:
+          db_path: .llama/distributions/ollama/localfs_datasetio.db
+          namespace:
+          type: sqlite
+      provider_id: localfs
+      provider_type: inline::localfs
   eval:
-  - config:
-      kvstore:
-        db_path: .llama/distributions/ollama/meta_reference_eval.db
-        namespace:
-        type: sqlite
-    provider_id: meta-reference
-    provider_type: inline::meta-reference
+    - config:
+        kvstore:
+          db_path: .llama/distributions/ollama/meta_reference_eval.db
+          namespace:
+          type: sqlite
+      provider_id: meta-reference
+      provider_type: inline::meta-reference
   inference:
     - provider_id: ${env.ENABLE_VLLM:+vllm}
       provider_type: remote::vllm
@@ -91,123 +91,123 @@ providers:
       provider_type: inline::sentence-transformers
       config: {}
   post_training:
-  - config:
-      checkpoint_format: huggingface
-      device: cpu
-      distributed_backend:
-      dpo_output_dir: "."
-    provider_id: huggingface
-    provider_type: inline::huggingface
+    - config:
+        checkpoint_format: huggingface
+        device: cpu
+        distributed_backend:
+        dpo_output_dir: '.'
+      provider_id: huggingface
+      provider_type: inline::huggingface
   safety:
-  - config:
-      excluded_categories: []
-    provider_id: llama-guard
-    provider_type: inline::llama-guard
-  - provider_id: lightspeed_question_validity
-    provider_type: inline::lightspeed_question_validity
-    config:
-      model_id: ${env.VALIDATION_PROVIDER:=vllm}/${env.VALIDATION_MODEL_NAME}
-      model_prompt: |-
-        Instructions:
+    - config:
+        excluded_categories: []
+      provider_id: llama-guard
+      provider_type: inline::llama-guard
+    - provider_id: lightspeed_question_validity
+      provider_type: inline::lightspeed_question_validity
+      config:
+        model_id: ${env.VALIDATION_PROVIDER:=vllm}/${env.VALIDATION_MODEL_NAME}
+        model_prompt: |-
+          Instructions:
 
-        You area question classification tool. You are an expert in the following categories:
-        - Backstage
-        - Red Hat Developer Hub (RHDH)
-        - Kubernetes
-        - Openshift
-        - CI/CD
-        - GitOps
-        - Pipelines
-        - Developer Portals
-        - Deployments
-        - Software Catalogs
-        - Software Templates
-        - Tech Docs
+          You area question classification tool. You are an expert in the following categories:
+          - Backstage
+          - Red Hat Developer Hub (RHDH)
+          - Kubernetes
+          - Openshift
+          - CI/CD
+          - GitOps
+          - Pipelines
+          - Developer Portals
+          - Deployments
+          - Software Catalogs
+          - Software Templates
+          - Tech Docs
 
-        Your job is to determine if a user's question is related to the categories you are an expert in. If the question is related to those categories, \
-        or any features that may be related to those categories, you will answer with ${allowed}.
+          Your job is to determine if a user's question is related to the categories you are an expert in. If the question is related to those categories, \
+          or any features that may be related to those categories, you will answer with ${allowed}.
 
-        If a question is not related to your expert categories, answer with ${rejected}.
+          If a question is not related to your expert categories, answer with ${rejected}.
 
-        You do not need to explain your answer.
+          You do not need to explain your answer.
 
-        Below are some example questions:
-        Example Question:
-        Why is the sky blue?
-        Example Response:
-        ${rejected}
+          Below are some example questions:
+          Example Question:
+          Why is the sky blue?
+          Example Response:
+          ${rejected}
 
-        Example Question:
-        Can you help configure my cluster to automatically scale?
-        Example Response:
-        ${allowed}
+          Example Question:
+          Can you help configure my cluster to automatically scale?
+          Example Response:
+          ${allowed}
 
-        Example Question:
-        How do I create import an existing software template in Backstage?
-        Example Response:
-        ${allowed}
+          Example Question:
+          How do I create import an existing software template in Backstage?
+          Example Response:
+          ${allowed}
 
-        Example Question:
-        How do I accomplish a task in RHDH?
-        Example Response:
-        ${allowed}
+          Example Question:
+          How do I accomplish a task in RHDH?
+          Example Response:
+          ${allowed}
 
-        Example Question:
-        How do I explore a component in RHDH catalog?
-        Example Response:
-        ${allowed}
+          Example Question:
+          How do I explore a component in RHDH catalog?
+          Example Response:
+          ${allowed}
 
-        Example Question:
-        How can I integrate GitOps into my pipeline?
-        Example Response:
-        ${allowed}
+          Example Question:
+          How can I integrate GitOps into my pipeline?
+          Example Response:
+          ${allowed}
 
-        Question:
-        ${message}
-        Response:
-      invalid_question_response: |-
-        Hi, I'm the Red Hat Developer Hub Lightspeed assistant, I can help you with questions about Red Hat Developer Hub or Backstage.
-        Please ensure your question is about these topics, and feel free to ask again!
+          Question:
+          ${message}
+          Response:
+        invalid_question_response: |-
+          Hi, I'm the Red Hat Developer Hub Lightspeed assistant, I can help you with questions about Red Hat Developer Hub or Backstage.
+          Please ensure your question is about these topics, and feel free to ask again!
   scoring:
-  - config: {}
-    provider_id: basic
-    provider_type: inline::basic
-  - config: {}
-    provider_id: llm-as-judge
-    provider_type: inline::llm-as-judge
-  - config:
-      openai_api_key: '********'
-    provider_id: braintrust
-    provider_type: inline::braintrust
+    - config: {}
+      provider_id: basic
+      provider_type: inline::basic
+    - config: {}
+      provider_id: llm-as-judge
+      provider_type: inline::llm-as-judge
+    - config:
+        openai_api_key: '********'
+      provider_id: braintrust
+      provider_type: inline::braintrust
   telemetry:
-  - config:
-      service_name: 'lightspeed-stack-telemetry'
-      sinks: sqlite
-      sqlite_db_path: .llama/distributions/ollama/trace_store.db
-    provider_id: meta-reference
-    provider_type: inline::meta-reference
+    - config:
+        service_name: 'lightspeed-stack-telemetry'
+        sinks: sqlite
+        sqlite_db_path: .llama/distributions/ollama/trace_store.db
+      provider_id: meta-reference
+      provider_type: inline::meta-reference
   tool_runtime:
-  - provider_id: model-context-protocol
-    provider_type: remote::model-context-protocol
-    config: {}
-  - provider_id: rag-runtime
-    provider_type: inline::rag-runtime
-    config: {}
+    - provider_id: model-context-protocol
+      provider_type: remote::model-context-protocol
+      config: {}
+    - provider_id: rag-runtime
+      provider_type: inline::rag-runtime
+      config: {}
   vector_io:
-  - config:
-      kvstore:
-        db_path: .llama/distributions/ollama/faiss_store.db
-        namespace:
-        type: sqlite
-    provider_id: faiss
-    provider_type: inline::faiss
-  - provider_id: rhdh-docs
-    provider_type: inline::faiss
-    config:
-      kvstore:
-        type: sqlite
-        namespace:
-        db_path: /app-root/vector_db/rhdh_product_docs/1.8/faiss_store.db
+    - config:
+        kvstore:
+          db_path: .llama/distributions/ollama/faiss_store.db
+          namespace:
+          type: sqlite
+      provider_id: faiss
+      provider_type: inline::faiss
+    - provider_id: rhdh-docs
+      provider_type: inline::faiss
+      config:
+        kvstore:
+          type: sqlite
+          namespace:
+          db_path: /app-root/vector_db/rhdh_product_docs/1.8/faiss_store.db
 scoring_fns: []
 server:
   auth:
@@ -218,14 +218,14 @@ server:
   tls_certfile:
   tls_keyfile:
 shields:
-- shield_id: lightspeed_question_validity-shield
-  provider_id: lightspeed_question_validity
+  - shield_id: lightspeed_question_validity-shield
+    provider_id: lightspeed_question_validity
 tool_groups:
-- provider_id: rag-runtime
-  toolgroup_id: builtin::rag
-  description: "Only use for questions specifically about Red Hat Developer Hub (RHDH). Searches technical documentation for RHDH installation, discovery, configuration, release, upgrade, control access, integration, observability, and extending with plugins. Do not use for any other topic outside RHDH."
+  - provider_id: rag-runtime
+    toolgroup_id: builtin::rag
+    description: 'Only use for questions specifically about Red Hat Developer Hub (RHDH). Searches technical documentation for RHDH installation, discovery, configuration, release, upgrade, control access, integration, observability, and extending with plugins. Do not use for any other topic outside RHDH.'
 vector_dbs:
-- embedding_dimension: 768
-  embedding_model: sentence-transformers/all-mpnet-base-v2
-  provider_id: rhdh-docs
-  vector_db_id: rhdh-product-docs-1_8
+  - embedding_dimension: 768
+    embedding_model: sentence-transformers/all-mpnet-base-v2
+    provider_id: rhdh-docs
+    vector_db_id: rhdh-product-docs-1_8