Skip to content

Commit

Permalink
fix: Using base classes in conditions
Browse files Browse the repository at this point in the history
  • Loading branch information
frascuchon committed Oct 18, 2024
1 parent 4423f66 commit a407b25
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions argilla/src/argilla/records/_mapping/_mapper.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
from argilla._exceptions import RecordsIngestionError
from argilla.records._resource import Record
from argilla.responses import Response
from argilla.settings import AbstractField, VectorField
from argilla.settings import FieldBase, VectorField
from argilla.settings._metadata import MetadataPropertyBase
from argilla.settings._question import QuestionPropertyBase
from argilla.suggestions import Suggestion
Expand Down Expand Up @@ -184,7 +184,7 @@ def _select_attribute_type(self, attribute_route: AttributeRoute) -> AttributeRo
attribute_route.type = AttributeType.SUGGESTION
elif isinstance(schema_item, QuestionPropertyBase) and attribute_route.type == AttributeType.RESPONSE:
attribute_route.type = AttributeType.RESPONSE
elif isinstance(schema_item, AbstractField):
elif isinstance(schema_item, FieldBase):
attribute_route.type = AttributeType.FIELD
elif isinstance(schema_item, VectorField):
attribute_route.type = AttributeType.VECTOR
Expand Down
12 changes: 6 additions & 6 deletions argilla/src/argilla/settings/_field.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@
if TYPE_CHECKING:
from argilla.datasets import Dataset

__all__ = ["Field", "AbstractField", "TextField", "ImageField", "ChatField", "CustomField"]
__all__ = ["Field", "FieldBase", "TextField", "ImageField", "ChatField", "CustomField"]


class AbstractField(ABC, SettingsPropertyBase):
class FieldBase(ABC, SettingsPropertyBase):
"""Abstract base class to work with Field resources"""

_model: FieldModel
Expand Down Expand Up @@ -96,7 +96,7 @@ def _with_client(self, client: "Argilla") -> "Self":
return self


class TextField(AbstractField):
class TextField(FieldBase):
"""Text field for use in Argilla `Dataset` `Settings`"""

def __init__(
Expand Down Expand Up @@ -136,7 +136,7 @@ def use_markdown(self, value: bool) -> None:
self._model.settings.use_markdown = value


class ImageField(AbstractField):
class ImageField(FieldBase):
"""Image field for use in Argilla `Dataset` `Settings`"""

def __init__(
Expand Down Expand Up @@ -167,7 +167,7 @@ def __init__(
)


class ChatField(AbstractField):
class ChatField(FieldBase):
"""Chat field for use in Argilla `Dataset` `Settings`"""

def __init__(
Expand Down Expand Up @@ -208,7 +208,7 @@ def use_markdown(self, value: bool) -> None:
self._model.settings.use_markdown = value


class CustomField(AbstractField):
class CustomField(FieldBase):
"""Custom field for use in Argilla `Dataset` `Settings`"""

def __init__(
Expand Down
10 changes: 5 additions & 5 deletions argilla/src/argilla/settings/_resource.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,18 @@
import json
import os
import re
import warnings
from functools import cached_property
from pathlib import Path
from typing import List, Optional, TYPE_CHECKING, Dict, Union, Iterator, Sequence, Literal
from uuid import UUID
import warnings

from argilla._exceptions import SettingsError, ArgillaAPIError, ArgillaSerializeError
from argilla._models._dataset import DatasetModel
from argilla._resource import Resource
from argilla.settings._field import Field, _field_from_dict, _field_from_model
from argilla.settings._field import Field, _field_from_dict, _field_from_model, FieldBase
from argilla.settings._io import build_settings_from_repo_id
from argilla.settings._metadata import MetadataType, MetadataField
from argilla.settings._metadata import MetadataType, MetadataField, MetadataPropertyBase
from argilla.settings._question import QuestionType, question_from_model, question_from_dict
from argilla.settings._task_distribution import TaskDistribution
from argilla.settings._templates import DefaultSettingsMixin
Expand Down Expand Up @@ -311,13 +311,13 @@ def add(
else:
raise SettingsError(message)

if isinstance(property, Field):
if isinstance(property, FieldBase):
self.fields.add(property)
elif isinstance(property, QuestionType):
self.questions.add(property)
elif isinstance(property, VectorField):
self.vectors.add(property)
elif isinstance(property, MetadataType):
elif isinstance(property, MetadataPropertyBase):
self.metadata.add(property)
else:
raise ValueError(f"Unsupported property type: {type(property).__name__}")
Expand Down

0 comments on commit a407b25

Please sign in to comment.