Skip to content

armgit / E2B

Public Imported from GitHub
0

Open-source, secure environment with real-world tools for enterprise-grade agents.

Fix markdown support

Tomas Valentad045d5381945
diff --git a/api-service/models/base.py b/api-service/models/base.py
index aad8772ff..dbba32ab3 100644
--- a/api-service/models/base.py
+++ b/api-service/models/base.py
@@ -52,7 +52,7 @@ def get_model(
request_timeout=3600,
verbose=True,
max_retries=10,
- streaming=True,
+ streaming=False,
callback_manager=callback_manager,
)
case ModelProvider.AzureOpenAI.value:
diff --git a/components/Editor/Sidebar/Prompt/PromptEditor.tsx b/components/Editor/Sidebar/Prompt/PromptEditor.tsx
index dc8ce8c5b..462bbc921 100644
--- a/components/Editor/Sidebar/Prompt/PromptEditor.tsx
+++ b/components/Editor/Sidebar/Prompt/PromptEditor.tsx
@@ -23,7 +23,6 @@ function Editor({
placeholder,
modelConfig,
content: initialContent,
- referenceSearch,
}: Props) {
const [selectors] = useStateStore()
const setModelConfigPrompt = selectors.use.setModelConfigPrompt()
@@ -47,7 +46,6 @@ function Editor({
initialContent,
onContentChange: onChange,
placeholder,
- referenceSearch,
})
return (
diff --git a/components/Editor/Template/NodeJSExpressTemplate/InstructionsEditor/index.tsx b/components/Editor/Template/NodeJSExpressTemplate/InstructionsEditor/index.tsx
index d76338723..a08dbb9c0 100644
--- a/components/Editor/Template/NodeJSExpressTemplate/InstructionsEditor/index.tsx
+++ b/components/Editor/Template/NodeJSExpressTemplate/InstructionsEditor/index.tsx
@@ -27,7 +27,6 @@ function InstructionsEditor({
initialContent: content,
onContentChange: onChange,
placeholder,
- referenceSearch,
})
return (
diff --git a/components/Editor/Template/SmolDeveloperTemplate/InstructionsEditor/index.tsx b/components/Editor/Template/SmolDeveloperTemplate/InstructionsEditor/index.tsx
index 7ce4e9430..ec686972a 100644
--- a/components/Editor/Template/SmolDeveloperTemplate/InstructionsEditor/index.tsx
+++ b/components/Editor/Template/SmolDeveloperTemplate/InstructionsEditor/index.tsx
@@ -18,13 +18,11 @@ function InstructionsEditor({
onChange,
content,
placeholder,
- referenceSearch,
}: Props) {
const editor = useDocEditor({
initialContent: content,
onContentChange: onChange,
placeholder,
- referenceSearch,
})
return (
diff --git a/components/Editor/Template/StripeCheckoutTemplate/InstructionsEditor/index.tsx b/components/Editor/Template/StripeCheckoutTemplate/InstructionsEditor/index.tsx
index 7ce4e9430..ec686972a 100644
--- a/components/Editor/Template/StripeCheckoutTemplate/InstructionsEditor/index.tsx
+++ b/components/Editor/Template/StripeCheckoutTemplate/InstructionsEditor/index.tsx
@@ -18,13 +18,11 @@ function InstructionsEditor({
onChange,
content,
placeholder,
- referenceSearch,
}: Props) {
const editor = useDocEditor({
initialContent: content,
onContentChange: onChange,
placeholder,
- referenceSearch,
})
return (
diff --git a/editor/schema.ts b/editor/schema.ts
index 90ccd74f7..d80502136 100644
--- a/editor/schema.ts
+++ b/editor/schema.ts
@@ -1,88 +1,13 @@
-import { createDocument, getSchema } from '@tiptap/react'
import { StarterKit } from '@tiptap/starter-kit'
-import { MarkdownSerializer, defaultMarkdownSerializer } from 'prosemirror-markdown'
-import BulletList from '@tiptap/extension-bullet-list'
-import ListItem from '@tiptap/extension-list-item'
-import OrderedList from '@tiptap/extension-ordered-list'
-import CodeBlock from '@tiptap/extension-code-block'
-import Paragraph from '@tiptap/extension-paragraph'
-
+import { Markdown } from 'tiptap-markdown'
import { Reference } from './referenceType'
-import ReferenceExtension, {
- REFERENCE_TYPE_ATTRIBUTE_NAME,
- REFERENCE_VALUE_ATTRIBUTE_NAME,
-} from 'editor/extensions/reference'
-
-
export const extensions = [
- StarterKit.configure({
- // blockquote: false,
- // bold: false,
- // code: false,
- dropcursor: false,
- hardBreak: false,
- // heading: false,
- // horizontalRule: false,
- // italic: false,
- strike: false,
- paragraph: false,
-
- // We use the Ordered List, Code block, Bullet List and List item from explicit packages
- // so we can use their names in the markdown serializer.
- codeBlock: false,
- bulletList: false,
- listItem: false,
- orderedList: false,
- }),
- Paragraph,
- CodeBlock,
- OrderedList,
- ListItem,
- BulletList,
- ReferenceExtension,
+ StarterKit,
+ Markdown,
]
-const schema = getSchema(extensions)
-
-const serializer = new MarkdownSerializer({
- ...defaultMarkdownSerializer.nodes,
- [OrderedList.name]: defaultMarkdownSerializer.nodes.ordered_list,
- [ListItem.name]: defaultMarkdownSerializer.nodes.list_item,
- [BulletList.name]: defaultMarkdownSerializer.nodes.bullet_list,
- [CodeBlock.name]: defaultMarkdownSerializer.nodes.code_block,
- [Paragraph.name]: (state, node) => {
- state.text('\n')
- state.renderInline(node)
- },
- [ReferenceExtension.name]: (state, node) => {
- state.text(' `' + node.attrs[REFERENCE_VALUE_ATTRIBUTE_NAME] + '` ')
- },
-}, {
- ...defaultMarkdownSerializer.marks,
-})
-
-
+// Placeholder function until we delete all depending code
export function html2markdown(html: string): [string, Reference[]] {
- const node = createDocument(html, schema)
- const markdown = serializer.serialize(node)
-
- const references: Reference[] = []
-
- node.descendants(n => {
- if (n.type.name === ReferenceExtension.name) {
- references.push({
- type: n.attrs[REFERENCE_TYPE_ATTRIBUTE_NAME],
- value: n.attrs[REFERENCE_VALUE_ATTRIBUTE_NAME],
- })
- }
- })
-
- const uniqueReferences = references.filter((reference, index, self) =>
- index === self.findIndex((r) => (
- r.type === reference.type && r.value === reference.value
- ))
- )
-
- return [markdown, uniqueReferences]
+ return ['', []]
}
diff --git a/hooks/useDocEditor.ts b/hooks/useDocEditor.ts
index fcb2c9c12..6166a05f8 100644
--- a/hooks/useDocEditor.ts
+++ b/hooks/useDocEditor.ts
@@ -1,9 +1,6 @@
import { useEditor } from '@tiptap/react'
import Placeholder from '@tiptap/extension-placeholder'
-import Fuse from 'fuse.js'
-import { Reference } from 'editor/referenceType'
-import AutocompleteExtension from 'editor/extensions/autocomplete'
import { extensions } from 'editor/schema'
import CustomKeymap from 'editor/extensions/keymap'
@@ -11,10 +8,12 @@ function useDocEditor({
initialContent,
onContentChange,
placeholder,
- referenceSearch,
}: {
- referenceSearch?: Fuse<Reference>
initialContent: string,
+ /**
+ * @param content in Markdown format
+ * @returns
+ */
onContentChange: (content: string) => void,
placeholder?: string
}) {
@@ -32,11 +31,6 @@ function useDocEditor({
extensions: [
...extensions,
CustomKeymap,
- ...referenceSearch ? [AutocompleteExtension.configure({
- suggestion: {
- items: query => referenceSearch.search(query),
- },
- })] : [],
Placeholder.configure({
placeholder: ({ editor }) => {
if (!editor.getText()) {
@@ -46,9 +40,10 @@ function useDocEditor({
}
}),
],
+
onUpdate({ transaction, editor }) {
if (transaction.docChanged) {
- onContentChange(editor.getHTML())
+ onContentChange(editor.storage.markdown.getMarkdown())
}
},
}, [onContentChange])
diff --git a/package-lock.json b/package-lock.json
index 48765c832..ea0d27621 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -54,6 +54,7 @@
"superjson": "^1.12.2",
"swr": "^2.0.4",
"tippy.js": "^6.3.7",
+ "tiptap-markdown": "^0.7.2",
"usehooks-ts": "^2.9.1",
"zustand": "^4.3.5"
},
@@ -1421,6 +1422,20 @@
"@types/node": "*"
}
},
+ "node_modules/@types/linkify-it": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-3.0.2.tgz",
+ "integrity": "sha512-HZQYqbiFVWufzCwexrvh694SOim8z2d+xJl5UNamcvQFejLY/2YUtzXHYi3cHdI7PMlS8ejH2slRAOJQ32aNbA=="
+ },
+ "node_modules/@types/markdown-it": {
+ "version": "12.2.3",
+ "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-12.2.3.tgz",
+ "integrity": "sha512-GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ==",
+ "dependencies": {
+ "@types/linkify-it": "*",
+ "@types/mdurl": "*"
+ }
+ },
"node_modules/@types/mdast": {
"version": "3.0.10",
"resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.10.tgz",
@@ -1429,6 +1444,11 @@
"@types/unist": "*"
}
},
+ "node_modules/@types/mdurl": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/@types/mdurl/-/mdurl-1.0.2.tgz",
+ "integrity": "sha512-eC4U9MlIcu2q0KQmXszyn5Akca/0jrQmwDRgpAMJai7qBWq4amIQhZyNau4VYGtCeALvW1/NtjzJJ567aZxfKA=="
+ },
"node_modules/@types/micro": {
"version": "7.3.7",
"resolved": "https://registry.npmjs.org/@types/micro/-/micro-7.3.7.tgz",
@@ -5070,6 +5090,11 @@
"markdown-it": "bin/markdown-it.js"
}
},
+ "node_modules/markdown-it-task-lists": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/markdown-it-task-lists/-/markdown-it-task-lists-2.1.1.tgz",
+ "integrity": "sha512-TxFAc76Jnhb2OUu+n3yz9RMu4CwGfaT788br6HhEDlvWfdeJcLUsxk1Hgw2yJio0OXsxv7pyIPmvECY7bMbluA=="
+ },
"node_modules/mdast-util-definitions": {
"version": "5.1.2",
"resolved": "https://registry.npmjs.org/mdast-util-definitions/-/mdast-util-definitions-5.1.2.tgz",
@@ -8243,6 +8268,20 @@
"@popperjs/core": "^2.9.0"
}
},
+ "node_modules/tiptap-markdown": {
+ "version": "0.7.2",
+ "resolved": "https://registry.npmjs.org/tiptap-markdown/-/tiptap-markdown-0.7.2.tgz",
+ "integrity": "sha512-awmd2hsHdkV/X45jNQeqF2qT8m/hSqUzI3/XsklJsgLJ6SUOnxvALUBu28omJ9+Eph7Ctc2QUVEno3UIKcudwg==",
+ "dependencies": {
+ "@types/markdown-it": "^12.2.3",
+ "markdown-it": "^13.0.1",
+ "markdown-it-task-lists": "^2.1.1",
+ "prosemirror-markdown": "^1.10.1"
+ },
+ "peerDependencies": {
+ "@tiptap/core": "^2.0.3"
+ }
+ },
"node_modules/to-regex-range": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
diff --git a/package.json b/package.json
index 91763defb..8db05c06e 100644
--- a/package.json
+++ b/package.json
@@ -84,6 +84,7 @@
"superjson": "^1.12.2",
"swr": "^2.0.4",
"tippy.js": "^6.3.7",
+ "tiptap-markdown": "^0.7.2",
"usehooks-ts": "^2.9.1",
"zustand": "^4.3.5"
},
diff --git a/pages/[projectID].tsx b/pages/[projectID].tsx
index 9ebf31615..74281a648 100644
--- a/pages/[projectID].tsx
+++ b/pages/[projectID].tsx
@@ -4,7 +4,6 @@ import { useSupabaseClient } from '@supabase/auth-helpers-react'
import type { ParsedUrlQuery } from 'querystring'
import { prisma, projects } from 'db/prisma'
-import Editor from 'components/Editor'
import { StoreProvider } from 'state/StoreProvider'
import { Database } from 'db/supabase'
import { serverCreds } from 'db/credentials'
@@ -88,9 +87,6 @@ function EditorPage({ project }: Props) {
client={client}
project={project}
>
- <Editor
- project={project}
- />
</StoreProvider>
)
}
diff --git a/pages/agent/smol-developer/index.tsx b/pages/agent/smol-developer/index.tsx
index 4f97bb91e..55d23907d 100644
--- a/pages/agent/smol-developer/index.tsx
+++ b/pages/agent/smol-developer/index.tsx
@@ -16,9 +16,9 @@ import { serverCreds } from 'db/credentials'
import SpinnerIcon from 'components/Spinner'
type Repo = {
- name: string;
- stargazers_count: number;
-};
+ name: string
+ stargazers_count: number
+}
export const getServerSideProps: GetServerSideProps<{
repo: Repo
diff --git a/pages/agent/smol-developer/setup.tsx b/pages/agent/smol-developer/setup.tsx
index 459ca328c..6a3e88446 100644
--- a/pages/agent/smol-developer/setup.tsx
+++ b/pages/agent/smol-developer/setup.tsx
@@ -23,9 +23,8 @@ import { TemplateID } from 'state/template'
import { Creds } from 'hooks/useModelProviderArgs'
import { getDefaultModelConfig, getModelArgs, ModelConfig } from 'state/model'
import { GitHubAccount } from 'utils/github'
-import { nanoid } from 'nanoid'
import { RepoSetup } from 'components/SelectRepository/RepoSetup'
-import { html2markdown } from 'editor/schema'
+import { nanoid } from 'nanoid'
export interface PostAgentBody {
// ID of the installation of the GitHub App
@@ -151,9 +150,6 @@ function Setup() {
},
})
- // Transform instruction from prosemirror XML to markdown
- const [mdBody] = html2markdown(instructions)
-
await createAgent({
defaultBranch: selectedRepository.defaultBranch,
installationID: selectedRepository.installationID,
@@ -162,7 +158,7 @@ function Setup() {
repositoryID: selectedRepository.repositoryID,
title: 'Smol PR',
branch: `pr/smol-dev/${nanoid(6).toLowerCase()}`,
- body: mdBody.trim(),
+ body: instructions,
commitMessage: 'Smol dev initial commit',
modelConfig,
})
@@ -184,7 +180,6 @@ function Setup() {
steps[newVal].status = 'current'
return newVal
})
-
}
function handleRepoSelection(repo: any) {