refactor: move API handlers folder structure

argilla-server/.pre-commit-config.yaml

@@ -24,6 +24,7 @@ repos:
     hooks:
       - id: black
         additional_dependencies: ["typer==0.7.0"]
+        args: [--line-length=120]
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
     rev: v0.4.3

argilla-server/src/argilla_server/_app.py

@@ -29,7 +29,7 @@
 
 from argilla_server import helpers
 from argilla_server._version import __version__ as argilla_version
-from argilla_server.apis.routes import api_v1
+from argilla_server.api.routes import api_v1
 from argilla_server.constants import DEFAULT_API_KEY, DEFAULT_PASSWORD, DEFAULT_USERNAME
 from argilla_server.contexts import accounts
 from argilla_server.database import get_async_db
@@ -152,7 +152,6 @@ def wait_for_search_engine(app: FastAPI):
     pass
 
 
-
 def configure_app_security(app: FastAPI):
     auth.configure_app(app)
 

argilla-server/src/argilla_server/apis/v1/handlers/authentication.py → argilla-server/src/argilla_server/api/handlers/v1/authentication.py

@@ -17,10 +17,10 @@
 from fastapi import APIRouter, Depends, Form, status
 from sqlalchemy.ext.asyncio import AsyncSession
 
+from argilla_server.api.schemas.v1.oauth2 import Token
 from argilla_server.contexts import accounts
 from argilla_server.database import get_async_db
 from argilla_server.errors import UnauthorizedError
-from argilla_server.schemas.v1.oauth2 import Token
 
 router = APIRouter(tags=["Authentication"])
 

argilla-server/src/argilla_server/apis/v1/handlers/datasets/__init__.py → argilla-server/src/argilla_server/api/handlers/v1/datasets/__init__.py

@@ -14,10 +14,10 @@
 
 from fastapi import APIRouter
 
-from argilla_server.apis.v1.handlers.datasets.datasets import router as datasets_router
-from argilla_server.apis.v1.handlers.datasets.questions import router as questions_router
-from argilla_server.apis.v1.handlers.datasets.records import router as records_router
-from argilla_server.apis.v1.handlers.datasets.records_bulk import router as records_bulk_router
+from argilla_server.api.handlers.v1.datasets.datasets import router as datasets_router
+from argilla_server.api.handlers.v1.datasets.questions import router as questions_router
+from argilla_server.api.handlers.v1.datasets.records import router as records_router
+from argilla_server.api.handlers.v1.datasets.records_bulk import router as records_bulk_router
 
 router = APIRouter(tags=["datasets"])
 

argilla-server/src/argilla_server/apis/v1/handlers/datasets/datasets.py → argilla-server/src/argilla_server/api/handlers/v1/datasets/datasets.py

@@ -21,23 +21,27 @@
 
 from argilla_server import models
 from argilla_server.api.policies.v1 import DatasetPolicy, MetadataPropertyPolicy, authorize, is_authorized
