Merge pull request #257 from cloudera/main

Release 1.23.0

Author: jkwatson

.gitattributes

@@ -0,0 +1 @@
+# prebuilt_artifacts/* filter=lfs diff=lfs merge=lfs -text

.github/workflows/publish_release.yml

@@ -20,7 +20,6 @@ on:
           - customer-hotfix
 jobs:
   build:
-
     runs-on: ubuntu-latest
 
     steps:
@@ -29,6 +28,13 @@ jobs:
         with:
           ref: ${{ github.event.inputs.BRANCH }}
           ssh-key: ${{ secrets.DEPLOY_KEY }}
+          lfs: true
+
+      - name: Install Git LFS
+        run: |
+          sudo apt-get update && sudo apt-get install git-lfs
+      - name: Initialize Git LFS
+        run: git lfs install
 
       - name: Set up JDK 21
         uses: actions/setup-java@v4
@@ -102,14 +108,18 @@ jobs:
         run: |
             git config --local user.name actions-user
             git config --local user.email "[email protected]"
-            echo "export RELEASE_TAG=${{ github.event.inputs.VERSION }}" > release_version.txt
-            git add release_version.txt
+            echo "export RELEASE_TAG=${{ github.event.inputs.VERSION }}" > scripts/release_version.txt
+            mkdir -p prebuilt_artifacts
+            cp backend/build/libs/rag-api.jar prebuilt_artifacts/
+            cp ui/fe-dist.tar.gz prebuilt_artifacts/
+            cp ui/express/node-dist.tar.gz prebuilt_artifacts/
+            git add prebuilt_artifacts
+            git add scripts/release_version.txt
             if ! git diff --cached --quiet; then
               git commit -m "Update release version to ${{ github.event.inputs.VERSION }}"
               git push
             else
               echo "No changes to commit"
             fi
-        working-directory: scripts
         env:
-          GITHUB_TOKEN: ${{ github.token }}
+          GITHUB_TOKEN: ${{ github.token }}

.github/workflows/publish_runtime.yml

@@ -0,0 +1,41 @@
+name: publish_runtime.yml
+on:
+  workflow_dispatch:
+    inputs:
+      VERSION:
+        description: 'Version of runtime to release'
+        required: true
+      BRANCH:
+        description: 'Branch to use for runtime build'
+        required: true
+        default: 'main'
+        type: choice
+        options:
+          - main
+          - mob/main
+          - release/1
+          - customer-hotfix
+jobs:
+  runtime-build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.inputs.BRANCH }}
+          ssh-key: ${{ secrets.DEPLOY_KEY }}
+          lfs: true
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build Docker image
+        run: |
+          docker build -t ghcr.io/cloudera/rag-studio-runtime:${{ github.event.inputs.VERSION }} -t ghcr.io/cloudera/rag-studio-runtime:latest -f runtime.Dockerfile .
+          docker push ghcr.io/cloudera/rag-studio-runtime:${{ github.event.inputs.VERSION }}
+          docker push ghcr.io/cloudera/rag-studio-runtime:latest
+        working-directory: llm-service

.gitignore

@@ -10,4 +10,4 @@ databases/
 **/.DS_Store
 .history
 addresses/
-tools/
+tools/mcp.json

README.md

