refactor: move OasstError into oasst_shared.exceptions (#289)

* refactor: move OasstError into oasst_shared.exceptions

* fix: update OasstError import

* fix: linter errors

backend/main.py

@@ -14,8 +14,8 @@ from oasst_backend.api.deps import get_dummy_api_client
 from oasst_backend.api.v1.api import api_router
 from oasst_backend.config import settings
 from oasst_backend.database import engine
-from oasst_backend.exceptions import OasstError, OasstErrorCode
 from oasst_backend.prompt_repository import PromptRepository
+from oasst_shared.exceptions import OasstError, OasstErrorCode
 from oasst_shared.schemas import protocol as protocol_schema
 from sqlmodel import Session
 from starlette.middleware.cors import CORSMiddleware

backend/oasst_backend/api/deps.py

@@ -9,8 +9,8 @@ from fastapi_limiter.depends import RateLimiter
 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 oasst_shared.exceptions import OasstError, OasstErrorCode
 from sqlmodel import Session
 
 

backend/oasst_backend/api/v1/frontend_messages.py

@@ -1,10 +1,10 @@
 from fastapi import APIRouter, Depends
 from oasst_backend.api import deps
 from oasst_backend.api.v1 import utils
-from oasst_backend.exceptions import OasstError, OasstErrorCode
 from oasst_backend.models import ApiClient
 from oasst_backend.models.db_payload import MessagePayload
 from oasst_backend.prompt_repository import PromptRepository
+from oasst_shared.exceptions import OasstError, OasstErrorCode
 from sqlmodel import Session
 
 router = APIRouter()

backend/oasst_backend/api/v1/messages.py

@@ -4,10 +4,10 @@ from uuid import UUID
 from fastapi import APIRouter, Depends, Query, Response
 from oasst_backend.api import deps
 from oasst_backend.api.v1 import utils
-from oasst_backend.exceptions import OasstError, OasstErrorCode
 from oasst_backend.models import ApiClient
 from oasst_backend.models.db_payload import MessagePayload
 from oasst_backend.prompt_repository import PromptRepository
+from oasst_shared.exceptions import OasstError, OasstErrorCode
 from sqlmodel import Session
 from starlette.status import HTTP_200_OK
 

backend/oasst_backend/api/v1/tasks.py

@@ -6,8 +6,8 @@ from fastapi import APIRouter, Depends
 from fastapi.security.api_key import APIKey
 from loguru import logger
 from oasst_backend.api import deps
-from oasst_backend.exceptions import OasstError, OasstErrorCode
 from oasst_backend.prompt_repository import PromptRepository
+from oasst_shared.exceptions import OasstError, OasstErrorCode
 from oasst_shared.schemas import protocol as protocol_schema
 from sqlmodel import Session
 

backend/oasst_backend/api/v1/utils.py

@@ -1,9 +1,9 @@
 from http import HTTPStatus
 from uuid import UUID
 
-from oasst_backend.exceptions import OasstError, OasstErrorCode
 from oasst_backend.models import Message
 from oasst_backend.models.db_payload import MessagePayload
+from oasst_shared.exceptions import OasstError, OasstErrorCode
 from oasst_shared.schemas import protocol
 
 

backend/oasst_backend/database.py

@@ -1,5 +1,5 @@
 from oasst_backend.config import settings
-from oasst_backend.exceptions import OasstError, OasstErrorCode
+from oasst_shared.exceptions import OasstError, OasstErrorCode
 from sqlmodel import create_engine
 
 if settings.DATABASE_URI is None:

backend/oasst_backend/prompt_repository.py

@@ -7,10 +7,10 @@ from uuid import UUID, uuid4
 
 import oasst_backend.models.db_payload as db_payload
 from loguru import logger
-from oasst_backend.exceptions import OasstError, OasstErrorCode
 from oasst_backend.journal_writer import JournalWriter
 from oasst_backend.models import ApiClient, Message, MessageReaction, Task, TextLabels, User
 from oasst_backend.models.payload_column_type import PayloadContainer
+from oasst_shared.exceptions import OasstError, OasstErrorCode
 from oasst_shared.schemas import protocol as protocol_schema
 from oasst_shared.schemas.protocol import SystemStats
 from sqlalchemy import update

oasst-shared/oasst_shared/exceptions/__init__.py

@@ -0,0 +1,3 @@
+# Ignore unused imports; these are re-exported
+from .oasst_api_error import OasstError as OasstError  # noqa: F401
+from .oasst_api_error import OasstErrorCode as OasstErrorCode  # noqa: F401