-from argilla_server.contexts import accounts, datasets
-from argilla_server.database import get_async_db
-from argilla_server.enums import ResponseStatus
-from argilla_server.models import Dataset, User, Workspace
-from argilla_server.schemas.v1.datasets import (
+from argilla_server.api.schemas.v1.datasets import (
     Dataset as DatasetSchema,
 )
-from argilla_server.schemas.v1.datasets import (
+from argilla_server.api.schemas.v1.datasets import (
     DatasetCreate,
     DatasetMetrics,
     DatasetProgress,
     Datasets,
     DatasetUpdate,
 )
-from argilla_server.schemas.v1.fields import Field, FieldCreate, Fields
-from argilla_server.schemas.v1.metadata_properties import MetadataProperties, MetadataProperty, MetadataPropertyCreate
-from argilla_server.schemas.v1.vector_settings import VectorSettings, VectorSettingsCreate, VectorsSettings
+from argilla_server.api.schemas.v1.fields import Field, FieldCreate, Fields
+from argilla_server.api.schemas.v1.metadata_properties import (
+    MetadataProperties,
+    MetadataProperty,
+    MetadataPropertyCreate,
+)
+from argilla_server.api.schemas.v1.vector_settings import VectorSettings, VectorSettingsCreate, VectorsSettings
+from argilla_server.contexts import accounts, datasets
+from argilla_server.database import get_async_db
+from argilla_server.enums import ResponseStatus
+from argilla_server.models import Dataset, User, Workspace
 from argilla_server.search_engine import (
     SearchEngine,
     get_search_engine,

argilla-server/src/argilla_server/apis/v1/handlers/datasets/questions.py → argilla-server/src/argilla_server/api/handlers/v1/datasets/questions.py

@@ -20,10 +20,10 @@
 from starlette import status
 
 from argilla_server.api.policies.v1 import DatasetPolicy, authorize
+from argilla_server.api.schemas.v1.questions import Question, QuestionCreate, Questions
 from argilla_server.contexts import questions
 from argilla_server.database import get_async_db
 from argilla_server.models import Dataset, User
-from argilla_server.schemas.v1.questions import Question, QuestionCreate, Questions
 from argilla_server.security import auth
 
 router = APIRouter()

argilla-server/src/argilla_server/apis/v1/handlers/datasets/records.py → argilla-server/src/argilla_server/api/handlers/v1/datasets/records.py

@@ -23,14 +23,8 @@
 
 import argilla_server.search_engine as search_engine
 from argilla_server.api.policies.v1 import DatasetPolicy, RecordPolicy, authorize, is_authorized
-from argilla_server.contexts import datasets, search
-from argilla_server.database import get_async_db
-from argilla_server.enums import MetadataPropertyType, RecordSortField, ResponseStatusFilter, SortOrder
-from argilla_server.errors.future import MissingVectorError, NotFoundError, UnprocessableEntityError
-from argilla_server.errors.future.base_errors import MISSING_VECTOR_ERROR_CODE
-from argilla_server.models import Dataset, Field, MetadataProperty, Record, User, VectorSettings
-from argilla_server.schemas.v1.datasets import Dataset as DatasetSchema
-from argilla_server.schemas.v1.records import (
+from argilla_server.api.schemas.v1.datasets import Dataset as DatasetSchema
+from argilla_server.api.schemas.v1.records import (
     Filters,
     FilterScope,
     MetadataFilterScope,
@@ -48,14 +42,20 @@
     SearchRecordsResult,
     TermsFilter,
 )
-from argilla_server.schemas.v1.records import Record as RecordSchema
-from argilla_server.schemas.v1.responses import ResponseFilterScope
-from argilla_server.schemas.v1.suggestions import (
+from argilla_server.api.schemas.v1.records import Record as RecordSchema
+from argilla_server.api.schemas.v1.responses import ResponseFilterScope
+from argilla_server.api.schemas.v1.suggestions import (
     SearchSuggestionOptions,
     SearchSuggestionOptionsQuestion,
     SearchSuggestionsOptions,
     SuggestionFilterScope,
 )
+from argilla_server.contexts import datasets, search
+from argilla_server.database import get_async_db
+from argilla_server.enums import MetadataPropertyType, RecordSortField, ResponseStatusFilter, SortOrder
+from argilla_server.errors.future import MissingVectorError, NotFoundError, UnprocessableEntityError
+from argilla_server.errors.future.base_errors import MISSING_VECTOR_ERROR_CODE
+from argilla_server.models import Dataset, Field, MetadataProperty, Record, User, VectorSettings
 from argilla_server.search_engine import (
     AndFilter,
     FloatMetadataFilter,

argilla-server/src/argilla_server/apis/v1/handlers/datasets/records_bulk.py → argilla-server/src/argilla_server/api/handlers/v1/datasets/records_bulk.py

@@ -20,10 +20,10 @@
 from starlette import status
 
 from argilla_server.api.policies.v1 import DatasetPolicy, authorize
+from argilla_server.api.schemas.v1.records_bulk import RecordsBulk, RecordsBulkCreate, RecordsBulkUpsert
 from argilla_server.bulk.records_bulk import CreateRecordsBulk, UpsertRecordsBulk
 from argilla_server.database import get_async_db
 from argilla_server.models import Dataset, User
-from argilla_server.schemas.v1.records_bulk import RecordsBulk, RecordsBulkCreate, RecordsBulkUpsert
 from argilla_server.search_engine import SearchEngine, get_search_engine
 from argilla_server.security import auth
 from argilla_server.telemetry import TelemetryClient, get_telemetry_client

argilla-server/src/argilla_server/apis/v1/handlers/fields.py → argilla-server/src/argilla_server/api/handlers/v1/fields.py

@@ -19,11 +19,11 @@
 from sqlalchemy.orm import selectinload
 
 from argilla_server.api.policies.v1 import FieldPolicy, authorize
+from argilla_server.api.schemas.v1.fields import Field as FieldSchema
+from argilla_server.api.schemas.v1.fields import FieldUpdate
 from argilla_server.contexts import datasets
 from argilla_server.database import get_async_db
 from argilla_server.models import Field, User
-from argilla_server.schemas.v1.fields import Field as FieldSchema
-from argilla_server.schemas.v1.fields import FieldUpdate
 from argilla_server.security import auth
 
 router = APIRouter(tags=["fields"])

argilla-server/src/argilla_server/apis/v1/handlers/info.py → argilla-server/src/argilla_server/api/handlers/v1/info.py

@@ -14,8 +14,8 @@
 
 from fastapi import APIRouter, Depends
 
+from argilla_server.api.schemas.v1.info import Status, Version
 from argilla_server.contexts import info
-from argilla_server.schemas.v1.info import Status, Version
 from argilla_server.search_engine import SearchEngine, get_search_engine
 
 router = APIRouter(tags=["info"])

argilla-server/src/argilla_server/apis/v1/handlers/metadata_properties.py → argilla-server/src/argilla_server/api/handlers/v1/metadata_properties.py

@@ -19,16 +19,16 @@
 from sqlalchemy.orm import selectinload
 
 from argilla_server.api.policies.v1 import MetadataPropertyPolicy, authorize
-from argilla_server.contexts import datasets
-from argilla_server.database import get_async_db
-from argilla_server.models import MetadataProperty, User
-from argilla_server.schemas.v1.metadata_properties import (
+from argilla_server.api.schemas.v1.metadata_properties import (
     MetadataMetrics,
     MetadataPropertyUpdate,
 )
-from argilla_server.schemas.v1.metadata_properties import (
+from argilla_server.api.schemas.v1.metadata_properties import (
     MetadataProperty as MetadataPropertySchema,
 )
+from argilla_server.contexts import datasets
+from argilla_server.database import get_async_db
+from argilla_server.models import MetadataProperty, User
 from argilla_server.search_engine import SearchEngine, get_search_engine
 from argilla_server.security import auth
 

argilla-server/src/argilla_server/apis/v1/handlers/oauth2.py → argilla-server/src/argilla_server/api/handlers/v1/oauth2.py

@@ -17,12 +17,12 @@
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from argilla_server import telemetry
+from argilla_server.api.schemas.v1.oauth2 import Provider, Providers, Token
 from argilla_server.contexts import accounts
 from argilla_server.database import get_async_db
 from argilla_server.enums import UserRole
 from argilla_server.errors.future import AuthenticationError
 from argilla_server.models import User
-from argilla_server.schemas.v1.oauth2 import Provider, Providers, Token
 from argilla_server.security.authentication.jwt import JWT
 from argilla_server.security.authentication.oauth2 import OAuth2ClientProvider
 from argilla_server.security.authentication.userinfo import UserInfo

argilla-server/src/argilla_server/apis/v1/handlers/questions.py → argilla-server/src/argilla_server/api/handlers/v1/questions.py

@@ -19,11 +19,11 @@
 from sqlalchemy.orm import selectinload
 
 from argilla_server.api.policies.v1 import QuestionPolicy, authorize
+from argilla_server.api.schemas.v1.questions import Question as QuestionSchema
+from argilla_server.api.schemas.v1.questions import QuestionUpdate
 from argilla_server.contexts import questions
 from argilla_server.database import get_async_db
 from argilla_server.models import Question, User
-from argilla_server.schemas.v1.questions import Question as QuestionSchema
-from argilla_server.schemas.v1.questions import QuestionUpdate
 from argilla_server.security import auth
 
 router = APIRouter(tags=["questions"])

argilla-server/src/argilla_server/apis/v1/handlers/records.py → argilla-server/src/argilla_server/api/handlers/v1/records.py

@@ -21,15 +21,15 @@
 from sqlalchemy.orm import selectinload
 
 from argilla_server.api.policies.v1 import RecordPolicy, authorize
+from argilla_server.api.schemas.v1.records import Record as RecordSchema
+from argilla_server.api.schemas.v1.records import RecordUpdate
+from argilla_server.api.schemas.v1.responses import Response, ResponseCreate
+from argilla_server.api.schemas.v1.suggestions import Suggestion as SuggestionSchema
+from argilla_server.api.schemas.v1.suggestions import SuggestionCreate, Suggestions
 from argilla_server.contexts import datasets, questions
 from argilla_server.database import get_async_db
 from argilla_server.errors.future.base_errors import NotFoundError, UnprocessableEntityError
 from argilla_server.models import Dataset, Question, Record, Suggestion, User
-from argilla_server.schemas.v1.records import Record as RecordSchema
-from argilla_server.schemas.v1.records import RecordUpdate
-from argilla_server.schemas.v1.responses import Response, ResponseCreate
-from argilla_server.schemas.v1.suggestions import Suggestion as SuggestionSchema
-from argilla_server.schemas.v1.suggestions import SuggestionCreate, Suggestions
 from argilla_server.search_engine import SearchEngine, get_search_engine
 from argilla_server.security import auth
 from argilla_server.utils import parse_uuids

argilla-server/src/argilla_server/apis/v1/handlers/responses.py → argilla-server/src/argilla_server/api/handlers/v1/responses.py

@@ -19,17 +19,17 @@
 from sqlalchemy.orm import selectinload
 
 from argilla_server.api.policies.v1 import ResponsePolicy, authorize
-from argilla_server.contexts import datasets
-from argilla_server.database import get_async_db
-from argilla_server.models import Dataset, Record, Response, User
-from argilla_server.schemas.v1.responses import (
+from argilla_server.api.schemas.v1.responses import (
     Response as ResponseSchema,
 )
-from argilla_server.schemas.v1.responses import (
+from argilla_server.api.schemas.v1.responses import (
     ResponsesBulk,
     ResponsesBulkCreate,
     ResponseUpdate,
 )
+from argilla_server.contexts import datasets
+from argilla_server.database import get_async_db
+from argilla_server.models import Dataset, Record, Response, User
 from argilla_server.search_engine import SearchEngine, get_search_engine
 from argilla_server.security import auth
 from argilla_server.use_cases.responses.upsert_responses_in_bulk import (

argilla-server/src/argilla_server/apis/v1/handlers/settings.py → argilla-server/src/argilla_server/api/handlers/v1/settings.py

@@ -14,8 +14,8 @@
 
 from fastapi import APIRouter
 
+from argilla_server.api.schemas.v1.settings import Settings
 from argilla_server.contexts import settings
-from argilla_server.schemas.v1.settings import Settings
 
 router = APIRouter(tags=["settings"])
 

argilla-server/src/argilla_server/apis/v1/handlers/suggestions.py → argilla-server/src/argilla_server/api/handlers/v1/suggestions.py

@@ -19,10 +19,10 @@
 from sqlalchemy.orm import selectinload
 
 from argilla_server.api.policies.v1 import SuggestionPolicy, authorize
+from argilla_server.api.schemas.v1.suggestions import Suggestion as SuggestionSchema
 from argilla_server.contexts import datasets
 from argilla_server.database import get_async_db
 from argilla_server.models import Record, Suggestion, User
-from argilla_server.schemas.v1.suggestions import Suggestion as SuggestionSchema
 from argilla_server.search_engine import SearchEngine, get_search_engine
 from argilla_server.security import auth
 

argilla-server/src/argilla_server/apis/v1/handlers/users.py → argilla-server/src/argilla_server/api/handlers/v1/users.py

@@ -20,13 +20,13 @@
 
 from argilla_server import telemetry
 from argilla_server.api.policies.v1 import UserPolicy, authorize
+from argilla_server.api.schemas.v1.users import User as UserSchema
+from argilla_server.api.schemas.v1.users import UserCreate, Users
+from argilla_server.api.schemas.v1.workspaces import Workspaces
 from argilla_server.contexts import accounts
 from argilla_server.database import get_async_db
 from argilla_server.errors.future import NotUniqueError
 from argilla_server.models import User
-from argilla_server.schemas.v1.users import User as UserSchema
-from argilla_server.schemas.v1.users import UserCreate, Users
-from argilla_server.schemas.v1.workspaces import Workspaces
 from argilla_server.security import auth
 
 router = APIRouter(tags=["users"])

argilla-server/src/argilla_server/apis/v1/handlers/vectors_settings.py → argilla-server/src/argilla_server/api/handlers/v1/vectors_settings.py

@@ -19,11 +19,11 @@
 from sqlalchemy.orm import selectinload
 
 from argilla_server.api.policies.v1 import VectorSettingsPolicy, authorize
+from argilla_server.api.schemas.v1.vector_settings import VectorSettings as VectorSettingsSchema
+from argilla_server.api.schemas.v1.vector_settings import VectorSettingsUpdate
 from argilla_server.contexts import datasets
 from argilla_server.database import get_async_db
 from argilla_server.models import User, VectorSettings
-from argilla_server.schemas.v1.vector_settings import VectorSettings as VectorSettingsSchema
-from argilla_server.schemas.v1.vector_settings import VectorSettingsUpdate
 from argilla_server.security import auth
 
 router = APIRouter(tags=["vectors-settings"])

argilla-server/src/argilla_server/apis/v1/handlers/workspaces.py → argilla-server/src/argilla_server/api/handlers/v1/workspaces.py

@@ -18,20 +18,20 @@
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from argilla_server.api.policies.v1 import WorkspacePolicy, WorkspaceUserPolicy, authorize
-from argilla_server.contexts import accounts, datasets
-from argilla_server.database import get_async_db
-from argilla_server.errors.future import NotFoundError, UnprocessableEntityError
-from argilla_server.models import User, Workspace, WorkspaceUser
-from argilla_server.schemas.v1.users import User as UserSchema
-from argilla_server.schemas.v1.users import Users
-from argilla_server.schemas.v1.workspaces import (
+from argilla_server.api.schemas.v1.users import User as UserSchema
+from argilla_server.api.schemas.v1.users import Users
+from argilla_server.api.schemas.v1.workspaces import (
     Workspace as WorkspaceSchema,
 )
-from argilla_server.schemas.v1.workspaces import (
+from argilla_server.api.schemas.v1.workspaces import (
     WorkspaceCreate,
     Workspaces,
     WorkspaceUserCreate,
 )
+from argilla_server.contexts import accounts, datasets
+from argilla_server.database import get_async_db
+from argilla_server.errors.future import NotFoundError, UnprocessableEntityError
+from argilla_server.models import User, Workspace, WorkspaceUser
 from argilla_server.security import auth
 
 router = APIRouter(tags=["workspaces"])