Feature/thread creation slug name ()

* thread creation additional params name and slug, with api

* typo fix

* Rebuild openai Swagger docs
Handle validations for fields to prevent invalid field inputs for .new
Enforce sluggification of `slug` to prevent breaking of URL structs

---------

Co-authored-by: abrakadobr <abrakadobr@gmail.com>
This commit is contained in:
Timothy Carambat 2024-10-21 13:09:55 -07:00 committed by GitHub
parent 446164d7b9
commit e71392d83f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 45 additions and 11 deletions
.vscode
server
endpoints/api/workspaceThread
models
swagger

View file

@ -50,6 +50,7 @@
"textgenwebui",
"togetherai",
"Unembed",
"uuidv",
"vectordbs",
"Weaviate",
"Zilliz"

View file

@ -31,12 +31,14 @@ function apiWorkspaceThreadEndpoints(app) {
type: 'string'
}
#swagger.requestBody = {
description: 'Optional userId associated with the thread',
description: 'Optional userId associated with the thread, thread slug and thread name',
required: false,
content: {
"application/json": {
example: {
userId: 1
userId: 1,
name: 'Name',
slug: 'thread-slug'
}
}
}
@ -67,9 +69,9 @@ function apiWorkspaceThreadEndpoints(app) {
}
*/
try {
const { slug } = request.params;
let { userId = null } = reqBody(request);
const workspace = await Workspace.get({ slug });
const wslug = request.params.slug;
let { userId = null, name = null, slug = null } = reqBody(request);
const workspace = await Workspace.get({ slug: wslug });
if (!workspace) {
response.sendStatus(400).end();
@ -83,7 +85,8 @@ function apiWorkspaceThreadEndpoints(app) {
const { thread, message } = await WorkspaceThread.new(
workspace,
userId ? Number(userId) : null
userId ? Number(userId) : null,
{ name, slug }
);
await Telemetry.sendTelemetry("workspace_thread_created", {

View file

@ -1,16 +1,44 @@
const prisma = require("../utils/prisma");
const slugifyModule = require("slugify");
const { v4: uuidv4 } = require("uuid");
const WorkspaceThread = {
defaultName: "Thread",
writable: ["name"],
new: async function (workspace, userId = null) {
/**
* The default Slugify module requires some additional mapping to prevent downstream issues
* if the user is able to define a slug externally. We have to block non-escapable URL chars
* so that is the slug is rendered it doesn't break the URL or UI when visited.
* @param {...any} args - slugify args for npm package.
* @returns {string}
*/
slugify: function (...args) {
slugifyModule.extend({
"+": " plus ",
"!": " bang ",
"@": " at ",
"*": " splat ",
".": " dot ",
":": "",
"~": "",
"(": "",
")": "",
"'": "",
'"': "",
"|": "",
});
return slugifyModule(...args);
},
new: async function (workspace, userId = null, data = {}) {
try {
const thread = await prisma.workspace_threads.create({
data: {
name: this.defaultName,
slug: uuidv4(),
name: data.name ? String(data.name) : this.defaultName,
slug: data.slug
? this.slugify(data.slug, { lowercase: true })
: uuidv4(),
user_id: userId ? Number(userId) : null,
workspace_id: workspace.id,
},

View file

@ -2391,12 +2391,14 @@
}
},
"requestBody": {
"description": "Optional userId associated with the thread",
"description": "Optional userId associated with the thread, thread slug and thread name",
"required": false,
"content": {
"application/json": {
"example": {
"userId": 1
"userId": 1,
"name": "Name",
"slug": "thread-slug"
}
}
}