Skip to content

Commit

Permalink
[JS] use shorthand notation (huggingface#711)
Browse files Browse the repository at this point in the history
* [JS] use shorthand notation

* add `"object-shorthand": ["error", "always"],`

* fix "Expected method shorthand  object-shorthand"

* format
  • Loading branch information
Mishig authored Jan 22, 2024
1 parent f35e104 commit d5559df
Show file tree
Hide file tree
Showing 13 changed files with 16 additions and 15 deletions.
1 change: 1 addition & 0 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ module.exports = {
argsIgnorePattern: "^_",
},
],
"object-shorthand": ["error", "always"],
},
env: {
browser: true,
Expand Down
2 changes: 1 addition & 1 deletion src/lib/server/auth.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ export function refreshSessionCookie(cookies: Cookies, sessionId: string) {
}

export async function findUser(sessionId: string) {
const session = await collections.sessions.findOne({ sessionId: sessionId });
const session = await collections.sessions.findOne({ sessionId });

if (!session) {
return null;
Expand Down
2 changes: 1 addition & 1 deletion src/lib/server/endpoints/openai/endpointOai.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export async function endpointOai(

const openai = new OpenAI({
apiKey: apiKey ?? "sk-",
baseURL: baseURL,
baseURL,
});

if (completion === "completions") {
Expand Down
2 changes: 1 addition & 1 deletion src/lib/server/sentenceSimilarity.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export async function findSimilarSentences(
(sentenceEmbedding: Embedding, index: number) => {
return {
distance: innerProduct(queryEmbedding, sentenceEmbedding),
index: index,
index,
};
}
);
Expand Down
4 changes: 2 additions & 2 deletions src/lib/server/websearch/runWebSearch.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export async function runWebSearch(
})() satisfies Message[];

const webSearch: WebSearch = {
prompt: prompt,
prompt,
searchQuery: "",
results: [],
context: "",
Expand All @@ -35,7 +35,7 @@ export async function runWebSearch(
};

function appendUpdate(message: string, args?: string[], type?: "error" | "update") {
updatePad({ type: "webSearch", messageType: type ?? "update", message: message, args: args });
updatePad({ type: "webSearch", messageType: type ?? "update", message, args });
}

try {
Expand Down
2 changes: 1 addition & 1 deletion src/lib/utils/loadClientCerts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export function loadClientCertificates(
key: clientKey,
ca: caCert,
passphrase: clientKeyPassword,
rejectUnauthorized: rejectUnauthorized,
rejectUnauthorized,
},
});

Expand Down
2 changes: 1 addition & 1 deletion src/routes/conversation/+server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ export const POST: RequestHandler = async ({ locals, request }) => {
preprompt: preprompt === model?.preprompt ? model?.preprompt : preprompt,
createdAt: new Date(),
updatedAt: new Date(),
embeddingModel: embeddingModel,
embeddingModel,
...(locals.user ? { userId: locals.user._id } : { sessionId: locals.sessionId }),
...(values.fromShare ? { meta: { fromShareId: values.fromShare } } : {}),
});
Expand Down
2 changes: 1 addition & 1 deletion src/routes/conversation/[id]/+page.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@
messages = messages.map((message) => {
if (message.id === messageId) {
oldScore = message.score;
return { ...message, score: score };
return { ...message, score };
}
return message;
});
Expand Down
6 changes: 3 additions & 3 deletions src/routes/conversation/[id]/+server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export async function POST({ request, locals, params, getClientAddress }) {

// register the event for ratelimiting
await collections.messageEvents.insertOne({
userId: userId,
userId,
createdAt: new Date(),
ip: getClientAddress(),
});
Expand Down Expand Up @@ -265,7 +265,7 @@ export async function POST({ request, locals, params, getClientAddress }) {
from: "assistant",
content: output.token.text.trimStart(),
webSearch: webSearchResults,
updates: updates,
updates,
id: crypto.randomUUID(),
createdAt: new Date(),
updatedAt: new Date(),
Expand Down Expand Up @@ -293,7 +293,7 @@ export async function POST({ request, locals, params, getClientAddress }) {
{
...messages[messages.length - 1],
content: output.generated_text,
updates: updates,
updates,
updatedAt: new Date(),
},
];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export async function GET({ params, locals }) {
preprompt: conv.preprompt,
webSearch: messagesUpTo[messagesUpTo.length - 1].webSearch,
messages: messagesUpTo,
model: model,
model,
});

return new Response(
Expand Down
2 changes: 1 addition & 1 deletion src/routes/conversations/+page.server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { collections } from "$lib/server/database";
import { redirect } from "@sveltejs/kit";

export const actions = {
delete: async function ({ locals }) {
async delete({ locals }) {
// double check we have a user to delete conversations for
if (locals.user?._id || locals.sessionId) {
await collections.conversations.deleteMany({
Expand Down
2 changes: 1 addition & 1 deletion src/routes/login/+page.server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { getOIDCAuthorizationUrl } from "$lib/server/auth";
import { base } from "$app/paths";

export const actions = {
default: async function ({ url, locals, request }) {
async default({ url, locals, request }) {
// TODO: Handle errors if provider is not responding
const referer = request.headers.get("referer");
const authorizationUrl = await getOIDCAuthorizationUrl(
Expand Down
2 changes: 1 addition & 1 deletion src/routes/logout/+page.server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { collections } from "$lib/server/database";
import { redirect } from "@sveltejs/kit";

export const actions = {
default: async function ({ cookies, locals }) {
async default({ cookies, locals }) {
await collections.sessions.deleteOne({ sessionId: locals.sessionId });

cookies.delete(COOKIE_NAME, {
Expand Down

0 comments on commit d5559df

Please sign in to comment.