Merge branch 'feat/move-api-v0-functionality-to-v1' into feat/migrate…

…-delete-user-to-api-v1

src/argilla_server/apis/v0/handlers/users.py

@@ -23,7 +23,7 @@
 from argilla_server.contexts import accounts
 from argilla_server.database import get_async_db
 from argilla_server.errors import EntityAlreadyExistsError, EntityNotFoundError
-from argilla_server.errors.future.base_errors import NotUniqueError
+from argilla_server.errors.future import NotUniqueError
 from argilla_server.policies import UserPolicy, authorize
 from argilla_server.pydantic_v1 import parse_obj_as
 from argilla_server.schemas.v0.users import User, UserCreate
@@ -95,7 +95,7 @@ async def create_user(
         user = await accounts.create_user(db, user_create.dict(), user_create.workspaces)
 
         telemetry.track_user_created(user)
-    except NotUniqueError as e:
+    except NotUniqueError:
         raise EntityAlreadyExistsError(name=user_create.username, type=User)
     except Exception as e:
         raise HTTPException(status_code=status.HTTP_422_UNPROCESSABLE_ENTITY, detail=str(e))

src/argilla_server/apis/v1/handlers/users.py

@@ -21,7 +21,7 @@
 from argilla_server import models, telemetry
 from argilla_server.contexts import accounts
 from argilla_server.database import get_async_db
-from argilla_server.errors.future.base_errors import NotUniqueError
+from argilla_server.errors.future import NotUniqueError
 from argilla_server.policies import UserPolicyV1, authorize
 from argilla_server.schemas.v1.users import User, UserCreate, Users
 from argilla_server.schemas.v1.workspaces import Workspaces

src/argilla_server/contexts/accounts.py

@@ -21,7 +21,7 @@
 from sqlalchemy.orm import Session, selectinload
 
 from argilla_server.enums import UserRole
-from argilla_server.errors.future.base_errors import NotUniqueError
+from argilla_server.errors.future import NotUniqueError
 from argilla_server.models import User, Workspace, WorkspaceUser
 from argilla_server.schemas.v0.users import UserCreate
 from argilla_server.schemas.v0.workspaces import WorkspaceCreate, WorkspaceUserCreate

src/argilla_server/errors/future/base_errors.py

@@ -12,7 +12,7 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-__all__ = ["NotFoundError", "AuthenticationError"]
+__all__ = ["NotFoundError", "NotUniqueError", "AuthenticationError"]
 
 
 class NotFoundError(Exception):