@jpetit/toolkit 3.0.5 → 3.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@jpetit/toolkit",
-    "version": "3.0.5",
+    "version": "3.0.7",
     "publishConfig": {
         "access": "public"
     },
@@ -8,13 +8,16 @@
     "type": "module",
     "bin": "toolkit/index.ts",
     "scripts": {
-        "build": "bun run build-assets && bun build toolkit --compile --outfile toolkit.exe",
-        "build-assets": "rm assets.zip && zip assets.zip -r assets",
         "lint": "eslint .",
         "format": "bun prettier . --write",
         "depcheck": "bunx depcheck --ignores='bun,bun:test'"
     },
+    "files": [
+        "dist",
+        "assets"
+    ],
     "dependencies": {
+        "@commander-js/extra-typings": "^14.0.0",
         "@eslint/js": "^9.39.2",
         "@inquirer/prompts": "^8.1.0",
         "boxen": "^8.0.1",
@@ -23,7 +26,9 @@
         "commander": "^14.0.2",
         "env-paths": "^3.0.0",
         "eslint": "^9.39.2",
+        "execa": "^9.6.1",
         "fflate": "^0.8.2",
+        "glob": "^13.0.0",
         "gpt-tokenizer": "^3.4.0",
         "human-id": "^4.1.3",
         "image-size": "^2.0.2",
@@ -32,21 +37,22 @@
         "multi-llm-ts": "^4.6.2",
         "nanoid": "^5.1.6",
         "ora": "^9.0.0",
-        "@commander-js/extra-typings": "^14.0.0",
         "prettier": "^3.7.4",
         "pretty-bytes": "^7.1.0",
         "pretty-ms": "^9.3.0",
         "radash": "^12.1.1",
         "slug": "^11.0.1",
         "typescript-eslint": "^8.50.0",
+        "yaml": "^2.8.2",
         "zod": "^4.2.1"
     },
     "devDependencies": {
+        "@types/bun": "1.3.5",
         "@types/image-size": "^0.8.0",
         "@types/marked": "^6.0.0",
         "@types/marked-terminal": "^6.1.1",
+        "@types/node": "^25.0.3",
         "@types/ora": "^3.2.0",
-        "@types/bun": "1.3.5",
         "@types/slug": "^5.0.9"
     },
     "peerDependencies": {

package/toolkit/index.ts

@@ -1,7 +1,6 @@
 #!/usr/bin/env bun
 
 import { confirm } from '@inquirer/prompts'
-
 import { program } from '@commander-js/extra-typings'
 import { ai } from './ai'
 import { compilers } from './compilers'
@@ -11,13 +10,20 @@ import { create } from './create'
 import { doctor } from './doctor'
 import { init } from './init'
 import { verify } from './verify'
+import { readFileSync } from 'fs'
+import { fileURLToPath } from 'url'
+import { dirname, join } from 'path'
+
+const __filename = fileURLToPath(import.meta.url)
+const __dirname = join(dirname(__filename), '..')
+const packageJson = JSON.parse(readFileSync(join(__dirname, 'package.json'), 'utf8'))
+
+program.version(packageJson.version as string)
 
 program.name('jutge-toolkit')
 
 program.description('Toolkit to prepare problems for Jutge.org')
 
-program.version('3.0.0')
-
 program.addCommand(init)
 program.addCommand(create)
 program.addCommand(make)

package/.prettierignore

@@ -1,11 +0,0 @@
-data
-prisma
-.next
-.cache
-package-lock.json
-public
-node_modules
-next-env.d.ts
-next.config.ts
-yarn.lock
-problems

package/.prettierrc.json

@@ -1,9 +0,0 @@
-{
-    "semi": false,
-    "singleQuote": true,
-    "trailingComma": "all",
-    "tabWidth": 4,
-    "useTabs": false,
-    "arrowParens": "always",
-    "printWidth": 120
-}

package/.vscode/settings.json

@@ -1,26 +0,0 @@
-{
-    "editor.defaultFormatter": "esbenp.prettier-vscode",
-    "[javascript]": {
-        "editor.defaultFormatter": "esbenp.prettier-vscode"
-    },
-    "editor.tabSize": 4,
-    "editor.insertSpaces": true,
-    "editor.indentSize": "tabSize",
-    "editor.detectIndentation": false,
-    "files.exclude": {
-        "**/node_modules": true,
-        "**/.next": true,
-        "**/data/quizzes": true,
-        "**/prisma/generated": true
-    },
-    "explorer.sortOrder": "filesFirst",
-    "[c]": {
-        "editor.defaultFormatter": "ms-vscode.cpptools"
-    },
-    "[java]": {
-        "editor.defaultFormatter": "redhat.java"
-    },
-    "[cpp]": {
-        "editor.defaultFormatter": "ms-vscode.cpptools"
-    }
-}

package/eslint.config.mjs

@@ -1,31 +0,0 @@
-// @ts-check
-
-import eslint from '@eslint/js'
-import { globalIgnores } from 'eslint/config'
-import tseslint from 'typescript-eslint'
-
-export default tseslint.config(
-    eslint.configs.recommended,
-    tseslint.configs.recommended,
-    [globalIgnores(['postcss.config.mjs', 'eslint.config.mjs', 'lib/compilers/_frompython.ts'])],
-
-    tseslint.configs.recommendedTypeChecked,
-    {
-        languageOptions: {
-            parserOptions: {
-                projectService: true,
-                tsconfigRootDir: import.meta.dirname,
-            },
-        },
-    },
-    {
-        rules: {
-            '@typescript-eslint/no-explicit-any': 'off',
-            '@typescript-eslint/no-unsafe-assignment': 'off',
-            '@typescript-eslint/no-unused-vars': 'off',
-            '@typescript-eslint/no-unsafe-member-access': 'off',
-            // '@typescript-eslint/no-unsafe-return': 'off',
-            // '@typescript-eslint/no-unsafe-argument': 'off',
-        },
-    },
-)

package/lib/ai.ts

@@ -1,138 +0,0 @@
-import { encode } from 'gpt-tokenizer'
-import { estimateCost } from 'gpt-tokenizer/model/gpt-5'
-import { igniteModel, LlmModel, loadModels, logger, Message } from 'multi-llm-ts'
-
-// do not log anything from multi-llm-ts
-logger.disable()
-
-export async function complete(model: string, systemPrompt: string, userPrompt: string): Promise<string> {
-    const parts = model.split('/')
-    const providerName = parts[0]!
-    const modelName = parts[1]!
-
-    const config = { apiKey: process.env[keys[providerName]!] || '' }
-
-    const models = await loadModels(providerName, config)
-    // console.log(models)
-    const chat = models!.chat.find((m) => m.id === modelName)!
-
-    const bot = igniteModel(providerName, chat, config)
-    const messages = [new Message('system', systemPrompt), new Message('user', userPrompt)]
-    const response = await bot.complete(messages)
-    return response.content!
-}
-
-type ModelInfo = Record<string, Record<string, string[]>>
-
-export async function listModels(): Promise<ModelInfo> {
-    const result: ModelInfo = {}
-    const providers = Object.keys(keys).sort()
-    for (const providerName of providers) {
-        if (providerName === 'ollama') continue // Ollama models are local, skip for now
-        const config = { apiKey: process.env[keys[providerName]!] || '' }
-        const models = await loadModels(providerName, config)
-        if (models === null) continue
-        result[providerName] = {}
-        for (const modelType in models) {
-            result[providerName][modelType] = []
-            for (const model of models.chat) {
-                result[providerName][modelType].push(model.id)
-            }
-        }
-    }
-    return result
-}
-
-export class ChatBot {
-    private model: string
-    private bot: LlmModel | null = null
-    private messages: Message[]
-    public totalInputTokens: number = 0
-    public totalOutputTokens: number = 0
-    public totalInputCost: number = 0
-    public totalOutputCost: number = 0
-
-    constructor(model: string, systemPrompt: string) {
-        this.model = model
-        this.messages = [new Message('system', systemPrompt)]
-    }
-
-    async init() {
-        const parts = this.model.split('/')
-        const providerName = parts[0]!
-        const modelName = parts[1]!
-        const config = { apiKey: process.env[keys[providerName]!] || '' }
-        const models = await loadModels(providerName, config)
-        const chat = models!.chat.find((m: any) => m.id === modelName)!
-        this.bot = igniteModel(providerName, chat, config)
-    }
-
-    async complete(userPrompt: string): Promise<string> {
-        if (!this.bot) {
-            throw new Error(`Model '${this.model}' could not be initialized`)
-        }
-
-        this.messages.push(new Message('user', userPrompt))
-        const response = await this.bot.complete(this.messages)
-        this.messages.push(new Message('assistant', response.content))
-
-        const inputTokens = encode(userPrompt).length
-        const outputTokens = encode(response.content!).length
-        const inputCost = estimateCost(inputTokens)
-        const outputCost = estimateCost(outputTokens)
-
-        this.totalInputTokens += inputTokens
-        this.totalOutputTokens += outputTokens
-        this.totalInputCost += inputCost.main!.input!
-        this.totalOutputCost += outputCost.main!.output!
-
-        return response.content!
-    }
-
-    forgetLastInteraction() {
-        if (this.messages.length > 2) {
-            this.messages.pop()
-            this.messages.pop()
-        }
-    }
-
-    modelInformation(): any {
-        if (!this.bot) {
-            throw new Error(`Model '${this.model}' has not been initialized`)
-        }
-        return this.bot.model
-    }
-}
-
-export type PowerEstimation = {
-    wattHours: number
-    joules: number
-    co2Grams: number
-    trees: number
-}
-
-export function estimatePowerConsumption(inputTokens: number, outputTokens: number): PowerEstimation {
-    // Written by Claude.ai
-
-    // Very rough estimates based on public data
-    // One tree absorbs approximately:
-    // - 22 kg (22,000g) of CO2 per year on average
-    // - 1 ton (1,000,000g) over its lifetime (~40 years)
-
-    const wattsPerToken = 0.0003 // ~0.3 milliwatts per token
-    const totalTokens = inputTokens + outputTokens
-    const co2PerTree = 22000
-
-    return {
-        wattHours: (totalTokens * wattsPerToken) / 3600, // Convert to Wh
-        joules: totalTokens * wattsPerToken,
-        co2Grams: ((totalTokens * wattsPerToken) / 3600) * 0.5, // Rough CO2 estimate
-        trees: (((totalTokens * wattsPerToken) / 3600) * 0.5) / co2PerTree,
-    }
-}
-
-const keys: Record<string, string> = {
-    google: 'GEMINI_API_KEY',
-    openai: 'OPENAI_API_KEY',
-    ollama: '',
-}

package/lib/assets.ts

@@ -1,31 +0,0 @@
-import zipFile from '@/assets.zip' with { type: 'file' }
-import chalk from 'chalk'
-import { unzipSync } from 'fflate'
-import { mkdir, rm } from 'fs/promises'
-import { join } from 'path'
-import { paths } from './settings'
-import * as tui from './tui.js'
-
-export async function decompressAssets() {
-    await tui.section('Decompressing assets', async () => {
-        const destination = paths.data
-        tui.action(`Decompressing assets to ${destination}`)
-        const bytes = await Bun.file(zipFile).arrayBuffer()
-        const zipBuffer = new Uint8Array(bytes)
-
-        await rm(destination, { recursive: true, force: true })
-        await mkdir(destination, { recursive: true })
-
-        const unzipped = unzipSync(zipBuffer)
-        for (const [filePath, content] of Object.entries(unzipped)) {
-            // console.log(chalk.magenta(filePath))
-            const fullPath = join(destination, filePath)
-            if (filePath.endsWith('/')) {
-                await mkdir(fullPath, { recursive: true })
-            } else {
-                await Bun.write(fullPath, content)
-            }
-        }
-        tui.success('Assets decompressed')
-    })
-}

package/lib/cleaner.ts

@@ -1,58 +0,0 @@
-import { confirm } from '@inquirer/prompts'
-import * as tui from '@/lib/tui.js'
-import { readdir, unlink } from 'fs/promises'
-import { join } from 'path'
-
-export async function cleanFiles(force: boolean, directory: string): Promise<void> {
-    const patterns = [
-        '\\.exe$',
-        '\\.cor$',
-        '\\.out$',
-        '\\.class$',
-        '\\.o$',
-        '\\.ho$',
-        '~$',
-        '^problem\\.[a-z][a-z]\\.pdf$',
-        '^problem\\.[a-z][a-z]\\.ps$',
-        '^a\\.out$',
-    ]
-    const pattern = new RegExp(patterns.join('|'))
-
-    const entries = await readdir(directory, { withFileTypes: true })
-
-    const removalList: string[] = []
-    for (const entry of entries) {
-        const fullPath = join(directory, entry.name)
-        if (entry.isFile() && pattern.test(entry.name)) {
-            removalList.push(fullPath)
-        }
-    }
-
-    if (removalList.length === 0) {
-        tui.success('No files to remove')
-        return
-    }
-
-    tui.warning(`The following ${removalList.length} files will be removed:`)
-    for (const elem of removalList.sort()) {
-        tui.print(elem)
-    }
-    console.log()
-
-    if (!force) {
-        const conformation = await confirm({ message: `Remove ${removalList.length} files?`, default: false })
-        if (!conformation) return
-    }
-
-    let removalCount = 0
-    for (const elem of removalList) {
-        try {
-            await unlink(elem)
-            removalCount++
-        } catch (error) {
-            tui.error(`Could not remove file ${elem}`)
-        }
-    }
-
-    tui.success(`Removed ${removalCount} files`)
-}