Merge branch 'main' into main

Author: MohamedAliRashad

README.md

@@ -33,16 +33,20 @@ We can then take the resulting model and continue with completion sampling step
 
 We are not going to stop at replicating ChatGPT. We want to build the assistant of the future, able to not only write email and cover letters, but do meaningful work, use APIs, dynamically research information, and much more, with the ability to be personalized and extended by anyone. And we want to do this in a way that is open and accessible, which means we must not only build a great assistant, but also make it small and efficient enough to run on consumer hardware.
 
+### Slide Decks
+
+[Important Data Structures](https://docs.google.com/presentation/d/1iaX_nxasVWlvPiSNs0cllR9L_1neZq0RJxd6MFEalUY/edit?usp=sharing)
+
 ## How can you help?
 
 All open source projects begins with people like you. Open source is the belief that if we collaborate we can together gift our knowledge and technology to the world for the benefit of humanity.
 
 ## I’m in! Now what?
 
-[Fill out the contributor signup form](https://docs.google.com/forms/d/e/1FAIpQLSeuggO7UdYkBvGLEJldDvxp6DwaRbW5p7dl96UzFkZgziRTrQ/viewform)
-
 [Join the LAION Discord Server!](https://discord.com/invite/mVcgxMPD7e)
 
+[and / or the YK Discord Server](https://ykilcher.com/discord)
+
 [Visit the Notion](https://ykilcher.com/open-assistant)
 
 ### Taking on Tasks

backend/alembic/versions/2022_12_28_1142-d24b37426857_post_ref_for_work_package.py

@@ -0,0 +1,50 @@
+# -*- coding: utf-8 -*-
+"""post ref for work_package
+
+Revision ID: d24b37426857
+Revises: 3358eb6834e6
+Create Date: 2022-12-28 11:42:26.773704
+
+"""
+import sqlalchemy as sa
+import sqlmodel
+from alembic import op
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision = "d24b37426857"
+down_revision = "3358eb6834e6"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column("post", sa.Column("depth", sa.Integer(), server_default=sa.text("0"), nullable=False))
+    op.add_column("post", sa.Column("children_count", sa.Integer(), server_default=sa.text("0"), nullable=False))
+    op.add_column("post_reaction", sa.Column("work_package_id", postgresql.UUID(as_uuid=True), nullable=False))
+    op.drop_constraint("post_reaction_post_id_fkey", "post_reaction", type_="foreignkey")
+    op.create_foreign_key(None, "post_reaction", "work_package", ["work_package_id"], ["id"])
+    op.drop_column("post_reaction", "post_id")
+    op.add_column("work_package", sa.Column("done", sa.Boolean(), server_default=sa.text("false"), nullable=False))
+    op.add_column("work_package", sa.Column("ack", sa.Boolean(), nullable=True))
+    op.add_column("work_package", sa.Column("frontend_ref_post_id", sqlmodel.sql.sqltypes.AutoString(), nullable=True))
+    op.add_column("work_package", sa.Column("thread_id", sqlmodel.sql.sqltypes.GUID(), nullable=True))
+    op.add_column("work_package", sa.Column("parent_post_id", sqlmodel.sql.sqltypes.GUID(), nullable=True))
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column("work_package", "parent_post_id")
+    op.drop_column("work_package", "thread_id")
+    op.drop_column("work_package", "frontend_ref_post_id")
+    op.drop_column("work_package", "ack")
+    op.drop_column("work_package", "done")
+    op.add_column("post_reaction", sa.Column("post_id", postgresql.UUID(), autoincrement=False, nullable=False))
+    op.drop_constraint(None, "post_reaction", type_="foreignkey")
+    op.create_foreign_key("post_reaction_post_id_fkey", "post_reaction", "post", ["post_id"], ["id"])
+    op.drop_column("post_reaction", "work_package_id")
+    op.drop_column("post", "children_count")
+    op.drop_column("post", "depth")
+    # ### end Alembic commands ###

backend/main.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from http import HTTPStatus
 from pathlib import Path
 
 import alembic.command
@@ -7,10 +8,29 @@
 from loguru import logger
 from oasst_backend.api.v1.api import api_router
 from oasst_backend.config import settings
+from oasst_backend.exceptions import OasstError, OasstErrorCode
 from starlette.middleware.cors import CORSMiddleware
 
 app = fastapi.FastAPI(title=settings.PROJECT_NAME, openapi_url=f"{settings.API_V1_STR}/openapi.json")
 
+
+@app.exception_handler(OasstError)
+async def oasst_exception_handler(request: fastapi.Request, ex: OasstError):
+    logger.error(f"{request.method} {request.url} failed: {repr(ex)}")
+    return fastapi.responses.JSONResponse(
+        status_code=int(ex.http_status_code), content={"message": ex.message, "error_code": ex.error_code}
+    )
+
+
+@app.exception_handler(Exception)
+async def unhandled_exception_handler(request: fastapi.Request, ex: Exception):
+    logger.exception(f"{request.method} {request.url} failed [UNHANDLED]: {repr(ex)}")
+    status = HTTPStatus.INTERNAL_SERVER_ERROR
+    return fastapi.responses.JSONResponse(
+        status_code=status.value, content={"message": status.name, "error_code": OasstErrorCode.GENERIC_ERROR}
+    )
+
+
 # Set all CORS enabled origins
 if settings.BACKEND_CORS_ORIGINS:
     app.add_middleware(

backend/oasst_backend/api/deps.py

@@ -1,16 +1,17 @@
 # -*- coding: utf-8 -*-
+from http import HTTPStatus
 from secrets import token_hex
 from typing import Generator
 from uuid import UUID
 
-from fastapi import HTTPException, Security
+from fastapi import Security
 from fastapi.security.api_key import APIKey, APIKeyHeader, APIKeyQuery
 from loguru import logger
 from oasst_backend.config import settings
 from oasst_backend.database import engine
+from oasst_backend.exceptions import OasstError, OasstErrorCode
 from oasst_backend.models import ApiClient
 from sqlmodel import Session
-from starlette.status import HTTP_403_FORBIDDEN
 
 
 def get_db() -> Generator:
@@ -36,22 +37,26 @@ def api_auth(
     api_key: APIKey,
     db: Session,
 ) -> ApiClient:
-
-    if api_key is None and not settings.DEBUG_SKIP_API_KEY_CHECK:
-        raise HTTPException(status_code=HTTP_403_FORBIDDEN, detail="Could not validate credentials")
-
-    if settings.DEBUG_SKIP_API_KEY_CHECK or settings.DEBUG_ALLOW_ANY_API_KEY:
-        # make sure that a dummy api key exits in db (foreign key references)
-        ANY_API_KEY_ID = UUID("00000000-1111-2222-3333-444444444444")
-        api_client: ApiClient = db.query(ApiClient).filter(ApiClient.id == ANY_API_KEY_ID).first()
-        if api_client is None:
-            token = token_hex(32)
-            logger.info(f"ANY_API_KEY missing, inserting api_key: {token}")
-            api_client = ApiClient(id=ANY_API_KEY_ID, api_key=token, description="ANY_API_KEY, random token")
-            db.add(api_client)
-            db.commit()
-        return api_client
-
-    api_client = db.query(ApiClient).filter(ApiClient.api_key == api_key).first()
-    if api_client is not None and api_client.enabled:
-        return api_client
+    if api_key or settings.DEBUG_SKIP_API_KEY_CHECK:
+
+        if settings.DEBUG_SKIP_API_KEY_CHECK or settings.DEBUG_ALLOW_ANY_API_KEY:
+            # make sure that a dummy api key exits in db (foreign key references)
+            ANY_API_KEY_ID = UUID("00000000-1111-2222-3333-444444444444")
+            api_client: ApiClient = db.query(ApiClient).filter(ApiClient.id == ANY_API_KEY_ID).first()
+            if api_client is None:
+                token = token_hex(32)
+                logger.info(f"ANY_API_KEY missing, inserting api_key: {token}")
+                api_client = ApiClient(id=ANY_API_KEY_ID, api_key=token, description="ANY_API_KEY, random token")
+                db.add(api_client)
+                db.commit()
+            return api_client
+
+        api_client = db.query(ApiClient).filter(ApiClient.api_key == api_key).first()
+        if api_client is not None and api_client.enabled:
+            return api_client
+
+    raise OasstError(
+        "Could not validate credentials",
+        error_code=OasstErrorCode.API_CLIENT_NOT_AUTHORIZED,
+        http_status_code=HTTPStatus.FORBIDDEN,
+    )