-
Notifications
You must be signed in to change notification settings - Fork 93
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add Google Gemini/AIStudio plugin #66
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
name: Gemini tests | ||
|
||
on: pull_request | ||
|
||
jobs: | ||
test-gemini: | ||
name: Run tests | ||
runs-on: macos-latest | ||
steps: | ||
- uses: actions/checkout@v4 | ||
- name: Cache test model | ||
id: cache-model | ||
uses: actions/cache@v4 | ||
with: | ||
path: /Users/runner/.humanifyjs/models/ | ||
key: models-phi | ||
- name: Checkout code | ||
uses: actions/checkout@v3 | ||
- uses: actions/setup-node@v4 | ||
with: | ||
node-version: 20 | ||
cache: "npm" | ||
- run: npm install --ci | ||
- run: npm run build | ||
- run: npm run download-ci-model | ||
- run: npm run test:gemini | ||
env: | ||
GEMINI_API_KEY: ${{secrets.GEMINI_API_KEY}} |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
import { cli } from "../cli.js"; | ||
import prettier from "../plugins/prettier.js"; | ||
import { unminify } from "../unminify.js"; | ||
import babel from "../plugins/babel/babel.js"; | ||
import { verbose } from "../verbose.js"; | ||
import { geminiRename } from "../plugins/gemini-rename.js"; | ||
import { env } from "../env.js"; | ||
|
||
export const azure = cli() | ||
.name("gemini") | ||
Comment on lines
+9
to
+10
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. From a code maintenance perspective, I wonder if the export |
||
.description("Use Google Gemini/AIStudio API to unminify code") | ||
.option("-m, --model <model>", "The model to use", "gemini-1.5-flash") | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I wonder if this could be made a 'flexible enum' or similarly provide a list of other useful model names that could be used here in it's help/similar? (while not limiting the model chosen to a fixed list so it doesn't need to be updated for every new model release) |
||
.option("-o, --outputDir <output>", "The output directory", "output") | ||
.option( | ||
"-k, --apiKey <apiKey>", | ||
"The Google Gemini/AIStudio API key. Alternatively use GEMINI_API_KEY environment variable" | ||
) | ||
.option("--verbose", "Show verbose output") | ||
.argument("input", "The input minified Javascript file") | ||
.action(async (filename, opts) => { | ||
if (opts.verbose) { | ||
verbose.enabled = true; | ||
} | ||
|
||
const apiKey = opts.apiKey ?? env("GEMINI_API_KEY"); | ||
await unminify(filename, opts.outputDir, [ | ||
babel, | ||
geminiRename({ apiKey, model: opts.model }), | ||
prettier | ||
]); | ||
}); |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,64 @@ | ||
import { visitAllIdentifiers } from "./local-llm-rename/visit-all-identifiers.js"; | ||
import { verbose } from "../verbose.js"; | ||
import { showPercentage } from "../progress.js"; | ||
import { | ||
GoogleGenerativeAI, | ||
ModelParams, | ||
SchemaType | ||
} from "@google/generative-ai"; | ||
|
||
export function geminiRename({ | ||
apiKey, | ||
model: modelName | ||
}: { | ||
apiKey: string; | ||
model: string; | ||
}) { | ||
const client = new GoogleGenerativeAI(apiKey); | ||
|
||
return async (code: string): Promise<string> => { | ||
return await visitAllIdentifiers( | ||
code, | ||
async (name, surroundingCode) => { | ||
verbose.log(`Renaming ${name}`); | ||
verbose.log("Context: ", surroundingCode); | ||
|
||
const model = client.getGenerativeModel( | ||
toRenameParams(name, modelName) | ||
); | ||
|
||
const result = await model.generateContent(surroundingCode); | ||
|
||
const renamed = JSON.parse(result.response.text()).newName; | ||
|
||
verbose.log(`Renamed to ${renamed}`); | ||
|
||
return renamed; | ||
}, | ||
showPercentage | ||
); | ||
}; | ||
} | ||
|
||
function toRenameParams(name: string, model: string): ModelParams { | ||
return { | ||
model, | ||
systemInstruction: `Rename Javascript variables/function \`${name}\` to have descriptive name based on their usage in the code."`, | ||
generationConfig: { | ||
responseMimeType: "application/json", | ||
responseSchema: { | ||
nullable: false, | ||
description: "The new name for the variable/function", | ||
type: SchemaType.OBJECT, | ||
properties: { | ||
newName: { | ||
type: SchemaType.STRING, | ||
nullable: false, | ||
description: `The new name for the variable/function called \`${name}\`` | ||
} | ||
}, | ||
required: ["newName"] | ||
} | ||
} | ||
}; | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,47 @@ | ||
import test from "node:test"; | ||
import { readFile, rm } from "node:fs/promises"; | ||
import { testPrompt } from "./test-prompt.js"; | ||
import { gbnf } from "../plugins/local-llm-rename/gbnf.js"; | ||
import assert from "node:assert"; | ||
import { humanify } from "../test-utils.js"; | ||
|
||
const TEST_OUTPUT_DIR = "test-output"; | ||
|
||
test.afterEach(async () => { | ||
await rm(TEST_OUTPUT_DIR, { recursive: true, force: true }); | ||
}); | ||
|
||
test("Unminifies an example file successfully", async () => { | ||
const fileIsMinified = async (filename: string) => { | ||
const prompt = await testPrompt(); | ||
return await prompt( | ||
`Your job is to read the following code and rate it's readabillity and variable names. Answer "EXCELLENT", "GOOD" or "UNREADABLE".`, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Type: readabillity -> readability |
||
await readFile(filename, "utf-8"), | ||
gbnf`${/("EXCELLENT" | "GOOD" | "UNREADABLE") [^.]+/}.` | ||
); | ||
}; | ||
const expectStartsWith = (expected: string[], actual: string) => { | ||
assert( | ||
expected.some((e) => actual.startsWith(e)), | ||
`Expected "${expected}" but got ${actual}` | ||
); | ||
}; | ||
|
||
await expectStartsWith( | ||
["UNREADABLE"], | ||
await fileIsMinified(`fixtures/example.min.js`) | ||
); | ||
|
||
await humanify( | ||
"gemini", | ||
"fixtures/example.min.js", | ||
"--verbose", | ||
"--outputDir", | ||
TEST_OUTPUT_DIR | ||
); | ||
|
||
await expectStartsWith( | ||
["EXCELLENT", "GOOD"], | ||
await fileIsMinified(`${TEST_OUTPUT_DIR}/deobfuscated.js`) | ||
); | ||
}); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Typo: 'provice' -> 'provide'