Merge branch 'main' into fixes

Author: cjqian

.github/workflows/ci.yaml

@@ -77,77 +77,3 @@ jobs:
     - name: Test frontend
       working-directory: ./frontend
       run: npm test
-
-  update-schemas:
-    name: Update generated schemas
-
-    runs-on: ubuntu-latest
-
-    # Only run on push to main/master, not on PRs
-    if: github.event_name == 'push' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master')
-
-    permissions:
-      contents: write
-      pull-requests: write
-
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        token: ${{ secrets.GITHUB_TOKEN }}
-
-    - name: Use Node.js 22.x
-      uses: actions/setup-node@v4
-      with:
-        node-version: 22.x
-
-    - name: Set up Python
-      uses: actions/setup-python@v5
-      with:
-        python-version: '3.12'
-
-    - name: Install uv
-      uses: astral-sh/setup-uv@v4
-
-    - name: Install dependencies
-      run: |
-        npm install
-        cd scripts && uv sync
-
-    - name: Build utils
-      working-directory: ./utils
-      run: npm run build
-
-    - name: Regenerate schemas
-      run: |
-        cd utils && npx tsx src/export-schemas.ts
-        npx prettier --write ../docs/assets/api/schemas.json
-        cd ../scripts && uv run datamodel-codegen \
-          --input ../docs/assets/api/schemas.json \
-          --output deliberate_lab/types.py \
-          --input-file-type jsonschema \
-          --reuse-model \
-          --collapse-root-models \
-          --use-union-operator \
-          --use-title-as-name \
-          --output-model-type pydantic_v2.BaseModel \
-          --custom-file-header $'# pyright: reportInvalidTypeForm=false\n# pylint: disable=missing-module-docstring,missing-class-docstring,invalid-name,too-few-public-methods'
-
-    - name: Format Python files
-      run: |
-        cd scripts && uvx black deliberate_lab/
-
-    - name: Validate generated Python
-      run: |
-        cd scripts && uv run pyright deliberate_lab/
-
-    - name: Create PR if schemas changed
-      uses: peter-evans/create-pull-request@v8
-      with:
-        token: ${{ secrets.GITHUB_TOKEN }}
-        commit-message: "chore: update generated schemas and Python types"
-        title: "chore: update generated schemas and Python types"
-        body: "🤖 Auto-generated by GitHub Actions"
-        branch: auto-update-schemas
-        add-paths: |
-          docs/assets/api/schemas.json
-          scripts/deliberate_lab/

docs/assets/api/schemas.json

@@ -341,6 +341,9 @@
           "items": {
             "type": "string"
           }
