Skip to content

Commit

Permalink
reverted to just ontology
Browse files Browse the repository at this point in the history
  • Loading branch information
Gabefire committed Nov 17, 2024
1 parent e866dc6 commit 378f851
Showing 1 changed file with 19 additions and 18 deletions.
37 changes: 19 additions & 18 deletions libs/labelbox/src/labelbox/schema/ontology.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@
import warnings
from enum import Enum
from typing import Annotated, Any, Dict, List, Optional, Type, Union
from dataclasses import field

from lbox.exceptions import InconsistentOntologyException
from pydantic import StringConstraints, Field
from pydantic import StringConstraints, field
from pydantic.dataclasses import dataclass

from labelbox.orm.db_object import DbObject
from labelbox.orm.model import Field as LB_Field, Relationship
from labelbox.orm.model import Field, Relationship
from labelbox.schema.tool_building.step_reasoning_tool import StepReasoningTool
from labelbox.schema.tool_building.tool_type import ToolType

Expand All @@ -35,9 +36,9 @@ def __str__(self):


class FeatureSchema(DbObject):
name = LB_Field.String("name")
color = LB_Field.String("name")
normalized = LB_Field.Json("normalized")
name = Field.String("name")
color = Field.String("name")
normalized = Field.Json("normalized")


@dataclass
Expand All @@ -64,7 +65,7 @@ class Option:
feature_schema_id: Optional[FeatureSchemaId] = None
options: Union[
List["Classification"], List["PromptResponseClassification"]
] = Field(default_factory=list)
] = field(default_factory=list)

def __post_init__(self):
if self.label is None:
Expand Down Expand Up @@ -160,7 +161,7 @@ class UIMode(Enum):
name: Optional[str] = None
instructions: Optional[str] = None
required: bool = False
options: List[Option] = Field(default_factory=list)
options: List[Option] = field(default_factory=list)
schema_id: Optional[str] = None
feature_schema_id: Optional[str] = None
scope: Scope = None
Expand Down Expand Up @@ -344,7 +345,7 @@ class Type(Enum):
name: Optional[str] = None
instructions: Optional[str] = None
required: bool = True
options: List[ResponseOption] = Field(default_factory=list)
options: List[ResponseOption] = field(default_factory=list)
character_min: Optional[int] = None
character_max: Optional[int] = None
schema_id: Optional[str] = None
Expand Down Expand Up @@ -449,7 +450,7 @@ class Type(Enum):
name: str
required: bool = False
color: Optional[str] = None
classifications: List[Classification] = Field(default_factory=list)
classifications: List[Classification] = field(default_factory=list)
schema_id: Optional[str] = None
feature_schema_id: Optional[str] = None

Expand Down Expand Up @@ -517,13 +518,13 @@ class Ontology(DbObject):
created_by (Relationship): `ToOne` relationship to User
"""

name = LB_Field.String("name")
description = LB_Field.String("description")
updated_at = LB_Field.DateTime("updated_at")
created_at = LB_Field.DateTime("created_at")
normalized = LB_Field.Json("normalized")
object_schema_count = LB_Field.Int("object_schema_count")
classification_schema_count = LB_Field.Int("classification_schema_count")
name = Field.String("name")
description = Field.String("description")
updated_at = Field.DateTime("updated_at")
created_at = Field.DateTime("created_at")
normalized = Field.Json("normalized")
object_schema_count = Field.Int("object_schema_count")
classification_schema_count = Field.Int("classification_schema_count")

projects = Relationship.ToMany("Project", True)
created_by = Relationship.ToOne("User", False, "created_by")
Expand Down Expand Up @@ -596,10 +597,10 @@ class OntologyBuilder:
"""

tools: List[Union[Tool, StepReasoningTool]] = Field(default_factory=list)
tools: List[Union[Tool, StepReasoningTool]] = field(default_factory=list)
classifications: List[
Union[Classification, PromptResponseClassification]
] = Field(default_factory=list)
] = field(default_factory=list)

@classmethod
def from_dict(cls, dictionary: Dict[str, Any]) -> Dict[str, Any]:
Expand Down

0 comments on commit 378f851

Please sign in to comment.