web search done right
npm run format
Mikkel Denker375ab7b7f979
diff --git a/frontend/package.json b/frontend/package.jsonindex 3fa221a9..2f947300 100644--- a/frontend/package.json+++ b/frontend/package.json@@ -75,7 +75,7 @@"node": "^20.10.x"},"overrides": {- "@sveltejs/kit" : {+ "@sveltejs/kit": {"cookie": "^0.7.0"}}diff --git a/tools/annotate-results/global.d.ts b/tools/annotate-results/global.d.tsindex 13d619aa..e14cbaff 100644--- a/tools/annotate-results/global.d.ts+++ b/tools/annotate-results/global.d.ts@@ -1,8 +1,13 @@declare type Item = import("svelte-dnd-action").Item;-declare type DndEvent<ItemType = Item> = import("svelte-dnd-action").DndEvent<ItemType>;+declare type DndEvent<ItemType = Item> =+ import("svelte-dnd-action").DndEvent<ItemType>;declare namespace svelteHTML {- interface HTMLAttributes<T> {- "on:consider"?: (event: CustomEvent<DndEvent<ItemType>> & {target: EventTarget & T}) => void;- "on:finalize"?: (event: CustomEvent<DndEvent<ItemType>> & {target: EventTarget & T}) => void;- }-}\ No newline at end of file+ interface HTMLAttributes<T> {+ "on:consider"?: (+ event: CustomEvent<DndEvent<ItemType>> & { target: EventTarget & T },+ ) => void;+ "on:finalize"?: (+ event: CustomEvent<DndEvent<ItemType>> & { target: EventTarget & T },+ ) => void;+ }+}diff --git a/tools/annotate-results/package.json b/tools/annotate-results/package.jsonindex b3c1e1eb..70b634c2 100644--- a/tools/annotate-results/package.json+++ b/tools/annotate-results/package.json@@ -47,4 +47,4 @@}},"type": "module"-}\ No newline at end of file+}diff --git a/tools/annotate-results/src/app.d.ts b/tools/annotate-results/src/app.d.tsindex 843ae573..28dcb5af 100644--- a/tools/annotate-results/src/app.d.ts+++ b/tools/annotate-results/src/app.d.ts@@ -1,4 +1,4 @@-import 'unplugin-icons/types/svelte'+import "unplugin-icons/types/svelte";// See https://kit.svelte.dev/docs/types#app// for information about these interfacesdeclare global {diff --git a/tools/annotate-results/src/lib/db.ts b/tools/annotate-results/src/lib/db.tsindex 62911aa2..10236692 100644--- a/tools/annotate-results/src/lib/db.ts+++ b/tools/annotate-results/src/lib/db.ts@@ -114,7 +114,10 @@ export function getSearchResults(qid: string): SearchResult[] {}));}-export const saveSearchResults = (qid: string, searchResults: SearchResult[]) => {+export const saveSearchResults = (+ qid: string,+ searchResults: SearchResult[],+) => {const upsertSearchResults = db.prepare(`INSERT INTO search_results (qid, url, orig_rank, webpage_json, annotation)VALUES (@qid, @url, @origRank, @webpageJson, @annotation)@@ -131,7 +134,7 @@ export const saveSearchResults = (qid: string, searchResults: SearchResult[]) =>annotation: searchResult.annotation,});}-}+};export function getQuery(qid: String): Query | undefined {const query = db.prepare(`diff --git a/tools/annotate-results/src/lib/webpage.ts b/tools/annotate-results/src/lib/webpage.tsindex 803aa57b..70f9289f 100644--- a/tools/annotate-results/src/lib/webpage.ts+++ b/tools/annotate-results/src/lib/webpage.ts@@ -1,19 +1,26 @@export type SimpleWebpage = {- title: string;- url: string;- snippet: string,- rankingSignals: Record<string, number>;+ title: string;+ url: string;+ snippet: string;+ rankingSignals: Record<string, number>;};export const asSimpleWebpage = (webpage: Webpage): SimpleWebpage => {- return {- title: webpage.title,- url: webpage.url,- snippet: webpage.snippet.type === "normal" ? webpage.snippet.text.fragments.map(f => f.text).join("") : webpage.snippet.question.body.map(f => f.value).join(""),- rankingSignals: Object.fromEntries(Object.entries(webpage.rankingSignals).map(([key, value]) => [key, value.value])),- };-}-+ return {+ title: webpage.title,+ url: webpage.url,+ snippet:+ webpage.snippet.type === "normal"+ ? webpage.snippet.text.fragments.map((f) => f.text).join("")+ : webpage.snippet.question.body.map((f) => f.value).join(""),+ rankingSignals: Object.fromEntries(+ Object.entries(webpage.rankingSignals).map(([key, value]) => [+ key,+ value.value,+ ]),+ ),+ };+};export type Webpage = {title: string;@@ -25,8 +32,8 @@ export type Webpage = {export type RankingSignals = Record<string, RankingSignal>;export type RankingSignal = {- coefficient: number;- value: number;+ coefficient: number;+ value: number;};export type Snippet =@@ -67,4 +74,4 @@ export type CodeOrText =| {type: "text";value: string;- };\ No newline at end of file+ };diff --git a/tools/annotate-results/src/routes/annotate/[slug]/+page.server.ts b/tools/annotate-results/src/routes/annotate/[slug]/+page.server.tsindex 705d7bbe..639d5f99 100644--- a/tools/annotate-results/src/routes/annotate/[slug]/+page.server.ts+++ b/tools/annotate-results/src/routes/annotate/[slug]/+page.server.ts@@ -1,4 +1,10 @@-import { getNextQuery, getPreviousQuery, getQuery, getSearchResults, saveSearchResults } from "$lib/db";+import {+ getNextQuery,+ getPreviousQuery,+ getQuery,+ getSearchResults,+ saveSearchResults,+} from "$lib/db";import type { Webpage } from "$lib/webpage";import { asSimpleWebpage } from "$lib/webpage";import { redirect } from "@sveltejs/kit";@@ -26,7 +32,6 @@ export const load = async ({ params }) => {const { slug } = params;const qid = slug;-if (!getQuery(qid)) {throw redirect(301, "/");}@@ -39,7 +44,7 @@ export const load = async ({ params }) => {if (searchResults.length === 0) {const webpages = (await search(query.query)).map((w) => asSimpleWebpage(w));-+searchResults = webpages.map((w, i) => ({id: `${query.qid}-${w.url}`,origRank: i,@@ -53,7 +58,10 @@ export const load = async ({ params }) => {// sort results by annotation and then origRank// annotation is 0-4 where 4 is best, null is unannotatedsearchResults.sort((a, b) => {- if ((a.annotation === null && b.annotation === null) || a.annotation === b.annotation) {+ if (+ (a.annotation === null && b.annotation === null) ||+ a.annotation === b.annotation+ ) {return a.origRank - b.origRank;} else if (a.annotation === null) {return 1;@@ -65,4 +73,4 @@ export const load = async ({ params }) => {});return { query, searchResults, previousQuery, nextQuery };-};\ No newline at end of file+};diff --git a/tools/annotate-results/src/routes/annotate/[slug]/+page.svelte b/tools/annotate-results/src/routes/annotate/[slug]/+page.svelteindex ba30cac5..4113c40d 100644--- a/tools/annotate-results/src/routes/annotate/[slug]/+page.svelte+++ b/tools/annotate-results/src/routes/annotate/[slug]/+page.svelte@@ -1,9 +1,9 @@<script lang="ts">- import Home from '~icons/heroicons/home-20-solid';- import ArrowLeft from '~icons/heroicons/arrow-left-20-solid';- import ArrowRight from '~icons/heroicons/arrow-right-20-solid';+ import Home from "~icons/heroicons/home-20-solid";+ import ArrowLeft from "~icons/heroicons/arrow-left-20-solid";+ import ArrowRight from "~icons/heroicons/arrow-right-20-solid";import type { PageData } from "./$types";- import { browser } from '$app/environment';+ import { browser } from "$app/environment";$: shownSignals = -1;$: searchResults = data.searchResults;@@ -23,7 +23,7 @@qid: data.query.qid,results: searchResults,}),- })+ });}function handleKeyPress(event: KeyboardEvent) {@@ -62,7 +62,6 @@selected = 0;window.location.href = `/annotate/${data.nextQuery?.qid}`;}-}$: searchResults && save();@@ -70,25 +69,32 @@export let data: PageData;</script>-<div class="flex flex-col w-full items-center mt-5">- <div class="max-w-xl flex flex-col space-y-5">+<div class="mt-5 flex w-full flex-col items-center">+ <div class="flex max-w-xl flex-col space-y-5"><div class="flex w-full justify-around">- <div class="w-8 h-8">- <a href="/" class="w-full h-full text-sky-300 hover:text-sky-500">- <Home class="w-full h-full"/>+ <div class="h-8 w-8">+ <a href="/" class="h-full w-full text-sky-300 hover:text-sky-500">+ <Home class="h-full w-full" /></a></div><div class="text-xl"><div>- <b class="font-bold">Query:</b> {data.query.query}+ <b class="font-bold">Query:</b>+ {data.query.query}</div></div><div class="flex">- <a href="/annotate/{data.previousQuery?.qid}" class="text-orange-300 hover:text-orange-500">- <ArrowLeft class="w-6 h-6"/>+ <a+ href="/annotate/{data.previousQuery?.qid}"+ class="text-orange-300 hover:text-orange-500"+ >+ <ArrowLeft class="h-6 w-6" /></a>- <a href="/annotate/{data.nextQuery?.qid}" class="text-orange-300 hover:text-orange-500">- <ArrowRight class="w-6 h-6"/>+ <a+ href="/annotate/{data.nextQuery?.qid}"+ class="text-orange-300 hover:text-orange-500"+ >+ <ArrowRight class="h-6 w-6" /></a></div></div>@@ -97,9 +103,16 @@<div id={res.id}><div class="relative"><!-- svelte-ignore a11y-no-noninteractive-element-interactions -->- <div role="listitem" class="py-2 px-2 {selected == i ? 'bg-slate-300' : 'bg-slate-100'} border shadow-sm rounded-lg" on:click={() => selected = i} on:keypress={handleKeyPress}>- <div class="w-full flex justify-between">- <a href="{res.webpage.url}" target="_blank">{res.webpage.url}</a>+ <div+ role="listitem"+ class="px-2 py-2 {selected == i+ ? 'bg-slate-300'+ : 'bg-slate-100'} rounded-lg border shadow-sm"+ on:click={() => (selected = i)}+ on:keypress={handleKeyPress}+ >+ <div class="flex w-full justify-between">+ <a href={res.webpage.url} target="_blank">{res.webpage.url}</a>{#if res.annotation != null}{#if res.annotation == 4}<div class="text-green-600">{res.annotation}</div>@@ -115,17 +128,25 @@{/if}</div><div class="font-bold">- <a href="{res.webpage.url}" target="_blank">{res.webpage.title}</a>+ <a href={res.webpage.url} target="_blank">{res.webpage.title}</a+ ></div><div class="line-clamp-3 text-sm">{res.webpage.snippet}</div>- <div class="text-sm mt-2 text-slate-500">- Host centrality: {res.webpage.rankingSignals["host_centrality"].toFixed(3)}- Tracker score: {res.webpage.rankingSignals["tracker_score"].toFixed(3)}+ <div class="mt-2 text-sm text-slate-500">+ Host centrality: {res.webpage.rankingSignals[+ "host_centrality"+ ].toFixed(3)}+ Tracker score: {res.webpage.rankingSignals[+ "tracker_score"+ ].toFixed(3)}</div><div>- <button class="text-sm text-slate-500" on:click={() => shownSignals = (shownSignals == i) ? -1 : i}>+ <button+ class="text-sm text-slate-500"+ on:click={() => (shownSignals = shownSignals == i ? -1 : i)}+ >{shownSignals === i ? "Hide" : "Show"} signals</button></div>@@ -149,4 +170,4 @@</div></div>-<svelte:window on:keydown={handleKeyPress}/>\ No newline at end of file+<svelte:window on:keydown={handleKeyPress} />diff --git a/tools/annotate-results/vite.config.ts b/tools/annotate-results/vite.config.tsindex 83cf07a0..d97601bb 100644--- a/tools/annotate-results/vite.config.ts+++ b/tools/annotate-results/vite.config.ts@@ -1,12 +1,12 @@import { sveltekit } from "@sveltejs/kit/vite";import { defineConfig } from "vite";-import Icons from 'unplugin-icons/vite';+import Icons from "unplugin-icons/vite";export default defineConfig({plugins: [sveltekit(),Icons({- compiler: 'svelte',- })+ compiler: "svelte",+ }),],});diff --git a/tools/ranking-diff/README.md b/tools/ranking-diff/README.mdindex 74881963..1cd3989d 100644--- a/tools/ranking-diff/README.md+++ b/tools/ranking-diff/README.md@@ -1,17 +1,21 @@# Diff ranking algorithms+This is a tool used to visualise how changes to the ranking algorithm influences the results for different queries. It is used to try and determine if a change is beneficial or detrimental overall.## Setup-* Install the dependencies using `npm install .`-* Start the server using `npm run dev -- --open`-* In a new terminal tab, start Stract by running `just dev` in the root of the stract folder++- Install the dependencies using `npm install .`+- Start the server using `npm run dev -- --open`+- In a new terminal tab, start Stract by running `just dev` in the root of the stract folder## Usage+You will first need to add some queries that can be used for the experiments, and optionally classify these queries into a chosen set of categories. After this is done, head over to the 'Experiments' tab and add a new experiment that will be used as a baseline.After the experiment is finished, make some changes to the ranking algorithm and perform a new experiment after the changes are done. The two experiments can now be selected and compared.This should show the following page containing the common queries between the two experiments+<p align="center"><img src="assets/queries.png" width="80%" /></p>@@ -19,6 +23,7 @@ This should show the following page containing the common queries between the twSelect one of the queries which will show a side-by-side view of the results from both experiments. It is random whether the baseline or the experiment is shown on the left or right side. This can be toggled under settings. You can use the `a` and `b` keyboard shortcuts to quickly annotate the results and move to the next/previous query using the arrow keys.After some queries have been annotated, the query overview should now color improved queries green and deteriorated queries red. The category overview shows an aggregate of how the ranking change has impacted queries in the chosen categories. Clicking a category shows the queries under the particular category.+<p align="center"><img src="assets/categories.png" width="80%" />-</p>\ No newline at end of file+</p>diff --git a/tools/ranking-diff/package.json b/tools/ranking-diff/package.jsonindex ac8f5fec..2a806f7a 100644--- a/tools/ranking-diff/package.json+++ b/tools/ranking-diff/package.json@@ -50,8 +50,8 @@"ts-pattern": "^5.1.1"},"overrides": {- "@sveltejs/kit": {- "cookie": "^0.7.0"- }- }+ "@sveltejs/kit": {+ "cookie": "^0.7.0"+ }+ }}diff --git a/tools/ranking-diff/postcss.config.js b/tools/ranking-diff/postcss.config.jsindex 2aa7205d..0f772168 100644--- a/tools/ranking-diff/postcss.config.js+++ b/tools/ranking-diff/postcss.config.js@@ -1,6 +1,6 @@export default {- plugins: {- tailwindcss: {},- autoprefixer: {},- },+ plugins: {+ tailwindcss: {},+ autoprefixer: {}+ }};diff --git a/tools/ranking-diff/src/app.d.ts b/tools/ranking-diff/src/app.d.tsindex dcc03230..39256058 100644--- a/tools/ranking-diff/src/app.d.ts+++ b/tools/ranking-diff/src/app.d.ts@@ -2,13 +2,13 @@ import 'unplugin-icons/types/svelte';// See https://kit.svelte.dev/docs/types#app// for information about these interfacesdeclare global {- namespace App {- // interface Error {}- // interface Locals {}- // interface PageData {}- // interface PageState {}- // interface Platform {}- }+ namespace App {+ // interface Error {}+ // interface Locals {}+ // interface PageData {}+ // interface PageState {}+ // interface Platform {}+ }}export {};diff --git a/tools/ranking-diff/src/index.test.ts b/tools/ranking-diff/src/index.test.tsindex 964d2872..e07cbbd7 100644--- a/tools/ranking-diff/src/index.test.ts+++ b/tools/ranking-diff/src/index.test.ts@@ -1,7 +1,7 @@import { describe, it, expect } from 'vitest';describe('sum test', () => {- it('adds 1 + 2 to equal 3', () => {- expect(1 + 2).toBe(3);- });+ it('adds 1 + 2 to equal 3', () => {+ expect(1 + 2).toBe(3);+ });});diff --git a/tools/ranking-diff/src/lib/api.ts b/tools/ranking-diff/src/lib/api.tsindex d149cb52..de2f24f5 100644--- a/tools/ranking-diff/src/lib/api.ts+++ b/tools/ranking-diff/src/lib/api.ts@@ -2,148 +2,148 @@ import type { Category, Experiment, Query, LikedState } from '$lib';import type { SimpleWebpage } from './webpage';export type ApiOptions = {- fetch?: typeof fetch;+ fetch?: typeof fetch;};export const fetchExperimentById = async (- id: number,- options?: ApiOptions,+ id: number,+ options?: ApiOptions): Promise<Experiment> => {- const res = await (options?.fetch ?? fetch)(`/api/experiments/by_id`, {- method: 'POST',- body: JSON.stringify({- id,- }),- });+ const res = await (options?.fetch ?? fetch)(`/api/experiments/by_id`, {+ method: 'POST',+ body: JSON.stringify({+ id+ })+ });- const experiment = (await res.json()) as Experiment;+ const experiment = (await res.json()) as Experiment;- return experiment;+ return experiment;};export const fetchQueryById = async (id: number, options?: ApiOptions): Promise<Query> => {- const res = await (options?.fetch ?? fetch)(`/api/queries/by_id`, {- method: 'POST',- body: JSON.stringify({- id,- }),- });+ const res = await (options?.fetch ?? fetch)(`/api/queries/by_id`, {+ method: 'POST',+ body: JSON.stringify({+ id+ })+ });- const query = (await res.json()) as Query;+ const query = (await res.json()) as Query;- return query;+ return query;};export const fetchSerpByQueryAndExperiment = async (- queryId: number,- experimentId: number,- options?: ApiOptions,+ queryId: number,+ experimentId: number,+ options?: ApiOptions): Promise<SimpleWebpage[]> => {- const res = await (options?.fetch ?? fetch)(`/api/experiments/get_serp`, {- method: 'POST',- body: JSON.stringify({- queryId,- experimentId,- }),- });+ const res = await (options?.fetch ?? fetch)(`/api/experiments/get_serp`, {+ method: 'POST',+ body: JSON.stringify({+ queryId,+ experimentId+ })+ });- const serp = (await res.json()) as SimpleWebpage[];+ const serp = (await res.json()) as SimpleWebpage[];- return serp;+ return serp;};export const fetchQueriesIntersection = async (- experimentA: number,- experimentB: number,- options?: ApiOptions,+ experimentA: number,+ experimentB: number,+ options?: ApiOptions): Promise<Query[]> => {- const res = await (options?.fetch ?? fetch)(`/api/experiments/queries/intersection`, {- method: 'POST',- body: JSON.stringify({- experimentA,- experimentB,- }),- });+ const res = await (options?.fetch ?? fetch)(`/api/experiments/queries/intersection`, {+ method: 'POST',+ body: JSON.stringify({+ experimentA,+ experimentB+ })+ });- const queries = (await res.json()) as Query[];+ const queries = (await res.json()) as Query[];- return queries;+ return queries;};export const fetchAllCategories = async (options?: ApiOptions): Promise<Category[]> => {- const res = await (options?.fetch ?? fetch)(`/api/categories`);+ const res = await (options?.fetch ?? fetch)(`/api/categories`);- const categories = (await res.json()) as Category[];+ const categories = (await res.json()) as Category[];- return categories;+ return categories;};export const fetchQueriesByCategory = async (- categoryId: number,- options?: ApiOptions,+ categoryId: number,+ options?: ApiOptions): Promise<Query[]> => {- const res = await (options?.fetch ?? fetch)(`/api/categories/get_queries`, {- method: 'POST',- body: JSON.stringify({- categoryId,- }),- });+ const res = await (options?.fetch ?? fetch)(`/api/categories/get_queries`, {+ method: 'POST',+ body: JSON.stringify({+ categoryId+ })+ });- const queries = (await res.json()) as Query[];+ const queries = (await res.json()) as Query[];- return queries;+ return queries;};export const like = async (- baselineId: number,- experimentId: number,- queryId: number,- state: LikedState,- options?: ApiOptions,+ baselineId: number,+ experimentId: number,+ queryId: number,+ state: LikedState,+ options?: ApiOptions) => {- await (options?.fetch ?? fetch)(`/api/experiments/like`, {- method: 'POST',- body: JSON.stringify({- baselineId,- experimentId,- queryId,- state,- }),- });+ await (options?.fetch ?? fetch)(`/api/experiments/like`, {+ method: 'POST',+ body: JSON.stringify({+ baselineId,+ experimentId,+ queryId,+ state+ })+ });};export const unlike = async (- baselineId: number,- experimentId: number,- queryId: number,- options?: ApiOptions,+ baselineId: number,+ experimentId: number,+ queryId: number,+ options?: ApiOptions) => {- await (options?.fetch ?? fetch)(`/api/experiments/unlike`, {- method: 'POST',- body: JSON.stringify({- baselineId,- experimentId,- queryId,- }),- });+ await (options?.fetch ?? fetch)(`/api/experiments/unlike`, {+ method: 'POST',+ body: JSON.stringify({+ baselineId,+ experimentId,+ queryId+ })+ });};export const likedState = async (- baselineId: number,- experimentId: number,- queryId: number,- options?: ApiOptions,+ baselineId: number,+ experimentId: number,+ queryId: number,+ options?: ApiOptions): Promise<LikedState> => {- const res = await (options?.fetch ?? fetch)(`/api/experiments/liked_state`, {- method: 'POST',- body: JSON.stringify({- baselineId,- experimentId,- queryId,- }),- });-- const state = (await res.json()) as LikedState;-- return state;+ const res = await (options?.fetch ?? fetch)(`/api/experiments/liked_state`, {+ method: 'POST',+ body: JSON.stringify({+ baselineId,+ experimentId,+ queryId+ })+ });++ const state = (await res.json()) as LikedState;++ return state;};diff --git a/tools/ranking-diff/src/lib/db.ts b/tools/ranking-diff/src/lib/db.tsindex c7a4dbe0..fde7f564 100644--- a/tools/ranking-diff/src/lib/db.ts+++ b/tools/ranking-diff/src/lib/db.ts@@ -3,11 +3,11 @@ import Database from 'better-sqlite3';import type { SimpleWebpage } from './webpage';const db = new Database('../../data/ranking-diff.sqlite', {- fileMustExist: false,+ fileMustExist: false});const setupDB = () => {- db.exec(`+ db.exec(`CREATE TABLE IF NOT EXISTS queries (id INTEGER PRIMARY KEY AUTOINCREMENT,text TEXT NOT NULL,@@ -15,12 +15,12 @@ const setupDB = () => {);`);- db.exec(`+ db.exec(`CREATE INDEX IF NOT EXISTS queries_text_indexON queries (text);`);- db.exec(`+ db.exec(`CREATE TABLE IF NOT EXISTS experiments (id INTEGER PRIMARY KEY AUTOINCREMENT,name TEXT NOT NULL,@@ -28,7 +28,7 @@ const setupDB = () => {);`);- db.exec(`+ db.exec(`CREATE TABLE IF NOT EXISTS serps (queryId INTEGER NOT NULL,experimentId INTEGER NOT NULL,@@ -42,7 +42,7 @@ const setupDB = () => {);`);- db.exec(`+ db.exec(`CREATE TABLE IF NOT EXISTS liked_experiments (queryId INTEGER NOT NULL,baselineId INTEGER NOT NULL,@@ -59,7 +59,7 @@ const setupDB = () => {);`);- db.exec(`+ db.exec(`CREATE TABLE IF NOT EXISTS categories (id INTEGER PRIMARY KEY AUTOINCREMENT,name TEXT NOT NULL,@@ -67,7 +67,7 @@ const setupDB = () => {);`);- db.exec(`+ db.exec(`CREATE TABLE IF NOT EXISTS query_category (categoryId INTEGER NOT NULL,queryId INTEGER NOT NULL,@@ -83,127 +83,127 @@ const setupDB = () => {);`);- return db;+ return db;};export const insertQuery = (query: string) => {- const insertQuery = db.prepare(`+ const insertQuery = db.prepare(`INSERT OR IGNORE INTO queries (text)VALUES (@query)`);- insertQuery.run({ query });+ insertQuery.run({ query });};export const clearQueries = () => {- const clearQueries = db.prepare(`+ const clearQueries = db.prepare(`DELETE FROM queries`);- clearQueries.run();+ clearQueries.run();};export const deleteQuery = (id: number) => {- const deleteQuery = db.prepare(`+ const deleteQuery = db.prepare(`DELETE FROM queriesWHERE id = @id`);- deleteQuery.run({ id });+ deleteQuery.run({ id });};export const getQueries = (): Query[] => {- const query = db.prepare(`+ const query = db.prepare(`SELECT id, textFROM queries`);- return query.all() as Query[];+ return query.all() as Query[];};export const newExperiment = (name: string): Experiment => {- const insertExperiment = db.prepare(`+ const insertExperiment = db.prepare(`INSERT OR IGNORE INTO experiments (name)VALUES (@name)`);- insertExperiment.run({ name });+ insertExperiment.run({ name });- const query = db.prepare(`+ const query = db.prepare(`SELECT *FROM experimentsWHERE name = @name`);- return query.get({ name }) as Experiment;+ return query.get({ name }) as Experiment;};export const clearExperiments = () => {- const clearSerps = db.prepare(`+ const clearSerps = db.prepare(`DELETE FROM serps`);- clearSerps.run();+ clearSerps.run();- const clearExperiments = db.prepare(`+ const clearExperiments = db.prepare(`DELETE FROM experiments`);- clearExperiments.run();+ clearExperiments.run();};export const deleteExperiment = (id: number) => {- const deleteSerps = db.prepare(`+ const deleteSerps = db.prepare(`DELETE FROM serpsWHERE experimentId = @id`);- deleteSerps.run({ id });+ deleteSerps.run({ id });- const deleteExperiment = db.prepare(`+ const deleteExperiment = db.prepare(`DELETE FROM experimentsWHERE id = @id`);- deleteExperiment.run({ id });+ deleteExperiment.run({ id });};export const renameExperiment = (id: number, name: string) => {- const renameExperiment = db.prepare(`+ const renameExperiment = db.prepare(`UPDATE experimentsSET name = @nameWHERE id = @id`);- renameExperiment.run({ id, name });+ renameExperiment.run({ id, name });};export const getExperiments = (): Experiment[] => {- const query = db.prepare(`+ const query = db.prepare(`SELECT id, name, timestampFROM experimentsORDER BY id DESC`);- return query.all() as Experiment[];+ return query.all() as Experiment[];};export const addSerp = (experimentId: number, queryId: number, webpages: SimpleWebpage[]) => {- const insertSerp = db.prepare(`+ const insertSerp = db.prepare(`INSERT OR REPLACE INTO serps (queryId, experimentId, results)VALUES (@queryId, @experimentId, @results)`);- insertSerp.run({- queryId,- experimentId,- results: JSON.stringify(webpages),- });+ insertSerp.run({+ queryId,+ experimentId,+ results: JSON.stringify(webpages)+ });};export const queryIntersection = (experimentIdA: number, experimentIdB: number): Query[] => {- const query = db.prepare(`+ const query = db.prepare(`SELECT q.id, q.textFROM queries qJOIN serps sa ON sa.queryId = q.id@@ -212,47 +212,47 @@ export const queryIntersection = (experimentIdA: number, experimentIdB: number):AND sb.experimentId = @experimentIdB`);- return query.all({ experimentIdA, experimentIdB }) as Query[];+ return query.all({ experimentIdA, experimentIdB }) as Query[];};export const experimentById = (id: number): Experiment => {- const query = db.prepare(`+ const query = db.prepare(`SELECT *FROM experimentsWHERE id = @id`);- return query.get({ id }) as Experiment;+ return query.get({ id }) as Experiment;};export const queryById = (id: number): Query => {- const query = db.prepare(`+ const query = db.prepare(`SELECT *FROM queriesWHERE id = @id`);- return query.get({ id }) as Query;+ return query.get({ id }) as Query;};export const serpByQueryAndExperiment = (- queryId: number,- experimentId: number,+ queryId: number,+ experimentId: number): SimpleWebpage[] => {- const query = db.prepare(`+ const query = db.prepare(`SELECT resultsFROM serpsWHERE queryId = @queryIdAND experimentId = @experimentId`);- return JSON.parse(- (query.get({ queryId, experimentId }) as any).results as string,- ) as SimpleWebpage[];+ return JSON.parse(+ (query.get({ queryId, experimentId }) as any).results as string+ ) as SimpleWebpage[];};export const nextQuery = (experimentId: number, currentQueryId: number): Query | undefined => {- const query = db.prepare(`+ const query = db.prepare(`SELECT q.id, q.textFROM queries qJOIN serps sa ON sa.queryId = q.id@@ -262,11 +262,11 @@ export const nextQuery = (experimentId: number, currentQueryId: number): Query |LIMIT 1`);- return query.get({ experimentId, currentQueryId }) as Query;+ return query.get({ experimentId, currentQueryId }) as Query;};export const previousQuery = (experimentId: number, currentQueryId: number): Query | undefined => {- const query = db.prepare(`+ const query = db.prepare(`SELECT q.id, q.textFROM queries qJOIN serps sa ON sa.queryId = q.id@@ -276,15 +276,15 @@ export const previousQuery = (experimentId: number, currentQueryId: number): QueLIMIT 1`);- return query.get({ experimentId, currentQueryId }) as Query;+ return query.get({ experimentId, currentQueryId }) as Query;};export const likedState = (- baselineId: number,- experimentId: number,- queryId: number,+ baselineId: number,+ experimentId: number,+ queryId: number): LikedState => {- const query = db.prepare(`+ const query = db.prepare(`SELECT likedStateFROM liked_experimentsWHERE experimentId = @experimentId@@ -292,115 +292,115 @@ export const likedState = (AND baselineId = @baselineId`);- const res = query.get({ baselineId, experimentId, queryId });+ const res = query.get({ baselineId, experimentId, queryId });- if (res) {- return (res as any).likedState as LikedState;- }+ if (res) {+ return (res as any).likedState as LikedState;+ }- return 'none';+ return 'none';};export const like = (- baselineId: number,- experimentId: number,- queryId: number,- state: LikedState,+ baselineId: number,+ experimentId: number,+ queryId: number,+ state: LikedState) =>- db- .prepare(- `+ db+ .prepare(+ `INSERT OR IGNORE INTO liked_experiments (baselineId, experimentId, queryId, likedState)VALUES (@baselineId, @experimentId, @queryId, @state)- `,- )- .run({ baselineId, experimentId, queryId, state });+ `+ )+ .run({ baselineId, experimentId, queryId, state });export const unlike = (baselineId: number, experimentId: number, queryId: number) =>- db- .prepare(- `+ db+ .prepare(+ `DELETE FROM liked_experimentsWHERE experimentId = @experimentIdAND queryId = @queryIdAND baselineId = @baselineId- `,- )- .run({ baselineId, experimentId, queryId });+ `+ )+ .run({ baselineId, experimentId, queryId });export const addCategory = (name: string) => {- const insertCategory = db.prepare(`+ const insertCategory = db.prepare(`INSERT OR IGNORE INTO categories (name)VALUES (@name)`);- insertCategory.run({ name });+ insertCategory.run({ name });};export const removeCategory = (categoryId: number) => {- const deleteCategory = db.prepare(`+ const deleteCategory = db.prepare(`DELETE FROM categoriesWHERE id = @categoryId`);- deleteCategory.run({ categoryId });+ deleteCategory.run({ categoryId });};export const addQueryToCategory = (queryId: number, categoryId: number) => {- const insertQueryCategory = db.prepare(`+ const insertQueryCategory = db.prepare(`INSERT OR IGNORE INTO query_category (queryId, categoryId)VALUES (@queryId, @categoryId)`);- insertQueryCategory.run({ queryId, categoryId });+ insertQueryCategory.run({ queryId, categoryId });};export const removeQueryCategories = (queryId: number) => {- const deleteQueryCategory = db.prepare(`+ const deleteQueryCategory = db.prepare(`DELETE FROM query_categoryWHERE queryId = @queryId`);- deleteQueryCategory.run({ queryId });+ deleteQueryCategory.run({ queryId });};export const getCategories = (): Category[] => {- const query = db.prepare(`+ const query = db.prepare(`SELECT id, nameFROM categories`);- return query.all() as Category[];+ return query.all() as Category[];};export const getQueriesByCategory = (categoryId: number) => {- const query = db.prepare(`+ const query = db.prepare(`SELECT q.id, q.textFROM queries qJOIN query_category qc ON qc.queryId = q.idWHERE categoryId = @categoryId`);- return query.all({ categoryId });+ return query.all({ categoryId });};export const getQueryCategories = (queryId: number): Category[] => {- const query = db.prepare(`+ const query = db.prepare(`SELECT c.id, c.nameFROM categories cJOIN query_category qc ON qc.categoryId = c.idWHERE queryId = @queryId`);- return query.all({ queryId }) as Category[];+ return query.all({ queryId }) as Category[];};export const clearCategories = () => {- const clearCategories = db.prepare(`+ const clearCategories = db.prepare(`DELETE FROM categories`);- clearCategories.run();+ clearCategories.run();};setupDB();diff --git a/tools/ranking-diff/src/lib/index.ts b/tools/ranking-diff/src/lib/index.tsindex 9ee468cb..3169cf9c 100644--- a/tools/ranking-diff/src/lib/index.ts+++ b/tools/ranking-diff/src/lib/index.ts@@ -3,22 +3,22 @@ import type { SimpleWebpage } from './webpage';export type LikedState = 'baseline' | 'experiment' | 'none';export type Experiment = {- id: number;- name: string;- timestamp: string;+ id: number;+ name: string;+ timestamp: string;};export type Query = {- id: number;- text: string;+ id: number;+ text: string;};export type ExperimentResult = {- experiment: Experiment;- serp: SimpleWebpage[];+ experiment: Experiment;+ serp: SimpleWebpage[];};export type Category = {- id: number;- name: string;+ id: number;+ name: string;};diff --git a/tools/ranking-diff/src/lib/stores.ts b/tools/ranking-diff/src/lib/stores.tsindex 374b64ba..ab0320f2 100644--- a/tools/ranking-diff/src/lib/stores.ts+++ b/tools/ranking-diff/src/lib/stores.ts@@ -2,44 +2,44 @@ import { browser } from '$app/environment';import { writable } from 'svelte/store';const parseJSONWithFallback = <T>(json: string, fallback: T, message = '') => {- try {- return JSON.parse(json);- } catch (e) {- if (message) console.warn(message, { json });- return fallback;- }+ try {+ return JSON.parse(json);+ } catch (e) {+ if (message) console.warn(message, { json });+ return fallback;+ }};const writableLocalStorage = <T>(- key: string,- defaultValue: T,- storage = browser && localStorage,+ key: string,+ defaultValue: T,+ storage = browser && localStorage) => {- const storedValue = storage && storage.getItem(key);- const store = writable<T>(- typeof storedValue == 'string'- ? parseJSONWithFallback(storedValue, defaultValue, `Failed to parse value stored in '${key}'`)- : defaultValue,- );-- store.subscribe(($value) => {- if (browser && storage) {- if (typeof $value == 'undefined') {- storage.removeItem(key);- } else {- storage.setItem(key, JSON.stringify($value));- }- }- });-- const { set } = store;- store.set = (value: T) => {- if (storage) {- set(value);- }- };-- return store;+ const storedValue = storage && storage.getItem(key);+ const store = writable<T>(+ typeof storedValue == 'string'+ ? parseJSONWithFallback(storedValue, defaultValue, `Failed to parse value stored in '${key}'`)+ : defaultValue+ );++ store.subscribe(($value) => {+ if (browser && storage) {+ if (typeof $value == 'undefined') {+ storage.removeItem(key);+ } else {+ storage.setItem(key, JSON.stringify($value));+ }+ }+ });++ const { set } = store;+ store.set = (value: T) => {+ if (storage) {+ set(value);+ }+ };++ return store;};const SHUFFLE_EXPERIMENTS = 'shuffleExperiments';@@ -50,6 +50,6 @@ export const showSignalsStore = writableLocalStorage<boolean>(SHOW_SIGNALS, falsconst SEARCH_API = 'searchApi';export const searchApiStore = writableLocalStorage<string>(- SEARCH_API,- 'http://localhost:3000/beta/api/search',+ SEARCH_API,+ 'http://localhost:3000/beta/api/search');diff --git a/tools/ranking-diff/src/lib/webpage.ts b/tools/ranking-diff/src/lib/webpage.tsindex 802a88a9..87526092 100644--- a/tools/ranking-diff/src/lib/webpage.ts+++ b/tools/ranking-diff/src/lib/webpage.ts@@ -1,74 +1,74 @@export type SimpleWebpage = {- title: string;- url: string;- snippet: string;- rankingSignals: Record<string, number>;+ title: string;+ url: string;+ snippet: string;+ rankingSignals: Record<string, number>;};export const asSimpleWebpage = (webpage: Webpage): SimpleWebpage => {- return {- title: webpage.title,- url: webpage.url,- snippet: webpage.snippet.text.fragments.map((f) => f.text).join(''),- rankingSignals: Object.fromEntries(- Object.entries(webpage.rankingSignals).map(([key, value]) => [- key,- value.coefficient * value.value,- ]),- ),- };+ return {+ title: webpage.title,+ url: webpage.url,+ snippet: webpage.snippet.text.fragments.map((f) => f.text).join(''),+ rankingSignals: Object.fromEntries(+ Object.entries(webpage.rankingSignals).map(([key, value]) => [+ key,+ value.coefficient * value.value+ ])+ )+ };};export type Webpage = {- title: string;- url: string;- snippet: Snippet;- richSnippet: RichSnippet;- rankingSignals: RankingSignals;+ title: string;+ url: string;+ snippet: Snippet;+ richSnippet: RichSnippet;+ rankingSignals: RankingSignals;};export type RankingSignals = Record<string, RankingSignal>;export type RankingSignal = {- coefficient: number;- value: number;+ coefficient: number;+ value: number;};export type Snippet = {- date?: string;- text: TextSnippet;+ date?: string;+ text: TextSnippet;};export type RichSnippet = {- answers: StackOverflowAnswer[];- question: StackOverflowQuestion;- type: 'stackOverflowQA';+ answers: StackOverflowAnswer[];+ question: StackOverflowQuestion;+ type: 'stackOverflowQA';};export type StackOverflowAnswer = {- accepted: boolean;- body: CodeOrText[];- date: string;- upvotes: number;- url: string;+ accepted: boolean;+ body: CodeOrText[];+ date: string;+ upvotes: number;+ url: string;};export type StackOverflowQuestion = {- body: CodeOrText[];+ body: CodeOrText[];};export type TextSnippet = {- fragments: TextSnippetFragment[];+ fragments: TextSnippetFragment[];};export type TextSnippetFragment = {- kind: TextSnippetFragmentKind;- text: string;+ kind: TextSnippetFragmentKind;+ text: string;};export type TextSnippetFragmentKind = 'normal' | 'highlighted';export type CodeOrText =- | {- type: 'code';- value: string;- }- | {- type: 'text';- value: string;- };+ | {+ type: 'code';+ value: string;+ }+ | {+ type: 'text';+ value: string;+ };diff --git a/tools/ranking-diff/src/routes/+layout.svelte b/tools/ranking-diff/src/routes/+layout.svelteindex 685253dc..7deb6602 100644--- a/tools/ranking-diff/src/routes/+layout.svelte+++ b/tools/ranking-diff/src/routes/+layout.svelte@@ -1,7 +1,7 @@<script>- import '../app.css';+ import '../app.css';</script><div class="h-screen w-screen px-5 py-2">- <slot />+ <slot /></div>diff --git a/tools/ranking-diff/src/routes/+page.svelte b/tools/ranking-diff/src/routes/+page.svelteindex 1197d034..fbfd4501 100644--- a/tools/ranking-diff/src/routes/+page.svelte+++ b/tools/ranking-diff/src/routes/+page.svelte@@ -1,131 +1,131 @@<script lang="ts">- import type { Experiment, Query } from '$lib';- import { onMount } from 'svelte';- import Navbar from './components/Navbar.svelte';- import AddIcon from '~icons/heroicons/plus-circle';- import ExperimentComponent from './Experiment.svelte';- import ExperimentProgress from './ExperimentProgress.svelte';-- const getExperiments = async () => {- const res = await fetch('/api/experiments');- experiments = await res.json();- };-- const getQueries = async () => {- const res = await fetch('/api/queries');- queries = await res.json();- };-- const newExperiment = async () => {- if (queries.length == 0) {- alert('No queries available. Please add a query first.');- return;- }-- const experiment = (await fetch('/api/experiments/new', {- method: 'POST',- headers: { 'Content-Type': 'application/json' },- }).then((res) => res.json())) as Experiment;-- currentlyBuildingExperiment = experiment;- };-- const clearExperiments = async () => {- await fetch('/api/experiments/clear', { method: 'POST' });- await getExperiments();- };-- const finishExperiment = async () => {- currentlyBuildingExperiment = null;- // reload page- window.location.reload();- };-- onMount(async () => {- await getExperiments();- await getQueries();- });-- const selectExperiment = (id: number): boolean => {- if (selectedExperimentIds.length >= 2) {- return false;- }-- selectedExperimentIds = [...selectedExperimentIds, id];-- selectedExperimentIds.sort((a, b) => {- const aExp = experiments.find((e) => e.id === a)!;- const bExp = experiments.find((e) => e.id === b)!;-- return aExp.name.localeCompare(bExp.name);- });-- return true;- };-- const deselectExperiment = (id: number) => {- selectedExperimentIds = selectedExperimentIds.filter((i) => i !== id);- };-- let experiments: Experiment[] = [];- let queries: Query[] = [];-- $: selectedExperimentIds = [] as number[];-- let currentlyBuildingExperiment: Experiment | null = null;+ import type { Experiment, Query } from '$lib';+ import { onMount } from 'svelte';+ import Navbar from './components/Navbar.svelte';+ import AddIcon from '~icons/heroicons/plus-circle';+ import ExperimentComponent from './Experiment.svelte';+ import ExperimentProgress from './ExperimentProgress.svelte';++ const getExperiments = async () => {+ const res = await fetch('/api/experiments');+ experiments = await res.json();+ };++ const getQueries = async () => {+ const res = await fetch('/api/queries');+ queries = await res.json();+ };++ const newExperiment = async () => {+ if (queries.length == 0) {+ alert('No queries available. Please add a query first.');+ return;+ }++ const experiment = (await fetch('/api/experiments/new', {+ method: 'POST',+ headers: { 'Content-Type': 'application/json' }+ }).then((res) => res.json())) as Experiment;++ currentlyBuildingExperiment = experiment;+ };++ const clearExperiments = async () => {+ await fetch('/api/experiments/clear', { method: 'POST' });+ await getExperiments();+ };++ const finishExperiment = async () => {+ currentlyBuildingExperiment = null;+ // reload page+ window.location.reload();+ };++ onMount(async () => {+ await getExperiments();+ await getQueries();+ });++ const selectExperiment = (id: number): boolean => {+ if (selectedExperimentIds.length >= 2) {+ return false;+ }++ selectedExperimentIds = [...selectedExperimentIds, id];++ selectedExperimentIds.sort((a, b) => {+ const aExp = experiments.find((e) => e.id === a)!;+ const bExp = experiments.find((e) => e.id === b)!;++ return aExp.name.localeCompare(bExp.name);+ });++ return true;+ };++ const deselectExperiment = (id: number) => {+ selectedExperimentIds = selectedExperimentIds.filter((i) => i !== id);+ };++ let experiments: Experiment[] = [];+ let queries: Query[] = [];++ $: selectedExperimentIds = [] as number[];++ let currentlyBuildingExperiment: Experiment | null = null;</script><Navbar page="experiments" /><div class="flex w-full flex-col items-center">- <div class="flex">- <h1 class="text-2xl">Experiments</h1>- <button on:click={newExperiment} class="ml-2 text-green-500">- <AddIcon class="h-6 w-6" />- </button>- </div>-- <div class="mt-5 flex flex-col space-y-5">- {#if currentlyBuildingExperiment}- <ExperimentProgress- experiment={currentlyBuildingExperiment}- {queries}- on:finish={finishExperiment}- />- {/if}-- {#each experiments as experiment}- <ExperimentComponent- {experiment}- on:delete={getExperiments}- selectionCallback={selectExperiment}- deselectionCallback={deselectExperiment}- />- {/each}-- {#if experiments.length == 0}- <p class="text-gray-500">No experiments available.</p>- {/if}- </div>-- {#if experiments.length > 0}- <div>- <button- on:click={clearExperiments}- class="mt-10 h-8 w-40 rounded bg-red-500 text-white disabled:bg-gray-400"- >- Clear All- </button>-- <button- class="mt-10 h-8 w-40 rounded bg-sky-400 text-white disabled:bg-gray-400"- disabled={selectedExperimentIds.length !== 2}- on:click={() => {- window.location.href = `/experiments/compare/${selectedExperimentIds[0]}/${selectedExperimentIds[1]}`;- }}- >- Compare- </button>- </div>- {/if}+ <div class="flex">+ <h1 class="text-2xl">Experiments</h1>+ <button on:click={newExperiment} class="ml-2 text-green-500">+ <AddIcon class="h-6 w-6" />+ </button>+ </div>++ <div class="mt-5 flex flex-col space-y-5">+ {#if currentlyBuildingExperiment}+ <ExperimentProgress+ experiment={currentlyBuildingExperiment}+ {queries}+ on:finish={finishExperiment}+ />+ {/if}++ {#each experiments as experiment}+ <ExperimentComponent+ {experiment}+ on:delete={getExperiments}+ selectionCallback={selectExperiment}+ deselectionCallback={deselectExperiment}+ />+ {/each}++ {#if experiments.length == 0}+ <p class="text-gray-500">No experiments available.</p>+ {/if}+ </div>++ {#if experiments.length > 0}+ <div>+ <button+ on:click={clearExperiments}+ class="mt-10 h-8 w-40 rounded bg-red-500 text-white disabled:bg-gray-400"+ >+ Clear All+ </button>++ <button+ class="mt-10 h-8 w-40 rounded bg-sky-400 text-white disabled:bg-gray-400"+ disabled={selectedExperimentIds.length !== 2}+ on:click={() => {+ window.location.href = `/experiments/compare/${selectedExperimentIds[0]}/${selectedExperimentIds[1]}`;+ }}+ >+ Compare+ </button>+ </div>+ {/if}</div>diff --git a/tools/ranking-diff/src/routes/Experiment.svelte b/tools/ranking-diff/src/routes/Experiment.svelteindex b9496e82..bf15d83c 100644--- a/tools/ranking-diff/src/routes/Experiment.svelte+++ b/tools/ranking-diff/src/routes/Experiment.svelte@@ -1,93 +1,93 @@<script lang="ts">- import type { Experiment } from '$lib';- import DeleteIcon from '~icons/heroicons/trash';- import RenameIcon from '~icons/heroicons/pencil-square';- import { createEventDispatcher } from 'svelte';-- const deleteExperiment = async (id: number) => {- await fetch('/api/experiments/delete', {- method: 'POST',- headers: { 'Content-Type': 'application/json' },- body: JSON.stringify({ id }),- });-- dispatch('delete', { id });- };-- const renameExperiment = (id: number) => {- editable = true;- };-- const saveRename = async () => {- editable = false;-- await fetch('/api/experiments/rename', {- method: 'POST',- headers: { 'Content-Type': 'application/json' },- body: JSON.stringify({ id: experiment.id, name: paragraph?.innerText }),- });- };-- export let experiment: Experiment;- export let selectionCallback: (id: number) => boolean;- export let deselectionCallback: (id: number) => void;-- let selected: boolean = false;-- let editable = false;-- let paragraph: HTMLParagraphElement | null = null;-- const dispatch = createEventDispatcher();-- $: {- if (paragraph) {- paragraph.addEventListener('blur', async () => {- await saveRename();- });-- paragraph.addEventListener('keydown', async (e) => {- if (e.key === 'Enter') {- e.preventDefault();- await saveRename();- }- });- }-- if (editable) {- setTimeout(() => {- paragraph?.focus();- }, 10);- } else {- paragraph?.blur();- }- }-- export const onClick = () => {- if (editable) {- return;- }-- if (!selected) {- selected = selectionCallback(experiment.id);- } else {- deselectionCallback(experiment.id);- selected = false;- }- };+ import type { Experiment } from '$lib';+ import DeleteIcon from '~icons/heroicons/trash';+ import RenameIcon from '~icons/heroicons/pencil-square';+ import { createEventDispatcher } from 'svelte';++ const deleteExperiment = async (id: number) => {+ await fetch('/api/experiments/delete', {+ method: 'POST',+ headers: { 'Content-Type': 'application/json' },+ body: JSON.stringify({ id })+ });++ dispatch('delete', { id });+ };++ const renameExperiment = (id: number) => {+ editable = true;+ };++ const saveRename = async () => {+ editable = false;++ await fetch('/api/experiments/rename', {+ method: 'POST',+ headers: { 'Content-Type': 'application/json' },+ body: JSON.stringify({ id: experiment.id, name: paragraph?.innerText })+ });+ };++ export let experiment: Experiment;+ export let selectionCallback: (id: number) => boolean;+ export let deselectionCallback: (id: number) => void;++ let selected: boolean = false;++ let editable = false;++ let paragraph: HTMLParagraphElement | null = null;++ const dispatch = createEventDispatcher();++ $: {+ if (paragraph) {+ paragraph.addEventListener('blur', async () => {+ await saveRename();+ });++ paragraph.addEventListener('keydown', async (e) => {+ if (e.key === 'Enter') {+ e.preventDefault();+ await saveRename();+ }+ });+ }++ if (editable) {+ setTimeout(() => {+ paragraph?.focus();+ }, 10);+ } else {+ paragraph?.blur();+ }+ }++ export const onClick = () => {+ if (editable) {+ return;+ }++ if (!selected) {+ selected = selectionCallback(experiment.id);+ } else {+ deselectionCallback(experiment.id);+ selected = false;+ }+ };</script><button class="flex items-center gap-x-2 {selected ? 'bg-sky-100' : ''}" on:click={onClick}>- <button class="text-gray-400 hover:text-red-500" on:click={() => deleteExperiment(experiment.id)}>- <DeleteIcon class="h-4 w-4" />- </button>- <button- class="text-gray-400 hover:text-blue-500"- on:click={() => renameExperiment(experiment.id)}- >- <RenameIcon class="h-4 w-4" />- </button>- <p bind:this={paragraph} class="w-full text-center" contenteditable={editable}>- {experiment.name}- </p>+ <button class="text-gray-400 hover:text-red-500" on:click={() => deleteExperiment(experiment.id)}>+ <DeleteIcon class="h-4 w-4" />+ </button>+ <button+ class="text-gray-400 hover:text-blue-500"+ on:click={() => renameExperiment(experiment.id)}+ >+ <RenameIcon class="h-4 w-4" />+ </button>+ <p bind:this={paragraph} class="w-full text-center" contenteditable={editable}>+ {experiment.name}+ </p></button>diff --git a/tools/ranking-diff/src/routes/ExperimentProgress.svelte b/tools/ranking-diff/src/routes/ExperimentProgress.svelteindex b40ce6ed..db1f170a 100644--- a/tools/ranking-diff/src/routes/ExperimentProgress.svelte+++ b/tools/ranking-diff/src/routes/ExperimentProgress.svelte@@ -1,65 +1,65 @@<script lang="ts">- import type { Experiment, Query } from '$lib';- import { asSimpleWebpage, type SimpleWebpage, type Webpage } from '$lib/webpage';- import { createEventDispatcher, onMount } from 'svelte';- import { tweened } from 'svelte/motion';- import { searchApiStore } from '$lib/stores';+ import type { Experiment, Query } from '$lib';+ import { asSimpleWebpage, type SimpleWebpage, type Webpage } from '$lib/webpage';+ import { createEventDispatcher, onMount } from 'svelte';+ import { tweened } from 'svelte/motion';+ import { searchApiStore } from '$lib/stores';- export let experiment: Experiment;- export let queries: Query[];+ export let experiment: Experiment;+ export let queries: Query[];- const REQ_DELAY_MS = 1000;+ const REQ_DELAY_MS = 1000;- let currentQuery = 0;+ let currentQuery = 0;- const search = async (query: Query): Promise<SimpleWebpage[]> => {- const res = await fetch($searchApiStore, {- method: 'POST',- headers: { 'Content-Type': 'application/json' },- body: JSON.stringify({ query: query.text, returnRankingSignals: true }),- });+ const search = async (query: Query): Promise<SimpleWebpage[]> => {+ const res = await fetch($searchApiStore, {+ method: 'POST',+ headers: { 'Content-Type': 'application/json' },+ body: JSON.stringify({ query: query.text, returnRankingSignals: true })+ });- const data = await res.json();- const webpages = data.webpages as Webpage[];+ const data = await res.json();+ const webpages = data.webpages as Webpage[];- return webpages.map((webpage) => asSimpleWebpage(webpage));- };+ return webpages.map((webpage) => asSimpleWebpage(webpage));+ };- const addSerpToExperiment = async (query: Query, pages: SimpleWebpage[]) => {- await fetch('/api/experiments/add_serp', {- method: 'POST',- headers: { 'Content-Type': 'application/json' },- body: JSON.stringify({- experimentId: experiment.id,- queryId: query.id,- webpages: pages,- }),- });- };+ const addSerpToExperiment = async (query: Query, pages: SimpleWebpage[]) => {+ await fetch('/api/experiments/add_serp', {+ method: 'POST',+ headers: { 'Content-Type': 'application/json' },+ body: JSON.stringify({+ experimentId: experiment.id,+ queryId: query.id,+ webpages: pages+ })+ });+ };- onMount(async () => {- for (let i = 0; i < queries.length; i++) {- currentQuery = i;- progress.set(((i + 1) / queries.length) * 100);+ onMount(async () => {+ for (let i = 0; i < queries.length; i++) {+ currentQuery = i;+ progress.set(((i + 1) / queries.length) * 100);- const query = queries[i];- const pages = await search(query);- await addSerpToExperiment(query, pages);+ const query = queries[i];+ const pages = await search(query);+ await addSerpToExperiment(query, pages);- await new Promise((resolve) => setTimeout(resolve, REQ_DELAY_MS));- }+ await new Promise((resolve) => setTimeout(resolve, REQ_DELAY_MS));+ }- dispatch('finish');- });+ dispatch('finish');+ });- const dispatch = createEventDispatcher();- const progress = tweened(0, { duration: 100 });+ const dispatch = createEventDispatcher();+ const progress = tweened(0, { duration: 100 });</script><div>- <span class="flex w-full gap-x-2">- <p class="text-sm">{$progress.toFixed(0)}%</p>- <progress max="100" value={$progress}></progress>- </span>- <p class="text-sm">processing: <i>{queries[currentQuery].text}</i>...</p>+ <span class="flex w-full gap-x-2">+ <p class="text-sm">{$progress.toFixed(0)}%</p>+ <progress max="100" value={$progress}></progress>+ </span>+ <p class="text-sm">processing: <i>{queries[currentQuery].text}</i>...</p></div>diff --git a/tools/ranking-diff/src/routes/api/categories/+server.ts b/tools/ranking-diff/src/routes/api/categories/+server.tsindex f1afc0ae..64c85f08 100644--- a/tools/ranking-diff/src/routes/api/categories/+server.ts+++ b/tools/ranking-diff/src/routes/api/categories/+server.ts@@ -2,7 +2,7 @@ import type { RequestEvent } from '@sveltejs/kit';import { getCategories } from '$lib/db';export async function GET({}: RequestEvent): Promise<Response> {- const experiments = getCategories();+ const experiments = getCategories();- return new Response(JSON.stringify(experiments));+ return new Response(JSON.stringify(experiments));}diff --git a/tools/ranking-diff/src/routes/api/categories/clear/+server.ts b/tools/ranking-diff/src/routes/api/categories/clear/+server.tsindex d6353d19..fd0a088a 100644--- a/tools/ranking-diff/src/routes/api/categories/clear/+server.ts+++ b/tools/ranking-diff/src/routes/api/categories/clear/+server.ts@@ -2,6 +2,6 @@ import type { RequestEvent } from '@sveltejs/kit';import { clearCategories } from '$lib/db';export async function POST({}: RequestEvent): Promise<Response> {- clearCategories();- return new Response('OK');+ clearCategories();+ return new Response('OK');}diff --git a/tools/ranking-diff/src/routes/api/categories/delete/+server.ts b/tools/ranking-diff/src/routes/api/categories/delete/+server.tsindex 0863ba8f..caf98743 100644--- a/tools/ranking-diff/src/routes/api/categories/delete/+server.ts+++ b/tools/ranking-diff/src/routes/api/categories/delete/+server.ts@@ -2,12 +2,12 @@ import type { RequestEvent } from '@sveltejs/kit';import { removeCategory } from '$lib/db';export async function POST({ request }: RequestEvent): Promise<Response> {- const {- id,- }: {- id: number;- } = await request.json();- removeCategory(id);+ const {+ id+ }: {+ id: number;+ } = await request.json();+ removeCategory(id);- return new Response('OK');+ return new Response('OK');}diff --git a/tools/ranking-diff/src/routes/api/categories/get_queries/+server.ts b/tools/ranking-diff/src/routes/api/categories/get_queries/+server.tsindex e8bad4f4..cee1ec3d 100644--- a/tools/ranking-diff/src/routes/api/categories/get_queries/+server.ts+++ b/tools/ranking-diff/src/routes/api/categories/get_queries/+server.ts@@ -2,13 +2,13 @@ import type { RequestEvent } from '@sveltejs/kit';import { getQueriesByCategory } from '$lib/db';export async function POST({ request }: RequestEvent): Promise<Response> {- const {- categoryId,- }: {- categoryId: number;- } = await request.json();+ const {+ categoryId+ }: {+ categoryId: number;+ } = await request.json();- const queries = getQueriesByCategory(categoryId);+ const queries = getQueriesByCategory(categoryId);- return new Response(JSON.stringify(queries));+ return new Response(JSON.stringify(queries));}diff --git a/tools/ranking-diff/src/routes/api/categories/new/+server.ts b/tools/ranking-diff/src/routes/api/categories/new/+server.tsindex d8f4a1a8..05551f09 100644--- a/tools/ranking-diff/src/routes/api/categories/new/+server.ts+++ b/tools/ranking-diff/src/routes/api/categories/new/+server.ts@@ -2,13 +2,13 @@ import type { RequestEvent } from '@sveltejs/kit';import { addCategory } from '$lib/db';export async function POST({ request }: RequestEvent): Promise<Response> {- const {- name,- }: {- name: string;- } = await request.json();+ const {+ name+ }: {+ name: string;+ } = await request.json();- addCategory(name);+ addCategory(name);- return new Response('OK');+ return new Response('OK');}diff --git a/tools/ranking-diff/src/routes/api/experiments/+server.ts b/tools/ranking-diff/src/routes/api/experiments/+server.tsindex 34df346b..a7552384 100644--- a/tools/ranking-diff/src/routes/api/experiments/+server.ts+++ b/tools/ranking-diff/src/routes/api/experiments/+server.ts@@ -2,7 +2,7 @@ import type { RequestEvent } from '@sveltejs/kit';import { getExperiments } from '$lib/db';export async function GET({}: RequestEvent): Promise<Response> {- const experiments = getExperiments();+ const experiments = getExperiments();- return new Response(JSON.stringify(experiments));+ return new Response(JSON.stringify(experiments));}diff --git a/tools/ranking-diff/src/routes/api/experiments/add_serp/+server.ts b/tools/ranking-diff/src/routes/api/experiments/add_serp/+server.tsindex 030582dd..a2c13a06 100644--- a/tools/ranking-diff/src/routes/api/experiments/add_serp/+server.ts+++ b/tools/ranking-diff/src/routes/api/experiments/add_serp/+server.ts@@ -3,17 +3,17 @@ import { addSerp } from '$lib/db';import type { SimpleWebpage } from '$lib/webpage';export async function POST({ request }: RequestEvent): Promise<Response> {- const {- experimentId,- queryId,- webpages,- }: {- experimentId: number;- queryId: number;- webpages: SimpleWebpage[];- } = await request.json();+ const {+ experimentId,+ queryId,+ webpages+ }: {+ experimentId: number;+ queryId: number;+ webpages: SimpleWebpage[];+ } = await request.json();- addSerp(experimentId, queryId, webpages);+ addSerp(experimentId, queryId, webpages);- return new Response('OK');+ return new Response('OK');}diff --git a/tools/ranking-diff/src/routes/api/experiments/by_id/+server.ts b/tools/ranking-diff/src/routes/api/experiments/by_id/+server.tsindex a0279e20..b9b157ca 100644--- a/tools/ranking-diff/src/routes/api/experiments/by_id/+server.ts+++ b/tools/ranking-diff/src/routes/api/experiments/by_id/+server.ts@@ -2,12 +2,12 @@ import type { RequestEvent } from '@sveltejs/kit';import { experimentById } from '$lib/db';export async function POST({ request }: RequestEvent): Promise<Response> {- const {- id,- }: {- id: number;- } = await request.json();- const experiment = experimentById(id);+ const {+ id+ }: {+ id: number;+ } = await request.json();+ const experiment = experimentById(id);- return new Response(JSON.stringify(experiment));+ return new Response(JSON.stringify(experiment));}diff --git a/tools/ranking-diff/src/routes/api/experiments/clear/+server.ts b/tools/ranking-diff/src/routes/api/experiments/clear/+server.tsindex c7742112..31a937b4 100644--- a/tools/ranking-diff/src/routes/api/experiments/clear/+server.ts+++ b/tools/ranking-diff/src/routes/api/experiments/clear/+server.ts@@ -2,6 +2,6 @@ import type { RequestEvent } from '@sveltejs/kit';import { clearExperiments } from '$lib/db';export async function POST({}: RequestEvent): Promise<Response> {- clearExperiments();- return new Response('OK');+ clearExperiments();+ return new Response('OK');}diff --git a/tools/ranking-diff/src/routes/api/experiments/delete/+server.ts b/tools/ranking-diff/src/routes/api/experiments/delete/+server.tsindex 3386af71..1fa243e9 100644--- a/tools/ranking-diff/src/routes/api/experiments/delete/+server.ts+++ b/tools/ranking-diff/src/routes/api/experiments/delete/+server.ts@@ -2,12 +2,12 @@ import type { RequestEvent } from '@sveltejs/kit';import { deleteExperiment } from '$lib/db';export async function POST({ request }: RequestEvent): Promise<Response> {- const {- id,- }: {- id: number;- } = await request.json();- deleteExperiment(id);+ const {+ id+ }: {+ id: number;+ } = await request.json();+ deleteExperiment(id);- return new Response('OK');+ return new Response('OK');}diff --git a/tools/ranking-diff/src/routes/api/experiments/get_serp/+server.ts b/tools/ranking-diff/src/routes/api/experiments/get_serp/+server.tsindex 20f1c37a..e1a268c9 100644--- a/tools/ranking-diff/src/routes/api/experiments/get_serp/+server.ts+++ b/tools/ranking-diff/src/routes/api/experiments/get_serp/+server.ts@@ -2,15 +2,15 @@ import type { RequestEvent } from '@sveltejs/kit';import { serpByQueryAndExperiment } from '$lib/db';export async function POST({ request }: RequestEvent): Promise<Response> {- const {- experimentId,- queryId,- }: {- experimentId: number;- queryId: number;- } = await request.json();+ const {+ experimentId,+ queryId+ }: {+ experimentId: number;+ queryId: number;+ } = await request.json();- const res = serpByQueryAndExperiment(queryId, experimentId);+ const res = serpByQueryAndExperiment(queryId, experimentId);- return new Response(JSON.stringify(res));+ return new Response(JSON.stringify(res));}diff --git a/tools/ranking-diff/src/routes/api/experiments/like/+server.ts b/tools/ranking-diff/src/routes/api/experiments/like/+server.tsindex 55745aa7..9be8019c 100644--- a/tools/ranking-diff/src/routes/api/experiments/like/+server.ts+++ b/tools/ranking-diff/src/routes/api/experiments/like/+server.ts@@ -2,19 +2,19 @@ import type { RequestEvent } from '@sveltejs/kit';import { like, type LikedState } from '$lib/db';export async function POST({ request }: RequestEvent): Promise<Response> {- const {- baselineId,- experimentId,- queryId,- state,- }: {- baselineId: number;- experimentId: number;- queryId: number;- state: LikedState;- } = await request.json();+ const {+ baselineId,+ experimentId,+ queryId,+ state+ }: {+ baselineId: number;+ experimentId: number;+ queryId: number;+ state: LikedState;+ } = await request.json();- like(baselineId, experimentId, queryId, state);+ like(baselineId, experimentId, queryId, state);- return new Response('OK');+ return new Response('OK');}diff --git a/tools/ranking-diff/src/routes/api/experiments/liked_state/+server.ts b/tools/ranking-diff/src/routes/api/experiments/liked_state/+server.tsindex 74a0ae0d..ca45cf9a 100644--- a/tools/ranking-diff/src/routes/api/experiments/liked_state/+server.ts+++ b/tools/ranking-diff/src/routes/api/experiments/liked_state/+server.ts@@ -2,17 +2,17 @@ import type { RequestEvent } from '@sveltejs/kit';import { likedState } from '$lib/db';export async function POST({ request }: RequestEvent): Promise<Response> {- const {- baselineId,- experimentId,- queryId,- }: {- baselineId: number;- experimentId: number;- queryId: number;- } = await request.json();+ const {+ baselineId,+ experimentId,+ queryId+ }: {+ baselineId: number;+ experimentId: number;+ queryId: number;+ } = await request.json();- const res = likedState(baselineId, experimentId, queryId);+ const res = likedState(baselineId, experimentId, queryId);- return new Response(JSON.stringify(res));+ return new Response(JSON.stringify(res));}diff --git a/tools/ranking-diff/src/routes/api/experiments/new/+server.ts b/tools/ranking-diff/src/routes/api/experiments/new/+server.tsindex e4d8c6ed..687a85b4 100644--- a/tools/ranking-diff/src/routes/api/experiments/new/+server.ts+++ b/tools/ranking-diff/src/routes/api/experiments/new/+server.ts@@ -2,8 +2,8 @@ import type { RequestEvent } from '@sveltejs/kit';import { newExperiment } from '$lib/db';export async function POST({}: RequestEvent): Promise<Response> {- const curTime = new Date().toISOString();- const experiment = newExperiment(curTime);+ const curTime = new Date().toISOString();+ const experiment = newExperiment(curTime);- return new Response(JSON.stringify(experiment));+ return new Response(JSON.stringify(experiment));}diff --git a/tools/ranking-diff/src/routes/api/experiments/queries/intersection/+server.ts b/tools/ranking-diff/src/routes/api/experiments/queries/intersection/+server.tsindex eac935a4..cc81754a 100644--- a/tools/ranking-diff/src/routes/api/experiments/queries/intersection/+server.ts+++ b/tools/ranking-diff/src/routes/api/experiments/queries/intersection/+server.ts@@ -2,15 +2,15 @@ import type { RequestEvent } from '@sveltejs/kit';import { queryIntersection } from '$lib/db';export async function POST({ request }: RequestEvent): Promise<Response> {- const {- experimentA,- experimentB,- }: {- experimentA: number;- experimentB: number;- } = await request.json();+ const {+ experimentA,+ experimentB+ }: {+ experimentA: number;+ experimentB: number;+ } = await request.json();- const queries = queryIntersection(experimentA, experimentB);+ const queries = queryIntersection(experimentA, experimentB);- return new Response(JSON.stringify(queries));+ return new Response(JSON.stringify(queries));}diff --git a/tools/ranking-diff/src/routes/api/experiments/rename/+server.ts b/tools/ranking-diff/src/routes/api/experiments/rename/+server.tsindex 6ce65353..56b28b63 100644--- a/tools/ranking-diff/src/routes/api/experiments/rename/+server.ts+++ b/tools/ranking-diff/src/routes/api/experiments/rename/+server.ts@@ -2,14 +2,14 @@ import type { RequestEvent } from '@sveltejs/kit';import { renameExperiment } from '$lib/db';export async function POST({ request }: RequestEvent): Promise<Response> {- const {- id,- name,- }: {- id: number;- name: string;- } = await request.json();- renameExperiment(id, name);+ const {+ id,+ name+ }: {+ id: number;+ name: string;+ } = await request.json();+ renameExperiment(id, name);- return new Response('OK');+ return new Response('OK');}diff --git a/tools/ranking-diff/src/routes/api/experiments/unlike/+server.ts b/tools/ranking-diff/src/routes/api/experiments/unlike/+server.tsindex 413a9dd3..0de2ac4a 100644--- a/tools/ranking-diff/src/routes/api/experiments/unlike/+server.ts+++ b/tools/ranking-diff/src/routes/api/experiments/unlike/+server.ts@@ -2,17 +2,17 @@ import type { RequestEvent } from '@sveltejs/kit';import { unlike } from '$lib/db';export async function POST({ request }: RequestEvent): Promise<Response> {- const {- baselineId,- experimentId,- queryId,- }: {- baselineId: number;- experimentId: number;- queryId: number;- } = await request.json();+ const {+ baselineId,+ experimentId,+ queryId+ }: {+ baselineId: number;+ experimentId: number;+ queryId: number;+ } = await request.json();- unlike(baselineId, experimentId, queryId);+ unlike(baselineId, experimentId, queryId);- return new Response('OK');+ return new Response('OK');}diff --git a/tools/ranking-diff/src/routes/api/queries/+server.ts b/tools/ranking-diff/src/routes/api/queries/+server.tsindex 1a21edfb..9efed1a7 100644--- a/tools/ranking-diff/src/routes/api/queries/+server.ts+++ b/tools/ranking-diff/src/routes/api/queries/+server.ts@@ -2,7 +2,7 @@ import type { RequestEvent } from '@sveltejs/kit';import { getQueries } from '$lib/db';export async function GET({}: RequestEvent): Promise<Response> {- const queries = getQueries();+ const queries = getQueries();- return new Response(JSON.stringify(queries));+ return new Response(JSON.stringify(queries));}diff --git a/tools/ranking-diff/src/routes/api/queries/add_category/+server.ts b/tools/ranking-diff/src/routes/api/queries/add_category/+server.tsindex e2568229..63fb8a8c 100644--- a/tools/ranking-diff/src/routes/api/queries/add_category/+server.ts+++ b/tools/ranking-diff/src/routes/api/queries/add_category/+server.ts@@ -2,14 +2,14 @@ import type { RequestEvent } from '@sveltejs/kit';import { addQueryToCategory } from '$lib/db';export async function POST({ request }: RequestEvent): Promise<Response> {- const {- categoryId,- queryId,- }: {- categoryId: number;- queryId: number;- } = await request.json();- addQueryToCategory(queryId, categoryId);+ const {+ categoryId,+ queryId+ }: {+ categoryId: number;+ queryId: number;+ } = await request.json();+ addQueryToCategory(queryId, categoryId);- return new Response('OK');+ return new Response('OK');}diff --git a/tools/ranking-diff/src/routes/api/queries/by_id/+server.ts b/tools/ranking-diff/src/routes/api/queries/by_id/+server.tsindex 65decfc1..ed1e7aee 100644--- a/tools/ranking-diff/src/routes/api/queries/by_id/+server.ts+++ b/tools/ranking-diff/src/routes/api/queries/by_id/+server.ts@@ -2,12 +2,12 @@ import type { RequestEvent } from '@sveltejs/kit';import { queryById } from '$lib/db';export async function POST({ request }: RequestEvent): Promise<Response> {- const {- id,- }: {- id: number;- } = await request.json();- const experiment = queryById(id);+ const {+ id+ }: {+ id: number;+ } = await request.json();+ const experiment = queryById(id);- return new Response(JSON.stringify(experiment));+ return new Response(JSON.stringify(experiment));}diff --git a/tools/ranking-diff/src/routes/api/queries/categories/+server.ts b/tools/ranking-diff/src/routes/api/queries/categories/+server.tsindex b91c914b..cb4aaa8c 100644--- a/tools/ranking-diff/src/routes/api/queries/categories/+server.ts+++ b/tools/ranking-diff/src/routes/api/queries/categories/+server.ts@@ -2,12 +2,12 @@ import type { RequestEvent } from '@sveltejs/kit';import { getQueryCategories } from '$lib/db';export async function POST({ request }: RequestEvent): Promise<Response> {- const {- queryId,- }: {- queryId: number;- } = await request.json();- const res = getQueryCategories(queryId);+ const {+ queryId+ }: {+ queryId: number;+ } = await request.json();+ const res = getQueryCategories(queryId);- return new Response(JSON.stringify(res));+ return new Response(JSON.stringify(res));}diff --git a/tools/ranking-diff/src/routes/api/queries/clear/+server.ts b/tools/ranking-diff/src/routes/api/queries/clear/+server.tsindex aaaf4f14..c5f0eb28 100644--- a/tools/ranking-diff/src/routes/api/queries/clear/+server.ts+++ b/tools/ranking-diff/src/routes/api/queries/clear/+server.ts@@ -2,6 +2,6 @@ import type { RequestEvent } from '@sveltejs/kit';import { clearQueries } from '$lib/db';export async function POST({}: RequestEvent): Promise<Response> {- clearQueries();- return new Response('OK');+ clearQueries();+ return new Response('OK');}diff --git a/tools/ranking-diff/src/routes/api/queries/delete/+server.ts b/tools/ranking-diff/src/routes/api/queries/delete/+server.tsindex 2f8fcf47..e8056808 100644--- a/tools/ranking-diff/src/routes/api/queries/delete/+server.ts+++ b/tools/ranking-diff/src/routes/api/queries/delete/+server.ts@@ -2,12 +2,12 @@ import type { RequestEvent } from '@sveltejs/kit';import { deleteQuery } from '$lib/db';export async function POST({ request }: RequestEvent): Promise<Response> {- const {- id,- }: {- id: number;- } = await request.json();- deleteQuery(id);+ const {+ id+ }: {+ id: number;+ } = await request.json();+ deleteQuery(id);- return new Response('OK');+ return new Response('OK');}diff --git a/tools/ranking-diff/src/routes/api/queries/insert/+server.ts b/tools/ranking-diff/src/routes/api/queries/insert/+server.tsindex 00e179ec..dffc6e51 100644--- a/tools/ranking-diff/src/routes/api/queries/insert/+server.ts+++ b/tools/ranking-diff/src/routes/api/queries/insert/+server.ts@@ -2,13 +2,13 @@ import type { RequestEvent } from '@sveltejs/kit';import { insertQuery } from '$lib/db';export async function POST({ request }: RequestEvent): Promise<Response> {- const {- query,- }: {- query: string;- } = await request.json();+ const {+ query+ }: {+ query: string;+ } = await request.json();- insertQuery(query);+ insertQuery(query);- return new Response('OK');+ return new Response('OK');}diff --git a/tools/ranking-diff/src/routes/api/queries/remove_category/+server.ts b/tools/ranking-diff/src/routes/api/queries/remove_category/+server.tsindex fe3e11fc..e6505783 100644--- a/tools/ranking-diff/src/routes/api/queries/remove_category/+server.ts+++ b/tools/ranking-diff/src/routes/api/queries/remove_category/+server.ts@@ -2,12 +2,12 @@ import type { RequestEvent } from '@sveltejs/kit';import { removeQueryCategories } from '$lib/db';export async function POST({ request }: RequestEvent): Promise<Response> {- const {- queryId,- }: {- queryId: number;- } = await request.json();- removeQueryCategories(queryId);+ const {+ queryId+ }: {+ queryId: number;+ } = await request.json();+ removeQueryCategories(queryId);- return new Response('OK');+ return new Response('OK');}diff --git a/tools/ranking-diff/src/routes/categories/+page.svelte b/tools/ranking-diff/src/routes/categories/+page.svelteindex e4a55856..a73354d6 100644--- a/tools/ranking-diff/src/routes/categories/+page.svelte+++ b/tools/ranking-diff/src/routes/categories/+page.svelte@@ -1,94 +1,94 @@<script lang="ts">- import { onMount } from 'svelte';- import AddIcon from '~icons/heroicons/plus-circle';- import DeleteIcon from '~icons/heroicons/trash';- import type { Category } from '$lib';- import Navbar from '../components/Navbar.svelte';-- const addCategory = async (name: string) => {- if (name.trim() === '') {- return;- }-- await fetch('/api/categories/new', {- method: 'POST',- headers: { 'Content-Type': 'application/json' },- body: JSON.stringify({ name }),- });- };-- const addCategorySubmit = async (e: Event) => {- e.preventDefault();-- if (!input) {- return;- }-- await addCategory(input.value);- await getCategories();-- input.value = '';- };-- const getCategories = async () => {- const res = await fetch('/api/categories');- categories = await res.json();- };-- const clearCategories = async () => {- await fetch('/api/categories/clear', { method: 'POST' });- await getCategories();- };-- const deleteCategory = async (id: number) => {- await fetch('/api/categories/delete', {- method: 'POST',- headers: { 'Content-Type': 'application/json' },- body: JSON.stringify({ id }),- });- await getCategories();- };-- let categories: Category[] = [];-- let input: HTMLInputElement | null = null;- onMount(async () => {- await getCategories();- });+ import { onMount } from 'svelte';+ import AddIcon from '~icons/heroicons/plus-circle';+ import DeleteIcon from '~icons/heroicons/trash';+ import type { Category } from '$lib';+ import Navbar from '../components/Navbar.svelte';++ const addCategory = async (name: string) => {+ if (name.trim() === '') {+ return;+ }++ await fetch('/api/categories/new', {+ method: 'POST',+ headers: { 'Content-Type': 'application/json' },+ body: JSON.stringify({ name })+ });+ };++ const addCategorySubmit = async (e: Event) => {+ e.preventDefault();++ if (!input) {+ return;+ }++ await addCategory(input.value);+ await getCategories();++ input.value = '';+ };++ const getCategories = async () => {+ const res = await fetch('/api/categories');+ categories = await res.json();+ };++ const clearCategories = async () => {+ await fetch('/api/categories/clear', { method: 'POST' });+ await getCategories();+ };++ const deleteCategory = async (id: number) => {+ await fetch('/api/categories/delete', {+ method: 'POST',+ headers: { 'Content-Type': 'application/json' },+ body: JSON.stringify({ id })+ });+ await getCategories();+ };++ let categories: Category[] = [];++ let input: HTMLInputElement | null = null;+ onMount(async () => {+ await getCategories();+ });</script><Navbar page="categories" /><div class="flex w-full flex-col items-center">- <h1 class="text-2xl">Categories</h1>-- <form class="flex gap-x-1" on:submit={addCategorySubmit}>- <input- bind:this={input}- class="rounded border border-slate-400 px-2 py-1"- placeholder="category"- type="text"- />- <button type="submit"><AddIcon class="text-green-600" /></button>- </form>-- <div class="mt-5 flex flex-col space-y-5">- {#each categories as category}- <div class="flex items-center gap-x-2">- <button on:click={() => deleteCategory(category.id)} class="hover:text-red-600">- <DeleteIcon class="w-3" />- </button>- <p class="w-full text-center">{category.name}</p>- </div>- {/each}- </div>-- {#if categories.length == 0}- <p class="text-gray-500">No categories available.</p>- {:else}- <button- on:click={clearCategories}- class="mt-10 h-8 w-40 rounded bg-red-500 text-white disabled:bg-gray-400">Clear All</button- >- {/if}+ <h1 class="text-2xl">Categories</h1>++ <form class="flex gap-x-1" on:submit={addCategorySubmit}>+ <input+ bind:this={input}+ class="rounded border border-slate-400 px-2 py-1"+ placeholder="category"+ type="text"+ />+ <button type="submit"><AddIcon class="text-green-600" /></button>+ </form>++ <div class="mt-5 flex flex-col space-y-5">+ {#each categories as category}+ <div class="flex items-center gap-x-2">+ <button on:click={() => deleteCategory(category.id)} class="hover:text-red-600">+ <DeleteIcon class="w-3" />+ </button>+ <p class="w-full text-center">{category.name}</p>+ </div>+ {/each}+ </div>++ {#if categories.length == 0}+ <p class="text-gray-500">No categories available.</p>+ {:else}+ <button+ on:click={clearCategories}+ class="mt-10 h-8 w-40 rounded bg-red-500 text-white disabled:bg-gray-400">Clear All</button+ >+ {/if}</div>diff --git a/tools/ranking-diff/src/routes/components/Navbar.svelte b/tools/ranking-diff/src/routes/components/Navbar.svelteindex d223bf53..6112c694 100644--- a/tools/ranking-diff/src/routes/components/Navbar.svelte+++ b/tools/ranking-diff/src/routes/components/Navbar.svelte@@ -1,38 +1,38 @@<script lang="ts">- import Settings from './Settings.svelte';+ import Settings from './Settings.svelte';- type Page = 'experiments' | 'queries' | 'categories';- export let page: Page;+ type Page = 'experiments' | 'queries' | 'categories';+ export let page: Page;</script><nav class="flex justify-between gap-x-2">- <div class="flex h-fit gap-x-2">- <a- href="/"- class="border-content rounded-full border-slate-500 px-2 py-1 {page === 'experiments'- ? 'border'- : ''}"- >- Experiments- </a>- <a- href="/queries"- class="border-content rounded-full border-slate-500 px-2 py-1 {page === 'queries'- ? 'border'- : ''}"- >- Queries- </a>- <a- href="/categories"- class="border-content rounded-full border-slate-500 px-2 py-1 {page === 'categories'- ? 'border'- : ''}"- >- Categories- </a>- </div>- <div>- <Settings />- </div>+ <div class="flex h-fit gap-x-2">+ <a+ href="/"+ class="border-content rounded-full border-slate-500 px-2 py-1 {page === 'experiments'+ ? 'border'+ : ''}"+ >+ Experiments+ </a>+ <a+ href="/queries"+ class="border-content rounded-full border-slate-500 px-2 py-1 {page === 'queries'+ ? 'border'+ : ''}"+ >+ Queries+ </a>+ <a+ href="/categories"+ class="border-content rounded-full border-slate-500 px-2 py-1 {page === 'categories'+ ? 'border'+ : ''}"+ >+ Categories+ </a>+ </div>+ <div>+ <Settings />+ </div></nav>diff --git a/tools/ranking-diff/src/routes/components/Settings.svelte b/tools/ranking-diff/src/routes/components/Settings.svelteindex 38bd1ee4..8ea2bfb9 100644--- a/tools/ranking-diff/src/routes/components/Settings.svelte+++ b/tools/ranking-diff/src/routes/components/Settings.svelte@@ -1,32 +1,32 @@<script lang="ts">- import SettingsIcon from '~icons/heroicons/cog';- import { shuffleExperimentsStore, showSignalsStore, searchApiStore } from '$lib/stores';+ import SettingsIcon from '~icons/heroicons/cog';+ import { shuffleExperimentsStore, showSignalsStore, searchApiStore } from '$lib/stores';- let open = false;+ let open = false;</script><div>- <button on:click={() => (open = !open)}>- <SettingsIcon class="h-6 w-6" />- </button>- {#if open}- <div>- <div class="flex gap-x-1">- <input id="shuffle_experiments" type="checkbox" bind:checked={$shuffleExperimentsStore} />- <label for="shuffle_experiments">Shuffle Experiments</label>- </div>- <div class="flex gap-x-1">- <input id="show_signals" type="checkbox" bind:checked={$showSignalsStore} />- <label for="show_signals">Show Signals</label>- </div>- <div class="flex">- <input- class="border border-slate-700"- type="text"- bind:value={$searchApiStore}- placeholder="search api"- />- </div>- </div>- {/if}+ <button on:click={() => (open = !open)}>+ <SettingsIcon class="h-6 w-6" />+ </button>+ {#if open}+ <div>+ <div class="flex gap-x-1">+ <input id="shuffle_experiments" type="checkbox" bind:checked={$shuffleExperimentsStore} />+ <label for="shuffle_experiments">Shuffle Experiments</label>+ </div>+ <div class="flex gap-x-1">+ <input id="show_signals" type="checkbox" bind:checked={$showSignalsStore} />+ <label for="show_signals">Show Signals</label>+ </div>+ <div class="flex">+ <input+ class="border border-slate-700"+ type="text"+ bind:value={$searchApiStore}+ placeholder="search api"+ />+ </div>+ </div>+ {/if}</div>diff --git a/tools/ranking-diff/src/routes/experiments/compare/[baseline]/[experiment]/+page.svelte b/tools/ranking-diff/src/routes/experiments/compare/[baseline]/[experiment]/+page.svelteindex 60f8ba4f..59f23394 100644--- a/tools/ranking-diff/src/routes/experiments/compare/[baseline]/[experiment]/+page.svelte+++ b/tools/ranking-diff/src/routes/experiments/compare/[baseline]/[experiment]/+page.svelte@@ -1,37 +1,37 @@<script lang="ts">- import type { PageData } from './$types';- import BackIcon from '~icons/heroicons/arrow-left';- import Query from './Query.svelte';- import Settings from '../../../../components/Settings.svelte';+ import type { PageData } from './$types';+ import BackIcon from '~icons/heroicons/arrow-left';+ import Query from './Query.svelte';+ import Settings from '../../../../components/Settings.svelte';- export let data: PageData;+ export let data: PageData;- const { baseline, experiment, queries } = data;+ const { baseline, experiment, queries } = data;</script><div class="flex w-full justify-between">- <div class="flex w-fit gap-x-5">- <a href="/">- <BackIcon class="h-6 w-6" />- </a>- <div class="flex gap-2">- <a href="/experiments/compare/{baseline.id}/{experiment.id}">- <span class="rounded-full border border-slate-500 px-2 py-1">Queries</span>- </a>- <a href="/experiments/compare/{baseline.id}/{experiment.id}/categories">- <span class="rounded-full border-slate-500 px-2 py-1">Categories</span>- </a>- </div>- </div>- <div>- <Settings />- </div>+ <div class="flex w-fit gap-x-5">+ <a href="/">+ <BackIcon class="h-6 w-6" />+ </a>+ <div class="flex gap-2">+ <a href="/experiments/compare/{baseline.id}/{experiment.id}">+ <span class="rounded-full border border-slate-500 px-2 py-1">Queries</span>+ </a>+ <a href="/experiments/compare/{baseline.id}/{experiment.id}/categories">+ <span class="rounded-full border-slate-500 px-2 py-1">Categories</span>+ </a>+ </div>+ </div>+ <div>+ <Settings />+ </div></div><div class="flex flex-col py-10">- <div class="grid grid-cols-5 gap-2">- {#each queries as query}- <Query {query} {experiment} {baseline} />- {/each}- </div>+ <div class="grid grid-cols-5 gap-2">+ {#each queries as query}+ <Query {query} {experiment} {baseline} />+ {/each}+ </div></div>diff --git a/tools/ranking-diff/src/routes/experiments/compare/[baseline]/[experiment]/+page.ts b/tools/ranking-diff/src/routes/experiments/compare/[baseline]/[experiment]/+page.tsindex bacf42a5..b46f34b2 100644--- a/tools/ranking-diff/src/routes/experiments/compare/[baseline]/[experiment]/+page.ts+++ b/tools/ranking-diff/src/routes/experiments/compare/[baseline]/[experiment]/+page.ts@@ -3,20 +3,20 @@ import { fetchExperimentById, fetchQueriesIntersection } from '$lib/api';import type { PageLoad } from './$types';export const load: PageLoad = async (req) => {- const { params, fetch } = req;+ const { params, fetch } = req;- const queries = await fetchQueriesIntersection(- Number(params.baseline),- Number(params.experiment),- { fetch },- );+ const queries = await fetchQueriesIntersection(+ Number(params.baseline),+ Number(params.experiment),+ { fetch }+ );- const baseline = await fetchExperimentById(Number(params.baseline), { fetch });- const experiment = await fetchExperimentById(Number(params.experiment), { fetch });+ const baseline = await fetchExperimentById(Number(params.baseline), { fetch });+ const experiment = await fetchExperimentById(Number(params.experiment), { fetch });- return {- baseline,- experiment,- queries,- };+ return {+ baseline,+ experiment,+ queries+ };};diff --git a/tools/ranking-diff/src/routes/experiments/compare/[baseline]/[experiment]/Query.svelte b/tools/ranking-diff/src/routes/experiments/compare/[baseline]/[experiment]/Query.svelteindex 928162dd..1727775b 100644--- a/tools/ranking-diff/src/routes/experiments/compare/[baseline]/[experiment]/Query.svelte+++ b/tools/ranking-diff/src/routes/experiments/compare/[baseline]/[experiment]/Query.svelte@@ -1,34 +1,34 @@<script lang="ts">- import type { Query, Experiment, LikedState } from '$lib';- import { likedState as getLikedState } from '$lib/api';- import { onMount } from 'svelte';+ import type { Query, Experiment, LikedState } from '$lib';+ import { likedState as getLikedState } from '$lib/api';+ import { onMount } from 'svelte';- export let baseline: Experiment;- export let experiment: Experiment;- export let query: Query;+ export let baseline: Experiment;+ export let experiment: Experiment;+ export let query: Query;- let likedState: LikedState = 'none';+ let likedState: LikedState = 'none';- onMount(async () => {- likedState = await getLikedState(baseline.id, experiment.id, query.id);- });+ onMount(async () => {+ likedState = await getLikedState(baseline.id, experiment.id, query.id);+ });- $: color = 'bg-slate-200';- $: hoverColor = 'hover:bg-slate-300';- $: {- if (likedState === 'baseline') {- color = 'bg-red-200';- hoverColor = 'hover:bg-red-300';- } else if (likedState === 'experiment') {- color = 'bg-green-200';- hoverColor = 'hover:bg-green-300';- }- }+ $: color = 'bg-slate-200';+ $: hoverColor = 'hover:bg-slate-300';+ $: {+ if (likedState === 'baseline') {+ color = 'bg-red-200';+ hoverColor = 'hover:bg-red-300';+ } else if (likedState === 'experiment') {+ color = 'bg-green-200';+ hoverColor = 'hover:bg-green-300';+ }+ }</script><a- href="/experiments/compare/{baseline.id}/{experiment.id}/{query.id}"- class="flex h-24 items-center justify-center rounded {color} {hoverColor} px-2"+ href="/experiments/compare/{baseline.id}/{experiment.id}/{query.id}"+ class="flex h-24 items-center justify-center rounded {color} {hoverColor} px-2">- <h2 class="line-clamp-2 break-all">{query.text}</h2>+ <h2 class="line-clamp-2 break-all">{query.text}</h2></a>diff --git a/tools/ranking-diff/src/routes/experiments/compare/[baseline]/[experiment]/[query]/+page.svelte b/tools/ranking-diff/src/routes/experiments/compare/[baseline]/[experiment]/[query]/+page.svelteindex 76edb48b..a6318b5a 100644--- a/tools/ranking-diff/src/routes/experiments/compare/[baseline]/[experiment]/[query]/+page.svelte+++ b/tools/ranking-diff/src/routes/experiments/compare/[baseline]/[experiment]/[query]/+page.svelte@@ -1,157 +1,157 @@<script lang="ts">- import type { PageData } from './$types';- import BackIcon from '~icons/heroicons/arrow-left';- import LikeIcon from '~icons/heroicons/hand-thumb-up';- import Serp from './Serp.svelte';- import { like, likedState, unlike } from '$lib/api';- import { browser } from '$app/environment';- import Settings from '../../../../../components/Settings.svelte';- import { shuffleExperimentsStore } from '$lib/stores';- import type { SimpleWebpage } from '$lib/webpage';- import type { Experiment } from '$lib';- import type { LikedState } from '$lib/db';-- export let data: PageData;-- $: baseline = data.baseline;- $: experiment = data.experiment;- $: query = data.query;- $: allQueries = data.allQueries;-- $: queryIndex = allQueries.findIndex((q) => q.id === query.id);- $: prevQuery = allQueries[queryIndex - 1];- $: nextQuery = allQueries[queryIndex + 1];-- $: experiments = [- { isBaseline: true, ...baseline },- { isBaseline: false, ...experiment },- ];-- $: {- if ($shuffleExperimentsStore && browser && experiments) {- experiments = experiments- .map((value) => ({ value, sort: Math.random() }))- .sort((a, b) => a.sort - b.sort)- .map(({ value }) => value);- } else {- experiments = [- { isBaseline: true, ...baseline },- { isBaseline: false, ...experiment },- ];- }-- if (browser && experiments) {- updateLikedExperiment();- }- }-- $: likedExperiment = null as number | null;-- const updateLikedExperiment = async () => {- const state = await likedState(baseline.experiment.id, experiment.experiment.id, query.id, {- fetch,- });- if (state === 'baseline') {- likedExperiment = baseline.experiment.id;- } else if (state === 'experiment') {- likedExperiment = experiment.experiment.id;- } else {- likedExperiment = null;- }- };-- const unlikeAllExperiments = async () => {- await unlike(baseline.experiment.id, experiment.experiment.id, query.id, { fetch });- };-- const likeExperiment = async (e: {- experiment: Experiment;- isBaseline: boolean;- serp: SimpleWebpage[];- }) => {- await unlikeAllExperiments();-- const wasLiked = likedExperiment === e.experiment.id;-- if (!wasLiked) {- if (e.isBaseline) {- await like(baseline.experiment.id, experiment.experiment.id, query.id, 'baseline', {- fetch,- });- } else {- await like(baseline.experiment.id, experiment.experiment.id, query.id, 'experiment', {- fetch,- });- }- }-- await updateLikedExperiment();- };-- const onKeyDown = (event: KeyboardEvent) => {- if (event.key === 'ArrowLeft' && prevQuery) {- window.location.href = prevQuery.id.toString();- } else if (event.key === 'ArrowRight' && nextQuery) {- window.location.href = nextQuery.id.toString();- } else if (event.key.toLowerCase() == 'a') {- likeExperiment(experiments[0]);- } else if (event.key.toLowerCase() == 'b') {- likeExperiment(experiments[1]);- }- };+ import type { PageData } from './$types';+ import BackIcon from '~icons/heroicons/arrow-left';+ import LikeIcon from '~icons/heroicons/hand-thumb-up';+ import Serp from './Serp.svelte';+ import { like, likedState, unlike } from '$lib/api';+ import { browser } from '$app/environment';+ import Settings from '../../../../../components/Settings.svelte';+ import { shuffleExperimentsStore } from '$lib/stores';+ import type { SimpleWebpage } from '$lib/webpage';+ import type { Experiment } from '$lib';+ import type { LikedState } from '$lib/db';++ export let data: PageData;++ $: baseline = data.baseline;+ $: experiment = data.experiment;+ $: query = data.query;+ $: allQueries = data.allQueries;++ $: queryIndex = allQueries.findIndex((q) => q.id === query.id);+ $: prevQuery = allQueries[queryIndex - 1];+ $: nextQuery = allQueries[queryIndex + 1];++ $: experiments = [+ { isBaseline: true, ...baseline },+ { isBaseline: false, ...experiment }+ ];++ $: {+ if ($shuffleExperimentsStore && browser && experiments) {+ experiments = experiments+ .map((value) => ({ value, sort: Math.random() }))+ .sort((a, b) => a.sort - b.sort)+ .map(({ value }) => value);+ } else {+ experiments = [+ { isBaseline: true, ...baseline },+ { isBaseline: false, ...experiment }+ ];+ }++ if (browser && experiments) {+ updateLikedExperiment();+ }+ }++ $: likedExperiment = null as number | null;++ const updateLikedExperiment = async () => {+ const state = await likedState(baseline.experiment.id, experiment.experiment.id, query.id, {+ fetch+ });+ if (state === 'baseline') {+ likedExperiment = baseline.experiment.id;+ } else if (state === 'experiment') {+ likedExperiment = experiment.experiment.id;+ } else {+ likedExperiment = null;+ }+ };++ const unlikeAllExperiments = async () => {+ await unlike(baseline.experiment.id, experiment.experiment.id, query.id, { fetch });+ };++ const likeExperiment = async (e: {+ experiment: Experiment;+ isBaseline: boolean;+ serp: SimpleWebpage[];+ }) => {+ await unlikeAllExperiments();++ const wasLiked = likedExperiment === e.experiment.id;++ if (!wasLiked) {+ if (e.isBaseline) {+ await like(baseline.experiment.id, experiment.experiment.id, query.id, 'baseline', {+ fetch+ });+ } else {+ await like(baseline.experiment.id, experiment.experiment.id, query.id, 'experiment', {+ fetch+ });+ }+ }++ await updateLikedExperiment();+ };++ const onKeyDown = (event: KeyboardEvent) => {+ if (event.key === 'ArrowLeft' && prevQuery) {+ window.location.href = prevQuery.id.toString();+ } else if (event.key === 'ArrowRight' && nextQuery) {+ window.location.href = nextQuery.id.toString();+ } else if (event.key.toLowerCase() == 'a') {+ likeExperiment(experiments[0]);+ } else if (event.key.toLowerCase() == 'b') {+ likeExperiment(experiments[1]);+ }+ };</script><svelte:window on:keydown={onKeyDown} /><div class="flex w-full justify-between">- <div class="w-fit">- <a href="/experiments/compare/{baseline.experiment.id}/{experiment.experiment.id}">- <BackIcon class="h-6 w-6" />- </a>- </div>- <div><Settings /></div>+ <div class="w-fit">+ <a href="/experiments/compare/{baseline.experiment.id}/{experiment.experiment.id}">+ <BackIcon class="h-6 w-6" />+ </a>+ </div>+ <div><Settings /></div></div><div>- <h1 class="grow text-center text-lg font-semibold">{query.text}</h1>+ <h1 class="grow text-center text-lg font-semibold">{query.text}</h1></div><div class="mt-10 flex h-3/4 w-full justify-center overflow-auto">- <div class="flex w-full max-w-5xl gap-x-2">- <div class="w-full">- <h2 class="mb-5 text-center">A</h2>- <Serp webpages={experiments[0].serp} />- </div>- <div class="w-full">- <h2 class="mb-5 text-center">B</h2>- <Serp webpages={experiments[1].serp} />- </div>- </div>+ <div class="flex w-full max-w-5xl gap-x-2">+ <div class="w-full">+ <h2 class="mb-5 text-center">A</h2>+ <Serp webpages={experiments[0].serp} />+ </div>+ <div class="w-full">+ <h2 class="mb-5 text-center">B</h2>+ <Serp webpages={experiments[1].serp} />+ </div>+ </div></div><div class="mt-5 flex w-full justify-center">- <div class="flex w-full max-w-5xl">- {#each experiments as e}- <div class="flex grow justify-center">- <button- on:click={() => likeExperiment(e)}- class="{likedExperiment && likedExperiment == e.experiment.id- ? 'text-green-500'- : 'text-slate-300'} hover:text-green-700"><LikeIcon class="h-6 w-6" /></button- >- </div>- {/each}- </div>+ <div class="flex w-full max-w-5xl">+ {#each experiments as e}+ <div class="flex grow justify-center">+ <button+ on:click={() => likeExperiment(e)}+ class="{likedExperiment && likedExperiment == e.experiment.id+ ? 'text-green-500'+ : 'text-slate-300'} hover:text-green-700"><LikeIcon class="h-6 w-6" /></button+ >+ </div>+ {/each}+ </div></div><div class="mt-10 flex w-full justify-between">- {#if prevQuery}- <a href={prevQuery.id.toString()}>Prev</a>- {:else}- <span class="text-gray-400">Prev</span>- {/if}- {#if nextQuery}- <a href={nextQuery.id.toString()}>Next</a>- {:else}- <span class="text-gray-400">Next</span>- {/if}+ {#if prevQuery}+ <a href={prevQuery.id.toString()}>Prev</a>+ {:else}+ <span class="text-gray-400">Prev</span>+ {/if}+ {#if nextQuery}+ <a href={nextQuery.id.toString()}>Next</a>+ {:else}+ <span class="text-gray-400">Next</span>+ {/if}</div>diff --git a/tools/ranking-diff/src/routes/experiments/compare/[baseline]/[experiment]/[query]/+page.ts b/tools/ranking-diff/src/routes/experiments/compare/[baseline]/[experiment]/[query]/+page.tsindex 6dd74a64..60cb85f3 100644--- a/tools/ranking-diff/src/routes/experiments/compare/[baseline]/[experiment]/[query]/+page.ts+++ b/tools/ranking-diff/src/routes/experiments/compare/[baseline]/[experiment]/[query]/+page.ts@@ -1,41 +1,41 @@import type { ExperimentResult } from '$lib';import {- fetchExperimentById,- fetchQueriesIntersection,- fetchQueryById,- fetchSerpByQueryAndExperiment,+ fetchExperimentById,+ fetchQueriesIntersection,+ fetchQueryById,+ fetchSerpByQueryAndExperiment} from '$lib/api';import type { PageLoad } from './$types';export const load: PageLoad = async (req) => {- const { params, fetch } = req;+ const { params, fetch } = req;- const query = await fetchQueryById(Number(params.query), { fetch });+ const query = await fetchQueryById(Number(params.query), { fetch });- const baseline = await fetchExperimentById(Number(params.baseline), { fetch });- const baselineSerp = await fetchSerpByQueryAndExperiment(- Number(params.query),- Number(params.baseline),- { fetch },- );+ const baseline = await fetchExperimentById(Number(params.baseline), { fetch });+ const baselineSerp = await fetchSerpByQueryAndExperiment(+ Number(params.query),+ Number(params.baseline),+ { fetch }+ );- const experiment = await fetchExperimentById(Number(params.experiment), { fetch });- const experimentSerp = await fetchSerpByQueryAndExperiment(- Number(params.query),- Number(params.experiment),- { fetch },- );+ const experiment = await fetchExperimentById(Number(params.experiment), { fetch });+ const experimentSerp = await fetchSerpByQueryAndExperiment(+ Number(params.query),+ Number(params.experiment),+ { fetch }+ );- const allQueries = await fetchQueriesIntersection(- Number(params.baseline),- Number(params.experiment),- { fetch },- );+ const allQueries = await fetchQueriesIntersection(+ Number(params.baseline),+ Number(params.experiment),+ { fetch }+ );- return {- baseline: { experiment: baseline, serp: baselineSerp } as ExperimentResult,- experiment: { experiment, serp: experimentSerp } as ExperimentResult,- query,- allQueries,- };+ return {+ baseline: { experiment: baseline, serp: baselineSerp } as ExperimentResult,+ experiment: { experiment, serp: experimentSerp } as ExperimentResult,+ query,+ allQueries+ };};diff --git a/tools/ranking-diff/src/routes/experiments/compare/[baseline]/[experiment]/[query]/Serp.svelte b/tools/ranking-diff/src/routes/experiments/compare/[baseline]/[experiment]/[query]/Serp.svelteindex 45c04a0b..851108e0 100644--- a/tools/ranking-diff/src/routes/experiments/compare/[baseline]/[experiment]/[query]/Serp.svelte+++ b/tools/ranking-diff/src/routes/experiments/compare/[baseline]/[experiment]/[query]/Serp.svelte@@ -1,16 +1,16 @@<script lang="ts">- import type { SimpleWebpage } from '$lib/webpage';- import Webpage from './Webpage.svelte';+ import type { SimpleWebpage } from '$lib/webpage';+ import Webpage from './Webpage.svelte';- export let webpages: SimpleWebpage[];+ export let webpages: SimpleWebpage[];</script><div class="flex w-full flex-col gap-y-5">- {#if webpages.length === 0}- <i class="text-center">No webpages found</i>- {:else}- {#each webpages as webpage}- <Webpage {webpage} />- {/each}- {/if}+ {#if webpages.length === 0}+ <i class="text-center">No webpages found</i>+ {:else}+ {#each webpages as webpage}+ <Webpage {webpage} />+ {/each}+ {/if}</div>diff --git a/tools/ranking-diff/src/routes/experiments/compare/[baseline]/[experiment]/[query]/TopSignals.svelte b/tools/ranking-diff/src/routes/experiments/compare/[baseline]/[experiment]/[query]/TopSignals.svelteindex e78c520f..4022d597 100644--- a/tools/ranking-diff/src/routes/experiments/compare/[baseline]/[experiment]/[query]/TopSignals.svelte+++ b/tools/ranking-diff/src/routes/experiments/compare/[baseline]/[experiment]/[query]/TopSignals.svelte@@ -1,19 +1,19 @@<script lang="ts">- export let signals: Record<string, number>;+ export let signals: Record<string, number>;- let showAll = false;- const sortedSignals = Object.entries(signals).sort((a, b) => b[1] - a[1]);+ let showAll = false;+ const sortedSignals = Object.entries(signals).sort((a, b) => b[1] - a[1]);</script><div class="flex flex-wrap gap-x-1 gap-y-1">- {#each sortedSignals.slice(0, showAll ? undefined : 3) as [signal, value]}- <span- class="rounded-full border border-sky-300 bg-sky-100 px-1 text-xs"- title={value.toFixed(4)}- >{signal.replaceAll('_', '-')}- </span>- {/each}- <button class="text-xs text-gray-400" on:click={() => (showAll = !showAll)}>- {showAll ? 'Show less' : 'Show all'}- </button>+ {#each sortedSignals.slice(0, showAll ? undefined : 3) as [signal, value]}+ <span+ class="rounded-full border border-sky-300 bg-sky-100 px-1 text-xs"+ title={value.toFixed(4)}+ >{signal.replaceAll('_', '-')}+ </span>+ {/each}+ <button class="text-xs text-gray-400" on:click={() => (showAll = !showAll)}>+ {showAll ? 'Show less' : 'Show all'}+ </button></div>diff --git a/tools/ranking-diff/src/routes/experiments/compare/[baseline]/[experiment]/[query]/Webpage.svelte b/tools/ranking-diff/src/routes/experiments/compare/[baseline]/[experiment]/[query]/Webpage.svelteindex 1cc0c2b7..7eb6ca22 100644--- a/tools/ranking-diff/src/routes/experiments/compare/[baseline]/[experiment]/[query]/Webpage.svelte+++ b/tools/ranking-diff/src/routes/experiments/compare/[baseline]/[experiment]/[query]/Webpage.svelte@@ -1,25 +1,25 @@<script lang="ts">- import type { SimpleWebpage } from '$lib/webpage';- import TopSignals from './TopSignals.svelte';- import { showSignalsStore } from '$lib/stores';+ import type { SimpleWebpage } from '$lib/webpage';+ import TopSignals from './TopSignals.svelte';+ import { showSignalsStore } from '$lib/stores';- export let webpage: SimpleWebpage;+ export let webpage: SimpleWebpage;- const totalScore = Object.values(webpage.rankingSignals).reduce((acc, value) => acc + value, 0);+ const totalScore = Object.values(webpage.rankingSignals).reduce((acc, value) => acc + value, 0);</script><div>- <h2 class="line-clamp-1 font-medium" title={webpage.title}>{webpage.title}</h2>- <a- class="line-clamp-1 text-xs underline"- href={webpage.url}- title={webpage.url}- target="_blank"- rel="noopener noreferrer">{webpage.url}</a- >- <p class="line-clamp-3 text-sm">{webpage.snippet}</p>- <p class="text-xs text-gray-500">Score: {totalScore.toFixed(4)}</p>- {#if $showSignalsStore}- <TopSignals signals={webpage.rankingSignals} />- {/if}+ <h2 class="line-clamp-1 font-medium" title={webpage.title}>{webpage.title}</h2>+ <a+ class="line-clamp-1 text-xs underline"+ href={webpage.url}+ title={webpage.url}+ target="_blank"+ rel="noopener noreferrer">{webpage.url}</a+ >+ <p class="line-clamp-3 text-sm">{webpage.snippet}</p>+ <p class="text-xs text-gray-500">Score: {totalScore.toFixed(4)}</p>+ {#if $showSignalsStore}+ <TopSignals signals={webpage.rankingSignals} />+ {/if}</div>diff --git a/tools/ranking-diff/src/routes/experiments/compare/[baseline]/[experiment]/categories/+page.svelte b/tools/ranking-diff/src/routes/experiments/compare/[baseline]/[experiment]/categories/+page.svelteindex 46dfabdd..f2279e3a 100644--- a/tools/ranking-diff/src/routes/experiments/compare/[baseline]/[experiment]/categories/+page.svelte+++ b/tools/ranking-diff/src/routes/experiments/compare/[baseline]/[experiment]/categories/+page.svelte@@ -1,35 +1,35 @@<script lang="ts">- import type { PageData } from './$types';- import BackIcon from '~icons/heroicons/arrow-left';- import Settings from '../../../../../components/Settings.svelte';- import Category from './Category.svelte';+ import type { PageData } from './$types';+ import BackIcon from '~icons/heroicons/arrow-left';+ import Settings from '../../../../../components/Settings.svelte';+ import Category from './Category.svelte';- export let data: PageData;+ export let data: PageData;- const { baseline, experiment, categories } = data;+ const { baseline, experiment, categories } = data;</script><div class="flex w-full justify-between">- <div class="flex w-fit gap-x-5">- <a href="/">- <BackIcon class="h-6 w-6" />- </a>- <div class="flex gap-2">- <a href="/experiments/compare/{baseline.id}/{experiment.id}">- <span class="rounded-full border-slate-500 px-2 py-1">Queries</span>- </a>- <a href="/experiments/compare/{baseline.id}/{experiment.id}/categories">- <span class="rounded-full border border-slate-500 px-2 py-1">Categories</span>- </a>- </div>- </div>- <div>- <Settings />- </div>+ <div class="flex w-fit gap-x-5">+ <a href="/">+ <BackIcon class="h-6 w-6" />+ </a>+ <div class="flex gap-2">+ <a href="/experiments/compare/{baseline.id}/{experiment.id}">+ <span class="rounded-full border-slate-500 px-2 py-1">Queries</span>+ </a>+ <a href="/experiments/compare/{baseline.id}/{experiment.id}/categories">+ <span class="rounded-full border border-slate-500 px-2 py-1">Categories</span>+ </a>+ </div>+ </div>+ <div>+ <Settings />+ </div></div><div class="flex flex-col gap-y-10 py-10">- {#each categories as category}- <Category {category} {baseline} {experiment} />- {/each}+ {#each categories as category}+ <Category {category} {baseline} {experiment} />+ {/each}</div>diff --git a/tools/ranking-diff/src/routes/experiments/compare/[baseline]/[experiment]/categories/+page.ts b/tools/ranking-diff/src/routes/experiments/compare/[baseline]/[experiment]/categories/+page.tsindex 2b08863f..6742f54e 100644--- a/tools/ranking-diff/src/routes/experiments/compare/[baseline]/[experiment]/categories/+page.ts+++ b/tools/ranking-diff/src/routes/experiments/compare/[baseline]/[experiment]/categories/+page.ts@@ -2,16 +2,16 @@ import { fetchExperimentById, fetchAllCategories } from '$lib/api';import type { PageLoad } from './$types';export const load: PageLoad = async (req) => {- const { params, fetch } = req;+ const { params, fetch } = req;- const categories = await fetchAllCategories({ fetch });+ const categories = await fetchAllCategories({ fetch });- const baseline = await fetchExperimentById(Number(params.baseline), { fetch });- const experiment = await fetchExperimentById(Number(params.experiment), { fetch });+ const baseline = await fetchExperimentById(Number(params.baseline), { fetch });+ const experiment = await fetchExperimentById(Number(params.experiment), { fetch });- return {- baseline,- experiment,- categories,- };+ return {+ baseline,+ experiment,+ categories+ };};diff --git a/tools/ranking-diff/src/routes/experiments/compare/[baseline]/[experiment]/categories/Category.svelte b/tools/ranking-diff/src/routes/experiments/compare/[baseline]/[experiment]/categories/Category.svelteindex 93786e86..c1d1cfef 100644--- a/tools/ranking-diff/src/routes/experiments/compare/[baseline]/[experiment]/categories/Category.svelte+++ b/tools/ranking-diff/src/routes/experiments/compare/[baseline]/[experiment]/categories/Category.svelte@@ -1,59 +1,59 @@<script lang="ts">- import type { Category, Experiment, Query, LikedState } from '$lib';- import { fetchQueriesByCategory, likedState } from '$lib/api';- import { onMount } from 'svelte';- import Gauge from './Gauge.svelte';- import QueryComponent from '../Query.svelte';-- export let category: Category;- export let baseline: Experiment;- export let experiment: Experiment;-- $: queries = [] as Query[];- $: states = [] as LikedState[];-- onMount(async () => {- queries = await fetchQueriesByCategory(category.id);- states = await Promise.all(- queries.map((query) => likedState(baseline.id, experiment.id, query.id)),- );- });-- $: score = states.reduce((acc, state) => {- if (state === 'baseline') {- return acc - 1;- } else if (state === 'experiment') {- return acc + 1;- }- return acc;- }, 0);-- $: annotations = states.filter((state) => state !== 'none').length;-- let showQueries = false;+ import type { Category, Experiment, Query, LikedState } from '$lib';+ import { fetchQueriesByCategory, likedState } from '$lib/api';+ import { onMount } from 'svelte';+ import Gauge from './Gauge.svelte';+ import QueryComponent from '../Query.svelte';++ export let category: Category;+ export let baseline: Experiment;+ export let experiment: Experiment;++ $: queries = [] as Query[];+ $: states = [] as LikedState[];++ onMount(async () => {+ queries = await fetchQueriesByCategory(category.id);+ states = await Promise.all(+ queries.map((query) => likedState(baseline.id, experiment.id, query.id))+ );+ });++ $: score = states.reduce((acc, state) => {+ if (state === 'baseline') {+ return acc - 1;+ } else if (state === 'experiment') {+ return acc + 1;+ }+ return acc;+ }, 0);++ $: annotations = states.filter((state) => state !== 'none').length;++ let showQueries = false;</script><div class="flex flex-col items-center">- <button class="flex" on:click={() => (showQueries = !showQueries)}>- {category.name}- {annotations} / {queries.length}- </button>-- {#if score < 0}- <span class="text-xs text-red-500">{score} ↓</span>- {:else if score > 0}- <span class="text-xs text-green-500">{score} ↑</span>- {:else}- <span class="text-xs text-gray-400">no change</span>- {/if}-- <Gauge value={score} min={-queries.length} max={queries.length} />-- {#if showQueries}- <div class="mt-5 grid w-full grid-cols-5 gap-2">- {#each queries as query}- <QueryComponent {query} {experiment} {baseline} />- {/each}- </div>- {/if}+ <button class="flex" on:click={() => (showQueries = !showQueries)}>+ {category.name}+ {annotations} / {queries.length}+ </button>++ {#if score < 0}+ <span class="text-xs text-red-500">{score} ↓</span>+ {:else if score > 0}+ <span class="text-xs text-green-500">{score} ↑</span>+ {:else}+ <span class="text-xs text-gray-400">no change</span>+ {/if}++ <Gauge value={score} min={-queries.length} max={queries.length} />++ {#if showQueries}+ <div class="mt-5 grid w-full grid-cols-5 gap-2">+ {#each queries as query}+ <QueryComponent {query} {experiment} {baseline} />+ {/each}+ </div>+ {/if}</div>diff --git a/tools/ranking-diff/src/routes/experiments/compare/[baseline]/[experiment]/categories/Gauge.svelte b/tools/ranking-diff/src/routes/experiments/compare/[baseline]/[experiment]/categories/Gauge.svelteindex ce0035a4..c7710f52 100644--- a/tools/ranking-diff/src/routes/experiments/compare/[baseline]/[experiment]/categories/Gauge.svelte+++ b/tools/ranking-diff/src/routes/experiments/compare/[baseline]/[experiment]/categories/Gauge.svelte@@ -1,49 +1,49 @@<script lang="ts">- export let value: number;- export let min: number;- export let max: number;- export let neutral: number = 0;-- $: value = Math.min(Math.max(value, min), max);-- $: negativeFrag = 0;- $: positiveFrag = 0;-- $: {- if (value < neutral) {- negativeFrag = (value - neutral) / (min - neutral);- positiveFrag = 0;- } else {- negativeFrag = 0;- positiveFrag = (value - neutral) / (max - neutral);- }- }-- const width = 600;- const height = 30;-- $: maskWidth = positiveFrag > negativeFrag ? width / 2 : (width / 2) * (1 - negativeFrag);- $: maskX = positiveFrag > negativeFrag ? maskWidth * (1 + positiveFrag) : 0;-- $: otherMaskWidth = width / 2;- $: otherMaskX = positiveFrag > negativeFrag ? 0 : width / 2;+ export let value: number;+ export let min: number;+ export let max: number;+ export let neutral: number = 0;++ $: value = Math.min(Math.max(value, min), max);++ $: negativeFrag = 0;+ $: positiveFrag = 0;++ $: {+ if (value < neutral) {+ negativeFrag = (value - neutral) / (min - neutral);+ positiveFrag = 0;+ } else {+ negativeFrag = 0;+ positiveFrag = (value - neutral) / (max - neutral);+ }+ }++ const width = 600;+ const height = 30;++ $: maskWidth = positiveFrag > negativeFrag ? width / 2 : (width / 2) * (1 - negativeFrag);+ $: maskX = positiveFrag > negativeFrag ? maskWidth * (1 + positiveFrag) : 0;++ $: otherMaskWidth = width / 2;+ $: otherMaskX = positiveFrag > negativeFrag ? 0 : width / 2;</script><div class="flex w-64">- {#if value != neutral}- <svg viewBox="0 0 {width} {height}">- <defs>- <linearGradient id="gradient" x1="0" x2="1" y1="1" y2="1">- <stop offset="0%" stop-color="#eb4334" />- <stop offset="100%" stop-color="#37eb34" />- </linearGradient>- </defs>-- <rect id="rect" {width} {height} rx="15" fill="url(#gradient)" />-- <rect x={maskX} y="0" width={maskWidth} height={height + 1} fill="white" />-- <rect x={otherMaskX} y="0" width={otherMaskWidth} height={height + 1} fill="white" />- </svg>- {/if}+ {#if value != neutral}+ <svg viewBox="0 0 {width} {height}">+ <defs>+ <linearGradient id="gradient" x1="0" x2="1" y1="1" y2="1">+ <stop offset="0%" stop-color="#eb4334" />+ <stop offset="100%" stop-color="#37eb34" />+ </linearGradient>+ </defs>++ <rect id="rect" {width} {height} rx="15" fill="url(#gradient)" />++ <rect x={maskX} y="0" width={maskWidth} height={height + 1} fill="white" />++ <rect x={otherMaskX} y="0" width={otherMaskWidth} height={height + 1} fill="white" />+ </svg>+ {/if}</div>diff --git a/tools/ranking-diff/src/routes/queries/+page.svelte b/tools/ranking-diff/src/routes/queries/+page.svelteindex 010333d2..aa3d8d94 100644--- a/tools/ranking-diff/src/routes/queries/+page.svelte+++ b/tools/ranking-diff/src/routes/queries/+page.svelte@@ -1,155 +1,155 @@<script lang="ts">- import { onMount } from 'svelte';- import AddIcon from '~icons/heroicons/plus-circle';- import DeleteIcon from '~icons/heroicons/trash';- import type { Category, Query } from '$lib';- import Navbar from '../components/Navbar.svelte';- import { get } from 'svelte/store';-- const addQuery = async (query: string) => {- if (query.trim() === '') {- return;- }-- await fetch('/api/queries/insert', {- method: 'POST',- headers: { 'Content-Type': 'application/json' },- body: JSON.stringify({ query }),- });- };-- const addQuerySubmit = async (e: Event) => {- e.preventDefault();-- if (!input) {- return;- }-- await addQuery(input.value);- await getQueries();-- input.value = '';- };-- const getQueries = async () => {- const res = await fetch('/api/queries');- queries = await res.json();- };-- const clearQueries = async () => {- await fetch('/api/queries/clear', { method: 'POST' });- await getQueries();- };-- const deleteQuery = async (id: number) => {- await fetch('/api/queries/delete', {- method: 'POST',- headers: { 'Content-Type': 'application/json' },- body: JSON.stringify({ id }),- });- await getQueries();- };-- const getQueryCategories = async (queryId: number) =>- (- await fetch(`/api/queries/categories`, {- method: 'POST',- headers: { 'Content-Type': 'application/json' },- body: JSON.stringify({ queryId }),- })- ).json() as Promise<Category[]>;-- const getQueryCategory = async (queryId: number): Promise<Category | undefined> =>- (await getQueryCategories(queryId))[0];-- const getCategories = async () => {- const res = await fetch('/api/categories');- allCategories = await res.json();- };-- const removeQueryCategory = async (query: Query) => {- await fetch('/api/queries/remove_category', {- method: 'POST',- headers: { 'Content-Type': 'application/json' },- body: JSON.stringify({ queryId: query.id }),- });- };-- const updateQueryCategory = async (e: Event, query: Query) => {- const select = e.target as HTMLSelectElement;-- if (select.value === '') {- await removeQueryCategory(query);- return;- }-- await fetch('/api/queries/add_category', {- method: 'POST',- headers: { 'Content-Type': 'application/json' },- body: JSON.stringify({ queryId: query.id, categoryId: Number(select.value) }),- });- };-- let queries: Query[] = [];- let allCategories: Category[] = [];-- let input: HTMLInputElement | null = null;- onMount(async () => {- await getQueries();- await getCategories();- });+ import { onMount } from 'svelte';+ import AddIcon from '~icons/heroicons/plus-circle';+ import DeleteIcon from '~icons/heroicons/trash';+ import type { Category, Query } from '$lib';+ import Navbar from '../components/Navbar.svelte';+ import { get } from 'svelte/store';++ const addQuery = async (query: string) => {+ if (query.trim() === '') {+ return;+ }++ await fetch('/api/queries/insert', {+ method: 'POST',+ headers: { 'Content-Type': 'application/json' },+ body: JSON.stringify({ query })+ });+ };++ const addQuerySubmit = async (e: Event) => {+ e.preventDefault();++ if (!input) {+ return;+ }++ await addQuery(input.value);+ await getQueries();++ input.value = '';+ };++ const getQueries = async () => {+ const res = await fetch('/api/queries');+ queries = await res.json();+ };++ const clearQueries = async () => {+ await fetch('/api/queries/clear', { method: 'POST' });+ await getQueries();+ };++ const deleteQuery = async (id: number) => {+ await fetch('/api/queries/delete', {+ method: 'POST',+ headers: { 'Content-Type': 'application/json' },+ body: JSON.stringify({ id })+ });+ await getQueries();+ };++ const getQueryCategories = async (queryId: number) =>+ (+ await fetch(`/api/queries/categories`, {+ method: 'POST',+ headers: { 'Content-Type': 'application/json' },+ body: JSON.stringify({ queryId })+ })+ ).json() as Promise<Category[]>;++ const getQueryCategory = async (queryId: number): Promise<Category | undefined> =>+ (await getQueryCategories(queryId))[0];++ const getCategories = async () => {+ const res = await fetch('/api/categories');+ allCategories = await res.json();+ };++ const removeQueryCategory = async (query: Query) => {+ await fetch('/api/queries/remove_category', {+ method: 'POST',+ headers: { 'Content-Type': 'application/json' },+ body: JSON.stringify({ queryId: query.id })+ });+ };++ const updateQueryCategory = async (e: Event, query: Query) => {+ const select = e.target as HTMLSelectElement;++ if (select.value === '') {+ await removeQueryCategory(query);+ return;+ }++ await fetch('/api/queries/add_category', {+ method: 'POST',+ headers: { 'Content-Type': 'application/json' },+ body: JSON.stringify({ queryId: query.id, categoryId: Number(select.value) })+ });+ };++ let queries: Query[] = [];+ let allCategories: Category[] = [];++ let input: HTMLInputElement | null = null;+ onMount(async () => {+ await getQueries();+ await getCategories();+ });</script><Navbar page="queries" /><div class="flex w-full flex-col items-center">- <h1 class="text-2xl">Queries</h1>-- <form class="flex gap-x-1" on:submit={addQuerySubmit}>- <input- bind:this={input}- class="rounded border border-slate-400 px-2 py-1"- placeholder="query"- type="text"- />- <button type="submit"><AddIcon class="text-green-600" /></button>- </form>-- <div class="mt-5 flex flex-col space-y-5">- {#each queries as query}- <div class="flex items-center justify-between gap-x-5">- <div class="flex gap-x-2">- <button on:click={() => deleteQuery(query.id)} class="hover:text-red-600">- <DeleteIcon class="w-3" />- </button>- <p class="w-full text-center">{query.text}</p>- </div>- {#if allCategories.length > 0}- <select- class="rounded bg-slate-200 px-2 py-1"- on:change={(e) => updateQueryCategory(e, query)}- >- <option value=""></option>-- {#await getQueryCategory(query.id) then selectedCategory}- {#each allCategories as category}- <option value={category.id} selected={category.id === selectedCategory?.id}- >{category.name}</option- >- {/each}- {/await}- </select>- {/if}- </div>- {/each}- </div>-- {#if queries.length == 0}- <p class="text-gray-500">No queries available.</p>- {:else}- <button- on:click={clearQueries}- class="mt-10 h-8 w-40 rounded bg-red-500 text-white disabled:bg-gray-400">Clear All</button- >- {/if}+ <h1 class="text-2xl">Queries</h1>++ <form class="flex gap-x-1" on:submit={addQuerySubmit}>+ <input+ bind:this={input}+ class="rounded border border-slate-400 px-2 py-1"+ placeholder="query"+ type="text"+ />+ <button type="submit"><AddIcon class="text-green-600" /></button>+ </form>++ <div class="mt-5 flex flex-col space-y-5">+ {#each queries as query}+ <div class="flex items-center justify-between gap-x-5">+ <div class="flex gap-x-2">+ <button on:click={() => deleteQuery(query.id)} class="hover:text-red-600">+ <DeleteIcon class="w-3" />+ </button>+ <p class="w-full text-center">{query.text}</p>+ </div>+ {#if allCategories.length > 0}+ <select+ class="rounded bg-slate-200 px-2 py-1"+ on:change={(e) => updateQueryCategory(e, query)}+ >+ <option value=""></option>++ {#await getQueryCategory(query.id) then selectedCategory}+ {#each allCategories as category}+ <option value={category.id} selected={category.id === selectedCategory?.id}+ >{category.name}</option+ >+ {/each}+ {/await}+ </select>+ {/if}+ </div>+ {/each}+ </div>++ {#if queries.length == 0}+ <p class="text-gray-500">No queries available.</p>+ {:else}+ <button+ on:click={clearQueries}+ class="mt-10 h-8 w-40 rounded bg-red-500 text-white disabled:bg-gray-400">Clear All</button+ >+ {/if}</div>diff --git a/tools/ranking-diff/svelte.config.js b/tools/ranking-diff/svelte.config.jsindex da3d3c02..c713d257 100644--- a/tools/ranking-diff/svelte.config.js+++ b/tools/ranking-diff/svelte.config.js@@ -7,34 +7,34 @@ const __dirname = dirname(fileURLToPath(import.meta.url));/** @type {import('@sveltejs/kit').Config} */const config = {- // Consult https://kit.svelte.dev/docs/integrations#preprocessors- // for more information about preprocessors- preprocess: vitePreprocess({- style: {- css: {- postcss: join(__dirname, 'postcss.config.js'),- },- },- }),+ // Consult https://kit.svelte.dev/docs/integrations#preprocessors+ // for more information about preprocessors+ preprocess: vitePreprocess({+ style: {+ css: {+ postcss: join(__dirname, 'postcss.config.js')+ }+ }+ }),- kit: {- csrf: {- checkOrigin: false,- },- // adapter-auto only supports some environments, see https://kit.svelte.dev/docs/adapter-auto for a list.- // If your environment is not supported, or you settled on a specific environment, switch out the adapter.- // See https://kit.svelte.dev/docs/adapters for more information about adapters.- adapter: adapter(),- csp: {- directives: {- 'default-src': ['*'],- 'script-src': ['self', 'wasm-unsafe-eval'],- 'connect-src': ['*'],- 'img-src': ['self', 'data:', 'stract.com', '0.0.0.0:3000', 'localhost:3000'],- 'style-src': ['self', 'unsafe-inline'],- },- },- },+ kit: {+ csrf: {+ checkOrigin: false+ },+ // adapter-auto only supports some environments, see https://kit.svelte.dev/docs/adapter-auto for a list.+ // If your environment is not supported, or you settled on a specific environment, switch out the adapter.+ // See https://kit.svelte.dev/docs/adapters for more information about adapters.+ adapter: adapter(),+ csp: {+ directives: {+ 'default-src': ['*'],+ 'script-src': ['self', 'wasm-unsafe-eval'],+ 'connect-src': ['*'],+ 'img-src': ['self', 'data:', 'stract.com', '0.0.0.0:3000', 'localhost:3000'],+ 'style-src': ['self', 'unsafe-inline']+ }+ }+ }};export default config;diff --git a/tools/ranking-diff/tailwind.config.ts b/tools/ranking-diff/tailwind.config.tsindex 03114c64..bfe0bc28 100644--- a/tools/ranking-diff/tailwind.config.ts+++ b/tools/ranking-diff/tailwind.config.ts@@ -1,8 +1,8 @@/** @type {import('tailwindcss').Config} */export default {- content: ["./src/**/*.{html,js,svelte,ts}"],- theme: {- extend: {},- },- plugins: [],+ content: ['./src/**/*.{html,js,svelte,ts}'],+ theme: {+ extend: {}+ },+ plugins: []};diff --git a/tools/ranking-diff/tsconfig.json b/tools/ranking-diff/tsconfig.jsonindex 2317b21e..a43ca1d4 100644--- a/tools/ranking-diff/tsconfig.json+++ b/tools/ranking-diff/tsconfig.json@@ -1,6 +1,6 @@{"extends": "./.svelte-kit/tsconfig.json",- "include": ["src/**/*", "global.d.ts", "vite.config.ts"],+ "include": ["src/**/*", "global.d.ts", "vite.config.ts"],"compilerOptions": {"allowJs": true,"checkJs": true,diff --git a/tools/ranking-diff/vite.config.ts b/tools/ranking-diff/vite.config.tsindex 2f4c16f4..763d2f35 100644--- a/tools/ranking-diff/vite.config.ts+++ b/tools/ranking-diff/vite.config.ts@@ -3,10 +3,10 @@ import { defineConfig } from 'vitest/config';import Icons from 'unplugin-icons/vite';export default defineConfig({- plugins: [- sveltekit(),- Icons({- compiler: 'svelte',- }),- ],+ plugins: [+ sveltekit(),+ Icons({+ compiler: 'svelte'+ })+ ]});