diff --git a/.devcontainer/README.md b/.devcontainer/README.md new file mode 100644 index 00000000..a7e792da --- /dev/null +++ b/.devcontainer/README.md @@ -0,0 +1,93 @@ +# devcontainer + +## example usage + +Below are some example use cases you might want to run from within the +devcontainer (either +[within VSCode locally](https://code.visualstudio.com/docs/devcontainers/create-dev-container#_create-a-devcontainerjson-file) +or in your browser via +[GitHub Codespaces](https://github.com/features/codespaces)). + +### Run pre-commit + +```bash +# run pre-commit +pre-commit run --all-files +``` + +A successfull run should look something like this: + +``` +@andrewm4894 ➜ /workspaces/Open-Assistant (devcontainer-improvements) $ pre-commit run --all-files +[INFO] Initializing environment for https://github.com/pre-commit/pre-commit-hooks. +[INFO] Initializing environment for https://github.com/psf/black. +[INFO] Initializing environment for https://github.com/psf/black:.[jupyter]. +[INFO] Initializing environment for https://github.com/pycqa/flake8. +[INFO] Initializing environment for https://github.com/pycqa/isort. +[INFO] Initializing environment for https://github.com/pre-commit/mirrors-prettier. +[INFO] Initializing environment for https://github.com/pre-commit/mirrors-prettier:prettier@2.7.1. +[INFO] Initializing environment for local. +[INFO] Installing environment for https://github.com/pre-commit/pre-commit-hooks. +[INFO] Once installed this environment will be reused. +[INFO] This may take a few minutes... +[INFO] Installing environment for https://github.com/psf/black. +[INFO] Once installed this environment will be reused. +[INFO] This may take a few minutes... +[INFO] Installing environment for https://github.com/pycqa/flake8. +[INFO] Once installed this environment will be reused. +[INFO] This may take a few minutes... +[INFO] Installing environment for https://github.com/pycqa/isort. +[INFO] Once installed this environment will be reused. +[INFO] This may take a few minutes... +[INFO] Installing environment for https://github.com/pre-commit/mirrors-prettier. +[INFO] Once installed this environment will be reused. +[INFO] This may take a few minutes... +[INFO] Installing environment for local. +[INFO] Once installed this environment will be reused. +[INFO] This may take a few minutes... +trim trailing whitespace.................................................Passed +check python ast.........................................................Passed +check yaml...............................................................Passed +check json...............................................................Passed +check for case conflicts.................................................Passed +detect private key.......................................................Passed +fix python encoding pragma...............................................Passed +forbid submodules....................................(no files to check)Skipped +mixed line ending........................................................Passed +fix requirements.txt.....................................................Passed +check that executables have shebangs.....................................Passed +check that scripts with shebangs are executable..........................Passed +check BOM - deprecated: use fix-byte-order-marker........................Passed +check for broken symlinks............................(no files to check)Skipped +check for merge conflicts................................................Passed +check for added large files..............................................Passed +fix end of files.........................................................Passed +black-jupyter............................................................Passed +flake8...................................................................Passed +isort....................................................................Passed +prettier.................................................................Passed +Lint website.............................................................Passed +``` + +### Docker compose + +```bash +# build the image +docker compose up --build +``` + +You should see some docker containers being pulled and activated. + +Once you see a line like: + +``` +open-assistant-web-1 | Listening on port 3000 url: http://localhost:3000 +``` + +you should be able to access that port like below: + +image + +this port can then be forwarded to a browser tab like below: + +image diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index b737430a..22f43374 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,7 +1,12 @@ { - "service": "frontend-dev", - "dockerComposeFile": "../docker-compose.yaml", - "forwardPorts": [3000], + "name": "Open-Assistant", + "image": "mcr.microsoft.com/vscode/devcontainers/universal", + "features": { + "ghcr.io/devcontainers-contrib/features/pre-commit:2": { + "version": "latest" + } + }, + "postCreateCommand": "bash .devcontainer/post_create_command.sh", "customizations": { "vscode": { "extensions": ["GitHub.copilot"] diff --git a/.devcontainer/post_create_command.sh b/.devcontainer/post_create_command.sh new file mode 100644 index 00000000..983576b9 --- /dev/null +++ b/.devcontainer/post_create_command.sh @@ -0,0 +1,2 @@ +# ensure pre-commit is installed +pre-commit install diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7e7a3023..27a6511d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -26,10 +26,7 @@ # # /WARNING! -exclude: "build|stubs|^bot/templates/|^notebooks/.*\\.ipynb$" - -default_language_version: - python: python3 +exclude: build|stubs|^bot/templates/$ repos: - repo: https://github.com/pre-commit/pre-commit-hooks @@ -42,12 +39,12 @@ repos: # and which break the standard YAML check. The alternative would be to # skip any unsafe errors (and thus break YAML compatibility) or use # some other checker that may not work in general. - exclude: "^copilot/.*/addons/.*$" + exclude: ^copilot/.*/addons/.*$ - id: check-json - id: check-case-conflict - id: detect-private-key - id: fix-encoding-pragma - args: ["--remove"] + args: [--remove] - id: forbid-submodules - id: mixed-line-ending - id: requirements-txt-fixer @@ -57,13 +54,13 @@ repos: - id: check-symlinks - id: check-merge-conflict - id: check-added-large-files - args: ["--maxkb=1024"] + args: [--maxkb=1024] - id: end-of-file-fixer - repo: https://github.com/psf/black rev: 22.12.0 hooks: - - id: black + - id: black-jupyter - repo: https://github.com/pycqa/flake8 rev: 6.0.0 @@ -79,7 +76,7 @@ repos: rev: v2.7.1 hooks: - id: prettier - args: ["--prose-wrap=always", "--write"] + args: [--prose-wrap=always, --write] - repo: local hooks: diff --git a/README.md b/README.md index 103dc010..b619c931 100644 --- a/README.md +++ b/README.md @@ -26,6 +26,15 @@ interact with the website. **Note:** When logging in via email, navigate to `http://localhost:1080` to get the magic email login link. +**Note:** If you would like to run this in a standardized development +environment (a +["devcontainer"](https://code.visualstudio.com/docs/devcontainers/containers)) +using +[vscode locally](https://code.visualstudio.com/docs/devcontainers/create-dev-container#_create-a-devcontainerjson-file) +or in a web browser using +[GitHub Codespaces](https://github.com/features/codespaces), you can use the +provided [`.devcontainer`](.devcontainer/) folder. + ## The Plan We want to get to an initial MVP as fast as possible, by following the 3-steps diff --git a/discord-bot/.env.example b/discord-bot/.env.example index ec114c8f..8474ee90 100644 --- a/discord-bot/.env.example +++ b/discord-bot/.env.example @@ -1,7 +1,7 @@ BOT_TOKEN= DECLARE_GLOBAL_COMMANDS= OWNER_IDS=[, ] -PREFIX="/" # Don't change, this allows for slash commands in DMs +PREFIX="/" # DO NOT LEAVE EMPTY, slash command prefix in DMs OASST_API_URL="http://localhost:8080" # No trailing '/' OASST_API_KEY="" diff --git a/discord-bot/bot/bot.py b/discord-bot/bot/bot.py index df3c5f2f..8c604e1a 100644 --- a/discord-bot/bot/bot.py +++ b/discord-bot/bot/bot.py @@ -6,7 +6,7 @@ import hikari import lightbulb import miru from bot.settings import Settings -from bot.utils import EMPTY, mention +from bot.utils import mention from oasst_shared.api_client import OasstApiClient settings = Settings() @@ -34,8 +34,11 @@ async def on_starting(event: hikari.StartingEvent): bot.d.oasst_api = OasstApiClient(settings.oasst_api_url, settings.oasst_api_key) - # A set of user id's that are currently doing work. - bot.d.currently_working = set() + # A `dict[hikari.Message | None, UUID | None]]` that maps user IDs to (task msg ID, task UUIDs). + # Either both are `None` or both are not `None`. + # If both are `None`, the user is not currently selecting a task. + # TODO: Grow this on startup so we don't have to re-allocate memory every time it needs to grow + bot.d.currently_working = {} @bot.listen() @@ -50,13 +53,13 @@ async def _send_error_embed( ) -> None: ctx.command embed = hikari.Embed( - title=f"`{exception.__class__.__name__}` Error{f' in `{ctx.command.name}`' if ctx.command else '' }", + title=f"`{exception.__class__.__name__}` Error{f' in `/{ctx.command.name}`' if ctx.command else '' }", description=content, color=0xFF0000, timestamp=datetime.now().astimezone(), ).set_author(name=ctx.author.username, url=str(ctx.author.avatar_url)) - await ctx.respond(EMPTY, embed=embed) + await ctx.respond(embed=embed) @bot.listen(lightbulb.CommandErrorEvent) @@ -65,6 +68,8 @@ async def on_error(event: lightbulb.CommandErrorEvent) -> None: # Unwrap the exception to get the original cause exc = event.exception.__cause__ or event.exception ctx = event.context + if not ctx.bot.rest.is_alive: + return if isinstance(event.exception, lightbulb.CommandInvocationError): if not event.context.command: @@ -114,6 +119,8 @@ async def on_error(event: lightbulb.CommandErrorEvent) -> None: ctx, ) elif isinstance(exc, lightbulb.errors.MissingRequiredAttachment): - await _send_error_embed("Not enough attachemnts were supplied to this command.", exc, ctx) + await _send_error_embed("Not enough attachments were supplied to this command.", exc, ctx) + elif isinstance(exc, lightbulb.errors.CommandNotFound): + await ctx.respond(f"`/{exc.invoked_with}` is not a valid command. Use `/help` to see a list of commands.") else: raise exc diff --git a/discord-bot/bot/extensions/guild_settings.py b/discord-bot/bot/extensions/guild_settings.py index 62f21305..5940f33a 100644 --- a/discord-bot/bot/extensions/guild_settings.py +++ b/discord-bot/bot/extensions/guild_settings.py @@ -78,7 +78,6 @@ async def log_channel(ctx: lightbulb.SlashContext) -> None: # if the bot's permissions for this channel don't contain SEND_MESSAGE # This will also filter out categories and voice channels - print(permissions_in(ch, own_member) & hikari.Permissions.SEND_MESSAGES) if not permissions_in(ch, own_member) & hikari.Permissions.SEND_MESSAGES: await ctx.respond(f"I don't have permission to send messages in {ch.mention}.") return diff --git a/discord-bot/bot/extensions/text_labels.py b/discord-bot/bot/extensions/text_labels.py index 388a93f0..a2607aec 100644 --- a/discord-bot/bot/extensions/text_labels.py +++ b/discord-bot/bot/extensions/text_labels.py @@ -7,7 +7,6 @@ import lightbulb import miru from aiosqlite import Connection from bot.db.schemas import GuildSettings -from bot.utils import EMPTY from loguru import logger plugin = lightbulb.Plugin( @@ -74,7 +73,7 @@ class LabelModal(miru.Modal): ) channel = await context.bot.rest.fetch_channel(guild_settings.log_channel_id) assert isinstance(channel, hikari.TextableChannel) - await channel.send(EMPTY, embed=embed) + await channel.send(embed=embed) class LabelSelect(miru.View): @@ -164,7 +163,7 @@ async def label_message_text(ctx: lightbulb.MessageContext): msg.content, timeout=60, ) - resp = await ctx.respond(EMPTY, embed=embed, components=label_select_view, flags=hikari.MessageFlag.EPHEMERAL) + resp = await ctx.respond(embed=embed, components=label_select_view, flags=hikari.MessageFlag.EPHEMERAL) await label_select_view.start(await resp.message()) await label_select_view.wait() diff --git a/discord-bot/bot/extensions/work.py b/discord-bot/bot/extensions/work.py index c905e7a0..0561039d 100644 --- a/discord-bot/bot/extensions/work.py +++ b/discord-bot/bot/extensions/work.py @@ -1,14 +1,27 @@ """Work plugin for collecting user data.""" import asyncio import typing as t -from datetime import datetime +from uuid import UUID import hikari import lightbulb import lightbulb.decorators import miru from aiosqlite import Connection -from bot.utils import EMPTY +from bot.messages import ( + assistant_reply_message, + confirm_ranking_response_message, + confirm_text_response_message, + initial_prompt_message, + invalid_user_input_embed, + plain_embed, + prompter_reply_message, + rank_assistant_reply_message, + rank_initial_prompts_message, + rank_prompter_reply_message, + task_complete_embed, +) +from bot.settings import Settings from loguru import logger from oasst_shared.api_client import OasstApiClient, TaskType from oasst_shared.schemas import protocol as protocol_schema @@ -16,8 +29,10 @@ from oasst_shared.schemas.protocol import TaskRequestType plugin = lightbulb.Plugin("WorkPlugin") -MAX_TASK_TIME = 60 * 60 # 1 hour -MAX_TASK_ACCEPT_TIME = 60 # 1 minute +MAX_TASK_TIME = 60 * 60 # seconds +MAX_TASK_ACCEPT_TIME = 60 * 10 # seconds + +settings = Settings() @plugin.command @@ -33,25 +48,50 @@ MAX_TASK_ACCEPT_TIME = 60 # 1 minute @lightbulb.implements(lightbulb.SlashCommand, lightbulb.PrefixCommand) async def work(ctx: lightbulb.Context): """Create and handle a task.""" - # make sure the user isn't currently doing a task - currently_working: set[hikari.Snowflakeish] = ctx.bot.d.currently_working + # Only send this message if started from a server + if ctx.guild_id is not None: + await ctx.respond(embed=plain_embed("Sending you a task, check your DMs"), flags=hikari.MessageFlag.EPHEMERAL) + + # make sure the user isn't currently doing a task, and if they are, ask if they want to cancel it + currently_working: dict[ + hikari.Snowflakeish, tuple[hikari.Message | None, UUID | None] + ] = ctx.bot.d.currently_working + + oasst_api: OasstApiClient = ctx.bot.d.oasst_api if ctx.author.id in currently_working: - await ctx.respond( - "You are already performing a task. Please complete that one first.", flags=hikari.MessageFlag.EPHEMERAL + yn_view = YesNoView(timeout=MAX_TASK_ACCEPT_TIME) + msg = await ctx.author.send( + embed=plain_embed("You are already working. Would you like to cancel your old task start a new one?"), + flags=hikari.MessageFlag.EPHEMERAL, + components=yn_view, ) - return + await yn_view.start(msg) + await yn_view.wait() - currently_working.add(ctx.author.id) + match yn_view.choice: + case False | None: + return + case True: + old_msg, task_id = currently_working[ctx.author.id] + if old_msg is not None: + logger.info(f"User {ctx.author.id} cancelled task {task_id}, deleting message {old_msg.id}") + map(lambda c: c, old_msg.components) + await old_msg.delete() + if task_id is not None: + await oasst_api.nack_task(task_id, reason="user cancelled") + await msg.delete() + + currently_working[ctx.author.id] = (None, None) + + # Create a TaskRequestType from the stringified enum value task_type: TaskRequestType = TaskRequestType(ctx.options.type.split(".")[-1]) - await ctx.respond("Sending you a task, check your DMs", flags=hikari.MessageFlag.EPHEMERAL) logger.debug(f"Starting task_type: {task_type!r}") - try: await _handle_task(ctx, task_type) finally: - currently_working.remove(ctx.author.id) + del currently_working[ctx.author.id] async def _handle_task(ctx: lightbulb.Context, task_type: TaskRequestType) -> None: @@ -71,38 +111,79 @@ async def _handle_task(ctx: lightbulb.Context, task_type: TaskRequestType) -> No task, msg_id = await _select_task(ctx, task_type) if task is None: + # User cancelled return # Task action loop completed = False while not completed: - await ctx.author.send("Please type your response here:") + await ctx.author.send(embed=plain_embed("Please type your response below:")) try: event = await ctx.bot.wait_for( - hikari.DMMessageCreateEvent, timeout=MAX_TASK_TIME, predicate=lambda e: e.author.id == ctx.author.id + hikari.DMMessageCreateEvent, + timeout=MAX_TASK_TIME, + predicate=lambda e: e.author.id == ctx.author.id + and not (e.message.content or "").startswith(settings.prefix), ) except asyncio.TimeoutError: - await ctx.author.send("Task timed out. Exiting") + await ctx.author.send(embed=plain_embed("Task timed out. Exiting")) await oasst_api.nack_task(task.id, reason="timed out") logger.info(f"Task {task.id} timed out") return # Invalid response - if event.content is None or not _validate_user_input(event.content, task): - await ctx.author.send("Invalid response") + valid, err_msg = _validate_user_input(event.content, task) + if not valid or event.content is None: + + await ctx.author.send(embed=invalid_user_input_embed(err_msg)) continue logger.debug(f"Successful user input received: {event.content}") + # Confirm user input + if isinstance(task, protocol_schema.RankConversationRepliesTask): + content = confirm_ranking_response_message(event.content, task.replies) + elif isinstance(task, protocol_schema.RankInitialPromptsTask): + content = confirm_ranking_response_message(event.content, task.prompts) + elif isinstance(task, protocol_schema.ReplyToConversationTask | protocol_schema.InitialPromptTask): + content = confirm_text_response_message(event.content) + else: + logger.critical(f"Unknown task type: {task.type}") + raise ValueError(f"Unknown task type: {task.type}") + + confirm_resp_view = YesNoView(timeout=MAX_TASK_TIME) + msg = await ctx.author.send(content, components=confirm_resp_view) + await confirm_resp_view.start(msg) + await confirm_resp_view.wait() + + match confirm_resp_view.choice: + case False | None: + continue + case True: + await msg.delete() # buttons are already gone + # Send the response to the backend - reply = protocol_schema.TextReplyToMessage( - message_id=str(msg_id), - user_message_id=str(event.message_id), - user=protocol_schema.User( - auth_method="discord", id=str(ctx.author.id), display_name=ctx.author.username - ), - text=event.content, - ) + if isinstance(task, protocol_schema.RankConversationRepliesTask | protocol_schema.RankInitialPromptsTask): + reply = protocol_schema.MessageRanking( + message_id=str(msg_id), + ranking=[int(r) - 1 for r in event.content.replace(" ", "").split(",")], + user=protocol_schema.User( + auth_method="discord", id=str(ctx.author.id), display_name=ctx.author.username + ), + ) + elif isinstance(task, protocol_schema.ReplyToConversationTask | protocol_schema.InitialPromptTask): + reply = protocol_schema.TextReplyToMessage( + message_id=str(msg_id), + user_message_id=str(event.message_id), + user=protocol_schema.User( + auth_method="discord", id=str(ctx.author.id), display_name=ctx.author.username + ), + text=event.content, + ) + else: + logger.critical(f"Unexpected task type received: {task.type}") + raise ValueError(f"Unexpected task type received: {task.type}") + logger.debug(f"Sending reply to backend: {reply!r}") # Get next task @@ -110,7 +191,7 @@ async def _handle_task(ctx: lightbulb.Context, task_type: TaskRequestType) -> No logger.info(f"New task {new_task}") if new_task.type == TaskType.done: - await ctx.author.send("Task completed") + await ctx.author.send(embed=plain_embed("Task completed")) completed = True continue else: @@ -127,33 +208,20 @@ async def _handle_task(ctx: lightbulb.Context, task_type: TaskRequestType) -> No for id in log_channel_ids ] - done_embed = ( - hikari.Embed( - title="Task Completion", - description=f"`{task.type}` completed by {ctx.author.mention}", - color=hikari.Color(0x00FF00), - timestamp=datetime.now().astimezone(), - ) - .add_field("Total Tasks", "0", inline=True) - .add_field("Server Ranking", "0/0", inline=True) - .add_field("Global Ranking", "0/0", inline=True) - .set_footer(f"Task ID: {task.id}") - ) + done_embed = task_complete_embed(task, ctx.author.mention) # This will definitely get the bot rate limited, but that's a future problem - asyncio.gather( - *(ch.send(EMPTY, embed=done_embed) for ch in channels if isinstance(ch, hikari.TextableChannel)) - ) + asyncio.gather(*(ch.send(embed=done_embed) for ch in channels if isinstance(ch, hikari.TextableChannel))) # ask the user if they want to do another task - choice_view = ChoiceView(timeout=MAX_TASK_ACCEPT_TIME) - msg = await ctx.author.send("Would you like another task?", components=choice_view) - await choice_view.start(msg) - await choice_view.wait() + another_task_view = YesNoView(timeout=MAX_TASK_ACCEPT_TIME) + msg = await ctx.author.send(embed=plain_embed("Would you like another task?"), components=another_task_view) + await another_task_view.start(msg) + await another_task_view.wait() - match choice_view.choice: + match another_task_view.choice: case False | None: done = True - await ctx.author.send("Exiting, goodbye!") + await msg.edit(embed=plain_embed("Exiting, goodbye!")) case True: pass @@ -166,10 +234,12 @@ async def _select_task( logger.debug(f"Starting task selection for {task_type}") # Loop until the user accepts a task, cancels, or times out + msg: hikari.UndefinedOr[hikari.Message] = hikari.UNDEFINED while True: logger.debug(f"Requesting task of type {task_type}") task = await oasst_api.fetch_task(task_type, user) - resp, msg_id = await _send_task(ctx, task) + resp, msg = await _send_task(ctx, task, msg) + msg_id = str(msg.id) logger.debug(f"User choice: {resp}") match resp: @@ -181,25 +251,24 @@ async def _select_task( case "next": logger.info(f"Task {task.id} rejected, sending NACK") await oasst_api.nack_task(task.id, "rejected") - await ctx.author.send("Sending next task...") continue case "cancel": logger.info(f"Task {task.id} canceled, sending NACK") await oasst_api.nack_task(task.id, "canceled") - await ctx.author.send("Task canceled. Exiting") + await ctx.author.send(embed=plain_embed("Task canceled. Exiting")) return None, msg_id case None: logger.info(f"Task {task.id} timed out, sending NACK") await oasst_api.nack_task(task.id, "timed out") - await ctx.author.send("Task timed out. Exiting") + await ctx.author.send(embed=plain_embed("Task timed out. Exiting")) return None, msg_id async def _send_task( - ctx: lightbulb.Context, task: protocol_schema.Task -) -> tuple[t.Literal["accept", "next", "cancel"] | None, str]: + ctx: lightbulb.Context, task: protocol_schema.Task, msg: hikari.UndefinedOr[hikari.Message] +) -> tuple[t.Literal["accept", "next", "cancel"] | None, hikari.Message]: """Send a task to the user. Returns the user's choice and the message ID of the task message. @@ -208,37 +277,38 @@ async def _send_task( # but the tasks aren't discord specific so that doesn't really make sense. embed: hikari.UndefinedOr[hikari.Embed] = hikari.UNDEFINED + content: hikari.UndefinedOr[str] = hikari.UNDEFINED # Create an embed based on the task's type if task.type == TaskRequestType.initial_prompt: assert isinstance(task, protocol_schema.InitialPromptTask) logger.debug("sending initial prompt task") - embed = _initial_prompt_embed(task) + content = initial_prompt_message(task) elif task.type == TaskRequestType.rank_initial_prompts: assert isinstance(task, protocol_schema.RankInitialPromptsTask) logger.debug("sending rank initial prompt task") - embed = _rank_initial_prompt_embed(task) + content = rank_initial_prompts_message(task) elif task.type == TaskRequestType.rank_prompter_replies: assert isinstance(task, protocol_schema.RankPrompterRepliesTask) logger.debug("sending rank user reply task") - embed = _rank_prompter_reply_embed(task) + content = rank_prompter_reply_message(task) elif task.type == TaskRequestType.rank_assistant_replies: assert isinstance(task, protocol_schema.RankAssistantRepliesTask) logger.debug("sending rank assistant reply task") - embed = _rank_assistant_reply_embed(task) + content = rank_assistant_reply_message(task) elif task.type == TaskRequestType.prompter_reply: assert isinstance(task, protocol_schema.PrompterReplyTask) logger.debug("sending user reply task") - embed = _prompter_reply_embed(task) + content = prompter_reply_message(task) elif task.type == TaskRequestType.assistant_reply: assert isinstance(task, protocol_schema.AssistantReplyTask) logger.debug("sending assistant reply task") - embed = _assistant_reply_embed(task) + content = assistant_reply_message(task) elif task.type == TaskRequestType.summarize_story: raise NotImplementedError @@ -250,24 +320,34 @@ async def _send_task( raise ValueError(f"unknown task type {task.type}") view = TaskAcceptView(timeout=MAX_TASK_ACCEPT_TIME) - msg = await ctx.author.send( - EMPTY, - embed=embed, - components=view, - ) + if not msg: + msg = await ctx.author.send( + content, + embed=embed, + components=view, + ) + else: + await msg.edit( + content, + embed=embed, + components=view, + ) assert msg is not None + # Set the choice id as the current msg id + ctx.bot.d.currently_working[ctx.author.id] = (msg, task.id) + await view.start(msg) await view.wait() - return view.choice, str(msg.id) + return view.choice, msg -def _validate_user_input(content: str | None, task: protocol_schema.Task) -> bool: - """Returns whether the user's input is valid for the task type.""" +def _validate_user_input(content: str | None, task: protocol_schema.Task) -> tuple[bool, str]: + """Returns whether the user's input is valid for the task type and an error message.""" if content is None: - return False + return False, "No input provided" # User message input if ( @@ -279,22 +359,28 @@ def _validate_user_input(content: str | None, task: protocol_schema.Task) -> boo task, protocol_schema.InitialPromptTask | protocol_schema.PrompterReplyTask | protocol_schema.AssistantReplyTask, ) - return len(content) > 0 + return len(content) > 0, "Message must be at least one character long." # Ranking tasks elif task.type == TaskRequestType.rank_prompter_replies or task.type == TaskRequestType.rank_assistant_replies: assert isinstance(task, protocol_schema.RankPrompterRepliesTask | protocol_schema.RankAssistantRepliesTask) num_replies = len(task.replies) - rankings = content.split(",") - return set(rankings) == {str(i) for i in range(1, num_replies + 1)} and len(rankings) == num_replies + rankings = content.replace(" ", "").split(",") + return ( + set(rankings) == {str(i) for i in range(1, num_replies + 1)} and len(rankings) == num_replies, + "Message must contain numbers for all replies.", + ) elif task.type == TaskRequestType.rank_initial_prompts: assert isinstance(task, protocol_schema.RankInitialPromptsTask) num_prompts = len(task.prompts) - rankings = content.split(",") - return set(rankings) == {str(i) for i in range(1, num_prompts + 1)} and len(rankings) == num_prompts + rankings = content.replace(" ", "").split(",") + return ( + set(rankings) == {str(i) for i in range(1, num_prompts + 1)} and len(rankings) == num_prompts, + "Message must contain numbers for all prompts.", + ) elif task.type == TaskRequestType.summarize_story: raise NotImplementedError @@ -318,22 +404,29 @@ class TaskAcceptView(miru.View): async def accept_button(self, button: miru.Button, ctx: miru.ViewContext) -> None: logger.info("Accept button pressed") self.choice = "accept" + await ctx.message.edit(component=None) self.stop() @miru.button(label="Next Task", custom_id="next_task", row=0, style=hikari.ButtonStyle.SECONDARY) async def next_button(self, button: miru.Button, ctx: miru.ViewContext) -> None: logger.info("Next button pressed") self.choice = "next" + await ctx.message.edit(component=None) self.stop() @miru.button(label="Cancel", custom_id="cancel", row=0, style=hikari.ButtonStyle.DANGER) async def cancel_button(self, button: miru.Button, ctx: miru.ViewContext) -> None: logger.info("Cancel button pressed") self.choice = "cancel" + await ctx.message.edit(component=None) self.stop() + async def on_timeout(self) -> None: + if self.message is not None: + await self.message.edit(component=None) -class ChoiceView(miru.View): + +class YesNoView(miru.View): """View with two buttons: yes and no. The view stops once one of the buttons is pressed and the choice is stored in the `choice` attribute. @@ -344,115 +437,18 @@ class ChoiceView(miru.View): @miru.button(label="Yes", custom_id="yes", style=hikari.ButtonStyle.SUCCESS) async def yes_button(self, button: miru.Button, ctx: miru.ViewContext) -> None: self.choice = True + await ctx.message.edit(component=None) self.stop() @miru.button(label="No", custom_id="no", style=hikari.ButtonStyle.DANGER) async def no_button(self, button: miru.Button, ctx: miru.ViewContext) -> None: self.choice = False + await ctx.message.edit(component=None) self.stop() - -################################################################ -# Template Embeds # -################################################################ - -# TODO: Maybe implement a better way of creating embeds, like `from_json` or something - - -def _initial_prompt_embed(task: protocol_schema.InitialPromptTask) -> hikari.Embed: - return ( - hikari.Embed(title="Initial Prompt", description=f"Hint: {task.hint}", timestamp=datetime.now().astimezone()) - .set_image("https://images.unsplash.com/photo-1455390582262-044cdead277a?w=512") - .set_footer(text=f"OASST Assistant | {task.id}") - ) - - -def _rank_initial_prompt_embed(task: protocol_schema.RankInitialPromptsTask) -> hikari.Embed: - embed = ( - hikari.Embed( - title="Rank Initial Prompt", - description="Rank the following tasks from best to worst (1,2,3,4,5)", - timestamp=datetime.now().astimezone(), - ) - .set_image("https://images.unsplash.com/photo-1455390582262-044cdead277a?w=512") - .set_footer(text=f"OASST Assistant | {task.id}") - ) - - for i, prompt in enumerate(task.prompts): - embed.add_field(name=f"Prompt {i + 1}", value=prompt, inline=False) - - return embed - - -def _rank_prompter_reply_embed(task: protocol_schema.RankPrompterRepliesTask) -> hikari.Embed: - embed = ( - hikari.Embed( - title="Rank User Reply", - description="Rank the following user replies from best to worst. e.g. 1,2,5,3,4", - timestamp=datetime.now().astimezone(), - ) - .set_image("https://images.unsplash.com/photo-1455390582262-044cdead277a?w=512") # TODO: update image - .set_footer(text=f"OASST Assistant | {task.id}") - ) - - for i, reply in enumerate(task.replies): - embed.add_field(name=f"Reply {i + 1}", value=reply, inline=False) - - return embed - - -def _rank_assistant_reply_embed(task: protocol_schema.RankAssistantRepliesTask) -> hikari.Embed: - embed = ( - hikari.Embed( - title="Rank Assistant Reply", - description="Rank the following assistant replies from best to worst. e.g. 1,2,5,3,4", - timestamp=datetime.now().astimezone(), - ) - .set_image("https://images.unsplash.com/photo-1455390582262-044cdead277a?w=512") # TODO: update image - .set_footer(text=f"OASST Assistant | {task.id}") - ) - - for i, reply in enumerate(task.replies): - embed.add_field(name=f"Reply {i + 1}", value=reply, inline=False) - - return embed - - -def _prompter_reply_embed(task: protocol_schema.PrompterReplyTask) -> hikari.Embed: - embed = ( - hikari.Embed( - title="User Reply", - description=f"""\ - Send the next message in the conversation as if you were the user. - {'Hint: ' if task.hint else ''} - """, - timestamp=datetime.now().astimezone(), - ) - # .set_image("https://images.unsplash.com/photo-1455390582262-044cdead277a?w=512") # TODO: change image - .set_footer(text=f"OASST Assistant | {task.id}") - ) - - for message in task.conversation.messages: - embed.add_field(name="Assistant" if message.is_assistant else "User", value=message.text, inline=False) - - return embed - - -def _assistant_reply_embed(task: protocol_schema.AssistantReplyTask) -> hikari.Embed: - embed = ( - hikari.Embed( - title="User Reply", - description="Send the next message in the conversation as if you were the user.", - timestamp=datetime.now().astimezone(), - ) - # .set_image("https://images.unsplash.com/photo-1455390582262-044cdead277a?w=512") # TODO: change image - .set_footer(text=f"OASST Assistant | {task.id}") - ) - - for message in task.conversation.messages: - embed.add_field(name="Assistant" if message.is_assistant else "User", value=message.text, inline=False) - - return embed + async def on_timeout(self) -> None: + if self.message is not None: + await self.message.edit(component=None) def load(bot: lightbulb.BotApp): diff --git a/discord-bot/bot/messages.py b/discord-bot/bot/messages.py new file mode 100644 index 00000000..f74f8720 --- /dev/null +++ b/discord-bot/bot/messages.py @@ -0,0 +1,208 @@ +"""All user-facing messages and embeds.""" + +from datetime import datetime + +import hikari +from oasst_shared.schemas import protocol as protocol_schema + +NUMBER_EMOJIS = [":one:", ":two:", ":three:", ":four:", ":five:", ":six:", ":seven:", ":eight:", ":nine:", ":ten:"] +NL = "\n" + +### +# Reusable 'components' +### + + +def _h1(text: str) -> str: + return f"\n:small_blue_diamond: __**{text}**__ :small_blue_diamond:" + + +def _h2(text: str) -> str: + return f"__**{text}**__" + + +def _h3(text: str) -> str: + return f"__{text}__" + + +def _writing_prompt(text: str) -> str: + return f":pencil: _{text}_" + + +def _ranking_prompt(text: str) -> str: + return f":trophy: _{text}_" + + +def _response_prompt(text: str) -> str: + return f":speech_balloon: _{text}_" + + +def _summarize_prompt(text: str) -> str: + return f":notepad_spiral: _{text}_" + + +def _user(text: str | None) -> str: + return f"""\ +:person_red_hair: {_h3("User")}:{f"{NL}> **{text}**" if text is not None else ""} +""" + + +def _assistant(text: str | None) -> str: + return f"""\ +:robot: {_h3("Assistant")}:{f"{NL}> {text}" if text is not None else ""} +""" + + +def _make_ordered_list(items: list[str]) -> list[str]: + return [f"{num} {item}" for num, item in zip(NUMBER_EMOJIS, items)] + + +def _ordered_list(items: list[str]) -> str: + return "\n\n".join(_make_ordered_list(items)) + + +def _conversation(conv: protocol_schema.Conversation) -> str: + return "\n".join([_assistant(msg.text) if msg.is_assistant else _user(msg.text) for msg in conv.messages]) + + +def _hint(hint: str | None) -> str: + return f"{NL}Hint: {hint}" if hint else "" + + +### +# Messages +### + + +def initial_prompt_message(task: protocol_schema.InitialPromptTask) -> str: + """Creates the message that gets sent to users when they request an `initial_prompt` task.""" + return f"""\ + +{_h1("INITIAL PROMPT")} + + +{_writing_prompt("Please provide an initial prompt to the assistant.")} +{_hint(task.hint)} +""" + + +def rank_initial_prompts_message(task: protocol_schema.RankInitialPromptsTask) -> str: + """Creates the message that gets sent to users when they request a `rank_initial_prompts` task.""" + return f"""\ + +{_h1("RANK INITIAL PROMPTS")} + + +{_ordered_list(task.prompts)} + +{_ranking_prompt("Reply with the numbers of best to worst prompts separated by commas (example: '4,1,3,2')")} +""" + + +def rank_prompter_reply_message(task: protocol_schema.RankPrompterRepliesTask) -> str: + """Creates the message that gets sent to users when they request a `rank_prompter_replies` task.""" + return f"""\ + +{_h1("RANK PROMPTER REPLIES")} + + +{_conversation(task.conversation)} +{_user(None)} +{_ordered_list(task.replies)} + +{_ranking_prompt("Reply with the numbers of best to worst replies separated by commas (example: '4,1,3,2')")} +""" + + +def rank_assistant_reply_message(task: protocol_schema.RankAssistantRepliesTask) -> str: + """Creates the message that gets sent to users when they request a `rank_assistant_replies` task.""" + return f"""\ + +{_h1("RANK ASSISTANT REPLIES")} + + +{_conversation(task.conversation)} +{_assistant(None)} +{_ordered_list(task.replies)} + +{_ranking_prompt("Reply with the numbers of best to worst replies separated by commas (example: '4,1,3,2')")} +""" + + +def prompter_reply_message(task: protocol_schema.PrompterReplyTask) -> str: + """Creates the message that gets sent to users when they request a `prompter_reply` task.""" + return f"""\ + +{_h1("PROMPTER REPLY")} + + +{_conversation(task.conversation)} +{_hint(task.hint)} + +{_response_prompt("Please provide a reply to the assistant.")} +""" + + +def assistant_reply_message(task: protocol_schema.AssistantReplyTask) -> str: + """Creates the message that gets sent to users when they request a `assistant_reply` task.""" + return f"""\ +{_h1("ASSISTANT REPLY")} + + +{_conversation(task.conversation)} + +{_response_prompt("Please provide a reply to the assistant.")} +""" + + +def confirm_text_response_message(content: str) -> str: + return f"""\ +{_h2("CONFIRM RESPONSE")} + +> {content} +""" + + +def confirm_ranking_response_message(content: str, items: list[str]) -> str: + user_rankings = [int(r) for r in content.replace(" ", "").split(",")] + original_list = _make_ordered_list(items) + user_ranked_list = "\n\n".join([original_list[r - 1] for r in user_rankings]) + + return f"""\ +{_h2("CONFIRM RESPONSE")} + +{user_ranked_list} +""" + + +### +# Embeds +### + + +def task_complete_embed(task: protocol_schema.Task, mention: str) -> hikari.Embed: + return ( + hikari.Embed( + title="Task Completion", + description=f"`{task.type}` completed by {mention}", + color=hikari.Color(0x00FF00), + timestamp=datetime.now().astimezone(), + ) + .add_field("Total Tasks", "0", inline=True) + .add_field("Server Ranking", "0/0", inline=True) + .add_field("Global Ranking", "0/0", inline=True) + .set_footer(f"Task ID: {task.id}") + ) + + +def invalid_user_input_embed(error_message: str) -> hikari.Embed: + return hikari.Embed( + title="Invalid User Input", + description=error_message, + color=hikari.Color(0xFF0000), + timestamp=datetime.now().astimezone(), + ) + + +def plain_embed(text: str) -> hikari.Embed: + return hikari.Embed(color=0x36393F, description=text) diff --git a/discord-bot/bot/utils.py b/discord-bot/bot/utils.py index 2d968c93..530f402a 100644 --- a/discord-bot/bot/utils.py +++ b/discord-bot/bot/utils.py @@ -24,13 +24,6 @@ def format_time(dt: datetime, fmt: t.Literal["t", "T", "D", "f", "F", "R"]) -> s raise ValueError(f"`fmt` must be 't', 'T', 'D', 'f', 'F' or 'R', not {fmt}") -EMPTY = "\u200d" -"""Zero-width joiner. - -This appears as an empty message in Discord. -""" - - def mention( id: hikari.Snowflakeish, type: t.Literal["channel", "role", "user"], diff --git a/docs/data_schemas.md b/docs/data_schemas.md index 351e6bd4..f12eda84 100644 --- a/docs/data_schemas.md +++ b/docs/data_schemas.md @@ -10,6 +10,9 @@ Also, the schemas are leaning heavily on the [OpenAssistant Data Structures](https://docs.google.com/presentation/d/1iaX_nxasVWlvPiSNs0cllR9L_1neZq0RJxd6MFEalUY/edit?usp=sharing) presentation. +_Note on conformity: be pragmatic and decide what makes sense 🙂 , it's more +important that we move forward than cramming everything into a uniform thing._ + ## Data Schemas ### Main structure: conversation trees diff --git a/docs/supervised_datasets.md b/docs/supervised_datasets.md new file mode 100644 index 00000000..0f8c986d --- /dev/null +++ b/docs/supervised_datasets.md @@ -0,0 +1,79 @@ +# Supervised datasets + +For discussion about usage of supervised data see issue +. + +## Motivation + +An important part of making the assistant useful is to teach it to understand +and follow instructions, and to perform large set of tasks well. + +While RLHF seems like the main ingredient, using existing supervised data might +help. + +There are two large-scale projects in the area of instruction-following / +multitask learning: Promptsource and Natural Instructions - these projects +crowdsourced templates and turned existing NLP datasets into +instruction-following seq2seq form in natural langauge. They include both +long-output training examples like generating a sentence that is a likely +consequence of sentence in the prompt, and short-output, like rating prediction +from review. (Pre-)training on such datasets should help model understand and +follow instructions and teach it many abilities neccessary to perform a large +set of tasks correctly. However, these data are not dialog-like - they do not +look like a normal conversation. + +There are also supervised dialog datasets such as Blended Skill Talk or SODA. In +constrast to instruction-following datasets, dialog data is not as focused on +"academic tasks" or correctness, but encourage the model to respond naturally +like a person would. + +### Promptsource + +- GitHub: +- paper: + [Multitask Prompted Training Enables Zero-Shot Task Generalization](https://arxiv.org/abs/2110.08207) +- project for preparing templates and working with them +- they generated a dataset using the templates: + - + - (with multilingual data but + English prompt) + - (with multilingual data + and machine-translated prompt) +- they trained zero-shot models (= models for following instructions in the + input) + - based on T5 architecture (encoder-decoder) called T0 family (and MT0 for + multilingual) + - and based on GPT architecture (decoder-only) called BloomZ family + - Huggingface demo: [T0](https://huggingface.co/bigscience/T0pp), + [MT0](https://huggingface.co/bigscience/mt0-large), + [BloomZ](https://huggingface.co/bigscience/bloomz), + - GitHub repo for T0: + - GitHub repo for BloomZ and MT0: + + +### Natural instructions + +- GitHub: +- paper: + [Super-NaturalInstructions: Generalization via Declarative Instructions on 1600+ NLP Tasks](https://arxiv.org/abs/2204.07705) +- they crowdsource directly the data prepared for instruction following (and + learning from a few examples) +- the GitHub repo = the dataset. It contains jsons +- they trained zero-shot and in-context few-shot models (in multiple sizes): + - mT5 architecture (encoder-decoder, multilingual pretraining) + - Huggingface demo few-shot: + + - Huggingface demo zero-shot: + + +### Blended Skill Talk + +- used by Facebook in Blenderbot project +- HuggingFace dataset: +- example model trained on it: + + +### SODA + +- GitHub: +- paper: diff --git a/notebooks/data-argumentation/EssayInstructions.ipynb b/notebooks/data-argumentation/EssayInstructions.ipynb index b81a8b09..c4179382 100644 --- a/notebooks/data-argumentation/EssayInstructions.ipynb +++ b/notebooks/data-argumentation/EssayInstructions.ipynb @@ -1,226 +1,229 @@ { - "cells": [ - { - "cell_type": "code", - "execution_count": null, - "metadata": { - "id": "8zsmJ96eaL2w" - }, - "outputs": [], - "source": [ - "!pip install transformers" - ] - }, - { - "cell_type": "markdown", - "metadata": { - "id": "Pt6qbTsjW7Kp" - }, - "source": [ - "Put your essay here, [source of the essay used ](https://https://www.thewisdompost.com/essay/technology-essay/3387#essay-on-technology-for-college-and-university-students-essay-2-750-words)\n", - "\n", - "Separate paragraphs with one blank line\n", - "(this step is annoying but important)\n" - ] - }, - { - "cell_type": "code", - "execution_count": 2, - "metadata": { - "id": "d_5_BDFNWneB" - }, - "outputs": [], - "source": [ - "essay = \"\"\"\n", - "We live in a world driven by technology — hardly anyone would argue with you if you said this. \n", - "Technology, literally meaning the “science of craft”, refers to the collection of techniques, \n", - "skills, methods, and processes used to produce goods or services or for accomplishing objectives \n", - "such as scientific investigation. Technology can be embedded in machines enabling them to be \n", - "used by people even without a detailed knowledge of their inner workings. Technological growth \n", - "is closely linked to the expansion of scientific research and knowledge. In the last 50 years, \n", - "thanks to the exponential increases in computing power and microchip design and manufacture, \n", - "there has been unprecedented innovation and technological growth in nearly every field of human \n", - "endeavour from health and transport to industrial production and education.\n", - "\n", - "It is automotive technology that drives today’s electric and hybrid cars, and which will drive \n", - "tomorrow’s driverless cars, hover-taxis and space cabs. It is technology that drives the \n", - "ubiquitous mobile phones that you will now find in the hands of even the poorest of the world’s \n", - "poor. It is technology that creates hybrid seeds that resist inhospitable climatic conditions \n", - "and difficult terrain, giving high yields in shorter times. It is advancing medical technology \n", - "that makes remote surgery, minimally invasive surgery and life-saving cures using stem cell \n", - "transplants. Technology puts spacecrafts on asteroids and distant planets and lets us see \n", - "new worlds. Technology splits atoms, revealing their secrets, and gives us ways to exploit \n", - "them to create energy, quantum storage for data, and virtual reality games.\n", - "\n", - "There are people who strongly oppose technology and claim that it spells the death of \n", - "‘humanity’, and that we are approaching the day when machines will rule everything. They refer \n", - "to fans of technology as ‘techies’ or sometimes ‘geeks’. On the other hand, proponents of \n", - "technology call these people Luddites, a derogatory name for someone who is opposed to \n", - "industrialisation, automation, computerisation and new technologies in general.\n", - "Is this true? Is technology really a curse disguised as a blessing? Many believe that the \n", - "convergence of biotechnology and AI might be the most consequential development of all.\n", - "\n", - "In the last five decades, two areas in particular have grown faster than the rest, powered \n", - "by research and advances in computing power. One is artificial intelligence, or AI; the other \n", - "is biotechnology. Huge benefits have emerged from each of them for human beings in general, \n", - "such as self-driving cars — which will dramatically reduce the death rate from road accidents \n", - "— and robotic surgery, which enables precise, highly efficient and targeted surgical \n", - "interventions. Yet, visionaries like Yuval Noah Harari, author of the best-selling \"Homo \n", - "Sapiens\" and \"Deus\", are now warning that the convergence of biotechnology and AI will \n", - "irreversibly and unpredictably change both the quality of human life and its challenges in \n", - "the next few decades. A good example of this is the facial recognition technology that is \n", - "now present in all photo management programs. The AI in the software is capable of not \n", - "only spotting the faces in every photograph but also recognising the person by name.\n", - "This technology has now expanded so that photo apps can recognise cats, dogs, beaches, \n", - "mountains and cars too. Computers with AI are already correctly identifying human emotions \n", - "through observing facial expressions and body movements. Some robots are able to mimic \n", - "human emotions. This is called affective computing, sometimes called artificial emotional \n", - "intelligence, and refers to the study and development of systems and devices that can \n", - "recognize, interpret, process, and simulate human affects.\n", - "\n", - "How could this be a negative?\n", - "The ability to read human emotions is just a step away from predicting human emotions. For \n", - "example, if a computer attached to a video camera could identify which products a consumer \n", - "is showing greater interest in or which ones he is really keen to buy, various tactics \n", - "could be used to influence her to buy it. Activists worry that computers that can understand \n", - "and anticipate human wishes and desires by scanning their irises and analysing their \n", - "micro-expressions could also be programmed to exploit and manipulate them. Another very real \n", - "fear is that humanoid computers with human-like skin, speech, and expressions could jeopardise \n", - "and dehumanise relationship and create emotional vacuums.\n", - "\n", - "An enduring fear of Luddites has always been that computers will rob humans of their \n", - "livelihood by taking their jobs and doing them more efficiently at lower cost. However, in \n", - "reality the exact opposite has happened. As computerised machines began taking over mechanical \n", - "and repetitive human activities, new jobs for people opened up that needs thinking and \n", - "analytical skills and judgement, or human interpersonal skills. A good example is the \n", - "worldwide proliferation of call centres. When drones were invented many feared that pilots \n", - "would soon be redundant. However, few people know that it takes almost 30 people to fly \n", - "one military drone, and an additional 50 people to analyze and make sense of the data being \n", - "streamed back by the drone. The US army suffers from a serious shortage of trained, high \n", - "quality drone pilots; anyone who masters this skill will have a job. But a social scientist \n", - "warns that in 10 years, it is certain that computers will be flying that drone and humans \n", - "will be redundant. Equally sure is that some brand new skill requirement will have opened \n", - "up with advancing technology, calling for new talents.\n", - "\n", - "In the 20th century, a young man was supposed to choose a skill, vocation or profession, \n", - "master it through education and practice, and then earn a living from it till he or she \n", - "retired. However, the fast-changing nature of technology is making skills obsolete at a \n", - "higher rate than ever before. To survive, tomorrow young man must keep re-inventing himself \n", - "and updating his skills continuously. Life could be difficult if every new skill has a shelf \n", - "life of only a decade or so. Or perhaps one could look at it the other way — and say that \n", - "changing technology will keep human beings on their toes throughout their life.\n", - "\n", - "Technology is the result of human inventiveness. It reflects our evolutionary heritage. We \n", - "are neither strong like gorillas or tigers, nor fast like cheetahs and hawks, but our \n", - "brains and thinking powers have given us the greatest edge of any species on the planet. \n", - "Technology is a result. Technology is either inherently good or bad; it is how we use it \n", - "that makes it so. The splitting of a hydrogen atom is technology at work. As history has \n", - "shown us, technology can equally be used to make a nuclear bomb that kills millions — or \n", - "generate electricity that lights up a million homes.\n", - "\"\"\"" - ] - }, - { - "cell_type": "code", - "execution_count": 3, - "metadata": { - "id": "JESY8Y10W6hQ" - }, - "outputs": [], - "source": [ - "essay_paragraphs = essay.split('\\n\\n')" - ] - }, - { - "cell_type": "code", - "execution_count": null, - "metadata": { - "id": "t1G-ZiHbZZ-Y" - }, - "outputs": [], - "source": [ - "model_name = \"snrspeaks/t5-one-line-summary\"\n", - "\n", - "from transformers import AutoModelForSeq2SeqLM, AutoTokenizer\n", - "model = AutoModelForSeq2SeqLM.from_pretrained(model_name)\n", - "tokenizer = AutoTokenizer.from_pretrained(model_name)" - ] - }, - { - "cell_type": "markdown", - "metadata": { - "id": "8BARyupEemZ-" - }, - "source": [ - "## Results\n", - "Please at least check what is generated here, it's usually good but sometimes it's bs" - ] - }, - { - "cell_type": "code", - "execution_count": null, - "metadata": { - "colab": { - "base_uri": "https://localhost:8080/" - }, - "id": "eyR58KFRae7n", - "outputId": "b8e4bc29-be89-43c3-d1bc-7e90525c0e09" - }, - "outputs": [], - "source": [ - "preds = []\n", - "\n", - "for para in essay_paragraphs:\n", - " input_ids = tokenizer.encode(para, return_tensors=\"pt\", add_special_tokens=True)\n", - " generated_ids = model.generate(input_ids=input_ids,\n", - " num_beams=5,\n", - " max_length=35,\n", - " repetition_penalty=4.5,\n", - " length_penalty=1.5,\n", - " early_stopping=True,\n", - " num_return_sequences=1)\n", - " preds.append(tokenizer.decode(generated_ids[0], \n", - " skip_special_tokens=True, \n", - " clean_up_tokenization_spaces=True))\n", - "\n", - "prompts = ['Write an intro paragraph to an essay called'] + \\\n", - " ['Write a paragraph to an essay about']*len(preds[1:-1]) + \\\n", - " ['Write a concluding paragraph about']\n", - "\n", - "assert len(preds) == len(prompts)\n", - "\n", - "for prompt, pred in zip(prompts, preds):\n", - " print(prompt, pred.lower())" - ] - } - ], - "metadata": { - "colab": { - "provenance": [] - }, - "kernelspec": { - "display_name": "Python 3.8.10 64-bit", - "language": "python", - "name": "python3" - }, - "language_info": { - "codemirror_mode": { - "name": "ipython", - "version": 3 - }, - "file_extension": ".py", - "mimetype": "text/x-python", - "name": "python", - "nbconvert_exporter": "python", - "pygments_lexer": "ipython3", - "version": "3.8.10" - }, - "vscode": { - "interpreter": { - "hash": "31f2aee4e71d21fbe5cf8b01ff0e069b9275f58929596ceb00d14d90e3e16cd6" - } - } + "cells": [ + { + "cell_type": "code", + "execution_count": null, + "metadata": { + "id": "8zsmJ96eaL2w" + }, + "outputs": [], + "source": [ + "!pip install transformers" + ] }, - "nbformat": 4, - "nbformat_minor": 0 + { + "cell_type": "markdown", + "metadata": { + "id": "Pt6qbTsjW7Kp" + }, + "source": [ + "Put your essay here, [source of the essay used ](https://https://www.thewisdompost.com/essay/technology-essay/3387#essay-on-technology-for-college-and-university-students-essay-2-750-words)\n", + "\n", + "Separate paragraphs with one blank line\n", + "(this step is annoying but important)\n" + ] + }, + { + "cell_type": "code", + "execution_count": 2, + "metadata": { + "id": "d_5_BDFNWneB" + }, + "outputs": [], + "source": [ + "essay = \"\"\"\n", + "We live in a world driven by technology — hardly anyone would argue with you if you said this. \n", + "Technology, literally meaning the “science of craft”, refers to the collection of techniques, \n", + "skills, methods, and processes used to produce goods or services or for accomplishing objectives \n", + "such as scientific investigation. Technology can be embedded in machines enabling them to be \n", + "used by people even without a detailed knowledge of their inner workings. Technological growth \n", + "is closely linked to the expansion of scientific research and knowledge. In the last 50 years, \n", + "thanks to the exponential increases in computing power and microchip design and manufacture, \n", + "there has been unprecedented innovation and technological growth in nearly every field of human \n", + "endeavour from health and transport to industrial production and education.\n", + "\n", + "It is automotive technology that drives today’s electric and hybrid cars, and which will drive \n", + "tomorrow’s driverless cars, hover-taxis and space cabs. It is technology that drives the \n", + "ubiquitous mobile phones that you will now find in the hands of even the poorest of the world’s \n", + "poor. It is technology that creates hybrid seeds that resist inhospitable climatic conditions \n", + "and difficult terrain, giving high yields in shorter times. It is advancing medical technology \n", + "that makes remote surgery, minimally invasive surgery and life-saving cures using stem cell \n", + "transplants. Technology puts spacecrafts on asteroids and distant planets and lets us see \n", + "new worlds. Technology splits atoms, revealing their secrets, and gives us ways to exploit \n", + "them to create energy, quantum storage for data, and virtual reality games.\n", + "\n", + "There are people who strongly oppose technology and claim that it spells the death of \n", + "‘humanity’, and that we are approaching the day when machines will rule everything. They refer \n", + "to fans of technology as ‘techies’ or sometimes ‘geeks’. On the other hand, proponents of \n", + "technology call these people Luddites, a derogatory name for someone who is opposed to \n", + "industrialisation, automation, computerisation and new technologies in general.\n", + "Is this true? Is technology really a curse disguised as a blessing? Many believe that the \n", + "convergence of biotechnology and AI might be the most consequential development of all.\n", + "\n", + "In the last five decades, two areas in particular have grown faster than the rest, powered \n", + "by research and advances in computing power. One is artificial intelligence, or AI; the other \n", + "is biotechnology. Huge benefits have emerged from each of them for human beings in general, \n", + "such as self-driving cars — which will dramatically reduce the death rate from road accidents \n", + "— and robotic surgery, which enables precise, highly efficient and targeted surgical \n", + "interventions. Yet, visionaries like Yuval Noah Harari, author of the best-selling \"Homo \n", + "Sapiens\" and \"Deus\", are now warning that the convergence of biotechnology and AI will \n", + "irreversibly and unpredictably change both the quality of human life and its challenges in \n", + "the next few decades. A good example of this is the facial recognition technology that is \n", + "now present in all photo management programs. The AI in the software is capable of not \n", + "only spotting the faces in every photograph but also recognising the person by name.\n", + "This technology has now expanded so that photo apps can recognise cats, dogs, beaches, \n", + "mountains and cars too. Computers with AI are already correctly identifying human emotions \n", + "through observing facial expressions and body movements. Some robots are able to mimic \n", + "human emotions. This is called affective computing, sometimes called artificial emotional \n", + "intelligence, and refers to the study and development of systems and devices that can \n", + "recognize, interpret, process, and simulate human affects.\n", + "\n", + "How could this be a negative?\n", + "The ability to read human emotions is just a step away from predicting human emotions. For \n", + "example, if a computer attached to a video camera could identify which products a consumer \n", + "is showing greater interest in or which ones he is really keen to buy, various tactics \n", + "could be used to influence her to buy it. Activists worry that computers that can understand \n", + "and anticipate human wishes and desires by scanning their irises and analysing their \n", + "micro-expressions could also be programmed to exploit and manipulate them. Another very real \n", + "fear is that humanoid computers with human-like skin, speech, and expressions could jeopardise \n", + "and dehumanise relationship and create emotional vacuums.\n", + "\n", + "An enduring fear of Luddites has always been that computers will rob humans of their \n", + "livelihood by taking their jobs and doing them more efficiently at lower cost. However, in \n", + "reality the exact opposite has happened. As computerised machines began taking over mechanical \n", + "and repetitive human activities, new jobs for people opened up that needs thinking and \n", + "analytical skills and judgement, or human interpersonal skills. A good example is the \n", + "worldwide proliferation of call centres. When drones were invented many feared that pilots \n", + "would soon be redundant. However, few people know that it takes almost 30 people to fly \n", + "one military drone, and an additional 50 people to analyze and make sense of the data being \n", + "streamed back by the drone. The US army suffers from a serious shortage of trained, high \n", + "quality drone pilots; anyone who masters this skill will have a job. But a social scientist \n", + "warns that in 10 years, it is certain that computers will be flying that drone and humans \n", + "will be redundant. Equally sure is that some brand new skill requirement will have opened \n", + "up with advancing technology, calling for new talents.\n", + "\n", + "In the 20th century, a young man was supposed to choose a skill, vocation or profession, \n", + "master it through education and practice, and then earn a living from it till he or she \n", + "retired. However, the fast-changing nature of technology is making skills obsolete at a \n", + "higher rate than ever before. To survive, tomorrow young man must keep re-inventing himself \n", + "and updating his skills continuously. Life could be difficult if every new skill has a shelf \n", + "life of only a decade or so. Or perhaps one could look at it the other way — and say that \n", + "changing technology will keep human beings on their toes throughout their life.\n", + "\n", + "Technology is the result of human inventiveness. It reflects our evolutionary heritage. We \n", + "are neither strong like gorillas or tigers, nor fast like cheetahs and hawks, but our \n", + "brains and thinking powers have given us the greatest edge of any species on the planet. \n", + "Technology is a result. Technology is either inherently good or bad; it is how we use it \n", + "that makes it so. The splitting of a hydrogen atom is technology at work. As history has \n", + "shown us, technology can equally be used to make a nuclear bomb that kills millions — or \n", + "generate electricity that lights up a million homes.\n", + "\"\"\"" + ] + }, + { + "cell_type": "code", + "execution_count": 3, + "metadata": { + "id": "JESY8Y10W6hQ" + }, + "outputs": [], + "source": [ + "essay_paragraphs = essay.split(\"\\n\\n\")" + ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": { + "id": "t1G-ZiHbZZ-Y" + }, + "outputs": [], + "source": [ + "model_name = \"snrspeaks/t5-one-line-summary\"\n", + "\n", + "from transformers import AutoModelForSeq2SeqLM, AutoTokenizer\n", + "\n", + "model = AutoModelForSeq2SeqLM.from_pretrained(model_name)\n", + "tokenizer = AutoTokenizer.from_pretrained(model_name)" + ] + }, + { + "cell_type": "markdown", + "metadata": { + "id": "8BARyupEemZ-" + }, + "source": [ + "## Results\n", + "Please at least check what is generated here, it's usually good but sometimes it's bs" + ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": { + "colab": { + "base_uri": "https://localhost:8080/" + }, + "id": "eyR58KFRae7n", + "outputId": "b8e4bc29-be89-43c3-d1bc-7e90525c0e09" + }, + "outputs": [], + "source": [ + "preds = []\n", + "\n", + "for para in essay_paragraphs:\n", + " input_ids = tokenizer.encode(para, return_tensors=\"pt\", add_special_tokens=True)\n", + " generated_ids = model.generate(\n", + " input_ids=input_ids,\n", + " num_beams=5,\n", + " max_length=35,\n", + " repetition_penalty=4.5,\n", + " length_penalty=1.5,\n", + " early_stopping=True,\n", + " num_return_sequences=1,\n", + " )\n", + " preds.append(tokenizer.decode(generated_ids[0], skip_special_tokens=True, clean_up_tokenization_spaces=True))\n", + "\n", + "prompts = (\n", + " [\"Write an intro paragraph to an essay called\"]\n", + " + [\"Write a paragraph to an essay about\"] * len(preds[1:-1])\n", + " + [\"Write a concluding paragraph about\"]\n", + ")\n", + "\n", + "assert len(preds) == len(prompts)\n", + "\n", + "for prompt, pred in zip(prompts, preds):\n", + " print(prompt, pred.lower())" + ] + } + ], + "metadata": { + "colab": { + "provenance": [] + }, + "kernelspec": { + "display_name": "Python 3.8.10 64-bit", + "language": "python", + "name": "python3" + }, + "language_info": { + "codemirror_mode": { + "name": "ipython", + "version": 3 + }, + "file_extension": ".py", + "mimetype": "text/x-python", + "name": "python", + "nbconvert_exporter": "python", + "pygments_lexer": "ipython3", + "version": "3.8.10" + }, + "vscode": { + "interpreter": { + "hash": "31f2aee4e71d21fbe5cf8b01ff0e069b9275f58929596ceb00d14d90e3e16cd6" + } + } + }, + "nbformat": 4, + "nbformat_minor": 0 } diff --git a/notebooks/data-argumentation/EssayRevision.ipynb b/notebooks/data-argumentation/EssayRevision.ipynb index bcd13d45..cba9bc5b 100644 --- a/notebooks/data-argumentation/EssayRevision.ipynb +++ b/notebooks/data-argumentation/EssayRevision.ipynb @@ -1 +1,324 @@ -{"cells":[{"cell_type":"markdown","metadata":{"id":"o0lAqmWhsiUe"},"source":["#Essay Revision\n","The goal of this notebook is to use data argumentation to have data on improving essays. The way this is done is by taking a template \"good\" essay and making step by step changes that make it worse and add intructions on how to fix it."]},{"cell_type":"code","execution_count":5,"metadata":{"colab":{"base_uri":"https://localhost:8080/"},"executionInfo":{"elapsed":240,"status":"ok","timestamp":1672489678465,"user":{"displayName":"Graverman","userId":"06659155231973912985"},"user_tz":-60},"id":"AFUIjc7xw25A","outputId":"01c13cd7-7252-4948-fd9a-f36919f2214b"},"outputs":[{"name":"stderr","output_type":"stream","text":["[nltk_data] Downloading package wordnet to\n","[nltk_data] C:\\Users\\Chandru\\AppData\\Roaming\\nltk_data...\n","[nltk_data] Package wordnet is already up-to-date!\n","[nltk_data] Downloading package omw-1.4 to\n","[nltk_data] C:\\Users\\Chandru\\AppData\\Roaming\\nltk_data...\n","[nltk_data] Package omw-1.4 is already up-to-date!\n"]}],"source":["import nltk\n","nltk.download('wordnet')\n","nltk.download('omw-1.4')\n","import random"]},{"cell_type":"markdown","metadata":{"id":"EcDYv9cnv18v"},"source":["Put your essay here, [source of the essay used ](https://www.thewisdompost.com/essay/technology-essay/3387#essay-on-technology-for-college-and-university-students-essay-2-750-words)"]},{"cell_type":"code","execution_count":6,"metadata":{"executionInfo":{"elapsed":250,"status":"ok","timestamp":1672490871113,"user":{"displayName":"Graverman","userId":"06659155231973912985"},"user_tz":-60},"id":"wvJHUeTJsiC7"},"outputs":[],"source":["essay = \"\"\"\n","We live in a world driven by technology — hardly anyone would argue with you if you said this. Technology, literally meaning the “science of craft”, refers to the collection of techniques, skills, methods, and processes used to produce goods or services or for accomplishing objectives such as scientific investigation. Technology can be embedded in machines enabling them to be used by people even without a detailed knowledge of their inner workings.\n","Technological growth is closely linked to the expansion of scientific research and knowledge. In the last 50 years, thanks to the exponential increases in computing power and microchip design and manufacture, there has been unprecedented innovation and technological growth in nearly every field of human endeavour from health and transport to industrial production and education.\n","\n","It is automotive technology that drives today’s electric and hybrid cars, and which will drive tomorrow’s driverless cars, hover-taxis and space cabs.\n","It is technology that drives the ubiquitous mobile phones that you will now find in the hands of even the poorest of the world’s poor. It is technology that creates hybrid seeds that resist inhospitable climatic conditions and difficult terrain, giving high yields in shorter times.\n","It is advancing medical technology that makes remote surgery, minimally invasive surgery and life-saving cures using stem cell transplants. Technology puts spacecrafts on asteroids and distant planets and lets us see new worlds. Technology splits atoms, revealing their secrets, and gives us ways to exploit them to create energy, quantum storage for data, and virtual reality games.\n","\n","There are people who strongly oppose technology and claim that it spells the death of ‘humanity’, and that we are approaching the day when machines will rule everything. They refer to fans of technology as ‘techies’ or sometimes ‘geeks’. On the other hand, proponents of technology call these people Luddites, a derogatory name for someone who is opposed to industrialisation, automation, computerisation and new technologies in general.\n","Is this true? Is technology really a curse disguised as a blessing? Many believe that the convergence of biotechnology and AI might be the most consequential development of all.\n","\n","In the last five decades, two areas in particular have grown faster than the rest, powered by research and advances in computing power. One is artificial intelligence, or AI; the other is biotechnology. Huge benefits have emerged from each of them for human beings in general, such as self-driving cars — which will dramatically reduce the death rate from road accidents — and robotic surgery, which enables precise, highly efficient and targeted surgical interventions.\n","Yet, visionaries like Yuval Noah Harari, author of the best-selling Homo sapiens and Deus, are now warning that the convergence of biotechnology and AI will irreversibly and unpredictably change both the quality of human life and its challenges in the next few decades. A good example of this is the facial recognition technology that is now present in all photo management programs. The AI in the software is capable of not only spotting the faces in every photograph but also recognising the person by name.\n","This technology has now expanded so that photo apps can recognise cats, dogs, beaches, mountains and cars too. Computers with AI are already correctly identifying human emotions through observing facial expressions and body movements. Some robots are able to mimic human emotions. This is called affective computing, sometimes called artificial emotional intelligence, and refers to the study and development of systems and devices that can recognize, interpret, process, and simulate human affects.\n","\n","The ability to read human emotions is just a step away from predicting human emotions. For example, if a computer attached to a video camera could identify which products a consumer is showing greater interest in or which ones he is really keen to buy, various tactics could be used to influence her to buy it.\n","Activists worry that computers that can understand and anticipate human wishes and desires by scanning their irises and analysing their micro-expressions could also be programmed to exploit and manipulate them.\n","Another very real fear is that humanoid computers with human-like skin, speech, and expressions could jeopardise and dehumanise relationship and create emotional vacuums.\n","\n","An enduring fear of Luddites has always been that computers will rob humans of their livelihood by taking their jobs and doing them more efficiently at lower cost. However, in reality the exact opposite has happened. As computerised machines began taking over mechanical and repetitive human activities, new jobs for people opened up that needs thinking and analytical skills and judgement, or human interpersonal skills. A good example is the worldwide proliferation of call centres.\n","When drones were invented many feared that pilots would soon be redundant. However, few people know that it takes almost 30 people to fly one military drone, and an additional 50 people to analyze and make sense of the data being streamed back by the drone.\n","The US army suffers from a serious shortage of trained, high quality drone pilots; anyone who masters this skill will have a job. But a social scientist warns that in 10 years, it is certain that computers will be flying that drone and humans will be redundant. Equally sure is that some brand new skill requirement will have opened up with advancing technology, calling for new talents.\n","\n","In the 20th century, a young man was supposed to choose a skill, vocation or profession, master it through education and practice, and then earn a living from it till he or she retired. However, the fast-changing nature of technology is making skills obsolete at a higher rate than ever before. To survive, tomorrow young man must keep re-inventing himself and updating his skills continuously. Life could be difficult if every new skill has a shelf life of only a decade or so.\n","Or perhaps one could look at it the other way — and say that changing technology will keep human beings on their toes throughout their life.\n","\n","Technology is the result of human inventiveness. It reflects our evolutionary heritage. We are neither strong like gorillas or tigers, nor fast like cheetahs and hawks, but our brains and thinking powers have given us the greatest edge of any species on the planet. Technology is a result.\n","Technology is either inherently good or bad; it is how we use it that makes it so. The splitting of a hydrogen atom is technology at work. As history has shown us, technology can equally be used to make a nuclear bomb that kills millions — or generate electricity that lights up a million homes.\n","\"\"\""]},{"cell_type":"code","execution_count":7,"metadata":{"executionInfo":{"elapsed":5,"status":"ok","timestamp":1672487908938,"user":{"displayName":"Graverman","userId":"06659155231973912985"},"user_tz":-60},"id":"_ttU0Ma8p1_U"},"outputs":[],"source":["instructions = []"]},{"cell_type":"code","execution_count":8,"metadata":{"executionInfo":{"elapsed":232,"status":"ok","timestamp":1672490937384,"user":{"displayName":"Graverman","userId":"06659155231973912985"},"user_tz":-60},"id":"Evaej8oH8VLH"},"outputs":[],"source":["# Make stucture error (shuffle one paragraph with another)\n","essay_paragraphs = essay.split('\\n\\n') #Splitting a String by newline character (\\n)\n","\n","rand1 = random.randint(0, len(essay_paragraphs) - 1)\n","rand2 = random.randint(0, len(essay_paragraphs) - 1)\n","\n","temp = essay_paragraphs[rand1]\n","essay_paragraphs[rand1] = essay_paragraphs[rand2]\n","essay_paragraphs[rand2] = temp\n","\n","essay = \"\"\n","for i in essay_paragraphs:\n"," essay += i\n"," essay += \"\\n\\n\"\n","\n","instructions.append(\"Fix structure errors in this essay\")"]},{"cell_type":"code","execution_count":9,"metadata":{"executionInfo":{"elapsed":257,"status":"ok","timestamp":1672490091374,"user":{"displayName":"Graverman","userId":"06659155231973912985"},"user_tz":-60},"id":"HhJXyfy-2OmT"},"outputs":[],"source":["# Make grammar erros (more like: change random words into words of similar meaning)\n","import nltk\n","from nltk.corpus import wordnet\n","import random\n","\n","essay_words = essay.split()\n","\n","for i in range(len(essay_words)):\n"," if random.randint(0, 100) < 30:\n"," suggestion = []\n"," for syn in wordnet.synsets(essay_words[i]):\n"," for l in syn.lemmas():\n"," suggestion.append(l.name())\n"," if suggestion != []:\n"," essay_words[i] = suggestion[random.randint(0, len(suggestion) - 1)]\n","\n","essay = \"\"\n","for i in essay_words:\n"," essay += i\n"," essay += \" \"\n","\n","\n","instructions.append(\"Fix grammar errors in this essay\")"]},{"cell_type":"code","execution_count":14,"metadata":{"executionInfo":{"elapsed":231,"status":"ok","timestamp":1672490096010,"user":{"displayName":"Graverman","userId":"06659155231973912985"},"user_tz":-60},"id":"delvA6xEzNwV"},"outputs":[],"source":["# Make typos\n","import string\n","import random\n","\n","# you can change the number 60 to change how much corrupted this essay will be\n","for i in range(len(essay) // 60):\n"," rand = random.randint(0, len(essay))\n"," essay = essay[:rand] + random.choice(string.ascii_letters) + essay[rand+1:]\n","\n","instructions.append(\"Fix typing errors in this essay\")"]},{"cell_type":"code","execution_count":15,"metadata":{"colab":{"base_uri":"https://localhost:8080/"},"executionInfo":{"elapsed":364,"status":"ok","timestamp":1672484222869,"user":{"displayName":"Graverman","userId":"06659155231973912985"},"user_tz":-60},"id":"4XLAXom_zGsR","outputId":"b741c776-41af-4ad5-8ab7-1825b19018ab"},"outputs":[{"name":"stdout","output_type":"stream","text":["Fix typing errors in this essay\n"]}],"source":["# Prints intrcutions (final step)\n","for i in instructions:\n"," print(i)\n","instructions.clear()"]},{"cell_type":"code","execution_count":null,"metadata":{},"outputs":[],"source":[]},{"cell_type":"code","execution_count":null,"metadata":{},"outputs":[],"source":[]}],"metadata":{"colab":{"authorship_tag":"ABX9TyO8HHo9/NuZY8QnCvjrXaYb","provenance":[]},"kernelspec":{"display_name":"Python 3","language":"python","name":"python3"},"language_info":{"codemirror_mode":{"name":"ipython","version":3},"file_extension":".py","mimetype":"text/x-python","name":"python","nbconvert_exporter":"python","pygments_lexer":"ipython3","version":"3.10.4"},"vscode":{"interpreter":{"hash":"492d89208e1af30f4727fd53e254ea56e6b1a843b376782bfa5f6ce13d676265"}}},"nbformat":4,"nbformat_minor":0} +{ + "cells": [ + { + "cell_type": "markdown", + "metadata": { + "id": "o0lAqmWhsiUe" + }, + "source": [ + "#Essay Revision\n", + "The goal of this notebook is to use data argumentation to have data on improving essays. The way this is done is by taking a template \"good\" essay and making step by step changes that make it worse and add intructions on how to fix it." + ] + }, + { + "cell_type": "code", + "execution_count": 5, + "metadata": { + "colab": { + "base_uri": "https://localhost:8080/" + }, + "executionInfo": { + "elapsed": 240, + "status": "ok", + "timestamp": 1672489678465, + "user": { + "displayName": "Graverman", + "userId": "06659155231973912985" + }, + "user_tz": -60 + }, + "id": "AFUIjc7xw25A", + "outputId": "01c13cd7-7252-4948-fd9a-f36919f2214b" + }, + "outputs": [ + { + "name": "stderr", + "output_type": "stream", + "text": [ + "[nltk_data] Downloading package wordnet to\n", + "[nltk_data] C:\\Users\\Chandru\\AppData\\Roaming\\nltk_data...\n", + "[nltk_data] Package wordnet is already up-to-date!\n", + "[nltk_data] Downloading package omw-1.4 to\n", + "[nltk_data] C:\\Users\\Chandru\\AppData\\Roaming\\nltk_data...\n", + "[nltk_data] Package omw-1.4 is already up-to-date!\n" + ] + } + ], + "source": [ + "import nltk\n", + "\n", + "nltk.download(\"wordnet\")\n", + "nltk.download(\"omw-1.4\")\n", + "import random" + ] + }, + { + "cell_type": "markdown", + "metadata": { + "id": "EcDYv9cnv18v" + }, + "source": [ + "Put your essay here, [source of the essay used ](https://www.thewisdompost.com/essay/technology-essay/3387#essay-on-technology-for-college-and-university-students-essay-2-750-words)" + ] + }, + { + "cell_type": "code", + "execution_count": 6, + "metadata": { + "executionInfo": { + "elapsed": 250, + "status": "ok", + "timestamp": 1672490871113, + "user": { + "displayName": "Graverman", + "userId": "06659155231973912985" + }, + "user_tz": -60 + }, + "id": "wvJHUeTJsiC7" + }, + "outputs": [], + "source": [ + "essay = \"\"\"\n", + "We live in a world driven by technology — hardly anyone would argue with you if you said this. Technology, literally meaning the “science of craft”, refers to the collection of techniques, skills, methods, and processes used to produce goods or services or for accomplishing objectives such as scientific investigation. Technology can be embedded in machines enabling them to be used by people even without a detailed knowledge of their inner workings.\n", + "Technological growth is closely linked to the expansion of scientific research and knowledge. In the last 50 years, thanks to the exponential increases in computing power and microchip design and manufacture, there has been unprecedented innovation and technological growth in nearly every field of human endeavour from health and transport to industrial production and education.\n", + "\n", + "It is automotive technology that drives today’s electric and hybrid cars, and which will drive tomorrow’s driverless cars, hover-taxis and space cabs.\n", + "It is technology that drives the ubiquitous mobile phones that you will now find in the hands of even the poorest of the world’s poor. It is technology that creates hybrid seeds that resist inhospitable climatic conditions and difficult terrain, giving high yields in shorter times.\n", + "It is advancing medical technology that makes remote surgery, minimally invasive surgery and life-saving cures using stem cell transplants. Technology puts spacecrafts on asteroids and distant planets and lets us see new worlds. Technology splits atoms, revealing their secrets, and gives us ways to exploit them to create energy, quantum storage for data, and virtual reality games.\n", + "\n", + "There are people who strongly oppose technology and claim that it spells the death of ‘humanity’, and that we are approaching the day when machines will rule everything. They refer to fans of technology as ‘techies’ or sometimes ‘geeks’. On the other hand, proponents of technology call these people Luddites, a derogatory name for someone who is opposed to industrialisation, automation, computerisation and new technologies in general.\n", + "Is this true? Is technology really a curse disguised as a blessing? Many believe that the convergence of biotechnology and AI might be the most consequential development of all.\n", + "\n", + "In the last five decades, two areas in particular have grown faster than the rest, powered by research and advances in computing power. One is artificial intelligence, or AI; the other is biotechnology. Huge benefits have emerged from each of them for human beings in general, such as self-driving cars — which will dramatically reduce the death rate from road accidents — and robotic surgery, which enables precise, highly efficient and targeted surgical interventions.\n", + "Yet, visionaries like Yuval Noah Harari, author of the best-selling Homo sapiens and Deus, are now warning that the convergence of biotechnology and AI will irreversibly and unpredictably change both the quality of human life and its challenges in the next few decades. A good example of this is the facial recognition technology that is now present in all photo management programs. The AI in the software is capable of not only spotting the faces in every photograph but also recognising the person by name.\n", + "This technology has now expanded so that photo apps can recognise cats, dogs, beaches, mountains and cars too. Computers with AI are already correctly identifying human emotions through observing facial expressions and body movements. Some robots are able to mimic human emotions. This is called affective computing, sometimes called artificial emotional intelligence, and refers to the study and development of systems and devices that can recognize, interpret, process, and simulate human affects.\n", + "\n", + "The ability to read human emotions is just a step away from predicting human emotions. For example, if a computer attached to a video camera could identify which products a consumer is showing greater interest in or which ones he is really keen to buy, various tactics could be used to influence her to buy it.\n", + "Activists worry that computers that can understand and anticipate human wishes and desires by scanning their irises and analysing their micro-expressions could also be programmed to exploit and manipulate them.\n", + "Another very real fear is that humanoid computers with human-like skin, speech, and expressions could jeopardise and dehumanise relationship and create emotional vacuums.\n", + "\n", + "An enduring fear of Luddites has always been that computers will rob humans of their livelihood by taking their jobs and doing them more efficiently at lower cost. However, in reality the exact opposite has happened. As computerised machines began taking over mechanical and repetitive human activities, new jobs for people opened up that needs thinking and analytical skills and judgement, or human interpersonal skills. A good example is the worldwide proliferation of call centres.\n", + "When drones were invented many feared that pilots would soon be redundant. However, few people know that it takes almost 30 people to fly one military drone, and an additional 50 people to analyze and make sense of the data being streamed back by the drone.\n", + "The US army suffers from a serious shortage of trained, high quality drone pilots; anyone who masters this skill will have a job. But a social scientist warns that in 10 years, it is certain that computers will be flying that drone and humans will be redundant. Equally sure is that some brand new skill requirement will have opened up with advancing technology, calling for new talents.\n", + "\n", + "In the 20th century, a young man was supposed to choose a skill, vocation or profession, master it through education and practice, and then earn a living from it till he or she retired. However, the fast-changing nature of technology is making skills obsolete at a higher rate than ever before. To survive, tomorrow young man must keep re-inventing himself and updating his skills continuously. Life could be difficult if every new skill has a shelf life of only a decade or so.\n", + "Or perhaps one could look at it the other way — and say that changing technology will keep human beings on their toes throughout their life.\n", + "\n", + "Technology is the result of human inventiveness. It reflects our evolutionary heritage. We are neither strong like gorillas or tigers, nor fast like cheetahs and hawks, but our brains and thinking powers have given us the greatest edge of any species on the planet. Technology is a result.\n", + "Technology is either inherently good or bad; it is how we use it that makes it so. The splitting of a hydrogen atom is technology at work. As history has shown us, technology can equally be used to make a nuclear bomb that kills millions — or generate electricity that lights up a million homes.\n", + "\"\"\"" + ] + }, + { + "cell_type": "code", + "execution_count": 7, + "metadata": { + "executionInfo": { + "elapsed": 5, + "status": "ok", + "timestamp": 1672487908938, + "user": { + "displayName": "Graverman", + "userId": "06659155231973912985" + }, + "user_tz": -60 + }, + "id": "_ttU0Ma8p1_U" + }, + "outputs": [], + "source": [ + "instructions = []" + ] + }, + { + "cell_type": "code", + "execution_count": 8, + "metadata": { + "executionInfo": { + "elapsed": 232, + "status": "ok", + "timestamp": 1672490937384, + "user": { + "displayName": "Graverman", + "userId": "06659155231973912985" + }, + "user_tz": -60 + }, + "id": "Evaej8oH8VLH" + }, + "outputs": [], + "source": [ + "# Make stucture error (shuffle one paragraph with another)\n", + "essay_paragraphs = essay.split(\"\\n\\n\") # Splitting a String by newline character (\\n)\n", + "\n", + "rand1 = random.randint(0, len(essay_paragraphs) - 1)\n", + "rand2 = random.randint(0, len(essay_paragraphs) - 1)\n", + "\n", + "temp = essay_paragraphs[rand1]\n", + "essay_paragraphs[rand1] = essay_paragraphs[rand2]\n", + "essay_paragraphs[rand2] = temp\n", + "\n", + "essay = \"\"\n", + "for i in essay_paragraphs:\n", + " essay += i\n", + " essay += \"\\n\\n\"\n", + "\n", + "instructions.append(\"Fix structure errors in this essay\")" + ] + }, + { + "cell_type": "code", + "execution_count": 9, + "metadata": { + "executionInfo": { + "elapsed": 257, + "status": "ok", + "timestamp": 1672490091374, + "user": { + "displayName": "Graverman", + "userId": "06659155231973912985" + }, + "user_tz": -60 + }, + "id": "HhJXyfy-2OmT" + }, + "outputs": [], + "source": [ + "# Make grammar erros (more like: change random words into words of similar meaning)\n", + "import nltk\n", + "from nltk.corpus import wordnet\n", + "import random\n", + "\n", + "essay_words = essay.split()\n", + "\n", + "for i in range(len(essay_words)):\n", + " if random.randint(0, 100) < 30:\n", + " suggestion = []\n", + " for syn in wordnet.synsets(essay_words[i]):\n", + " for l in syn.lemmas():\n", + " suggestion.append(l.name())\n", + " if suggestion != []:\n", + " essay_words[i] = suggestion[random.randint(0, len(suggestion) - 1)]\n", + "\n", + "essay = \"\"\n", + "for i in essay_words:\n", + " essay += i\n", + " essay += \" \"\n", + "\n", + "\n", + "instructions.append(\"Fix grammar errors in this essay\")" + ] + }, + { + "cell_type": "code", + "execution_count": 14, + "metadata": { + "executionInfo": { + "elapsed": 231, + "status": "ok", + "timestamp": 1672490096010, + "user": { + "displayName": "Graverman", + "userId": "06659155231973912985" + }, + "user_tz": -60 + }, + "id": "delvA6xEzNwV" + }, + "outputs": [], + "source": [ + "# Make typos\n", + "import string\n", + "import random\n", + "\n", + "# you can change the number 60 to change how much corrupted this essay will be\n", + "for i in range(len(essay) // 60):\n", + " rand = random.randint(0, len(essay))\n", + " essay = essay[:rand] + random.choice(string.ascii_letters) + essay[rand + 1 :]\n", + "\n", + "instructions.append(\"Fix typing errors in this essay\")" + ] + }, + { + "cell_type": "code", + "execution_count": 15, + "metadata": { + "colab": { + "base_uri": "https://localhost:8080/" + }, + "executionInfo": { + "elapsed": 364, + "status": "ok", + "timestamp": 1672484222869, + "user": { + "displayName": "Graverman", + "userId": "06659155231973912985" + }, + "user_tz": -60 + }, + "id": "4XLAXom_zGsR", + "outputId": "b741c776-41af-4ad5-8ab7-1825b19018ab" + }, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "Fix typing errors in this essay\n" + ] + } + ], + "source": [ + "# Prints intrcutions (final step)\n", + "for i in instructions:\n", + " print(i)\n", + "instructions.clear()" + ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": {}, + "outputs": [], + "source": [] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": {}, + "outputs": [], + "source": [] + } + ], + "metadata": { + "colab": { + "authorship_tag": "ABX9TyO8HHo9/NuZY8QnCvjrXaYb", + "provenance": [] + }, + "kernelspec": { + "display_name": "Python 3", + "language": "python", + "name": "python3" + }, + "language_info": { + "codemirror_mode": { + "name": "ipython", + "version": 3 + }, + "file_extension": ".py", + "mimetype": "text/x-python", + "name": "python", + "nbconvert_exporter": "python", + "pygments_lexer": "ipython3", + "version": "3.10.4" + }, + "vscode": { + "interpreter": { + "hash": "492d89208e1af30f4727fd53e254ea56e6b1a843b376782bfa5f6ce13d676265" + } + } + }, + "nbformat": 4, + "nbformat_minor": 0 +} diff --git a/notebooks/detoxify-evaluation/DetoxityEvaluation.ipynb b/notebooks/detoxify-evaluation/DetoxityEvaluation.ipynb index 3924ea29..907c4365 100644 --- a/notebooks/detoxify-evaluation/DetoxityEvaluation.ipynb +++ b/notebooks/detoxify-evaluation/DetoxityEvaluation.ipynb @@ -46,14 +46,14 @@ "metadata": {}, "outputs": [], "source": [ - "detoxify_models = ['original', \"original-small\", 'multilingual', 'unbiased', 'unbiased-small']\n", + "detoxify_models = [\"original\", \"original-small\", \"multilingual\", \"unbiased\", \"unbiased-small\"]\n", "\n", - "not_obvious_toxic = [ \n", + "not_obvious_toxic = [\n", " \"I'm not a racist, but I don't like afroamerican people\",\n", " \"I love my girlfriend, but I don't like her black friends\",\n", " \"My girfriend is the best and most loving person in the world as long as she doesn't leave the kitchen\",\n", " \"My girlfriend is 12 years old but I love her, after all age is just a number\",\n", - " \"You are like a star to me, you should stay milion of light years away\"\n", + " \"You are like a star to me, you should stay milion of light years away\",\n", "]\n", "\n", "not_obvious_non_toxic = [\n", @@ -61,15 +61,15 @@ " \"I love my girlfriend so much I would kill for her\",\n", " \"Wow you have an important event soon? Break a leg!\",\n", " \"I'm 35 and my girlfriend is 12. Can we do quests together with such a huge level gap?\",\n", - " \"I have reat this really awesome book about barbarians slaughtering villages and raping women\"\n", + " \"I have reat this really awesome book about barbarians slaughtering villages and raping women\",\n", "]\n", "\n", - "obvious_toxic =[ \n", + "obvious_toxic = [\n", " \"I absolutly hate you man\",\n", " \"This question is pathetic, you are an idiot\",\n", " \"I hate this minority and I think they should be exterminated\",\n", " \"Women should only work in the kitchen and keep the house clean\",\n", - " \"Men should always be muscular and never cry \"\n", + " \"Men should always be muscular and never cry \",\n", "]\n", "\n", "obvious_non_toxic = [\n", @@ -77,13 +77,13 @@ " \"You are a very good friend and you mean a lot to me\",\n", " \"What are we having for dinner tonight?\",\n", " \"People should read more books as they are very educating\",\n", - " \"We just returned from our trip to Spain\"\n", + " \"We just returned from our trip to Spain\",\n", "]\n", "\n", "word_site = \"https://www.mit.edu/~ecprice/wordlist.10000\"\n", "response = requests.get(word_site)\n", - "WORDS = [word.decode('utf-8') for word in response.content.splitlines()]\n", - "DEVICE = 'cuda'" + "WORDS = [word.decode(\"utf-8\") for word in response.content.splitlines()]\n", + "DEVICE = \"cuda\"" ] }, { @@ -93,7 +93,7 @@ "outputs": [], "source": [ "def random_sentence(sentence_length):\n", - " return ' '.join([WORDS[random.randint(0, len(WORDS)-1)] for i in range(sentence_length)])" + " return \" \".join([WORDS[random.randint(0, len(WORDS) - 1)] for i in range(sentence_length)])" ] }, { @@ -111,10 +111,10 @@ "outputs": [], "source": [ "for model in detoxify_models:\n", - " print(f'Loading {model} model')\n", + " print(f\"Loading {model} model\")\n", " Detoxify(model)\n", " gc.collect()\n", - " print(f'Loaded {model} model')" + " print(f\"Loaded {model} model\")" ] }, { @@ -187,86 +187,103 @@ " torch.cuda.empty_cache()\n", " initial_memory = torch.cuda.memory_allocated()\n", " model = Detoxify(model_name, device=DEVICE)\n", - " model_memory = (torch.cuda.memory_allocated() - initial_memory) / (1024*1024)\n", + " model_memory = (torch.cuda.memory_allocated() - initial_memory) / (1024 * 1024)\n", "\n", " max_sentence_length = 4000\n", " max_batch_size = 128\n", " sentence_step = 500\n", " batch_step = 32\n", "\n", - " memory_heatmap = pd.DataFrame(columns= [i for i in range(sentence_step, max_sentence_length + 1, sentence_step)], index=[i for i in range(batch_step, max_batch_size + 1, batch_step)])\n", - " execution_time_heatmap = pd.DataFrame(columns=[i for i in range(sentence_step, max_sentence_length + 1, sentence_step)], index=[i for i in range(batch_step, max_batch_size + 1, batch_step)])\n", + " memory_heatmap = pd.DataFrame(\n", + " columns=[i for i in range(sentence_step, max_sentence_length + 1, sentence_step)],\n", + " index=[i for i in range(batch_step, max_batch_size + 1, batch_step)],\n", + " )\n", + " execution_time_heatmap = pd.DataFrame(\n", + " columns=[i for i in range(sentence_step, max_sentence_length + 1, sentence_step)],\n", + " index=[i for i in range(batch_step, max_batch_size + 1, batch_step)],\n", + " )\n", "\n", - " for word_size in range (sentence_step, max_sentence_length + 1, sentence_step):\n", + " for word_size in range(sentence_step, max_sentence_length + 1, sentence_step):\n", " for batch_size in range(batch_step, max_batch_size + 1, batch_step):\n", " start_time = time.time()\n", " inputs = [random_sentence(word_size) for i in range(batch_size)]\n", " _ = model.predict(inputs)\n", - " \n", - " memory_heatmap.loc[batch_size, word_size] = (torch.cuda.max_memory_allocated() - initial_memory)/(1024*1024)\n", - " execution_time_heatmap.loc[batch_size, word_size] = time.time() - start_time\n", - " \n", + "\n", + " memory_heatmap.loc[batch_size, word_size] = (torch.cuda.max_memory_allocated() - initial_memory) / (\n", + " 1024 * 1024\n", + " )\n", + " execution_time_heatmap.loc[batch_size, word_size] = time.time() - start_time\n", + "\n", " del inputs, _\n", " torch.cuda.empty_cache()\n", " torch.cuda.reset_peak_memory_stats()\n", " plt.figure(figsize=(20, 20))\n", - " plt.suptitle(f'Detoxify model \"{model_name}\" base memory usage = {model_memory:.2f} MB', fontsize=36) \n", + " plt.suptitle(f'Detoxify model \"{model_name}\" base memory usage = {model_memory:.2f} MB', fontsize=36)\n", "\n", - " plt.subplot(2,2,1)\n", - " sns.heatmap(memory_heatmap.astype(float), annot=True, fmt=\".0f\", cmap='Blues')\n", - " plt.title(f'{model_name} model inference memory usage (MB)')\n", - " plt.xlabel('Sentence length')\n", - " plt.ylabel('Batch size')\n", - " \n", - " plt.subplot(2,2,2)\n", - " sns.heatmap(execution_time_heatmap.astype(float), annot=True, fmt=\".2f\", cmap='Blues')\n", - " plt.title(f'{model_name} model inference execution time (seconds)')\n", - " plt.xlabel('Sentence length')\n", - " plt.ylabel('Batch size')\n", - " \n", + " plt.subplot(2, 2, 1)\n", + " sns.heatmap(memory_heatmap.astype(float), annot=True, fmt=\".0f\", cmap=\"Blues\")\n", + " plt.title(f\"{model_name} model inference memory usage (MB)\")\n", + " plt.xlabel(\"Sentence length\")\n", + " plt.ylabel(\"Batch size\")\n", "\n", + " plt.subplot(2, 2, 2)\n", + " sns.heatmap(execution_time_heatmap.astype(float), annot=True, fmt=\".2f\", cmap=\"Blues\")\n", + " plt.title(f\"{model_name} model inference execution time (seconds)\")\n", + " plt.xlabel(\"Sentence length\")\n", + " plt.ylabel(\"Batch size\")\n", "\n", " max_sentence_length = 4000\n", " max_batch_size = 16\n", " sentence_step = 500\n", " batch_step = 4\n", "\n", - " memory_heatmap = pd.DataFrame(columns=[i for i in range(sentence_step, max_sentence_length + 1, sentence_step)], index=[i for i in range(batch_step, max_batch_size + 1, batch_step)])\n", - " execution_time_heatmap = pd.DataFrame(columns=[i for i in range(sentence_step, max_sentence_length + 1, sentence_step)], index=[i for i in range(batch_step, max_batch_size + 1, batch_step)])\n", + " memory_heatmap = pd.DataFrame(\n", + " columns=[i for i in range(sentence_step, max_sentence_length + 1, sentence_step)],\n", + " index=[i for i in range(batch_step, max_batch_size + 1, batch_step)],\n", + " )\n", + " execution_time_heatmap = pd.DataFrame(\n", + " columns=[i for i in range(sentence_step, max_sentence_length + 1, sentence_step)],\n", + " index=[i for i in range(batch_step, max_batch_size + 1, batch_step)],\n", + " )\n", "\n", " optimizer = torch.optim.Adam(model.model.parameters(), lr=0.0001)\n", - " for word_size in range (sentence_step, max_sentence_length + 1, sentence_step):\n", + " for word_size in range(sentence_step, max_sentence_length + 1, sentence_step):\n", " for batch_size in range(batch_step, max_batch_size + 1, batch_step):\n", " model.model.train()\n", " start_time = time.time()\n", - " \n", + "\n", " inputs = [random_sentence(word_size) for i in range(batch_size)]\n", - " outputs = model.model(**model.tokenizer(inputs, return_tensors='pt', padding=True, truncation=True).to(DEVICE))[0]\n", + " outputs = model.model(\n", + " **model.tokenizer(inputs, return_tensors=\"pt\", padding=True, truncation=True).to(DEVICE)\n", + " )[0]\n", " outputs = torch.sigmoid(outputs)\n", " random_outputs = torch.rand(outputs.shape).to(DEVICE)\n", " loss = torch.nn.functional.binary_cross_entropy(outputs, random_outputs)\n", " loss.backward()\n", " optimizer.step()\n", - " \n", - " memory_heatmap.loc[batch_size, word_size] = (torch.cuda.max_memory_allocated() - initial_memory)/(1024*1024)\n", - " execution_time_heatmap.loc[batch_size, word_size] = time.time() - start_time\n", - " \n", + "\n", + " memory_heatmap.loc[batch_size, word_size] = (torch.cuda.max_memory_allocated() - initial_memory) / (\n", + " 1024 * 1024\n", + " )\n", + " execution_time_heatmap.loc[batch_size, word_size] = time.time() - start_time\n", + "\n", " del inputs, outputs, random_outputs, loss\n", " torch.cuda.empty_cache()\n", " torch.cuda.reset_peak_memory_stats()\n", - " \n", - " plt.subplot(2,2,3)\n", - " sns.heatmap(memory_heatmap.astype(float), annot=True, fmt=\".0f\", cmap='Blues')\n", - " plt.title(f'{model_name} model training memory usage (MB)')\n", - " plt.xlabel('Sentence length')\n", - " plt.ylabel('Batch size')\n", - " \n", - " plt.subplot(2,2,4)\n", - " sns.heatmap(execution_time_heatmap.astype(float), annot=True, fmt=\".2f\", cmap='Blues')\n", - " plt.title(f'{model_name} model training execution time (seconds)')\n", - " plt.xlabel('Sentence length')\n", - " plt.ylabel('Batch size')\n", - " \n", + "\n", + " plt.subplot(2, 2, 3)\n", + " sns.heatmap(memory_heatmap.astype(float), annot=True, fmt=\".0f\", cmap=\"Blues\")\n", + " plt.title(f\"{model_name} model training memory usage (MB)\")\n", + " plt.xlabel(\"Sentence length\")\n", + " plt.ylabel(\"Batch size\")\n", + "\n", + " plt.subplot(2, 2, 4)\n", + " sns.heatmap(execution_time_heatmap.astype(float), annot=True, fmt=\".2f\", cmap=\"Blues\")\n", + " plt.title(f\"{model_name} model training execution time (seconds)\")\n", + " plt.xlabel(\"Sentence length\")\n", + " plt.ylabel(\"Batch size\")\n", + "\n", + "\n", "for m in detoxify_models:\n", " check_model(m)" ] @@ -369,29 +386,30 @@ " must_be_toxic = pd.DataFrame(model.predict(obvious_toxic))\n", " must_not_be_toxic = pd.DataFrame(model.predict(obvious_non_toxic))\n", "\n", - " nl = \"\\n\"# f strings don't support new lines\n", + " nl = \"\\n\" # f strings don't support new lines\n", " plt.figure(figsize=(15, 15))\n", " plt.suptitle(f'Detoxify model \"{model_name}\" outputs', fontsize=30)\n", - " plt.subplot(2,2,1)\n", - " sns.heatmap(should_be_toxic, annot=True, fmt=\".2f\", cmap='Blues')\n", + " plt.subplot(2, 2, 1)\n", + " sns.heatmap(should_be_toxic, annot=True, fmt=\".2f\", cmap=\"Blues\")\n", " plt.title(f'not obvious toxic {nl} { \"\".join([f\"{i}: {s} {nl}\" for i, s in enumerate(not_obvious_toxic)])}')\n", "\n", - " plt.subplot(2,2,2)\n", - " sns.heatmap(should_not_be_toxic, annot=True, fmt=\".2f\", cmap='Blues')\n", + " plt.subplot(2, 2, 2)\n", + " sns.heatmap(should_not_be_toxic, annot=True, fmt=\".2f\", cmap=\"Blues\")\n", " plt.title(f'not obvious not toxic {nl} { \"\".join([f\"{i}: {s} {nl}\" for i, s in enumerate(not_obvious_non_toxic)])}')\n", "\n", - " plt.subplot(2,2,3)\n", - " sns.heatmap(must_be_toxic, annot=True, fmt=\".2f\", cmap='Blues')\n", + " plt.subplot(2, 2, 3)\n", + " sns.heatmap(must_be_toxic, annot=True, fmt=\".2f\", cmap=\"Blues\")\n", " plt.title(f'obvious toxic {nl} { \"\".join([f\"{i}: {s} {nl}\" for i, s in enumerate(obvious_toxic)])}')\n", "\n", - " plt.subplot(2,2,4)\n", - " sns.heatmap(must_not_be_toxic, annot=True, fmt=\".2f\", cmap='Blues')\n", + " plt.subplot(2, 2, 4)\n", + " sns.heatmap(must_not_be_toxic, annot=True, fmt=\".2f\", cmap=\"Blues\")\n", " plt.title(f'obvious not toxic {nl} { \"\".join([f\"{i}: {s} {nl}\" for i, s in enumerate(obvious_non_toxic)])}')\n", - " \n", + "\n", " plt.tight_layout()\n", "\n", + "\n", "for m in detoxify_models:\n", - " check_outputs(m)\n" + " check_outputs(m)" ] }, { diff --git a/website/cypress/e2e/create/initial_prompt.cy.ts b/website/cypress/e2e/create/initial_prompt.cy.ts new file mode 100644 index 00000000..b17f2dd9 --- /dev/null +++ b/website/cypress/e2e/create/initial_prompt.cy.ts @@ -0,0 +1,26 @@ +import { faker } from "@faker-js/faker"; + +describe("creating initial prompts", () => { + it("completes the current task on submit and on request shows a new task", () => { + cy.signInWithEmail("cypress@example.com"); + cy.visit("/create/initial_prompt"); + + cy.get('[data-cy="task-id"').then((taskIdElement) => { + const taskId = taskIdElement.text(); + + const prompt = faker.lorem.sentence(); + cy.log("prompt", prompt); + cy.get('[data-cy="reply"').type(prompt); + + cy.get('[data-cy="submit"]').click(); + + cy.get('[data-cy="next-task"]').click(); + + cy.get('[data-cy="task-id"').should((taskIdElement) => { + expect(taskIdElement.text()).not.to.eq(taskId); + }); + }); + }); +}); + +export {}; diff --git a/website/package-lock.json b/website/package-lock.json index 1803cbca..5cd3d9bb 100644 --- a/website/package-lock.json +++ b/website/package-lock.json @@ -39,7 +39,7 @@ "react": "18.2.0", "react-dom": "18.2.0", "react-icons": "^4.7.1", - "sharp": "^0.31.3", + "sharp": "0.31.2", "swr": "^2.0.0", "tailwindcss": "^3.2.4", "use-debounce": "^9.0.2" @@ -27907,9 +27907,9 @@ } }, "node_modules/sharp": { - "version": "0.31.3", - "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.31.3.tgz", - "integrity": "sha512-XcR4+FCLBFKw1bdB+GEhnUNXNXvnt0tDo4WsBsraKymuo/IAuPuCBVAL2wIkUw2r/dwFW5Q5+g66Kwl2dgDFVg==", + "version": "0.31.2", + "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.31.2.tgz", + "integrity": "sha512-DUdNVEXgS5A97cTagSLIIp8dUZ/lZtk78iNVZgHdHbx1qnQR7JAHY0BnXnwwH39Iw+VKhO08CTYhIg0p98vQ5Q==", "hasInstallScript": true, "dependencies": { "color": "^4.2.3", @@ -52121,9 +52121,9 @@ } }, "sharp": { - "version": "0.31.3", - "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.31.3.tgz", - "integrity": "sha512-XcR4+FCLBFKw1bdB+GEhnUNXNXvnt0tDo4WsBsraKymuo/IAuPuCBVAL2wIkUw2r/dwFW5Q5+g66Kwl2dgDFVg==", + "version": "0.31.2", + "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.31.2.tgz", + "integrity": "sha512-DUdNVEXgS5A97cTagSLIIp8dUZ/lZtk78iNVZgHdHbx1qnQR7JAHY0BnXnwwH39Iw+VKhO08CTYhIg0p98vQ5Q==", "requires": { "color": "^4.2.3", "detect-libc": "^2.0.1", diff --git a/website/package.json b/website/package.json index c1d0c3d2..c66e10ca 100644 --- a/website/package.json +++ b/website/package.json @@ -49,7 +49,7 @@ "react": "18.2.0", "react-dom": "18.2.0", "react-icons": "^4.7.1", - "sharp": "^0.31.3", + "sharp": "0.31.2", "swr": "^2.0.0", "tailwindcss": "^3.2.4", "use-debounce": "^9.0.2" diff --git a/website/src/components/CollapsableText.tsx b/website/src/components/CollapsableText.tsx new file mode 100644 index 00000000..b0cfb3b9 --- /dev/null +++ b/website/src/components/CollapsableText.tsx @@ -0,0 +1,28 @@ +import { Button, useDisclosure } from "@chakra-ui/react"; +import { Modal, ModalOverlay, ModalContent, ModalHeader, ModalBody, ModalCloseButton } from "@chakra-ui/react"; +import React from "react"; + +export const CollapsableText = ({ text, maxLength = 220 }) => { + const { isOpen, onOpen, onClose } = useDisclosure(); + if (typeof text != "string" || text.length <= maxLength) { + return text; + } else { + return ( + <> + {text.substring(0, maxLength - 3)} + + + + + Full Text + + {text} + + + + + ); + } +}; diff --git a/website/src/components/Container.tsx b/website/src/components/Container.tsx index f65ed282..4149c0da 100644 --- a/website/src/components/Container.tsx +++ b/website/src/components/Container.tsx @@ -1,5 +1,5 @@ import clsx from "clsx"; export function Container({ className, ...props }) { - return
; + return
; } diff --git a/website/src/components/ContextMessages.tsx b/website/src/components/ContextMessages.tsx new file mode 100644 index 00000000..150dddfa --- /dev/null +++ b/website/src/components/ContextMessages.tsx @@ -0,0 +1,17 @@ +import { Box } from "@chakra-ui/react"; +import { Message } from "./Messages"; + +export const ContextMessages = ({ messages }: { messages: Message[] }) => { + return ( + + {messages.map((message, i) => { + return ( + + {message.is_assistant ? "Assistant: " : "User: "} + {message.text} + + ); + })} + + ); +}; diff --git a/website/src/components/Dashboard/LeaderboardTable.tsx b/website/src/components/Dashboard/LeaderboardTable.tsx new file mode 100644 index 00000000..b958d4b7 --- /dev/null +++ b/website/src/components/Dashboard/LeaderboardTable.tsx @@ -0,0 +1,94 @@ +import { Badge, Box, Image, Link, Stack, StackDivider, Text, useColorModeValue } from "@chakra-ui/react"; + +export function LeaderboardTable() { + const backgroundColor = useColorModeValue("white", "gray.700"); + const accentColor = useColorModeValue("gray.200", "gray.900"); + + //need to add streak info to chart + + const leaderInfo = [ + { + name: "fozziethebeat#6690", + image: "/images/temp-avatars/av1.jpg", + score: "5,208", + arrowDir: "increase", + streak: false, + streakCount: "5-Day Streak", + }, + { + name: "k_nearest_neighbor#8579", + image: "/images/temp-avatars/av2.jpg", + score: "5,164", + arrowDir: "decrease", + streak: false, + streakCount: "", + }, + { + name: "andreaskoepf#2266", + image: "/images/temp-avatars/av3.jpg", + score: "5,120", + arrowDir: "", + streak: false, + streakCount: "2-Day Streak", + }, + { + name: "AbdBarho#1684", + image: "/images/temp-avatars/av4.jpg", + score: "4,260", + arrowDir: "", + streak: false, + streakCount: "", + }, + { + name: "zu#9016", + image: "/images/temp-avatars/av5.jpg", + score: "3,608", + arrowDir: "", + streak: false, + streakCount: "", + }, + ]; + + return ( +
+
+
+ Top 5 Contributors + + + View All -> + + +
+ + } spacing="4"> +
+