+        },
+        "youtubeVideoId": {
+          "type": "string"
         }
       },
       "required": [
@@ -1005,28 +1008,9 @@
           "type": "string"
         },
         "type": {
-          "allOf": [
-            {
-              "anyOf": [
-                {
-                  "const": "static",
-                  "type": "string"
-                },
-                {
-                  "const": "random_permutation",
-                  "type": "string"
-                },
-                {
-                  "const": "balanced_assignment",
-                  "type": "string"
-                }
-              ]
-            },
-            {
-              "const": "static",
-              "type": "string"
-            }
-          ]
+          "default": "static",
+          "const": "static",
+          "type": "string"
         },
         "scope": {
           "anyOf": [
@@ -1255,28 +1239,9 @@
           "type": "string"
         },
         "type": {
-          "allOf": [
-            {
-              "anyOf": [
-                {
-                  "const": "static",
-                  "type": "string"
-                },
-                {
-                  "const": "random_permutation",
-                  "type": "string"
-                },
-                {
-                  "const": "balanced_assignment",
-                  "type": "string"
-                }
-              ]
-            },
-            {
-              "const": "random_permutation",
-              "type": "string"
-            }
-          ]
+          "default": "random_permutation",
+          "const": "random_permutation",
+          "type": "string"
         },
         "scope": {
           "anyOf": [
@@ -1363,28 +1328,9 @@
           "type": "string"
         },
         "type": {
-          "allOf": [
-            {
-              "anyOf": [
-                {
-                  "const": "static",
-                  "type": "string"
-                },
-                {
-                  "const": "random_permutation",
-                  "type": "string"
-                },
-                {
-                  "const": "balanced_assignment",
-                  "type": "string"
-                }
-              ]
-            },
-            {
-              "const": "balanced_assignment",
-              "type": "string"
-            }
-          ]
+          "default": "balanced_assignment",
+          "const": "balanced_assignment",
+          "type": "string"
         },
         "scope": {
           "anyOf": [
@@ -1894,9 +1840,45 @@
         },
         "progress": {
           "$ref": "#/$defs/StageProgressConfig"
+        },
+        "timeLimitInMinutes": {
+          "anyOf": [
+            {
+              "type": "number"
+            },
+            {
+              "type": "null"
+            }
+          ]
+        },
+        "requireFullTime": {
+          "type": "boolean"
+        },
+        "isTurnBasedChat": {
+          "type": "boolean"
+        },
+        "minNumberOfTurns": {
+          "type": "number"
+        },
+        "maxNumberOfTurns": {
+          "anyOf": [
+            {
+              "type": "number"
+            },
+            {
+              "type": "null"
+            }
+          ]
         }
       },
-      "required": ["id", "kind", "name", "descriptions", "progress"],
+      "required": [
+        "id",
+        "kind",
+        "name",
+        "descriptions",
+        "progress",
+        "timeLimitInMinutes"
+      ],
       "title": "PrivateChatStageConfig"
     },
     "ProfileStageConfig": {

frontend/src/components/experiment_builder/structured_prompt_editor.ts

@@ -8,25 +8,26 @@ import {CSSResultGroup, html, nothing, TemplateResult} from 'lit';
 import {customElement, property} from 'lit/decorators.js';
 
 import {core} from '../../core/core';
-import {AuthService} from '../../services/auth.service';
 import {ExperimentEditor} from '../../services/experiment.editor';
 import {renderConditionEditor} from '../../shared/condition_editor.utils';
 
 import {
   Condition,
+  ConditionOperator,
   ConditionTarget,
+  createConditionGroup,
+  createDefaultPromptItemGroup,
+  createDefaultStageContextPromptItem,
+  createShuffleConfig,
+  getConditionTargetsFromStages,
   PromptItem,
-  PromptItemType,
   PromptItemGroup,
+  PromptItemType,
+  SeedStrategy,
+  ShuffleConfig,
   StageContextPromptItem,
   StageKind,
   TextPromptItem,
-  createDefaultStageContextPromptItem,
-  createDefaultPromptItemGroup,
-  getConditionTargetsFromStages,
-  ShuffleConfig,
-  SeedStrategy,
-  createShuffleConfig,
 } from '@deliberation-lab/utils';
 
 import {styles} from './structured_prompt_editor.scss';
@@ -36,7 +37,6 @@ import {styles} from './structured_prompt_editor.scss';
 export class EditorComponent extends MobxLitElement {
   static override styles: CSSResultGroup = [styles];
 
-  private readonly authService = core.getService(AuthService);
   private readonly experimentEditor = core.getService(ExperimentEditor);
 
   @property() prompt: PromptItem[] = [];
@@ -213,13 +213,32 @@ export class EditorComponent extends MobxLitElement {
     }
 
     const conditionTargets = this.getConditionTargets();
+    const supportsConditions =
+      this.supportsConditions() && conditionTargets.length > 0;
+
+    return items.map((item, index) => {
+      const hasCondition = item.condition !== undefined;
 
-    return items.map(
-      (item, index) => html`
+      return html`
         <div class="prompt-item-wrapper ${isNested ? 'nested' : ''}">
           <div class="prompt-item-row">
             <div class="prompt-item-editor">${this.renderItemEditor(item)}</div>
             <div class="prompt-item-actions">
+              ${supportsConditions && item.type !== PromptItemType.GROUP
+                ? html`
+                    <pr-icon-button
+                      icon="rule"
+                      color=${hasCondition ? 'primary' : 'neutral'}
+                      variant="default"
+                      size="small"
+                      title=${hasCondition
+                        ? 'Remove display condition'
+                        : 'Add display condition'}
+                      @click=${() => this.toggleCondition(item)}
+                    >
+                    </pr-icon-button>
+                  `
+                : nothing}
               <pr-icon-button
                 icon="arrow_upward"
                 color="neutral"
@@ -246,43 +265,44 @@ export class EditorComponent extends MobxLitElement {
               </pr-icon-button>
             </div>
           </div>
-          ${this.renderPromptItemCondition(item, conditionTargets)}
+          ${hasCondition
+            ? this.renderPromptItemCondition(item, conditionTargets)
+            : nothing}
         </div>
-      `,
-    );
+      `;
+    });
+  }
+
+  private toggleCondition(item: PromptItem) {
+    if (item.condition !== undefined) {
+      // Remove condition
+      this.updatePromptItem(item, {condition: undefined});
+    } else {
+      // Add an empty condition group - user will add conditions via the editor
+      this.updatePromptItem(item, {
+        condition: createConditionGroup(ConditionOperator.AND, []),
+      });
+    }
   }
 
   private renderPromptItemCondition(
     item: PromptItem,
     conditionTargets: ConditionTarget[],
   ) {
-    // Don't show condition editor for GROUP items (they contain other items that can have conditions)
-    if (item.type === PromptItemType.GROUP) {
-      return nothing;
-    }
-
-    // Conditions are only supported for private chat stages (not group chat)
-    if (!this.supportsConditions()) {
-      return nothing;
-    }
-
     const onConditionChange = (condition: Condition | undefined) => {
       this.updatePromptItem(item, {condition});
     };
 
-    const conditionEditor = renderConditionEditor({
-      condition: item.condition,
-      targets: conditionTargets,
-      showAlphaFeatures: this.authService.showAlphaFeatures,
-      canEdit: this.experimentEditor.canEditStages,
-      onConditionChange,
-    });
-
-    if (conditionEditor === nothing) {
-      return nothing;
-    }
-
-    return html` <div class="prompt-item-condition">${conditionEditor}</div> `;
+    return html`
+      <div class="prompt-item-condition">
+        ${renderConditionEditor({
+          condition: item.condition,
+          targets: conditionTargets,
+          canEdit: this.experimentEditor.canEditStages,
+          onConditionChange,
+        })}
+      </div>
+    `;
   }
 
   private renderTextPromptItemEditor(item: TextPromptItem) {