@@ -150,6 +150,18 @@ the Node service locally, you can do so by following these steps:
 docker run -p 6333:6333 -p 6334:6334 -v $(pwd)/databases/qdrant_storage:/qdrant/storage:z qdrant/qdrant
 ```
 
+#### Modifying UI in CML
+
+* This is an unsupported workflow, but it is possible to modify the UI code in CML.
+
+- Start a CML Session from a CML Project that has the RAG Studio AMP installed.
+- Open the terminal in the CML Session and navigate to the `ui` directory.
+- Run `source ~/.bashrc` to ensure the Node environment variables are loaded.
+- Install PNPM using `npm install -g pnpm`.  Docs on PNPM can be found here: https://pnpm.io/installation#using-npm
+- Run `pnpm install` to install the dependencies.
+- Make your changes to the UI code in the `ui` directory.
+- Run `pnpm build` to build the new UI bundle.
+
 ## The Fine Print
 
 IMPORTANT: Please read the following before proceeding. This AMP includes or otherwise depends on certain third party software packages. Information about such third party software packages are made available in the notice file associated with this AMP. By configuring and launching this AMP, you will cause such third party software packages to be downloaded and installed into your environment, in some instances, from third parties' websites. For each third party software package, please see the notice file and the applicable websites for more information, including the applicable license terms. If you do not wish to download and install the third party software packages, do not configure, launch or otherwise use this AMP. By configuring, launching or otherwise using the AMP, you acknowledge the foregoing statement and agree that Cloudera is not responsible or liable in any way for the third party software packages.

backend/src/main/java/com/cloudera/cai/rag/projects/ProjectRepository.java

@@ -123,11 +123,11 @@ public List<Project> getProjects(String username) {
               SELECT *
                 FROM project
                 WHERE created_by_id = :createdById
-                OR default_project = true
+                OR default_project = :default
               """;
           handle.registerRowMapper(ConstructorMapper.factory(Project.class));
           try (Query query = handle.createQuery(sql)) {
-            query.bind("createdById", username);
+            query.bind("createdById", username).bind("default", true);
             return query.mapTo(Project.class).list();
           }
         });
@@ -145,11 +145,12 @@ public Project getDefaultProject() {
               """
                SELECT *
                  FROM project
-               WHERE default_project = true
+               WHERE default_project = :default
               """;
           handle.registerRowMapper(ConstructorMapper.factory(Project.class));
           try (Query query = handle.createQuery(sql)) {
             return query
+                .bind("default", true)
                 .mapTo(Project.class)
                 .findOne()
                 .orElseThrow(() -> new NotFound("Default project not found"));

backend/src/main/resources/migrations/postgres/19_create_project.up.sql

@@ -40,14 +40,13 @@ BEGIN;
 
 CREATE TABLE project
 (
-    id                    BIGINT auto_increment NOT NULL,
+    id SERIAL PRIMARY KEY,
     name                  VARCHAR(1024)         NOT NULL,
     default_project       BOOLEAN               NOT NULL DEFAULT FALSE,
     time_created          TIMESTAMP             NOT NULL DEFAULT CURRENT_TIMESTAMP,
     time_updated          TIMESTAMP             NOT NULL DEFAULT CURRENT_TIMESTAMP,
     created_by_id         VARCHAR(255)                NOT NULL,
-    updated_by_id         VARCHAR(255)                NOT NULL,
-    CONSTRAINT PK_project PRIMARY KEY (id)
+    updated_by_id         VARCHAR(255)                NOT NULL
 );
 
 COMMIT;

backend/src/main/resources/migrations/postgres/20_create_default_project.up.sql

@@ -38,6 +38,6 @@
 
 BEGIN;
 
-INSERT INTO project (name, created_by_id, updated_by_id) VALUES ('Default', 'admin', 'admin');
+INSERT INTO project (name, DEFAULT_PROJECT, created_by_id, updated_by_id) VALUES ('Default', true,'admin', 'admin');
 
 COMMIT;

backend/src/main/resources/migrations/postgres/23_create_project_data_source.up.sql

@@ -40,10 +40,9 @@ BEGIN;
 
 CREATE TABLE project_data_source
 (
-    id              BIGINT auto_increment NOT NULL,
+    id SERIAL PRIMARY KEY,
     project_id      BIGINT                NOT NULL,
-    data_source_id  BIGINT                NOT NULL,
-    CONSTRAINT PK_project_ds PRIMARY KEY (id)
+    data_source_id  BIGINT                NOT NULL
 );
 
 COMMIT;

backend/src/main/resources/migrations/postgres/24_add_default_project_data_source.down.sql

@@ -36,8 +36,6 @@
  * DATA.
  */
 
-SET MODE MYSQL;
-
 BEGIN;
 
 DELETE from project_data_source where project_id = (select id from project where default_project = true);