Skip to content

Commit

Permalink
feat: rename to _import_pydantic
Browse files Browse the repository at this point in the history
  • Loading branch information
gabrielmbmb committed Dec 21, 2023
1 parent ac02f83 commit d961c61
Show file tree
Hide file tree
Showing 104 changed files with 118 additions and 117 deletions.
2 changes: 1 addition & 1 deletion src/argilla/cli/server/database/users/create.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
UserCreate,
WorkspaceCreate,
)
from argilla.utils.pydantic import constr
from argilla.utils._import_pydantic import constr

USER_API_KEY_MIN_LENGTH = 8

Expand Down
2 changes: 1 addition & 1 deletion src/argilla/cli/server/database/users/migrate.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
from argilla.server.models import User, UserRole
from argilla.server.security.auth_provider.local.settings import settings
from argilla.server.security.model import USER_USERNAME_REGEX, WORKSPACE_NAME_REGEX
from argilla.utils.pydantic import BaseModel, constr
from argilla.utils._import_pydantic import BaseModel, constr

if TYPE_CHECKING:
from sqlalchemy.ext.asyncio import AsyncSession
Expand Down
2 changes: 1 addition & 1 deletion src/argilla/client/apis/datasets.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
)
from argilla.client.sdk.datasets.api import get_dataset
from argilla.client.sdk.datasets.models import TaskType
from argilla.utils.pydantic import BaseModel, Field
from argilla.utils._import_pydantic import BaseModel, Field


@dataclass
Expand Down
2 changes: 1 addition & 1 deletion src/argilla/client/apis/status.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
from argilla.client.apis import AbstractApi
from argilla.client.sdk.client import AuthenticatedClient
from argilla.client.sdk.commons.errors import ApiCompatibilityError
from argilla.utils.pydantic import BaseModel
from argilla.utils._import_pydantic import BaseModel


class ApiInfo(BaseModel):
Expand Down
2 changes: 1 addition & 1 deletion src/argilla/client/feedback/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

import json

from argilla.utils.pydantic import BaseModel, Field
from argilla.utils._import_pydantic import BaseModel, Field

try:
from yaml import SafeLoader, load, safe_dump
Expand Down
2 changes: 1 addition & 1 deletion src/argilla/client/feedback/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from typing import List, Union

from argilla.client.feedback.schemas.enums import FieldTypes, MetadataPropertyTypes
from argilla.utils.pydantic import StrictFloat, StrictInt, StrictStr
from argilla.utils._import_pydantic import StrictFloat, StrictInt, StrictStr

FETCHING_BATCH_SIZE = 250
PUSHING_BATCH_SIZE = 32
Expand Down
2 changes: 1 addition & 1 deletion src/argilla/client/feedback/dataset/helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
from argilla.client.sdk.v1.datasets.models import FeedbackDatasetModel
from argilla.client.singleton import active_client
from argilla.client.workspaces import Workspace
from argilla.utils.pydantic import BaseModel, Extra, ValidationError, create_model
from argilla.utils._import_pydantic import BaseModel, Extra, ValidationError, create_model

