@jutge.org/toolkit 4.4.9 → 4.4.16

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@jutge.org/toolkit",
     "description": "Toolkit to prepare problems for Jutge.org",
-    "version": "4.4.9",
+    "version": "4.4.16",
     "homepage": "https://jutge.org",
     "author": {
         "name": "Jutge.org",
@@ -61,31 +61,33 @@
     ],
     "dependencies": {
         "@commander-js/extra-typings": "^14.0.0",
-        "@dicebear/collection": "^9.3.1",
-        "@dicebear/core": "^9.3.1",
-        "@eslint/js": "^9.39.2",
-        "@inquirer/prompts": "^8.2.0",
+        "@dicebear/collection": "^9.3.2",
+        "@dicebear/core": "^9.3.2",
+        "@eslint/js": "^10.0.1",
+        "@inquirer/prompts": "^8.3.0",
         "adm-zip": "^0.5.16",
         "archiver": "^7.0.1",
         "boxen": "^8.0.1",
-        "bun-types": "^1.3.7",
+        "bun-types": "^1.3.9",
         "chalk": "^5.6.2",
         "chokidar": "^5.0.0",
         "cli-highlight": "^2.1.11",
-        "commander": "^14.0.2",
+        "commander": "^14.0.3",
         "dayjs": "^1.11.19",
         "env-paths": "^4.0.0",
-        "eslint": "^9.39.2",
+        "eslint": "^10.0.2",
         "execa": "^9.6.1",
         "handlebars": "^4.7.8",
         "image-size": "^2.0.2",
         "inquirer-checkbox-plus-plus": "^1.1.1",
+        "marked": "^17.0.3",
+        "marked-terminal": "^7.3.0",
         "nanoid": "^5.1.6",
         "open": "^11.0.0",
         "pretty-bytes": "^7.1.0",
         "pretty-ms": "^9.3.0",
         "radash": "^12.1.1",
-        "semver": "^7.7.3",
+        "semver": "^7.7.4",
         "sharp": "^0.34.5",
         "terminal-link": "^5.0.0",
         "tree-node-cli": "^1.6.0",
@@ -98,10 +100,11 @@
         "@types/adm-zip": "^0.5.0",
         "@types/archiver": "^7.0.0",
         "@types/image-size": "^0.8.0",
-        "@types/node": "^25.1.0",
+        "@types/marked-terminal": "^6.1.1",
+        "@types/node": "^25.3.0",
         "@types/semver": "^7.7.1",
         "prettier": "^3.8.1",
-        "typescript-eslint": "^8.54.0"
+        "typescript-eslint": "^8.56.1"
     },
     "peerDependencies": {
         "typescript": "^5.9.3"

package/toolkit/generate.ts

@@ -1,8 +1,10 @@
-import { Argument, Command } from '@commander-js/extra-typings'
+import { Argument, Command, Option } from '@commander-js/extra-typings'
+import { exists } from 'fs/promises'
 import { join } from 'path'
 import sharp from 'sharp'
-import { createProblemWithJutgeAI } from '../lib/create-with-jutgeai'
 import { complete } from '../lib/aiclient'
+import { createFuncsProblem } from '../lib/create-funcs'
+import { createIOProblem } from '../lib/create-io'
 import { languageKeys, languageNames, proglangKeys, proglangNames } from '../lib/data'
 import {
     addAlternativeSolution,
@@ -11,11 +13,11 @@ import {
     generateStatementFromSolution,
     generateTestCasesGenerator,
 } from '../lib/generate'
+import { getLoggedInJutgeClient } from '../lib/login'
 import { newProblem } from '../lib/problem'
 import { settings } from '../lib/settings'
 import tui from '../lib/tui'
 import { writeText } from '../lib/utils'
-import { getLoggedInJutgeClient } from '../lib/login'
 
 export const generateCmd = new Command('generate')
     .description('Generate problem elements using JutgeAI')
@@ -28,16 +30,80 @@ generateCmd
     .command('problem')
     .description('Generate a problem with JutgeAI')
 
+    .summary(`Generate a problem with JutgeAI
+
+Use this command to generate a problem with JutgeAI from a specification.
+
+There are currently two types of problems that can be generated:
+
+- io: The problem consists of reading input from standard input and writing output to standard output.
+
+    Current implementation supports C, C++, Python, Haskell, Java, Rust, R and Clojure programming languages.
+    
+    The following items will be generated:
+        - problem statement in original language
+        - sample test cases
+        - private test cases
+        - golden solution 
+        - translations of the problem statement into other languages
+        - alternative solutions in other programming languages
+        - test cases generators
+        - a README.md file describing the problem and LLM usage
+
+- funcs: The problem consists of implementing one or more functions.
+
+    Current implementation supports Python, Haskell and Clojure programming languages (through RunPython, RunHaskell and RunClojure compilers).
+
+    The following items will be generated:
+        - problem statement in original language
+        - translations of the problem statement into other languages
+        - generate sample.dt for Python
+        - sample test cases
+        - private test cases for each function
+        - golden solution
+        - alternative solutions in other programming languages
+        - scores.yml file with the scores for each function (if there is more than one function)
+        - a README.md file describing the problem and LLM usage
+
+Problem generation needs a problem specification:
+    - If --input is provided, the system will read the given input specification file.
+    - If --output is provided, the system will write the problem specification to the given output specification file.
+    - The system will ask interactively for the problem specification (using the values in the --input specification file if provided as defaults)
+    - unless the --do-not-ask flag is given.
+
+Treat the generated problem as a starting draft. You should edit the problem directory manually after the generation.
+`)
+
+    .addOption(
+        new Option
+            ('-k, --kind <kind>', 'problem kind')
+            .default('io')
+            .choices(['io', 'funcs'])
+    )
     .option('-d, --directory <path>', 'output directory', 'new-problem.pbm')
     .option('-i, --input <path>', 'input specification file')
     .option('-o, --output <path>', 'output specification file')
     .option('-n, --do-not-ask', 'do not ask interactively if --input given', false)
     .option('-m, --model <model>', 'AI model to use', settings.defaultModel)
 
-    .action(async ({ input, output, directory, model, doNotAsk }) => {
+    .action(async ({ input, output, directory, model, doNotAsk, kind }) => {
         const jutge = await getLoggedInJutgeClient()
-        await tui.section('Generating problem with JutgeAI', async () => {
-            await createProblemWithJutgeAI(jutge, model, directory, input, output, doNotAsk)
+        await tui.section(`Generating ${kind} problem with JutgeAI`, async () => {
+
+            if (await exists(directory)) {
+                throw new Error(`Directory ${directory} already exists`)
+            }
+            if (!directory.endsWith('.pbm')) {
+                throw new Error('The output directory must end with .pbm')
+            }
+
+            if (kind === 'io') {
+                await createIOProblem(jutge, model, directory, input, output, doNotAsk)
+            } else if (kind === 'funcs') {
+                await createFuncsProblem(jutge, model, directory, input, output, doNotAsk)
+            } else {
+                throw new Error(`Invalid problem kind: ${kind as string}`)
+            }
         })
     })
 
@@ -211,7 +277,7 @@ The new image will be saved as award.png in the problem directory, overriding an
     .action(async (prompt, { directory, model }) => {
         const jutge = await getLoggedInJutgeClient()
         const output = join(directory, 'award.png')
-        const problem = await newProblem(directory)
+        await newProblem(directory)
         let imagePrompt = prompt.trim()
         if (imagePrompt === '') {
             imagePrompt = 'A colorful award on a white background'