Merge branch 'main' into konflux/mintmaker/main/aiohttp-3.x

Author: TamiTakamiya

.github/workflows/shellcheck.yaml

@@ -0,0 +1,13 @@
+name: Shell check
+
+on:
+  - push
+  - pull_request
+
+jobs:
+  shellcheck:
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v4
+      - name: Shell check
+        run: make shellcheck

.tekton/ansible-chatbot-service-pull-request.yaml

@@ -34,6 +34,14 @@ spec:
     - name: revision
       value: "{{revision}}"
   taskRunSpecs:
+    - pipelineTaskName: ecosystem-cert-preflight-checks
+      stepSpecs:
+        - name: check-container
+          computeResources:
+            requests:
+              memory: 4Gi
+            limits:
+              memory: 4Gi
     - pipelineTaskName: clair-scan
       computeResources:
         requests:
@@ -258,7 +266,12 @@ spec:
           - name: COMMIT_SHA
             value: $(tasks.clone-repository.results.commit)
           - name: BUILD_ARGS
-            value: ["IMAGE_TAGS=pr-{{pull_request_number}} pr-{{pull_request_number}}.$(tasks.git-metadata.results.commit-timestamp)", "GIT_COMMIT=$(tasks.clone-repository.results.commit)", "RAG_CONTENTS_SUB_FOLDER=vector_db/aap_product_docs", "LIGHTSPEED_RAG_CONTENT_IMAGE=quay.io/ansible/aap-rag-content:latest", "LIGHTSPEED_RAG_EMBEDDINGS_IMAGE=quay.io/ansible/aap-rag-embeddings-image:latest"]
+            value:
+            - IMAGE_TAGS=pr-{{pull_request_number}} pr-{{pull_request_number}}.$(tasks.git-metadata.results.commit-timestamp)
+            - GIT_COMMIT=$(tasks.clone-repository.results.commit)
+            - RAG_CONTENTS_SUB_FOLDER=vector_db/aap_product_docs
+            - LIGHTSPEED_RAG_CONTENT_IMAGE=quay.io/ansible/aap-rag-content:1.0.1739753069
+            - LIGHTSPEED_RAG_EMBEDDINGS_IMAGE=quay.io/ansible/aap-rag-embeddings-image:latest
           - name: BUILD_ARGS_FILE
             value: $(params.build-args-file)
         runAfter:

.tekton/ansible-chatbot-service-push.yaml

@@ -29,6 +29,14 @@ spec:
     - name: revision
       value: "{{revision}}"
   taskRunSpecs:
+    - pipelineTaskName: ecosystem-cert-preflight-checks
+      stepSpecs:
+        - name: check-container
+          computeResources:
+            requests:
+              memory: 4Gi
+            limits:
+              memory: 4Gi
     - pipelineTaskName: clair-scan
       computeResources:
         requests:
@@ -274,7 +282,12 @@ spec:
           - name: TARGET_STAGE
             value: production
           - name: BUILD_ARGS
-            value: [ "IMAGE_TAGS=latest 1.0.$(tasks.git-metadata.results.commit-timestamp)", "GIT_COMMIT=$(tasks.clone-repository.results.commit)", "RAG_CONTENTS_SUB_FOLDER=vector_db/aap_product_docs", "LIGHTSPEED_RAG_CONTENT_IMAGE=quay.io/ansible/aap-rag-content:latest", "LIGHTSPEED_RAG_EMBEDDINGS_IMAGE=quay.io/ansible/aap-rag-embeddings-image:latest"]
+            value:
+            - IMAGE_TAGS=latest 1.0.$(tasks.git-metadata.results.commit-timestamp)
+            - GIT_COMMIT=$(tasks.clone-repository.results.commit)
+            - RAG_CONTENTS_SUB_FOLDER=vector_db/aap_product_docs
+            - LIGHTSPEED_RAG_CONTENT_IMAGE=quay.io/ansible/aap-rag-content:1.0.1739753069
+            - LIGHTSPEED_RAG_EMBEDDINGS_IMAGE=quay.io/ansible/aap-rag-embeddings-image:latest
         runAfter:
           - prefetch-dependencies
         taskRef:

Makefile

@@ -151,6 +151,11 @@ distribution-archives: ## Generate distribution archives to be uploaded into Pyt
 upload-distribution-archives: ## Upload distribution archives into Python registry
 	pdm run python -m twine upload --repository ${PYTHON_REGISTRY} dist/*
 
+shellcheck: ## Run shellcheck
+	wget -qO- "https://github.com/koalaman/shellcheck/releases/download/stable/shellcheck-stable.linux.x86_64.tar.xz" | tar -xJv \
+	shellcheck --version
+	shellcheck -- */*.sh
+
 help: ## Show this help screen
 	@echo 'Usage: make <OPTIONS> ... <TARGETS>'
 	@echo ''

README.md

@@ -242,7 +242,7 @@ Depends on configuration, but usually it is not needed to generate or use API ke
     credentials_path: watsonx_api_key.txt
     project_id: XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX
     models:
-      - name: ibm/granite-13b-chat-v2
+      - name: ibm/granite-3-8b-instruct
   ```
 
 ### RHEL AI provider
@@ -312,7 +312,7 @@ Depends on configuration, but usually it is not needed to generate or use API ke
          ```yaml
             rcs_config:
               default_provider: my_bam
-              default_model: ibm/granite-13b-chat-v2
+              default_model: ibm/granite-3-8b-instruct
          ```
 
 

docs/config.png

@@ -60,7 +60,7 @@ class "LoggingConfig" as ols.app.models.config.LoggingConfig {
   uvicorn_log_level : int
 }
 class "ModelConfig" as ols.app.models.config.ModelConfig {
-  context_window_size
+  context_window_size : Annotated
   credentials : Optional[str]
   name : str
   options : Optional[dict[str, Any]]
@@ -71,7 +71,7 @@ class "ModelConfig" as ols.app.models.config.ModelConfig {
   validate_options(options: dict) -> dict[str, Any]
 }
 class "ModelParameters" as ols.app.models.config.ModelParameters {
-  max_tokens_for_response
+  max_tokens_for_response : Annotated
 }
 class "OLSConfig" as ols.app.models.config.OLSConfig {
   authentication_config
@@ -100,10 +100,10 @@ class "PostgresConfig" as ols.app.models.config.PostgresConfig {
   ca_cert_path : Optional[FilePath]
   dbname : str
   host : str
-  max_entries
+  max_entries : Annotated
   password : Optional[str]
   password_path : Optional[FilePath]
-  port
+  port : Annotated
   ssl_mode : str
   user : str
   validate_yaml() -> Self
@@ -135,7 +135,7 @@ class "ProviderConfig" as ols.app.models.config.ProviderConfig {
 class "ProviderSpecificConfig" as ols.app.models.config.ProviderSpecificConfig {
   api_key : Optional[str]
   token : Optional[Any]
-  url
+  url : AnyHttpUrl
 }
 class "QueryFilter" as ols.app.models.config.QueryFilter {
   name : Optional[str]