if typing.TYPE_CHECKING:
from argilla.client.feedback.schemas.types import (
Expand Down
2 changes: 1 addition & 1 deletion src/argilla/client/feedback/schemas/fields.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

from argilla.client.feedback.schemas.enums import FieldTypes
from argilla.client.feedback.schemas.validators import title_must_have_value
from argilla.utils.pydantic import BaseModel, Extra, Field, validator
from argilla.utils._import_pydantic import BaseModel, Extra, Field, validator


class FieldSchema(BaseModel, ABC):
Expand Down
2 changes: 1 addition & 1 deletion src/argilla/client/feedback/schemas/metadata.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
validate_numeric_metadata_filter_bounds,
validate_numeric_metadata_property_bounds,
)
from argilla.utils.pydantic import (
from argilla.utils._import_pydantic import (
BaseModel,
Extra,
Field,
Expand Down
2 changes: 1 addition & 1 deletion src/argilla/client/feedback/schemas/questions.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
from argilla.client.feedback.schemas.enums import QuestionTypes
from argilla.client.feedback.schemas.utils import LabelMappingMixin
from argilla.client.feedback.schemas.validators import title_must_have_value
from argilla.utils.pydantic import BaseModel, Extra, Field, conint, conlist, root_validator, validator
from argilla.utils._import_pydantic import BaseModel, Extra, Field, conint, conlist, root_validator, validator


class QuestionSchema(BaseModel, ABC):
Expand Down
2 changes: 1 addition & 1 deletion src/argilla/client/feedback/schemas/records.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
from uuid import UUID

from argilla.client.feedback.schemas.enums import RecordSortField, ResponseStatus, SortOrder
from argilla.utils.pydantic import BaseModel, Extra, Field, PrivateAttr, StrictInt, StrictStr, conint, validator
from argilla.utils._import_pydantic import BaseModel, Extra, Field, PrivateAttr, StrictInt, StrictStr, conint, validator

if TYPE_CHECKING:
from argilla.client.feedback.unification import UnifiedValueSchema
Expand Down
2 changes: 1 addition & 1 deletion src/argilla/client/feedback/schemas/remote/records.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
from argilla.client.sdk.v1.records import api as records_api_v1
from argilla.client.sdk.v1.suggestions import api as suggestions_api_v1
from argilla.client.utils import allowed_for_roles
from argilla.utils.pydantic import Field
from argilla.utils._import_pydantic import Field

if TYPE_CHECKING:
import httpx
Expand Down
2 changes: 1 addition & 1 deletion src/argilla/client/feedback/schemas/remote/shared.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

import httpx

from argilla.utils.pydantic import BaseModel, Field
from argilla.utils._import_pydantic import BaseModel, Field


class RemoteSchema(BaseModel, ABC):
Expand Down
2 changes: 1 addition & 1 deletion src/argilla/client/feedback/schemas/validators.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
from typing import TYPE_CHECKING, Any, Dict, Optional

if TYPE_CHECKING:
from argilla.utils.pydantic import BaseModel
from argilla.utils._import_pydantic import BaseModel


def title_must_have_value(cls: "BaseModel", v: Optional[str], values: Dict[str, Any]) -> str:
Expand Down
2 changes: 1 addition & 1 deletion src/argilla/client/feedback/schemas/vector_settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
from typing import Optional

from argilla.client.feedback.schemas.validators import title_must_have_value
from argilla.utils.pydantic import BaseModel, Field, PositiveInt, validator
from argilla.utils._import_pydantic import BaseModel, Field, PositiveInt, validator


class VectorSettings(BaseModel):
Expand Down
2 changes: 1 addition & 1 deletion src/argilla/client/feedback/training/schemas/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@
RatingQuestionUnification,
)
from argilla.client.models import Framework
from argilla.utils._import_pydantic import BaseModel
from argilla.utils.dependency import require_dependencies, requires_dependencies
from argilla.utils.pydantic import BaseModel

_LOGGER = logging.getLogger(__name__)

Expand Down
2 changes: 1 addition & 1 deletion src/argilla/client/feedback/training/schemas/defaults.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
RankingQuestionUnification,
RatingQuestionUnification,
)
from argilla.utils.pydantic import BaseModel
from argilla.utils._import_pydantic import BaseModel


class TextClassificationDefaults(BaseModel):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

from typing import Dict, List, Tuple, Union

from argilla.utils.pydantic import BaseModel
from argilla.utils._import_pydantic import BaseModel


class TextClassificationReturnTypes(BaseModel):
Expand Down
2 changes: 1 addition & 1 deletion src/argilla/client/feedback/unification.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
RatingQuestion,
ValueSchema,
)
from argilla.utils.pydantic import BaseModel, root_validator, validator
from argilla.utils._import_pydantic import BaseModel, root_validator, validator


class UnifiedValueSchema(ValueSchema):
Expand Down
2 changes: 1 addition & 1 deletion src/argilla/client/login.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

from argilla.client.sdk.commons.errors import HttpResponseError, UnauthorizedApiError
from argilla.client.singleton import init
from argilla.utils.pydantic import AnyHttpUrl, BaseModel
from argilla.utils._import_pydantic import AnyHttpUrl, BaseModel

ARGILLA_CACHE_DIR = Path.home() / ".cache" / "argilla"
ARGILLA_CREDENTIALS_FILE = ARGILLA_CACHE_DIR / "credentials.json"
Expand Down
2 changes: 1 addition & 1 deletion src/argilla/client/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

from argilla import _messages
from argilla._constants import _JS_MAX_SAFE_INTEGER, DEFAULT_MAX_KEYWORD_LENGTH, PROTECTED_METADATA_FIELD_PREFIX
from argilla.utils.pydantic import BaseModel, Field, PrivateAttr, root_validator, validator
from argilla.utils._import_pydantic import BaseModel, Field, PrivateAttr, root_validator, validator
from argilla.utils.span_utils import SpanUtils