Name

+
+

Score

+
+
+ {leaderInfo.map((item, itemIndex) => ( +
+
+ Profile Picture +

{item.name}

+ {item.streakCount} +
+ +

{item.score}

+ +
+ ))} + + +
+
+ ); +} diff --git a/website/src/components/Dashboard/SideMenu.tsx b/website/src/components/Dashboard/SideMenu.tsx new file mode 100644 index 00000000..30a45777 --- /dev/null +++ b/website/src/components/Dashboard/SideMenu.tsx @@ -0,0 +1,83 @@ +import { Box, Button, Link, Text, Tooltip, useColorMode } from "@chakra-ui/react"; +import { useRouter } from "next/router"; +import { FiLayout, FiSun } from "react-icons/fi"; +import { colors } from "styles/Theme/colors"; + +export function SideMenu() { + const router = useRouter(); + const { colorMode, toggleColorMode } = useColorMode(); + const buttonOptions = [ + { + label: "Dashboard", + pathname: "/dashboard", + desc: "Dashboard Home", + icon: FiLayout, + }, + // { + // label: "Leaderboard", + // pathname: "#", + // desc: "Public Leaderboard", + // icon: FiAward, + // }, + // { + // label: "Stats", + // pathname: "#", + // desc: "User Statistics", + // icon: FiBarChart2, + // }, + ]; + + return ( +
+ + +
+ + + +
+ +
+ ); +} diff --git a/website/src/components/Dashboard/TaskOption.tsx b/website/src/components/Dashboard/TaskOption.tsx new file mode 100644 index 00000000..6b17a079 --- /dev/null +++ b/website/src/components/Dashboard/TaskOption.tsx @@ -0,0 +1,120 @@ +import { Box, Flex, GridItem, Heading, SimpleGrid, Text, useColorModeValue } from "@chakra-ui/react"; +import Link from "next/link"; + +const crTasks = [ + { + label: "Reply as User", + desc: "Chat with Open Assistant and help improve it’s responses as you interact with it.", + type: "create", + pathname: "/create/assistant_reply", + }, + { + label: "Reply as Assistant", + desc: "Help Open Assistant improve its responses to conversations with other users.", + type: "create", + pathname: "/create/assistant_reply", + }, +]; + +const evTasks = [ + { + label: "Rank User Replies", + type: "eval", + desc: "Help Open Assistant improve its responses to conversations with other users.", + pathname: "/evaluate/rank_user_replies", + }, + + { + label: "Rank Assistant Replies", + desc: "Score prompts given by Open Assistant based on their accuracy and readability.", + type: "eval", + pathname: "/evaluate/rank_assistant_replies", + }, + { + label: "Rank Initial Prompts", + desc: "Score prompts given by Open Assistant based on their accuracy and readability.", + type: "eval;", + pathname: "/evaluate/rank_initial_prompts", + }, +]; + +export const TaskOption = () => { + const backgroundColor = useColorModeValue("white", "gray.700"); + + return ( + +
+ Create + + {crTasks.map((item, itemIndex) => ( + + + + + + {item.label} + + + {item.desc} + + + + + + Go + + + + + ))} + +
+
+ Evaluate + + {evTasks.map((item, itemIndex) => ( + + + + + + {item.label} + + + {item.desc} + + + + + + Go + + + + + ))} + +
+ + ); +}; diff --git a/website/src/components/Dashboard/index.ts b/website/src/components/Dashboard/index.ts new file mode 100644 index 00000000..0b4ff49a --- /dev/null +++ b/website/src/components/Dashboard/index.ts @@ -0,0 +1,3 @@ +export { LeaderboardTable } from "./LeaderboardTable"; +export { SideMenu } from "./SideMenu"; +export { TaskOption } from "./TaskOption"; diff --git a/website/src/components/Header/Header.tsx b/website/src/components/Header/Header.tsx index 8b8c4663..4ea453c6 100644 --- a/website/src/components/Header/Header.tsx +++ b/website/src/components/Header/Header.tsx @@ -1,43 +1,11 @@ -import { Box, Button, useColorMode } from "@chakra-ui/react"; -import { Popover } from "@headlessui/react"; -import { AnimatePresence, motion } from "framer-motion"; +import { Box, Button, Text, useColorMode } from "@chakra-ui/react"; import Image from "next/image"; import Link from "next/link"; import { useSession } from "next-auth/react"; import { FaUser } from "react-icons/fa"; -import { ColorModeIconToggle } from "../UI/ColorModeIconToggle"; import { UserMenu } from "./UserMenu"; -function MenuIcon(props) { - return ( - - ); -} - -function ChevronUpIcon(props) { - return ( - - ); -} - -function MobileNavLink({ children, ...props }) { - return ( - - {children} - - ); -} - function AccountButton() { const { data: session } = useSession(); if (session) { @@ -53,70 +21,29 @@ function AccountButton() { } export function Header(props) { + const { data: session } = useSession(); + const homeURL = session ? "/dashboard" : "/"; + const { colorMode } = useColorMode(); const borderClass = props.transparent ? "" : colorMode === "light" ? "border-b border-gray-400" : "border-b border-zinc-800"; - return ( diff --git a/website/src/components/Header/NavLinks.tsx b/website/src/components/Header/NavLinks.tsx index 4f559e7e..47bd90be 100644 --- a/website/src/components/Header/NavLinks.tsx +++ b/website/src/components/Header/NavLinks.tsx @@ -1,7 +1,8 @@ -import { useColorMode } from "@chakra-ui/react"; +import { Text, useColorMode } from "@chakra-ui/react"; import { AnimatePresence, motion } from "framer-motion"; import Link from "next/link"; import { useState } from "react"; +import { colors } from "styles/Theme/colors"; export function NavLinks(): JSX.Element { const [hoveredIndex, setHoveredIndex] = useState(null); @@ -14,8 +15,8 @@ export function NavLinks(): JSX.Element { return ( <> {[ - ["Join Us", "/#join-us"], ["FAQ", "/#faq"], + ["Join Us", "/#join-us"], ].map(([label, href], index) => ( )} - {label} + + {label} + ))} diff --git a/website/src/components/Header/UserMenu.tsx b/website/src/components/Header/UserMenu.tsx index 280a207b..2e06606c 100644 --- a/website/src/components/Header/UserMenu.tsx +++ b/website/src/components/Header/UserMenu.tsx @@ -1,25 +1,33 @@ -import { Box, useColorModeValue } from "@chakra-ui/react"; +import { Box, Link, Text, useColorModeValue } from "@chakra-ui/react"; import { Popover } from "@headlessui/react"; import { AnimatePresence, motion } from "framer-motion"; import Image from "next/image"; import { signOut, useSession } from "next-auth/react"; import React from "react"; -import { FaCog, FaSignOutAlt } from "react-icons/fa"; +import { FiLayout, FiLogOut, FiSettings } from "react-icons/fi"; export function UserMenu() { const { data: session } = useSession(); - const backgroundColor = useColorModeValue("#FFFFFF", "#000000"); + const backgroundColor = useColorModeValue("white", "gray.700"); + const accentColor = useColorModeValue("gray.300", "gray.600"); if (!session) { return <>; } if (session && session.user) { const accountOptions = [ + { + name: "Dashboard", + href: "/dashboard", + desc: "Dashboard", + icon: FiLayout, + //For future use + }, { name: "Account Settings", href: "/account", desc: "Account Settings", - icon: FaCog, + icon: FiSettings, //For future use }, ]; @@ -28,18 +36,22 @@ export function UserMenu() { {({ open }) => ( <> -
+ Profile Picture

{session.user.name || session.user.email}

-
+ {open && ( @@ -54,35 +66,45 @@ export function UserMenu() { y: -10, transition: { duration: 0.2 }, }} - className="absolute right-0 mt-3 w-screen bg-inherit max-w-xs p-4 rounded-md border border-slate-300/70" > - - {accountOptions.map((item) => ( - + + {accountOptions.map((item) => ( + +
+
+
+ {item.name} +
+ + ))} + signOut({ callbackUrl: "/" })} >
-
-

{item.name}

+ Sign Out
- - ))} - signOut({ callbackUrl: "/" })} - > -
- -
-
-

Sign Out

-
- + + diff --git a/website/src/components/Layout.tsx b/website/src/components/Layout.tsx index 5f6f66b4..3564d765 100644 --- a/website/src/components/Layout.tsx +++ b/website/src/components/Layout.tsx @@ -17,4 +17,12 @@ export const getDefaultLayout = (page: React.ReactElement) => (
); +export const getTransparentHeaderLayout = (page: React.ReactElement) => ( +
+
+ {page} +
+
+); + export const noLayout = (page: React.ReactElement) => page; diff --git a/website/src/components/Roadmap.tsx b/website/src/components/Roadmap.tsx new file mode 100644 index 00000000..283a4c8f --- /dev/null +++ b/website/src/components/Roadmap.tsx @@ -0,0 +1,78 @@ +import { Container } from "./Container"; + +const Roadmap = () => { + return ( + +
+

Our Roadmap

+
+
+
+

ASAP

+
+

Minimum Viable Prototype

+
    +
  • Data Collection Pipeline
    • +
  • RL on Human Feedback
    • +
  • Assistant v1 usable
    • +
  • Out January 2023!
    • +
+
+
+ +
+ +
+
+

+ Q1 +
+ 2023 +

+
+

Growing Up

+
    +
  • Retrieval Augmentation
    • +
  • Rapid Personalization
    • +
  • Using External Tools
    • +
+
+
+ +
+ +
+
+

+ Q2 +
+ 2023 +

+
+

Growing Up

+
    +
  • Third-Party Extentions
    • +
  • Device Control
    • +
  • Multi-Modality
    • +
+
+
+ +
+ +
+
+

...

+
+

Growing Up

+
    +
  • What do you need?
    • +
+
+
+
+ + ); +}; + +export default Roadmap; diff --git a/website/src/components/Services.tsx b/website/src/components/Services.tsx new file mode 100644 index 00000000..ae20a6d7 --- /dev/null +++ b/website/src/components/Services.tsx @@ -0,0 +1,50 @@ +import { Container } from "./Container"; + +const Services = () => { + return ( +
+ +
+
+
+

Your Conversational Assistant

+ +

State-of-the-Art chat assistant that can be personalized to your needs

+
+
+

Interface w/ external systems

+ +

+ Usage of APIs and third-party applications, described via language & demonstrations. +

+
+
+
+
+

Retrieval via Search Engines

+ +

External, upgradeable knowledge: No need for billions of parameters.

+
+
+

A building block for developers

+ +

Integrate OpenAssistant into your application.

+
+
+
+

OpenAssistant unifies all knowledge work in one place

+ +
    +
  • Uses modern deep learning
    • +
  • Runs on consumer hardware
    • +
  • Trains on human feedback
    • +
  • Free and open
    • +
+
+
+ +
+ ); +}; + +export default Services; diff --git a/website/src/components/Sortable/Sortable.tsx b/website/src/components/Sortable/Sortable.tsx index 2f63ff27..270c67e7 100644 --- a/website/src/components/Sortable/Sortable.tsx +++ b/website/src/components/Sortable/Sortable.tsx @@ -18,6 +18,7 @@ import { } from "@dnd-kit/sortable"; import { ReactNode, useEffect, useState } from "react"; +import { CollapsableText } from "../CollapsableText"; import { SortableItem } from "./SortableItem"; export interface SortableProps { @@ -64,7 +65,7 @@ export const Sortable = (props: SortableProps) => { {itemsWithIds.map(({ id, item }) => ( - {item} + ))} diff --git a/website/src/components/Survey/TaskControls.tsx b/website/src/components/Survey/TaskControls.tsx index 7847c452..a93889ea 100644 --- a/website/src/components/Survey/TaskControls.tsx +++ b/website/src/components/Survey/TaskControls.tsx @@ -30,9 +30,13 @@ export const TaskControls = (props: TaskControlsProps) => { Skip {endTask.task.type !== "task_done" ? ( - props.onSubmitResponse(props.tasks[0])}>Submit + props.onSubmitResponse(props.tasks[0])}> + Submit + ) : ( - Next Task + + Next Task + )} diff --git a/website/src/components/TaskSelection/TaskSelection.tsx b/website/src/components/TaskSelection/TaskSelection.tsx index f258a90b..683c80e9 100644 --- a/website/src/components/TaskSelection/TaskSelection.tsx +++ b/website/src/components/TaskSelection/TaskSelection.tsx @@ -26,6 +26,12 @@ export const TaskSelection = () => { title="Summarize stories" link="/create/summarize_story" /> */} + { + return ( +
+ +
+
+

Our Vision

+

+ We want OpenAssistant to be the single, unifying platform that all other systems use to interface with + humans. +

+
+
+ temp-image +
+
+ +
+ ); +}; + +export default Vision; diff --git a/website/src/middleware.ts b/website/src/middleware.ts index 8e48d3b7..b6a539b4 100644 --- a/website/src/middleware.ts +++ b/website/src/middleware.ts @@ -4,5 +4,5 @@ export { default } from "next-auth/middleware"; * Guards all pages under `/grading` and redirects them to the sign in page. */ export const config = { - matcher: ["/create/:path*", "/evaluate/:path*", "/account/:path*"], + matcher: ["/create/:path*", "/evaluate/:path*", "/account/:path*", "/dashboard"], }; diff --git a/website/src/pages/about.tsx b/website/src/pages/about.tsx new file mode 100644 index 00000000..fdce53f6 --- /dev/null +++ b/website/src/pages/about.tsx @@ -0,0 +1,39 @@ +import { Container } from "src/components/Container"; +import Services from "src/components/Services"; +import Vision from "src/components/Vision"; +import Roadmap from "src/components/Roadmap"; +import { CallToAction } from "src/components/CallToAction"; +import Image from "next/image"; + +const AboutPage = () => { + return ( +
+ +
+
+ temp-image +
+
+
+

What is OpenAssistant?

+

+ OpenAssistant is a chat-based assistant that understands tasks, can interact with third-party systems, + and retrieve information dynamically to do so. +

+
+

+ It can be extended and personalized easily and is developed as free, open-source software. +

+
+
+ + + + + + +
+ ); +}; + +export default AboutPage; diff --git a/website/src/pages/account/edit.tsx b/website/src/pages/account/edit.tsx index a14c27f8..f695fce7 100644 --- a/website/src/pages/account/edit.tsx +++ b/website/src/pages/account/edit.tsx @@ -7,6 +7,7 @@ import React, { useState } from "react"; export default function Account() { const { data: session } = useSession(); const [username, setUsername] = useState(""); + const updateUser = async (e: React.SyntheticEvent) => { e.preventDefault(); try { @@ -16,6 +17,7 @@ export default function Account() { headers: { "Content-Type": "application/json" }, body: JSON.stringify(body), }); + session.user.name = username; await Router.push("/account"); } catch (error) { console.error(error); @@ -49,7 +51,6 @@ export default function Account() { -

{session.user.email}

); diff --git a/website/src/pages/api/username.tsx b/website/src/pages/api/username.tsx index 0a88ad20..556edfa9 100644 --- a/website/src/pages/api/username.tsx +++ b/website/src/pages/api/username.tsx @@ -1,4 +1,5 @@ import { getSession } from "next-auth/react"; +import prisma from "../../lib/prismadb"; // POST /api/post // Required fields in body: title diff --git a/website/src/pages/auth/signin.tsx b/website/src/pages/auth/signin.tsx index 936a3dbf..59fc7c05 100644 --- a/website/src/pages/auth/signin.tsx +++ b/website/src/pages/auth/signin.tsx @@ -15,13 +15,13 @@ function Signin({ csrfToken, providers }) { const emailEl = useRef(null); const signinWithEmail = (ev: React.FormEvent) => { ev.preventDefault(); - signIn(email.id, { callbackUrl: "/", email: emailEl.current.value }); + signIn(email.id, { callbackUrl: "/dashboard", email: emailEl.current.value }); }; const debugUsernameEl = useRef(null); function signinWithDebugCredentials(ev: React.FormEvent) { ev.preventDefault(); - signIn(credentials.id, { callbackUrl: "/", username: debugUsernameEl.current.value }); + signIn(credentials.id, { callbackUrl: "/dashboard", username: debugUsernameEl.current.value }); } const { colorMode } = useColorMode(); @@ -52,8 +52,9 @@ function Signin({ csrfToken, providers }) { {email && (
- + )} -
+
+
By signing up you agree to our

Terms of Service diff --git a/website/src/pages/create/assistant_reply.tsx b/website/src/pages/create/assistant_reply.tsx index 9a9c062e..ceac45be 100644 --- a/website/src/pages/create/assistant_reply.tsx +++ b/website/src/pages/create/assistant_reply.tsx @@ -65,7 +65,7 @@ const AssistantReply = () => {

Given the following conversation, provide an adequate reply

-