Qurator: Switch to Claude 3.7 Sonnet, ensure tools schemas adhere to draft 2020-12 (#4343)

Author: nl0

catalog/CHANGELOG.md

@@ -18,6 +18,8 @@ where verb is one of
 
 ## Changes
 
+- [Changed] Qurator: Switch to Claude 3.7 Sonnet ([#4343](https://github.com/quiltdata/quilt/pull/4343))
+- [Fixed] Qurator: Ensure tools schemas adhere to draft 2020-12 ([#4343](https://github.com/quiltdata/quilt/pull/4343))
 - [Added] Support setting the location where files are uploaded while creating or promoting packages (using `packageRoot` config property) ([#4384](https://github.com/quiltdata/quilt/pull/4384))
 - [Changed] Search: Only show package comment and hash when including historical versions, adjust stylings ([#4371](https://github.com/quiltdata/quilt/pull/4371))
 - [Changed] Allow forms and popups in iframes when **Permissive HTML Rendering** enabled ([#4366](https://github.com/quiltdata/quilt/pull/4366))

catalog/app/components/Assistant/Model/Bedrock.ts

@@ -9,7 +9,7 @@ import * as LLM from './LLM'
 
 const MODULE = 'Bedrock'
 
-const MODEL_ID = 'us.anthropic.claude-3-5-sonnet-20241022-v2:0'
+const MODEL_ID = 'us.anthropic.claude-3-7-sonnet-20250219-v1:0'
 
 const mapContent = (contentBlocks: BedrockRuntime.ContentBlocks | undefined) =>
   Eff.pipe(

catalog/app/components/Assistant/Model/GlobalContext/__snapshots__/navigation.spec.ts.snap

@@ -203,7 +203,7 @@ exports[`components/Assistant/Model/GlobalTools/navigation NavigateSchema produc
       "type": "object",
     },
   },
-  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
   "additionalProperties": false,
   "description": "navigate to a provided route",
   "properties": {
@@ -220,7 +220,7 @@ exports[`components/Assistant/Model/GlobalTools/navigation NavigateSchema produc
               "type": "string",
             },
             "params": {
-              "$id": "/schemas/{}",
+              "$id": "/schemas/empty",
               "anyOf": [
                 {
                   "type": "object",
@@ -248,7 +248,7 @@ exports[`components/Assistant/Model/GlobalTools/navigation NavigateSchema produc
               "type": "string",
             },
             "params": {
-              "$id": "/schemas/{}",
+              "$id": "/schemas/empty",
               "anyOf": [
                 {
                   "type": "object",
@@ -704,7 +704,7 @@ exports[`components/Assistant/Model/GlobalTools/navigation NavigateSchema produc
               "type": "string",
             },
             "params": {
-              "$id": "/schemas/{}",
+              "$id": "/schemas/empty",
               "anyOf": [
                 {
                   "type": "object",

catalog/app/components/Assistant/Model/GlobalContext/navigation.spec.ts

@@ -1,5 +1,7 @@
 import * as Eff from 'effect'
 
+import { makeJSONSchema } from '../Tool'
+
 import * as nav from './navigation'
 
 jest.mock(
@@ -11,7 +13,7 @@ describe('components/Assistant/Model/GlobalTools/navigation', () => {
   describe('NavigateSchema', () => {
     describe('produced JSON Schema', () => {
       it('should match the snapshot', () => {
-        const jsonSchema = Eff.JSONSchema.make(nav.NavigateSchema)
+        const jsonSchema = makeJSONSchema(nav.NavigateSchema)
         expect(jsonSchema).toMatchSnapshot()
       })
     })

catalog/app/components/Assistant/Model/Tool.ts

@@ -29,11 +29,49 @@ export interface Descriptor<I> {
 
 export type Collection = Record<string, Descriptor<any>>
 
+/**
+ * Ensure a JSON schema is compatible with draft-2020-12 by:
+ * 1. Replacing $id: 'schemas/{}' with $id: 'schemas/empty'
+ * 2. Converting draft-04/07 items/additionalItems to draft-2020 prefixItems/items
+ */
+function convertSchema(schema: any) {
+  if (!schema || typeof schema !== 'object') return
+
+  // Process arrays
+  if (Array.isArray(schema)) {
+    schema.forEach(convertSchema)
+    return
+  }
+
+  // Process object properties recursively
+  Object.values(schema).forEach(convertSchema)
+
+  // Replace empty schema IDs produced by Effect, which are not valid according to draft-2020
+  if (schema.$id === '/schemas/{}') schema.$id = '/schemas/empty'
+
+  // Handle items and additionalItems conversion for draft-2020
+  if (Array.isArray(schema.items)) {
+    schema.prefixItems = schema.items
+    delete schema.items
+    if (schema.additionalItems !== undefined) {
+      schema.items = schema.additionalItems
+      delete schema.additionalItems
+    }
+  }
+}
+
+export function makeJSONSchema(schema: Eff.Schema.Schema<any, any>) {
+  const out = Eff.JSONSchema.make(schema)
+  out.$schema = 'https://json-schema.org/draft/2020-12/schema'
+  convertSchema(out)
+  return out
+}
+
 export function make<A, I>(
   schema: Eff.Schema.Schema<A, I>,
   fn: Executor<A>,
 ): Descriptor<A> {
-  const jsonSchema = Eff.JSONSchema.make(schema)
+  const jsonSchema = makeJSONSchema(schema)
 
   const decode = Eff.Schema.decodeUnknown(schema, {
     errors: 'all',