cache sharing for posts. Begin infill implementation.
This commit is contained in:
@@ -1,13 +1,6 @@
|
|||||||
import { Typewriter } from "./Typewriter";
|
import { Typewriter } from "./Typewriter";
|
||||||
import { useBars } from "~/context/bars";
|
import { useBars } from "~/context/bars";
|
||||||
import {
|
import { onMount, createSignal, Show, For, onCleanup } from "solid-js";
|
||||||
onMount,
|
|
||||||
createEffect,
|
|
||||||
createSignal,
|
|
||||||
Show,
|
|
||||||
For,
|
|
||||||
onCleanup
|
|
||||||
} from "solid-js";
|
|
||||||
import { api } from "~/lib/api";
|
import { api } from "~/lib/api";
|
||||||
import { insertSoftHyphens } from "~/lib/client-utils";
|
import { insertSoftHyphens } from "~/lib/client-utils";
|
||||||
import GitHub from "./icons/GitHub";
|
import GitHub from "./icons/GitHub";
|
||||||
|
|||||||
@@ -644,6 +644,15 @@ export default function TextEditor(props: TextEditorProps) {
|
|||||||
let isInitialLoad = true; // Flag to prevent capturing history on initial load
|
let isInitialLoad = true; // Flag to prevent capturing history on initial load
|
||||||
let hasAttemptedHistoryLoad = false; // Flag to prevent repeated load attempts
|
let hasAttemptedHistoryLoad = false; // Flag to prevent repeated load attempts
|
||||||
|
|
||||||
|
// LLM Infill state
|
||||||
|
const [currentSuggestion, setCurrentSuggestion] = createSignal<string>("");
|
||||||
|
const [isInfillLoading, setIsInfillLoading] = createSignal(false);
|
||||||
|
const [infillConfig, setInfillConfig] = createSignal<{
|
||||||
|
endpoint: string;
|
||||||
|
token: string;
|
||||||
|
} | null>(null);
|
||||||
|
let infillDebounceTimer: ReturnType<typeof setTimeout> | null = null;
|
||||||
|
|
||||||
// Force reactive updates for button states
|
// Force reactive updates for button states
|
||||||
const [editorState, setEditorState] = createSignal(0);
|
const [editorState, setEditorState] = createSignal(0);
|
||||||
|
|
||||||
@@ -682,6 +691,67 @@ export default function TextEditor(props: TextEditorProps) {
|
|||||||
return `${baseClasses} ${activeClass} ${hoverClass}`.trim();
|
return `${baseClasses} ${activeClass} ${hoverClass}`.trim();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// Fetch infill config on mount (admin-only, desktop-only)
|
||||||
|
createEffect(async () => {
|
||||||
|
try {
|
||||||
|
const config = await api.infill.getConfig.query();
|
||||||
|
if (config.endpoint && config.token) {
|
||||||
|
setInfillConfig({ endpoint: config.endpoint, token: config.token });
|
||||||
|
console.log("✅ Infill enabled for admin");
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
console.error("Failed to fetch infill config:", error);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// Request LLM infill suggestion
|
||||||
|
const requestInfill = async (): Promise<void> => {
|
||||||
|
const config = infillConfig();
|
||||||
|
if (!config) return;
|
||||||
|
|
||||||
|
const context = getEditorContext();
|
||||||
|
if (!context) return;
|
||||||
|
|
||||||
|
setIsInfillLoading(true);
|
||||||
|
try {
|
||||||
|
const response = await fetch(config.endpoint, {
|
||||||
|
method: "POST",
|
||||||
|
headers: {
|
||||||
|
"Content-Type": "application/json",
|
||||||
|
Authorization: `Bearer ${config.token}`
|
||||||
|
},
|
||||||
|
body: JSON.stringify({
|
||||||
|
model: "default",
|
||||||
|
messages: [
|
||||||
|
{
|
||||||
|
role: "user",
|
||||||
|
content: `Continue writing from this context:\n\nBefore cursor: ${context.prefix}\n\nAfter cursor: ${context.suffix}`
|
||||||
|
}
|
||||||
|
],
|
||||||
|
max_tokens: 100,
|
||||||
|
temperature: 0.3,
|
||||||
|
stop: ["\n\n"]
|
||||||
|
})
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new Error(`Infill request failed: ${response.status}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
const data = await response.json();
|
||||||
|
const suggestion = data.choices?.[0]?.message?.content || "";
|
||||||
|
|
||||||
|
if (suggestion.trim()) {
|
||||||
|
setCurrentSuggestion(suggestion.trim());
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
console.error("Infill request failed:", error);
|
||||||
|
setCurrentSuggestion("");
|
||||||
|
} finally {
|
||||||
|
setIsInfillLoading(false);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
// Capture history snapshot
|
// Capture history snapshot
|
||||||
const captureHistory = async (editorInstance: any) => {
|
const captureHistory = async (editorInstance: any) => {
|
||||||
// Skip if initial load
|
// Skip if initial load
|
||||||
@@ -856,6 +926,34 @@ export default function TextEditor(props: TextEditorProps) {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// Extract editor context for LLM infill (512 chars before/after cursor)
|
||||||
|
const getEditorContext = (): {
|
||||||
|
prefix: string;
|
||||||
|
suffix: string;
|
||||||
|
cursorPos: number;
|
||||||
|
} | null => {
|
||||||
|
const instance = editor();
|
||||||
|
if (!instance) return null;
|
||||||
|
|
||||||
|
const { state } = instance;
|
||||||
|
const cursorPos = state.selection.$anchor.pos;
|
||||||
|
const text = state.doc.textContent;
|
||||||
|
|
||||||
|
if (text.length === 0) return null;
|
||||||
|
|
||||||
|
const prefix = text.slice(Math.max(0, cursorPos - 512), cursorPos);
|
||||||
|
const suffix = text.slice(
|
||||||
|
cursorPos,
|
||||||
|
Math.min(text.length, cursorPos + 512)
|
||||||
|
);
|
||||||
|
|
||||||
|
return {
|
||||||
|
prefix,
|
||||||
|
suffix,
|
||||||
|
cursorPos
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
const editor = createTiptapEditor(() => ({
|
const editor = createTiptapEditor(() => ({
|
||||||
element: editorRef,
|
element: editorRef,
|
||||||
extensions: [
|
extensions: [
|
||||||
|
|||||||
3
src/env/client.ts
vendored
3
src/env/client.ts
vendored
@@ -7,7 +7,8 @@ const clientEnvSchema = z.object({
|
|||||||
VITE_GOOGLE_CLIENT_ID: z.string().min(1),
|
VITE_GOOGLE_CLIENT_ID: z.string().min(1),
|
||||||
VITE_GOOGLE_CLIENT_ID_MAGIC_DELVE: z.string().min(1),
|
VITE_GOOGLE_CLIENT_ID_MAGIC_DELVE: z.string().min(1),
|
||||||
VITE_GITHUB_CLIENT_ID: z.string().min(1),
|
VITE_GITHUB_CLIENT_ID: z.string().min(1),
|
||||||
VITE_WEBSOCKET: z.string().min(1)
|
VITE_WEBSOCKET: z.string().min(1),
|
||||||
|
VITE_INFILL_ENDPOINT: z.string().min(1)
|
||||||
});
|
});
|
||||||
|
|
||||||
// Type inference
|
// Type inference
|
||||||
|
|||||||
4
src/env/server.ts
vendored
4
src/env/server.ts
vendored
@@ -30,7 +30,9 @@ const serverEnvSchema = z.object({
|
|||||||
VITE_GOOGLE_CLIENT_ID: z.string().min(1),
|
VITE_GOOGLE_CLIENT_ID: z.string().min(1),
|
||||||
VITE_GOOGLE_CLIENT_ID_MAGIC_DELVE: z.string().min(1),
|
VITE_GOOGLE_CLIENT_ID_MAGIC_DELVE: z.string().min(1),
|
||||||
VITE_GITHUB_CLIENT_ID: z.string().min(1),
|
VITE_GITHUB_CLIENT_ID: z.string().min(1),
|
||||||
VITE_WEBSOCKET: z.string().min(1)
|
VITE_WEBSOCKET: z.string().min(1),
|
||||||
|
VITE_INFILL_ENDPOINT: z.string().min(1),
|
||||||
|
INFILL_BEARER_TOKEN: z.string().min(1)
|
||||||
});
|
});
|
||||||
|
|
||||||
// Type inference
|
// Type inference
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ import { userRouter } from "./routers/user";
|
|||||||
import { blogRouter } from "./routers/blog";
|
import { blogRouter } from "./routers/blog";
|
||||||
import { gitActivityRouter } from "./routers/git-activity";
|
import { gitActivityRouter } from "./routers/git-activity";
|
||||||
import { postHistoryRouter } from "./routers/post-history";
|
import { postHistoryRouter } from "./routers/post-history";
|
||||||
|
import { infillRouter } from "./routers/infill";
|
||||||
import { createTRPCRouter } from "./utils";
|
import { createTRPCRouter } from "./utils";
|
||||||
|
|
||||||
export const appRouter = createTRPCRouter({
|
export const appRouter = createTRPCRouter({
|
||||||
@@ -18,7 +19,8 @@ export const appRouter = createTRPCRouter({
|
|||||||
user: userRouter,
|
user: userRouter,
|
||||||
blog: blogRouter,
|
blog: blogRouter,
|
||||||
gitActivity: gitActivityRouter,
|
gitActivity: gitActivityRouter,
|
||||||
postHistory: postHistoryRouter
|
postHistory: postHistoryRouter,
|
||||||
|
infill: infillRouter
|
||||||
});
|
});
|
||||||
|
|
||||||
export type AppRouter = typeof appRouter;
|
export type AppRouter = typeof appRouter;
|
||||||
|
|||||||
@@ -2,47 +2,12 @@ import { createTRPCRouter, publicProcedure } from "../utils";
|
|||||||
import { ConnectionFactory } from "~/server/utils";
|
import { ConnectionFactory } from "~/server/utils";
|
||||||
import { withCacheAndStale } from "~/server/cache";
|
import { withCacheAndStale } from "~/server/cache";
|
||||||
import { incrementPostReadSchema } from "../schemas/blog";
|
import { incrementPostReadSchema } from "../schemas/blog";
|
||||||
import type { Post, PostWithCommentsAndLikes } from "~/db/types";
|
import type { PostWithCommentsAndLikes } from "~/db/types";
|
||||||
|
|
||||||
const BLOG_CACHE_TTL = 24 * 60 * 60 * 1000; // 24 hours
|
const BLOG_CACHE_TTL = 24 * 60 * 60 * 1000; // 24 hours
|
||||||
|
|
||||||
export const blogRouter = createTRPCRouter({
|
// Shared cache function for all blog posts
|
||||||
getRecentPosts: publicProcedure.query(async () => {
|
const getAllPostsData = async (privilegeLevel: string) => {
|
||||||
return withCacheAndStale("blog-recent-posts", BLOG_CACHE_TTL, async () => {
|
|
||||||
// Get database connection
|
|
||||||
const conn = ConnectionFactory();
|
|
||||||
|
|
||||||
// Query for the 3 most recent published posts
|
|
||||||
const query = `
|
|
||||||
SELECT
|
|
||||||
p.id,
|
|
||||||
p.title,
|
|
||||||
p.subtitle,
|
|
||||||
p.date,
|
|
||||||
p.published,
|
|
||||||
p.category,
|
|
||||||
p.author_id,
|
|
||||||
p.banner_photo,
|
|
||||||
p.reads,
|
|
||||||
COUNT(DISTINCT pl.user_id) as total_likes,
|
|
||||||
COUNT(DISTINCT c.id) as total_comments
|
|
||||||
FROM Post p
|
|
||||||
LEFT JOIN PostLike pl ON p.id = pl.post_id
|
|
||||||
LEFT JOIN Comment c ON p.id = c.post_id
|
|
||||||
WHERE p.published = TRUE
|
|
||||||
GROUP BY p.id, p.title, p.subtitle, p.date, p.published, p.category, p.author_id, p.reads
|
|
||||||
ORDER BY p.date DESC
|
|
||||||
LIMIT 3;
|
|
||||||
`;
|
|
||||||
|
|
||||||
const results = await conn.execute(query);
|
|
||||||
return results.rows as unknown as PostWithCommentsAndLikes[];
|
|
||||||
});
|
|
||||||
}),
|
|
||||||
|
|
||||||
getPosts: publicProcedure.query(async ({ ctx }) => {
|
|
||||||
const privilegeLevel = ctx.privilegeLevel;
|
|
||||||
|
|
||||||
return withCacheAndStale(
|
return withCacheAndStale(
|
||||||
`blog-posts-${privilegeLevel}`,
|
`blog-posts-${privilegeLevel}`,
|
||||||
BLOG_CACHE_TTL,
|
BLOG_CACHE_TTL,
|
||||||
@@ -75,7 +40,7 @@ export const blogRouter = createTRPCRouter({
|
|||||||
}
|
}
|
||||||
|
|
||||||
postsQuery += ` GROUP BY p.id, p.title, p.subtitle, p.body, p.banner_photo, p.date, p.published, p.category, p.author_id, p.reads, p.attachments`;
|
postsQuery += ` GROUP BY p.id, p.title, p.subtitle, p.body, p.banner_photo, p.date, p.published, p.category, p.author_id, p.reads, p.attachments`;
|
||||||
postsQuery += ` ORDER BY p.date ASC;`;
|
postsQuery += ` ORDER BY p.date DESC;`;
|
||||||
|
|
||||||
const postsResult = await conn.execute(postsQuery);
|
const postsResult = await conn.execute(postsQuery);
|
||||||
const posts = postsResult.rows as unknown as PostWithCommentsAndLikes[];
|
const posts = postsResult.rows as unknown as PostWithCommentsAndLikes[];
|
||||||
@@ -103,6 +68,20 @@ export const blogRouter = createTRPCRouter({
|
|||||||
return { posts, tags, tagMap, privilegeLevel };
|
return { posts, tags, tagMap, privilegeLevel };
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export const blogRouter = createTRPCRouter({
|
||||||
|
getRecentPosts: publicProcedure.query(async ({ ctx }) => {
|
||||||
|
// Always use public privilege level for recent posts (only show published)
|
||||||
|
const allPostsData = await getAllPostsData("public");
|
||||||
|
|
||||||
|
// Return only the 3 most recent posts (already sorted DESC by date)
|
||||||
|
return allPostsData.posts.slice(0, 3);
|
||||||
|
}),
|
||||||
|
|
||||||
|
getPosts: publicProcedure.query(async ({ ctx }) => {
|
||||||
|
const privilegeLevel = ctx.privilegeLevel;
|
||||||
|
return getAllPostsData(privilegeLevel);
|
||||||
}),
|
}),
|
||||||
|
|
||||||
incrementPostRead: publicProcedure
|
incrementPostRead: publicProcedure
|
||||||
|
|||||||
33
src/server/api/routers/infill.ts
Normal file
33
src/server/api/routers/infill.ts
Normal file
@@ -0,0 +1,33 @@
|
|||||||
|
import { publicProcedure, createTRPCRouter } from "~/server/api/utils";
|
||||||
|
import { env } from "~/env/server";
|
||||||
|
|
||||||
|
// Helper to detect mobile devices from User-Agent
|
||||||
|
const isMobileDevice = (userAgent: string | undefined): boolean => {
|
||||||
|
if (!userAgent) return false;
|
||||||
|
return /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(
|
||||||
|
userAgent
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export const infillRouter = createTRPCRouter({
|
||||||
|
getConfig: publicProcedure.query(({ ctx }) => {
|
||||||
|
// Only admins get the config
|
||||||
|
if (ctx.privilegeLevel !== "admin") {
|
||||||
|
return { endpoint: null, token: null };
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get User-Agent from request headers
|
||||||
|
const userAgent = ctx.event.nativeEvent.node.req.headers["user-agent"];
|
||||||
|
|
||||||
|
// Block mobile devices - infill is desktop only
|
||||||
|
if (isMobileDevice(userAgent)) {
|
||||||
|
return { endpoint: null, token: null };
|
||||||
|
}
|
||||||
|
|
||||||
|
// Return endpoint and token (or null if not configured)
|
||||||
|
return {
|
||||||
|
endpoint: env.VITE_INFILL_ENDPOINT || null,
|
||||||
|
token: env.INFILL_BEARER_TOKEN || null
|
||||||
|
};
|
||||||
|
})
|
||||||
|
});
|
||||||
Reference in New Issue
Block a user