Merge branch 'refactor/api-folder-structure-improvements' into bug/ch…

…eck-search-engine-connection-on-startup
argilla-io · Jun 7, 2024 · 4a85682 · 4a85682
2 parents 82305d0 + 12a6816
commit 4a85682
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 19 deletions.
diff --git a/argilla-server/src/argilla_server/_app.py b/argilla-server/src/argilla_server/_app.py
@@ -160,7 +160,6 @@ async def _ping_search_engine():
                     "you have the necessary access permissions. Once you have verified this, restart the argilla server.\n"
                 )
 
-
 def configure_app_security(app: FastAPI):
     auth.configure_app(app)
 

diff --git a/argilla-server/src/argilla_server/api/schemas/v1/fields.py b/argilla-server/src/argilla_server/api/schemas/v1/fields.py
@@ -16,8 +16,6 @@
 from typing import Annotated, List, Literal, Optional
 from uuid import UUID
 
-from typing_extensions import Annotated
-
 from argilla_server.api.schemas.v1.commons import UpdateSchema
 from argilla_server.enums import FieldType
 from argilla_server.pydantic_v1 import BaseModel, constr

diff --git a/argilla-server/src/argilla_server/api/schemas/v1/metadata_properties.py b/argilla-server/src/argilla_server/api/schemas/v1/metadata_properties.py
@@ -16,8 +16,6 @@
 from typing import Annotated, Any, Dict, Generic, List, Literal, Optional, TypeVar, Union
 from uuid import UUID
 
-from typing_extensions import Annotated
-
 from argilla_server.api.schemas.v1.commons import UpdateSchema
 from argilla_server.enums import MetadataPropertyType
 from argilla_server.pydantic_v1 import BaseModel, Field, constr, root_validator, validator

diff --git a/argilla-server/src/argilla_server/api/schemas/v1/records.py b/argilla-server/src/argilla_server/api/schemas/v1/records.py
@@ -13,11 +13,11 @@
 #  limitations under the License.
 
 from datetime import datetime
-from typing import Any, Dict, List, Literal, Optional, Union
+
+from typing import Annotated, Any, Dict, List, Literal, Optional, Union
 from uuid import UUID
 
 import fastapi
-from typing_extensions import Annotated
 
 from argilla_server.api.schemas.v1.commons import UpdateSchema
 from argilla_server.api.schemas.v1.metadata_properties import MetadataPropertyName

diff --git a/argilla-server/src/argilla_server/api/schemas/v1/responses.py b/argilla-server/src/argilla_server/api/schemas/v1/responses.py
@@ -17,17 +17,11 @@
 from uuid import UUID
 
 from fastapi import Body
-from typing_extensions import Annotated
 
 from argilla_server.api.schemas.v1.questions import QuestionName
 from argilla_server.enums import ResponseStatus
 from argilla_server.pydantic_v1 import BaseModel, Field, StrictInt, StrictStr, root_validator
 
-try:
-    from typing import Annotated
-except ImportError:
-    from typing_extensions import Annotated
-
 RESPONSES_BULK_CREATE_MIN_ITEMS = 1
 RESPONSES_BULK_CREATE_MAX_ITEMS = 100
 

diff --git a/argilla-server/src/argilla_server/api/schemas/v1/vector_settings.py b/argilla-server/src/argilla_server/api/schemas/v1/vector_settings.py
@@ -16,8 +16,6 @@
 from typing import Annotated, List, Optional
 from uuid import UUID
 
-from typing_extensions import Annotated
-
 from argilla_server.api.schemas.v1.commons import UpdateSchema
 from argilla_server.errors.future import UnprocessableEntityError
 from argilla_server.pydantic_v1 import BaseModel, Field, PositiveInt, constr

diff --git a/argilla-server/tests/unit/api/handlers/v1/test_datasets.py b/argilla-server/tests/unit/api/handlers/v1/test_datasets.py
@@ -20,10 +20,7 @@
 
 import pytest
 from argilla_server.api.handlers.v1.datasets.records import LIST_DATASET_RECORDS_LIMIT_DEFAULT
-from argilla_server.api.schemas.v1.datasets import (
-    DATASET_GUIDELINES_MAX_LENGTH,
-    DATASET_NAME_MAX_LENGTH,
-)
+from argilla_server.api.schemas.v1.datasets import DATASET_GUIDELINES_MAX_LENGTH, DATASET_NAME_MAX_LENGTH
 from argilla_server.api.schemas.v1.fields import FIELD_CREATE_NAME_MAX_LENGTH, FIELD_CREATE_TITLE_MAX_LENGTH
 from argilla_server.api.schemas.v1.metadata_properties import (
     METADATA_PROPERTY_CREATE_NAME_MAX_LENGTH,