_LOGGER = logging.getLogger(__name__)
Expand Down
3 changes: 1 addition & 2 deletions src/argilla/client/sdk/commons/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@
from uuid import uuid4

from argilla.client.models import Vectors as ClientVectors
from argilla.utils.pydantic import BaseModel, Field, validator
from argilla.utils.pydantic.generics import GenericModel
from argilla.utils._import_pydantic import BaseModel, Field, GenericModel, validator

if TYPE_CHECKING:
from httpx import Response as HTTPXResponse
Expand Down
2 changes: 1 addition & 1 deletion src/argilla/client/sdk/datasets/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
from enum import Enum
from typing import Any, Dict, Optional

from argilla.utils.pydantic import BaseModel, Field
from argilla.utils._import_pydantic import BaseModel, Field


class TaskType(str, Enum):
Expand Down
2 changes: 1 addition & 1 deletion src/argilla/client/sdk/metrics/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

from typing import Optional

from argilla.utils.pydantic import BaseModel, Field
from argilla.utils._import_pydantic import BaseModel, Field


class MetricInfo(BaseModel):
Expand Down
2 changes: 1 addition & 1 deletion src/argilla/client/sdk/text2text/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
TaskStatus,
UpdateDatasetRequest,
)
from argilla.utils.pydantic import BaseModel, Field
from argilla.utils._import_pydantic import BaseModel, Field


class Text2TextPrediction(BaseModel):
Expand Down
2 changes: 1 addition & 1 deletion src/argilla/client/sdk/text_classification/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
TaskStatus,
UpdateDatasetRequest,
)
from argilla.utils.pydantic import BaseModel, Field
from argilla.utils._import_pydantic import BaseModel, Field


class ClassPrediction(BaseModel):
Expand Down
2 changes: 1 addition & 1 deletion src/argilla/client/sdk/token_classification/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
TaskStatus,
UpdateDatasetRequest,
)
from argilla.utils.pydantic import BaseModel, Field, validator
from argilla.utils._import_pydantic import BaseModel, Field, validator


class EntitySpan(BaseModel):
Expand Down
2 changes: 1 addition & 1 deletion src/argilla/client/sdk/users/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
from typing import List, Optional
from uuid import UUID

from argilla.utils.pydantic import BaseModel, Field
from argilla.utils._import_pydantic import BaseModel, Field


class UserRole(str, Enum):
Expand Down
2 changes: 1 addition & 1 deletion src/argilla/client/sdk/v1/datasets/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
from typing import Any, Dict, List, Literal, Optional, Union
from uuid import UUID

from argilla.utils.pydantic import BaseModel, Field, StrictInt, StrictStr, conint, root_validator
from argilla.utils._import_pydantic import BaseModel, Field, StrictInt, StrictStr, conint, root_validator


class FeedbackDatasetModel(BaseModel):
Expand Down
2 changes: 1 addition & 1 deletion src/argilla/client/sdk/v1/suggestions/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
from typing import Any, Literal, Optional
from uuid import UUID

from argilla.utils.pydantic import BaseModel
from argilla.utils._import_pydantic import BaseModel


class SuggestionModel(BaseModel):
Expand Down
2 changes: 1 addition & 1 deletion src/argilla/client/sdk/v1/vectors_settings/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
from datetime import datetime
from uuid import UUID

from argilla.utils.pydantic import BaseModel
from argilla.utils._import_pydantic import BaseModel


class VectorSettingsModel(BaseModel):
Expand Down
2 changes: 1 addition & 1 deletion src/argilla/client/sdk/v1/workspaces/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
from datetime import datetime
from uuid import UUID

from argilla.utils.pydantic import BaseModel
from argilla.utils._import_pydantic import BaseModel


class WorkspaceModel(BaseModel):
Expand Down
2 changes: 1 addition & 1 deletion src/argilla/client/sdk/workspaces/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
from datetime import datetime
from uuid import UUID

from argilla.utils.pydantic import BaseModel
from argilla.utils._import_pydantic import BaseModel


class WorkspaceModel(BaseModel):
Expand Down
2 changes: 1 addition & 1 deletion src/argilla/metrics/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import warnings
from typing import Any, Callable, Dict

from argilla.utils.pydantic import BaseModel, PrivateAttr
from argilla.utils._import_pydantic import BaseModel, PrivateAttr


# TODO(@frascuchon): Define as dataclasses.dataclass
Expand Down
2 changes: 1 addition & 1 deletion src/argilla/monitoring/_transformers.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
from argilla.client.models import TextClassificationRecord
from argilla.monitoring.base import BaseMonitor
from argilla.monitoring.types import MissingType
from argilla.utils.pydantic import BaseModel
from argilla.utils._import_pydantic import BaseModel

try:
from transformers import (
Expand Down
2 changes: 1 addition & 1 deletion src/argilla/server/apis/v0/handlers/datasets.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
from argilla.server.schemas.v0.datasets import CopyDatasetRequest, CreateDatasetRequest, Dataset, UpdateDatasetRequest
from argilla.server.security import auth
from argilla.server.services.datasets import DatasetsService
from argilla.utils.pydantic import parse_obj_as
from argilla.utils._import_pydantic import parse_obj_as

router = APIRouter(tags=["datasets"], prefix="/datasets")

Expand Down
2 changes: 1 addition & 1 deletion src/argilla/server/apis/v0/handlers/metrics.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
from argilla.server.security import auth
from argilla.server.services.datasets import DatasetsService
from argilla.server.services.metrics import MetricsService
from argilla.utils.pydantic import BaseModel, Field
from argilla.utils._import_pydantic import BaseModel, Field


class MetricInfo(BaseModel):
Expand Down
2 changes: 1 addition & 1 deletion src/argilla/server/apis/v0/handlers/records.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
from argilla.server.services.datasets import DatasetsService
from argilla.server.services.search.service import SearchRecordsService
from argilla.server.services.storage.service import RecordsStorageService
from argilla.utils.pydantic import BaseModel
from argilla.utils._import_pydantic import BaseModel


def configure_router(router: APIRouter):
Expand Down
2 changes: 1 addition & 1 deletion src/argilla/server/apis/v0/handlers/records_search.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
from argilla.server.models import User
from argilla.server.security import auth
from argilla.server.services.datasets import DatasetsService
from argilla.utils.pydantic import BaseModel, Field
from argilla.utils._import_pydantic import BaseModel, Field

# TODO(@frascuchon): This will be merged with `records.py`
# once the similarity search feature is merged into develop
Expand Down
2 changes: 1 addition & 1 deletion src/argilla/server/apis/v0/handlers/records_update.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
from argilla.server.services.datasets import DatasetsService
from argilla.server.services.search.service import SearchRecordsService
from argilla.server.services.storage.service import RecordsStorageService
from argilla.utils.pydantic import BaseModel
from argilla.utils._import_pydantic import BaseModel


def configure_router(router: APIRouter):
Expand Down
2 changes: 1 addition & 1 deletion src/argilla/server/apis/v0/handlers/users.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
from argilla.server.security import auth
from argilla.server.security.model import User, UserCreate
from argilla.utils import telemetry
from argilla.utils.pydantic import parse_obj_as
from argilla.utils._import_pydantic import parse_obj_as

router = APIRouter(tags=["users"])

Expand Down
2 changes: 1 addition & 1 deletion src/argilla/server/apis/v0/handlers/workspaces.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
from argilla.server.policies import WorkspacePolicy, WorkspaceUserPolicy, authorize
from argilla.server.security import auth
from argilla.server.security.model import User, Workspace, WorkspaceCreate, WorkspaceUserCreate
from argilla.utils.pydantic import parse_obj_as
from argilla.utils._import_pydantic import parse_obj_as

router = APIRouter(tags=["workspaces"])

Expand Down
3 changes: 1 addition & 2 deletions src/argilla/server/apis/v0/models/commons/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@
ServiceSortableField,
)
from argilla.server.services.tasks.commons import ServiceBaseAnnotation, ServiceBaseRecord, ServiceBaseRecordInputs
from argilla.utils.pydantic import BaseModel, Field
from argilla.utils.pydantic.generics import GenericModel
from argilla.utils._import_pydantic import BaseModel, Field, GenricModel


class SortableField(ServiceSortableField):
Expand Down
2 changes: 1 addition & 1 deletion src/argilla/server/apis/v0/models/dataset_settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
from typing import Dict, List, Optional, Union

from argilla.server.daos.models.datasets import EmbeddingsConfig
from argilla.utils.pydantic import BaseModel, Field, validator
from argilla.utils._import_pydantic import BaseModel, Field, validator


class AbstractDatasetSettings(BaseModel):
Expand Down
Loading

0 comments on commit d961c61

Please sign in to comment.